Attachment 206138 Details for Bug 239458 – Updated patch for VIA Padlock plugin to fix pkg-plist

[patch] Updated patch for VIA Padlock plugin to fix pkg-plist

strongswan-via-padlock.diff (text/plain), 1.74 KB, created by Francois ten Krooden on 2019-07-29 09:53:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francois ten Krooden

Created: 2019-07-29 09:53:09 UTC

Size: 1.74 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 507347)
>+++ Makefile	(working copy)
>@@ -43,6 +43,7 @@
> 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 @@
> 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 @@
> 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>
> 
>@@ -136,6 +139,12 @@
> 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:
> .if ${PORT_OPTIONS:MVICI}
> 	${INSTALL_DATA} ${WRKSRC}/src/libcharon/plugins/vici/libvici.h \
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 507347)
>+++ pkg-plist	(working copy)
>@@ -393,3 +393,7 @@
> %%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

Flags:

strongswan: maintainer-approval+

Actions: View | Diff

Attachments on bug 239458: 206078 | 206081 | 206138