New version of NetworkManager (0.8) is officially out!

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

6 files changed, 66 insertions, 108 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index cf3b7ecc7cca..550b99a3432e 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,15 @@
 # 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.68 2010/01/25 17:48:26 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.69 2010/02/26 10:23:29 dagger Exp $
+
+*networkmanager-0.8 (26 Feb 2010)
+
+  26 Feb 2010; Robert Piasek <dagger@gentoo.org>
+  -networkmanager-0.6.5_p20070823.ebuild, -networkmanager-0.7.999.ebuild,
+  +networkmanager-0.8.ebuild,
+  +files/networkmanager-0.8-nscd-clear-cache.patch:
+  New version of Networkmanager (0.8) is now out. Removed anvient and RC
+  versions.
 
   25 Jan 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
   networkmanager-0.7.999.ebuild:
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 402b9f358407..600bf49c706e 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -4,25 +4,23 @@ 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-nscd-clear-cache.patch 1214 RMD160 2381f455593202a740e634601c0ba8245ecb8fac SHA1 b4a0cec446b6f8fa81c06d5992db61b296f17057 SHA256 2d981bafa96607acb06740d78b8e33afdc675c52b0cf3ce5b098c67566362c99
 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
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
-DIST NetworkManager-0.6.5_p20070823.tar.gz 956975 RMD160 9d8556e3b5fc3155632bafdb726a5861412ae94b SHA1 c1d795cf114d2f5951a746eb4aa770e54eece9b6 SHA256 e6181ac9aadf1c36a20b979d313cfd0ae947bcf93f61c1c028cc1642c216454c
 DIST NetworkManager-0.6.6.tar.gz 984114 RMD160 f0672ee31001f83b06f6b93c30a01f37ee12ed6e SHA1 c5d0bcf7d262e1b600df6dad9f6f4baada293634 SHA256 36d48a11957e1c4f53a685b0fcc7d060e8972b435501c92b10737bb844dd95e2
 DIST NetworkManager-0.7.1-gentoo-patches-1b.tar.bz2 36726 RMD160 201e68e6760d6154744e0570e63fc4c7b62bdfb7 SHA1 c2df56df89f652a84287951dcb5c89497fc62b46 SHA256 e4684f0c49c3f1c55f8028a1a2fbe18d726a9aa1592f25e1bd61b9443bfe3060
 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.6.5_p20070823-updatedbackend.patch.bz2 5006 RMD160 f35c35a3db8dbd3178c8325a4eb8a641653a85f0 SHA1 5f9a3b1d85e4a08fa242ab1ff73c6d08ec2791d8 SHA256 0ee0ee38a3e5ac1f501d83dd424dd95e69871dd9e7d67cf2e09e9a378ae10fa8
-EBUILD networkmanager-0.6.5_p20070823.ebuild 2703 RMD160 f26ac7b1b243c9be2e087042984453230d1b65f4 SHA1 d8d21f867a132d1368429b5f57d93be594a8a919 SHA256 bf05ebe5e345e0016b0391708813f1ae78ea10446dbbfd8c2f9d82a456b158e9
+DIST NetworkManager-0.8.tar.bz2 1376044 RMD160 40074f52a79965510de816c0e94d1b9ac582c522 SHA1 fd290057a9246055fa59507b6a3d6b99ceb4c3dc SHA256 4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05
 EBUILD networkmanager-0.6.6.ebuild 2621 RMD160 7516ea6287cfe7c9b98e4f8e5203bf4b1642c8e6 SHA1 6dfc5a1e518e5b4b335a28ceeb248f8e1c639175 SHA256 8dce1c81ef039889d0bdd0ec9c18a3f3da14b42f20ba6ced5639808d6708bbe5
 EBUILD networkmanager-0.7.1-r3.ebuild 4258 RMD160 c6b0326c2080c2b9ce2b38d3fbfa9a1ce2b3701e SHA1 94a04331112af1fa7b8ec15952986fcf595a3642 SHA256 e81b0014fa33828404ec9f9b3f1d8d6743f7979f46534c7173ee2d0f24c500f6
 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 3604 RMD160 88bce62bc9a5e565c5365d8546e95aa1458ef19c SHA1 1880b5422e98e1ea8d649610886c239fe8efe26b SHA256 9c3479b8e56991acf108a0858d0f9103d57e3ff65ceaa19a0a276fb729645f9e
-MISC ChangeLog 14072 RMD160 82c124089982b8bd55727ae60375d050079403ee SHA1 46e717df66c3316f57c13f49a83c69e2b04d91e9 SHA256 7ae32f7d0fc2d0f7e4f6a11982a3dee550e5f48017d45a1f9e18fd2670cceb8e
-MISC metadata.xml 933 RMD160 63395375698331bad2b3fe4dbe2bb863f9851a84 SHA1 b8679894398e5b70fe53b03b20ba89146fdd30c8 SHA256 5fa990451e3e87fdceba75ae1daf6c26a2d414e858cdb7d6f73f7757f25df996
+EBUILD networkmanager-0.8.ebuild 3699 RMD160 04a0c89570f4e83565e9db564c3034a89aeaffac SHA1 fedd56294261795b7f19bd8ca8372d930f6a0aa8 SHA256 15e63405498f7bd8d0cbb04d899e381e0a779994b1456178335b0b41b7e8a815
+MISC ChangeLog 14396 RMD160 9aa10804c750d6c7da4882de2d14792392b1d651 SHA1 5892faa35f2b8f573b508f1d4f976a39f08a34a2 SHA256 2e3414ae6aa0eb426f41363e4b2c519e6486f18c4bec1993d2d323bcf4c199ef
+MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de32f78915bbc01c6b0665b45233d004d75c25 SHA256 e0ce95394f82f5631ecec62c6595dc4dad9afc52cf5e1bb0f30618edfb79becc
diff --git a/net-misc/networkmanager/files/networkmanager-0.8-nscd-clear-cache.patch b/net-misc/networkmanager/files/networkmanager-0.8-nscd-clear-cache.patch
new file mode 100644
index 000000000000..e92c883c2cb8
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.8-nscd-clear-cache.patch
@@ -0,0 +1,42 @@
+From 327e00f06358ef388f4fad5abcb016daa0ec3452 Mon Sep 17 00:00:00 2001
+From: Robert Piasek <dagger@gentoo.org>
+Date: Mon, 22 Feb 2010 10:34:23 +0000
+Subject: [PATCH] fix: use nscd -i to clear cache
+
+
+Signed-off-by: Robert Piasek <dagger@gentoo.org>
+---
+ src/backends/NetworkManagerGentoo.c |   11 +++++------
+ 1 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c
+index 7fa1207..aa4b40c 100644
+--- a/src/backends/NetworkManagerGentoo.c
++++ b/src/backends/NetworkManagerGentoo.c
+@@ -34,6 +34,7 @@
+ #include "NetworkManagerGeneric.h"
+ #include "NetworkManagerSystem.h"
+ #include "NetworkManagerUtils.h"
++#include "nm-utils.h"
+ 
+ /*
+  * nm_system_enable_loopback
+@@ -57,11 +58,9 @@ void nm_system_enable_loopback (void)
+  */
+ void nm_system_update_dns (void)
+ {
+- #ifdef NM_NO_NAMED
+-	if (nm_spawn_process ("/etc/init.d/nscd status") == 0)
+-		nm_spawn_process ("/etc/init.d/nscd restart");
+- #else
+-	nm_spawn_process("/usr/bin/killall -q nscd");
+- #endif
++	if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
++		nm_info ("Clearing nscd hosts cache.");
++		nm_spawn_process ("/usr/sbin/nscd -i hosts");
++	}
+ }
+ 
+-- 
+1.7.0
+
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 521a87d6cf69..1e6b51fdf997 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -3,10 +3,6 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-	<maintainer>
 		<email>dagger@gentoo.org</email>
 		<name>Robert Piasek</name>
 	</maintainer>
@@ -14,6 +10,10 @@
 		<email>nirbheek@gentoo.org</email>
 		<name>Nirbheek Chauhan</name>
 	</maintainer>
+        <maintainer>
+                <email>steev@gentoo.org</email>
+                <name>Stephen Klimaszewski</name>
+        </maintainer>
 	<use>
 		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for getting ip.</flag>
 		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip.</flag>
diff --git a/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild b/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild
deleted file mode 100644
index a2ac30468ad2..000000000000
--- a/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild,v 1.12 2009/04/24 12:26:41 rbu Exp $
-
-inherit gnome2 eutils
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-#http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.6/
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-	mirror://gentoo/${P}-updatedbackend.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE="crypt doc gnome"
-
-RDEPEND=">=sys-apps/dbus-0.60
-	>=sys-apps/hal-0.5
-	sys-apps/iproute2
-	=dev-libs/libnl-1.0_pre6*
-	!>=dev-libs/libnl-1.1
-	>=net-misc/dhcdbd-1.4
-	>=net-wireless/wireless-tools-28_pre9
-	>=net-wireless/wpa_supplicant-0.4.8
-	>=dev-libs/glib-2.8
-	gnome? ( >=x11-libs/gtk+-2.8
-		>=gnome-base/libglade-2
-		>=gnome-base/gnome-keyring-0.4
-		|| ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel )
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnomeui-2 )
-	crypt? ( dev-libs/libgcrypt )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.6.5 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-USE_DESTDIR="1"
-
-G2CONF="${G2CONF} \
-	`use_with crypt gcrypt` \
-	`use_with gnome` \
-	--disable-more-warnings \
-	--localstatedir=/var \
-	--with-distro=gentoo \
-	--with-dbus-sys=/etc/dbus-1/system.d \
-	--enable-notification-icon"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if built_with_use sys-apps/iproute2 minimal ; then
-		eerror "Please rebuild sys-apps/iproute2 without the minimal useflag."
-		die "Fix iproute2 first."
-	fi
-}
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	# Update to use our backend
-	epatch "${WORKDIR}/${P}-updatedbackend.patch"
-	# Use the kernel headers
-	epatch "${FILESDIR}/${PN}-use-kernel-headers.patch"
-	# Fix the resolv.conf permissions
-	epatch "${FILESDIR}/${PN}-resolvconf-perms.patch"
-	# Fix up the dbus conf file to use plugdev group
-	epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch"
-}
-
-src_install() {
-	gnome2_src_install
-	# Need to keep the /var/run/NetworkManager directory
-	keepdir /var/run/NetworkManager
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "You need to be in the plugdev group in order to use NetworkManager"
-	elog "Problems with your hostname getting changed?"
-	elog ""
-	elog "Add the following to /etc/dhcp/dhclient.conf"
-	elog 'send host-name "YOURHOSTNAME";'
-	elog 'supersede host-name "YOURHOSTNAME";'
-
-	elog "You will need to restart DBUS if this is your first time"
-	elog "installing NetworkManager."
-}
diff --git a/net-misc/networkmanager/networkmanager-0.7.999.ebuild b/net-misc/networkmanager/networkmanager-0.8.ebuild
index 3aede63fe754..3e3a76075113 100644
--- a/net-misc/networkmanager/networkmanager-0.7.999.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2010/01/25 17:48:26 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.ebuild,v 1.1 2010/02/26 10:23:29 dagger Exp $
 
 EAPI="2"
 
@@ -58,7 +58,10 @@ src_prepare() {
 	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"
+	epatch "${FILESDIR}/${P}-read-hostname.patch"
+
+	# Clear NSCD cache rather then kill daemon bug 301720
+	epatch "${FILESDIR}/${P}-nscd-clear-cache.patch"
 }
 
 src_configure() {