[gentoo-commits] proj/gnome:gnome-next commit in: net-misc/networkmanager/, net-misc/networkmanager/files/

[Alexandre Restovtsev]

commit:     cd412456377f71593b058f0b2930bcfd798fa26a
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Sep 30 23:43:53 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Sep 30 23:43:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cd412456

net-misc/networkmanager: add 0.9.1.90

Needed for nm-applet-0.9.1.90.

---
 .../files/networkmanager-0.9.1.90-rfkill.patch     |  133 +++++++++++++++++++
 .../files/networkmanager-0.9_rc3-fix-tests.patch   |   18 +++
 .../files/nm-system-settings.conf-ifnet            |    6 +
 .../networkmanager/networkmanager-0.9.1.90.ebuild  |  138 ++++++++++++++++++++
 4 files changed, 295 insertions(+), 0 deletions(-)

diff --git a/net-misc/networkmanager/files/networkmanager-0.9.1.90-rfkill.patch b/net-misc/networkmanager/files/networkmanager-0.9.1.90-rfkill.patch
new file mode 100644
index 0000000..0ddf3ad
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.9.1.90-rfkill.patch
@@ -0,0 +1,133 @@
+From 339229e4c698c61e20a28bfc33d8501490891427 Mon Sep 17 00:00:00 2001
+From: Gary Ching-Pang Lin <chingpang@×××××.com>
+Date: Tue, 20 Sep 2011 08:36:35 +0000
+Subject: core: improving handling of rfkill (bgo #655773)
+
+This commit improves the handling of rfkill.
+
+- The original two passes check gathers the states of platform
+  and non-platform switches in two separate loops. Now we gather
+  the both states in one loop and determine the final states later.
+
+- A new rule is used to determine the states of switches.
+
+  if (platform_state == UNBLOCKED)
+          choose non_platform_state;
+  else
+          choose platform_state;
+
+  The state is UNBLOCKED if and only if both the platform and
+  non-platform switches are unblocked, so the ambiguous state in
+  bgo#655773 will not happen.
+
+  Original code always preferred the platform switch state over
+  the device switch state, so if the platform switch was UNBLOCKED
+  but the device was BLOCKED, NM would treat the device as
+  UNBLOCKED and try to activate it, and obviously fail.
+---
+diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c
+index 72501c2..3e855b7 100644
+--- a/src/nm-udev-manager.c
++++ b/src/nm-udev-manager.c
+@@ -195,78 +195,50 @@ recheck_killswitches (NMUdevManager *self)
+ 	NMUdevManagerPrivate *priv = NM_UDEV_MANAGER_GET_PRIVATE (self);
+ 	GSList *iter;
+ 	RfKillState poll_states[RFKILL_TYPE_MAX];
++	RfKillState platform_states[RFKILL_TYPE_MAX];
+ 	gboolean platform_checked[RFKILL_TYPE_MAX];
+ 	int i;
+ 
+ 	/* Default state is unblocked */
+ 	for (i = 0; i < RFKILL_TYPE_MAX; i++) {
+ 		poll_states[i] = RFKILL_UNBLOCKED;
++		platform_states[i] = RFKILL_UNBLOCKED;
+ 		platform_checked[i] = FALSE;
+ 	}
+ 
+-	/* Perform two passes here; the first pass is for non-platform switches,
+-	 * which typically if hardkilled cannot be changed except by a physical
+-	 * hardware switch.  The second pass checks platform killswitches, which
+-	 * take precedence over device killswitches, because typically platform
+-	 * killswitches control device killswitches.  That is, a hardblocked device
+-	 * switch can often be unblocked by a platform switch.  Thus if we have
+-	 * a hardblocked device switch and a softblocked platform switch, the
+-	 * combined state should be softblocked since the platform switch can be
+-	 * unblocked to change the device switch.
+-	 */
+-
+-	/* Device switches first */
++	/* Poll the states of all killswitches */
+ 	for (iter = priv->killswitches; iter; iter = g_slist_next (iter)) {
+ 		Killswitch *ks = iter->data;
+ 		GUdevDevice *device;
+ 		RfKillState dev_state;
+ 		int sysfs_state;
+ 
+-		if (ks->platform == FALSE) {
+-			device = g_udev_client_query_by_subsystem_and_name (priv->client, "rfkill", ks->name);
+-			if (device) {
+-				sysfs_state = g_udev_device_get_property_as_int (device, "RFKILL_STATE");
+-				dev_state = sysfs_state_to_nm_state (sysfs_state);
++		device = g_udev_client_query_by_subsystem_and_name (priv->client, "rfkill", ks->name);
++		if (device) {
++			sysfs_state = g_udev_device_get_property_as_int (device, "RFKILL_STATE");
++			dev_state = sysfs_state_to_nm_state (sysfs_state);
++			if (ks->platform == FALSE) {
+ 				if (dev_state > poll_states[ks->rtype])
+ 					poll_states[ks->rtype] = dev_state;
+-				g_object_unref (device);
+-			}
+-		}
+-	}
+-
+-	/* Platform switches next; their state overwrites device state */
+-	for (iter = priv->killswitches; iter; iter = g_slist_next (iter)) {
+-		Killswitch *ks = iter->data;
+-		GUdevDevice *device;
+-		RfKillState dev_state;
+-		int sysfs_state;
+-
+-		if (ks->platform == TRUE) {
+-			device = g_udev_client_query_by_subsystem_and_name (priv->client, "rfkill", ks->name);
+-			if (device) {
+-				sysfs_state = g_udev_device_get_property_as_int (device, "RFKILL_STATE");
+-				dev_state = sysfs_state_to_nm_state (sysfs_state);
+-
+-				if (platform_checked[ks->rtype] == FALSE) {
+-					/* Overwrite device state with platform state for first
+-					 * platform switch found.
+-					 */
+-					poll_states[ks->rtype] = dev_state;
+-					platform_checked[ks->rtype] = TRUE;
+-				} else {
+-					/* If there are multiple platform switches of the same type,
+-					 * take the "worst" state for all of that type.
+-					 */
+-					if (dev_state > poll_states[ks->rtype])
+-						poll_states[ks->rtype] = dev_state;
+-				}
+-				g_object_unref (device);
++			} else {
++				platform_checked[ks->rtype] = TRUE;
++				if (dev_state > platform_states[ks->rtype])
++					platform_states[ks->rtype] = dev_state;
+ 			}
++			g_object_unref (device);
+ 		}
+ 	}
+ 
+ 	/* Log and emit change signal for final rfkill states */
+ 	for (i = 0; i < RFKILL_TYPE_MAX; i++) {
++		if (platform_checked[i] == TRUE) {
++			/* blocked platform switch state overrides device state, otherwise
++			 * let the device state stand. (bgo #655773)
++			 */
++			if (platform_states[i] != RFKILL_UNBLOCKED)
++				poll_states[i] = platform_states[i];
++		}
++
+ 		if (poll_states[i] != priv->rfkill_states[i]) {
+ 			nm_log_dbg (LOGD_RFKILL, "%s rfkill state now '%s'",
+ 			            rfkill_type_to_desc (i),
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/net-misc/networkmanager/files/networkmanager-0.9_rc3-fix-tests.patch b/net-misc/networkmanager/files/networkmanager-0.9_rc3-fix-tests.patch
new file mode 100644
index 0000000..7bd8a2b
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.9_rc3-fix-tests.patch
@@ -0,0 +1,18 @@
+--- configure.ac
++++ configure.ac
+@@ -577,7 +577,6 @@
+ src/settings/plugins/ifupdown/Makefile
+ src/settings/plugins/ifupdown/tests/Makefile
+ src/settings/plugins/ifnet/Makefile
+-src/settings/plugins/ifnet/tests/Makefile
+ src/settings/plugins/ifcfg-rh/Makefile
+ src/settings/plugins/ifcfg-rh/tests/Makefile
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
+--- src/settings/plugins/ifnet/Makefile.am
++++ src/settings/plugins/ifnet/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . tests
++SUBDIRS = .
+ INCLUDES = \
+        -I$(top_srcdir)/src/settings \
+        -I$(top_srcdir)/include \

diff --git a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet b/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
new file mode 100644
index 0000000..4d14ee7
--- /dev/null
+++ b/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
@@ -0,0 +1,6 @@
+[main]
+plugins=ifnet,keyfile
+
+[ifnet]
+managed=true
+auto_refresh=false

diff --git a/net-misc/networkmanager/networkmanager-0.9.1.90.ebuild b/net-misc/networkmanager/networkmanager-0.9.1.90.ebuild
new file mode 100644
index 0000000..73ea51e
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.9.1.90.ebuild
@@ -0,0 +1,138 @@
+# 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.9.0.ebuild,v 1.1 2011/08/23 23:17:09 nirbheek Exp $
+
+EAPI="4"
+GNOME_ORG_MODULE="NetworkManager"
+
+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"
+SLOT="0"
+IUSE="avahi bluetooth doc +nss gnutls dhclient +dhcpcd +introspection
+	kernel_linux +ppp resolvconf connection-sharing wimax"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="
+	^^ ( 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
+# TODO: Qt support?
+COMMON_DEPEND=">=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.75
+	>=net-wireless/wireless-tools-28_pre9
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] )
+	>=dev-libs/glib-2.26
+	>=sys-auth/polkit-0.97
+	>=dev-libs/libnl-1.1
+	>=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-misc/modemmanager-0.4
+		>=net-dialup/ppp-2.4.5 )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )
+	wimax? ( >=net-wireless/wimax-1.5.1 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-auth/consolekit"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+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
+}
+
+src_prepare() {
+	# Don't build tests
+	epatch "${FILESDIR}/${PN}-0.9_rc3-fix-tests.patch"
+	# Fix rfkill handling, will be in next release
+	epatch "${FILESDIR}/${P}-rfkill.patch"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	ECONF="--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-distro=gentoo
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		--with-udev-dir=/lib/udev
+		--with-iptables=/sbin/iptables
+		$(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)
+		$(systemd_with_unitdir)"
+
+		if use nss ; then
+			ECONF="${ECONF} $(use_with nss crypto=nss)"
+		else
+			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
+		fi
+
+	econf ${ECONF}
+}
+
+src_install() {
+	default
+	# Need to keep the /var/run/NetworkManager directory
+	keepdir /var/run/NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf
+
+	# Remove useless .la files
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+}