fix some shutdown crashes. Fix >=dnsmasq-2.56 connection sharing - Gentoo bug #357671

(Portage version: 2.1.9.42/cvs/Linux x86_64)

2 files changed, 78 insertions, 0 deletions

diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-dnsmasq-config.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-dnsmasq-config.patch
new file mode 100644
index 000000000000..67afdd6961cd
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-dnsmasq-config.patch
@@ -0,0 +1,32 @@
+From b05b77fa2668df4a4d8830685b138b4c57b1e777 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Sat, 05 Mar 2011 05:52:44 +0000
+Subject: dnsmasq: send no config file instead of a bogus one (lp:725041) (debian #615082)
+
+---
+diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
+index 701c078..3ca4b21 100644
+--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
++++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
+@@ -278,17 +278,10 @@ create_dm_cmd_line (const char *iface,
+ 	/* dnsmasq may read from it's default config file location, which if that
+ 	 * location is a valid config file, it will combine with the options here
+ 	 * and cause undesirable side-effects.  Like sending bogus IP addresses
+-	 * as the gateway or whatever.  So give dnsmasq a bogus config file
+-	 * location to avoid screwing up the configuration we're passing to it.
++	 * as the gateway or whatever.  So tell dnsmasq not to use any config file
++	 * at all.
+ 	 */
+-	memset (buf, 0, sizeof (buf));
+-	strcpy (buf, "/tmp/");
+-	for (i = 5; i < 15; i++)
+-		buf[i] = (char) (g_random_int_range ((guint32) 'a', (guint32) 'z') & 0xFF);
+-	strcat (buf, ".conf");
+-
+ 	nm_cmd_line_add_string (cmd, "--conf-file");
+-	nm_cmd_line_add_string (cmd, buf);
+ 
+ 	nm_cmd_line_add_string (cmd, "--no-hosts");
+ 	nm_cmd_line_add_string (cmd, "--keep-in-foreground");
+--
+cgit v0.8.3-6-g21f6
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-shutdown.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-shutdown.patch
new file mode 100644
index 000000000000..265c63766229
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-shutdown.patch
@@ -0,0 +1,46 @@
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index afcc6ad..9bd5354 100644
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -4364,10 +4364,11 @@ dispose (GObject *object)
+ 
+ 	/* Unregister property filter */
+ 	bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
+-	g_assert (bus);
+-	dbus_connection = dbus_g_connection_get_connection (bus);
+-	g_assert (dbus_connection);
+-	dbus_connection_remove_filter (dbus_connection, prop_filter, manager);
++	if (bus) {
++		dbus_connection = dbus_g_connection_get_connection (bus);
++		g_assert (dbus_connection);
++		dbus_connection_remove_filter (dbus_connection, prop_filter, manager);
++	}
+ 	g_object_unref (priv->dbus_mgr);
+ 
+ 	if (priv->bluez_mgr)
+--
+cgit v0.8.3-6-g21f6
+
+diff --git a/src/nm-policy.c b/src/nm-policy.c
+index b5c2129..5355703 100644
+--- a/src/nm-policy.c
++++ b/src/nm-policy.c
+@@ -1222,15 +1222,6 @@ nm_policy_destroy (NMPolicy *policy)
+ 	}
+ 	g_slist_free (policy->dev_signal_ids);
+ 
+-	/* Rewrite /etc/hosts on exit to ensure we don't leave stale IP addresses
+-	 * lying around.  FIXME: this will take out a valid IP address of an
+-	 * ethernet device we're leaving active (ie, a connection we can "assume"
+-	 * when NM starts again).
+-	 */
+-	policy->default_device4 = NULL;
+-	policy->default_device6 = NULL;
+-	update_system_hostname (policy, NULL, NULL);
+-
+ 	g_free (policy->orig_hostname);
+ 	g_free (policy->cur_hostname);
+ 
+--
+cgit v0.8.3-6-g21f6
+