From owner-svn-ports-all@freebsd.org Sat Dec 14 00:13:11 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9CD2E1DB21F; Sat, 14 Dec 2019 00:13:11 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47ZSfv3grjz3DGN; Sat, 14 Dec 2019 00:13:11 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 797DB1C510; Sat, 14 Dec 2019 00:13:11 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBE0DBpw036747; Sat, 14 Dec 2019 00:13:11 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBE0DB77036746; Sat, 14 Dec 2019 00:13:11 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201912140013.xBE0DB77036746@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Sat, 14 Dec 2019 00:13:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520074 - head/ftp/curl X-SVN-Group: ports-head X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: head/ftp/curl X-SVN-Commit-Revision: 520074 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Dec 2019 00:13:11 -0000 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}