Index: head/security/strongswan/Makefile =================================================================== --- head/security/strongswan/Makefile (revision 494735) +++ head/security/strongswan/Makefile (revision 494736) @@ -1,147 +1,144 @@ # Created by: Riaan Kruger # $FreeBSD$ PORTNAME= strongswan PORTVERSION= 5.7.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://download.strongswan.org/ \ http://download2.strongswan.org/ MAINTAINER= strongswan@nanoteq.com COMMENT= Open Source IKEv2 IPsec-based VPN solution LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe libtool:keepla pkgconfig tar:bzip2 ssl USE_RC_SUBR= strongswan USE_LDCONFIG= ${PREFIX}/lib/ipsec GNU_CONFIGURE= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-kernel-pfkey \ --enable-kernel-pfroute \ --disable-kernel-netlink \ --disable-scripts \ --disable-gmp \ --enable-openssl \ --enable-eap-identity \ --enable-eap-md5 \ --enable-eap-tls \ --enable-eap-mschapv2 \ --enable-eap-peap \ --enable-eap-ttls \ --enable-md4 \ --enable-blowfish \ --enable-addrblock \ --enable-whitelist \ --enable-cmd \ --with-group=wheel \ --with-lib-prefix=${PREFIX} OPTIONS_DEFINE= CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE GCM IKEV1 \ IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MEDIATION MYSQL PKI SCEP SMP \ SQLITE SWANCTL TESTVECTOR TPM UNBOUND UNITY VICI XAUTH OPTIONS_DEFAULT= BUILTIN CURL IKEV1 PKI SWANCTL VICI OPTIONS_SINGLE= PRINTF_HOOKS OPTIONS_SINGLE_PRINTF_HOOKS= BUILTIN LIBC VSTR OPTIONS_SUB= yes # Description of options CURL_DESC= Enable CURL to fetch CRL/OCSP EAPAKA3GPP2_DESC= Enable EAP AKA with 3gpp2 backend EAPDYNAMIC_DESC= Enable EAP dynamic proxy module EAPRADIUS_DESC= Enable EAP Radius proxy authentication EAPSIMFILE_DESC= Enable EAP SIM with file backend GCM_DESC= Enable GCM AEAD wrapper crypto plugin IKEV1_DESC= Enable IKEv1 support IPSECKEY_DESC= Enable authentication with IPSECKEY resource records with DNSSEC KERNELLIBIPSEC_DESC= Enable IPSec userland backend LOADTESTER_DESC= Enable load testing plugin MEDIATION_DESC= Enable IKEv2 Mediation Extension PKI_DESC= Enable PKI tools SCEP_DESC= Enable Simple Certificate Enrollment Protocol SMP_DESC= Enable XML-based management protocol (DEPRECATED) SWANCTL_DESC= Install swanctl (requires VICI) TESTVECTOR_DESC= Enable crypto test vectors TPM_DESC= Enable TPM plugin UNBOUND_DESC= Enable DNSSEC-enabled resolver UNITY_DESC= Enable Cisco Unity extension plugin VICI_DESC= Enable VICI management protocol XAUTH_DESC= Enable XAuth password verification BUILTIN_DESC= Use builtin printf hooks LIBC_DESC= Use libc printf hooks VSTR_DESC= Use devel/vstr printf hooks # Extra options CURL_CONFIGURE_ON= --enable-curl CURL_LIB_DEPENDS= libcurl.so:ftp/curl EAPAKA3GPP2_CONFIGURE_ON= --enable-eap-aka --enable-eap-aka-3gpp2 EAPAKA3GPP2_LIB_DEPENDS=libgmp.so:math/gmp EAPDYNAMIC_CONFIGURE_ON=--enable-eap-dynamic EAPRADIUS_CONFIGURE_ON= --enable-eap-radius EAPSIMFILE_CONFIGURE_ON=--enable-eap-sim --enable-eap-sim-file GCM_CONFIGURE_ON= --enable-gcm IKEV1_CONFIGURE_OFF= --disable-ikev1 IPSECKEY_CONFIGURE_ON= --enable-ipseckey KERNELLIBIPSEC_CONFIGURE_ON= --enable-kernel-libipsec LOADTESTER_CONFIGURE_ON=--enable-load-tester LDAP_CONFIGURE_ON= --enable-ldap LDAP_USE= OPENLDAP=yes MEDIATION_CONFIGURE_ON= --enable-mediation MYSQL_CONFIGURE_ON= --enable-mysql MYSQL_USES= mysql PKI_CONFIGURE_OFF= --disable-pki SCEP_CONFIGURE_OFF= --disable-scepclient SMP_LIB_DEPENDS= libxml2.so:textproc/libxml2 SMP_CONFIGURE_ON= --enable-smp SQLITE_CONFIGURE_ON= --enable-sqlite SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 SWANCTL_CONFIGURE_ON= --enable-swanctl SWANCTL_IMPLIES= VICI TESTVECTOR_CONFIGURE_ON=--enable-test-vectors TPM_CONFIGURE_ON= --enable-tpm UNBOUND_CONFIGURE_ON= --enable-unbound UNBOUND_LIB_DEPENDS= libunbound.so:dns/unbound \ libldns.so:dns/ldns UNITY_CONFIGURE_ON= --enable-unity VICI_CONFIGURE_ON= --enable-vici XAUTH_CONFIGURE_ON= --enable-xauth-eap --enable-xauth-generic BUILTIN_CONFIGURE_ON= --with-printf-hooks=builtin LIBC_CONFIGURE_ON= --with-printf-hooks=glibc VSTR_CONFIGURE_ON= --with-printf-hooks=vstr VSTR_LIB_DEPENDS= libvstr.so:devel/vstr .include .if ${PORT_OPTIONS:MEAPSIMFILE} || ${PORT_OPTIONS:MEAPAKA3GPP2} PLIST_SUB+= SIMAKA="" .else PLIST_SUB+= SIMAKA="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MSQLITE} CONFIGURE_ARGS+= --enable-attr-sql --enable-sql PLIST_SUB+= SQL="" .else PLIST_SUB+= SQL="@comment " .endif .if ${PORT_OPTIONS:MIKEV1} || ${PORT_OPTIONS:MXAUTH} PLIST_SUB+= XAUTHGEN="" .else PLIST_SUB+= XAUTHGEN="@comment " .endif 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 Index: head/security/strongswan/files/patch-src_swanctl_Makefile.in =================================================================== --- head/security/strongswan/files/patch-src_swanctl_Makefile.in (nonexistent) +++ head/security/strongswan/files/patch-src_swanctl_Makefile.in (revision 494736) @@ -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. Property changes on: head/security/strongswan/files/patch-src_swanctl_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/strongswan/files/strongswan.in =================================================================== --- head/security/strongswan/files/strongswan.in (revision 494735) +++ head/security/strongswan/files/strongswan.in (revision 494736) @@ -1,37 +1,39 @@ #!/bin/sh # Start or stop strongswan # $FreeBSD$ # PROVIDE: strongswan # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown . /etc/rc.subr name=strongswan rcvar=strongswan_enable -extra_commands="reload statusall" - load_rc_config $name + +: ${strongswan_enable:=NO} + +extra_commands="reload statusall" command="%%PREFIX%%/sbin/ipsec" start_precmd="strongswan_precmd" stop_cmd="strongswan_cmd" status_cmd="strongswan_cmd" reload_cmd="strongswan_cmd" statusall_cmd="strongswan_cmd" strongswan_precmd() { command_args=${rc_arg} } strongswan_cmd() { ${command} ${rc_arg} } run_rc_command "$1"