svn commit: r494736 - in head/security/strongswan: . files

[Steve Wills]

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 <jlduran at gmail.com>
  Approved by:	strongswan at 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 <bsd.port.mk>

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"