diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest index 217735387d..792b00ecc0 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest @@ -1,5 +1,5 @@ -DIST curl-8.10.0.tar.xz 2729448 BLAKE2B 18b438c0e4e7b0b698a1fee16406c611124e3d137349869dd8dbb43b5ba45163c6a053e02f665e627424c96e18f8499c13ebe1eeb4c1441936d0183d28696ae6 SHA512 055277695ea242fcb0bf26ca6c4867a385cd578cd73ed4c5c4a020233248044c1ecaebcbaeaac47d3ffe07a41300ea5fc86396d7e812137cf75ed3e1b54ca5b2 -DIST curl-8.10.0.tar.xz.asc 488 BLAKE2B 2b651b074b39eb8b34bc9e46a70d4e6597f04250fc3b5c8f8c4641a022529d176179cc54d9c7dccd9b64c62f1873a7ab214705d6a724928e68b871216658a683 SHA512 3d3ece14008facc373cd715d46eeb523bb17a701df3b1839f0774847692613a9472d3e7a60ba814846bbc8e8e4f17c81a1f1355e1c9eebef244b7cd00e0f6fb8 +DIST curl-8.10.1.tar.xz 2726748 BLAKE2B bfdfa24f6d652884044c5e8eea5d70daad651b46255c99c9df502f9595a2dcbf8c4034446becf9e87f8e8a3f397a8fda29ab3e0d6020ac0dae62dd42b8136b78 SHA512 f1c7a12492dcfb8ba08be69b96a83ce9074592cbaa6b95c72b3c16fc58ad35e9f9deec7b72baca7d360d013b0b1c7ea38bd4edae464903ac67aa3c76238d8c6c +DIST curl-8.10.1.tar.xz.asc 488 BLAKE2B 8e8f2b628d4e8964a76c1c43c5557aacbfc2d2dbc51be8a0fa1b157c257f15f29aedba842cba7cb270c4adcf0b4a5d9c8b0b3d49633c48b061fb3e1472303d66 SHA512 21d6d560c027efc9e3e5db182a77501d6376442221ba910df817e2ec980bee44a9fe2afc698205f8d5e8313ae47915a341d60206a46b46e816d73ee357a894ac DIST curl-8.7.1.tar.xz 2707016 BLAKE2B a2a9f48d0b69c0d92fcbbda535ce55082a5243abe3ab2db80d6fa3f32fb2c98b65026d69fc45c94e966398cf9ba8d9c95b6b91f4768b54749ed3275dd21838ef SHA512 5bbde9d5648e9226f5490fa951690aaf159149345f3a315df2ba58b2468f3e59ca32e8a49734338afc861803a4f81caac6d642a4699b72c6310ebfb1f618aad2 DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2716f531e5d2989e9b6b1199e180603673891d7967cdcdaee1d6b5e15160ccabe9b51590e2887022db03c2ed SHA512 f98c393997c4a32f545a8982226e8cd612395210915a4576c2ce227d0f650cff341be7bf15e989d1789abf32ac4fd9c190b9250b81e650b569e8532048746b37 DIST curl-8.8.0.tar.xz 2748860 BLAKE2B c14903bad4cbd1752a5335afa6bcc78be1a484692fce0e0a6c2061963e0e6b4e56defb8332cef32d0dbddb481ad0443b71faf3a52a6e9d945c89ecbce373d2a3 SHA512 9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.10.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.10.1.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.10.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.10.1.ebuild index 335c3c36a0..8aa5f19b3d 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.10.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.10.1.ebuild @@ -158,7 +158,6 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-prefix-2.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch - "${FILESDIR}"/${P}-sendrecv-poll.patch ) src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.9.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.9.1-r1.ebuild index ab60a16536..8ba549d7da 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.9.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.9.1-r1.ebuild @@ -21,7 +21,7 @@ else https://curl.se/download/${P}.tar.xz verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="BSD curl ISC test? ( BSD-4 )" diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch deleted file mode 100644 index 4465437700..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 -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) {