diff options
| author | Cillian de Roiste <cillian.deroiste@gmail.com> | 2011-02-24 12:04:00 +0000 |
|---|---|---|
| committer | Cillian de Roiste <cillian.deroiste@gmail.com> | 2011-02-24 12:04:00 +0000 |
| commit | 049d5697c062e1394d8b09db324e27a88fd83978 (patch) | |
| tree | b235dc7ee067572144d1f678da58391697c0506c /pkgs/os-specific/linux/iproute | |
| parent | a35dcdb2819e0ed429fe4a2204803a7bdfcd0e3b (diff) | |
| download | nixpkgs-049d5697c062e1394d8b09db324e27a88fd83978.tar nixpkgs-049d5697c062e1394d8b09db324e27a88fd83978.tar.gz nixpkgs-049d5697c062e1394d8b09db324e27a88fd83978.tar.bz2 nixpkgs-049d5697c062e1394d8b09db324e27a88fd83978.tar.lz nixpkgs-049d5697c062e1394d8b09db324e27a88fd83978.tar.xz nixpkgs-049d5697c062e1394d8b09db324e27a88fd83978.tar.zst nixpkgs-049d5697c062e1394d8b09db324e27a88fd83978.zip | |
Adding a patch which fixes vpnc
svn path=/nixpkgs/trunk/; revision=26089
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
| -rw-r--r-- | pkgs/os-specific/linux/iproute/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/iproute/vpnc.patch | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index ba0f1d4fd0f..806efdcba6d 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { url = "http://devresources.linux-foundation.org/dev/iproute2/download/${name}.tar.bz2"; sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla"; }; - + + patches = [ ./vpnc.patch ]; + preConfigure = '' patchShebangs ./configure diff --git a/pkgs/os-specific/linux/iproute/vpnc.patch b/pkgs/os-specific/linux/iproute/vpnc.patch new file mode 100644 index 00000000000..0a65f3e5df5 --- /dev/null +++ b/pkgs/os-specific/linux/iproute/vpnc.patch @@ -0,0 +1,15 @@ +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) { |