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 E89E2158020 for ; Sun, 11 Dec 2022 22:50:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DAF34E0826; Sun, 11 Dec 2022 22:50:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BE1F8E0826 for ; Sun, 11 Dec 2022 22:50:40 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0E8534120D for ; Sun, 11 Dec 2022 22:50:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3F4577D for ; Sun, 11 Dec 2022 22:50:37 +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: <1670799024.13c4058a167d8061a2f5615bc19a5333855d8b0c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/base/, profiles/features/wd40/, profiles/arch/amd64/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/curl/curl-7.86.0-r3.ebuild net-misc/curl/metadata.xml profiles/arch/amd64/package.use.mask profiles/arch/amd64/package.use.stable.mask profiles/arch/base/package.use.mask profiles/features/wd40/package.use.mask X-VCS-Directories: profiles/arch/base/ profiles/features/wd40/ profiles/arch/amd64/ net-misc/curl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 13c4058a167d8061a2f5615bc19a5333855d8b0c X-VCS-Branch: master Date: Sun, 11 Dec 2022 22:50:37 +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: 1875502a-09b0-408c-a5ce-2fda87ebbdf4 X-Archives-Hash: 158cbada234d3bd6dc6eab76b503f2e3 commit: 13c4058a167d8061a2f5615bc19a5333855d8b0c Author: Sam James gentoo org> AuthorDate: Sun Dec 11 01:04:36 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 11 22:50:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c4058a net-misc/curl: add rustls support Bug: https://bugs.gentoo.org/885099 Signed-off-by: Sam James gentoo.org> net-misc/curl/curl-7.86.0-r3.ebuild | 16 +++++++++++++--- net-misc/curl/metadata.xml | 1 + profiles/arch/amd64/package.use.mask | 4 ++++ profiles/arch/amd64/package.use.stable.mask | 4 ++++ profiles/arch/base/package.use.mask | 4 ++++ profiles/features/wd40/package.use.mask | 4 ++++ 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/net-misc/curl/curl-7.86.0-r3.ebuild b/net-misc/curl/curl-7.86.0-r3.ebuild index 50c94270b54b..c66e10b796b0 100644 --- a/net-misc/curl/curl-7.86.0-r3.ebuild +++ b/net-misc/curl/curl-7.86.0-r3.ebuild @@ -13,8 +13,8 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz LICENSE="curl" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" +IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" IUSE+=" nghttp3 quiche" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc @@ -26,6 +26,7 @@ REQUIRED_USE=" curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl + curl_ssl_rustls ) )" @@ -52,6 +53,9 @@ RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) dev-libs/nss-pem app-misc/ca-certificates ) + rustls? ( + net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] + ) ) http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) nghttp3? ( @@ -134,6 +138,10 @@ multilib_src_configure() { einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) fi + if use rustls || use curl_ssl_rustls; then + einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi if use curl_ssl_gnutls; then einfo "Default SSL provided by gnutls" @@ -147,6 +155,9 @@ multilib_src_configure() { elif use curl_ssl_openssl; then einfo "Default SSL provided by openssl" myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) else eerror "We can't be here because of REQUIRED_USE." fi @@ -224,7 +235,6 @@ multilib_src_configure() { $(use_with nghttp3 ngtcp2) $(use_with quiche) $(use_with rtmp librtmp) - --without-rustls --without-schannel --without-secure-transport $(use_enable websockets) diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml index 1ed68e6f5340..e33f2001ba38 100644 --- a/net-misc/curl/metadata.xml +++ b/net-misc/curl/metadata.xml @@ -22,6 +22,7 @@ Enable Post Office Protocol 3 support Enable the progress meter Enable RTMP Streaming Media support + Enable Rustls ssl backend Enable Simple Mail Transfer Protocol support Enable SSH urls in curl using libssh2 Enable crypto engine support (via openssl if USE='-gnutls -nss') diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 28b8e5f5dfe1..1508843cecf7 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Sam James (2022-12-11) +# net-libs/rustls-ffi is keyworded here +net-misc/curl -rustls -curl_ssl_rustls + # Andrew Ammerlaan (2022-12-06) # Quick Sync Video (through intel-mediasdk or oneVPL) is # only keyworded on amd64 diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index 212a3c74ea9f..06a6b1164832 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Sam James (2022-12-11) +# net-libs/rustls-ffi is not yet marked stable +net-misc/curl rustls curl_ssl_rustls + # Sam James (2022-12-07) # Needs unstable media-libs/oneVPL media-libs/gst-plugins-bad qsv diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 309971ea4bfd..b0af11dbc968 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2022-12-11) +# Unkeyworded dependencies +net-misc/curl rustls curl_ssl_rustls + # Andrew Ammerlaan (2022-12-06) # Quick Sync Video (through intel-mediasdk or oneVPL) is # only keyworded on amd64 diff --git a/profiles/features/wd40/package.use.mask b/profiles/features/wd40/package.use.mask index c86a7036962d..a61e76346525 100644 --- a/profiles/features/wd40/package.use.mask +++ b/profiles/features/wd40/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2022-12-11) +# net-libs/rustls-ffi needs Rust. +net-misc/curl rustls curl_ssl_rustls + # matoro (2022-12-01) # tree-sitter-grammar.eclass adds dev-util/tree-sitter-cli as test dep dev-libs/tree-sitter-bash test