Version bump with various bugfixes. Update dispatcher script to correctly detect openrc service status at boot (bug #436044, thanks to cyberbat). Update license.

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

8 files changed, 283 insertions, 11 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 202046c53e9d..5a2fcafc8e2a 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,17 @@
 # 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.148 2012/10/11 15:07:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.149 2012/10/26 22:57:58 tetromino Exp $
+
+*networkmanager-0.9.6.4 (26 Oct 2012)
+
+  26 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +files/10-openrc-status-r3, networkmanager-0.8.4.0-r2.ebuild,
+  networkmanager-0.9.4.0-r5.ebuild, networkmanager-0.9.4.0-r6.ebuild,
+  networkmanager-0.9.4.0-r7.ebuild, networkmanager-0.9.6.0.ebuild,
+  +networkmanager-0.9.6.4.ebuild:
+  Version bump with various bugfixes. Update dispatcher script to correctly
+  detect openrc service status at boot (bug #436044, thanks to cyberbat).
+  Update license.
 
   11 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
   networkmanager-0.9.4.0-r6.ebuild:
diff --git a/net-misc/networkmanager/files/10-openrc-status-r3 b/net-misc/networkmanager/files/10-openrc-status-r3
new file mode 100644
index 000000000000..0b4b89fb1dbb
--- /dev/null
+++ b/net-misc/networkmanager/files/10-openrc-status-r3
@@ -0,0 +1,30 @@
+#!/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 &&
+		! rc-service NetworkManager status 2>&1 | grep -q started &&
+		exec rc-service NetworkManager start ;;
+	down) nm-online -t 0 -x ||
+		rc-service NetworkManager status 2>&1 | grep -q stopped ||
+		exec rc-service NetworkManager stop ;;
+	pre-sleep) rc-service NetworkManager status 2>&1 | grep -q stopped ||
+		exec rc-service NetworkManager stop ;;
+esac
+exit 0
+# vim: set ts=4:
diff --git a/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild b/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild
index a8eae36e621f..a3beb98b4c4e 100644
--- a/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8.4.0-r2.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.8.4.0-r2.ebuild,v 1.9 2012/05/24 03:04:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild,v 1.10 2012/10/26 22:57:58 tetromino Exp $
 
 EAPI="3"
 GNOME_ORG_MODULE="NetworkManager"
@@ -10,7 +10,7 @@ inherit autotools eutils gnome.org linux-info systemd
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux +ppp resolvconf connection-sharing"
diff --git a/net-misc/networkmanager/networkmanager-0.9.4.0-r5.ebuild b/net-misc/networkmanager/networkmanager-0.9.4.0-r5.ebuild
index 3a47fdb1b5b6..de55bdf8c017 100644
--- a/net-misc/networkmanager/networkmanager-0.9.4.0-r5.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.4.0-r5.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-r5.ebuild,v 1.1 2012/07/17 05:43:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r5.ebuild,v 1.2 2012/10/26 22:57:58 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager"
@@ -10,7 +10,7 @@ inherit autotools eutils gnome.org linux-info systemd user
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd +wext wimax"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
diff --git a/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild b/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild
index aa1436d05252..8a4d1f1be902 100644
--- a/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.4.0-r6.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-r6.ebuild,v 1.6 2012/10/11 15:07:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild,v 1.7 2012/10/26 22:57:58 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager"
@@ -10,7 +10,7 @@ inherit autotools eutils gnome.org linux-info systemd user toolchain-funcs
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf +wext wimax" # systemd
 KEYWORDS="amd64 arm ppc ppc64 x86"
diff --git a/net-misc/networkmanager/networkmanager-0.9.4.0-r7.ebuild b/net-misc/networkmanager/networkmanager-0.9.4.0-r7.ebuild
index 5c6dc00a74ce..e2460201ba33 100644
--- a/net-misc/networkmanager/networkmanager-0.9.4.0-r7.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.4.0-r7.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-r7.ebuild,v 1.1 2012/08/14 04:47:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r7.ebuild,v 1.2 2012/10/26 22:57:58 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager"
@@ -10,7 +10,7 @@ inherit autotools eutils gnome.org linux-info systemd user toolchain-funcs
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd +wext wimax"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
diff --git a/net-misc/networkmanager/networkmanager-0.9.6.0.ebuild b/net-misc/networkmanager/networkmanager-0.9.6.0.ebuild
index 4f74c8e280bc..91803094765b 100644
--- a/net-misc/networkmanager/networkmanager-0.9.6.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.6.0.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.6.0.ebuild,v 1.2 2012/09/14 05:07:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.6.0.ebuild,v 1.3 2012/10/26 22:57:58 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager"
@@ -12,7 +12,7 @@ inherit autotools eutils gnome.org linux-info systemd user toolchain-funcs vala
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd vala +wext wimax"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
diff --git a/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild b/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild
new file mode 100644
index 000000000000..499c86678d28
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild
@@ -0,0 +1,231 @@
+# 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.6.4.ebuild,v 1.1 2012/10/26 22:57:58 tetromino Exp $
+
+EAPI="4"
+GNOME_ORG_MODULE="NetworkManager"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils gnome.org linux-info systemd user toolchain-funcs vala
+
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd vala +wext wimax"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	^^ ( nss gnutls )
+	^^ ( dhclient dhcpcd )"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# libnl:1.1 is needed for linking to net-wireless/wimax libraries
+# XXX: on bump, check that net-wireless/wimax is still using libnl:1.1 !
+# TODO: Qt support?
+COMMON_DEPEND=">=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.94
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] )
+	>=dev-libs/glib-2.26
+	>=sys-auth/polkit-0.97
+	>=net-libs/libsoup-2.26:2.4
+	>=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
+	bluetooth? ( >=net-wireless/bluez-4.82 )
+	avahi? ( net-dns/avahi[autoipd] )
+	gnutls? (
+		dev-libs/libgcrypt
+		net-libs/gnutls )
+	nss? ( >=dev-libs/nss-3.11 )
+	dhclient? ( net-misc/dhcp )
+	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
+	ppp? ( >=net-dialup/ppp-2.4.5 )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )
+	wimax? (
+		dev-libs/libnl:1.1
+		>=net-wireless/wimax-1.5.1 )
+	!wimax? ( dev-libs/libnl:3 )"
+
+RDEPEND="${COMMON_DEPEND}
+	modemmanager? ( >=net-misc/modemmanager-0.4 )
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( sys-auth/consolekit )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	doc? ( >=dev-util/gtk-doc-1.8 )
+	vala? ( $(vala_depend) )"
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See http://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See http://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	# Don't build tests
+	epatch "${FILESDIR}/${PN}-0.9_rc3-fix-tests.patch"
+	# Build against libnl:1.1 for net-wireless/wimax-1.5.2 compatibility
+	epatch "${FILESDIR}/${PN}-0.9.4.0-force-libnl1.1-r1.patch"
+	# Update init.d script to provide net and use inactive status if not connected
+	epatch "${FILESDIR}/${PN}-0.9.2.0-init-provide-net-r1.patch"
+	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
+	epatch "${FILESDIR}/${PN}-0.9.2.0-pre-sleep.patch"
+	# Bug #335147, https://bugzilla.gnome.org/show_bug.cgi?id=679428
+	epatch "${FILESDIR}/${PN}-0.9.4.0-dhclient-ipv6.patch"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=683932
+	epatch "${FILESDIR}/${PN}-0.9.6.0-daemon-signals.patch"
+
+	epatch_user
+
+	use vala && vala_src_prepare
+	eautoreconf
+	default
+}
+
+src_configure() {
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+	ECONF="--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-distro=gentoo
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		--with-udev-dir=${udevdir}
+		--with-iptables=/sbin/iptables
+		--enable-concheck
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_enable ppp)
+		$(use_enable wimax)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(use_with doc docs)
+		$(use_with resolvconf)
+		$(use_enable vala)
+		$(use_with wext)
+		$(use_with wimax libnl-1)
+		$(systemd_with_unitdir)"
+
+		if use nss ; then
+			ECONF="${ECONF} $(use_with nss crypto=nss)"
+		else
+			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
+		fi
+
+		if use systemd; then
+			ECONF="${ECONF} --with-session-tracking=systemd"
+		else
+			ECONF="${ECONF} --with-session-tracking=ck"
+		fi
+
+	econf ${ECONF}
+}
+
+src_install() {
+	default
+	# /var/run/NetworkManager is used by some distros, but not by Gentoo
+	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	if use systemd; then
+		# Our init.d script requires running a dispatcher script that annoys
+		# systemd users; bug #434692
+		rm -rv "${ED}/etc/init.d" || die "rm failed"
+	else
+		# Provide openrc net dependency only when nm is connected
+		exeinto /etc/NetworkManager/dispatcher.d
+		newexe "${FILESDIR}/10-openrc-status-r3" 10-openrc-status
+		sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+			-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+		# Default conf.d file
+		newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+	fi
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
+
+	# Allow users in plugdev group to modify system connections
+	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
+		doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.pkla"
+	fi
+
+	# Remove useless .la files
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+}
+
+pkg_postinst() {
+	elog "To modify system network connections without needing to enter the"
+	elog "root password, add your user account to the 'plugdev' group."
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		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
+}