summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2019-05-09 14:27:15 +0000
committerCy Schubert <cy@FreeBSD.org>2019-05-09 14:27:15 +0000
commit3b35676c7a812c761975d0e15315c26513895a78 (patch)
tree742120ed45277ce60ca05e5f6cc6df073fd1f1ed
parentUpdate to the 20190502 snapshot of GCC 7.4.1. (diff)
Prepare for the pending removal of ispec from GENERIC, making sure
that the ipsec kld is loaded. Suggested by: gallatin@ MFH: 2019Q2
-rw-r--r--security/racoon2/Makefile1
-rw-r--r--security/racoon2/files/patch-samples-rc.d-iked.in15
2 files changed, 13 insertions, 3 deletions
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 29f459e4344b..1a703530dcad 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= racoon2
PORTVERSION= ${RACOON2_COMMIT_DATE}
+PORTREVISION= 1
CATEGORIES= security net ipv6
HASH= 5c4af73
RACOON2_COMMIT_DATE=20181215
diff --git a/security/racoon2/files/patch-samples-rc.d-iked.in b/security/racoon2/files/patch-samples-rc.d-iked.in
index 653f2dc0afa7..8bad1a3d634b 100644
--- a/security/racoon2/files/patch-samples-rc.d-iked.in
+++ b/security/racoon2/files/patch-samples-rc.d-iked.in
@@ -1,6 +1,6 @@
---- samples/rc.d/iked.in.orig 2018-08-15 21:36:53.000000000 -0700
-+++ samples/rc.d/iked.in 2018-10-19 12:32:15.579253000 -0700
-@@ -10,11 +10,13 @@
+--- samples/rc.d/iked.in.orig 2018-08-15 22:36:53.000000000 -0600
++++ samples/rc.d/iked.in 2019-05-09 08:03:55.095621000 -0600
+@@ -10,14 +10,22 @@
. /etc/rc.subr
@@ -15,4 +15,13 @@
+required_vars="spmd_enable"
pidfile="/var/run/${name}.pid"
required_files="@sysconfdir@/racoon2.conf"
++start_precmd="iked_precmd"
reload_cmd="iked_reload"
++
++iked_precmd()
++{
++ sysctl -qn net.inet.ipsec.def_policy >/dev/null || kldload ipsec || return 1
++}
+
+ iked_reload()
+ {