Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Aug 2019 01:59:58 +0000 (UTC)
From:      Koichiro Iwao <meta@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r509483 - head/security/strongswan
Message-ID:  <201908210159.x7L1xwus078170@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: meta
Date: Wed Aug 21 01:59:57 2019
New Revision: 509483
URL: https://svnweb.freebsd.org/changeset/ports/509483

Log:
  security/strongswan: Add support for the VIA Padlock plugin
  
  PR:		239458
  Submitted by:	Evgeny <mojolicious@yandex.com> (initial revision)
  		strongswan@Nanoteq.com (maintainer, brushed-up revision)
  Approved by:	strongswan@Nanoteq.com (maintainer)

Modified:
  head/security/strongswan/Makefile
  head/security/strongswan/pkg-plist

Modified: head/security/strongswan/Makefile
==============================================================================
--- head/security/strongswan/Makefile	Wed Aug 21 01:59:38 2019	(r509482)
+++ head/security/strongswan/Makefile	Wed Aug 21 01:59:57 2019	(r509483)
@@ -43,6 +43,7 @@ CONFIGURE_ARGS=	--enable-kernel-pfkey \
 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_DEFINE_i386=	VIA
 OPTIONS_DEFAULT=	BUILTIN CURL IKEV1 PKI SWANCTL VICI
 OPTIONS_SINGLE=	PRINTF_HOOKS
 OPTIONS_SINGLE_PRINTF_HOOKS=	BUILTIN LIBC VSTR
@@ -73,6 +74,7 @@ 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
+VIA_DESC=	Enable VIA Padlock support
 
 # Extra options
 CURL_CONFIGURE_ON=	--enable-curl
@@ -114,6 +116,7 @@ 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
+VIA_CONFIGURE_ON=	--enable-padlock
 
 .include <bsd.port.options.mk>
 
@@ -134,6 +137,12 @@ PLIST_SUB+=	SQL="@comment "
 PLIST_SUB+=	XAUTHGEN=""
 .else
 PLIST_SUB+=	XAUTHGEN="@comment "
+.endif
+
+# Hack to disable VIA in plist of unsupported architectures
+.if ! ${OPTIONS_DEFINE:MVIA}
+PLIST_SUB+=	VIA="@comment "
+.else
 .endif
 
 post-install:

Modified: head/security/strongswan/pkg-plist
==============================================================================
--- head/security/strongswan/pkg-plist	Wed Aug 21 01:59:38 2019	(r509482)
+++ head/security/strongswan/pkg-plist	Wed Aug 21 01:59:57 2019	(r509483)
@@ -393,3 +393,7 @@ sbin/ipsec
 %%SWANCTL%%@dir etc/swanctl/x509ca
 %%SWANCTL%%@dir etc/swanctl/x509crl
 %%SWANCTL%%@dir etc/swanctl/x509ocsp
+%%VIA%%%%DATADIR%%/templates/config/plugins/padlock.conf
+%%VIA%%lib/ipsec/plugins/libstrongswan-padlock.la
+%%VIA%%lib/ipsec/plugins/libstrongswan-padlock.so
+%%VIA%%@sample %%ETCDIR%%.d/charon/padlock.conf.sample



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