guix_mirror_bot pushed a commit to branch world-rebuild in repository guix.
commit b7b7aa38fbc4d4019d60c3489460f02897211535 Author: bdunahu <[email protected]> AuthorDate: Wed Aug 5 18:58:35 2026 -0400 gnu: curl: Ungraft. This reverts commit c696a3b9554719c9c10a9dc8494c9a098e4d7654. Merges: https://codeberg.org/guix/guix/pulls/10375 Signed-off-by: Nguyễn Gia Phong <[email protected]> --- gnu/local.mk | 1 - gnu/packages/curl.scm | 11 ------- .../patches/curl-fix-wakeup-consumption.patch | 35 ---------------------- 3 files changed, 47 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 903bcdcf0b..e30fc4e0ca 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1183,7 +1183,6 @@ dist_patch_DATA = \ %D%/packages/patches/cups-relax-root-ownership-check.patch \ %D%/packages/patches/cura-engine-gcc-14.patch \ %D%/packages/patches/curl-use-ssl-cert-env.patch \ - %D%/packages/patches/curl-fix-wakeup-consumption.patch \ %D%/packages/patches/curlftpfs-fix-error-closing-file.patch \ %D%/packages/patches/curlftpfs-fix-file-names.patch \ %D%/packages/patches/curlftpfs-fix-memory-leak.patch \ diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 8837b215e8..6b8c9ee1f2 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -70,7 +70,6 @@ (package (name "curl") (version "8.20.0") - (replacement curl/fixed) (source (origin (method url-fetch) (uri (string-append "https://curl.se/download/curl-"; @@ -182,16 +181,6 @@ tunneling, and so on.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")))) -(define curl/fixed - (package - (inherit curl) - (name "curl") - (version "8.20.0") - (source (origin - (inherit (package-source curl)) - (patches (search-patches "curl-use-ssl-cert-env.patch" - "curl-fix-wakeup-consumption.patch")))))) - (define-public curl-ssh (package/inherit curl (arguments diff --git a/gnu/packages/patches/curl-fix-wakeup-consumption.patch b/gnu/packages/patches/curl-fix-wakeup-consumption.patch deleted file mode 100644 index f84eb72972..0000000000 --- a/gnu/packages/patches/curl-fix-wakeup-consumption.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2a2104f3cff44bb28bb570a093be52bbeeed8f23 Mon Sep 17 00:00:00 2001 -From: Stefan Eissing <[email protected]> -Date: Mon, 11 May 2026 14:56:04 +0200 -Subject: [PATCH] event: fix wakeup consumption - -The events on a multi wakeup socketpair were only consumed via -curl_multi_poll()/curl_multi_wait() but not in event based processing on -a curl_multi_socket() call. That led to busy loops as reported in - -Fixes #21547 -Reported-by: Earnestly on github -Closes #21549 - -original report: https://github.com/curl/curl/issues/21547 -original pull request: https://github.com/curl/curl/pull/21549 ---- - lib/multi.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/lib/multi.c b/lib/multi.c -index be32740a7097..5e84133f13fd 100644 ---- a/lib/multi.c -+++ b/lib/multi.c -@@ -2703,6 +2703,11 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, - Curl_uint32_bset_remove(&multi->dirty, data->mid); - - if(data == multi->admin) { -+#ifdef ENABLE_WAKEUP -+ /* Consume any pending wakeup signals before processing. -+ * This is necessary for event based processing. See #21547 */ -+ (void)Curl_wakeup_consume(multi->wakeup_pair, TRUE); -+#endif - #ifdef USE_RESOLV_THREADED - Curl_async_thrdd_multi_process(multi); - #endif
