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

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

5 files changed, 97 insertions, 4 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/Manifest b/net-misc/networkmanager/Manifest
index 5edc80dd9e39..1f8f478d1357 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -11,6 +11,8 @@ AUX networkmanager-0.8.1-glib-2.25.12-workaround.patch 663 RMD160 b4397b17a61482
 AUX networkmanager-0.8.2-1.patch 6642 RMD160 466f7c2bd34043d13d1b265f4a52b172c594430e SHA1 7af80cb4ea3cf1d60566c8dacd3eadc3ef4cc186 SHA256 f29cfa186c9b77452266e9c303711c2368986fb7e5455e388a5dfe064e80b3e3
 AUX networkmanager-0.8.2-accept-gw.patch 3679 RMD160 b163afa5215f0eb52ba2562d22c65ec5e0bd3380 SHA1 a71f25413abf0c359439add74a73545790604ac9 SHA256 631ccad5bc4c2d880b5235bc8e6ace494467bad1734023ded9d8bcd52b9177af
 AUX networkmanager-0.8.2-confchanges.patch 1279 RMD160 1ff5b6d663aa4417beaf9c7630d710a17a1812b5 SHA1 634ad19b189509e75362e5cd7f069ca795b4aeba SHA256 7c9ed8dc35b5b6d0414f96902fbe8117408ad556af655c0afc593ec5a1beac28
+AUX networkmanager-0.8.2-fix-dnsmasq-config.patch 1391 RMD160 4210e22419c897ecfd506b1b313908d71fbb79ba SHA1 91bbc910091c7c4625414640132cd10d0b4b2f19 SHA256 b36a4b4f0f7937c832371494b3149d9f864ec62820dcd286858a96f7c60a9333
+AUX networkmanager-0.8.2-fix-shutdown.patch 1412 RMD160 122ce2b089f976e63706b8a81784d561dc73d76b SHA1 a0e4d3389049775201971e4a3b8c2ff1bcc40f4c SHA256 cd2e9c07dc191729afe2ea40e467babd2a694ccb5dbda8bcc990d3a6b04da4e5
 AUX networkmanager-0.8.2-fix-tempfiles.patch 6758 RMD160 c403c33e71a38ca548b6ad8d8a3094094f11a686 SHA1 ee9818f898a34af688f507eabbdbda860108f418 SHA256 76951a82d62de94cd5d5862d26cd6c1b598623ae7b66c6592dff66c8fcb5a926
 AUX networkmanager-0.8.2-fix-tests.patch 2156 RMD160 b549d50e96efe7f26402f5d974560b3f9307dde5 SHA1 c38ae50f82a65c8e7e8c4a4fe65634e5ee9873c8 SHA256 d6cf4ceac6893a9893c916f1a5298cd1817ed0fb357f2e55539a3e6aae5e855e
 AUX networkmanager-0.8.2-fix-timestamp.patch 950 RMD160 4217e0332457eae47eb6c2f87a91f87adad37970 SHA1 d9fcaed9f2622937137bb977fba2d1c123b35893 SHA256 7d1d123b0da02ca8f02ce13b805eec912334bf1981032a38dcd2ef7e422bbf81
@@ -25,8 +27,8 @@ DIST networkmanager-ifnet-540e40f.patch 268068 RMD160 954ffb9915fdd8ae650963b66a
 EBUILD networkmanager-0.8-r1.ebuild 3682 RMD160 649d13ea5fda20abe261e0fcd74cb0cd3e76b907 SHA1 65fe9cb0447698ad20a51bf4c878ee2f5d36d07c SHA256 5e11ef6646e6ed5a9aeed68e321cd52aac35d052ebd61a0326d96d0badb60924
 EBUILD networkmanager-0.8.1-r6.ebuild 4784 RMD160 cdf8ca556319629e311744d84f08225e4509369f SHA1 72fc18c1e82eceddf57243d9c2cff9b5ebaeb046 SHA256 66170c5881519fd0c60b2fe6c0f1a55fda478833d2dc2947cae6080313bafae7
 EBUILD networkmanager-0.8.2-r1.ebuild 4132 RMD160 1261ce2f0e499ece5e2ea4c010c8627ede1fa754 SHA1 96f9ac6b0ecaf0656386e82458453a97dfb8be61 SHA256 d247e094c0e22b885b78efa2cc8a6c8b32bbb5967f95a46439985d9a9da7362e
+EBUILD networkmanager-0.8.2-r10.ebuild 5131 RMD160 815b339d654c6b325e7022fe69efa97a29c413a4 SHA1 7ee100e2fff620185d464ac62dc2cef4e7c4c560 SHA256 47e5cff11aa187e6489f28568597d3dd998ed56d471369179027b0a0dc0cd175
 EBUILD networkmanager-0.8.2-r2.ebuild 4407 RMD160 6ecc01211eb01e86a6856a1379dfdb991177b0d9 SHA1 ae3cc0a5869fc26b155b9704b286e61a01899c8c SHA256 0ead477d6ed601be6d1e3e5fa2a4546cc9cbbde77703406287125b3b639c5db2
 EBUILD networkmanager-0.8.2-r6.ebuild 4837 RMD160 417fa42b1d369fedaa6b7aea043a80cb52fd81e8 SHA1 99779c8f7693c2aeec53c489fa2319e042242b6d SHA256 c591c769bea0660755c3913a879fe74ab6413e2e3e58e83fcf2f0e24f49597de
-EBUILD networkmanager-0.8.2-r9.ebuild 4941 RMD160 c183214554e338d4cef7bb26690b68b7fac9ec7b SHA1 28488b44d53e24963cc2679e7bdafbe140fade1a SHA256 957358e3a9ec961fc3a41830eb8cd93b2998b60c9ab6659fa5d399f49dfc0642
-MISC ChangeLog 20982 RMD160 f4728d503110615be59238807426085f9b050fd5 SHA1 e7e3b3b7add65173c9e8a53bb88d0bbb141422b1 SHA256 ca054ee00e5c1c3173fa1787a72353c1e514e170af988825e48e2c9ead353355
+MISC ChangeLog 21337 RMD160 f19f1e81d44c2e941536b738079e4a97521c7e71 SHA1 a432c9499fd3abc5a2952c81549a630bca8d49b9 SHA256 58e4f5df1b28569a2b7dd7cbb99d02958439c44cf48eb5c24574798846174923
 MISC metadata.xml 1064 RMD160 28d68851ef6cb80bfef006ab6f88d2f93f44bee9 SHA1 ea76e3b1043d5933df8ed0531f89b0bc8e4b7d7c SHA256 ebb4664fb8edea0672a185e68c1cda3c0f3d5fa0ad906a50a67caafe380ef6be
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
 }