Attachment 162538 Details for Bug 204098 – Add SWANCTL and fix libvici install

[patch] Add SWANCTL and fix libvici install

strongswan.diff (text/plain), 3.22 KB, created by Renato Botelho on 2015-10-28 19:56:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2015-10-28 19:56:42 UTC

Size: 3.22 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 400393)
>+++ Makefile	(working copy)
>@@ -17,7 +17,7 @@
> USE_OPENSSL=	yes
> USE_RC_SUBR=	strongswan
> GNU_CONFIGURE=	yes
>-USE_LDCONFIG=	yes
>+USE_LDCONFIG=	${PREFIX}/lib/ipsec
> INSTALL_TARGET=	install-strip
> 
> CONFIGURE_ARGS=	--enable-kernel-pfkey \
>@@ -42,7 +42,7 @@
> 
> OPTIONS_DEFINE=	CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE GCM IKEv1 \
> 		IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MYSQL PKI SCEP SMP \
>-		SQLITE TESTVECTOR UNBOUND UNITY VICI XAUTH
>+		SQLITE SWANCTL TESTVECTOR UNBOUND UNITY VICI XAUTH
> OPTIONS_DEFAULT=	IKEv1 BUILTIN
> OPTIONS_SINGLE=	PRINTF_HOOKS
> OPTIONS_SINGLE_PRINTF_HOOKS=	BUILTIN VSTR LIBC
>@@ -61,6 +61,7 @@
> PKI_DESC=	Enable PKI tools
> SCEP_DESC=	Enable Simple Certificate Enrollment Protocol
> SMP_DESC=	Enable XML-based management protocol (DEPRECATED)
>+SWANCTL_DESC=	Install swanctl
> UNBOUND_DESC=	Enable DNSSEC-enabled resolver
> UNITY_DESC=	Enable Cisco Unity extension plugin
> VICI_DESC=	Enable VICI management protocol
>@@ -88,6 +89,7 @@
> MYSQL_USE=		MYSQL=yes
> SMP_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
> SMP_CONFIGURE_ON=	--enable-smp
>+SWANCTL_CONFIGURE_ON=	--enable-swanctl
> SQLITE_CONFIGURE_ON=	--enable-sqlite
> SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
> TESTVECTOR_CONFIGURE_ON=--enable-test-vectors
>@@ -124,4 +126,14 @@
> 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 <bsd.port.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 400393)
>+++ pkg-plist	(working copy)
>@@ -338,6 +338,12 @@
> %%SMP%%lib/ipsec/plugins/libstrongswan-smp.la
> %%SMP%%lib/ipsec/plugins/libstrongswan-smp.so
> %%SMP%%@sample %%ETCDIR%%.d/charon/smp.conf.sample
>+%%SWANCTL%%%%DATADIR%%/templates/config/strongswan.d/swanctl.conf
>+%%SWANCTL%%sbin/swanctl
>+%%SWANCTL%%man/man5/swanctl.conf.5.gz
>+%%SWANCTL%%man/man8/swanctl.8.gz
>+%%SWANCTL%%@sample %%ETCDIR%%.d/swanctl.conf.sample
>+%%SWANCTL%%@sample etc/swanctl/swanctl.conf.sample
> %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.a
> %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.la
> %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.so
>@@ -358,6 +364,7 @@
> %%VICI%%lib/ipsec/plugins/libstrongswan-vici.la
> %%VICI%%lib/ipsec/plugins/libstrongswan-vici.so
> %%VICI%%@sample %%ETCDIR%%.d/charon/vici.conf.sample
>+%%VICI%%include/libvici.h
> %%XAUTH%%lib/ipsec/plugins/libstrongswan-xauth-eap.a
> %%XAUTH%%lib/ipsec/plugins/libstrongswan-xauth-eap.la
> %%XAUTH%%lib/ipsec/plugins/libstrongswan-xauth-eap.so
>@@ -424,3 +431,12 @@
> @dir etc/ipsec.d/ocspcerts
> @dir etc/ipsec.d/private
> @dir etc/ipsec.d/reqs
>+%%SWANCTL%%@dir etc/swanctl/ecdsa
>+%%SWANCTL%%@dir etc/swanctl/pkcs12
>+%%SWANCTL%%@dir etc/swanctl/pkcs8
>+%%SWANCTL%%@dir etc/swanctl/rsa
>+%%SWANCTL%%@dir etc/swanctl/x509
>+%%SWANCTL%%@dir etc/swanctl/x509aa
>+%%SWANCTL%%@dir etc/swanctl/x509ac
>+%%SWANCTL%%@dir etc/swanctl/x509ca
>+%%SWANCTL%%@dir etc/swanctl/x509crl

Actions: View | Diff

Attachments on bug 204098: 162538