diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/50-bridge-interfaces.patch | 16 | ||||
| -rw-r--r-- | debian/patches/51-normalized-keys.patch | 12 |
2 files changed, 15 insertions, 13 deletions
diff --git a/debian/patches/50-bridge-interfaces.patch b/debian/patches/50-bridge-interfaces.patch index c3107fdd..6f4faeaa 100644 --- a/debian/patches/50-bridge-interfaces.patch +++ b/debian/patches/50-bridge-interfaces.patch @@ -7,9 +7,9 @@ Author: Michael Biebl <biebl@debian.org> Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530335 Index: network-manager/system-settings/plugins/ifupdown/plugin.c =================================================================== ---- network-manager.orig/system-settings/plugins/ifupdown/plugin.c 2010-12-05 04:27:03.157754436 +0100 -+++ network-manager/system-settings/plugins/ifupdown/plugin.c 2010-12-05 04:27:09.541753340 +0100 -@@ -362,9 +362,49 @@ +--- network-manager.orig/system-settings/plugins/ifupdown/plugin.c 2011-03-07 01:40:12.576352746 +0100 ++++ network-manager/system-settings/plugins/ifupdown/plugin.c 2011-03-07 01:40:35.916352746 +0100 +@@ -362,9 +362,51 @@ while (block) { if(!strcmp ("auto", block->type) || !strcmp ("allow-hotplug", block->type)) g_hash_table_insert (auto_ifaces, block->name, GUINT_TO_POINTER (1)); @@ -22,11 +22,13 @@ Index: network-manager/system-settings/plugins/ifupdown/plugin.c + /* Try to find bridge ports */ + const char *ports = ifparser_getkey (block, "bridge_ports"); + if (ports) { -+ PLUGIN_PRINT("SCPlugin-Ifupdown", "found bridge ports %s for %s", ports, block->name); -+ char **port_ifaces = g_strsplit_set (ports, " \t", -1); -+ + int i; + int state = 0; ++ char **port_ifaces; ++ ++ PLUGIN_PRINT("SCPlugin-Ifupdown", "found bridge ports %s for %s", ports, block->name); ++ ++ port_ifaces = g_strsplit_set (ports, " \t", -1); + for (i = 0; i < g_strv_length (port_ifaces); i++) { + char *token = port_ifaces[i]; + /* Skip crazy stuff like regex or all */ @@ -60,7 +62,7 @@ Index: network-manager/system-settings/plugins/ifupdown/plugin.c /* Remove any connection for this block that was previously found */ exported = g_hash_table_lookup (priv->iface_connections, block->name); if (exported) { -@@ -387,6 +427,7 @@ +@@ -387,6 +429,7 @@ g_hash_table_insert (priv->well_known_interfaces, block->name, "known"); PLUGIN_PRINT("SCPlugin-Ifupdown", "adding mapping %s to well_known_interfaces", block->name); } diff --git a/debian/patches/51-normalized-keys.patch b/debian/patches/51-normalized-keys.patch index 8411ca8b..f0404913 100644 --- a/debian/patches/51-normalized-keys.patch +++ b/debian/patches/51-normalized-keys.patch @@ -1,7 +1,7 @@ Index: network-manager/system-settings/plugins/ifupdown/interface_parser.c =================================================================== ---- network-manager.orig/system-settings/plugins/ifupdown/interface_parser.c 2011-03-06 20:49:32.229089569 +0100 -+++ network-manager/system-settings/plugins/ifupdown/interface_parser.c 2011-03-06 20:53:09.749089571 +0100 +--- network-manager.orig/system-settings/plugins/ifupdown/interface_parser.c 2011-03-07 01:42:18.420352746 +0100 ++++ network-manager/system-settings/plugins/ifupdown/interface_parser.c 2011-03-07 01:42:25.152352746 +0100 @@ -51,6 +51,7 @@ void add_data(const char *key,const char *data) { @@ -24,8 +24,8 @@ Index: network-manager/system-settings/plugins/ifupdown/interface_parser.c if (last->info == NULL) Index: network-manager/system-settings/plugins/ifupdown/plugin.c =================================================================== ---- network-manager.orig/system-settings/plugins/ifupdown/plugin.c 2011-03-06 20:49:36.721089570 +0100 -+++ network-manager/system-settings/plugins/ifupdown/plugin.c 2011-03-06 20:50:13.493089573 +0100 +--- network-manager.orig/system-settings/plugins/ifupdown/plugin.c 2011-03-07 01:42:23.988352746 +0100 ++++ network-manager/system-settings/plugins/ifupdown/plugin.c 2011-03-07 01:42:25.156352746 +0100 @@ -368,7 +368,7 @@ /* Bridge configuration */ if(!strncmp ("br", block->name, 2)) { @@ -33,5 +33,5 @@ Index: network-manager/system-settings/plugins/ifupdown/plugin.c - const char *ports = ifparser_getkey (block, "bridge_ports"); + const char *ports = ifparser_getkey (block, "bridge-ports"); if (ports) { - PLUGIN_PRINT("SCPlugin-Ifupdown", "found bridge ports %s for %s", ports, block->name); - char **port_ifaces = g_strsplit_set (ports, " \t", -1); + int i; + int state = 0; |