Attachment 153435 Details for Bug 197824 – Updated patch for add GCM and SMP options plus pkgconfig fix

[patch] Updated patch for add GCM and SMP options plus pkgconfig fix

strongswan-5.2.2-gcm_smp_pkgconfig_ikev1_v1.1.patch (text/plain), 3.69 KB, created by Francois ten Krooden on 2015-02-24 12:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francois ten Krooden

Created: 2015-02-24 12:30:03 UTC

Size: 3.69 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 379411)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	strongswan
> PORTVERSION=	5.2.2
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://download.strongswan.org/ \
> 		http://download2.strongswan.org/
>@@ -12,7 +13,7 @@
> 
> LICENSE=	GPLv2
> 
>-USES=		execinfo libtool:keepla tar:bzip2
>+USES=		execinfo libtool:keepla tar:bzip2 pkgconfig
> USE_OPENSSL=	yes
> USE_RC_SUBR=	strongswan
> GNU_CONFIGURE=	yes
>@@ -39,9 +40,10 @@
> 		--with-group=wheel  \
> 		--with-lib-prefix=${PREFIX}
> 
>-OPTIONS_DEFINE=	CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE IKEv1 \
>-		IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MYSQL PKI SCEP SQLITE \
>-		TESTVECTOR UNBOUND XAUTH
>+OPTIONS_DEFINE=	CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE GCM IKEv1 \
>+		IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MYSQL PKI SCEP SMP \
>+		SQLITE TESTVECTOR UNBOUND XAUTH
>+OPTIONS_DEFAULT=	IKEv1
> OPTIONS_SUB=	yes
> CURL_DESC=	Enable CURL to fetch CRL/OCSP
> EAPAKA3GPP2_DESC=	Enable EAP AKA with 3gpp2 backend
>@@ -48,6 +50,7 @@
> 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
>@@ -55,6 +58,7 @@
> TESTVECTOR_DESC=	Enable crypto test vectors
> PKI_DESC=	Enable PKI tools
> SCEP_DESC=	Enable Simple Certificate Enrollment Protocol
>+SMP_DESC=	Enable XML-based management protocol
> UNBOUND_DESC=	Enable DNSSEC-enabled resolver
> XAUTH_DESC=	Enable XAuth password verification
> 
>@@ -66,6 +70,7 @@
> 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
>@@ -74,6 +79,8 @@
> LDAP_USE=		OPENLDAP=yes
> MYSQL_CONFIGURE_ON=	--enable-mysql
> MYSQL_USE=		MYSQL=yes
>+SMP_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
>+SMP_CONFIGURE_ON=	--enable-smp
> SQLITE_CONFIGURE_ON=	--enable-sqlite
> SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
> TESTVECTOR_CONFIGURE_ON=--enable-test-vectors
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 379411)
>+++ pkg-plist	(working copy)
>@@ -252,6 +252,11 @@
> %%CURL%%lib/ipsec/plugins/libstrongswan-curl.so
> %%CURL%%%%DATADIR%%/templates/config/plugins/curl.conf
> %%CURL%%@sample %%ETCDIR%%.d/charon/curl.conf.sample
>+%%GCM%%%%DATADIR%%/templates/config/plugins/gcm.conf
>+%%GCM%%lib/ipsec/plugins/libstrongswan-gcm.a
>+%%GCM%%lib/ipsec/plugins/libstrongswan-gcm.la
>+%%GCM%%lib/ipsec/plugins/libstrongswan-gcm.so
>+%%GCM%%%%ETCDIR%%.d/charon/gcm.conf.sample
> %%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.a
> %%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.la
> %%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.so
>@@ -330,6 +335,11 @@
> %%SCEP%%man/man8/scepclient.8.gz
> %%SCEP%%%%DATADIR%%/templates/config/strongswan.d/scepclient.conf
> %%SCEP%%@sample %%ETCDIR%%.d/scepclient.conf.sample
>+%%SMP%%%%DATADIR%%/templates/config/plugins/smp.conf
>+%%SMP%%lib/ipsec/plugins/libstrongswan-smp.a
>+%%SMP%%lib/ipsec/plugins/libstrongswan-smp.la
>+%%SMP%%lib/ipsec/plugins/libstrongswan-smp.so
>+%%SMP%%@sample %%ETCDIR%%.d/charon/smp.conf.sample
> %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.a
> %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.la
> %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.so

Flags:

strongswan: maintainer-approval+

Actions: View | Diff

Attachments on bug 197824: 153178 | 153417 | 153431 | 153433 | 153435