summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-12-12 11:59:24 +0100
committerPacho Ramos <pacho@gentoo.org>2015-12-12 15:27:16 +0100
commitdab4f685feba4698fec68ef2f7ae9d66c36e7539 (patch)
tree35ec5423f2f127aa2d5d239c22607bb4d181e53d /net-misc/networkmanager/files
parentnet-misc/networkmanager: Version bump (diff)
downloadgentoo-dab4f685feba4698fec68ef2f7ae9d66c36e7539.tar.gz
gentoo-dab4f685feba4698fec68ef2f7ae9d66c36e7539.tar.bz2
gentoo-dab4f685feba4698fec68ef2f7ae9d66c36e7539.zip
net-misc/networkmanager: Drop old
Package-Manager: portage-2.2.24
Diffstat (limited to 'net-misc/networkmanager/files')
-rw-r--r--net-misc/networkmanager/files/networkmanager-1.0.2-configure-dhcpcd.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.2-configure-dhcpcd.patch b/net-misc/networkmanager/files/networkmanager-1.0.2-configure-dhcpcd.patch
deleted file mode 100644
index 52325810f0b2..000000000000
--- a/net-misc/networkmanager/files/networkmanager-1.0.2-configure-dhcpcd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6baca260d11b4c2f92e8765ff0f66786e507022a Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 26 May 2015 18:21:31 -0500
-Subject: Partially revert "dhcp: gracefully recover from failed DHCP BOUND
- state transitions (bgo #743700)"
-
-This reverts commit 7daf63461de4195b1626ca15f835fc7cbc56e847.
-
-Turns out the removal of the second set of [] in configure.ac causes the command
-to be wrong in 'configure' and the test to be incorrect.
-
-diff --git a/configure.ac b/configure.ac
-index ba22057..d9a90c1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -668,10 +668,10 @@ 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 [456789]\."; then
-+ 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
-- elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [6789]\."; then
-+ elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[6789]]\."; then
- AC_DEFINE(DHCPCD_SUPPORTS_IPV6, 1, [Define if dhcpcd supports IPv6 (6.x+)])
- fi
- fi
---
-cgit v0.10.2
-