commit:     893edb6df0a8cbe0902fb4b6d3e8f09a782fd349
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 12:12:34 2025 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Fri Feb 14 12:12:34 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893edb6d

net-misc/curl: add 8.12.1

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 net-misc/curl/Manifest           |   2 +
 net-misc/curl/curl-8.12.1.ebuild | 388 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 390 insertions(+)

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 24f5ecbff777..1300283d4409 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -4,5 +4,7 @@ DIST curl-8.11.1.tar.xz 2751236 BLAKE2B 
a87ec2c78c5d6daf44eee4cf8e3ed124849d067f
 DIST curl-8.11.1.tar.xz.asc 488 BLAKE2B 
53d58ebb8ab722d8394b7ce94b646c876324cd89b3e47d9129bddcfbb6db338c1dbe93a5e72a25caf7be9ddd450c2b0832cfee17beb8ba701bdeefe653235d53
 SHA512 
c09bedb67e83fb8ca3ad73c5bd0d92fed7fc2c26dbe5a71cccb193fd151c7219713241a9fe74baefcd1d008cfafba78142bf04cec24dd4a88d67179184d35824
 DIST curl-8.12.0.tar.xz 2777552 BLAKE2B 
b38c7465a38f6bbdc6daa1e8a27dc810f970c9172ddf532881e83965e1fa6001beff1bf358e5138e1a0ae1121d877f6a5a4f38ef7ea7e03c8b06dc46fbf24022
 SHA512 
ed35f0020541050ce387f4ba80f9e87562ececd99082da1bae85840dee81c49b86a4a55909e15fcbf4eb116106a796c29a9b2678dee11326f80db75992c6edc5
 DIST curl-8.12.0.tar.xz.asc 488 BLAKE2B 
8977dabab96b6f188e8b16497e7a4e589f05b5512a9bc6ec0ee36797615c720b9cb5c34bc90df6ee037d898b8fa7f708ad2b2ff789163adcb5308a2e0d7cf9df
 SHA512 
8526554ffb2187b48b6a4c6a0d4a8c73d484ef3ce4c3791add0e759baf953ac7ae0b2f88d688365b1f09c5745198611fa1761aa14d02ddf52823c4ff238779cd
+DIST curl-8.12.1.tar.xz 2768160 BLAKE2B 
2b3e3d91041881c0951ad470736266105d3b9720440b808fe382baa493a30075aba52eb1d329fb1f148e27cd76290d82e121e7f4abf695f215456a10e26ade3e
 SHA512 
88915468fa1bb7256e3dd6c9d058ada6894faa1e3e7800c7d9bfee3e8be4081ae57e7f2bf260c5342b709499fc4302ddc2d7864e25bfa3300fa07f118a3de603
+DIST curl-8.12.1.tar.xz.asc 488 BLAKE2B 
2a6563609c9f7ada84ca2c7048ad9406809eef4cc958760d2ab3d1b7be58d26247e579bd025870609e80ebb00295026aae30614b84e3a81bdf3ed3dbd0f5ed70
 SHA512 
41fc5582935090d13940d86974fdea3ea901dd5dab156c16029a87f811d2535172c59dc8dc366f2ffc37bcf85accbecb5aa765bc7b83c2991a3ef402bf25af69
 DIST curl-8.9.1.tar.xz 2782364 BLAKE2B 
6e38e20e2b03ab5bfbb8d9797442dfdd9644fc80d7b1f7c1efb1f44e0d730524e82ccf7413b2c6f4555bd61ae42f91ec7c0201e2c0d563811c85164aa234aada
 SHA512 
a0fe234402875db194aad4e4208b7e67e7ffc1562622eea90948d4b9b0122c95c3dde8bbe2f7445a687cb3de7cb09f20e5819d424570442d976aa4c913227fc7
 DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B 
437268f6e5ba5db73f205fd87f3ded1e5fc200e8bf63a83cdb7e21dfbf2f4a4620e598cd0bf5d8fa1548ade08d45b386599542cd988df46a238b85790409f42e
 SHA512 
18acd58436d70900ab6912b84774da2c451b9dbfc83d6d00f85bbbe7894b67075918e58956fdb753fcc1486e4f10caa31139d7c68b037d7c83dc2e9c2fae9f9b

diff --git a/net-misc/curl/curl-8.12.1.ebuild b/net-misc/curl/curl-8.12.1.ebuild
new file mode 100644
index 000000000000..f8c605501860
--- /dev/null
+++ b/net-misc/curl/curl-8.12.1.ebuild
@@ -0,0 +1,388 @@
+# 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
+       SRC_URI="
+               https://curl.se/download/${P}.tar.xz
+               verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
+       "
+       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
+
+LICENSE="BSD curl ISC test? ( BSD-4 )"
+SLOT="0"
+IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn 
+imap kerberos ldap mbedtls +openssl +pop3"
+IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 
static-libs test 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 )"
+
+# 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="
+       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 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.1.4[${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.0.0[${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-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+               )
+               rustls? (
+                       >=net-libs/rustls-ffi-0.14.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
+}
+
+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
+               myconf+=( --without-gnutls --without-mbedtls --without-rustls )
+
+               if use gnutls; then
+                       multilib_is_native_abi && einfo "SSL provided by gnutls"
+                       myconf+=( --with-gnutls )
+               fi
+               if use mbedtls; then
+                       multilib_is_native_abi && einfo "SSL provided by 
mbedtls"
+                       myconf+=( --with-mbedtls )
+               fi
+               if use openssl; then
+                       multilib_is_native_abi && einfo "SSL provided by 
openssl"
+                       myconf+=( --with-ssl 
--with-ca-path="${EPREFIX}"/etc/ssl/certs )
+               fi
+               if use rustls; then
+                       multilib_is_native_abi && einfo "SSL provided by rustls"
+                       myconf+=( --with-rustls )
+               fi
+               if use curl_ssl_gnutls; then
+                       multilib_is_native_abi && einfo "Default SSL provided 
by gnutls"
+                       myconf+=( --with-default-ssl-backend=gnutls )
+               elif use curl_ssl_mbedtls; then
+                       multilib_is_native_abi && einfo "Default SSL provided 
by mbedtls"
+                       myconf+=( --with-default-ssl-backend=mbedtls )
+               elif use curl_ssl_openssl; then
+                       multilib_is_native_abi && einfo "Default SSL provided 
by openssl"
+                       myconf+=( --with-default-ssl-backend=openssl )
+               elif use curl_ssl_rustls; then
+                       multilib_is_native_abi && einfo "Default SSL provided 
by rustls"
+                       myconf+=( --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
+
+       else
+               myconf+=( --without-ssl )
+               einfo "SSL disabled"
+       fi
+
+       # These configuration options are organized alphabetically
+       # within each category.  This should make it easier if we
+       # ever decide to make any of them contingent on USE flags:
+       # 1) protocols first.  To see them all do
+       # 'grep SUPPORT_PROTOCOLS configure.ac'
+       # 2) --enable/disable options second.
+       # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+       # 3) --with/without options third.
+       # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+       myconf+=(
+               $(use_enable alt-svc)
+               --enable-basic-auth
+               --enable-bearer-auth
+               --enable-digest-auth
+               --enable-kerberos-auth
+               --enable-negotiate-auth
+               --enable-aws
+               --enable-dict
+               --disable-ech
+               --enable-file
+               $(use_enable ftp)
+               $(use_enable gopher)
+               $(use_enable hsts)
+               --enable-http
+               $(use_enable imap)
+               $(use_enable ldap)
+               $(use_enable ldap ldaps)
+               --enable-ntlm
+               $(use_enable pop3)
+               --enable-rt
+               --enable-rtsp
+               $(use_enable samba smb)
+               $(use_with ssh libssh2)
+               $(use_enable smtp)
+               $(use_enable telnet)
+               $(use_enable tftp)
+               --enable-tls-srp
+               $(use_enable adns ares)
+               --enable-cookies
+               --enable-dateparse
+               --enable-dnsshuffle
+               --enable-doh
+               --enable-symbol-hiding
+               --enable-http-auth
+               --enable-ipv6
+               --enable-largefile
+               --enable-manual
+               --enable-mime
+               --enable-netrc
+               $(use_enable progress-meter)
+               --enable-proxy
+               --enable-socketpair
+               --disable-sspi
+               $(use_enable static-libs static)
+               --disable-versioned-symbols
+               --without-amissl
+               --without-bearssl
+               $(use_with brotli)
+               
--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
+               $(use_with http2 nghttp2)
+               $(use_with idn libidn2)
+               $(use_with kerberos gssapi "${EPREFIX}"/usr)
+               --without-libgsasl
+               $(use_with psl libpsl)
+               --without-msh3
+               $(use_with http3 nghttp3)
+               $(use_with curl_quic_ngtcp2 ngtcp2)
+               $(use_with curl_quic_openssl openssl-quic)
+               --without-quiche
+               $(use_with rtmp librtmp)
+               --without-schannel
+               --without-secure-transport
+               --without-test-caddy
+               --without-test-httpd
+               --without-test-nghttpx
+               $(use_enable websockets)
+               --without-winidn
+               --without-wolfssl
+               --with-zlib
+               $(use_with zstd)
+               
--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
+       )
+
+       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; we'll just make `httpsrr` 
conditional on adns
+       # when the time comes.
+       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
+}

Reply via email to