commit: 5e859b28b954c5367596cb0c056ec8329419c20e Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Thu Mar 20 07:17:54 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Mar 23 14:26:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e859b28
net-misc/curl: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/41188 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> net-misc/curl/files/curl-8.12.0-multi.patch | 136 --------------------------- net-misc/curl/files/curl-8.9.1-sigpipe.patch | 26 ----- net-misc/curl/files/curl-prefix-2.patch | 34 ------- 3 files changed, 196 deletions(-) diff --git a/net-misc/curl/files/curl-8.12.0-multi.patch b/net-misc/curl/files/curl-8.12.0-multi.patch deleted file mode 100644 index b9405af8da5b..000000000000 --- a/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/net-misc/curl/files/curl-8.9.1-sigpipe.patch b/net-misc/curl/files/curl-8.9.1-sigpipe.patch deleted file mode 100644 index d308fc4420e1..000000000000 --- a/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 <[email protected]> -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/net-misc/curl/files/curl-prefix-2.patch b/net-misc/curl/files/curl-prefix-2.patch deleted file mode 100644 index 0372038e7d59..000000000000 --- a/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 <[email protected]> -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 -
