commit: 4f6ceea34af488e1c32cdca99858ef4d41f2c9c1 Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja> AuthorDate: Tue Oct 10 10:59:47 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Oct 11 05:21:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6ceea3
net-misc/curl: update live ebuild for 8.4.0 - Update dependencies with minimum versions from docs - USE `alt-svc` and `hsts` now default enabled - `alt-svc` now required use for `nghttp3` + https://everything.curl.dev/libcurl-http/alt-svc#http-3 - properly reorder IUSE [sam: alt-svc/hsts are enabled by default now because they're broadly sensible things in 2023, and the USE flags themselves may go away soon and just become always-on, it's just a step towards that.] Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja> Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/curl/curl-9999.ebuild | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild index 6f07f5578572..392161f14af2 100644 --- a/net-misc/curl/curl-9999.ebuild +++ b/net-misc/curl/curl-9999.ebuild @@ -22,10 +22,10 @@ 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 +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 nghttp3 +openssl +pop3" +IUSE+=" +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_openssl curl_ssl_rustls" -IUSE+=" nghttp3" RESTRICT="!test? ( test )" # Only one default ssl provider can be enabled @@ -44,34 +44,37 @@ REQUIRED_USE=" curl_ssl_mbedtls? ( mbedtls ) curl_ssl_openssl? ( openssl ) curl_ssl_rustls? ( rustls ) - nghttp3? ( !openssl ) + nghttp3? ( + !openssl + alt-svc ) " # cURL's docs and CI/CD are great resources for confirming supported versions # particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.: -# - https://github.com/curl/curl/blob/master/docs/HTTP3.md -# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml +# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions) +# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly) +# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2) # However 'supported' vs 'works' are two entirely different things; be sane but # don't be afraid to require a later version. RDEPEND=" - sys-libs/zlib[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) nghttp3? ( >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}] >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] ) rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) ssl? ( gnutls? ( app-misc/ca-certificates - net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] + >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] dev-libs/nettle:=[${MULTILIB_USEDEP}] ) mbedtls? ( @@ -79,7 +82,7 @@ RDEPEND=" net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) openssl? ( - dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) rustls? ( net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]