commit: 29dd1c858ed575209765e1233f5090984e1eee10
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 10 06:13:51 2025 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 06:14:45 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dd1c85
net-misc/curl: add 8.16.0
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
net-misc/curl/Manifest | 6 +-
.../{curl-8.16.0_rc2.ebuild => curl-8.16.0.ebuild} | 0
net-misc/curl/curl-8.16.0_rc3.ebuild | 439 ---------------------
3 files changed, 2 insertions(+), 443 deletions(-)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index c2701e8afb7a..4b4076cb267c 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -6,7 +6,5 @@ DIST curl-8.14.1.tar.xz 2817248 BLAKE2B
4ce2277d143084823855b714e86047a94d4c52a6
DIST curl-8.14.1.tar.xz.asc 488 BLAKE2B
f664f526dbffa0a1af2b28f51982445f7d9064b3c3b3e6dd04322003db22da2acde5d493c80204b36a9219d42959543c5a0aee47f2365eb713490ff2fc5f475f
SHA512
663b1652bb27338310d1475a8b0422f04e68fca74be11a4b7120de948af4fc0c2b08b75ce5372d657aa89504a27b36b937b5091cb2d932297a7490d5e390d99f
DIST curl-8.15.0.tar.xz 2773156 BLAKE2B
ae809be87f34d079413129c27e618a6d15c2bf9087fd7e679cefe9b6d8645f0dd092e8c3e1f62b7bd0dffdd0b77e0bc5ac031ffce4e50060ec20b280618c8e68
SHA512
d27e316d70973906ac4b8d2c280f7e99b7528966aa1220c13a38ed45fca2ed6bbde54b8a9d7bed9e283171b92edb621f7b95162ef7d392e6383b0ee469de3191
DIST curl-8.15.0.tar.xz.asc 488 BLAKE2B
4b0bab065a1d2d5b7e5d49989bd4953344d844cafd3036b4cb2ed2dec82e59031832f05c06dc6a801e4668d92c936df74aeff7a5f2c15ff614da4b1673a67501
SHA512
b6aef1c6a1f32c60401494df565a748fa96c1d5098138772c22f6208bafeb8e61402f3077cbc274ea2c05f35ff376d8f736c58554520f8d20fded36d876499a5
-DIST curl-8.16.0-rc2.tar.xz 2782952 BLAKE2B
2d8d28532cb424d63b6a3d9c69d35d19ab3f534f440ffebdb39458b4e2d771ac0804b83d482512a9325202b9447498d6003de6377a304213c2f35e4a17a5c365
SHA512
7cc4f56a05634c651cf7224d3844359498d127f259e531aadefe86f6df3a7fc5f6644c296407d38867ddb716fe3e4951d377592f6d977c196ad1a733374e608f
-DIST curl-8.16.0-rc2.tar.xz.asc 488 BLAKE2B
9d3488e369b8e437359e25785cfb3addbb1cfb81ef74dd8c16f3466ca643efc4f3ccc7864de20fb70c65024406882770d221c5f7ee90da16f07fe13825a71549
SHA512
c180343f1037cf51eb32c61035a4da7e728c2ee7f8d4ca1d464545b9b4044b30963e6b1ce424951a151ff901d7c7f4d56e7a54dacc581fc2c5c3b54349c155eb
-DIST curl-8.16.0-rc3.tar.xz 2785600 BLAKE2B
393381819337fca038ccc12a4fae3290a28a56322b803f7a72ef541b39235b03a7916d52df94c64c725c4b1e98928f0d1874fad999d7984dbce19bfc0055bc47
SHA512
119e00ac9c150ac1d61ce5eeb522168b8a1c68d6576077400222170e0bd9b25dbe53182166a194058e58831a8768c1b7d9145fd5051c4e13bcd12841eb3a7284
-DIST curl-8.16.0-rc3.tar.xz.asc 488 BLAKE2B
8057c9dc6171799fbbb4399291415fd452c0efbf09ea8594eeb572be9f097fd4f0d9db4389b1438daad5a4765c7b8ee59d6ae2bc90d23f46aaf92180b3418029
SHA512
50e484772ac1e8390222ce21702c6995c96b4da99d1e0f2e233b7226b48b5ce3a290d6050963e1e2c519b9a29d2ded7134d3bd4e765a946a8abbae3c67e31d32
+DIST curl-8.16.0.tar.xz 2788632 BLAKE2B
573d56779481abf0b7d20225bba4f068cb726f23f69ce10076438e32cc6c16d1229c211aee05fc5e3e9cb9d78bbfdc5da0d8b73e730c0865879000eb90accf6a
SHA512
8262c3dc113cfd5744ef1b82dbccaa69448a9395ad5c094c22df5cf537a047a927d3332db2cb3be12a31a68a60d8d0fa8485b916e975eda36a4ebd860da4f621
+DIST curl-8.16.0.tar.xz.asc 488 BLAKE2B
d213bd447c668118b49b7356dc99e710de927b93f81325802bae5e286b61481da6ed30f23c7f4f3cfb0f01222db88602ff4e510f4a1401e98511eb0c72ac6abb
SHA512
591568e997c0d955a00152ce5bdfb4586d84b42f5c1e15df503514fb4eb4bf289a98b1ebdad23913119c67c27d51a6e6f4065ee6f7657b971c3a581c928a0d82
diff --git a/net-misc/curl/curl-8.16.0_rc2.ebuild
b/net-misc/curl/curl-8.16.0.ebuild
similarity index 100%
rename from net-misc/curl/curl-8.16.0_rc2.ebuild
rename to net-misc/curl/curl-8.16.0.ebuild
diff --git a/net-misc/curl/curl-8.16.0_rc3.ebuild
b/net-misc/curl/curl-8.16.0_rc3.ebuild
deleted file mode 100644
index f9ed048bec45..000000000000
--- a/net-misc/curl/curl-8.16.0_rc3.ebuild
+++ /dev/null
@@ -1,439 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should subscribe to the 'curl-distros' ML for backports etc
-# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
-# https://lists.haxx.se/listinfo/curl-distros
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs
verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/";
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/curl/curl.git";
-else
- if [[ ${P} == *rc* ]]; then
- CURL_URI="https://curl.se/rc/";
- S="${WORKDIR}/${P//_/-}"
- else
- CURL_URI="https://curl.se/download/";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos
~ppc-macos ~x64-macos ~x64-solaris"
- fi
- SRC_URI="
- ${CURL_URI}${P//_/-}.tar.xz
- verify-sig? ( ${CURL_URI}${P//_/-}.tar.xz.asc )
- "
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-IUSE="+adns +alt-svc brotli debug ech +ftp gnutls gopher +hsts +http2 +http3
+httpsrr idn +imap kerberos ldap"
-IUSE+=" mbedtls +openssl +pop3 +psl +quic rtmp rustls samba sasl-scram +smtp
ssh ssl static-libs test"
-IUSE+=" telnet +tftp +websockets zstd"
-# These select the default tls implementation / which quic impl to use
-IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls
+curl_ssl_openssl curl_ssl_rustls"
-RESTRICT="!test? ( test )"
-
-# HTTPS RR is technically usable with the threaded resolver, but it still uses
c-ares to
-# ask for the HTTPS RR record type; if DoH is in use the HTTPS record will be
requested
-# in addition to A and AAAA records.
-
-# To simplify dependency management in the ebuild we'll require c-ares for
HTTPS RR (for now?).
-# HTTPS RR in cURL is a dependency for:
-# - ECH (requires patched openssl or gnutls currently, enabled with rustls)
-# - Fetching the ALPN list which should provide a better HTTP/3 experience.
-
-# Only one default ssl / quic provider can be enabled
-# The default provider needs its USE satisfied
-# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL
offers any benefit at all in the modern day.
-# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
-REQUIRED_USE="
- ech? ( rustls )
- httpsrr? ( adns )
- quic? (
- ^^ (
- curl_quic_openssl
- curl_quic_ngtcp2
- )
- http3
- ssl
- )
- ssl? (
- ^^ (
- curl_ssl_gnutls
- curl_ssl_mbedtls
- curl_ssl_openssl
- curl_ssl_rustls
- )
- )
- curl_quic_openssl? (
- curl_ssl_openssl
- !gnutls
- !mbedtls
- !rustls
- )
- curl_quic_ngtcp2? (
- curl_ssl_gnutls
- !mbedtls
- !openssl
- !rustls
- )
- curl_ssl_gnutls? ( gnutls )
- curl_ssl_mbedtls? ( mbedtls )
- curl_ssl_openssl? ( openssl )
- curl_ssl_rustls? ( rustls )
- http3? ( alt-svc httpsrr quic )
-"
-
-# 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/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/http3-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.
-# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls
backend at a time.
-RDEPEND="
- >=sys-libs/zlib-1.2.5[${MULTILIB_USEDEP}]
- adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
- http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
- http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
- idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
- psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
- quic? (
- curl_quic_openssl? (
>=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
- curl_quic_ngtcp2? (
>=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
- )
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh2-1.2.8[${MULTILIB_USEDEP}] )
- sasl-scram? ( >=net-misc/gsasl-2.2.0[static-libs?,${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- app-misc/ca-certificates
-
>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
- dev-libs/nettle:=[${MULTILIB_USEDEP}]
- )
- mbedtls? (
- app-misc/ca-certificates
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
- )
- openssl? (
-
>=dev-libs/openssl-1.0.2:=[static-libs?,${MULTILIB_USEDEP}]
- )
- rustls? (
- >=net-libs/rustls-ffi-0.15.0:=[${MULTILIB_USEDEP}]
- )
- )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- dev-lang/perl
- virtual/pkgconfig
- test? (
- sys-apps/diffutils
- http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
- http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
- )
- verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/curl-config
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
- __builtin_available
- closesocket
- CloseSocket
- getpass_r
- ioctlsocket
- IoctlSocket
- mach_absolute_time
- setmode
- _fseeki64
- # custom AC_LINK_IFELSE code fails to link even without -Werror
- OSSL_QUIC_client_method
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-prefix-5.patch"
- "${FILESDIR}/${PN}-respect-cflags-3.patch"
-)
-
-src_prepare() {
- default
-
- eprefixify curl-config.in
- eautoreconf
-}
-
-# Generates TLS-related configure options based on USE flags.
-# Outputs options suitable for appending to a configure options array.
-_get_curl_tls_configure_opts() {
- local tls_opts=()
-
- local backend flag_name
- for backend in gnutls mbedtls openssl rustls; do
- if [[ "$backend" == "openssl" ]]; then
- flag_name="ssl"
- tls_opts+=( "--with-ca-path=${EPREFIX}/etc/ssl/certs")
- else
- flag_name="$backend"
- fi
-
- if use "$backend"; then
- tls_opts+=( "--with-${flag_name}" )
- else
- # If a single backend is enabled, 'ssl' is required,
openssl is the default / fallback
- if ! [[ "$backend" == "openssl" ]]; then
- tls_opts+=( "--without-${flag_name}" )
- fi
- fi
- done
-
- if use curl_ssl_gnutls; then
- multilib_is_native_abi && einfo "Default TLS backend: gnutls"
- tls_opts+=( "--with-default-ssl-backend=gnutls" )
- elif use curl_ssl_mbedtls; then
- multilib_is_native_abi && einfo "Default TLS backend: mbedtls"
- tls_opts+=( "--with-default-ssl-backend=mbedtls" )
- elif use curl_ssl_openssl; then
- multilib_is_native_abi && einfo "Default TLS backend: openssl"
- tls_opts+=( "--with-default-ssl-backend=openssl" )
- elif use curl_ssl_rustls; then
- multilib_is_native_abi && einfo "Default TLS backend: rustls"
- tls_opts+=( "--with-default-ssl-backend=rustls" )
- else
- eerror "We can't be here because of REQUIRED_USE."
- die "Please file a bug, hit impossible condition w/ USE=ssl
handling."
- fi
-
- # Explicitly Disable unimplemented backends
- tls_opts+=(
- --without-amissl
- --without-wolfssl
- )
-
- printf "%s\n" "${tls_opts[@]}"
-}
-
-multilib_src_configure() {
- # We make use of the fact that later flags override earlier ones
- # So start with all ssl providers off until proven otherwise
- # TODO: in the future, we may want to add wolfssl
(https://www.wolfssl.com/)
- local myconf=()
-
- myconf+=( --without-ca-fallback
--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
- if use ssl; then
- 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"
- fi
-
- # These configuration options are organised alphabetically by
category/type
-
- # Protocols
- # `grep SUPPORT_PROTOCOLS=\" configure.ac | awk '{ print substr($2, 1,
length($2)-1)}' | sort`
- # Assume that anything omitted (that is not new!) is enabled by default
with no deps
- myconf+=(
- --enable-file
- $(use_enable ftp)
- $(use_enable gopher)
- --enable-http
- $(use_enable imap) # Automatic IMAPS if TLS is enabled
- $(use_enable ldap ldaps)
- $(use_enable ldap)
- $(use_enable pop3)
- $(use_enable samba smb)
- $(use_with ssh libssh2) # enables scp/sftp
- $(use_with rtmp librtmp)
- --enable-rtsp
- $(use_enable smtp)
- $(use_enable telnet)
- $(use_enable tftp)
- $(use_enable websockets)
- )
-
- # Keep various 'HTTP-flavoured' options together
- myconf+=(
- $(use_enable alt-svc)
- $(use_enable hsts)
- $(use_enable httpsrr)
- $(use_with http2 nghttp2)
- $(use_with http3 nghttp3)
- )
-
- # --enable/disable options
- # `grep -- --enable configure | grep Check | awk '{ print $4 }' | sort`
- myconf+=(
- $(use_enable adns ares)
- --enable-aws
- --enable-basic-auth
- --enable-bearer-auth
- --enable-cookies
- --enable-dateparse
- --enable-dict
- --enable-digest-auth
- --enable-dnsshuffle
- --enable-doh
- $(use_enable ech)
- --enable-http-auth
- --enable-ipv6
- --enable-kerberos-auth
- --enable-largefile
- --enable-manual
- --enable-mime
- --enable-negotiate-auth
- --enable-netrc
- --enable-ntlm
- --enable-progress-meter
- --enable-proxy
- --enable-rt
- --enable-socketpair
- --disable-sspi
- $(use_enable static-libs static)
- --enable-symbol-hiding
- --enable-tls-srp
- --disable-versioned-symbols
- )
-
- # --with/without options
- # `grep -- --with configure | grep Check | awk '{ print $4 }' | sort`
- myconf+=(
- $(use_with brotli)
-
--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
- $(use_with idn libidn2)
- $(use_with kerberos gssapi "${EPREFIX}"/usr)
- $(use_with sasl-scram libgsasl)
- $(use_with psl libpsl)
- --without-quiche
- --without-schannel
- --without-winidn
- --with-zlib
-
--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
- $(use_with zstd)
- )
-
- # Test deps (disabled)
- myconf+=(
- --without-test-caddy
- --without-test-httpd
- --without-test-nghttpx
- )
-
- if use debug; then
- myconf+=(
- --enable-debug
- )
- fi
-
- if use test && multilib_is_native_abi && ( use http2 || use http3 );
then
- myconf+=(
- --with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
- )
- fi
-
- # Since 8.12.0 adns/c-ares and the threaded resolver are mutually
exclusive
- # This is in support of some work to enable `httpsrr` to use adns and
the rest
- # of curl to use the threaded resolver; for us `httpsrr` is conditional
on adns.
- if use adns; then
- myconf+=(
- --disable-threaded-resolver
- )
- else
- myconf+=(
- --enable-threaded-resolver
- )
- fi
-
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
- if ! multilib_is_native_abi; then
- # Avoid building the client (we just want libcurl for multilib)
- sed -i -e '/SUBDIRS/s:src::' Makefile || die
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
- fi
-
-}
-
-multilib_src_compile() {
- default
-
- if multilib_is_native_abi; then
- # Shell completions
- ! tc-is-cross-compiler && emake -C scripts
- fi
-}
-
-# There is also a pytest harness that tests for bugs in some very specific
-# situations; we can rely on upstream for this rather than adding additional
test deps.
-multilib_src_test() {
- # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
- # -n: no valgrind (unreliable in sandbox and doesn't work correctly on
all arches)
- # -v: verbose
- # -a: keep going on failure (so we see everything that breaks, not just
1st test)
- # -k: keep test files after completion
- # -am: automake style TAP output
- # -p: print logs if test fails
- # Note: if needed, we can skip specific tests. See e.g. Fedora's
packaging
- # or just read https://github.com/curl/curl/tree/master/tests#run.
- # Note: we don't run the testsuite for cross-compilation.
- # Upstream recommend 7*nproc as a starting point for parallel tests, but
- # this ends up breaking when nproc is huge (like -j80).
- # The network sandbox causes tests 241 and 1083 to fail; these are
typically skipped
- # as most gentoo users don't have an 'ip6-localhost'
- multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p
-j$((2*$(makeopts_jobs))) !241 !1083"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi; then
- # Shell completions
- ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}"
install
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete || die
- rm -rf "${ED}"/etc/ || die
-}
-
-pkg_postinst() {
- if use debug; then
- ewarn "USE=debug has been selected, enabling debug codepaths
and making cURL extra verbose."
- ewarn "Use this _only_ for testing. Debug builds should _not_
be used in anger."
- ewarn "hic sunt dracones; you have been warned."
- fi
-}
