[arch-commits] Commit in bridge-utils/repos (6 files)

Tobias Powalowski tpowa at nymeria.archlinux.org
Fri May 31 02:55:09 EDT 2013


    Date: Friday, May 31, 2013 @ 08:55:09
  Author: tpowa
Revision: 186772

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  bridge-utils/repos/staging-i686/
  bridge-utils/repos/staging-i686/PKGBUILD
    (from rev 186771, bridge-utils/trunk/PKGBUILD)
  bridge-utils/repos/staging-i686/bridge-utils-1.5-linux_3.8.x.patch
    (from rev 186771, bridge-utils/trunk/bridge-utils-1.5-linux_3.8.x.patch)
  bridge-utils/repos/staging-x86_64/
  bridge-utils/repos/staging-x86_64/PKGBUILD
    (from rev 186771, bridge-utils/trunk/PKGBUILD)
  bridge-utils/repos/staging-x86_64/bridge-utils-1.5-linux_3.8.x.patch
    (from rev 186771, bridge-utils/trunk/bridge-utils-1.5-linux_3.8.x.patch)

---------------------------------------------------+
 staging-i686/PKGBUILD                             |   35 ++++++++++++++++++++
 staging-i686/bridge-utils-1.5-linux_3.8.x.patch   |   30 +++++++++++++++++
 staging-x86_64/PKGBUILD                           |   35 ++++++++++++++++++++
 staging-x86_64/bridge-utils-1.5-linux_3.8.x.patch |   30 +++++++++++++++++
 4 files changed, 130 insertions(+)

Copied: bridge-utils/repos/staging-i686/PKGBUILD (from rev 186771, bridge-utils/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2013-05-31 06:55:09 UTC (rev 186772)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer:
+# Contributor: Judd Vinet <judd at archlinux.org>
+
+pkgname=bridge-utils
+pkgver=1.5
+pkgrel=2
+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)
+
+prepare () {
+  # fix compiling with newer kernel headers
+  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
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('ec7b381160b340648dede58c31bb2238'
+         'fba700dcb2a3225d72b3bae64c7f49ca')

Copied: bridge-utils/repos/staging-i686/bridge-utils-1.5-linux_3.8.x.patch (from rev 186771, bridge-utils/trunk/bridge-utils-1.5-linux_3.8.x.patch)
===================================================================
--- staging-i686/bridge-utils-1.5-linux_3.8.x.patch	                        (rev 0)
+++ staging-i686/bridge-utils-1.5-linux_3.8.x.patch	2013-05-31 06:55:09 UTC (rev 186772)
@@ -0,0 +1,30 @@
+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>
+ 

Copied: bridge-utils/repos/staging-x86_64/PKGBUILD (from rev 186771, bridge-utils/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2013-05-31 06:55:09 UTC (rev 186772)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer:
+# Contributor: Judd Vinet <judd at archlinux.org>
+
+pkgname=bridge-utils
+pkgver=1.5
+pkgrel=2
+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)
+
+prepare () {
+  # fix compiling with newer kernel headers
+  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
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('ec7b381160b340648dede58c31bb2238'
+         'fba700dcb2a3225d72b3bae64c7f49ca')

Copied: bridge-utils/repos/staging-x86_64/bridge-utils-1.5-linux_3.8.x.patch (from rev 186771, bridge-utils/trunk/bridge-utils-1.5-linux_3.8.x.patch)
===================================================================
--- staging-x86_64/bridge-utils-1.5-linux_3.8.x.patch	                        (rev 0)
+++ staging-x86_64/bridge-utils-1.5-linux_3.8.x.patch	2013-05-31 06:55:09 UTC (rev 186772)
@@ -0,0 +1,30 @@
+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>
+ 



More information about the arch-commits mailing list