[arch-commits] Commit in bridge-utils/trunk (2 files)

[Christian Hesse]

    Date: Monday, October 17, 2016 @ 18:44:08
  Author: eworm
Revision: 278902

upgpkg: bridge-utils 1.6-1

new upstream release

Modified:
  bridge-utils/trunk/PKGBUILD
Deleted:
  bridge-utils/trunk/bridge-utils-1.5-linux_3.8.x.patch

------------------------------------+
 PKGBUILD                           |   22 +++++++++-------------
 bridge-utils-1.5-linux_3.8.x.patch |   30 ------------------------------
 2 files changed, 9 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-17 18:26:02 UTC (rev 278901)
+++ PKGBUILD	2016-10-17 18:44:08 UTC (rev 278902)
@@ -1,26 +1,23 @@
 # $Id$
-# Maintainer:
+# Maintainer: Christian Hesse <mail at eworm.de>
 # Contributor: Judd Vinet <judd at archlinux.org>
 
 pkgname=bridge-utils
-pkgver=1.5
-pkgrel=2
+pkgver=1.6
+pkgrel=1
 pkgdesc="Utilities for configuring the Linux ethernet bridge"
 arch=('i686' 'x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge"
 license=('GPL')
 depends=('glibc')
-source=(http://downloads.sourceforge.net/bridge/bridge-utils-$pkgver.tar.gz
-        bridge-utils-1.5-linux_3.8.x.patch)
+validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E')	# Stephen Hemminger (Microsoft corporate) <sthemmin at microsoft.com>
+source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign})
+sha256sums=('cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8'
+            'SKIP')
 
-prepare () {
-  # fix compiling with newer kernel headers
+build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ../bridge-utils-1.5-linux_3.8.x.patch
-}
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
   aclocal
   autoconf
   ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc
@@ -29,7 +26,6 @@
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('ec7b381160b340648dede58c31bb2238'
-         'fba700dcb2a3225d72b3bae64c7f49ca')

Deleted: bridge-utils-1.5-linux_3.8.x.patch
===================================================================
--- bridge-utils-1.5-linux_3.8.x.patch	2016-10-17 18:26:02 UTC (rev 278901)
+++ bridge-utils-1.5-linux_3.8.x.patch	2016-10-17 18:44:08 UTC (rev 278902)
@@ -1,30 +0,0 @@
-commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d
-Author: Russell Senior <russell at personaltelco.net>
-Date:   Wed Mar 6 12:49:42 2013 -0800
-
-    bridge-utils: Fix compile against linux-3.8.x
-    
-    Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a
-    struct in6_addr but doesn't define it.  The trivial seeming fix of
-    including the header that does define it causes more problems.  The
-    problem was discussed on mailing lists in January 2013.  The final
-    suggestion I found was here:
-    
-          http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
-    
-    This is intended to implement that suggestion.
-    
-    Signed-off-by: Russell Senior <russell at personaltelco.net>
-
-diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
-index 39964f2..dd14bae 100644
---- a/libbridge/libbridge.h
-+++ b/libbridge/libbridge.h
-@@ -20,6 +20,7 @@
- #define _LIBBRIDGE_H
- 
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <linux/if.h>
- #include <linux/if_bridge.h>
-