/[gentoo-x86]/net-misc/networkmanager/files/networkmanager-0.9.4.0-dhclient-ipv6.patch
Gentoo

Contents of /net-misc/networkmanager/files/networkmanager-0.9.4.0-dhclient-ipv6.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Thu Jul 5 02:33:10 2012 UTC (2 years ago) by tetromino
Branch: MAIN
CVS Tags: HEAD
Fix the hang in 10-openrc-status that resulted in networkmanager getting marked as 'inactive' on resuming from suspend; many thanks to Travis Hansen for the solution (bugs #410661, #417283). Fix incompatibility with net-misc/dhcp[-ipv6] (bug #335147, thanks to Rick Harris). Move polkit rules.d file to /usr/share (bug #421577 comment #12, thanks to Dennis Lissov).

(Portage version: 2.2.0_alpha115/cvs/Linux x86_64)

1 From cc9f8102859cccd95ba7a13c00bc3cc4fb53aa0a Mon Sep 17 00:00:00 2001
2 From: Rick Harris <rickfharris@yahoo.com.au>
3 Date: Sun, 15 Apr 2012 09:44:55 +0000
4 Subject: [PATCH] dhcp: do not require dhclient-4 to be built with DHCPv6
5
6 The "-4" flag is the default if dhclient-4 was built with DHCPv6 support
7 enabled, and it's invalid if dhclient-4 was built without DHCPv6.
8 Therefore, we simply should not use it.
9
10 https://bugzilla.gnome.org/show_bug.cgi?id=679428
11 ---
12 src/dhcp-manager/nm-dhcp-dhclient.c | 5 +++--
13 1 files changed, 3 insertions(+), 2 deletions(-)
14
15 diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
16 index 043cd63..14be5b2 100644
17 --- a/src/dhcp-manager/nm-dhcp-dhclient.c
18 +++ b/src/dhcp-manager/nm-dhcp-dhclient.c
19 @@ -490,9 +490,10 @@ dhclient_start (NMDHCPClient *client,
20 g_ptr_array_add (argv, (gpointer) "-6");
21 if (mode_opt)
22 g_ptr_array_add (argv, (gpointer) mode_opt);
23 - } else {
24 - g_ptr_array_add (argv, (gpointer) "-4");
25 }
26 + /* We never want the "-4" flag: it's the default if dhclient was
27 + * built with DHCPv6 support, and invalid otherwise.
28 + */
29 #endif
30
31 g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
32 --
33 1.7.8.6

  ViewVC Help
Powered by ViewVC 1.1.20