From 8d55b366522f467a22d8bff812f317f3670849d0 Mon Sep 17 00:00:00 2001 From: bdrewery Date: Wed, 24 Jun 2015 17:21:30 +0000 Subject: Prevent building a broken curl when using the openssl port when GSSAPI_BASE set. Without this curl would link to both /usr/lib/libssl.so and /usr/local/lib/libssl.so resulting in a crash at runtime. Bump revision as current builds are broken at runtime and need to be rebuilt. PR: 200555 Submitted by: truckman Approved by: maintainer timeout --- ftp/curl/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'ftp/curl') diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index eee4fb9589fa..3a082ae4da82 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -3,6 +3,7 @@ PORTNAME= curl PORTVERSION= 7.43.0 +PORTREVISION= 1 CATEGORIES= ftp www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet @@ -161,11 +162,14 @@ IGNORE= only supports LDAPS with SSL 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} == "security/libressl" IGNORE= unsupported TLS-SRP in LibreSSL .endif .endif -- cgit