CVS commit: pkgsrc/www/curl

["Robert Bagdan" <kikadf%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kikadf
Date:           Fri May 15 12:32:20 UTC 2026

Modified Files:
        pkgsrc/www/curl: Makefile distinfo
Added Files:
        pkgsrc/www/curl/patches: patch-lib_multi.c

Log Message:
curl: apply patch to fix wakeup consumption


To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.224 -r1.225 pkgsrc/www/curl/distinfo
cvs rdiff -u -r0 -r1.5 pkgsrc/www/curl/patches/patch-lib_multi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/curl/Makefile
diff -u pkgsrc/www/curl/Makefile:1.306 pkgsrc/www/curl/Makefile:1.307
--- pkgsrc/www/curl/Makefile:1.306      Thu May 14 16:42:19 2026
+++ pkgsrc/www/curl/Makefile    Fri May 15 12:32:20 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.306 2026/05/14 16:42:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.307 2026/05/15 12:32:20 kikadf Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.224 pkgsrc/www/curl/distinfo:1.225
--- pkgsrc/www/curl/distinfo:1.224      Wed Apr 29 07:05:49 2026
+++ pkgsrc/www/curl/distinfo    Fri May 15 12:32:20 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.224 2026/04/29 07:05:49 wiz Exp $
+$NetBSD: distinfo,v 1.225 2026/05/15 12:32:20 kikadf Exp $
 
 BLAKE2s (curl-8.20.0.tar.xz) = 76a07a514760771d7fbde7a8337763cfd95859d9265a0712e25b41a8826773f8
 SHA512 (curl-8.20.0.tar.xz) = edfa5882aaeefcf2226fe03b19246151c0377c3656f9c8cc385bdaf34565e1354e762005b58780917a6d98039ae34085e4a4bcb44255c77e3b0e1d94090c010b
 Size (curl-8.20.0.tar.xz) = 2834456 bytes
+SHA1 (patch-lib_multi.c) = 5e2b700175d1724c4c4fe3fbc6dc07d197df8170

Added files:

Index: pkgsrc/www/curl/patches/patch-lib_multi.c
diff -u /dev/null pkgsrc/www/curl/patches/patch-lib_multi.c:1.5
--- /dev/null   Fri May 15 12:32:20 2026
+++ pkgsrc/www/curl/patches/patch-lib_multi.c   Fri May 15 12:32:20 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-lib_multi.c,v 1.5 2026/05/15 12:32:20 kikadf Exp $
+
+* Apply upstream commit to fix high cpu usage
+  https://github.com/curl/curl/commit/2a2104f3cff44bb28bb570a093be52bbeeed8f23
+
+--- lib/multi.c.orig   2026-05-15 14:06:57.225055741 +0200
++++ lib/multi.c
+@@ -2479,6 +2479,11 @@ static CURLMcode multi_runsingle(struct 
+   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