commit: c7e3650b5e0363d6f3202ad1848043e4b0448b98
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Mon Jul 14 16:16:20 2025 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Mon Jul 14 16:16:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c7e3650b
net-misc/curl: sync ::gentoo
Signed-off-by: orbea <orbea <AT> riseup.net>
net-misc/curl/curl-8.12.1.ebuild | 2 --
net-misc/curl/curl-8.13.0-r1.ebuild | 14 ++++++++++----
net-misc/curl/curl-8.14.1.ebuild | 14 ++++++++++----
net-misc/curl/metadata.xml | 4 ++--
4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/net-misc/curl/curl-8.12.1.ebuild b/net-misc/curl/curl-8.12.1.ebuild
index aa75986..f18cc30 100644
--- a/net-misc/curl/curl-8.12.1.ebuild
+++ b/net-misc/curl/curl-8.12.1.ebuild
@@ -53,13 +53,11 @@ REQUIRED_USE="
)
curl_quic_openssl? (
curl_ssl_openssl
- quic
!gnutls
!mbedtls
!rustls
)
curl_quic_ngtcp2? (
- quic
!mbedtls
!rustls
)
diff --git a/net-misc/curl/curl-8.13.0-r1.ebuild
b/net-misc/curl/curl-8.13.0-r1.ebuild
index 0a29f83..46a8386 100644
--- a/net-misc/curl/curl-8.13.0-r1.ebuild
+++ b/net-misc/curl/curl-8.13.0-r1.ebuild
@@ -71,13 +71,11 @@ REQUIRED_USE="
)
curl_quic_openssl? (
curl_ssl_openssl
- quic
!gnutls
!mbedtls
!rustls
)
curl_quic_ngtcp2? (
- quic
!mbedtls
!rustls
)
@@ -250,6 +248,16 @@ multilib_src_configure() {
local -a tls_backend_opts
readarray -t tls_backend_opts < <(_get_curl_tls_configure_opts)
myconf+=("${tls_backend_opts[@]}")
+ if use quic; then
+ myconf+=(
+ $(use_with curl_quic_ngtcp2 ngtcp2)
+ $(use_with curl_quic_openssl openssl-quic)
+ )
+ else
+ # Without a REQUIRED_USE to ensure that QUIC was
requested when at least one default backend is
+ # enabled we need ensure that we don't try to build
QUIC support
+ myconf+=( --without-ngtcp2 --without-openssl-quic )
+ fi
else
myconf+=( --without-ssl )
einfo "SSL disabled"
@@ -286,8 +294,6 @@ multilib_src_configure() {
$(use_enable httpsrr)
$(use_with http2 nghttp2)
$(use_with http3 nghttp3)
- $(use_with curl_quic_ngtcp2 ngtcp2)
- $(use_with curl_quic_openssl openssl-quic)
)
# --enable/disable options
diff --git a/net-misc/curl/curl-8.14.1.ebuild b/net-misc/curl/curl-8.14.1.ebuild
index 274df97..7c96f91 100644
--- a/net-misc/curl/curl-8.14.1.ebuild
+++ b/net-misc/curl/curl-8.14.1.ebuild
@@ -71,13 +71,11 @@ REQUIRED_USE="
)
curl_quic_openssl? (
curl_ssl_openssl
- quic
!gnutls
!mbedtls
!rustls
)
curl_quic_ngtcp2? (
- quic
!mbedtls
!rustls
)
@@ -244,6 +242,16 @@ multilib_src_configure() {
local -a tls_backend_opts
readarray -t tls_backend_opts < <(_get_curl_tls_configure_opts)
myconf+=("${tls_backend_opts[@]}")
+ if use quic; then
+ myconf+=(
+ $(use_with curl_quic_ngtcp2 ngtcp2)
+ $(use_with curl_quic_openssl openssl-quic)
+ )
+ else
+ # Without a REQUIRED_USE to ensure that QUIC was
requested when at least one default backend is
+ # enabled we need ensure that we don't try to build
QUIC support
+ myconf+=( --without-ngtcp2 --without-openssl-quic )
+ fi
else
myconf+=( --without-ssl )
einfo "SSL disabled"
@@ -280,8 +288,6 @@ multilib_src_configure() {
$(use_enable httpsrr)
$(use_with http2 nghttp2)
$(use_with http3 nghttp3)
- $(use_with curl_quic_ngtcp2 ngtcp2)
- $(use_with curl_quic_openssl openssl-quic)
)
# --enable/disable options
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 497d1d0..2fa671c 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -16,10 +16,10 @@
<flag name="gnutls">Enable gnutls ssl backend</flag>
<flag name="gopher">Enable Gopher protocol support</flag>
<flag name="hsts">Enable HTTP Strict Transport Security</flag>
- <flag name="imap">Enable Internet Message Access Protocol
support</flag>
- <flag name="mbedtls">Enable mbedtls ssl backend</flag>
<flag name="http3">Enable HTTP/3 support</flag>
<flag name="httpsrr">Enable HTTPS Resource Record support</flag>
+ <flag name="imap">Enable Internet Message Access Protocol
support</flag>
+ <flag name="mbedtls">Enable mbedtls ssl backend</flag>
<flag name="openssl">Enable openssl ssl backend</flag>
<flag name="pop3">Enable Post Office Protocol 3 support</flag>
<flag name="progress-meter">Enable the progress meter</flag>
