From nobody Sun Oct 08 12:05:08 2023 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 4S3LT14Z7Fz4wSck; Sun, 8 Oct 2023 12:05:09 +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 4S3LT04rPSz4Mq0; Sun, 8 Oct 2023 12:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696766708; 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=CheCIpKsumUFsF8Xxn+rnAT4Onp9YVpDB4M0r0AlB58=; b=UFGD/hHIG6yZh5yCrtP/8x2fTAppNeM7JqkWyWJtQcpgwdFJ+eI57+lJsdrfEimJ8ET5mP PJFxAWGj8hF8/mA17iKKBYEGY80eSRfotkNWESTA7DTDUYaTtNRDgtuueiTJSZLAlFH6O5 9c8F3XnrGOxUnNRHxWdMztyMUzH2KbknolxvPvxTQOn7xvjpFVLOI01gN8liOFNP3Dam2w VSwkqKkYAEeuDQB5MxM77Rhez3Lyzwz93u+ZjmlxO5nalkO/rJTwo3OpVpVx44W6JQ7rMQ fuA6q/SObtlEdXcBa6wjt2dON/68jyVUb0512tgubF4+FHQg37LwzE/S67sFMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696766708; a=rsa-sha256; cv=none; b=iW8tC6e8qsq9F8KeCD+kp5NqQpMhSv+USKh7WjHbZuFPNiczheQo0Zf99o69JPM+QOtTcL pfRrTCietAmHtg6Po05kznEf8JkVi+gaLUhwK76JqfNIRvUDac9taaMKgiSIBIKLOPWBuo 5bsALd+zMhV0rYhAWbR15C7PyThphXXP3BB+lMJ3uLgJGf56kW9ts47P5xWPJFKXE7Wjv1 BGuorBKqYQdBcdU7oY8wJXvj6n1iw6qkkUK8swoYKVlaerc4vRmNNHQMKFFEU4iMu6BK04 rl7Wh9CH+2PVu5duDhr+nFaNw1Drlb0vfOQPZPCAmMiB4Cdnk7o8uUSsaYFmyA== 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=1696766708; 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=CheCIpKsumUFsF8Xxn+rnAT4Onp9YVpDB4M0r0AlB58=; b=jCnW5YiSxfVcxHW6QePpIE+wut2fjQJ4BbvZ03peV7ldtl3oJuy/kj7BLJNWwD9zMlz87N 09fItn9K57pZ7AMkTHRnxDsJKd2jAflmP5jVJLgXqjLKptoJ4RIv8ZLzezZCIBK5eoIDEo 9Zkx8VcyQcSemVgggZ8M65ZCXy40JURYz4AputXjkcAa6+YLtvUEPTp9zeaqndkG522KKv Ij0bjj1Sb2A2SQd4PwydOxZ5ZyhnssdJMqcheBVkOgSCGetUMBnw2HVxq+87w7p+3UoVx7 66qexTHFnvm9QaS+R2px5SOL6AYdLhNuGyzCPlVhv4Jp3qiRPg4qQOUvd6iT0g== 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 4S3LT03vYvz1B3N; Sun, 8 Oct 2023 12:05:08 +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 398C58RM057638; Sun, 8 Oct 2023 12:05:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 398C58Ea057635; Sun, 8 Oct 2023 12:05:08 GMT (envelope-from git) Date: Sun, 8 Oct 2023 12:05:08 GMT Message-Id: <202310081205.398C58Ea057635@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4881eceec92a - main - ftp/curl: Always use the default trust store instead of ca_root_nss. 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: des X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4881eceec92a58dae0979a2744fe71fca8675cf9 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/ports/commit/?id=4881eceec92a58dae0979a2744fe71fca8675cf9 commit 4881eceec92a58dae0979a2744fe71fca8675cf9 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-08 12:04:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-08 12:04:58 +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 --- 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