gentoo auto-resync : 09:07:2022 - 18:04:20

3 files changed, 0 insertions, 59 deletions

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index b6fb28643ef9..9cb45c4fda48 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,6 +1,4 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
-AUX curl-7.82.0-certs-processing.patch 853 BLAKE2B 5e05d6f31a93fd81ee597d88c1adeef97ac805befd2615044ad09d41c4b8c8b69f0689b21c2765c547c1dffa695d18791ee4c9301ae9b9e873621fd74eb6107a SHA512 839f262bec4b3730810a3cc849b571c1f7b9482d1c6f37fed9f56e7c3ccf1e07c0eb91bdf973846162bd0e259973e5dc90581db0a9cc7a808924948894437890
-AUX curl-7.83.0-http2.patch 1109 BLAKE2B f1cfcbcd68e046151e5d61c3d95e92cfdec9e412bc51375f08fcb7af508cea19fe48aabdd817949ecde61f9d6ba10d4051f3fe418ce7ca73326847e4bc6b4b04 SHA512 e98eb9129929bd00b1c8387da3668689b4da77b9641761766cf02f28909da5bad8bd506b59b5ce4cd066262a08341d2fa1d39803233c832e998be9a84ecbcab2
 AUX curl-7.84.0-easylock.patch 856 BLAKE2B a77854a75a06ad66ef4dc7d6a2555fe2678f4bfd170e961c35e5ad2a82a62891d125ead2d15a311e2a8951404732c755a03636dd4bf4dd3ad16e8bf32ff4f7ca SHA512 7b94f941577d5b0a240e4e879a7e4c659dbdd4ff50d67465bd1a0adf30f5e37a0af7f15b71810feb05d19b833359b069f86aa3ac4c396fd8ba8ed2012b60fb8f
 AUX curl-7.84.0-include-sched.patch 625 BLAKE2B 8c7ecdbc8ffd7cafac915c2d12db1ea98acbd166f18eba538ecd4666152653c36784569f1945b095480120c61124573b094e26ce26c8b85f62baedb40e20d758 SHA512 4be64eff67e56c2584f6c9ee0c9c7b7aca55fc15c8d4be6f9f79da9bb3c1bb1532bcb80eb4f87be2db1058dd41a32e366bfe83988d28b4b263fbb6679b5ec806
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
diff --git a/net-misc/curl/files/curl-7.82.0-certs-processing.patch b/net-misc/curl/files/curl-7.82.0-certs-processing.patch
deleted file mode 100644
index a62c1df20b30..000000000000
--- a/net-misc/curl/files/curl-7.82.0-certs-processing.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/curl/curl/issues/8559
-https://bugs.gentoo.org/836629
-
-From 911714d617c106ed5d553bf003e34ec94ab6a136 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Tue, 8 Mar 2022 13:38:13 +0100
-Subject: [PATCH] openssl: fix CN check error code
-
-Due to a missing 'else' this returns error too easily.
-
-Regressed in: d15692ebb
-
-Reported-by: Kristoffer Gleditsch
-Fixes #8559
-Closes #8560
---- a/lib/vtls/openssl.c
-+++ b/lib/vtls/openssl.c
-@@ -1817,7 +1817,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn,
-               memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen);
-               peer_CN[peerlen] = '\0';
-             }
--            result = CURLE_OUT_OF_MEMORY;
-+            else
-+              result = CURLE_OUT_OF_MEMORY;
-           }
-         }
-         else /* not a UTF8 name */
diff --git a/net-misc/curl/files/curl-7.83.0-http2.patch b/net-misc/curl/files/curl-7.83.0-http2.patch
deleted file mode 100644
index ede69a177b98..000000000000
--- a/net-misc/curl/files/curl-7.83.0-http2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Bug: https://bugs.gentoo.org/842780, https://github.com/curl/curl/pull/8768
-https://github.com/curl/curl/commit/6eb7fb37d901ed1e4ce07cbd628ee11bf02db1f3
-
-From 6eb7fb37d901ed1e4ce07cbd628ee11bf02db1f3 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 28 Apr 2022 17:11:50 +0200
-Subject: [PATCH] mbedtls: fix compile when h2-enabled
-
-Fixes #8766
-Reported-by: LigH-de on github
-Closes #8768
----
- lib/vtls/mbedtls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
-index 64f57c5d8321..5f9b87e6b75b 100644
---- a/lib/vtls/mbedtls.c
-+++ b/lib/vtls/mbedtls.c
-@@ -815,8 +815,8 @@ mbed_connect_step2(struct Curl_easy *data, struct connectdata *conn,
-     if(next_protocol) {
-       infof(data, VTLS_INFOF_ALPN_ACCEPTED_1STR, next_protocol);
- #ifdef USE_HTTP2
--      if(!strncmp(next_protocol, ALPN_H2, ALPN_H2_LEN) &&
--         !next_protocol[ALPN_H2_LEN]) {
-+      if(!strncmp(next_protocol, ALPN_H2, ALPN_H2_LENGTH) &&
-+         !next_protocol[ALPN_H2_LENGTH]) {
-         conn->negnpn = CURL_HTTP_VERSION_2;
-       }
-       else