From nobody Fri May 13 19:45:23 2022 X-Original-To: dev-commits-ports-all@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 682D31AD9B83; Fri, 13 May 2022 19:45:23 +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 4L0Jyq27zGz4tLZ; Fri, 13 May 2022 19:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652471123; 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=JqKh+xRUheK8ViyKiz1cB+tYxsPmA2JfUll4eNVY2ME=; b=UFmEmJaHmOV3Hj3dOaZfuTPR1CgITfvh0taaVDO483/x3F/KNwppYfeFSOp+er1IB7RxCH xc2ys/cTvXpfWfKLteUbJI5stdKECpfWIzsR6Zur/ETM4WFjddoNp2hLxCEEXeyani+gD6 qTajSO3OkjTCX9soy4gnama1pq9m1nwsSzPzDpoYbTGbwnmTyugX5y6H1RizHExSqpIx8o xvcxnflxnzJcUbNPrK8q3X5Vn0OgLHXt3IGQaX6yRFtiScCwIWd5EtA11IV7z1fjZVjQ3u uwxLuRInyw2A+suQzNtCh03nK/gv1bHyPE/tL+gwqakDC0nRa8kWsaBfxg8wgg== 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 2ABE1E21; Fri, 13 May 2022 19:45: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 24DJjN20020873; Fri, 13 May 2022 19:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DJjNKI020872; Fri, 13 May 2022 19:45:23 GMT (envelope-from git) Date: Fri, 13 May 2022 19:45:23 GMT Message-Id: <202205131945.24DJjNKI020872@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 22c3478564e7 - 2022Q2 - ftp/curl: Remove deprecated NSS option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 22c3478564e7ec431eb300df63be18b705c6a614 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652471123; 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=JqKh+xRUheK8ViyKiz1cB+tYxsPmA2JfUll4eNVY2ME=; b=Xx997P090nlh0bz5Km+h7NIA0gEdxc0RF5+5euwuayfTmwYEC6LXp4jyvS6pcat214xsFZ pXeKU9ippJemA3KT8j0h9E/wFnE2yxAg0+icypuEXF9EpvpP8KoGGD4zcYAU3c4FSvsFst rXH5p1KpGNm0tw0+VjB95T03oqQ9DCZqwwiHlV4kJRS8Tg+U/6nrR08oXSkmlk6liomSeI BJQWor679eu3CBx02E4CvEBWojyeHliP5H6KU6Xa9J1io3IwVtHa6Nd82jZjeaXsFCxcsn Jj6ZmvdC4rfCilhsHwm2tYdFtuE78ouUBJq4hsDK5FOUlLyICHdqkitx3fUv/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652471123; a=rsa-sha256; cv=none; b=MDhhr9YPTX2qqSnvZNbOXNFtBS0GyL1bB0aqgJ/BMEDnfMCPSb+F3879q8nW8R8s7ZeIfy W8C3GtHiSGRPbbC3/oFwBaMcAZu9Co7+P5BAjmYVD1wdlE7o2owuLi+YfnOT1zwLGlFv2p KqQxY/nEgxvVoI0V//YYDI2faXkDyBR5mbghipoROLMSZ7gSEWCq7b4+YyqbHeB1ORBS3I Rh5R1YP7mvuA24Use7rMZgZsiurBIGm+KPb2uxq28r9PY9kGgUurv9nkSucMZn8onA95yc lb72eyTDxG9JTCyMJ/3A0pHm5IolTr1TawgDPWdl1+bWiDi7U2mdibynsZdBrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=22c3478564e7ec431eb300df63be18b705c6a614 commit 22c3478564e7ec431eb300df63be18b705c6a614 Author: Po-Chuan Hsieh AuthorDate: 2022-04-16 04:15:24 +0000 Commit: Po-Chuan Hsieh 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