From nobody Wed Oct 11 13:12:16 2023 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 4S5Cq45MQGz4xNCr; Wed, 11 Oct 2023 13:12:16 +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 4S5Cq43DF5z3DDD; Wed, 11 Oct 2023 13:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697029936; 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=HTsjrxQuZRQny7caj4ncCkCcQGukAZZmkp6pBZNyK+g=; b=H5KNFX6jgYhfi44HnFZ5VfGx9OR5pw73IBiQ/wbA1LNdTsy+041hAuGoOpvnNTtz0r67UV EA6p/M5L37IMzJSzYdpX1ulxrAPcmovN59VqctaYQzhAiXheZol4GPmQbYnGkE2dQbnAbw 7tBNYlgw9Wbd2k7fP2URbBcZvEplRZG0N2Xp+UlfofllFgUUWiS7fpIu8RfJK7m5iyiWKV NJ7q0n1Njvwdo6UTQJGL9R9O9LJ4stgDn5VsyiSuLguNAionhyzBH0WyVukqP2EqpsJ4o1 9IKA/HgNGPq4vJPnwLCo3YopEjc2z6byqoTUyqKaXO29IOCbj85FJtGVBQ6Crg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697029936; a=rsa-sha256; cv=none; b=KsWl2oJ8KCJ/t52RVoxyxx0gw+tioVKlPXD6W4Tqskwh22+6ZshLiqK4HEYyUKvVomZsgS KVhQS+xIyAKSCDOdY3KlkClAvkXL6ofWqGhT0329OG33psBEx9Gv+Phj1FcF1QEeNgflZi SOpkLnhorL7ZvoKGj9uK1swdT9K658AZ1oRrmHUY8B61BAnN2cyNzjiaHHYTxmIBRRTmIz oHWQYh2ZfWiRJ1VFAOOoCCm028NZVBE6XPmdgtyh5F3rlcD5KyYpZuw1d0Bsc0qFNblzdZ RxNEDYs6qKDk8EHYKYZmC678lQijkNH+7Ahax9/jyq+WJuSqVHDkC36EgQ5DhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697029936; 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=HTsjrxQuZRQny7caj4ncCkCcQGukAZZmkp6pBZNyK+g=; b=POB1B14MxBZAmimsRgt4VtFxQVMfh4eqviDf9Mw5LkcsMTF9VtS+6B+2m/HgPFknxhBR7Q +jZLSqfIg+NCWhnJrmpy1hjTKVE1qhekPhh7KlxiZrWADFGCiR3dgvVm6ziyxWbIjI76tw NLRa7P78g6xrCAczbiKU26TNbtamYUdVr6WuFr0XD1zi0/bx7rTwfGAS7RE/fJYWt/DJwF iL82cZ9NOHxxqHj23LrcKXstKyLxfbjBtS8iIForcIThi1iHURXPNF0giptdUPVunOvr8k j7btMaAkIdUSsxOxBrCwVyFbbdk/JYIUT47fVMXdwX7JYyCJUp2rStgYFudtiA== 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 4S5Cq42J2Wz7YY; Wed, 11 Oct 2023 13:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39BDCGVO071013; Wed, 11 Oct 2023 13:12:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BDCGBw071010; Wed, 11 Oct 2023 13:12:16 GMT (envelope-from git) Date: Wed, 11 Oct 2023 13:12:16 GMT Message-Id: <202310111312.39BDCGBw071010@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: 1d1638a22946 - 2023Q4 - ftp/curl: Always use the default trust store instead of ca_root_nss. 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 1d1638a2294600a16ec5f7e8ca091e848cd616de Auto-Submitted: auto-generated The branch 2023Q4 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d1638a2294600a16ec5f7e8ca091e848cd616de commit 1d1638a2294600a16ec5f7e8ca091e848cd616de Author: Dag-Erling Smørgrav AuthorDate: 2023-10-08 12:04:32 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-10-11 13:11:56 +0000 ftp/curl: Always use the default trust store instead of ca_root_nss. MFH: 2023Q4 Reviewed by: sunpoet Differential Revision: https://reviews.freebsd.org/D42039 (cherry picked from commit 4881eceec92a58dae0979a2744fe71fca8675cf9) --- ftp/curl/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index da6937efb7d3..2f41a9caf739 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -1,5 +1,6 @@ PORTNAME= curl PORTVERSION= 8.3.0 +PORTREVISION= 1 CATEGORIES= ftp net www MASTER_SITES= https://curl.se/download/ \ https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/ @@ -25,6 +26,8 @@ CONFIGURE_ARGS= --disable-werror \ --enable-netrc \ --enable-openssl-auto-load-config \ --enable-progress-meter \ + --without-ca-bundle \ + --without-ca-path \ --with-fish-functions-dir=${LOCALBASE}/share/fish/completions \ --with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ @@ -38,7 +41,7 @@ CPE_VENDOR= haxx SHEBANG_FILES= */*.pl -OPTIONS_DEFINE= ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 NTLM PROXY PSL STATIC TLS_SRP ZSTD +OPTIONS_DEFINE= ALTSVC BROTLI COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 NTLM PROXY PSL STATIC TLS_SRP ZSTD OPTIONS_GROUP= PROTOCOL OPTIONS_RADIO= SSL OPTIONS_SINGLE= GSSAPI RESOLV @@ -46,10 +49,9 @@ OPTIONS_GROUP_PROTOCOL= DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS LIBSSH LIBSSH 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 PSL RTSP SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP +OPTIONS_DEFAULT=ALTSVC COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP LIBSSH2 NTLM OPENSSL POP3 PROXY PSL 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 COOKIES_DESC= Cookies support CURL_DEBUG_DESC=cURL debug memory tracking DICT_DESC= DICT (RFC 2229) support @@ -76,8 +78,6 @@ WEBSOCKET_DESC= WebSocket support (experimental) ALTSVC_CONFIGURE_ENABLE=alt-svc BROTLI_CONFIGURE_WITH= brotli BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli -CA_BUNDLE_CONFIGURE_WITH= ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt -CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss CARES_CONFIGURE_ENABLE= ares CARES_LIB_DEPENDS= libcares.so:dns/c-ares CARES_USES= pkgconfig @@ -150,7 +150,7 @@ ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include -.if !${PORT_OPTIONS:MCA_BUNDLE} && (${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL}) +.if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL} CONFIGURE_ARGS+=--with-ca-fallback .endif