summaryrefslogtreecommitdiff
path: root/core/bridge-utils
diff options
context:
space:
mode:
Diffstat (limited to 'core/bridge-utils')
-rw-r--r--core/bridge-utils/PKGBUILD22
-rw-r--r--core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch30
-rw-r--r--core/bridge-utils/bridges.conf.d27
3 files changed, 42 insertions, 37 deletions
diff --git a/core/bridge-utils/PKGBUILD b/core/bridge-utils/PKGBUILD
index fb452354e..07742e381 100644
--- a/core/bridge-utils/PKGBUILD
+++ b/core/bridge-utils/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 140510 2011-10-16 05:39:52Z eric $
+# $Id: PKGBUILD 187019 2013-06-03 11:14:55Z allan $
# Maintainer:
# Contributor: Judd Vinet <judd@archlinux.org>
pkgname=bridge-utils
pkgver=1.5
-pkgrel=1
+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')
-backup=('etc/conf.d/bridges')
source=(http://downloads.sourceforge.net/bridge/bridge-utils-$pkgver.tar.gz
- bridges.conf.d)
-md5sums=('ec7b381160b340648dede58c31bb2238'
- 'f5d691282653580dd5fd4a1092ef365b')
+ 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 --sysconfdir=/etc
+ ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
-
- # install config file
- install -Dm644 ../bridges.conf.d "${pkgdir}/etc/conf.d/bridges"
}
+md5sums=('ec7b381160b340648dede58c31bb2238'
+ 'fba700dcb2a3225d72b3bae64c7f49ca')
diff --git a/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch b/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch
new file mode 100644
index 000000000..0455a9085
--- /dev/null
+++ b/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch
@@ -0,0 +1,30 @@
+commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d
+Author: Russell Senior <russell@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@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>
+
diff --git a/core/bridge-utils/bridges.conf.d b/core/bridge-utils/bridges.conf.d
deleted file mode 100644
index 2609cf51f..000000000
--- a/core/bridge-utils/bridges.conf.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Settings for layer-2 bridges
-#
-# For each bridge interface declared in INTERFACES (in rc.conf), declare
-# a bridge_${IF} variable that contains the real ethernet interfaces that
-# should be bridged togeether.
-#
-# Then list the bridge interface name in the BRIDGE_INTERFACES array.
-#
-
-# example:
-#
-# in /etc/rc.conf:
-# eth0="eth0 up"
-# eth1="eth1 up"
-# br0="br0 192.168.0.2 netmask 255.255.255.0 up"
-# INTERFACES=(lo eth0 eth1 br0)
-#
-# in /etc/conf.d/bridges
-# bridge_br0="eth0 eth1"
-# BRIDGE_INTERFACES=(br0)
-#
-
-
-#bridge_br0="eth0 eth1"
-#BRIDGE_INTERFACES=(br0)
-