From nobody Wed Oct 11 13:12:17 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 4S5Cq55MQcz4xN4V; Wed, 11 Oct 2023 13:12:17 +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 4S5Cq54GDdz3DDb; Wed, 11 Oct 2023 13:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697029937; 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=l+Wr/Q88iKq0ecOS+9CNG9cBgq1NBzXMBjRGflpMaIk=; b=m95V5jjjNBNEwiVjcz3blGPn1XJ6Kn7TRpSE4Rx0Myrf6ALGGVDQYzxD6JPcB3nSH8ocDK sAn+8JFB6Kb6QewedfAZqXAPsKu2s4tdVycZGgiQBV3Xrlsjy4y6UCTKLZSTfA1ZyBRdyO Eg46Z4uZtKtgRdj5RRMeCtzkB1R5Z8gTZdPSsIV4+y0wohk/Ssu585ir9lUzaMx+k+5quO GfVFNEQa51Tfo80Q/+VFYyqwBgzlsBSa0AjijJvp5wosisVWI+ydMrnrvJ0n3tuLijFwwc CQ/k2Xjj1mg+8fOMRmyzAJyqzj5uQXe659gMMSLJzsGwtGFTdIefUVL0iU+b1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697029937; a=rsa-sha256; cv=none; b=PPCQiqtXSpRIojIYsMUWpghX4rBk29SHLC4BXYm0nkMGuq+DZriQcYmHKxb+Ay3+JJkXpA OiygVWJvZlx5+NnoZDatdWHA9BJSC9770LNwwmAWSPHJYtcezg+GVQaF2klsZJLA1Vq/ww iJe0qLHzBbOlyJ1pjSkzgUWhW7kdGZGWsyekiViU2mQYALHEHMs/++VdlRDn5WppBbLuxH G9b2hxjH2so2EKcQTD8fcJUiLg/VkpzqcUNtdCXDtNjfsxv55v7OgBrWmHNmH1C0QJ328Z 6in7I7G7GMACcqP/BmNhY5IBh0t5teaCXmSZok3hFfchb54CXYk3fEuDmTIqfA== 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=1697029937; 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=l+Wr/Q88iKq0ecOS+9CNG9cBgq1NBzXMBjRGflpMaIk=; b=YCfvCrqtKOC2BIeAmeGBSmRqSbXhy8mYWZmfjW0s04Wssw4dShUbRX+FKRSI9vDCeaXOrZ 8ao9PUyryqwcZ7PjXFmXY+X0aZaLKXDlGnSFq68eQfJvgPsAcohkFVAdqoFz/AuWFbFCDX p826yUTqf+MAe2N0tGfzf7rWiS8aFFC/XIHjZvK65zFstzFi7Rk6Pz4EVEr/aInflPGzEL YqSndeJZ2ERYOrbbhOtxVWqlIdLyvQx2MOwnH2oJuvnGXUdVGjxr0AgOGhqHdkt3oi0qJX OLIQfWtVZ1kJ4Cpk1N362Feq/hmD3Pp7I2Efx4Giu69kpU9oJAJwWXZDxCBQ+g== 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 4S5Cq53KdFz7c5; Wed, 11 Oct 2023 13:12:17 +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 39BDCHBp071055; Wed, 11 Oct 2023 13:12:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BDCHlT071052; Wed, 11 Oct 2023 13:12:17 GMT (envelope-from git) Date: Wed, 11 Oct 2023 13:12:17 GMT Message-Id: <202310111312.39BDCHlT071052@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: 7e391f798bae - 2023Q4 - ftp/curl: Convert to options helper 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: 7e391f798baea59a5b3ef50675d42cc32bfc8717 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e391f798baea59a5b3ef50675d42cc32bfc8717 commit 7e391f798baea59a5b3ef50675d42cc32bfc8717 Author: Po-Chuan Hsieh AuthorDate: 2023-10-08 12:28:17 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-10-11 13:11:56 +0000 ftp/curl: Convert to options helper (cherry picked from commit aabdfa405a77f8ecabb504e2bde73aae57488ad0) --- ftp/curl/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 2f41a9caf739..2d5b51fdca99 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -26,10 +26,10 @@ 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 + --with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \ + --without-ca-bundle \ + --without-ca-path CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ ac_cv_func_SSLv2_client_method=no GNU_CONFIGURE= yes @@ -86,6 +86,7 @@ CURL_DEBUG_CONFIGURE_ENABLE= curldebug DEBUG_CONFIGURE_ENABLE= debug DICT_CONFIGURE_ENABLE= dict FTP_CONFIGURE_ENABLE= ftp +GNUTLS_CONFIGURE_ON= --with-ca-fallback GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ libnettle.so:security/nettle @@ -123,6 +124,7 @@ LIBSSH2_CONFIGURE_WITH= libssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 MQTT_CONFIGURE_ENABLE= mqtt NTLM_CONFIGURE_ENABLE= ntlm +OPENSSL_CONFIGURE_ON= --with-ca-fallback OPENSSL_CONFIGURE_WITH= openssl=${OPENSSLBASE} OPENSSL_CPPFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} @@ -150,10 +152,6 @@ ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include -.if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL} -CONFIGURE_ARGS+=--with-ca-fallback -.endif - .if ((!${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}) || (${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mlibressl*})) && ${PORT_OPTIONS:MTLS_SRP} IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS .endif