gentoo auto-resync : 05:10:2024 - 04:27:09

2 files changed, 0 insertions, 52 deletions

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 7b8fe1863b1a..4a7a4fc3ba15 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,4 +1,3 @@
-AUX curl-8.10.0-sendrecv-poll.patch 2113 BLAKE2B 8f00179a27b3f544c8cf9c8f1adfc087011eb2c84792f64847052fe34fdf0a39c953a677aaf8a77f27634ec619101562203d0105c415664952b036f791083db9 SHA512 2e00a8004bcc50f184c5768ab30d0daaa0b845c5d5d2368ee8d35971da4832dd6bb7f30733e4ecb9fb3dd6547facfbc8d152fc59a40bf2858a8564130f83b308
 AUX curl-8.7.1-chunked-post.patch 2389 BLAKE2B d283816be5dca19ab0058db1937d686b4f9056caf3c46a8dcd731bc69ae91df1b01d10f643ce127eeec7aac0e9282f8b5c5109fe1cea82b30d2cf3270e93ae24 SHA512 3b1a67010704f4863f973e79d6a695e6e13b938fbaa695a05bc92b1a577fa5852c310b38f9c88518275f82c7d088474f5e4c585ac5ff790043e6ca969b0dc1d9
 AUX curl-8.7.1-fix-compress-option.patch 6222 BLAKE2B 7ff5c096fa6cc5cc039f47188a85c49364cdfe6cfeae3a9c58b38939eb59896bcf204c682f36e89ace37a0753236593307e1af45bc2d0f099ff685af8e366713 SHA512 1622adf015a016a205d4bf621715ed06fd345cd45f032ad44b6d9324d398c0e2004f04fe734401b12007c3eb145dac84aa3ce90bdaa9b16e09b5908da75f902f
 AUX curl-8.7.1-http2-git-clone.patch 14120 BLAKE2B 5bc2c0765ebd400f2e79d0552621c98640c757f189ae0fa029d8fb6d9fa74ac0e4fd93948fed6bc7f93b329e30948a585be1f20dde18423acf162cd36b4fb166 SHA512 278720daae7d4d3288502e0dd2b591ada66a559040eb341b0cf5673094e9d214eb166772279378487da96f43912313e04d3b174fdcb2b2cbfa766f241df62f34
diff --git a/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch b/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch
deleted file mode 100644
index 44654377008a..000000000000
--- a/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://github.com/curl/curl/commit/a33bcc9b53b9d6ea9f879624e8abea0b012b008e
-From: Stefan Eissing <stefan@eissing.org>
-Date: Fri, 13 Sep 2024 18:36:53 +0200
-Subject: [PATCH] transfer: fix sendrecv() without interim poll
-
-There was a "clever" optimization that skipped sendrecv() handling when
-the transfer's pollset was empty. This happens for paused transfers, for
-example.
-
-Unforunately, if the libcurl application never calls curl_multi_poll(),
-the pollset is and will aways remain empty, prevent the transfer from
-progressing.
-
-Remove this "optimization" and always try send/receive where applicable.
-
-Fixes #14898
-Reported-by: Victor Kislov
-Closes #14901
---- a/lib/transfer.c
-+++ b/lib/transfer.c
-@@ -431,8 +431,6 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp)
-     if(select_bits_paused(data, data->state.select_bits)) {
-       /* leave the bits unchanged, so they'll tell us what to do when
-        * this transfer gets unpaused. */
--      /* DEBUGF(infof(data, "sendrecv, select_bits, early return on PAUSED"));
--      */
-       result = CURLE_OK;
-       goto out;
-     }
-@@ -440,16 +438,13 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp)
-     /* DEBUGF(infof(data, "sendrecv, select_bits %x, RUN", select_bits)); */
-     select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN);
-   }
--  else if(data->last_poll.num) {
--    /* The transfer wanted something polled. Let's run all available
--     * send/receives. Worst case we EAGAIN on some. */
--    /* DEBUGF(infof(data, "sendrecv, had poll sockets, RUN")); */
-+  else {
-+    /* try both directions if the transfer wants it. We used to poll
-+     * the socket here and on ran send/recv depending on POLLIN/OUT, but
-+     * that does not when connections are multiplexed or handshake,
-+     * or other direction reversals are happening. */
-     select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN);
-   }
--  else if(data->req.keepon & KEEP_SEND_TIMED) {
--    /* DEBUGF(infof(data, "sendrecv, KEEP_SEND_TIMED, RUN ul")); */
--    select_bits = CURL_CSELECT_OUT;
--  }
- 
- #ifdef USE_HYPER
-   if(data->conn->datastream) {