alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Strongswan: use full path to ipsec

Browse source 
This fixes issue:

... charon[6135]: 11[CHD] updown: /bin/sh: ipsec: command not found
This commit is contained in:
Igor Pashev 2014-12-22 18:24:19 +01:00
parent d57927748a
commit 9bbe674927
2 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/networking/strongswan/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gmp, pkgconfig, python }:
{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook }:
stdenv.mkDerivation rec {
name = "strongswan-5.2.1";
@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
dontPatchELF = true;
buildInputs = [ gmp pkgconfig python ];
buildInputs = [ gmp pkgconfig python autoreconfHook ];
patches = [
./firewall_defaults.patch
];
configureFlags = [ "--enable-swanctl" "--enable-cmd" ];

32
pkgs/tools/networking/strongswan/firewall_defaults.patch Normal file
View file

@ -0,0 +1,32 @@
Index: strongswan-5.2.1/src/starter/confread.c
===================================================================
--- strongswan-5.2.1.orig/src/starter/confread.c
+++ strongswan-5.2.1/src/starter/confread.c
@@ -43,7 +43,7 @@
static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536";
static const char esp_defaults[] = "aes128-sha1,3des-sha1";
-static const char firewall_defaults[] = IPSEC_SCRIPT " _updown iptables";
+static const char firewall_defaults[] = IPSEC_SBINDIR "/" IPSEC_SCRIPT " _updown iptables";
/**
* Provided by GPERF
Index: strongswan-5.2.1/src/starter/Makefile.am
===================================================================
--- strongswan-5.2.1.orig/src/starter/Makefile.am
+++ strongswan-5.2.1/src/starter/Makefile.am
@@ -18,10 +18,12 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/starter \
-I$(top_srcdir)/src/stroke \
- -DIPSEC_DIR=\"${ipsecdir}\" \
+ -DIPSEC_BINDIR=\"${bindir}\" \
-DIPSEC_CONFDIR=\"${sysconfdir}\" \
- -DIPSEC_PIDDIR=\"${piddir}\" \
+ -DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_EAPDIR=\"${eapdir}\" \
+ -DIPSEC_PIDDIR=\"${piddir}\" \
+ -DIPSEC_SBINDIR=\"${sbindir}\" \
-DIPSEC_SCRIPT=\"${ipsec_script}\" \
-DDEV_RANDOM=\"${random_device}\" \
-DDEV_URANDOM=\"${urandom_device}\" \