From c9aaa2ff911ee95adca22bcd9264e8ecfa3d5149 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Jul 2023 08:52:39 +0100 Subject: gentoo auto-resync : 23:07:2023 - 08:52:38 --- net-misc/Manifest.gz | Bin 54112 -> 54118 bytes net-misc/curl/Manifest | 4 +- net-misc/curl/curl-8.2.0-r1.ebuild | 353 ++++++++++++++++++++++++ net-misc/curl/curl-8.2.0.ebuild | 351 ----------------------- net-misc/curl/files/curl-8.2.0-basic-auth.patch | 127 +++++++++ net-misc/curl/files/curl-8.2.0-http2-eof.patch | 32 +++ net-misc/gallery-dl/Manifest | 2 +- net-misc/gallery-dl/gallery-dl-1.25.6.ebuild | 2 +- 8 files changed, 517 insertions(+), 354 deletions(-) create mode 100644 net-misc/curl/curl-8.2.0-r1.ebuild delete mode 100644 net-misc/curl/curl-8.2.0.ebuild create mode 100644 net-misc/curl/files/curl-8.2.0-basic-auth.patch create mode 100644 net-misc/curl/files/curl-8.2.0-http2-eof.patch (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 33dbd545ec61..8eda6fb13b9e 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index e7a275e91006..9e9b663212d1 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,4 +1,6 @@ AUX curl-8.0.1-onion-resolution.patch 4036 BLAKE2B 7f9a693f5090585c46d596133e915b67cf6a0b0a78ee164f987de166f24fb3d64a968f6263110c119710735363429447d52e5cc52df90d0f3830cf0e10c3673b SHA512 72efe3cd6d594cd2b73a19596e587c88a7ca89ed6f9a7325df98df2e18a1e85f26232ea48e80097d2d1e2f8db2c1cd945896311cd70ee830c8838afbcb7628d9 +AUX curl-8.2.0-basic-auth.patch 3246 BLAKE2B 46c1dc8510fc43910f41f14b6c2d2f57c93ff507db7af206e4ad359039e5131e363d980594c1b423205a7681e066cedcca00c7e319addceab2ee513e531736c6 SHA512 5d4f6e9f49985d91b800a7563c6060a8dbbdec15773d591920fb999d58b3a7eb925271b897b1654bec2ccd483770b8865625ef4f935c309e42c3be57db6fb80a +AUX curl-8.2.0-http2-eof.patch 1112 BLAKE2B e9803a87cdb7e363bde2266edaea9c21b19e430520c90ff4512b03fbcb23778d32b4620dfc83d53dd55a5e07d642a76da2983c7d8540e96644bacce3f417b869 SHA512 7432340ef3ea912e1df00e704ef46e65e1c54f55e2aaf85cc4a575a38efedc159f788c5bac0195e7ea8b5f46e65822ce07097684b41a94dc6986ff0a7b7f7cd2 AUX curl-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 DIST curl-8.0.1.tar.xz 2575544 BLAKE2B 67d82e9d71f0a351b5c2ed3ad5eab02e367ded872658a295179b935729d5105015f8c29569c396e11cd14036656af894ded85c8838cba260d9f6f1a8dcb5e22b SHA512 3bb777982659ed697ae90f113ff7b65d6ce8ba9fe6a8984cfd6769d2f051a72ba953c911abe234c204ec2cc5a35d68b4d033037fad7fba31bb92a52543f8d13d @@ -9,6 +11,6 @@ DIST curl-8.2.0.tar.xz 2637208 BLAKE2B 1387869f9ab2e1984217e57a5a8aa3551b4015875 DIST curl-8.2.0.tar.xz.asc 488 BLAKE2B de16ae63b86fd45a576da3c323d1903820d0644c17996ceda561783f14ab74e961ae403847a5b4117b558a6ecb89d866efb635c24af85a99f65a1f4f3a9ec81c SHA512 66005647c54bae098feebac68f2762af2e4463dc7eb8ba4c0db79590a1a7fe581ec3d2bc4fbea39729e42836b62b011a3f7c83c29bd2f00b3ce5cf875b60b187 EBUILD curl-8.0.1.ebuild 8702 BLAKE2B 24aee27a611d96a824f461384089730f6bc51500dc50d3a2dfc287e6cf76b31f6c072de757c2ff0686158c934f3be69732560c905691bf159da26b31bc005141 SHA512 b33fe3010a94e0db79b8aa1f5367a7ad9b6caaa84a89119bff24ee889cb046c4ce0d84b2e67f08cba31ac9f632ea337a851091437f4b5c89a2ecf942d958681b EBUILD curl-8.1.2.ebuild 9469 BLAKE2B 7bb4d26949fa9b903da71e972904ef1a6ade0cbad174cf44902b78d5806aebcb705002ef3a77e093b9b2d2e7548a0e2f5a0402b9e54a19a6ba0541045e41335c SHA512 dcfc2e06bd97f72460819c67974b2626a873c978497cdc69f1e019c40c7c132a60abf9b3723f4d9565f1d680fb98d7244fd49b7fe6eb9acd11ec7a2cf14e5196 -EBUILD curl-8.2.0.ebuild 10114 BLAKE2B 14de0a5075fa558c57a73bf87c57e834c32bed47c45aa2f5551e7742448202e282fadb3fc8f7b1910db60450ec26d07755e41168ecda856a63b47ea9a7de03d6 SHA512 50b15a42248cad6d0a1777525ec11eefa82187928eefca4c1e770f9d615a61632c4ee15dd2900ab4ec506c254f7e2b6f6eb9240d6f6071b2f2ff8d28f8055730 +EBUILD curl-8.2.0-r1.ebuild 10219 BLAKE2B 3407c690bcd828ea26a87eb1b78dd38d2e84f67d201f4cda0969c2147edef6d78e9d32f0e8d91615ace909d387e54c7afcbc4485a4dc4e1f0e6cbad438703d45 SHA512 b9965a8568f897706519db878bd1c1a22a0c6622ffc5f55c973e5bcfaac51d79d8a3e352cd33d153d35a036bd92f06ea0fdfab6a0c09d0278d6c12ecbb614af6 EBUILD curl-9999.ebuild 10114 BLAKE2B 14de0a5075fa558c57a73bf87c57e834c32bed47c45aa2f5551e7742448202e282fadb3fc8f7b1910db60450ec26d07755e41168ecda856a63b47ea9a7de03d6 SHA512 50b15a42248cad6d0a1777525ec11eefa82187928eefca4c1e770f9d615a61632c4ee15dd2900ab4ec506c254f7e2b6f6eb9240d6f6071b2f2ff8d28f8055730 MISC metadata.xml 2203 BLAKE2B 939a2ec06ec2155b88d510abdfaa00eafcd5a7e5f6f7983e456ccfc7cf4179d58adbcc7f282a11bb74d217640c93896fb5038206f7c76ea2c2e2543fe0db378e SHA512 c81d7159c0851dab0ae099c7129d965d3d3bd5cc7f7f3240052a4afab0eaa1e15efbf79265bbad5f2d257cc14b5d30daacd3aa5c3099c2ac264560e23ec797f1 diff --git a/net-misc/curl/curl-8.2.0-r1.ebuild b/net-misc/curl/curl-8.2.0-r1.ebuild new file mode 100644 index 000000000000..11500ccb756e --- /dev/null +++ b/net-misc/curl/curl-8.2.0-r1.ebuild @@ -0,0 +1,353 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="curl" +SLOT="0" +IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +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_nss +curl_ssl_openssl curl_ssl_rustls" +IUSE+=" nghttp3" +RESTRICT="!test? ( test )" + +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_nss? ( nss ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) +" + +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + nghttp3? ( + net-libs/nghttp3[${MULTILIB_USEDEP}] + net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + ) + mbedtls? ( + app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + ) + nss? ( + app-misc/ca-certificates + dev-libs/nss[${MULTILIB_USEDEP}] + dev-libs/nss-pem + ) + openssl? ( + dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + rustls? ( + net-libs/rustls-ffi:=[${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}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( CHANGES 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 +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${PN}-8.2.0-basic-auth.patch + "${FILESDIR}"/${PN}-8.2.0-http2-eof.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-nss --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 nss; then + multilib_is_native_abi && einfo "SSL provided by nss" + myconf+=( --with-nss --with-nss-deprecated ) + 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_nss; then + multilib_is_native_abi && einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + 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-crypto-auth + --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 + --disable-ntlm-wb + $(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) + --enable-pthreads + --enable-threaded-resolver + --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) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + --without-libpsl + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + --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 test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + 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 + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +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 which 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. + # 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$((7*$(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 +} diff --git a/net-misc/curl/curl-8.2.0.ebuild b/net-misc/curl/curl-8.2.0.ebuild deleted file mode 100644 index 0414671d123d..000000000000 --- a/net-misc/curl/curl-8.2.0.ebuild +++ /dev/null @@ -1,351 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="curl" -SLOT="0" -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +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_nss +curl_ssl_openssl curl_ssl_rustls" -IUSE+=" nghttp3" -RESTRICT="!test? ( test )" - -# Only one default ssl provider can be enabled -# The default ssl provider needs its USE satisfied -REQUIRED_USE=" - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_rustls - ) - ) - curl_ssl_gnutls? ( gnutls ) - curl_ssl_mbedtls? ( mbedtls ) - curl_ssl_nss? ( nss ) - curl_ssl_openssl? ( openssl ) - curl_ssl_rustls? ( rustls ) -" - -RDEPEND=" - sys-libs/zlib[${MULTILIB_USEDEP}] - adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) - idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - app-misc/ca-certificates - net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:=[${MULTILIB_USEDEP}] - ) - mbedtls? ( - app-misc/ca-certificates - net-libs/mbedtls:=[${MULTILIB_USEDEP}] - ) - nss? ( - app-misc/ca-certificates - dev-libs/nss[${MULTILIB_USEDEP}] - dev-libs/nss-pem - ) - openssl? ( - dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] - ) - rustls? ( - net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] - ) - ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/perl - virtual/pkgconfig - test? ( - sys-apps/diffutils - http2? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) - nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) - ) - verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) -" - -DOCS=( CHANGES 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 -) - -PATCHES=( - "${FILESDIR}"/${PN}-prefix.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-nss --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 nss; then - multilib_is_native_abi && einfo "SSL provided by nss" - myconf+=( --with-nss --with-nss-deprecated ) - 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_nss; then - multilib_is_native_abi && einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) - 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-crypto-auth - --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 - --disable-ntlm-wb - $(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) - --enable-pthreads - --enable-threaded-resolver - --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) - --without-hyper - $(use_with idn libidn2) - $(use_with kerberos gssapi "${EPREFIX}"/usr) - --without-libgsasl - --without-libpsl - --without-msh3 - $(use_with nghttp3) - $(use_with nghttp3 ngtcp2) - --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 test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then - myconf+=( - --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" - ) - 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 - - # Fix up the pkg-config file to be more robust. - # https://github.com/curl/curl/issues/864 - local priv=() libs=() - # We always enable zlib. - libs+=( "-lz" ) - priv+=( "zlib" ) - if use http2; then - libs+=( "-lnghttp2" ) - priv+=( "libnghttp2" ) - fi - if use nghttp3; then - libs+=( "-lnghttp3" "-lngtcp2" ) - priv+=( "libnghttp3" "libngtcp2" ) - fi - if use ssl && use curl_ssl_openssl; then - libs+=( "-lssl" "-lcrypto" ) - priv+=( "openssl" ) - fi - grep -q Requires.private libcurl.pc && die "need to update ebuild" - libs=$(printf '|%s' "${libs[@]}") - sed -i -r \ - -e "/^Libs.private/s:(${libs#|})( |$)::g" \ - libcurl.pc || die - echo "Requires.private: ${priv[*]}" >> libcurl.pc || die -} - -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 which 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. - # 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$((7*$(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 -} diff --git a/net-misc/curl/files/curl-8.2.0-basic-auth.patch b/net-misc/curl/files/curl-8.2.0-basic-auth.patch new file mode 100644 index 000000000000..899ffb75a878 --- /dev/null +++ b/net-misc/curl/files/curl-8.2.0-basic-auth.patch @@ -0,0 +1,127 @@ +Patch-Source: https://github.com/curl/curl/pull/11492 +-- +From 0470577eb4524f09d245e9e6afd42ba8677a5a19 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Thu, 20 Jul 2023 23:20:50 +0200 +Subject: [PATCH 1/2] test979: test -u with redirect to (the same) absolute + host + +--- + tests/data/Makefile.inc | 1 + + tests/data/test979 | 64 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 65 insertions(+) + create mode 100644 tests/data/test979 + +diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc +index 8ee1394d4e562..12aefb14c0d1b 100644 +--- a/tests/data/Makefile.inc ++++ b/tests/data/Makefile.inc +@@ -122,6 +122,7 @@ test943 test944 test945 test946 test947 test948 test949 test950 test951 \ + test952 test953 test954 test955 test956 test957 test958 test959 test960 \ + test961 test962 test963 test964 test965 test966 test967 test968 test969 \ + test970 test971 test972 test973 test974 test975 test976 test977 test978 \ ++test979 \ + \ + test980 test981 test982 test983 test984 test985 test986 test987 test988 \ + test989 \ +diff --git a/tests/data/test979 b/tests/data/test979 +new file mode 100644 +index 0000000000000..40cc35044d9f6 +--- /dev/null ++++ b/tests/data/test979 +@@ -0,0 +1,64 @@ ++ ++ ++ ++HTTP ++HTTP GET ++Basic ++ ++ ++ ++# ++# Server-side ++ ++ ++HTTP/1.1 302 go go go ++Content-Length: 8 ++Location: http://%HOSTIP:%HTTPPORT/user/%TESTNUMBER0002 ++Content-Type: text/html ++Funny-head: yesyes ++ ++notreal ++ ++ ++HTTP/1.1 200 OK ++Content-Length: 6 ++Content-Type: text/html ++Funny-head: yesyes ++ ++final ++ ++ ++ ++# ++# Client-side ++ ++ ++http ++ ++ ++-u with redirect to absolute URL using same origin and auth ++ ++ ++http://first:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u smith:doggie ++ ++ ++ ++# ++# Verify data after the test has been "shot" ++ ++ ++GET /%TESTNUMBER HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic c21pdGg6ZG9nZ2ll ++User-Agent: curl/%VERSION ++Accept: */* ++ ++GET /user/%TESTNUMBER0002 HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic c21pdGg6ZG9nZ2ll ++User-Agent: curl/%VERSION ++Accept: */* ++ ++ ++ ++ + +From c1effdfe658ae505e8ea65e5f46d810c4b8d81cb Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Thu, 20 Jul 2023 23:28:19 +0200 +Subject: [PATCH 2/2] transfer: do not clear the credentials on redirect to + absolute URL + +Makes test 979 work. Regression shipped in 8.2.0 from commit +dd4d1a26959f63a2c + +Fixes #11486 +Reported-by: Cloudogu Siebels +--- + lib/transfer.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/lib/transfer.c b/lib/transfer.c +index 52cd6a0153673..b678004b95ad2 100644 +--- a/lib/transfer.c ++++ b/lib/transfer.c +@@ -1558,10 +1558,6 @@ CURLcode Curl_follow(struct Curl_easy *data, + /* If this is not redirect due to a 401 or 407 response and an absolute + URL: don't allow a custom port number */ + disallowport = TRUE; +- if(!data->set.allow_auth_to_other_hosts) { +- Curl_safefree(data->state.aptr.user); +- Curl_safefree(data->state.aptr.passwd); +- } + } + + DEBUGASSERT(data->state.uh); diff --git a/net-misc/curl/files/curl-8.2.0-http2-eof.patch b/net-misc/curl/files/curl-8.2.0-http2-eof.patch new file mode 100644 index 000000000000..0040a3c6560e --- /dev/null +++ b/net-misc/curl/files/curl-8.2.0-http2-eof.patch @@ -0,0 +1,32 @@ +Patch-Source: https://github.com/curl/curl/commit/f9314f317f017e19e1802ce04ceeae620ca2cd71 +-- +From: Stefan Eissing +Date: Thu, 20 Jul 2023 13:08:00 +0200 +Subject: [PATCH] http2: fix regression on upload EOF handling + +- a regression introduced by c9ec85121110d7cbbbed2990024222c8f5b8afe5 + where optimization of small POST bodies leads to a new code path + for such uploads that did not trigger the "done sending" event +- add triggering this event for early "upload_done" situations + +Fixes #11485 +Closes #11487 +Reported-by: Aleksander Mazur +--- + lib/http.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/http.c b/lib/http.c +index f851bcd4a3443..e04028b3fec54 100644 +--- a/lib/http.c ++++ b/lib/http.c +@@ -3380,6 +3380,9 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done) + } + } + ++ if(data->req.upload_done) ++ Curl_conn_ev_data_done_send(data); ++ + if((conn->httpversion >= 20) && data->req.upload_chunky) + /* upload_chunky was set above to set up the request in a chunky fashion, + but is disabled here again to avoid that the chunked encoded version is diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index 923ea0ccb93d..8fb24d88e6ba 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -3,7 +3,7 @@ DIST gallery-dl-1.25.6.gh.tar.gz 567710 BLAKE2B 85f4fe19a09d1569e431e18c821db6d7 DIST gallery-dl-1.25.7.gh.tar.gz 570326 BLAKE2B b499d9dad019b6a209cb4ce1c6ef64867d0ab6327ca2131631ad7abf52c7541187886c0d3674152cea24d7cafb1c508c7c22ffd14a94737759beda3bffb38d4e SHA512 0fb86b074c54db615cc8fd276160ef42a5a58e839a88fe0acb24d3f27d3002f90d28e7e0eb6ca3606e3c4c7c8f56b7d8a103898ba375dd63ffea27e4c422b4c1 DIST gallery-dl-1.25.8.gh.tar.gz 570435 BLAKE2B 33cd558c0f30cc31adbd0a51365b9501309be001cb0f7a3bb83e21dc797ca7e097b94e1575e4c0342fad44a5fca07a486d1e44db1a12d90ade06d0bc4acf8384 SHA512 22bd9e330efe24cb56e7b9b3eb219094aa897bb620253c4dd3fcda33df82fc021f1151dd9a6aff1f762c3ed4d426aadc75a398a659b30f64f254780554f46687 EBUILD gallery-dl-1.25.5.ebuild 1030 BLAKE2B f8eee827828a8096cb6ed53104a861a301744f3e443daf3f266b3fa608a5d0942a8b20ad7218ab121e8ec211ec33a1c1eee4f937c88824b2920fe6979c022be3 SHA512 78712cbe3a8bcda690528ceda50de032ca877e4101f989b66b9876980844240aec4c561eee93ebbfaf4b475a4965237effabf5d95b4f271c36cefc335a308c47 -EBUILD gallery-dl-1.25.6.ebuild 1031 BLAKE2B 24c5483d680029faeb663a80b93188aea33f4b39ae93ff07575dc6b5cc5166006b33c1d28219b35209df4695f9cdec146180e064fb8c9f917eaa66d7cb4ac591 SHA512 e3b104d69df69c2aa7bef313e49ca6454d902c13d9cdfa8f21568557858b0fbb612ebae7b172c27ac87fb842c034ace773972ba7da85603b3bccbada613ee74a +EBUILD gallery-dl-1.25.6.ebuild 1030 BLAKE2B f8eee827828a8096cb6ed53104a861a301744f3e443daf3f266b3fa608a5d0942a8b20ad7218ab121e8ec211ec33a1c1eee4f937c88824b2920fe6979c022be3 SHA512 78712cbe3a8bcda690528ceda50de032ca877e4101f989b66b9876980844240aec4c561eee93ebbfaf4b475a4965237effabf5d95b4f271c36cefc335a308c47 EBUILD gallery-dl-1.25.7.ebuild 1037 BLAKE2B d0a577a5e71be88d28c735580b24617e1d87bac48ed8ce1044991fc8eddf1044d1cb69d2bccbf40843fe0b99877cce069ae048d43f1016bd687f5a7ab8589298 SHA512 8b209c0d297af4f95c9dea25e22df7a4f3323ac1396c644b07e99a782d42f343065c846dbbc9b0c05a98d20e4b456ab5509ff7ff91b0904668509efb26425f26 EBUILD gallery-dl-1.25.8.ebuild 1037 BLAKE2B d0a577a5e71be88d28c735580b24617e1d87bac48ed8ce1044991fc8eddf1044d1cb69d2bccbf40843fe0b99877cce069ae048d43f1016bd687f5a7ab8589298 SHA512 8b209c0d297af4f95c9dea25e22df7a4f3323ac1396c644b07e99a782d42f343065c846dbbc9b0c05a98d20e4b456ab5509ff7ff91b0904668509efb26425f26 EBUILD gallery-dl-9999.ebuild 1037 BLAKE2B d0a577a5e71be88d28c735580b24617e1d87bac48ed8ce1044991fc8eddf1044d1cb69d2bccbf40843fe0b99877cce069ae048d43f1016bd687f5a7ab8589298 SHA512 8b209c0d297af4f95c9dea25e22df7a4f3323ac1396c644b07e99a782d42f343065c846dbbc9b0c05a98d20e4b456ab5509ff7ff91b0904668509efb26425f26 diff --git a/net-misc/gallery-dl/gallery-dl-1.25.6.ebuild b/net-misc/gallery-dl/gallery-dl-1.25.6.ebuild index e5fbc2f301b3..e83e798733f1 100644 --- a/net-misc/gallery-dl/gallery-dl-1.25.6.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.25.6.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/mikf/${PN}.git" else SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86" fi LICENSE="GPL-2" -- cgit v1.2.3