gentoo auto-resync : 12:12:2022 - 03:24:14

3 files changed, 17 insertions, 6 deletions

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 3b50c547452f..1b54231711b5 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -14,5 +14,5 @@ DIST curl-7.86.0.tar.xz.asc 488 BLAKE2B a9abe2f3af801b3a48be7db09cb82b6bb83bd26a
 EBUILD curl-7.84.0.ebuild 8365 BLAKE2B 60758e9c23ab94612542434e0adb6602602128e455aff50c8f9da2cbdb58e27fa396bfd0011a3c461ac519e6faa25712ec80351bad3b45a7faf758aefdcbade6 SHA512 9d53b069da866f1acf875ee8615a11c8e0d5f8a88011f85ab7c8ec6e301de0d693df09d265670f0ae758aac5b923bd02a79ee0beffe5bc1454830ac876d1a652
 EBUILD curl-7.85.0-r2.ebuild 8204 BLAKE2B ca20481a8128774d80ec96082c8d6c2ec4f469d871952643819e85db0ed1fdbfaf63d5a2b162697e97a9a77e0662da1e7635a3cf831c1ee76efedddbf9650a40 SHA512 ab0805b4f80d6b58b4c8f1faad3a958da334c69e49e1a3c855a3adabd23d0e45fa274ac0c770e05a77334b4d37d36410b30c64abaff35992ce95b93d24106eb1
 EBUILD curl-7.86.0-r2.ebuild 8367 BLAKE2B c7463df2a9da87728a6dec7b241e87e9b79eac01ec997f03548b2fc2c3e63749fff1b4b29fbbc317c6fbf2be784ba1b7e4599bb6e030a1dbd5692b89e1753667 SHA512 3f1d304dcde76fd82e7718cd393453bf772eede1627e594726627ade378f8e18b05073c6769d4cf5c6b553504dfa15c95e9e9e75b4aa6681e57a467d3be983f5
-EBUILD curl-7.86.0-r3.ebuild 8444 BLAKE2B 923149cab4e2faef1e6d9ce4d400e7f8155939f545e24fd17ca35f314d99b878db28dd566c83b421fab41277946c8b323ba62632947378041c2563c41d11806c SHA512 1d790a87d4c249f82bf64b666803b2013232bd5856afaadf2787d4ecb16c59dcfa9175a7db4db0cc2b21b874dab1c7a28081f54958722cf5a838b94853e4449c
-MISC metadata.xml 2103 BLAKE2B beb97305069a47f8eee68278dca5c0f10467d374c9fdab2ea27808b79a68cd921e2ab60bbb2455cbce2cdcada72e8c68290b40ec87ba31dad6ea580820f5c800 SHA512 27c15624622b074926307369bb41ad6cf532300154a70573618a072418358f5fc543eb56873e9836703073e8b42134a0387f3077e741377827a685cbf69faaab
+EBUILD curl-7.86.0-r3.ebuild 8782 BLAKE2B 98b86edcf8bfdc1f555f73cab27b27cc0422988566dc1ffb5b4da7aca9fe8570228c385042ae7558108bd0328597d1da6f8f139bdac387348169e54b6d6a4adb SHA512 5dc9fb4d5a5e3f7d5bc8686f7db138ebee444d5054381d7e85679bc0768784da8b13d5cfb1c221a4a7ba74a8ca82d5d6f7ab807589e25e15fbbbac202863c92e
+MISC metadata.xml 2158 BLAKE2B 2b99163e490c531d73aa8c62d428ff4e994537b140e159548d74d52a7c46a2b5e04c992a541298253464f7eaab447d7a680140aadc6b33ecd7d69c35b6aaf6c5 SHA512 a3313197aeedaa7f347e3b6b791d8e5e3bda4292225afcc457ec21cd883347c4cdccaeaa79a7c212e061fdb339be3706815d425d09d8511a4d984f9318164797
diff --git a/net-misc/curl/curl-7.86.0-r3.ebuild b/net-misc/curl/curl-7.86.0-r3.ebuild
index 50c94270b54b..fb34199c73a2 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? (
@@ -116,7 +120,7 @@ multilib_src_configure() {
 	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
 	#myconf+=( --without-default-ssl-backend )
 	if use ssl ; then
-		myconf+=( --without-gnutls --without-mbedtls --without-nss )
+		myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls )
 
 		if use gnutls || use curl_ssl_gnutls; then
 			einfo "SSL provided by gnutls"
@@ -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 @@
 		<flag name="pop3">Enable Post Office Protocol 3 support</flag>
 		<flag name="progress-meter">Enable the progress meter</flag>
 		<flag name="rtmp">Enable RTMP Streaming Media support</flag>
+		<flag name="rustls">Enable Rustls ssl backend</flag>
 		<flag name="smtp">Enable Simple Mail Transfer Protocol support</flag>
 		<flag name="ssh">Enable SSH urls in curl using libssh2</flag>
 		<flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>