rbu 09/04/25 14:27:25
Modified: networkmanager-0.7.0-gentoo-dhclient.patch
Added: networkmanager-0.7.1-bad-link.patch
Log:
Fix bug #267349 by Daniel Gryniewicz, NetworkManager-0.7 links against
installed version of nm-util, specify udev directory for bug #267168.
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Revision Changes Path
1.2 net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch?r1=1.1&r2=1.2
Index: networkmanager-0.7.0-gentoo-dhclient.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- networkmanager-0.7.0-gentoo-dhclient.patch 21 Apr 2009 15:59:57 -0000 1.1
+++ networkmanager-0.7.0-gentoo-dhclient.patch 25 Apr 2009 14:27:25 -0000 1.2
@@ -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@g.o>
+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 @@
#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
+
1.1 net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch?rev=1.1&content-type=text/plain
Index: networkmanager-0.7.1-bad-link.patch
===================================================================
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
|
