1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
nixpkgs/pkgs/tools/networking/strongswan/firewall_defaults.patch
Igor Pashev 9bbe674927 Strongswan: use full path to ipsec
This fixes issue:

... charon[6135]: 11[CHD] updown: /bin/sh: ipsec: command not found
2014-12-22 20:20:15 +00:00

33 lines
1.3 KiB
Diff

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}\" \