Bump to 0.7.999 -- final RC of networkmanager-0.8; add fix for bug 176873

Package-Manager: portage-2.1.7.16/cvs/Linux i686

5 files changed, 217 insertions, 3 deletions

diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index ca188bbfbc92..fabb1426e0c3 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,6 +1,8 @@
 DIST ModemManager-0.2_p20091109.tar.bz2 341075 RMD160 a69991be6cbc0cacafe358cf43f1863ee67a84bf SHA1 65f43243778a2fa1e43d0639954e0833a6e2da1e SHA256 3d383c423b571ce0bbe3bd117b02285eae6e0e071e1d9c435505f59c0de3f9c3
 DIST ModemManager-0.2_p20091123.tar.bz2 310043 RMD160 3c73c8445727618063df0bd75dd280547f3b4a1f SHA1 5468d9e89be20ee036db9bf9189cff2be6c1f8c1 SHA256 db82b5ab75e9a561718020b62766838832ab44ee03324201e21c618c12ac2d1a
+DIST ModemManager-0.3.tar.bz2 363848 RMD160 e23ef4492df4f292531b588f99853c6ede078433 SHA1 d4adf26da3ef015d7cc4e25d2ebbc692b6c566f8 SHA256 6bcfce70a26ed9c3162ba23fd0591029441c57e146d7ff4b2fd8036eb50945da
 EBUILD modemmanager-0.2_p20091109.ebuild 930 RMD160 edec43911195ef2557039bb708781b885efbf7a1 SHA1 5c243419198561be15b7316e91d7c7ba1a70a7b1 SHA256 81fdf1de088c3f3a13fa0de83282874afd8b9c79bec1f112c00d32a10a73be0b
 EBUILD modemmanager-0.2_p20091123.ebuild 930 RMD160 6169877d12f00a6480fc37946ca65f6b08a61214 SHA1 8a8fd67c97b168e51de3364a4f8d88f06f40da28 SHA256 fd695ef798902a50dca30009e3755a5b63b1b190f094219a9c10a1e538744799
-MISC ChangeLog 1272 RMD160 54bbcbd0d35a3d0500ae08ff409f8a279b134ec1 SHA1 fd608dbe1db2fe452884b7f013d4f6ce19b1e4be SHA256 264d9bc6d96d3baad8f5c33b97a07c5f0ab8afcdf9ede68c6266e57d27db4f7b
+EBUILD modemmanager-0.3.ebuild 1035 RMD160 b4a947723b60c92dde3d3d6c44cdf4f3ff786415 SHA1 79ff46b00b29837ce5c39ca233267760a054d61c SHA256 cc77b576f491a9b57a3f6383084374a1e226b6543c37de9278c1360bc7a6d05d
+MISC ChangeLog 1435 RMD160 e5e3b1bc6b33d4d6ab2d8a0c4ba954579a02cce0 SHA1 5f0be6599f51000e6809fad580a700120462fdb0 SHA256 ebfb20cf3ab140c813bb3f7fe40854ba0d876554951e3cbf3532d0a1aea9695d
 MISC metadata.xml 296 RMD160 d8f057fffd0d6d3c84b2d5481481f8848cc7f5aa SHA1 d3e950b1ca7636e89f44d3182753cb2384dcd11c SHA256 996385c7eb65b2fe398df26ebb0da85233a4f6c135a1256da9c53bd96ad450f4
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index de507da08c58..b4542aa62666 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.64 2010/01/22 19:19:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.65 2010/01/25 06:31:01 nirbheek Exp $
+
+*networkmanager-0.7.999 (25 Jan 2010)
+
+  25 Jan 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +networkmanager-0.7.999.ebuild,
+  +files/networkmanager-0.8-read-hostname.patch:
+  Bump to 0.7.999 -- final RC of networkmanager-0.8; add fix for bug 176873
 
   22 Jan 2010; Brent Baude <ranger@gentoo.org> networkmanager-0.7.2.ebuild:
   Marking networkmanager-0.7.2 ppc64 for bug 274688
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index cc925a31b10b..17b2a6b51149 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -4,6 +4,7 @@ AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382
 AUX networkmanager-0.7.0-gentoo-dhclient.patch 956 RMD160 7d7cb94256350c92e95d9adcf57cc891a84cc086 SHA1 95663877b428803bdbb540cda6effe5a29dda9c5 SHA256 da9c943969ad22a9ad465efc914644c7a6c600c0c88b8b2a8b8807ff05e5f7ae
 AUX networkmanager-0.7.1-bad-link.patch 655 RMD160 24a431665b604d111a9b10efa33ff066a4363aad SHA1 9de1073f681623cb156444fed53c19d03e06076d SHA256 92bf60b9a10d804d0c295e73f8525bce67e9d6e36dc7ccf5468243c21183c113
 AUX networkmanager-0.7.1-confchanges.patch 968 RMD160 7216f028613a29cf619029db3178cb0510aa3c1b SHA1 d818ddeb553862e18f0f796dcf30e53e25af0bd4 SHA256 5032ffd7fddbd9f67ef05ee0159f77e67b8c08b1aac9ef5209363fb02297d437
+AUX networkmanager-0.8-read-hostname.patch 2380 RMD160 8b4349293235d2b63546b4e65d30a94d91ab9a04 SHA1 f7d57c686e9bd1f1ac58e67efcd8255c0fc9a5c5 SHA256 5ee07a0fb949c7ce299f0d2459c4f9840ace765308cd1a208d89eecec51a63fe
 AUX networkmanager-resolvconf-perms.patch 532 RMD160 453ce19560e1872d1da1fa48e0c9a365025e6b1b SHA1 a81be4e9c9bac854e092b82529c4ae2c12cdf91c SHA256 e1786f34a75d2e0a27ceccb960cf975176260886f70cc3e9b172180f8a1d2e6e
 AUX networkmanager-updatedbackend.patch 17700 RMD160 685132b4a98843416264f06c480ff205fa87f789 SHA1 a83d2b0ea7e4a563af3d14567ba1da3605fbf654 SHA256 ee4a1583db867fd6a1851a9dd243401166f29ee9d00ad6e03e5b677915e5bf43
 AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b89d08f3baa3c2e58 SHA1 a9e269c9021888ca058b9fb72f9a71dc25a7488b SHA256 952948f41676fafcf76210cbef46728cbb219d6c851d5417d892b984fd725402
@@ -14,6 +15,7 @@ DIST NetworkManager-0.7.1-gentoo-patches-1b.tar.bz2 36726 RMD160 201e68e6760d615
 DIST NetworkManager-0.7.1.tar.bz2 1226975 RMD160 117677b5da4e66df0287e5a974c80709e988dcb3 SHA1 3f734b8c606bcc71a43c63ba3993524d8db807ca SHA256 7526a31de615a662cb09e915f26e5b151eda364240d983df6232aac8b9333f3a
 DIST NetworkManager-0.7.1_p20090824.tar.bz2 1188200 RMD160 5a532d310c206907a23b285919eb2eda2d46ea0c SHA1 133a32dff26906cc728bfd6c9daf3ad5b7aa34d9 SHA256 80de2cb86a85a3644495688df58385d4caa8d5bb8abb5f9480b08ca12a5b21d4
 DIST NetworkManager-0.7.2.tar.bz2 1315036 RMD160 b4cfe2cdb8df5a7ae7f6e7d580337e9cc9094e2b SHA1 0de68cb77698b4788f415b0361b48258f4734119 SHA256 8d6f47432ae372aaffdc78f056cec9e9fc6bb1547a454e0c1ad7d130a9198470
+DIST NetworkManager-0.7.999.tar.bz2 1374416 RMD160 e1d7500ba97a9393b9417f345658fda820c99013 SHA1 d3a8ee7ab5bd0d18394e4af59a97be1ba4ac07af SHA256 6fa351b3efc78cff4daa1f42386ba8435474bc121b4358a7d08bd7c9fb63aaef
 DIST NetworkManager-0.8.0_pre20090824.tar.bz2 1182851 RMD160 7ad9631bedb60218b1f3c59318fa9aa699b2fbfd SHA1 30761bf0d97f8495cbe565bcb913aebb3a13a6e1 SHA256 466864918d95fc56754743850a3c880da413b36c9a8c97faad2c07ab5231a4a3
 DIST NetworkManager-0.8.0_pre20091105.tar.bz2 1332837 RMD160 26ff456e841d7c6ac7e1e42424834290541ee9f0 SHA1 d2694da7656c0e0172d771929cad5be4afb08672 SHA256 fcb611d9ebf1df947837c5cced99c180056b0b047abd2d09f3605a1d7d192134
 DIST networkmanager-0.6.5_p20070823-updatedbackend.patch.bz2 5006 RMD160 f35c35a3db8dbd3178c8325a4eb8a641653a85f0 SHA1 5f9a3b1d85e4a08fa242ab1ff73c6d08ec2791d8 SHA256 0ee0ee38a3e5ac1f501d83dd424dd95e69871dd9e7d67cf2e09e9a378ae10fa8
@@ -23,7 +25,8 @@ EBUILD networkmanager-0.7.1-r3.ebuild 4258 RMD160 c6b0326c2080c2b9ce2b38d3fbfa9a
 EBUILD networkmanager-0.7.1-r6.ebuild 4033 RMD160 a0629b415c2cbcc2de8569dac2c67552a61d03d4 SHA1 5f1c4fa2d71818685a7dc0c1fdc3bfdab392df8d SHA256 7602f8b235552c2be536cb41bc60a3095cc86fe4754dd0ac141f294770607f98
 EBUILD networkmanager-0.7.1_p20090824.ebuild 3867 RMD160 1d39ff7fdd486ffa1a5914e5afdbc2b17abaa546 SHA1 5dbe17ece7800176fa7c2fd77e2c631eb696d17e SHA256 f9f4ef9115d43d94f080d426229b0cca840cb8606605915052636d50137b3925
 EBUILD networkmanager-0.7.2.ebuild 3707 RMD160 18fe37ad670fe2a39422502963ec2cf0c710b73d SHA1 68701111f54980fb1a66596b35700e9b73060391 SHA256 fcc749b95097b7e69ff913c4db82378f367097912c90bf5e4ba75774d82ed5ab
+EBUILD networkmanager-0.7.999.ebuild 3628 RMD160 1a33abca50f89fb0097b4a2a979ef91f2f96aec1 SHA1 fe5ce857e6cabe7f3fa294c0591652aba7e62a1a SHA256 a505a60cb691f57f80c907245ad4fb571a2dc42f5cfb3f0a1dd673699ed06748
 EBUILD networkmanager-0.8.0_pre20090824.ebuild 3592 RMD160 b29ac882a60371db56da46fd5663ca1e36a55fa9 SHA1 17fb43ec7c3227c34ec1231dcf3838d16fee9f00 SHA256 b53649f4ff13a661a6cb301c21eaedf47a9a04563336035f54549f63d3e066ea
 EBUILD networkmanager-0.8.0_pre20091105.ebuild 3632 RMD160 bff120fde330c83e399849419afffaf90902cf5b SHA1 a60577a23706b649d96bd173a5a100f2ce933f56 SHA256 c0ae7b8cfdd3b278ae785bb301c24258f19e00ed41f363bcc37e06d5caa9e062
-MISC ChangeLog 13316 RMD160 0aeaab0aa5c2da6a1cc5d71628164d2805230509 SHA1 826c238ce10cbc0ecd47f7b3fe2ea2b99a209297 SHA256 3109ee298846986c89de1d99dd9af656cf260cbdf0820672a42c99fdc18a1d3c
+MISC ChangeLog 13571 RMD160 0dd3d8f8909d771da0fd26c15c091e7bd6f4be2d SHA1 cb53c50891ba918abba0b24cf0783ce70336217b SHA256 95b20cbc68ceb81ca18b88103520a22071778d7d6cc95755310110a76e0c7171
 MISC metadata.xml 877 RMD160 3e1ebf2aa4a389fbe59a857c06f506ddce78732a SHA1 eb850ae305329cce36279a90295c910400dd18c4 SHA256 10e0f84ec0ab6b5bddc188530f3ff89952a14fe822fd8756e352230e763a9de0
diff --git a/net-misc/networkmanager/files/networkmanager-0.8-read-hostname.patch b/net-misc/networkmanager/files/networkmanager-0.8-read-hostname.patch
new file mode 100644
index 000000000000..ac59fe26ca26
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.8-read-hostname.patch
@@ -0,0 +1,76 @@
+When reading hostname from NM keyfile, if no hostname is set, read from the
+system file at /etc/conf.d/hostname to set hostname. This patch is not meant to
+be ever upstreamed. Proper fix is to write a gentoo-specific ifcfg plugin.
+
+To change hostname, touch nm-system-settings.conf, which will reload the keyfile
+and cause /etc/conf.d/hostname to be reloaded.
+
+This horrible hack fixes http://bugs.gentoo.org/176873
+
+Author: Nirbheek Chauhan <nirbheek@gentoo.org>
+Reviewed-by: Arun Raghavan <ford_prefect@gentoo.org>
+
+---
+--- system-settings/plugins/keyfile/plugin.c
++++ system-settings/plugins/keyfile/plugin.c
+@@ -43,6 +43,9 @@
+ #define KEYFILE_PLUGIN_INFO "(c) 2007 - 2008 Red Hat, Inc.  To report bugs please use the NetworkManager mailing list."
+ 
+ #define CONF_FILE SYSCONFDIR "/NetworkManager/nm-system-settings.conf"
++#ifdef TARGET_GENTOO
++#define HOSTNAME_FILE SYSCONFDIR "/conf.d/hostname"
++#endif
+ 
+ static char *plugin_get_hostname (SCPluginKeyfile *plugin);
+ static void system_config_interface_init (NMSystemConfigInterface *system_config_interface_class);
+@@ -381,6 +384,12 @@
+ 	GKeyFile *key_file;
+ 	char *hostname = NULL;
+ 	GError *error = NULL;
++#ifdef TARGET_GENTOO
++	char *contents = NULL;
++	char **lines = NULL, **line;
++	GError *contents_err = NULL;
++	gsize contents_len = 0;
++#endif
+ 
+ 	key_file = g_key_file_new ();
+ 	if (g_key_file_load_from_file (key_file, CONF_FILE, G_KEY_FILE_NONE, &error))
+@@ -392,7 +401,37 @@
+ 
+ 	g_key_file_free (key_file);
+ 
++	if (hostname)
++		goto out;
++#ifdef TARGET_GENTOO
++	/* If hostname is unset in keyfile, read system file to get hostname */
++	if (!g_file_get_contents (HOSTNAME_FILE, &contents,
++				  &contents_len, &contents_err))
++		goto out;
++
++	lines = g_strsplit_set (contents, "\n\r", 0);
++	if (!lines)
++		goto out;
++
++	for (line = lines; *line; line++) {
++		if (!g_str_has_prefix (*line, "hostname="))
++			continue;
++		hostname = g_strsplit_set (g_strsplit_set (*line, "=", 0)[1], "#", 0)[0];
++		g_strstrip (hostname);
++		if (!hostname)
++			goto out;
++		/* Remove quotes surrounding hostname */
++		if (hostname[0] == '"' && hostname[strlen(hostname)-1] == '"')
++			contents = g_strndup(&hostname[1], strlen(hostname)-2);
++		/* Un-escape before using to imitate librc behaviour */
++		hostname = g_strcompress (contents);
++	}
++
++out:
++	g_error_free(contents_err);
++
+ 	return hostname;
++#endif
+ }
+ 
+ static gboolean
diff --git a/net-misc/networkmanager/networkmanager-0.7.999.ebuild b/net-misc/networkmanager/networkmanager-0.7.999.ebuild
new file mode 100644
index 000000000000..f7736b3c88ab
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.7.999.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.999.ebuild,v 1.1 2010/01/25 06:31:01 nirbheek Exp $
+
+EAPI="2"
+
+inherit gnome.org eutils
+
+# NetworkManager likes itself with capital letters
+MY_PN=${PN/networkmanager/NetworkManager}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd resolvconf connection-sharing"
+
+RDEPEND=">=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.75
+	>=net-wireless/wireless-tools-28_pre9
+	>=sys-fs/udev-145[extras]
+	>=dev-libs/glib-2.18
+	>=sys-auth/polkit-0.92
+	>=dev-libs/libnl-1.1
+	>=net-misc/modemmanager-0.2
+	>=net-wireless/wpa_supplicant-0.5.10[dbus]
+	bluetooth? ( net-wireless/bluez )
+	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
+	avahi? ( net-dns/avahi[autoipd] )
+	gnutls? (
+		nss? ( >=dev-libs/nss-3.11 )
+		!nss? ( dev-libs/libgcrypt
+			net-libs/gnutls ) )
+	!gnutls? ( >=dev-libs/nss-3.11 )
+	dhclient? (
+		dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+		!dhcpcd? ( >=net-misc/dhcp-3.0.0 ) )
+	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	net-dialup/ppp
+	>=dev-util/gtk-doc-1.8
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Fix up the dbus conf file to use plugdev group
+	epatch "${FILESDIR}/${PN}-0.7.1-confchanges.patch"
+
+	# Hack keyfile plugin to read hostname file, fixes bug 176873
+	epatch "${FILESDIR}/${PN}-0.8-read-hostname.patch"
+}
+
+src_configure() {
+	ECONF="--disable-more-warnings
+		--localstatedir=/var
+		--with-distro=gentoo
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		--with-udev-dir=/etc/udev
+		--with-iptables=/sbin/iptables
+		$(use_enable doc gtk-doc)
+		$(use_with doc docs)
+		$(use_with resolvconf)"
+
+	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
+	if use dhclient ; then
+		if use dhcpcd ; then
+			ECONF="${ECONF} --with-dhcp-client=dhcpcd"
+		else
+			ECONF="${ECONF} --with-dhcp-client=dhclient"
+		fi
+	else
+		ECONF="${ECONF} --with-dhcp-client=dhcpcd"
+	fi
+
+	# default is NSS (if none or both are specified), GnuTLS otherwise
+	if use gnutls ; then
+		if use nss ; then
+			ECONF="${ECONF} --with-crypto=nss"
+		else
+			ECONF="${ECONF} --with-crypto=gnutls"
+		fi
+	else
+		ECONF="${ECONF} --with-crypto=nss"
+	fi
+
+	econf ${ECONF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# 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
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
+		|| die "newins failed"
+}
+
+pkg_postinst() {
+	elog "You will need to restart DBUS if this is your first time"
+	elog "installing NetworkManager."
+	elog ""
+	elog "To save system-wide settings as a user, that user needs to have the"
+	elog "right policykit privileges. You can add them by running:"
+	elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"'
+}