diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2009-04-21 15:59:57 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2009-04-21 15:59:57 +0000 |
| commit | 2ba94bb82f1104fda2ae926ca595c866612a6ab0 (patch) | |
| tree | 5614b354b6d6306f762aabf01dcd5bdf40f34f80 /net-misc/networkmanager | |
| parent | Marking openmpi-1.2.9 ppc64 for bug 266555 (diff) | |
| download | gentoo-2-2ba94bb82f1104fda2ae926ca595c866612a6ab0.tar.gz gentoo-2-2ba94bb82f1104fda2ae926ca595c866612a6ab0.tar.bz2 gentoo-2-2ba94bb82f1104fda2ae926ca595c866612a6ab0.zip | |
fix nm 0.7 to look for dhclient.conf in the correct place on gentoo
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/networkmanager')
| -rw-r--r-- | net-misc/networkmanager/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch | 14 | ||||
| -rw-r--r-- | net-misc/networkmanager/networkmanager-0.7.0.ebuild | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog index 128bb27aebf3..8a391e46e9de 100644 --- a/net-misc/networkmanager/ChangeLog +++ b/net-misc/networkmanager/ChangeLog @@ -1,6 +1,10 @@ # 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.37 2009/01/22 16:29:17 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.38 2009/04/21 15:59:57 dang Exp $ + + 21 Apr 2009; Daniel Gryniewicz <dang@gentoo.org> + +files/networkmanager-0.7.0-gentoo-dhclient.patch, networkmanager-0.7.0: + fix nm 0.7 to look for dhclient.conf in the correct place on gentoo 22 Jan 2009; Peter Volkov <pva@gentoo.org> networkmanager-0.6.5_p20070823.ebuild, networkmanager-0.6.6.ebuild: 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 new file mode 100644 index 000000000000..ba2cf4377d8e --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch @@ -0,0 +1,14 @@ +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 + orig = g_strdup (SYSCONFDIR "/dhclient.conf"); + #elif defined(TARGET_DEBIAN) + orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf"); ++#elif defined(TARGET_GENTOO) ++ orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf"); + #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 diff --git a/net-misc/networkmanager/networkmanager-0.7.0.ebuild b/net-misc/networkmanager/networkmanager-0.7.0.ebuild index 328491d74082..55d83ca008a1 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 # 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.2 2008/12/18 18:38:03 rbu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.0.ebuild,v 1.3 2009/04/21 15:59:57 dang Exp $ inherit eutils @@ -59,6 +59,7 @@ src_unpack () { # Fix up the dbus conf file to use plugdev group epatch "${FILESDIR}/${P}-confchanges.patch" + epatch "${FILESDIR}/${P}-gentoo-dhclient.patch" } src_compile() { |