New version of NetworkManager (0.8) is officially out!

(Portage version: 2.1.7.17/cvs/Linux x86_64)

5 files changed, 61 insertions, 101 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/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() {