Attachment 157314 Details for Bug 200555 – patch to improve OPENSSL vs. GSSAPI_BASE sanity check

[patch] patch to improve OPENSSL vs. GSSAPI_BASE sanity check

openssl.patch (text/plain), 1.40 KB, created by Don Lewis on 2015-05-31 22:05:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Lewis

Created: 2015-05-31 22:05:57 UTC

Size: 1.40 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 388001)
>+++ Makefile	(working copy)
>@@ -136,8 +136,8 @@
> THREADED_RESOLVER_CONFIGURE_ON=	--enable-threaded-resolver
> TLS_SRP_CONFIGURE_OFF=	--disable-tls-srp
> TLS_SRP_CONFIGURE_ON=	--enable-tls-srp
>-WOLFSSL_CONFIGURE_OFF=	--without-cyassl	 
>-WOLFSSL_CONFIGURE_ON=	--with-cyassl=${LOCALBASE}	 
>+WOLFSSL_CONFIGURE_OFF=	--without-cyassl
>+WOLFSSL_CONFIGURE_ON=	--with-cyassl=${LOCALBASE}
> WOLFSSL_LIB_DEPENDS=	libwolfssl.so:${PORTSDIR}/security/wolfssl
> 
> .include <bsd.port.options.mk>
>@@ -162,11 +162,15 @@
> IGNORE=		only supports LIBSSH2 with OpenSSL
> .endif
> 
>-.if ${PORT_OPTIONS:MOPENSSL} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"
>+.if ${PORT_OPTIONS:MOPENSSL} && ( \
>+	defined(WITH_OPENSSL_PORT) || \
>+	(!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)) || \
>+	(defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"))
> .if ${PORT_OPTIONS:MGSSAPI_BASE}
>-IGNORE=		with GSSAPI_BASE, configure failed to detect OpenSSL/LibreSSL from ports and link against base OpenSSL
>+IGNORE=		with GSSAPI_BASE, configure failed to detect OpenSSL/LibreSSL from ports and links against base OpenSSL
> .endif
>-.if ${PORT_OPTIONS:MTLS_SRP}
>+.if ${PORT_OPTIONS:MTLS_SRP} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "sec
>+urity/libressl"
> IGNORE=		unsupported TLS-SRP in LibreSSL
> .endif
> .endif

Actions: View | Diff

Attachments on bug 200555: 157314