about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-12-05 04:27:31 +0100
committerMichael Biebl <biebl@debian.org>2010-12-05 04:27:31 +0100
commitde6bf7bedd686b860593371a705c4421636cd6e3 (patch)
treeecfd4de82fa7f6e9f861c33982f51f5aea260e07
parent602ec1e2e06c6cbb92dc2da2ab2ebfe433a7ef94 (diff)
Refresh patches
-rw-r--r--debian/patches/40-umanaged-interfaces.patch8
-rw-r--r--debian/patches/50-bridge-interfaces.patch8
2 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/40-umanaged-interfaces.patch b/debian/patches/40-umanaged-interfaces.patch
index b5509fc5..0963f7f5 100644
--- a/debian/patches/40-umanaged-interfaces.patch
+++ b/debian/patches/40-umanaged-interfaces.patch
@@ -1,8 +1,8 @@
 Index: network-manager/system-settings/plugins/ifupdown/plugin.c
 ===================================================================
---- network-manager.orig/system-settings/plugins/ifupdown/plugin.c	2010-12-03 20:47:40.656731988 +0100
-+++ network-manager/system-settings/plugins/ifupdown/plugin.c	2010-12-04 16:41:38.258906974 +0100
-@@ -366,6 +366,7 @@
+--- network-manager.orig/system-settings/plugins/ifupdown/plugin.c	2010-12-05 04:24:58.153750890 +0100
++++ network-manager/system-settings/plugins/ifupdown/plugin.c	2010-12-05 04:27:03.157754436 +0100
+@@ -368,6 +368,7 @@
  			/* Remove any connection for this block that was previously found */
  			exported = g_hash_table_lookup (priv->iface_connections, block->name);
  			if (exported) {
@@ -10,7 +10,7 @@ Index: network-manager/system-settings/plugins/ifupdown/plugin.c
  				nm_settings_connection_interface_delete (NM_SETTINGS_CONNECTION_INTERFACE (exported),
  				                                         ignore_cb,
  				                                         NULL);
-@@ -375,11 +376,14 @@
+@@ -377,11 +378,14 @@
  			/* add the new connection */
  			exported = nm_ifupdown_connection_new (block);
  			if (exported) {
diff --git a/debian/patches/50-bridge-interfaces.patch b/debian/patches/50-bridge-interfaces.patch
index f58ba5d7..07c2a326 100644
--- a/debian/patches/50-bridge-interfaces.patch
+++ b/debian/patches/50-bridge-interfaces.patch
@@ -1,8 +1,8 @@
 Index: network-manager/system-settings/plugins/ifupdown/plugin.c
 ===================================================================
---- network-manager.orig/system-settings/plugins/ifupdown/plugin.c	2010-12-04 16:41:38.000000000 +0100
-+++ network-manager/system-settings/plugins/ifupdown/plugin.c	2010-12-04 16:51:51.810906877 +0100
-@@ -360,9 +360,49 @@
+--- 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 @@
  	while (block) {
  		if(!strcmp ("auto", block->type) || !strcmp ("allow-hotplug", block->type))
  			g_hash_table_insert (auto_ifaces, block->name, GUINT_TO_POINTER (1));
@@ -53,7 +53,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) {
-@@ -385,6 +425,7 @@
+@@ -387,6 +427,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);
  		}