/[gentoo-x86]/net-misc/networkmanager/files/networkmanager-1.0.2-configure-dhcpcd.patch
Gentoo

Contents of /net-misc/networkmanager/files/networkmanager-1.0.2-configure-dhcpcd.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Thu Jun 4 09:33:20 2015 UTC (3 years, 10 months ago) by pacho
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Fix dhcpcd detection (#549970 by Joakim Tjernlund)

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

1 From 6baca260d11b4c2f92e8765ff0f66786e507022a Mon Sep 17 00:00:00 2001
2 From: Dan Williams <dcbw@redhat.com>
3 Date: Tue, 26 May 2015 18:21:31 -0500
4 Subject: Partially revert "dhcp: gracefully recover from failed DHCP BOUND
5 state transitions (bgo #743700)"
6
7 This reverts commit 7daf63461de4195b1626ca15f835fc7cbc56e847.
8
9 Turns out the removal of the second set of [] in configure.ac causes the command
10 to be wrong in 'configure' and the test to be incorrect.
11
12 diff --git a/configure.ac b/configure.ac
13 index ba22057..d9a90c1 100644
14 --- a/configure.ac
15 +++ b/configure.ac
16 @@ -668,10 +668,10 @@ fi
17 if test "$with_dhcpcd" = "yes"; then
18 AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin)
19 if test "$with_dhcpcd" != "no"; then
20 - if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [456789]\."; then
21 + if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[456789]]\."; then
22 AC_MSG_WARN([Cannot use dhcpcd, version 4.x or higher is required])
23 with_dhcpcd=no
24 - elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [6789]\."; then
25 + elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[6789]]\."; then
26 AC_DEFINE(DHCPCD_SUPPORTS_IPV6, 1, [Define if dhcpcd supports IPv6 (6.x+)])
27 fi
28 fi
29 --
30 cgit v0.10.2
31

  ViewVC Help
Powered by ViewVC 1.1.20