Fix bug #267349 by Daniel Gryniewicz, NetworkManager-0.7 links against

installed version of nm-util, specify udev directory for bug #267168.
Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

6 files changed, 58 insertions, 17 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 625d67d15566..037242e3439e 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.41 2009/04/24 12:26:41 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.42 2009/04/25 14:27:22 rbu Exp $
+
+*networkmanager-0.7.1-r1 (25 Apr 2009)
+
+  25 Apr 2009; Robert Buchholz <rbu@gentoo.org>
+  files/networkmanager-0.7.0-gentoo-dhclient.patch,
+  +files/networkmanager-0.7.1-bad-link.patch, -networkmanager-0.7.1.ebuild,
+  +networkmanager-0.7.1-r1.ebuild:
+  Fix bug #267349 by Daniel Gryniewicz, NetworkManager-0.7 links against
+  installed version of nm-util, specify udev directory for bug #267168.
 
   24 Apr 2009; Robert Buchholz <rbu@gentoo.org>
   +networkmanager-0.6.5_p20070823.ebuild:
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 6030af9dec2c..efa45d943eba 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,7 +1,8 @@
 AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e
 AUX networkmanager-0.6.5-confchanges.patch 1053 RMD160 ae76d5c029090848a9264e7559aaab90e7f3c084 SHA1 4847532aa15316a1a45e8667cd7947b514a1833f SHA256 bf3418ccbf8643d14b0413cf7a9d25290003d4443a7a051bb54f953aebede84f
 AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382fad56c7d8e21d4 SHA1 35706e9807e923732e3ac1db9c1e7d7a9f0bcc8f SHA256 ffd4fdf452a5791d938406d33b432aff591ab7e475583a66343a5c98ee6091af
-AUX networkmanager-0.7.0-gentoo-dhclient.patch 1034 RMD160 6414765a9e01985a3c3c20f9c855fdfbc5851ae0 SHA1 8c646f39f40d79220ee790f98b126f2f7a18edcc SHA256 cd4bc70ced0be525c6eec692c5fd68721b7e3b989c7f55635b0b367fe6dbaa1c
+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-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
@@ -13,7 +14,7 @@ DIST NetworkManager-0.7.1.tar.bz2 1226975 RMD160 117677b5da4e66df0287e5a974c8070
 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
 EBUILD networkmanager-0.6.6.ebuild 2621 RMD160 7516ea6287cfe7c9b98e4f8e5203bf4b1642c8e6 SHA1 6dfc5a1e518e5b4b335a28ceeb248f8e1c639175 SHA256 8dce1c81ef039889d0bdd0ec9c18a3f3da14b42f20ba6ced5639808d6708bbe5
-EBUILD networkmanager-0.7.0.ebuild 3784 RMD160 a4fa8a03d23c568bfc172710123d827ef7f766c5 SHA1 71e944e28f49adbb1014d7decc5058bdb9c24218 SHA256 2f97a38ec23745e6b4235693c53a79d577faaed9dbd4876e6da0b9efff7f0bd0
-EBUILD networkmanager-0.7.1.ebuild 4052 RMD160 1e80ba95c0050939ebbd5ec01fdf2c9ccca2e547 SHA1 1721225ba50988f1ddd289a46ec7b7f1ef1213f3 SHA256 5fe865a09d7174bd7050d4f8c478527ec36ffa326e92dc8a7418af6a13162818
-MISC ChangeLog 9270 RMD160 d2a9004ba463eda8d203d03b397606c61225ebb9 SHA1 0303b44db87a36c810cbc9386624b5058fd2824d SHA256 991f51f04a1c2b9ca0fe5d22905435002c3992c49f7b5c087fba90f840321b65
+EBUILD networkmanager-0.7.0.ebuild 3783 RMD160 81c88e8d04ef13dc350c79ce56efef3b41e7b657 SHA1 87b1c84937850409cb6c9d0e8d91913aab88fbe1 SHA256 c9f4155a47f50128feec7eb52c34741d09089a7d34482aedaf8c541fe44e92bb
+EBUILD networkmanager-0.7.1-r1.ebuild 4137 RMD160 55b06282a348fd28cfbd5c83600dd3faec79da20 SHA1 317f98989febd259720057e8434079301f22ee61 SHA256 b6d4d559200d3145a22f9c7006f65c1a8a02cebab9b5ad4ab4cb6d72c3243853
+MISC ChangeLog 9667 RMD160 69cfd3c31c512717f8a26510adb31f1d5c260303 SHA1 8d4e780aa3f9068e064a5297e0e94504b7b218ba SHA256 eb6b4ed10b5b053aff319cd20d6f9d314de7625c7cdd314791aac0e94fe84d0b
 MISC metadata.xml 981 RMD160 3bc47188c37b22140511a58a3dc9ff7b0e7ddcef SHA1 cf4a964ae0b40a0e9440799d41a8296d940bfcfd SHA256 4f0dcfe4b5a1453d76259c25f501505fa52c4b547634ce1768391eabfe13a06d
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch b/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch
index ba2cf4377d8e..fa21c7680817 100644
--- a/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch
+++ b/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch
@@ -1,7 +1,17 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN NetworkManager-0.7.0.orig/src/dhcp-manager/nm-dhcp-dhclient.c NetworkManager-0.7.0/src/dhcp-manager/nm-dhcp-dhclient.c
---- NetworkManager-0.7.0.orig/src/dhcp-manager/nm-dhcp-dhclient.c	2008-11-12 16:29:43.000000000 -0500
-+++ NetworkManager-0.7.0/src/dhcp-manager/nm-dhcp-dhclient.c	2009-04-21 11:38:18.000000000 -0400
-@@ -161,6 +161,8 @@ create_dhclient_config (NMDHCPDevice *de
+From 33547b8d8b64a10187b9c452eef7325d909889a1 Mon Sep 17 00:00:00 2001
+From: Daniel Gryniewicz <dang@gentoo.org>
+Date: Thu, 23 Apr 2009 10:42:43 -0400
+Subject: [PATCH] dhcp: use correct dhclient config file location for Gentoo (bgo #579737)
+
+---
+ src/dhcp-manager/nm-dhcp-dhclient.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
+index 946be0c..34b36f1 100644
+--- a/src/dhcp-manager/nm-dhcp-dhclient.c
++++ b/src/dhcp-manager/nm-dhcp-dhclient.c
+@@ -167,6 +167,8 @@ create_dhclient_config (NMDHCPDevice *device, NMSettingIP4Config *s_ip4)
  	orig = g_strdup (SYSCONFDIR "/dhclient.conf");
  #elif defined(TARGET_DEBIAN)
  	orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf");
@@ -10,5 +20,6 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN NetworkManager-0.7.0.ori
  #else
  	orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", device->iface);
  #endif
-Files NetworkManager-0.7.0.orig/src/dhcp-manager/.nm-dhcp-manager.c.swp and NetworkManager-0.7.0/src/dhcp-manager/.nm-dhcp-manager.c.swp differ
-Files NetworkManager-0.7.0.orig/src/named-manager/.nm-named-manager.c.swp and NetworkManager-0.7.0/src/named-manager/.nm-named-manager.c.swp differ
+-- 
+1.6.2
+
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch b/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch
new file mode 100644
index 000000000000..ea074bae821a
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch
@@ -0,0 +1,15 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN NetworkManager-0.7.1.orig/src/ppp-manager/Makefile.am NetworkManager-0.7.1/src/ppp-manager/Makefile.am
+--- NetworkManager-0.7.1.orig/src/ppp-manager/Makefile.am	2009-03-03 11:55:47.000000000 -0500
++++ NetworkManager-0.7.1/src/ppp-manager/Makefile.am	2009-04-24 11:32:58.000000000 -0400
+@@ -47,9 +47,9 @@ nm_pppd_plugin_la_CPPFLAGS = \
+ nm_pppd_plugin_la_LDFLAGS = -module -avoid-version
+ 
+ nm_pppd_plugin_la_LIBADD = \
++	$(top_builddir)/libnm-util/libnm-util.la \
+ 	$(DBUS_LIBS) \
+-	$(GLIB_LIBS) \
+-	$(top_builddir)/libnm-util/libnm-util.la
++	$(GLIB_LIBS)
+ 
+ BUILT_SOURCES = nm-ppp-manager-glue.h
+ 
diff --git a/net-misc/networkmanager/networkmanager-0.7.0.ebuild b/net-misc/networkmanager/networkmanager-0.7.0.ebuild
index 55d83ca008a1..10aff8e1510f 100644
--- a/net-misc/networkmanager/networkmanager-0.7.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.7.0.ebuild,v 1.3 2009/04/21 15:59:57 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.0.ebuild,v 1.4 2009/04/25 14:27:22 rbu Exp $
 
 inherit eutils
 
diff --git a/net-misc/networkmanager/networkmanager-0.7.1.ebuild b/net-misc/networkmanager/networkmanager-0.7.1-r1.ebuild
index 106e9c874b9b..8e4fca97c864 100644
--- a/net-misc/networkmanager/networkmanager-0.7.1.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1.ebuild,v 1.3 2009/04/24 22:28:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.1-r1.ebuild,v 1.1 2009/04/25 14:27:22 rbu Exp $
 
 EAPI="2"
 inherit eutils
@@ -14,6 +14,7 @@ DESCRIPTION="Network configuration and management in an easy way. Desktop enviro
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
 SRC_URI="mirror://gnome/sources/NetworkManager/0.7/${MY_P}.tar.bz2"
 
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~ppc ~x86"
@@ -62,6 +63,9 @@ src_prepare() {
 	# bug #266982
 	epatch "${FILESDIR}/${PN}-0.7.0-gentoo-dhclient.patch"
 
+	# bug #267349
+	epatch "${FILESDIR}/${PN}-0.7.1-bad-link.patch"
+
 #	EPATCH_SOURCE="${WORKDIR}/modem-manager-patchset-0.7.1"
 #	EPATCH_SUFFIX="patch"
 #	use modemmanager && epatch && eautoreconf
@@ -69,10 +73,11 @@ src_prepare() {
 }
 
 src_configure() {
-	ECONF="--disable-more-warnings \
-		--localstatedir=/var \
-		--with-distro=gentoo \
+	ECONF="--disable-more-warnings
+		--localstatedir=/var
+		--with-distro=gentoo
 		--with-dbus-sys=/etc/dbus-1/system.d
+		--with-udev-dir=/etc/udev
 		$(use_enable doc gtk-doc)
 		$(use_with doc docs)
 		$(use_with resolvconf)"