diff options
author | Matt Jolly <Matt.Jolly@footclan.ninja> | 2023-05-17 17:51:10 +1000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2023-05-17 08:58:25 +0100 |
commit | e157923b659d2650cb9eb5a3084d9539f6487b29 (patch) | |
tree | 71628585ba116ba205b939212a77f7ef87c599ba /net-misc | |
parent | net-misc/curl: drop 7.88.1-r1 (diff) | |
download | gentoo-e157923b659d2650cb9eb5a3084d9539f6487b29.tar.gz gentoo-e157923b659d2650cb9eb5a3084d9539f6487b29.tar.bz2 gentoo-e157923b659d2650cb9eb5a3084d9539f6487b29.zip |
net-misc/curl: drop 7.88.1-r2
Bug: https://bugs.gentoo.org/902801
Signed-off-by: Matt Jolly <Matt.Jolly@footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/31074
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/curl/Manifest | 2 | ||||
-rw-r--r-- | net-misc/curl/curl-7.88.1-r2.ebuild | 307 | ||||
-rw-r--r-- | net-misc/curl/files/curl-7.88.1-header-dump-segfault.patch | 29 | ||||
-rw-r--r-- | net-misc/curl/files/curl-7.88.1-onion-resolution.patch | 134 | ||||
-rw-r--r-- | net-misc/curl/files/curl-7.88.1-pipewait.patch | 64 | ||||
-rw-r--r-- | net-misc/curl/files/curl-7.88.1-silent-parallel.patch | 20 |
6 files changed, 0 insertions, 556 deletions
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 6e39d609ad9b..23d992711598 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,5 +1,3 @@ -DIST curl-7.88.1.tar.xz 2581032 BLAKE2B ed7e7aa29efb02fd89a53d5c8d0ec79b4d17612ea07d2a6b5a951f0ca651b4cf7264704344b1a0c2d82196f4cb5c08525e06b4cdd432bc3278ff23c7a6580839 SHA512 b8d30c52a6d1c3e272608a7a8db78dfd79aef21330f34d6f1df43839a400e13ac6aac72a383526db0b711a70ecbec89a3b934677d7ecf5094fd64d3dbcb3492f -DIST curl-7.88.1.tar.xz.asc 488 BLAKE2B ea90d840846fca3f0b17838a84431cb44d6e3f8d2b42c3eced1fb1c929a58e8899b303c93d27ca3cafcaa52e7269ac440e7102191d6b2c2751729a6c4116e82f SHA512 d6dc720533004c4d533cc4fb3dd33ac28d95e114f440ec011e4b58f65d1f4c40cfa10ba26d2e2f2f1f9de99511632578b4758c5e79593c7c30d29788fdf1cbb6 DIST curl-8.0.1.tar.xz 2575544 BLAKE2B 67d82e9d71f0a351b5c2ed3ad5eab02e367ded872658a295179b935729d5105015f8c29569c396e11cd14036656af894ded85c8838cba260d9f6f1a8dcb5e22b SHA512 3bb777982659ed697ae90f113ff7b65d6ce8ba9fe6a8984cfd6769d2f051a72ba953c911abe234c204ec2cc5a35d68b4d033037fad7fba31bb92a52543f8d13d DIST curl-8.0.1.tar.xz.asc 488 BLAKE2B 452e1bebe1028e7621bbf8829e50cf56e254cd63a8cf2a4c0332176b9f18fb2821304ae556a203996d273c986bddbd04db2218c18fd34dee66e9155861ba50ce SHA512 92c6a0570e9a8a708fe2f717b8b37a68dcb9cd4520ca50c9baafec5891bda103bce2d2dcb67f1387bf11bd7e51e0e64ccd52d196e61d58b598ad3aa1960386cf DIST curl-8.1.0.tar.xz 2612568 BLAKE2B 768a824b8f5f6ddaa073599c4106f07a8134bcbe0e0d666390be1bce16ba25386d85930853bb47bc90b2c8a499a0b2abb9c685042563801e0fe58b9c315ac6cc SHA512 b99926f372ddd715cd1d2b54d8fb96b26b085e6501715e25aa57b6c6a7f8452473506ddb284e2f280f8afdb301b7f0c3bfde7ad7ed393b12c022430a9301096d diff --git a/net-misc/curl/curl-7.88.1-r2.ebuild b/net-misc/curl/curl-7.88.1-r2.ebuild deleted file mode 100644 index 98f09d3e9b4b..000000000000 --- a/net-misc/curl/curl-7.88.1-r2.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit autotools multilib-minimal prefix verify-sig - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.se/" -SRC_URI="https://curl.se/download/${P}.tar.xz - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )" - -LICENSE="curl" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -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" -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" -IUSE+=" nghttp3" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc - -#Only one default ssl provider can be enabled -REQUIRED_USE=" - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_rustls - ) - )" - -# lead to lots of false negatives, bug #285669 -RESTRICT="!test? ( test )" - -RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - mbedtls? ( - net-libs/mbedtls:=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - openssl? ( - dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] - ) - nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - dev-libs/nss-pem - app-misc/ca-certificates - ) - rustls? ( - net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] - ) - ) - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - sys-libs/zlib[${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 -) - -PATCHES=( - "${FILESDIR}"/${PN}-7.30.0-prefix.patch - "${FILESDIR}"/${PN}-respect-cflags-3.patch - - "${FILESDIR}"/${P}-header-dump-segfault.patch - "${FILESDIR}"/${P}-onion-resolution.patch - "${FILESDIR}"/${P}-pipewait.patch - "${FILESDIR}"/${P}-silent-parallel.patch -) - -src_prepare() { - default - - # Some tests (HTTP/#) rely on ssl certificates that are stored VCS which breaks - # with out-of-tree builds. - sed -i "s:my \$path = getcwd():my \$path = \"${S}/tests\":" tests/http*-server.pl \ - || die "Unable to update test locations" - 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 ) - #myconf+=( --without-default-ssl-backend ) - if use ssl ; then - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) - - if use gnutls || use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls ) - fi - if use mbedtls || use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - fi - if use nss || use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss --with-nss-deprecated ) - fi - if use openssl || use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use rustls || use curl_ssl_rustls; then - einfo "SSL provided by rustls" - myconf+=( --with-rustls ) - fi - if use curl_ssl_gnutls; then - einfo "Default SSL provided by gnutls" - myconf+=( --with-default-ssl-backend=gnutls ) - elif use curl_ssl_mbedtls; then - einfo "Default SSL provided by mbedtls" - myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_nss; then - einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) - elif use curl_ssl_openssl; then - einfo "Default SSL provided by openssl" - myconf+=( --with-default-ssl-backend=openssl ) - elif use curl_ssl_rustls; then - einfo "Default SSL provided by rustls" - myconf+=( --with-default-ssl-backend=rustls ) - else - eerror "We can't be here because of REQUIRED_USE." - 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) - --without-fish-functions-dir - $(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) - ) - - 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 - 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_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 disable tests. See e.g. Fedora's packaging - # or just read https://github.com/curl/curl/tree/master/tests#run. - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p" -} - -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-7.88.1-header-dump-segfault.patch b/net-misc/curl/files/curl-7.88.1-header-dump-segfault.patch deleted file mode 100644 index 48ebb7a5e45f..000000000000 --- a/net-misc/curl/files/curl-7.88.1-header-dump-segfault.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/curl/curl/commit/1c9cfb7af368feefb522caf81b052ee742a76da8 -From: Daniel Stenberg <daniel@haxx.se> -Date: Mon, 20 Feb 2023 18:35:13 +0100 -Subject: [PATCH] tool_operate: avoid fclose(NULL) on bad header dump file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes #10570 -Reported-by: Jérémy Rabasco -Closes #10571 ---- a/src/tool_operate.c -+++ b/src/tool_operate.c -@@ -984,12 +984,13 @@ static CURLcode single_transfer(struct GlobalConfig *global, - */ - if(!per->prev || per->prev->config != config) { - newfile = fopen(config->headerfile, "wb+"); -- fclose(newfile); -+ if(newfile) -+ fclose(newfile); - } - newfile = fopen(config->headerfile, "ab+"); - - if(!newfile) { -- warnf(global, "Failed to open %s\n", config->headerfile); -+ errorf(global, "Failed to open %s\n", config->headerfile); - result = CURLE_WRITE_ERROR; - break; - } diff --git a/net-misc/curl/files/curl-7.88.1-onion-resolution.patch b/net-misc/curl/files/curl-7.88.1-onion-resolution.patch deleted file mode 100644 index d3385623da5f..000000000000 --- a/net-misc/curl/files/curl-7.88.1-onion-resolution.patch +++ /dev/null @@ -1,134 +0,0 @@ -https://bugs.gentoo.org/887287 -https://github.com/curl/curl/pull/10705 - -From: Matt Jolly <Matt.Jolly@footclan.ninja> -Date: Wed, 8 Mar 2023 02:16:45 +1100 -Subject: [PATCH] Refuse to resolve the .onion TLD. - -RFC 7686 states that: - -> Applications that do not implement the Tor -> protocol SHOULD generate an error upon the use of .onion and -> SHOULD NOT perform a DNS lookup. - -Let's do that. - -See curl/curl#543 -https://www.rfc-editor.org/rfc/rfc7686#section-2 ---- a/lib/hostip.c -+++ b/lib/hostip.c -@@ -652,6 +652,14 @@ enum resolve_t Curl_resolv(struct Curl_easy *data, - CURLcode result; - enum resolve_t rc = CURLRESOLV_ERROR; /* default to failure */ - struct connectdata *conn = data->conn; -+ /* We should intentionally error and not resolve .onion TLDs */ -+ size_t hostname_len = strlen(hostname); -+ if(hostname_len >= 7 && -+ (curl_strequal(&hostname[hostname_len-6], ".onion") || -+ curl_strequal(&hostname[hostname_len-7], ".onion."))) { -+ failf(data, "Not resolving .onion address (RFC 7686)"); -+ return CURLRESOLV_ERROR; -+ } - *entry = NULL; - #ifndef CURL_DISABLE_DOH - conn->bits.doh = FALSE; /* default is not */ ---- a/tests/data/Makefile.inc -+++ b/tests/data/Makefile.inc -@@ -186,8 +186,8 @@ test1432 test1433 test1434 test1435 test1436 test1437 test1438 test1439 \ - test1440 test1441 test1442 test1443 test1444 test1445 test1446 test1447 \ - test1448 test1449 test1450 test1451 test1452 test1453 test1454 test1455 \ - test1456 test1457 test1458 test1459 test1460 test1461 test1462 test1463 \ --test1464 test1465 test1466 test1467 test1468 test1469 \ --\ -+test1464 test1465 test1466 test1467 test1468 test1469 test1471 \ -+test1472 \ - test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ - test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \ - test1516 test1517 test1518 test1519 test1520 test1521 test1522 test1523 \ ---- /dev/null -+++ b/tests/data/test1471 -@@ -0,0 +1,39 @@ -+<testcase> -+<info> -+<keywords> -+Onion -+Tor -+FAILURE -+</keywords> -+</info> -+# -+# Server-side -+<reply> -+</reply> -+ -+# -+# Client-side -+<client> -+<server> -+none -+</server> -+<name> -+Fail to resolve .onion TLD -+</name> -+<command> -+red.onion -+</command> -+</client> -+ -+# -+# Verify data after the test has been "shot" -+<verify> -+# Couldn't resolve host name -+<errorcode> -+6 -+</errorcode> -+<stderr mode="text"> -+curl: (6) Not resolving .onion address (RFC 7686) -+</stderr> -+</verify> -+</testcase> ---- /dev/null -+++ b/tests/data/test1472 -@@ -0,0 +1,39 @@ -+<testcase> -+<info> -+<keywords> -+Onion -+Tor -+FAILURE -+</keywords> -+</info> -+# -+# Server-side -+<reply> -+</reply> -+ -+# -+# Client-side -+<client> -+<server> -+none -+</server> -+<name> -+Fail to resolve .onion. TLD -+</name> -+<command> -+tasty.onion. -+</command> -+</client> -+ -+# -+# Verify data after the test has been "shot" -+<verify> -+# Couldn't resolve host name -+<errorcode> -+6 -+</errorcode> -+<stderr mode="text"> -+curl: (6) Not resolving .onion address (RFC 7686) -+</stderr> -+</verify> -+</testcase> --- -2.39.2 - diff --git a/net-misc/curl/files/curl-7.88.1-pipewait.patch b/net-misc/curl/files/curl-7.88.1-pipewait.patch deleted file mode 100644 index 6c626a86c8e0..000000000000 --- a/net-misc/curl/files/curl-7.88.1-pipewait.patch +++ /dev/null @@ -1,64 +0,0 @@ -https://github.com/curl/curl/commit/821f6e2a89de8aec1c7da3c0f381b92b2b801efc -From: Stefan Eissing <stefan@eissing.org> -Date: Thu, 9 Feb 2023 16:07:34 +0100 -Subject: [PATCH] CURLOPT_PIPEWAIT: allow waited reuse also for subsequent - connections - -note: Dropped test portion of patch; not shipped in source tarball! - -As tested in test_02_07, when firing off 200 urls with --parallel, 199 -wait for the first connection to be established. if that is multiuse, -urls are added up to its capacity. - -The first url over capacity opens another connection. But subsequent -urls found the same situation and open a connection too. They should -have waited for the second connection to actually connect and make its -capacity known. - -This change fixes that by - -- setting `connkeep()` early in the HTTP setup handler. as otherwise - a new connection is marked as closeit by default and not considered - for multiuse at all -- checking the "connected" status for a candidate always and continuing - to PIPEWAIT if no alternative is found. - -pytest: -- removed "skip" from test_02_07 -- added test_02_07b to check that http/1.1 continues to work as before - -Closes #10456 ---- a/lib/http.c -+++ b/lib/http.c -@@ -233,6 +233,7 @@ static CURLcode http_setup_conn(struct Curl_easy *data, - - Curl_mime_initpart(&http->form); - data->req.p.http = http; -+ connkeep(conn, "HTTP default"); - - if((data->state.httpwant == CURL_HTTP_VERSION_3) - || (data->state.httpwant == CURL_HTTP_VERSION_3ONLY)) { ---- a/lib/url.c -+++ b/lib/url.c -@@ -1170,14 +1170,14 @@ ConnectionExists(struct Curl_easy *data, - continue; - } - } -+ } - -- if(!Curl_conn_is_connected(check, FIRSTSOCKET)) { -- foundPendingCandidate = TRUE; -- /* Don't pick a connection that hasn't connected yet */ -- infof(data, "Connection #%ld isn't open enough, can't reuse", -- check->connection_id); -- continue; -- } -+ if(!Curl_conn_is_connected(check, FIRSTSOCKET)) { -+ foundPendingCandidate = TRUE; -+ /* Don't pick a connection that hasn't connected yet */ -+ infof(data, "Connection #%ld isn't open enough, can't reuse", -+ check->connection_id); -+ continue; - } - - #ifdef USE_UNIX_SOCKETS diff --git a/net-misc/curl/files/curl-7.88.1-silent-parallel.patch b/net-misc/curl/files/curl-7.88.1-silent-parallel.patch deleted file mode 100644 index 1162067f73b3..000000000000 --- a/net-misc/curl/files/curl-7.88.1-silent-parallel.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/curl/curl/commit/475207c1c834ecf203dc4f3bc1917ae87628b6d0 -From: Daniel Stenberg <daniel@haxx.se> -Date: Tue, 21 Feb 2023 11:38:03 +0100 -Subject: [PATCH] tool_progress: shut off progress meter for --silent in - parallel - -Reported-by: finkjsc on github -Fixes #10573 -Closes #10579 ---- a/src/tool_progress.c -+++ b/src/tool_progress.c -@@ -173,7 +173,7 @@ bool progress_meter(struct GlobalConfig *global, - struct timeval now; - long diff; - -- if(global->noprogress) -+ if(global->noprogress || global->silent) - return FALSE; - - now = tvnow(); |