diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2013-07-19 19:07:13 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2013-07-19 19:07:13 +0000 |
| commit | 953a3fde6291148587685b1b13a02951a1eedbbe (patch) | |
| tree | f7955a0f99f436a7543d8dfcc37eae4c8d9636c3 /net-misc/networkmanager/files | |
| parent | Update to 20120731 (diff) | |
| download | gentoo-2-953a3fde6291148587685b1b13a02951a1eedbbe.tar.gz gentoo-2-953a3fde6291148587685b1b13a02951a1eedbbe.tar.bz2 gentoo-2-953a3fde6291148587685b1b13a02951a1eedbbe.zip | |
Add missing eutils inherits; add patch and bump to allow building against dhcpcd 6.x (previously silently failed to use dhcpcd, but still compiled and installed)
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 229E5838)
Diffstat (limited to 'net-misc/networkmanager/files')
| -rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.9.8.2-allow-new-dhcpcd.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.8.2-allow-new-dhcpcd.patch b/net-misc/networkmanager/files/networkmanager-0.9.8.2-allow-new-dhcpcd.patch new file mode 100644 index 000000000000..66e293c7b238 --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.9.8.2-allow-new-dhcpcd.patch @@ -0,0 +1,25 @@ +From 89512ec5c49de8d29e25d2758f7065ded09a1bd9 Mon Sep 17 00:00:00 2001 +From: Dan Williams <dcbw@redhat.com> +Date: Fri, 19 Jul 2013 18:32:44 +0000 +Subject: build: allow dhcpcd versions higher than 5 + +No reason to exclude them, just that configure.ac hasn't tracked new +versions of dhcpcd. +--- +diff --git a/configure.ac b/configure.ac +index d28e4bf..6b70bbd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -506,8 +506,8 @@ fi + if test "$with_dhcpcd" = "yes"; then + AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin) + if test "$with_dhcpcd" != "no"; then +- if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[45]]\."; then +- AC_MSG_WARN([Cannot use dhcpcd, version 4.x or 5.x is required]) ++ if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[456789]]\."; then ++ AC_MSG_WARN([Cannot use dhcpcd, version 4.x or higher is required]) + with_dhcpcd=no + fi + fi +-- +cgit v0.9.0.2-2-gbebe |