gentoo auto-resync : 23:07:2023 - 08:52:38

4 files changed, 166 insertions, 3 deletions

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.ebuild b/net-misc/curl/curl-8.2.0-r1.ebuild
index 0414671d123d..11500ccb756e 100644
--- a/net-misc/curl/curl-8.2.0.ebuild
+++ b/net-misc/curl/curl-8.2.0-r1.ebuild
@@ -51,7 +51,7 @@ 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}] )
+	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}] )
@@ -91,7 +91,7 @@ BDEPEND="
 	virtual/pkgconfig
 	test? (
 		sys-apps/diffutils
-		http2? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
 		nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
 	)
 	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
@@ -121,6 +121,8 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 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() {
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 <daniel@haxx.se>
+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 @@
++<testcase>
++<info>
++<keywords>
++HTTP
++HTTP GET
++Basic
++</keywords>
++</info>
++
++#
++# Server-side
++<reply>
++<data crlf="yes" nocheck="yes">
++HTTP/1.1 302 go go go
++Content-Length: 8
++Location: http://%HOSTIP:%HTTPPORT/user/%TESTNUMBER0002
++Content-Type: text/html
++Funny-head: yesyes
++
++notreal
++</data>
++<data2 crlf="yes">
++HTTP/1.1 200 OK
++Content-Length: 6
++Content-Type: text/html
++Funny-head: yesyes
++
++final
++</data2>
++</reply>
++
++#
++# Client-side
++<client>
++<server>
++http
++</server>
++<name>
++-u with redirect to absolute URL using same origin and auth
++</name>
++<command>
++http://first:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u smith:doggie
++</command>
++</client>
++
++#
++# Verify data after the test has been "shot"
++<verify>
++<protocol crlf="yes">
++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: */*
++
++</protocol>
++</verify>
++</testcase>
+
+From c1effdfe658ae505e8ea65e5f46d810c4b8d81cb Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+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 <stefan@eissing.org>
+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