package/bridge-utils: fix build with newer kernels

... while keeping compatibility with older ones.

Preventive fix to autobuild failures! ;-)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/bridge-utils/bridge-utils-000-build-system.patch b/package/bridge-utils/bridge-utils-000-build-system.patch
new file mode 100644 (file)
index 0000000..f447377
--- /dev/null
+++ b/package/bridge-utils/bridge-utils-000-build-system.patch
@@ -0,0 +1,11 @@
+--- bridge-utils-0.9.6/libbridge/Makefile.in.dist      2004-03-01 20:55:52.000000000 -0600
++++ bridge-utils-0.9.6/libbridge/Makefile.in   2004-03-01 20:56:23.000000000 -0600
+@@ -5,7 +5,7 @@
+ RANLIB=@RANLIB@
+ 
+ CC=@CC@
+-CFLAGS = -Wall -g $(KERNEL_HEADERS)
++CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS)
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@

diff --git a/package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch b/package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.patch
new file mode 100644 (file)
index 0000000..0455a90
--- /dev/null
+++ b/package/bridge-utils/bridge-utils-001-fix-for-kernel-headers-3.8+.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/package/bridge-utils/bridge-utils.patch b/package/bridge-utils/bridge-utils.patch
deleted file mode 100644 (file)
index f447377..0000000
--- a/package/bridge-utils/bridge-utils.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bridge-utils-0.9.6/libbridge/Makefile.in.dist      2004-03-01 20:55:52.000000000 -0600
-+++ bridge-utils-0.9.6/libbridge/Makefile.in   2004-03-01 20:56:23.000000000 -0600
-@@ -5,7 +5,7 @@
- RANLIB=@RANLIB@
- 
- CC=@CC@
--CFLAGS = -Wall -g $(KERNEL_HEADERS)
-+CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS)
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@