diff options
Diffstat (limited to 'source/n/bridge-utils')
-rw-r--r-- | source/n/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch | 30 | ||||
-rwxr-xr-x | source/n/bridge-utils/bridge-utils.SlackBuild | 7 | ||||
-rw-r--r-- | source/n/bridge-utils/bridge-utils.url | 1 |
3 files changed, 3 insertions, 35 deletions
diff --git a/source/n/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch b/source/n/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch deleted file mode 100644 index 0455a908..00000000 --- a/source/n/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch +++ /dev/null @@ -1,30 +0,0 @@ -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/source/n/bridge-utils/bridge-utils.SlackBuild b/source/n/bridge-utils/bridge-utils.SlackBuild index e5789fa9..05ac953b 100755 --- a/source/n/bridge-utils/bridge-utils.SlackBuild +++ b/source/n/bridge-utils/bridge-utils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bridge-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -68,7 +68,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf bridge-utils-$VERSION -tar xf $CWD/bridge-utils-$VERSION.tar.xz || exit 1 +tar xvf $CWD/bridge-utils-$VERSION.tar.xz || exit 1 cd bridge-utils-$VERSION || exit 1 chown -R root:root . @@ -78,9 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Apply patches: -zcat $CWD/bridge-utils-1.5-linux_3.8.x.patch.gz | patch -p1 --verbose || exit 1 - # Configure: autoconf ./configure \ diff --git a/source/n/bridge-utils/bridge-utils.url b/source/n/bridge-utils/bridge-utils.url new file mode 100644 index 00000000..a57d31c8 --- /dev/null +++ b/source/n/bridge-utils/bridge-utils.url @@ -0,0 +1 @@ +https://www.kernel.org/pub/linux/utils/net/bridge-utils/ |