From owner-svn-ports-head@freebsd.org Sun May 12 13:22:29 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 760A415974B4; Sun, 12 May 2019 13:22:29 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 17C3E6F619; Sun, 12 May 2019 13:22:29 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3C402B285; Sun, 12 May 2019 13:22:28 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4CDMSAL009126; Sun, 12 May 2019 13:22:28 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4CDMSAq009125; Sun, 12 May 2019 13:22:28 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201905121322.x4CDMSAq009125@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Sun, 12 May 2019 13:22:28 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in head/security/ipsec-tools: . files X-SVN-Commit-Revision: 501380 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 17C3E6F619 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.93)[-0.932,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2019 13:22:29 -0000 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 + +.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() {