Fix the hang in 10-openrc-status that resulted in networkmanager getting marked as 'inactive' on resuming from suspend; many thanks to Travis Hansen for the solution (bugs #410661, #417283). Fix incompatibility with net-misc/dhcp[-ipv6] (bug #335147, thanks to Rick Harris). Move polkit rules.d file to /usr/share (bug #421577 comment #12, thanks to Dennis Lissov).

Package-Manager: portage-2.2.0_alpha115/cvs/Linux x86_64

5 files changed, 106 insertions, 13 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index dd356d8eefd1..06ebe73784a4 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.137 2012/07/04 07:56:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.138 2012/07/05 02:33:10 tetromino Exp $
+
+*networkmanager-0.9.4.0-r4 (05 Jul 2012)
+
+  05 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +files/10-openrc-status-r2, -networkmanager-0.9.4.0-r3.ebuild,
+  +networkmanager-0.9.4.0-r4.ebuild,
+  +files/networkmanager-0.9.4.0-dhclient-ipv6.patch:
+  Fix the hang in 10-openrc-status that resulted in networkmanager getting
+  marked as 'inactive' on resuming from suspend; many thanks to Travis Hansen
+  for the solution (bugs #410661, #417283). Fix incompatibility with
+  net-misc/dhcp[-ipv6] (bug #335147, thanks to Rick Harris). Move polkit
+  rules.d file to /usr/share (bug #421577 comment #12, thanks to Dennis
+  Lissov).
 
 *networkmanager-0.9.4.0-r3 (04 Jul 2012)
 
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 9f0b3af1716d..a3ebfad13f94 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,6 +5,7 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.pkla 187 RMD160 a6d
 AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 RMD160 86b63ae348289ce0d661be1634bfbd7263c7c3b5 SHA1 261a70ea76ff3abe621b7c0cdec727c3a72d27fa SHA256 702e1e702ec633608fd75dfd44f66437896421c9d2d7fe9966df8e4ef1d93a6c
 AUX 10-openrc-status 912 RMD160 621ef49695f344ca5731e0761f9f79bd99f1b2e7 SHA1 aba0cf91c2c771824fcc29e3b1884f43b3d736b6 SHA256 85621ae323f3ba09361ded68532e6c71522268e8dba699574bf5550bc900c004
 AUX 10-openrc-status-r1 893 RMD160 d071ed084fb80cd6ce34e0b91738b00de6fa7cf5 SHA1 26d401af7b1237894f6017f63b7ef79dbf6be1d6 SHA256 06db30b90859cd01dc28040853d9ff558b9ea4616a367032996f9c30cb699f93
+AUX 10-openrc-status-r2 899 RMD160 04b7a095311802285fe055a348bf4f5a1227bc2e SHA1 e5426d819b8b97c8bbe9eef12c723081a5be4542 SHA256 4391d3c53f7904bfd287e767c791c5c1b605d5bff7f5aaa00b8d7655101f2732
 AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e
 AUX conf.d.NetworkManager 230 RMD160 2d13403ad7856e35ca3c5eba767c24ca7761dc45 SHA1 05cdd210968a41fef965d119e6bedafbd3ea7309 SHA256 4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd
 AUX networkmanager-0.8-confchanges.patch 1063 RMD160 25a0d45410fa5590098386556e9947dd15507eda SHA1 ba6eaa63188f97f93bbbb327676d8104bbf7e8c8 SHA256 9fcbe0b9ab4cc38c9057a0dde2f5153efc12515ed4d28920a455dad7fc2b1e09
@@ -22,6 +23,7 @@ AUX networkmanager-0.9.2.0-ifnet-unquote-hostname.patch 1005 RMD160 c5660af6a897
 AUX networkmanager-0.9.2.0-init-provide-net-r1.patch 2282 RMD160 bcae874a2de469ce95639b514509cd2881bb546f SHA1 a68b7349a3ea5c1289c7a7cdb04cf5a8d0f66abb SHA256 fd46086be527bdd79978142eb8b46653ecc919f2dcab0a02dea2d0fd28232f92
 AUX networkmanager-0.9.2.0-init-provide-net.patch 1957 RMD160 20dac26714191f4eb1e7ec28eab515bd060f7b25 SHA1 39b7aa225e76b22c5d9795061b6a13980dc881d7 SHA256 76a39cf52925c863da9958d3b3ced9be3ba68b7fe98bad070ba3a3b3b9999d81
 AUX networkmanager-0.9.2.0-pre-sleep.patch 9163 RMD160 a7fa48306ac7ff6aacb918a836019acb02d176ec SHA1 c080ffcde01d67fea89180799182eb9b420df1df SHA256 e391907c8699b22b6c48ff27bf4d7a116600e643d788bd579339adc180e1ed97
+AUX networkmanager-0.9.4.0-dhclient-ipv6.patch 1230 RMD160 40e2d2d0a3e24beadb9a0e20ae8d6d2b83c1945d SHA1 637ac7e446f07ade324944361139f2ba98f3ec68 SHA256 5db0d4654c9844cc329f30ef3d6370eddc00148a60e6dd0935cd91206239f52c
 AUX networkmanager-0.9.4.0-fix-quote-handling.patch 2878 RMD160 ec5fa9687fde5a7ba0c214272b26a949ac470b44 SHA1 936272415e9b7fd6b32e1be44e1cce716c9d223e SHA256 15c46523e22fcdb1b885b08ea545f5664f7419fe82f065898eeada066c6fcead
 AUX networkmanager-0.9.4.0-force-libnl1.1-r1.patch 3422 RMD160 2f55ef543c5e2a4b6bd5878aa64a64c82ebed99c SHA1 40ebfd1125273831165985ac86d5a819ec9c4a31 SHA256 191511187731eab1d796104647b2fb93f35d9f315cb70d72f7927d1103a979d5
 AUX networkmanager-0.9.4.0-ip_ppp.h.patch 1617 RMD160 8d015b25959b0b7ae45397bf5e2b48e08cecb161 SHA1 119f3c2b1cbde9aa34ad72b44caa424e239a4dca SHA256 5fe243f9c2a1dff8f4d8ee79ee21c1383bcd310ddf0c3410248234c03e2f7606
@@ -42,17 +44,17 @@ EBUILD networkmanager-0.9.0.ebuild 4046 RMD160 a9c65dc727f209cc2d12efbf1f968b32c
 EBUILD networkmanager-0.9.2.0-r3.ebuild 5406 RMD160 0c4685c24876fc47e842ec919ad8f4f20d4b9827 SHA1 4c59cdfb9ae77fef652a8e38fa827eccd5600c75 SHA256 7b259b409e8f5f7875b49000c4de64b61691fcc51fde1a4bd6bb51b75792e792
 EBUILD networkmanager-0.9.2.0-r5.ebuild 5850 RMD160 410f9d3902ccc07d1190674e04005da11fd653e7 SHA1 1a07027b2b30ede1c6199b0cf3f68dbda7f9e46c SHA256 285807a779e071ae2521d4b465784c94c2b6322ba744a1c1c59f5990331ea25f
 EBUILD networkmanager-0.9.4.0-r2.ebuild 6468 RMD160 bd8c50b7381229099a4b6ed486ff400a5721024c SHA1 c766d404e2ca958f71ca2714e8022a8cc282e5dc SHA256 c2dfba186443d9bfccd5fcdc86965d7472c526335a6a3ecfac82beb9b72b35d8
-EBUILD networkmanager-0.9.4.0-r3.ebuild 6680 RMD160 4e8e900bc649d02201f42a59dfff26998b1fde76 SHA1 3115d79cae884e27d65c3f894f9da1625afca86d SHA256 75a6288a8aa408d21befeef6d874383145b3783026a72bea1b4718db144b10ac
-MISC ChangeLog 33399 RMD160 a926361fe624fef031220e6aa6bab49b5d63f19b SHA1 22b6584c782fc70d3513dd4a07b4a7a5c7ceb1fb SHA256 39a7b9d95f6e2c0760241fa636c886e8f06a14f1ca2888563463a5c96cff9d36
+EBUILD networkmanager-0.9.4.0-r4.ebuild 7512 RMD160 b24c4d16f804534172239826bd6dc81a471039f2 SHA1 18ee492bb22fb22269b453a69214338a4f34a1d1 SHA256 d3fa2838ac658d911e1b8f1a2babb83733da63ecf14e10bf59e6b551aca5c186
+MISC ChangeLog 34034 RMD160 fc5abaf49c3a0abf733b01f851c15c36688d7edb SHA1 bd1f00916d5784d9360aab051b30b79082bcf8f5 SHA256 45f7fb0aa583c61fdc30c9424df9058da3b2ff0a883da4d7624dce599f9735b8
 MISC metadata.xml 1740 RMD160 e31fee3e115457c14bea892b5783eaeb39289fb9 SHA1 a9add7c35d995f6bb7a8690de199b5a9d046933f SHA256 b1e6f477bd5f6366fdd631f89eec95770e45340031421c99071910bb0d9ca19c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP8/crAAoJEJ0WA1zPCt1hZN4IAIJD0Ak8sECxnKEsQ4GgB5ai
-wQoQirok+47R69WJFMrYT8YUttSA3ScC06zhqQKIyaEWGukgXzQHtM86f+ypsYnU
-tpd/NT0Oj08NjB07fVOLkNAyhvLPRn0vbSwRhaniqXkYxCTzvzynR9paw8msKcnC
-/W8Jdhejyxd+pZ0Ndk9+Gse5ku4VBgFA/8F2O6PHPYnbRLBwup6xBAD+YXokkTNA
-lUZqfeb6k+4f1JB30TAwkzjRkrdgkmyPiO6hmvH+nfG1kt9QPjCq4Zc7fei0EJsr
-wElD5AnxrH4pW+aZsSvwBrbndhYjGMsOAquWInclslAz6/g74UVNTHDUG9PrgEM=
-=hc+m
+iQEcBAEBAgAGBQJP9PzrAAoJEJ0WA1zPCt1ha+0H/RixwREGdzg0xQlj3fVGJqY+
++hzJfokY0DUpIlBHni9jXXU3mWwO1Tp3wZ0o26s0cHGWvzJ+ypx76WcXqS4qMUVV
+ellBoVV6g1szxi8PIVYie0rzSr6UtHg/MLHa4HwPmaFhJsnqfxyuFalOdGfRM1TK
+pSGbNDslTfen6CunH616gvGkaLOhchAnIjoidCJFqSdCksOO26vglFaA1LbI16Zu
+QN693wUNtCm+2fWq3UAdFTu1tL+upCF67DypRTl19FlPUU0MUvG7zrz+EN+dcQcK
+1raHAL+8gCCBvKQUFPikuDQRb5EAE3uCQmmzKTlhh6NJvIx2zdQWTjVGgTXy2JM=
+=3eMK
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/10-openrc-status-r2 b/net-misc/networkmanager/files/10-openrc-status-r2
new file mode 100644
index 000000000000..967c56600a54
--- /dev/null
+++ b/net-misc/networkmanager/files/10-openrc-status-r2
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Copyright (c) 2012 Alexandre Rostovtsev
+# Released under the 2-clause BSD license.
+
+# Ensures that the NetworkManager OpenRC service is marked as started and
+# providing net only when it has a successful connection.
+
+# Ensure rc-service is in PATH
+PATH="${PATH}:@EPREFIX@/sbin:@EPREFIX@/usr/sbin"
+
+# Exit if the NetworkManager OpenRC service is not running
+rc-service NetworkManager status 2>&1 | grep -Eq "status: (starting|started|inactive|stopping)" || exit 0
+
+# Call rc-service in background mode so that the start/stop functions update
+# NetworkManager service status to started or inactive instead of actually
+# starting or stopping the daemon
+export IN_BACKGROUND=YES
+
+case "$2" in
+    up) nm-online -t 0 -x && exec rc-service NetworkManager start ;;
+    down) nm-online -t 0 -x || exec rc-service NetworkManager stop ;;
+    pre-sleep) exec rc-service NetworkManager stop ;;
+esac
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.4.0-dhclient-ipv6.patch b/net-misc/networkmanager/files/networkmanager-0.9.4.0-dhclient-ipv6.patch
new file mode 100644
index 000000000000..9700f1a110b5
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.9.4.0-dhclient-ipv6.patch
@@ -0,0 +1,34 @@
+From cc9f8102859cccd95ba7a13c00bc3cc4fb53aa0a Mon Sep 17 00:00:00 2001
+From: Rick Harris <rickfharris@yahoo.com.au>
+Date: Sun, 15 Apr 2012 09:44:55 +0000
+Subject: [PATCH] dhcp: do not require dhclient-4 to be built with DHCPv6
+
+The "-4" flag is the default if dhclient-4 was built with DHCPv6 support
+enabled, and it's invalid if dhclient-4 was built without DHCPv6.
+Therefore, we simply should not use it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=679428
+---
+ src/dhcp-manager/nm-dhcp-dhclient.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
+index 043cd63..14be5b2 100644
+--- a/src/dhcp-manager/nm-dhcp-dhclient.c
++++ b/src/dhcp-manager/nm-dhcp-dhclient.c
+@@ -490,9 +490,10 @@ dhclient_start (NMDHCPClient *client,
+ 		g_ptr_array_add (argv, (gpointer) "-6");
+ 		if (mode_opt)
+ 			g_ptr_array_add (argv, (gpointer) mode_opt);
+-	} else {
+-		g_ptr_array_add (argv, (gpointer) "-4");
+ 	}
++        /* We never want the "-4" flag: it's the default if dhclient was
++         * built with DHCPv6 support, and invalid otherwise.
++         */
+ #endif
+ 
+ 	g_ptr_array_add (argv, (gpointer) "-sf");	/* Set script file */
+-- 
+1.7.8.6
+
diff --git a/net-misc/networkmanager/networkmanager-0.9.4.0-r3.ebuild b/net-misc/networkmanager/networkmanager-0.9.4.0-r4.ebuild
index a6004f05cb1f..6e3a1730ba7e 100644
--- a/net-misc/networkmanager/networkmanager-0.9.4.0-r3.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.4.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r3.ebuild,v 1.1 2012/07/04 07:56:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r4.ebuild,v 1.1 2012/07/05 02:33:10 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager"
@@ -111,6 +111,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-ip_ppp.h.patch"
 	# Fix ipv6 default route bug, #417529
 	epatch "${FILESDIR}/${P}-ipv6-route.patch"
+	# Bug #335147, https://bugzilla.gnome.org/show_bug.cgi?id=679428
+	epatch "${FILESDIR}/${P}-dhclient-ipv6.patch"
 
 	epatch_user
 
@@ -164,7 +166,7 @@ src_install() {
 
 	# Provide openrc net dependency only when nm is connected
 	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r1" 10-openrc-status
+	newexe "${FILESDIR}/10-openrc-status-r2" 10-openrc-status
 	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
 		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
 
@@ -175,7 +177,7 @@ src_install() {
 	newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
 
 	# Allow users in plugdev group to modify system connections
-	insinto /etc/polkit-1/rules.d
+	insinto /usr/share/polkit-1/rules.d/
 	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
 	if has_version '<sys-auth/polkit-0.106'; then
 		insinto /etc/polkit-1/localauthority/10-vendor.d
@@ -200,4 +202,23 @@ pkg_postinst() {
 		ewarn
 		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
 	fi
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  574d0cfa7e911b1f7792077003060240* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
 }