svn commit: r501102 - in branches/2019Q2/security/racoon2: . files

[Cy Schubert]

Author: cy
Date: Thu May  9 14:45:09 2019
New Revision: 501102
URL: https://svnweb.freebsd.org/changeset/ports/501102

Log:
  MFH: r501100
  
  Prepare for the pending removal of ispec from GENERIC, making sure
  that the ipsec kld is loaded.
  
  Suggested by:	gallatin@
  Approved by:	portmgr (joneum@)

Modified:
  branches/2019Q2/security/racoon2/Makefile
  branches/2019Q2/security/racoon2/files/patch-samples-rc.d-iked.in
Directory Properties:
  branches/2019Q2/   (props changed)

Modified: branches/2019Q2/security/racoon2/Makefile
==============================================================================
--- branches/2019Q2/security/racoon2/Makefile	Thu May  9 14:39:30 2019	(r501101)
+++ branches/2019Q2/security/racoon2/Makefile	Thu May  9 14:45:09 2019	(r501102)
@@ -3,6 +3,7 @@
 
 PORTNAME=	racoon2
 PORTVERSION=	${RACOON2_COMMIT_DATE}
+PORTREVISION=	1
 CATEGORIES=	security net ipv6
 HASH=		5c4af73
 RACOON2_COMMIT_DATE=20181215

Modified: branches/2019Q2/security/racoon2/files/patch-samples-rc.d-iked.in
==============================================================================
--- branches/2019Q2/security/racoon2/files/patch-samples-rc.d-iked.in	Thu May  9 14:39:30 2019	(r501101)
+++ branches/2019Q2/security/racoon2/files/patch-samples-rc.d-iked.in	Thu May  9 14:45:09 2019	(r501102)
@@ -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()
+ {