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

["Sam James" <sam@gentoo.org>]

commit:     cc1824275e07e2a2b7c3f516b25eb0832cd0e716
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jun 10 08:27:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 09:16:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc182427

net-misc/curl: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31371
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/curl/files/curl-8.1.0-header-length.patch |  86 --------
 .../curl/files/curl-8.1.0-numeric-hostname.patch   | 227 ---------------------
 .../curl/files/curl-8.1.1-configure-compiler.patch |  73 -------
 net-misc/curl/files/curl-8.1.1-hanging-http2.patch |  36 ----
 4 files changed, 422 deletions(-)

diff --git a/net-misc/curl/files/curl-8.1.0-header-length.patch b/net-misc/curl/files/curl-8.1.0-header-length.patch
deleted file mode 100644
index 6229fd817f2a..000000000000
--- a/net-misc/curl/files/curl-8.1.0-header-length.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://github.com/curl/curl/commit/77c9a9845bbee66f3aff158b8452dc8cd963cbd5.patch
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Thu, 18 May 2023 18:22:57 +0200
-Subject: [PATCH] http2: double http request parser max line length
-
-This works around #11138, by doubling the limit, and should be a
-relatively safe fix.
-
-Ideally the buffer would grow as needed and there would be no need for a
-limit? But that might be follow-up material.
-
-Fixes #11138
-Closes #11139
----
- lib/http1.h             | 2 ++
- lib/http2.c             | 2 +-
- lib/vquic/curl_msh3.c   | 2 +-
- lib/vquic/curl_ngtcp2.c | 2 +-
- lib/vquic/curl_quiche.c | 2 +-
- 5 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/lib/http1.h b/lib/http1.h
-index c2d107587a6f8..8acb9db401a95 100644
---- a/lib/http1.h
-+++ b/lib/http1.h
-@@ -33,6 +33,8 @@
- #define H1_PARSE_OPT_NONE       (0)
- #define H1_PARSE_OPT_STRICT     (1 << 0)
- 
-+#define H1_PARSE_DEFAULT_MAX_LINE_LEN (8 * 1024)
-+
- struct h1_req_parser {
-   struct http_req *req;
-   struct bufq scratch;
-diff --git a/lib/http2.c b/lib/http2.c
-index 47e6f71393156..4e3b182b8d815 100644
---- a/lib/http2.c
-+++ b/lib/http2.c
-@@ -1860,7 +1860,7 @@ static ssize_t h2_submit(struct stream_ctx **pstream,
-   nghttp2_priority_spec pri_spec;
-   ssize_t nwritten;
- 
--  Curl_h1_req_parse_init(&h1, (4*1024));
-+  Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
-   Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST);
- 
-   *err = http2_data_setup(cf, data, &stream);
-diff --git a/lib/vquic/curl_msh3.c b/lib/vquic/curl_msh3.c
-index 40e89379fc402..173886739b6dc 100644
---- a/lib/vquic/curl_msh3.c
-+++ b/lib/vquic/curl_msh3.c
-@@ -575,7 +575,7 @@ static ssize_t cf_msh3_send(struct Curl_cfilter *cf, struct Curl_easy *data,
- 
-   CF_DATA_SAVE(save, cf, data);
- 
--  Curl_h1_req_parse_init(&h1, (4*1024));
-+  Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
-   Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST);
- 
-   /* Sizes must match for cast below to work" */
-diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c
-index 05f960afdffa1..7794f148c6ec9 100644
---- a/lib/vquic/curl_ngtcp2.c
-+++ b/lib/vquic/curl_ngtcp2.c
-@@ -1550,7 +1550,7 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf,
-   nghttp3_data_reader reader;
-   nghttp3_data_reader *preader = NULL;
- 
--  Curl_h1_req_parse_init(&h1, (4*1024));
-+  Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
-   Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST);
- 
-   *err = h3_data_setup(cf, data);
-diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c
-index 392b9beb83c59..c63e8e10a22e0 100644
---- a/lib/vquic/curl_quiche.c
-+++ b/lib/vquic/curl_quiche.c
-@@ -913,7 +913,7 @@ static ssize_t h3_open_stream(struct Curl_cfilter *cf,
-     DEBUGASSERT(stream);
-   }
- 
--  Curl_h1_req_parse_init(&h1, (4*1024));
-+  Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
-   Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST);
- 
-   DEBUGASSERT(stream);

diff --git a/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch b/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch
deleted file mode 100644
index 6a0dd1382d62..000000000000
--- a/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-https://github.com/curl/curl/commit/92772e6d395bbdda0e7822d980caf86e8c4aa51c.patch
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 18 May 2023 00:31:17 +0200
-Subject: [PATCH] urlapi: allow numerical parts in the host name
-
-It can only be an IPv4 address if all parts are all digits and no more than
-four parts, otherwise it is a host name. Even slightly wrong IPv4 will now be
-passed through as a host name.
-
-Regression from 17a15d88467 shipped in 8.1.0
-
-Extended test 1560 accordingly.
-
-Reported-by: Pavel Kalyugin
-Fixes #11129
-Closes #11131
---- a/lib/urlapi.c
-+++ b/lib/urlapi.c
-@@ -34,6 +34,7 @@
- #include "inet_ntop.h"
- #include "strdup.h"
- #include "idn.h"
-+#include "curl_memrchr.h"
- 
- /* The last 3 #include files should be in this order */
- #include "curl_printf.h"
-@@ -643,8 +644,8 @@ static CURLUcode hostname_check(struct Curl_URL *u, char *hostname,
-  * Handle partial IPv4 numerical addresses and different bases, like
-  * '16843009', '0x7f', '0x7f.1' '0177.1.1.1' etc.
-  *
-- * If the given input string is syntactically wrong or any part for example is
-- * too big, this function returns FALSE and doesn't create any output.
-+ * If the given input string is syntactically wrong IPv4 or any part for
-+ * example is too big, this function returns HOST_NAME.
-  *
-  * Output the "normalized" version of that input string in plain quad decimal
-  * integers.
-@@ -675,7 +676,7 @@ static int ipv4_normalize(struct dynbuf *host)
-     unsigned long l;
-     if(!ISDIGIT(*c))
-       /* most importantly this doesn't allow a leading plus or minus */
--      return n ? HOST_BAD : HOST_NAME;
-+      return HOST_NAME;
-     l = strtoul(c, &endp, 0);
- 
-     parts[n] = l;
-@@ -684,7 +685,7 @@ static int ipv4_normalize(struct dynbuf *host)
-     switch(*c) {
-     case '.':
-       if(n == 3)
--        return HOST_BAD;
-+        return HOST_NAME;
-       n++;
-       c++;
-       break;
-@@ -694,39 +695,40 @@ static int ipv4_normalize(struct dynbuf *host)
-       break;
- 
-     default:
--      return n ? HOST_BAD : HOST_NAME;
-+      return HOST_NAME;
-     }
- 
-     /* overflow */
-     if((l == ULONG_MAX) && (errno == ERANGE))
--      return HOST_BAD;
-+      return HOST_NAME;
- 
- #if SIZEOF_LONG > 4
-     /* a value larger than 32 bits */
-     if(l > UINT_MAX)
--      return HOST_BAD;
-+      return HOST_NAME;
- #endif
-   }
- 
--  /* this is a valid IPv4 numerical address */
--  Curl_dyn_reset(host);
--
-   switch(n) {
-   case 0: /* a -- 32 bits */
-+    Curl_dyn_reset(host);
-+
-     result = Curl_dyn_addf(host, "%u.%u.%u.%u",
-                            parts[0] >> 24, (parts[0] >> 16) & 0xff,
-                            (parts[0] >> 8) & 0xff, parts[0] & 0xff);
-     break;
-   case 1: /* a.b -- 8.24 bits */
-     if((parts[0] > 0xff) || (parts[1] > 0xffffff))
--      return HOST_BAD;
-+      return HOST_NAME;
-+    Curl_dyn_reset(host);
-     result = Curl_dyn_addf(host, "%u.%u.%u.%u",
-                            parts[0], (parts[1] >> 16) & 0xff,
-                            (parts[1] >> 8) & 0xff, parts[1] & 0xff);
-     break;
-   case 2: /* a.b.c -- 8.8.16 bits */
-     if((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xffff))
--      return HOST_BAD;
-+      return HOST_NAME;
-+    Curl_dyn_reset(host);
-     result = Curl_dyn_addf(host, "%u.%u.%u.%u",
-                            parts[0], parts[1], (parts[2] >> 8) & 0xff,
-                            parts[2] & 0xff);
-@@ -734,7 +736,8 @@ static int ipv4_normalize(struct dynbuf *host)
-   case 3: /* a.b.c.d -- 8.8.8.8 bits */
-     if((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff) ||
-        (parts[3] > 0xff))
--      return HOST_BAD;
-+      return HOST_NAME;
-+    Curl_dyn_reset(host);
-     result = Curl_dyn_addf(host, "%u.%u.%u.%u",
-                            parts[0], parts[1], parts[2], parts[3]);
-     break;
-@@ -796,6 +799,9 @@ static CURLUcode parse_authority(struct Curl_URL *u,
-   if(result)
-     goto out;
- 
-+  if(!Curl_dyn_len(host))
-+    return CURLUE_NO_HOST;
-+
-   switch(ipv4_normalize(host)) {
-   case HOST_IPV4:
-     break;
---- a/tests/libtest/lib1560.c
-+++ b/tests/libtest/lib1560.c
-@@ -474,6 +474,13 @@ static const struct testcase get_parts_list[] ={
- };
- 
- static const struct urltestcase get_url_list[] = {
-+  {"https://1.0x1000000", "https://1.0x1000000/", 0, 0, CURLUE_OK},
-+  {"https://0x7f.1", "https://127.0.0.1/", 0, 0, CURLUE_OK},
-+  {"https://1.2.3.256.com", "https://1.2.3.256.com/", 0, 0, CURLUE_OK},
-+  {"https://10.com", "https://10.com/", 0, 0, CURLUE_OK},
-+  {"https://1.2.com", "https://1.2.com/", 0, 0, CURLUE_OK},
-+  {"https://1.2.3.com", "https://1.2.3.com/", 0, 0, CURLUE_OK},
-+  {"https://1.2.com.99", "https://1.2.com.99/", 0, 0, CURLUE_OK},
-   {"https://[fe80::0000:20c:29ff:fe9c:409b]:80/moo",
-    "https://[fe80::20c:29ff:fe9c:409b]:80/moo",
-    0, 0, CURLUE_OK},
-@@ -522,22 +529,24 @@ static const struct urltestcase get_url_list[] = {
- 
-   /* IPv4 trickeries */
-   {"https://16843009", "https://1.1.1.1/", 0, 0, CURLUE_OK},
--  {"https://0x7f.1", "https://127.0.0.1/", 0, 0, CURLUE_OK},
-   {"https://0177.1", "https://127.0.0.1/", 0, 0, CURLUE_OK},
-   {"https://0111.02.0x3", "https://73.2.0.3/", 0, 0, CURLUE_OK},
-+  {"https://0111.02.0x3.", "https://0111.02.0x3./", 0, 0, CURLUE_OK},
-+  {"https://0111.02.030", "https://73.2.0.24/", 0, 0, CURLUE_OK},
-+  {"https://0111.02.030.", "https://0111.02.030./", 0, 0, CURLUE_OK},
-   {"https://0xff.0xff.0377.255", "https://255.255.255.255/", 0, 0, CURLUE_OK},
-   {"https://1.0xffffff", "https://1.255.255.255/", 0, 0, CURLUE_OK},
-   /* IPv4 numerical overflows or syntax errors will not normalize */
-   {"https://a127.0.0.1", "https://a127.0.0.1/", 0, 0, CURLUE_OK},
-   {"https://\xff.127.0.0.1", "https://%FF.127.0.0.1/", 0, CURLU_URLENCODE,
-    CURLUE_OK},
--  {"https://127.-0.0.1", "https://127.-0.0.1/", 0, 0, CURLUE_BAD_HOSTNAME},
-+  {"https://127.-0.0.1", "https://127.-0.0.1/", 0, 0, CURLUE_OK},
-   {"https://127.0. 1", "https://127.0.0.1/", 0, 0, CURLUE_MALFORMED_INPUT},
--  {"https://1.0x1000000", "https://1.0x1000000/", 0, 0, CURLUE_BAD_HOSTNAME},
--  {"https://1.2.3.256", "https://1.2.3.256/", 0, 0, CURLUE_BAD_HOSTNAME},
--  {"https://1.2.3.4.5", "https://1.2.3.4.5/", 0, 0, CURLUE_BAD_HOSTNAME},
--  {"https://1.2.0x100.3", "https://1.2.0x100.3/", 0, 0, CURLUE_BAD_HOSTNAME},
--  {"https://4294967296", "https://4294967296/", 0, 0, CURLUE_BAD_HOSTNAME},
-+  {"https://1.2.3.256", "https://1.2.3.256/", 0, 0, CURLUE_OK},
-+  {"https://1.2.3.256.", "https://1.2.3.256./", 0, 0, CURLUE_OK},
-+  {"https://1.2.3.4.5", "https://1.2.3.4.5/", 0, 0, CURLUE_OK},
-+  {"https://1.2.0x100.3", "https://1.2.0x100.3/", 0, 0, CURLUE_OK},
-+  {"https://4294967296", "https://4294967296/", 0, 0, CURLUE_OK},
-   {"https://123host", "https://123host/", 0, 0, CURLUE_OK},
-   /* 40 bytes scheme is the max allowed */
-   {"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA://hostname/path",
-@@ -599,20 +608,11 @@ static const struct urltestcase get_url_list[] = {
-    0, 0, CURLUE_OK},
-   /* here the password has the semicolon */
-   {"http://user:pass;word@host/file",
--   "http://user:pass;word@host/file",
--   0, 0, CURLUE_OK},
--  {"file:///file.txt#moo",
--   "file:///file.txt#moo",
--   0, 0, CURLUE_OK},
--  {"file:////file.txt",
--   "file:////file.txt",
--   0, 0, CURLUE_OK},
--  {"file:///file.txt",
--   "file:///file.txt",
--   0, 0, CURLUE_OK},
--  {"file:./",
--   "file://",
--   0, 0, CURLUE_BAD_SCHEME},
-+   "http://user:pass;word@host/file", 0, 0, CURLUE_OK},
-+  {"file:///file.txt#moo", "file:///file.txt#moo", 0, 0, CURLUE_OK},
-+  {"file:////file.txt", "file:////file.txt", 0, 0, CURLUE_OK},
-+  {"file:///file.txt", "file:///file.txt", 0, 0, CURLUE_OK},
-+  {"file:./", "file://", 0, 0, CURLUE_OK},
-   {"http://example.com/hello/../here",
-    "http://example.com/hello/../here",
-    CURLU_PATH_AS_IS, 0, CURLUE_OK},
-@@ -1124,7 +1124,7 @@ static int get_url(void)
-       }
-       curl_free(url);
-     }
--    else if(rc != get_url_list[i].ucode) {
-+    if(rc != get_url_list[i].ucode) {
-       fprintf(stderr, "Get URL\nin: %s\nreturned %d (expected %d)\n",
-               get_url_list[i].in, (int)rc, get_url_list[i].ucode);
-       error++;
-@@ -1515,6 +1515,9 @@ int test(char *URL)
- {
-   (void)URL; /* not used */
- 
-+  if(get_url())
-+    return 3;
-+
-   if(huge())
-     return 9;
- 
-@@ -1533,9 +1536,6 @@ int test(char *URL)
-   if(set_parts())
-     return 2;
- 
--  if(get_url())
--    return 3;
--
-   if(get_parts())
-     return 4;
- 

diff --git a/net-misc/curl/files/curl-8.1.1-configure-compiler.patch b/net-misc/curl/files/curl-8.1.1-configure-compiler.patch
deleted file mode 100644
index f769b35880cf..000000000000
--- a/net-misc/curl/files/curl-8.1.1-configure-compiler.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-The check for "basic compiler options" hangs otherwise.
-
-https://github.com/curl/curl/commit/471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36
-https://github.com/curl/curl/commit/c4a019603b82a08c3572591a9393df0818ee02f6
-
-From 471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Tue, 23 May 2023 09:40:18 +0200
-Subject: [PATCH] configure: quote the assignments for run-compiler
-
-Building for multilib failed, as the compiler command contains an
-extra argument. That needs quoting.
-
-Regression from b78ca50cb3dda361f9c1
-
-Fixes #11179
-Closes #11180
---- a/configure.ac
-+++ b/configure.ac
-@@ -193,8 +193,8 @@ dnl something different but only have that affect the execution of the results
- dnl of the compile, not change the libraries for the compiler itself.
- dnl
- compilersh="run-compiler"
--echo "CC=$CC" > $compilersh
--echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $compilersh
-+echo "CC=\"$CC\"" > $compilersh
-+echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh
- echo 'exec $CC $@' >> $compilersh
- 
- dnl **********************************************************************
-
-From c4a019603b82a08c3572591a9393df0818ee02f6 Mon Sep 17 00:00:00 2001
-From: Emanuele Torre <torreemanuele6@gmail.com>
-Date: Tue, 23 May 2023 11:59:59 +0200
-Subject: [PATCH] configure: fix build with arbitrary CC and LD_LIBRARY_PATH
-
-Since ./configure and processes that inherit its environment variables
-are the only callers of the run-compiler script, we can just save the
-current value of the LD_LIBRARY_PATH and CC variables to another pair of
-environment variables, and make run-compiler a static script that
-simply restores CC and LD_LIBRARY_PATH to the saved value, and before
-running the compiler.
-
-This avoids having to inject the values of the variables in the script,
-possibly causing problems if they contains spaces, quotes, and other
-special characters.
-
-Also add exports in the script just in case LD_LIBRARY_PATH and CC are
-not already in the environment.
-
-follow-up from 471dab2
-
-Closes #11182
---- a/configure.ac
-+++ b/configure.ac
-@@ -193,9 +193,13 @@ dnl something different but only have that affect the execution of the results
- dnl of the compile, not change the libraries for the compiler itself.
- dnl
- compilersh="run-compiler"
--echo "CC=\"$CC\"" > $compilersh
--echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh
--echo 'exec $CC $@' >> $compilersh
-+export "CURL_SAVED_CC=$CC"
-+export "CURL_SAVED_LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
-+cat <<\EOF > "$compilersh"
-+export "CC=$CURL_SAVED_CC"
-+export "LD_LIBRARY_PATH=$CURL_SAVED_LD_LIBRARY_PATH"
-+exec $CC "$@"
-+EOF
- 
- dnl **********************************************************************
- dnl See which TLS backend(s) that are requested. Just do all the
-

diff --git a/net-misc/curl/files/curl-8.1.1-hanging-http2.patch b/net-misc/curl/files/curl-8.1.1-hanging-http2.patch
deleted file mode 100644
index 4777c4dd35ed..000000000000
--- a/net-misc/curl/files/curl-8.1.1-hanging-http2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/curl/curl/commit/5c58cb0212bcf63cce33a974906bf9905948b4bb
-From: Stefan Eissing <stefan@eissing.org>
-Date: Wed, 24 May 2023 18:48:16 +0200
-Subject: [PATCH] http2: fix EOF handling on uploads with auth negotiation
-
-- doing a POST with `--digest` does an override on the initial request
-  with `Content-Length: 0`, but the http2 filter was unaware of that
-  and expected the originally request body. It did therefore not
-  send a final DATA frame with EOF flag to the server.
-- The fix overrides any initial notion of post size when the `done_send`
-  event is triggered by the transfer loop, leading to the EOF that
-  is necessary.
-- refs #11194. The fault did not happen in testing, as Apache httpd
-  never tries to read the request body of the initial request,
-  sends the 401 reply and closes the stream. The server used in the
-  reported issue however tried to read the EOF and timed out on the
-  request.
-
-Reported-by: Aleksander Mazur
-Fixes #11194
-Cloes #11200
---- a/lib/http2.c
-+++ b/lib/http2.c
-@@ -1527,10 +1527,8 @@ static CURLcode http2_data_done_send(struct Curl_cfilter *cf,
-   if(!stream->send_closed) {
-     stream->send_closed = TRUE;
-     if(stream->upload_left) {
--      /* If we operated with unknown length, we now know that everything
--       * that is buffered is all we have to send. */
--      if(stream->upload_left == -1)
--        stream->upload_left = Curl_bufq_len(&stream->sendbuf);
-+      /* we now know that everything that is buffered is all there is. */
-+      stream->upload_left = Curl_bufq_len(&stream->sendbuf);
-       /* resume sending here to trigger the callback to get called again so
-          that it can signal EOF to nghttp2 */
-       (void)nghttp2_session_resume_data(ctx->h2, stream->id);