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

(Portage version: 2.1.9.42/cvs/Linux x86_64)

4 files changed, 93 insertions, 2 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 52fa876e916e..1d0f28499348 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.102 2011/03/09 11:17:23 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.103 2011/03/09 14:14:23 dagger Exp $
+
+*networkmanager-0.8.2-r10 (09 Mar 2011)
+
+  09 Mar 2011; Robert Piasek <dagger@gentoo.org>
+  -networkmanager-0.8.2-r9.ebuild, +networkmanager-0.8.2-r10.ebuild,
+  +files/networkmanager-0.8.2-fix-dnsmasq-config.patch,
+  +files/networkmanager-0.8.2-fix-shutdown.patch:
+  fix some shutdown crashes. Fix >=dnsmasq-2.56 connection sharing - Gentoo bug
+  #357671
 
 *networkmanager-0.8.2-r9 (26 Feb 2011)
 
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
+
diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r9.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild
index bc12243522bd..cd38ce13eca7 100644
--- a/net-misc/networkmanager/networkmanager-0.8.2-r9.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r9.ebuild,v 1.1 2011/02/26 08:13:31 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild,v 1.1 2011/03/09 14:14:23 dagger Exp $
 
 EAPI="2"
 
@@ -101,6 +101,10 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-fix-tempfiles.patch"
 	# won't write when nothing changed (bug #356339)
 	epatch "${FILESDIR}/${P}-ifnet-smarter-write.patch"
+	# don't pass trash arguments to dnsmasq. Fixes bug #357671
+	epatch "${FILESDIR}/${P}-fix-dnsmasq-config.patch"
+	# fix some crashes at shutdown
+	epatch "${FILESDIR}/${P}-fix-shutdown.patch"
 	eautoreconf
 }