git: 22c3478564e7 - 2022Q2 - ftp/curl: Remove deprecated NSS option

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Fri, 13 May 2022 19:45:23 UTC
The branch 2022Q2 has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=22c3478564e7ec431eb300df63be18b705c6a614

commit 22c3478564e7ec431eb300df63be18b705c6a614
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-04-16 04:15:24 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-05-13 19:42:06 +0000

    ftp/curl: Remove deprecated NSS option
    
    - Update CA_BUNDLE_DESC: Remove unsupported mbedTLS
    
    PR:             262955
    Submitted by:   diizzy
    
    (cherry picked from commit c224916d09aa283920b6c016f61778e4e90ef577)
---
 ftp/curl/Makefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index b27356a0c4cd..ccebec9bb6b6 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -34,13 +34,13 @@ OPTIONS_GROUP=	PROTOCOL
 OPTIONS_RADIO=	SSL
 OPTIONS_SINGLE=	GSSAPI RESOLV
 OPTIONS_GROUP_PROTOCOL=	DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS LIBSSH2 MQTT POP3 RTMP RTSP SMB SMTP TELNET TFTP
-OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL WOLFSSL
+OPTIONS_RADIO_SSL=	GNUTLS 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 LIBSSH2 NTLM OPENSSL POP3 PROXY RTSP SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP
 OPTIONS_SUB=	yes
 ALTSVC_DESC=	HTTP Alternative Services support
-CA_BUNDLE_DESC=	Enable CA bundle for OpenSSL/GnuTLS/mbedTLS
+CA_BUNDLE_DESC=	Enable CA bundle for OpenSSL/GnuTLS
 COOKIES_DESC=	Cookies support
 CURL_DEBUG_DESC=cURL debug memory tracking
 DICT_DESC=	DICT (RFC 2229) support
@@ -108,10 +108,6 @@ LDAPS_CONFIGURE_ENABLE=	ldaps
 LIBSSH2_CONFIGURE_WITH=	libssh2
 LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
 MQTT_CONFIGURE_ENABLE=	mqtt
-NSS_CONFIGURE_WITH=	nss
-NSS_LIB_DEPENDS=	libnss3.so:security/nss \
-			libnspr4.so:devel/nspr
-NSS_USES=		pkgconfig
 NTLM_CONFIGURE_ENABLE=	ntlm
 OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
 OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
@@ -147,7 +143,7 @@ CONFIGURE_ARGS+=--with-ca-fallback
 IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
 .endif
 
-.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MWOLFSSL}
+.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MWOLFSSL}
 IGNORE=		only supports LDAPS with SSL
 .endif