Author: simons
Date: Wed Feb 29 22:50:33 2012
New Revision: 32712
URL: https://nixos.org/websvn/nix/?rev=32712&sc=1

Log:
vpnc: added patch to fix the 'Error: either "to" is duplicate, or "ipid" is a 
garbage' bug

Further details are at:

  
http://www.rz.uni-konstanz.de/activekb/questions/250/VPNC+unter+Ubuntu+11.10+%22Error%3A+either+%22to%22+is+duplicate%2C+or+%22ipid%22+is+a+garbage.%22

Added:
   nixpkgs/trunk/pkgs/tools/networking/vpnc/vpnc-script.patch
Modified:
   nixpkgs/trunk/pkgs/tools/networking/vpnc/default.nix

Modified: nixpkgs/trunk/pkgs/tools/networking/vpnc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/vpnc/default.nix        Wed Feb 29 
21:25:12 2012        (r32711)
+++ nixpkgs/trunk/pkgs/tools/networking/vpnc/default.nix        Wed Feb 29 
22:50:33 2012        (r32712)
@@ -7,7 +7,7 @@
     sha256 = "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6";
   };
 
-  patches = [ ./makefile.patch ];
+  patches = [ ./makefile.patch ./vpnc-script.patch ];
 
   # The `etc/vpnc/vpnc-script' script relies on `which' and on
   # `ifconfig' as found in net-tools (not GNU Inetutils).

Added: nixpkgs/trunk/pkgs/tools/networking/vpnc/vpnc-script.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/networking/vpnc/vpnc-script.patch  Wed Feb 29 
22:50:33 2012        (r32712)
@@ -0,0 +1,12 @@
+diff -ubr vpnc-0.5.3-orig/vpnc-script.in vpnc-0.5.3/vpnc-script.in
+--- vpnc-0.5.3-orig/vpnc-script.in     2012-02-29 23:03:35.289636602 +0100
++++ vpnc-0.5.3/vpnc-script.in  2012-02-29 23:03:59.597307445 +0100
+@@ -116,7 +116,7 @@
+ 
+ if [ -n "$IPROUTE" ]; then
+       fix_ip_get_output () {
+-              sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit 
[0-9]\+//g'
++              sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit 
[0-9]\+//g;s/ipid 0x....//g'
+       }
+ 
+       set_vpngateway_route() {
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to