From: "Matt Jolly" <kangie@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/, net-misc/curl/files/
Date: Fri, 30 May 2025 11:44:58 +0000 (UTC) [thread overview]
Message-ID: <1748605486.63db447b09a4ceab8124032fb6076a1b1165e07f.kangie@gentoo> (raw)
commit: 63db447b09a4ceab8124032fb6076a1b1165e07f
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Fri May 30 11:28:58 2025 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Fri May 30 11:44:46 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63db447b
net-misc/curl: drop 8.14.0_rc2, 8.14.0_rc3
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
net-misc/curl/Manifest | 4 -
net-misc/curl/curl-8.14.0_rc2.ebuild | 436 --------------------
net-misc/curl/curl-8.14.0_rc3.ebuild | 437 ---------------------
.../curl/files/curl-8.14.0-brew-not-found.patch | 36 --
4 files changed, 913 deletions(-)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index ee9393b32910..a21c7e37b495 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,9 +2,5 @@ DIST curl-8.12.1.tar.xz 2768160 BLAKE2B 2b3e3d91041881c0951ad470736266105d3b9720
DIST curl-8.12.1.tar.xz.asc 488 BLAKE2B 2a6563609c9f7ada84ca2c7048ad9406809eef4cc958760d2ab3d1b7be58d26247e579bd025870609e80ebb00295026aae30614b84e3a81bdf3ed3dbd0f5ed70 SHA512 41fc5582935090d13940d86974fdea3ea901dd5dab156c16029a87f811d2535172c59dc8dc366f2ffc37bcf85accbecb5aa765bc7b83c2991a3ef402bf25af69
DIST curl-8.13.0.tar.xz 2773628 BLAKE2B 6869634ad50f015d5c7526699034d5a3f27d9588bc32eacc8080dbd6c690f63b1f25cee40d3fdf8fd9dd8535c305ea9c5edf1d5a02bc6d9ce60fd8c88230aca0 SHA512 d266e460f162ee455b56726e5b7247b2d1aa5265ae12081513fc0c5c79e785a594097bc71d505dc9bcd2c2f6f1ff6f4bab9dbd9d120bb76d06c5be8521a8ca7d
DIST curl-8.13.0.tar.xz.asc 488 BLAKE2B bd568ec32a44ef7c14c38e4830bcc7711dac726e950325292f1e5de76e619839685300c5afac32330127324327e71ce0d6e574f6e95bcc4a48957345152bc86a SHA512 07f79c7fd7c305c96e10a5f52797254aed7d2a1f3577c8626b8d617855ceb82634ac6787bfa0b7130a4ed72c3a9945d3c9ba5b7be54df8bafa07ded1c62ef2be
-DIST curl-8.14.0-rc2.tar.xz 2812028 BLAKE2B afd110e546d35b0c11879ec1b99e1783579b785eed35d2713fdb0686773a14b2452e31f52f1f29762abac0d913c7f88bc8b4afc9bebb0bce91a4f446338150f4 SHA512 2e769a712db69f37c2e3b855248fd17290bd62cfc553b2e56a418efef69307010cdf8f42e08eb457900c98c52bc37d007caced2647f616ab0facb2f3c14a416a
-DIST curl-8.14.0-rc2.tar.xz.asc 488 BLAKE2B 0a326bfee0ca400ad61b43a95a55a1f726d470d680352440710a1563d2987114357fabeb032860d585032cd7dca19082cb2840104a53f12dbea4dfed72edccae SHA512 89d9c26200a2c1fee49782df396ba11b323debe7226441c4fa00eb96a0d245b47c157c84060bdd4d46105d8cdb7198639c42bcd1594c40318e31dc3f73f8e514
-DIST curl-8.14.0-rc3.tar.xz 2816044 BLAKE2B 97c7269fff76e4c5e61f1e99e5f96a8a0428c329246da689b79d989ead9c5e5a79e520ce762b0cebfdbe3cb97bdac7c6d46f432cc2abf333cb2d1bb1581d8959 SHA512 aadbb930ca9515a51674230adefa5e5e3a74747d8e402830a49ed780986435a06e57e31e14b25dd8ebf63fc658feb1bd1d77f006487ccf26952456bf38377654
-DIST curl-8.14.0-rc3.tar.xz.asc 488 BLAKE2B 0a79f17d90de77e2cf4f44c3e8fc12796c42b893b7cbdfcef30bff3d34cbe5f1f4ec3058ee554d89d1195b80a1287c133495bc95e17d66539b2fb9978b00a2ca SHA512 96196422bb944cea65d5f4f2f54938bd6b90ab6a85bf84c55f805be03d9d10d6d37f3d814dd3adafd5e8a51c2c80d4e85ac97b33c2ba55a7d27f335ba2070e6b
DIST curl-8.14.0.tar.xz 2819512 BLAKE2B d8b7d58e6923366265a1d95d3a6f14002729dfb95d88b17ec925d096bd199b206f6c9645e1e4be3bc2d295e8898c35990eda6f45329396f38753725907e402a1 SHA512 d9f49cac0b93dbc53879713cc017392b4277d84b489bbf2ef3b585c6a50eea6c3a7b80043286b34062af04329560f2dc321f315b0038ce93435aa9bbcaec1eea
DIST curl-8.14.0.tar.xz.asc 488 BLAKE2B 9fa2fe756d7c170b4fc883bd0c23eb103d947e8328d56ea3dea53403d3cd01626ada943595179955f55a77eb8f4da65b5e4d74fe5627fc8c5ab4d88efbb5df3e SHA512 7c147ddb5e141dd9951e2ef6b23fa120318c0e631fb36861b80fce61b4b19ca08273a6b95627f46a8172945fb51bd790ffc74dee0a4b0de860dad518963b4710
diff --git a/net-misc/curl/curl-8.14.0_rc2.ebuild b/net-misc/curl/curl-8.14.0_rc2.ebuild
deleted file mode 100644
index bdceb348fcc7..000000000000
--- a/net-misc/curl/curl-8.14.0_rc2.ebuild
+++ /dev/null
@@ -1,436 +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
- quic
- !gnutls
- !mbedtls
- !rustls
- )
- curl_quic_ngtcp2? (
- curl_ssl_gnutls
- quic
- !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-4.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 b
- tls_opts+=(
- --without-amissl
- --without-bearssl
- --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[@]}")
- 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)
- $(use_with curl_quic_ngtcp2 ngtcp2)
- $(use_with curl_quic_openssl openssl-quic)
- )
-
- # --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-msh3
- --without-quiche
- --without-schannel
- --without-secure-transport
- --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
-}
diff --git a/net-misc/curl/curl-8.14.0_rc3.ebuild b/net-misc/curl/curl-8.14.0_rc3.ebuild
deleted file mode 100644
index 35f831850ec7..000000000000
--- a/net-misc/curl/curl-8.14.0_rc3.ebuild
+++ /dev/null
@@ -1,437 +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
- quic
- !gnutls
- !mbedtls
- !rustls
- )
- curl_quic_ngtcp2? (
- curl_ssl_gnutls
- quic
- !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-4.patch"
- "${FILESDIR}/${PN}-respect-cflags-3.patch"
- "${FILESDIR}/${PN}-8.14.0-brew-not-found.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 b
- tls_opts+=(
- --without-amissl
- --without-bearssl
- --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[@]}")
- 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)
- $(use_with curl_quic_ngtcp2 ngtcp2)
- $(use_with curl_quic_openssl openssl-quic)
- )
-
- # --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-msh3
- --without-quiche
- --without-schannel
- --without-secure-transport
- --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
-}
diff --git a/net-misc/curl/files/curl-8.14.0-brew-not-found.patch b/net-misc/curl/files/curl-8.14.0-brew-not-found.patch
deleted file mode 100644
index a1db268a86c7..000000000000
--- a/net-misc/curl/files/curl-8.14.0-brew-not-found.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 96c28bf35f89ba62947763a43ce934d994ffbc32 Mon Sep 17 00:00:00 2001
-From: Matt Jolly <kangie@gentoo.org>
-Date: Wed, 21 May 2025 20:30:11 +1000
-Subject: [PATCH] configure: suppress command not found for brew
-
-`42331cb48a1f66efaa0920ee8ccba5a74d67de27` made configure
-checks more CMake-like, but now calls `brew` resulting
-in "command not found" in the configure output if the
-package is not installed.
-
-Redirect stderr to suppress this; it's not an issue
-for us if `brew` isn't found.
-
-Signed-off-by: Matt Jolly <kangie@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -310,7 +310,7 @@ if test -x /usr/bin/caddy; then
- CADDY=/usr/bin/caddy
- elif test -x /usr/local/bin/caddy; then
- CADDY=/usr/local/bin/caddy
--elif test -x `brew --prefix`/bin/caddy; then
-+elif test -x "`brew --prefix 2>/dev/null`/bin/caddy"; then
- CADDY=`brew --prefix`/bin/caddy
- fi
- AC_ARG_WITH(test-caddy,dnl
-@@ -326,7 +326,7 @@ if test -x /usr/sbin/vsftpd; then
- VSFTPD=/usr/sbin/vsftpd
- elif test -x /usr/local/sbin/vsftpd; then
- VSFTPD=/usr/local/sbin/vsftpd
--elif test -x `brew --prefix`/sbin/vsftpd; then
-+elif test -x "`brew --prefix 2>/dev/null`/sbin/vsftpd"; then
- VSFTPD=`brew --prefix`/sbin/vsftpd
- fi
- AC_ARG_WITH(test-vsftpd,dnl
---
-2.49.0
next reply other threads:[~2025-05-30 11:45 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-30 11:44 Matt Jolly [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-18 6:30 [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/, net-misc/curl/files/ Matt Jolly
2025-09-01 22:51 Matt Jolly
2025-05-30 11:44 Matt Jolly
2024-09-14 22:15 Matt Jolly
2024-08-05 7:23 Matt Jolly
2024-05-30 2:02 Matt Jolly
2024-05-22 7:03 Matt Jolly
2024-04-26 13:37 Sam James
2024-04-20 4:04 Matt Jolly
2024-04-01 3:59 Matt Jolly
2024-04-01 3:59 Matt Jolly
2024-03-28 2:09 Matt Jolly
2024-02-08 1:18 Sam James
2024-01-05 5:57 Sam James
2024-01-05 5:57 Sam James
2023-10-11 7:03 Sam James
2023-05-23 3:42 Sam James
2023-05-17 7:58 Sam James
2023-05-17 7:58 Sam James
2023-03-23 8:59 Sam James
2023-02-22 10:00 Sam James
2022-12-23 1:29 Sam James
2022-10-28 17:18 Sam James
2022-07-03 2:36 Andreas K. Hüttel
2022-07-02 12:41 Sam James
2022-05-05 13:46 Jakov Smolić
2022-04-20 20:14 Sam James
2021-09-18 3:01 Sam James
2020-06-10 20:13 Anthony G. Basile
2018-04-18 21:42 Aaron Bauman
2016-11-13 13:21 Anthony G. Basile
2016-05-18 12:25 Anthony G. Basile
2016-03-24 12:24 Anthony G. Basile
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1748605486.63db447b09a4ceab8124032fb6076a1b1165e07f.kangie@gentoo \
--to=kangie@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox