Author: cillian
Date: Thu Feb 24 12:04:00 2011
New Revision: 26089
URL: https://svn.nixos.org/websvn/nix/?rev=26089&sc=1

Log:
Adding a patch which fixes vpnc

Added:
   nixpkgs/trunk/pkgs/os-specific/linux/iproute/vpnc.patch
Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/iproute/default.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/iproute/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/iproute/default.nix    Thu Feb 24 
11:59:30 2011        (r26088)
+++ nixpkgs/trunk/pkgs/os-specific/linux/iproute/default.nix    Thu Feb 24 
12:04:00 2011        (r26089)
@@ -7,7 +7,9 @@
     url = 
"http://devresources.linux-foundation.org/dev/iproute2/download/${name}.tar.bz2";;
     sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla";
   };
- 
+
+  patches = [ ./vpnc.patch ];
+
   preConfigure =
     ''
       patchShebangs ./configure

Added: nixpkgs/trunk/pkgs/os-specific/linux/iproute/vpnc.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/iproute/vpnc.patch     Thu Feb 24 
12:04:00 2011        (r26089)
@@ -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) {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to