From nobody Sat Apr 16 04:25:22 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0EDF67CECBF; Sat, 16 Apr 2022 04:25:24 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KgKql2qnbz3PbQ; Sat, 16 Apr 2022 04:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650083123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i4mCtJi8r0Od0+3aAJuDzDgHniB0gyU4yfV4j5QuBiA=; b=sbBjJsVgIc0NSOeW41sgUfnyb/WPdZDRrsGxgRa1hWx6amSML8U+dej/2cdZDHJDHM4/kg ojK64vE7MQjXDvRSLIZyD3jX+JW8ZWg5w/I9D0zOas/mVjRLtMA2mxufTYKYmJLR3z6o3S GIrtI093EDqfeerRKBW5E3qHj30BVULTzdkj/ZL2ndWdkq2qhuGwSqvHo8mEr4GPkYyGQl rPTsfWj6LlLwfdNWGfLrt2q5DhfMW06SQ7sDwWqZKSfhnNAugAPBtKXjJ7Q94JmO72czNW dF637S9isKo/QUd+ezrP99NYOQqIACzfpuliO7OSuVHD1yOi3dCXKRL/uDkkNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1AEC522E63; Sat, 16 Apr 2022 04:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23G4PMdf008694; Sat, 16 Apr 2022 04:25:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23G4PMoU008693; Sat, 16 Apr 2022 04:25:22 GMT (envelope-from git) Date: Sat, 16 Apr 2022 04:25:22 GMT Message-Id: <202204160425.23G4PMoU008693@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: c224916d09aa - main - ftp/curl: Remove deprecated NSS option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c224916d09aa283920b6c016f61778e4e90ef577 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650083123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i4mCtJi8r0Od0+3aAJuDzDgHniB0gyU4yfV4j5QuBiA=; b=y2rbbHl7ItEjDc9NcjyEUmc7Q5vFFZOhBXZ3sQLysy2LsHS5UPO0/y7TzO4Z29hwiEpZb4 mYZBob1HaT3qTcCUVZ5mUMhv23CxKWD4go/RzAs6hi0AWkuwo52beRp57vGA8kVcuL4FNg zVsXOFwaPU3o5ZBZhdE+oWiGisQNtymWFNV+Vt1btWCscy73ic2+7WWjBEfbuDUL+gLsSK thTX0X/o98L7F3PEW3Opev3iFvDebRp/o3ru3CQZxthWDPlh8UXUR41E9n9xvfU7Ijel4R /LGbdeECWnk+FBEbPRrGQCodHqd2Mp90DJMmlf98yGl/+PSblJwWuneDC2HluA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650083123; a=rsa-sha256; cv=none; b=edY3w4oLINLZW5efdMQNCQhSE4yo4wvUr+nMZLOf+6/NNACFJ74P2tfRYN8QowD1rOycCT HKh0jyX2jkDy3xR+kII78Xp33HLabZrbVVFEiyCZ9FwIdCyJIerxkvt7qEgqZPGjC5V0CV K+KNwM9wqSMH/QXuFht1PGn5h5IRxDj2uAqciE0c7sqOjVLRIUUAMSxBCZMLQ5fxIM+8FO FtQWEY8j/TQtZbHuR+C2TAy6Ndns1FTGS5Uc8BoTElhIKz2v5jMlHx+YK03EBckAiye6k4 qPANyGMpSaEkXZIgF44hCKnFS+ieDX8hDDq3/S814VcnQAQLXxtkKA9bLJWguA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c224916d09aa283920b6c016f61778e4e90ef577 commit c224916d09aa283920b6c016f61778e4e90ef577 Author: Po-Chuan Hsieh AuthorDate: 2022-04-16 04:15:24 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-04-16 04:19:52 +0000 ftp/curl: Remove deprecated NSS option - Update CA_BUNDLE_DESC: Remove unsupported mbedTLS PR: 262955 Submitted by: diizzy --- 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