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 0f4efc9986..74528f45a2 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 @@ -2,5 +2,5 @@ DIST curl-8.11.1.tar.xz 2751236 BLAKE2B a87ec2c78c5d6daf44eee4cf8e3ed124849d067f DIST curl-8.11.1.tar.xz.asc 488 BLAKE2B 53d58ebb8ab722d8394b7ce94b646c876324cd89b3e47d9129bddcfbb6db338c1dbe93a5e72a25caf7be9ddd450c2b0832cfee17beb8ba701bdeefe653235d53 SHA512 c09bedb67e83fb8ca3ad73c5bd0d92fed7fc2c26dbe5a71cccb193fd151c7219713241a9fe74baefcd1d008cfafba78142bf04cec24dd4a88d67179184d35824 DIST curl-8.12.1.tar.xz 2768160 BLAKE2B 2b3e3d91041881c0951ad470736266105d3b9720440b808fe382baa493a30075aba52eb1d329fb1f148e27cd76290d82e121e7f4abf695f215456a10e26ade3e SHA512 88915468fa1bb7256e3dd6c9d058ada6894faa1e3e7800c7d9bfee3e8be4081ae57e7f2bf260c5342b709499fc4302ddc2d7864e25bfa3300fa07f118a3de603 DIST curl-8.12.1.tar.xz.asc 488 BLAKE2B 2a6563609c9f7ada84ca2c7048ad9406809eef4cc958760d2ab3d1b7be58d26247e579bd025870609e80ebb00295026aae30614b84e3a81bdf3ed3dbd0f5ed70 SHA512 41fc5582935090d13940d86974fdea3ea901dd5dab156c16029a87f811d2535172c59dc8dc366f2ffc37bcf85accbecb5aa765bc7b83c2991a3ef402bf25af69 -DIST curl-8.13.0-rc1.tar.xz 2788060 BLAKE2B eb82b73ac51e93fc8e9e6040a85ce54924edc1179cc670327009c984a1d2ddd62d29080de6ee83e7fd2657b9ef2778c4324abebef846d6afd85e5016dd282129 SHA512 6890dae4abf9c9d4017c28ea8ced84ef457aa911574b261af97b81ab1631e04deef188928d015a19c861d8dd319a23d9a7725d93046fc07a39694c5dc445562e -DIST curl-8.13.0-rc1.tar.xz.asc 488 BLAKE2B cb4ec7c0ceee7b7bb4c92569d37b1620b7543db5b5db0939a8c03f875f7b1e495584fd9cd7d84071a477dc85b54fc4127197814f1c765e232f445b050c1869d3 SHA512 aeb6f5abcf1bd19d836ae688bebd0193c673060ed74afa7c5b63c2a0ecf7eaf00a223110cd7aa77d19183e8ba757bd0b8fb481e279cf1141c4b459f92604a740 +DIST curl-8.13.0-rc3.tar.xz 2792136 BLAKE2B af18c877ca6e9fb3e75265f86b3f3416e12b4160b71de00dfb82d687f11f457faf2f7dddde557474631ac7148cada1add189ac4ed002c41745bd546309093312 SHA512 72c0e0b8b0bc9117ab911b97bab6b1502d877f5a72a34091b68e48c046e45dfd188f24f270c0200f4df3f1a70933ada00f3a73a0aa078ec2b125fa5a9294d33f +DIST curl-8.13.0-rc3.tar.xz.asc 488 BLAKE2B 8778af342578bace6ddea93c719fb74b8a9b85ffb53938f46888c48cb9eef53bd018b4df421c2ceaecae5a8058a32b3b058e7965ba8b092eb17fef69168ab3f4 SHA512 a2d94a898824fabc1c4834f9e5719fb65311d0f218f6170e80fe1a04c6f842f9fbf589d281767ab916f668ff7087bb318b819a1fb26790640df136f335ff3b99 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.12.1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.12.1.ebuild index f8c6055018..a497cf397a 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.12.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.12.1.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/curl-8.13.0_rc1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.13.0_rc3.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.13.0_rc1.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.13.0_rc3.ebuild index 13cfd90ad6..5af80a37e9 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.13.0_rc1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.13.0_rc3.ebuild @@ -367,8 +367,7 @@ multilib_src_test() { # this ends up breaking when nproc is huge (like -j80). # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped # as most gentoo users don't have an 'ip6-localhost' - # 1022 does not like `-rc` in the version string; fixed upstream. - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083 !1022" + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083" } multilib_src_install() { diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.12.0-multi.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.12.0-multi.patch deleted file mode 100644 index b9405af8da..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.12.0-multi.patch +++ /dev/null @@ -1,136 +0,0 @@ -https://github.com/curl/curl/issues/16236#issuecomment-2645385845 -https://github.com/curl/curl/commit/242a1439e7d8cdb72ae6a2fa2e705e2d9a2b7501 - - ---- a/lib/setopt.c -+++ b/lib/setopt.c -@@ -1584,10 +1584,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option, - if(data->share->hsts == data->hsts) - data->hsts = NULL; - #endif --#ifdef USE_SSL -- if(data->share->ssl_scache == data->state.ssl_scache) -- data->state.ssl_scache = data->multi ? data->multi->ssl_scache : NULL; --#endif - #ifdef USE_LIBPSL - if(data->psl == &data->share->psl) - data->psl = data->multi ? &data->multi->psl : NULL; -@@ -1628,10 +1624,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option, - data->hsts = data->share->hsts; - } - #endif --#ifdef USE_SSL -- if(data->share->ssl_scache) -- data->state.ssl_scache = data->share->ssl_scache; --#endif - #ifdef USE_LIBPSL - if(data->share->specifier & (1 << CURL_LOCK_DATA_PSL)) - data->psl = &data->share->psl; ---- a/lib/transfer.c -+++ b/lib/transfer.c -@@ -567,12 +567,6 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) - #endif - data->state.httpreq = data->set.method; - --#ifdef USE_SSL -- if(!data->state.ssl_scache) -- /* There was no ssl session cache set via a share, use the multi one */ -- data->state.ssl_scache = data->multi->ssl_scache; --#endif -- - data->state.requests = 0; - data->state.followlocation = 0; /* reset the location-follow counter */ - data->state.this_is_a_follow = FALSE; /* reset this */ ---- a/lib/urldata.h -+++ b/lib/urldata.h -@@ -1199,7 +1199,6 @@ struct UrlState { - curl_prot_t first_remote_protocol; - - int retrycount; /* number of retries on a new connection */ -- struct Curl_ssl_scache *ssl_scache; /* TLS session pool */ - int os_errno; /* filled in with errno whenever an error occurs */ - long followlocation; /* redirect counter */ - int requests; /* request counter: redirects + authentication retakes */ ---- a/lib/vtls/vtls_scache.c -+++ b/lib/vtls/vtls_scache.c -@@ -82,6 +82,17 @@ struct Curl_ssl_scache { - long age; - }; - -+static struct Curl_ssl_scache *cf_ssl_scache_get(struct Curl_easy *data) -+{ -+ struct Curl_ssl_scache *scache = NULL; -+ /* If a share is present, its ssl_scache has preference over the multi */ -+ if(data->share && data->share->ssl_scache) -+ scache = data->share->ssl_scache; -+ else if(data->multi && data->multi->ssl_scache) -+ scache = data->multi->ssl_scache; -+ return scache; -+} -+ - static void cf_ssl_scache_clear_session(struct Curl_ssl_session *s) - { - if(s->sdata) { -@@ -792,7 +803,7 @@ CURLcode Curl_ssl_scache_put(struct Curl_cfilter *cf, - const char *ssl_peer_key, - struct Curl_ssl_session *s) - { -- struct Curl_ssl_scache *scache = data->state.ssl_scache; -+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); - struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data); - CURLcode result; - DEBUGASSERT(ssl_config); -@@ -826,7 +837,7 @@ CURLcode Curl_ssl_scache_take(struct Curl_cfilter *cf, - const char *ssl_peer_key, - struct Curl_ssl_session **ps) - { -- struct Curl_ssl_scache *scache = data->state.ssl_scache; -+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); - struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); - struct Curl_ssl_scache_peer *peer = NULL; - struct Curl_llist_node *n; -@@ -870,7 +881,7 @@ CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf, - void *sobj, - Curl_ssl_scache_obj_dtor *sobj_free) - { -- struct Curl_ssl_scache *scache = data->state.ssl_scache; -+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); - struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); - struct Curl_ssl_scache_peer *peer = NULL; - CURLcode result; -@@ -898,7 +909,7 @@ bool Curl_ssl_scache_get_obj(struct Curl_cfilter *cf, - const char *ssl_peer_key, - void **sobj) - { -- struct Curl_ssl_scache *scache = data->state.ssl_scache; -+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); - struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); - struct Curl_ssl_scache_peer *peer = NULL; - CURLcode result; -@@ -924,7 +935,7 @@ void Curl_ssl_scache_remove_all(struct Curl_cfilter *cf, - struct Curl_easy *data, - const char *ssl_peer_key) - { -- struct Curl_ssl_scache *scache = data->state.ssl_scache; -+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); - struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); - struct Curl_ssl_scache_peer *peer = NULL; - CURLcode result; -@@ -1021,7 +1032,7 @@ CURLcode Curl_ssl_session_import(struct Curl_easy *data, - const unsigned char *shmac, size_t shmac_len, - const unsigned char *sdata, size_t sdata_len) - { -- struct Curl_ssl_scache *scache = data->state.ssl_scache; -+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); - struct Curl_ssl_scache_peer *peer = NULL; - struct Curl_ssl_session *s = NULL; - bool locked = FALSE; -@@ -1092,7 +1103,7 @@ CURLcode Curl_ssl_session_export(struct Curl_easy *data, - curl_ssls_export_cb *export_fn, - void *userptr) - { -- struct Curl_ssl_scache *scache = data->state.ssl_scache; -+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); - struct Curl_ssl_scache_peer *peer; - struct dynbuf sbuf, hbuf; - struct Curl_llist_node *n; diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.9.1-sigpipe.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.9.1-sigpipe.patch deleted file mode 100644 index d308fc4420..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.9.1-sigpipe.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/curl/curl/commit/3eec5afbd0b6377eca893c392569b2faf094d970 -From: Daniel Stenberg -Date: Mon, 5 Aug 2024 00:17:17 +0200 -Subject: [PATCH] sigpipe: init the struct so that first apply ignores - -Initializes 'no_signal' to TRUE, so that a call to sigpipe_apply() after -init ignores the signal (unless CURLOPT_NOSIGNAL) is set. - -I have read the existing code multiple times now and I think it gets the -initial state reversed this missing to ignore. - -Regression from 17e6f06ea37136c36d27 - -Reported-by: Rasmus Thomsen -Fixes #14344 -Closes #14390 ---- a/lib/sigpipe.h -+++ b/lib/sigpipe.h -@@ -39,6 +39,7 @@ struct sigpipe_ignore { - static void sigpipe_init(struct sigpipe_ignore *ig) - { - memset(ig, 0, sizeof(*ig)); -+ ig->no_signal = TRUE; - } - - /* diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-prefix-2.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-prefix-2.patch deleted file mode 100644 index 0372038e7d..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-prefix-2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a3033ee39f2cc43cb17386b23cb304b010c2c96f Mon Sep 17 00:00:00 2001 -From: Matt Jolly -Date: Wed, 22 May 2024 16:18:51 +1000 -Subject: [PATCH] Update prefix patch for 8.8.0 - ---- - curl-config.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/curl-config.in b/curl-config.in -index 085bb1e..c0bc6ce 100644 ---- a/curl-config.in -+++ b/curl-config.in -@@ -145,7 +145,7 @@ while test "$#" -gt 0; do - else - CPPFLAG_CURL_STATICLIB="" - fi -- if test "X@includedir@" = "X/usr/include"; then -+ if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then - echo "${CPPFLAG_CURL_STATICLIB}" - else - echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@" -@@ -153,7 +153,7 @@ while test "$#" -gt 0; do - ;; - - --libs) -- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then -+ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then - CURLLIBDIR="-L@libdir@ " - else - CURLLIBDIR="" --- -2.45.0 -