diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2015-08-11 17:44:04 -0400 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2015-08-11 17:47:53 -0400 |
| commit | 963e70a7e838449030668b554cce69b5c9cdf72e (patch) | |
| tree | 1b5f34349334b9789dc16486562ee26e1c361c80 /pkgs/os-specific/linux/iproute | |
| parent | 62074ab09a6dab1b8cd0b18f32be4383529945a7 (diff) | |
iproute: remove unused patch
In f18efaf26e8, the "patches" attribute was erroneously renamed to "patch". If you follow the original bug report[1], you'll see that this has long since been fixed upstream (using a different patch). 1: https://bugs.gentoo.org/show_bug.cgi?id=331447
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
| -rw-r--r-- | pkgs/os-specific/linux/iproute/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/iproute/vpnc.patch | 15 |
2 files changed, 0 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index f7ca0481a31b5..6fea4ba05e0d6 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "0vz6m2k6hdrjlg4x0r3cd75lg9ysmndbsp35pm8494zvksc7l1vk"; }; - patch = [ ./vpnc.patch ]; - preConfigure = '' patchShebangs ./configure sed -e '/ARPDDIR/d' -i Makefile diff --git a/pkgs/os-specific/linux/iproute/vpnc.patch b/pkgs/os-specific/linux/iproute/vpnc.patch deleted file mode 100644 index 0a65f3e5df5fd..0000000000000 --- a/pkgs/os-specific/linux/iproute/vpnc.patch +++ /dev/null @@ -1,15 +0,0 @@ -vpnc fails with "RTNETLINK answers: No such device" -Patch from: https://bugs.gentoo.org/attachment.cgi?id=245736 -In reference to: https://bugs.gentoo.org/show_bug.cgi?id=331447 - ---- iproute2-2.6.35.old/ip/iproute.c 2010-09-02 16:00:21.805000124 +0200 -+++ iproute2-2.6.35/ip/iproute.c 2010-09-02 16:00:40.782000125 +0200 -@@ -160,7 +160,7 @@ - if (r->rtm_family == AF_INET6 && table != RT_TABLE_MAIN) - ip6_multiple_tables = 1; - -- if (filter.cloned == !(r->rtm_flags&RTM_F_CLONED)) -+ if (filter.cloned && !(r->rtm_flags&RTM_F_CLONED)) - return 0; - - if (r->rtm_family == AF_INET6 && !ip6_multiple_tables) { |