bridge-utils in main

2015-07-21 20:55:12 +03:00
parent 9f3266e43f
commit a663e33050
6 changed files with 140 additions and 0 deletions
@@ -0,0 +1,10 @@
+--- bridge-utils-1.0.4/libbridge/libbridge_private.h~	2004-05-28 21:38:38.000000000 +0100
+++ bridge-utils-1.0.4/libbridge/libbridge_private.h	2004-07-01 11:24:21.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include "config.h"
+ 
+ #include <linux/sockios.h>
+#include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <linux/if_bridge.h>
@@ -0,0 +1,13 @@
+diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c
+index 1decc28..65ea79a 100644
+--- a/libbridge/libbridge_devif.c
+++ b/libbridge/libbridge_devif.c
+@@ -282,7 +282,7 @@ static int br_set(const char *bridge, const char *name,
+ 	char path[SYSFS_PATH_MAX];
+ 	FILE *f;
+ 
+-	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/%s", bridge, name);
+	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/%s", bridge, name);
+ 
+ 	f = fopen(path, "w");
+ 	if (f) {
@@ -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>
+