Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 May 2019 13:22:28 +0000 (UTC)
From:      Eugene Grosbein <eugen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r501380 - in head/security/ipsec-tools: . files
Message-ID:  <201905121322.x4CDMSAq009125@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eugen
Date: Sun May 12 13:22:28 2019
New Revision: 501380
URL: https://svnweb.freebsd.org/changeset/ports/501380

Log:
  security/ipsec-tools: autoload ipsec.ko if possible
  
  Check for IPSEC support in kernel and auto-load ipsec.ko
  if needed while starting racoon except of 11.0-RELEASE
  that had not IPSEC as a module.

Modified:
  head/security/ipsec-tools/Makefile
  head/security/ipsec-tools/files/racoon.in

Modified: head/security/ipsec-tools/Makefile
==============================================================================
--- head/security/ipsec-tools/Makefile	Sun May 12 12:11:26 2019	(r501379)
+++ head/security/ipsec-tools/Makefile	Sun May 12 13:22:28 2019	(r501380)
@@ -8,7 +8,7 @@
 
 PORTNAME=	ipsec-tools
 PORTVERSION=	0.8.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -17,11 +17,10 @@ COMMENT=	KAME racoon IKE daemon, ipsec-tools version
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	racoon-[0-9]*
+USES=		libtool tar:bzip2 ssl
 
+CONFLICTS=	racoon-[0-9]*
 INSTALL_TARGET=	install-strip
-
-USES=		libtool tar:bzip2 ssl
 USE_RC_SUBR=	racoon
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -30,7 +29,7 @@ CONFIGURE_ARGS=	--enable-shared --sysconfdir=${PREFIX}
 		--with-pkgversion=freebsd-${PORTVERSION}
 
 STATEDIR=	/var/db/racoon
-SUB_LIST+=	STATEDIR=${STATEDIR}
+SUB_LIST+=	STATEDIR=${STATEDIR} REQUIREMOD=${REQUIREMOD}
 PLIST_SUB+=	STATEDIR=${STATEDIR}
 
 OPTIONS_DEFINE=	DEBUG IPV6 ADMINPORT STATS DPD NATT NATTF FRAG HYBRID PAM \
@@ -82,6 +81,10 @@ WCPSKEY_EXTRA_PATCHES=		${FILESDIR}/wildcard-psk.diff
 NATT_EXTRA_PATCHES=		${FILESDIR}/natt.diff
 
 .include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100510
+REQUIREMOD?=	ipsec
+.endif
 
 # Need to be patched for openssl-1.1.1 (default after 1200080)
 .if ${OPSYS} == FreeBSD

Modified: head/security/ipsec-tools/files/racoon.in
==============================================================================
--- head/security/ipsec-tools/files/racoon.in	Sun May 12 12:11:26 2019	(r501379)
+++ head/security/ipsec-tools/files/racoon.in	Sun May 12 13:22:28 2019	(r501380)
@@ -33,6 +33,7 @@ stop_postcmd="${name}_cleanup"
 socketfile="%%STATEDIR%%/${name}.sock"
 required_files="%%PREFIX%%/etc/${name}/${name}.conf"
 required_dirs="%%STATEDIR%%"
+required_modules="%%REQUIREMOD%%"
 
 racoon_cleanup()
 {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905121322.x4CDMSAq009125>