diff options
-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() { |