Attachment 181834 Details for Bug 218238 – BROKEN_SSL version of previous patch

[patch] BROKEN_SSL version of previous patch

zabbix_libressl_broken_v2.diff (text/plain), 1.67 KB, created by Franco Fichtner on 2017-04-17 07:18:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2017-04-17 07:18:16 UTC

Size: 1.67 KB

patch

obsolete

>diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile
>index 8649a7f45e6f..dedd0610e904 100644
>--- a/net-mgmt/zabbix3-server/Makefile
>+++ b/net-mgmt/zabbix3-server/Makefile
>@@ -137,6 +137,8 @@ LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
> 
> OPENSSL_CONFIGURE_WITH=	openssl
> OPENSSL_USES=		ssl
>+OPENSSL_VARS=		BROKEN_SSL="libressl libressl-devel" \
>+			BROKEN_SSL_REASON="PSK is not provided by LibreSSL"
> 
> GNUTLS_CONFIGURE_WITH=	gnutls
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
>@@ -146,10 +148,6 @@ POLARSSL_LIB_DEPENDS=	libmbedtls.so:security/polarssl13
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${SSL_DEFAULT:Mlibressl*}
>-IGNORE=	requires PSK which is unsupported by the selected LibreSSL
>-.endif
>-
> post-patch:
> 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
> 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
>diff --git a/net-mgmt/zabbix32-server/Makefile b/net-mgmt/zabbix32-server/Makefile
>index b73802f7a45d..07f0f465eaa7 100644
>--- a/net-mgmt/zabbix32-server/Makefile
>+++ b/net-mgmt/zabbix32-server/Makefile
>@@ -137,6 +137,8 @@ LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
> 
> OPENSSL_CONFIGURE_WITH=	openssl
> OPENSSL_USES=		ssl
>+OPENSSL_VARS=		BROKEN_SSL="libressl libressl-devel" \
>+			BROKEN_SSL_REASON="PSK is not provided by LibreSSL"
> 
> GNUTLS_CONFIGURE_WITH=	gnutls
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
>@@ -146,10 +148,6 @@ POLARSSL_LIB_DEPENDS=	libmbedtls.so:security/polarssl13
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${SSL_DEFAULT:Mlibressl*}
>-IGNORE=	requires PSK which is unsupported by the selected LibreSSL
>-.endif
>-
> post-patch:
> 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
> 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'

Actions: View | Diff

Attachments on bug 218238: 181328 | 181834