diff options
| author | Peter Simons <simons@cryp.to> | 2012-02-29 22:50:33 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-02-29 22:50:33 +0000 |
| commit | 57b612cb050778c4ded12fe8e45de26b91eeef70 (patch) | |
| tree | 3ca2e705c42785e84df747c14805f1fe962f5642 /pkgs | |
| parent | 41b3f46f788ee4caef2334c5f94924ae9bdeaa06 (diff) | |
| download | nixpkgs-57b612cb050778c4ded12fe8e45de26b91eeef70.tar nixpkgs-57b612cb050778c4ded12fe8e45de26b91eeef70.tar.gz nixpkgs-57b612cb050778c4ded12fe8e45de26b91eeef70.tar.bz2 nixpkgs-57b612cb050778c4ded12fe8e45de26b91eeef70.tar.lz nixpkgs-57b612cb050778c4ded12fe8e45de26b91eeef70.tar.xz nixpkgs-57b612cb050778c4ded12fe8e45de26b91eeef70.tar.zst nixpkgs-57b612cb050778c4ded12fe8e45de26b91eeef70.zip | |
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 svn path=/nixpkgs/trunk/; revision=32712
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/vpnc/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/vpnc/vpnc-script.patch | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 88ef6bd8e59..8619cd95409 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { 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). diff --git a/pkgs/tools/networking/vpnc/vpnc-script.patch b/pkgs/tools/networking/vpnc/vpnc-script.patch new file mode 100644 index 00000000000..67a86d5d58f --- /dev/null +++ b/pkgs/tools/networking/vpnc/vpnc-script.patch @@ -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() { |