diff --git a/packages/bridge-utils/default.bash b/packages/bridge-utils/default.bash index ab6a547..3ba30f0 100644 --- a/packages/bridge-utils/default.bash +++ b/packages/bridge-utils/default.bash @@ -1,26 +1,31 @@ version=\ ( - "1.4" + '1.5' ) url=\ ( - "http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-$version/bridge-utils-$version.tar.gz" + "http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-$version.tar.gz" ) md5=\ ( - "0182fcac3a2b307113bbec34e5f1c673" + 'ec7b381160b340648dede58c31bb2238' ) maintainer=\ ( - "Ricardo Martins " + 'Ricardo Martins ' ) post_unpack() { - cd ../bridge-utils-$version && autoreconf + patches=$(ls "$cfg_package_spec_dir/patches-$version/"*.patch 2>/dev/null) + if [ -n "$patches" ]; then + cat $patches | patch -p1 + fi && + + autoreconf } configure() diff --git a/packages/bridge-utils/patches-1.5/00-build-fix.patch b/packages/bridge-utils/patches-1.5/00-build-fix.patch new file mode 100644 index 0000000..292cc83 --- /dev/null +++ b/packages/bridge-utils/patches-1.5/00-build-fix.patch @@ -0,0 +1,54 @@ +Submitted By: Bruce Dubbs +Date: 2013-03-10 +Initial Package Version: 1.5 +Upstream Status: Unknown +Origin: LFS +Description: This patch contains fixes a problem with +the omission of a needed include file in the kernel's linux/if_bridge.h. +It also fixes some autoconf warnings. + + +diff -Naur bridge-utils-1.5.orig/Makefile.in bridge-utils-1.5/Makefile.in +--- bridge-utils-1.5.orig/Makefile.in 2011-03-28 19:52:54.000000000 -0500 ++++ bridge-utils-1.5/Makefile.in 2013-03-10 13:44:41.000000000 -0500 +@@ -9,6 +9,7 @@ + bindir=@bindir@ + sbindir=@sbindir@ + mandir=@mandir@ ++datarootdir=@datarootdir@ + distdir = $(PACKAGE)-$(VERSION) + + SUBDIRS=libbridge brctl doc +diff -Naur bridge-utils-1.5.orig/brctl/Makefile.in bridge-utils-1.5/brctl/Makefile.in +--- bridge-utils-1.5.orig/brctl/Makefile.in 2011-03-28 19:52:54.000000000 -0500 ++++ bridge-utils-1.5/brctl/Makefile.in 2013-03-10 13:44:15.000000000 -0500 +@@ -12,6 +12,7 @@ + bindir=@bindir@ + sbindir=@sbindir@ + mandir=@mandir@ ++datarootdir=@datarootdir@ + + INSTALL=@INSTALL@ + +diff -Naur bridge-utils-1.5.orig/doc/Makefile.in bridge-utils-1.5/doc/Makefile.in +--- bridge-utils-1.5.orig/doc/Makefile.in 2011-03-28 19:52:54.000000000 -0500 ++++ bridge-utils-1.5/doc/Makefile.in 2013-03-10 13:43:39.000000000 -0500 +@@ -9,6 +9,7 @@ + bindir=@bindir@ + sbindir=@sbindir@ + mandir=@mandir@ ++datarootdir=@datarootdir@ + + SUBDIRS=libbridge brctl + +diff -Naur bridge-utils-1.5.orig/libbridge/libbridge.h bridge-utils-1.5/libbridge/libbridge.h +--- bridge-utils-1.5.orig/libbridge/libbridge.h 2011-03-28 19:52:54.000000000 -0500 ++++ bridge-utils-1.5/libbridge/libbridge.h 2013-03-10 13:46:23.000000000 -0500 +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include + + /* defined in net/if.h but that conflicts with linux/if.h... */