[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     36505d36317a892c0e6e863440f4d706bf066a43
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Aug 13 13:40:13 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 05:58:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36505d36

net-misc/curl: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32285
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-misc/curl/files/curl-8.2.0-basic-auth.patch | 127 ------------------------
 net-misc/curl/files/curl-8.2.0-http2-eof.patch  |  32 ------
 2 files changed, 159 deletions(-)

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
deleted file mode 100644
index 899ffb75a878..000000000000
--- a/net-misc/curl/files/curl-8.2.0-basic-auth.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-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
deleted file mode 100644
index 0040a3c6560e..000000000000
--- a/net-misc/curl/files/curl-8.2.0-http2-eof.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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