From owner-svn-ports-head@freebsd.org Tue Mar 5 20:14:19 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 0EAA91511DF9; Tue, 5 Mar 2019 20:14:19 +0000 (UTC) (envelope-from swills@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 A854A86A13; Tue, 5 Mar 2019 20:14:18 +0000 (UTC) (envelope-from swills@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 9C8EC21109; Tue, 5 Mar 2019 20:14:18 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x25KEIoa000535; Tue, 5 Mar 2019 20:14:18 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x25KEHIj000532; Tue, 5 Mar 2019 20:14:17 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201903052014.x25KEHIj000532@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 5 Mar 2019 20:14:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494736 - in head/security/strongswan: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/security/strongswan: . files X-SVN-Commit-Revision: 494736 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A854A86A13 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Tue, 05 Mar 2019 20:14:19 -0000 Author: swills Date: Tue Mar 5 20:14:17 2019 New Revision: 494736 URL: https://svnweb.freebsd.org/changeset/ports/494736 Log: security/strongswan: Minor port improvements - Follow the same patching logic for swanctl.conf as the other config files. - Silence warning: $strongswan_enable not properly set. PR: 235340 Submitted by: Jose Luis Duran Approved by: strongswan@Nanoteq.com (maintainer) Added: head/security/strongswan/files/patch-src_swanctl_Makefile.in (contents, props changed) Modified: head/security/strongswan/Makefile (contents, props changed) head/security/strongswan/files/strongswan.in Modified: head/security/strongswan/Makefile ============================================================================== --- head/security/strongswan/Makefile Tue Mar 5 19:44:52 2019 (r494735) +++ head/security/strongswan/Makefile Tue Mar 5 20:14:17 2019 (r494736) @@ -3,6 +3,7 @@ PORTNAME= strongswan PORTVERSION= 5.7.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://download.strongswan.org/ \ http://download2.strongswan.org/ @@ -138,10 +139,6 @@ post-install: .if ${PORT_OPTIONS:MVICI} ${INSTALL_DATA} ${WRKSRC}/src/libcharon/plugins/vici/libvici.h \ ${STAGEDIR}${PREFIX}/include -.endif -.if ${PORT_OPTIONS:MSWANCTL} - ${MV} ${STAGEDIR}${PREFIX}/etc/swanctl/swanctl.conf \ - ${STAGEDIR}${PREFIX}/etc/swanctl/swanctl.conf.sample .endif .include Added: head/security/strongswan/files/patch-src_swanctl_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/strongswan/files/patch-src_swanctl_Makefile.in Tue Mar 5 20:14:17 2019 (r494736) @@ -0,0 +1,11 @@ +--- src/swanctl/Makefile.in.orig 2019-01-18 17:24:51 UTC ++++ src/swanctl/Makefile.in +@@ -1065,7 +1065,7 @@ install-data-local: swanctl.conf + test -e "$(DESTDIR)$(swanctldir)/bliss" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/bliss" || true + test -e "$(DESTDIR)$(swanctldir)/pkcs8" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/pkcs8" || true + test -e "$(DESTDIR)$(swanctldir)/pkcs12" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/pkcs12" || true +- test -e "$(DESTDIR)$(swanctldir)/swanctl.conf" || $(INSTALL) -m 640 $(srcdir)/swanctl.conf $(DESTDIR)$(swanctldir)/swanctl.conf || true ++ test -e "$(DESTDIR)$(swanctldir)/swanctl.conf" || $(INSTALL) -m 640 $(srcdir)/swanctl.conf $(DESTDIR)$(swanctldir)/swanctl.conf.sample || true + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Modified: head/security/strongswan/files/strongswan.in ============================================================================== --- head/security/strongswan/files/strongswan.in Tue Mar 5 19:44:52 2019 (r494735) +++ head/security/strongswan/files/strongswan.in Tue Mar 5 20:14:17 2019 (r494736) @@ -12,9 +12,11 @@ name=strongswan rcvar=strongswan_enable -extra_commands="reload statusall" - load_rc_config $name + +: ${strongswan_enable:=NO} + +extra_commands="reload statusall" command="%%PREFIX%%/sbin/ipsec"