| 1 |
rbu 09/04/25 14:27:25 |
| 2 |
|
| 3 |
Modified: networkmanager-0.7.0-gentoo-dhclient.patch |
| 4 |
Added: networkmanager-0.7.1-bad-link.patch |
| 5 |
Log: |
| 6 |
Fix bug #267349 by Daniel Gryniewicz, NetworkManager-0.7 links against |
| 7 |
installed version of nm-util, specify udev directory for bug #267168. |
| 8 |
(Portage version: 2.1.6.11/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch |
| 12 |
|
| 13 |
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 |
| 14 |
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 |
| 15 |
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 |
| 16 |
|
| 17 |
Index: networkmanager-0.7.0-gentoo-dhclient.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- networkmanager-0.7.0-gentoo-dhclient.patch 21 Apr 2009 15:59:57 -0000 1.1 |
| 24 |
+++ networkmanager-0.7.0-gentoo-dhclient.patch 25 Apr 2009 14:27:25 -0000 1.2 |
| 25 |
@@ -1,7 +1,17 @@ |
| 26 |
-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 |
| 27 |
---- NetworkManager-0.7.0.orig/src/dhcp-manager/nm-dhcp-dhclient.c 2008-11-12 16:29:43.000000000 -0500 |
| 28 |
-+++ NetworkManager-0.7.0/src/dhcp-manager/nm-dhcp-dhclient.c 2009-04-21 11:38:18.000000000 -0400 |
| 29 |
-@@ -161,6 +161,8 @@ create_dhclient_config (NMDHCPDevice *de |
| 30 |
+From 33547b8d8b64a10187b9c452eef7325d909889a1 Mon Sep 17 00:00:00 2001 |
| 31 |
+From: Daniel Gryniewicz <dang@g.o> |
| 32 |
+Date: Thu, 23 Apr 2009 10:42:43 -0400 |
| 33 |
+Subject: [PATCH] dhcp: use correct dhclient config file location for Gentoo (bgo #579737) |
| 34 |
+ |
| 35 |
+--- |
| 36 |
+ src/dhcp-manager/nm-dhcp-dhclient.c | 2 ++ |
| 37 |
+ 1 files changed, 2 insertions(+), 0 deletions(-) |
| 38 |
+ |
| 39 |
+diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c |
| 40 |
+index 946be0c..34b36f1 100644 |
| 41 |
+--- a/src/dhcp-manager/nm-dhcp-dhclient.c |
| 42 |
++++ b/src/dhcp-manager/nm-dhcp-dhclient.c |
| 43 |
+@@ -167,6 +167,8 @@ create_dhclient_config (NMDHCPDevice *device, NMSettingIP4Config *s_ip4) |
| 44 |
orig = g_strdup (SYSCONFDIR "/dhclient.conf"); |
| 45 |
#elif defined(TARGET_DEBIAN) |
| 46 |
orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf"); |
| 47 |
@@ -10,5 +20,6 @@ |
| 48 |
#else |
| 49 |
orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", device->iface); |
| 50 |
#endif |
| 51 |
-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 |
| 52 |
-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 |
| 53 |
+-- |
| 54 |
+1.6.2 |
| 55 |
+ |
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
1.1 net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch |
| 60 |
|
| 61 |
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 |
| 62 |
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 |
| 63 |
|
| 64 |
Index: networkmanager-0.7.1-bad-link.patch |
| 65 |
=================================================================== |
| 66 |
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 |
| 67 |
--- NetworkManager-0.7.1.orig/src/ppp-manager/Makefile.am 2009-03-03 11:55:47.000000000 -0500 |
| 68 |
+++ NetworkManager-0.7.1/src/ppp-manager/Makefile.am 2009-04-24 11:32:58.000000000 -0400 |
| 69 |
@@ -47,9 +47,9 @@ nm_pppd_plugin_la_CPPFLAGS = \ |
| 70 |
nm_pppd_plugin_la_LDFLAGS = -module -avoid-version |
| 71 |
|
| 72 |
nm_pppd_plugin_la_LIBADD = \ |
| 73 |
+ $(top_builddir)/libnm-util/libnm-util.la \ |
| 74 |
$(DBUS_LIBS) \ |
| 75 |
- $(GLIB_LIBS) \ |
| 76 |
- $(top_builddir)/libnm-util/libnm-util.la |
| 77 |
+ $(GLIB_LIBS) |
| 78 |
|
| 79 |
BUILT_SOURCES = nm-ppp-manager-glue.h |
Archives