From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C92F4158089 for ; Thu, 14 Sep 2023 03:41:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E216B2BC032; Thu, 14 Sep 2023 03:41:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93EFA2BC032 for ; Thu, 14 Sep 2023 03:41:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B3D6335C94 for ; Thu, 14 Sep 2023 03:41:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EA2711AA for ; Thu, 14 Sep 2023 03:41:08 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1694662813.0457bac499c5e9a2f733065d74c051f1cf938f10.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/curl/curl-8.3.0.ebuild net-misc/curl/curl-9999.ebuild X-VCS-Directories: net-misc/curl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0457bac499c5e9a2f733065d74c051f1cf938f10 X-VCS-Branch: master Date: Thu, 14 Sep 2023 03:41:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c222ed2e-9c75-4322-86a2-8729aaec997f X-Archives-Hash: 42d45efd1efd6ffbcb5713a246516406 commit: 0457bac499c5e9a2f733065d74c051f1cf938f10 Author: Sam James gentoo org> AuthorDate: Thu Sep 14 03:40:13 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Sep 14 03:40:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0457bac4 net-misc/curl: drop old configure args No revbump as it makes 0 diff. to the effective configuration as NSS was straight up removed in 8.3.0 and the rest are just reflecting defaults (renamed options anyway). Signed-off-by: Sam James gentoo.org> net-misc/curl/curl-8.3.0.ebuild | 27 +++++++++------------------ net-misc/curl/curl-9999.ebuild | 27 +++++++++------------------ 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/net-misc/curl/curl-8.3.0.ebuild b/net-misc/curl/curl-8.3.0.ebuild index 9bc62ec0c41d..8a2356959332 100644 --- a/net-misc/curl/curl-8.3.0.ebuild +++ b/net-misc/curl/curl-8.3.0.ebuild @@ -22,9 +22,9 @@ fi LICENSE="BSD curl ISC test? ( BSD-4 )" SLOT="0" -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" # These select the default SSL implementation -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls" IUSE+=" nghttp3" RESTRICT="!test? ( test )" @@ -35,14 +35,12 @@ REQUIRED_USE=" ^^ ( curl_ssl_gnutls curl_ssl_mbedtls - curl_ssl_nss curl_ssl_openssl curl_ssl_rustls ) ) curl_ssl_gnutls? ( gnutls ) curl_ssl_mbedtls? ( mbedtls ) - curl_ssl_nss? ( nss ) curl_ssl_openssl? ( openssl ) curl_ssl_rustls? ( rustls ) " @@ -78,11 +76,6 @@ RDEPEND=" app-misc/ca-certificates net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) - nss? ( - app-misc/ca-certificates - dev-libs/nss[${MULTILIB_USEDEP}] - dev-libs/nss-pem - ) openssl? ( dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) @@ -147,7 +140,7 @@ multilib_src_configure() { myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) if use ssl; then - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) if use gnutls; then multilib_is_native_abi && einfo "SSL provided by gnutls" @@ -157,10 +150,6 @@ multilib_src_configure() { multilib_is_native_abi && einfo "SSL provided by mbedtls" myconf+=( --with-mbedtls ) fi - if use nss; then - multilib_is_native_abi && einfo "SSL provided by nss" - myconf+=( --with-nss --with-nss-deprecated ) - fi if use openssl; then multilib_is_native_abi && einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) @@ -175,9 +164,6 @@ multilib_src_configure() { elif use curl_ssl_mbedtls; then multilib_is_native_abi && einfo "Default SSL provided by mbedtls" myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_nss; then - multilib_is_native_abi && einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) elif use curl_ssl_openssl; then multilib_is_native_abi && einfo "Default SSL provided by openssl" myconf+=( --with-default-ssl-backend=openssl ) @@ -206,7 +192,12 @@ multilib_src_configure() { myconf+=( $(use_enable alt-svc) - --enable-crypto-auth + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws --enable-dict --disable-ech --enable-file diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild index 9bc62ec0c41d..8a2356959332 100644 --- a/net-misc/curl/curl-9999.ebuild +++ b/net-misc/curl/curl-9999.ebuild @@ -22,9 +22,9 @@ fi LICENSE="BSD curl ISC test? ( BSD-4 )" SLOT="0" -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" # These select the default SSL implementation -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls" IUSE+=" nghttp3" RESTRICT="!test? ( test )" @@ -35,14 +35,12 @@ REQUIRED_USE=" ^^ ( curl_ssl_gnutls curl_ssl_mbedtls - curl_ssl_nss curl_ssl_openssl curl_ssl_rustls ) ) curl_ssl_gnutls? ( gnutls ) curl_ssl_mbedtls? ( mbedtls ) - curl_ssl_nss? ( nss ) curl_ssl_openssl? ( openssl ) curl_ssl_rustls? ( rustls ) " @@ -78,11 +76,6 @@ RDEPEND=" app-misc/ca-certificates net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) - nss? ( - app-misc/ca-certificates - dev-libs/nss[${MULTILIB_USEDEP}] - dev-libs/nss-pem - ) openssl? ( dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) @@ -147,7 +140,7 @@ multilib_src_configure() { myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) if use ssl; then - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) if use gnutls; then multilib_is_native_abi && einfo "SSL provided by gnutls" @@ -157,10 +150,6 @@ multilib_src_configure() { multilib_is_native_abi && einfo "SSL provided by mbedtls" myconf+=( --with-mbedtls ) fi - if use nss; then - multilib_is_native_abi && einfo "SSL provided by nss" - myconf+=( --with-nss --with-nss-deprecated ) - fi if use openssl; then multilib_is_native_abi && einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) @@ -175,9 +164,6 @@ multilib_src_configure() { elif use curl_ssl_mbedtls; then multilib_is_native_abi && einfo "Default SSL provided by mbedtls" myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_nss; then - multilib_is_native_abi && einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) elif use curl_ssl_openssl; then multilib_is_native_abi && einfo "Default SSL provided by openssl" myconf+=( --with-default-ssl-backend=openssl ) @@ -206,7 +192,12 @@ multilib_src_configure() { myconf+=( $(use_enable alt-svc) - --enable-crypto-auth + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws --enable-dict --disable-ech --enable-file