diff options
author | ts468 <ts468@users.noreply.github.com> | 2015-08-05 21:30:05 +0200 |
---|---|---|
committer | ts468 <ts468@users.noreply.github.com> | 2015-08-05 21:30:05 +0200 |
commit | e190a70b0472df3eac5241fd3e021968271375fb (patch) | |
tree | dd56c7f5299df615dc91ffce6427365e9c568c48 /pkgs/tools | |
parent | ebe412e8f7ad8de74320371fc42e255df2e509b2 (diff) | |
parent | 531e93eaf49229c19a83ee6ceda83b31e7575d11 (diff) | |
download | nixlib-e190a70b0472df3eac5241fd3e021968271375fb.tar nixlib-e190a70b0472df3eac5241fd3e021968271375fb.tar.gz nixlib-e190a70b0472df3eac5241fd3e021968271375fb.tar.bz2 nixlib-e190a70b0472df3eac5241fd3e021968271375fb.tar.lz nixlib-e190a70b0472df3eac5241fd3e021968271375fb.tar.xz nixlib-e190a70b0472df3eac5241fd3e021968271375fb.tar.zst nixlib-e190a70b0472df3eac5241fd3e021968271375fb.zip |
Merge pull request #9128 from ts468/upstream.vpnc
vpnc: 0.5.3 -> svn-rev-550
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/vpnc/default.nix | 31 | ||||
-rw-r--r-- | pkgs/tools/networking/vpnc/vpnc-script.patch | 12 |
2 files changed, 22 insertions, 21 deletions
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 1386f7133e54..bde93dfdd48a 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,30 +1,43 @@ -{ stdenv, fetchurl, nettools, libgcrypt, perl, gawk, makeWrapper }: +{ stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: stdenv.mkDerivation rec { - name = "vpnc-0.5.3"; - src = fetchurl { - url = "http://www.unix-ag.uni-kl.de/~massar/vpnc/${name}.tar.gz"; - sha256 = "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6"; + name = "vpnc-rev550"; + src = fetchsvn { + url = "http://svn.unix-ag.uni-kl.de/vpnc"; + rev = "550"; + sha256 = "0x4ckfv9lpykwmh28v1kyzz91y1j2v48fi8q5nsawrba4q0wlrls"; }; - patches = [ ./makefile.patch ./vpnc-script.patch ]; + postUnpack = '' + mv $sourceRoot/trunk/* $sourceRoot/. + rm -r $sourceRoot/{trunk,branches,tags} + ''; + + patches = [ ./makefile.patch ]; # The `etc/vpnc/vpnc-script' script relies on `which' and on # `ifconfig' as found in net-tools (not GNU Inetutils). propagatedBuildInputs = [ nettools ]; - buildInputs = [libgcrypt perl makeWrapper]; + buildInputs = [libgcrypt perl makeWrapper openssl ]; preConfigure = '' - substituteInPlace "vpnc-script.in" \ + sed -i 's|^#OPENSSL|OPENSSL|g' Makefile + + substituteInPlace "vpnc-script" \ --replace "which" "type -P" \ - --replace "awk" "${gawk}/bin/awk" + --replace "awk" "${gawk}/bin/awk" \ + --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf" substituteInPlace "config.c" \ --replace "/etc/vpnc/vpnc-script" "$out/etc/vpnc/vpnc-script" substituteInPlace "pcf2vpnc" \ --replace "/usr/bin/perl" "${perl}/bin/perl" + + # use random local port by default to reduce clashes with + # other IPSec services like, e.g., strongSwan + echo "Local Port 0" >> vpnc.conf ''; postInstall = '' diff --git a/pkgs/tools/networking/vpnc/vpnc-script.patch b/pkgs/tools/networking/vpnc/vpnc-script.patch deleted file mode 100644 index 67a86d5d58fa..000000000000 --- a/pkgs/tools/networking/vpnc/vpnc-script.patch +++ /dev/null @@ -1,12 +0,0 @@ -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() { |