svn commit: r520074 - head/ftp/curl
Kubilay Kocak
koobs at FreeBSD.org
Sat Dec 14 00:13:11 UTC 2019
Author: koobs
Date: Sat Dec 14 00:13:11 2019
New Revision: 520074
URL: https://svnweb.freebsd.org/changeset/ports/520074
Log:
ftp/curl: Add NTLM option (Fix OpenSSL build w/o DES)
curl fails to build when OpenSSL is built without DES support, with many
"use of undeclared identifier" errors. For example:
curl_ntlm_core.c:392:3: error: use of undeclared identifier 'DES_key_schedule'
DES_key_schedule ks;
^
An issue was reported back in 2015 [1], requesting support for ./configure
detecting OPENSSL_NO_DES, but the issue was ultimately closed:
"We just don't support very custom OpenSSL builds. I could be talked into
accepting patches that introduce support for this however".
Accordingly and leui of an upstream configure patch, this change adds an
NTLM option, enabled by default, and when disabled, defines
CURL_DISABLE_NTLM, which prevents #define'ing USE_NTLM in
WRKSRC/lib/curl_setup.h, resulting in a successful build.
This allows users the opportunity to easily disable the DES requiring
functionality in curl, if they happen to run custom or stripped down
OpenSSL builds.
Note: This issue may impact builds with other SSL libraries that allow
disabling DES, but I did not investigate this question.
[1] https://sourceforge.net/p/curl/bugs/1439/
[2] Would require a version update, which granted, is mostly bugfixes
Reviewed by: sunpoet (maintainer)
Approved by: sunpoet (maintainer)
MFH: No [2]
Differential Revision: D22498
Modified:
head/ftp/curl/Makefile
Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile Fri Dec 13 23:39:22 2019 (r520073)
+++ head/ftp/curl/Makefile Sat Dec 14 00:13:11 2019 (r520074)
@@ -13,7 +13,7 @@ COMMENT= Command line tool and library for transferrin
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-OPTIONS_DEFINE= ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK PROXY PSL TLS_SRP
+OPTIONS_DEFINE= ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK NTLM PROXY PSL TLS_SRP
OPTIONS_GROUP= PROTOCOL
OPTIONS_RADIO= SSL
OPTIONS_SINGLE= GSSAPI RESOLV
@@ -21,7 +21,7 @@ OPTIONS_GROUP_PROTOCOL= DICT FTP GOPHER HTTP HTTP2 IMA
OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL WOLFSSL
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_SINGLE_RESOLV= CARES THREADED_RESOLVER
-OPTIONS_DEFAULT= ALTSVC CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP OPENSSL POP3 PROXY RESOLV RTSP SMTP TELNET TFTP THREADED_RESOLVER TLS_SRP
+OPTIONS_DEFAULT= ALTSVC CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP NTLM OPENSSL POP3 PROXY RESOLV RTSP SMTP TELNET TFTP THREADED_RESOLVER TLS_SRP
ALTSVC_DESC= HTTP Alternative Services support
CA_BUNDLE_DESC= Enable CA bundle for OpenSSL/GnuTLS/mbedTLS
COOKIES_DESC= Cookies support
@@ -119,6 +119,7 @@ NSS_CONFIGURE_WITH= nss
NSS_LIB_DEPENDS= libnss3.so:security/nss \
libnspr4.so:devel/nspr
NSS_USES= pkgconfig
+NTLM_CPPFLAGS_OFF= -DCURL_DISABLE_NTLM
OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE}
OPENSSL_CPPFLAGS= -I${OPENSSLINC}
OPENSSL_LDFLAGS= -L${OPENSSLLIB}
More information about the svn-ports-head
mailing list