From: Markus Volk Date: Wed, 24 Jun 2026 12:46:39 +0000 (+0200) Subject: curl: update 8.20.0 -> 8.21.0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ec500cd5a4cddd80cd40de8a481655158c2419c;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git curl: update 8.20.0 -> 8.21.0 After updating oe-core and meta-openembedded I see this error in curl build: | configure: detected GnuTLS version 3.8.13 | checking for nettle_MD5Init in -lgnutls... no | checking for x86_64-oe-linux-pkg-config... (cached) /home/flk/bitbake/bitbake-builds/oe/build/tmp/work/corei7-64-oe-linux/curl/8.20.0/recipe-sysroot-native/usr/bin/pkg-config | checking for nettle options with pkg-config... found | checking for nettle_MD5Init in -lnettle... no | configure: error: GnuTLS found, but nettle was not found This issue has already been fixed upstream and a new curl version was released today -> update to fix build - adjust no-test-timeout.patch - remove backported patches Signed-off-by: Markus Volk Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-support/curl/curl/0001-event-fix-wakeup-consumption.patch b/meta/recipes-support/curl/curl/0001-event-fix-wakeup-consumption.patch deleted file mode 100644 index 7f22e19c05..0000000000 --- a/meta/recipes-support/curl/curl/0001-event-fix-wakeup-consumption.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 590e31dff8aa4c5ff8be761128e38ac751aed875 Mon Sep 17 00:00:00 2001 -From: Stefan Eissing -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 - -Upstream-Status: Backport ["2a2104f event: fix wakeup consumption"] -Suggested-by: Ross Burton -Signed-off-by: Tim Orling ---- - lib/multi.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/lib/multi.c b/lib/multi.c -index 7520253d70..a0012d8faf 100644 ---- a/lib/multi.c -+++ b/lib/multi.c -@@ -2479,6 +2479,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 --- -2.47.3 - diff --git a/meta/recipes-support/curl/curl/mbedtls.patch b/meta/recipes-support/curl/curl/mbedtls.patch deleted file mode 100644 index f2f2c457aa..0000000000 --- a/meta/recipes-support/curl/curl/mbedtls.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 50b1408f97d9e8fc585c5351cbf86bf60a30eb59 Mon Sep 17 00:00:00 2001 -From: Viktor Szakats -Date: Sat, 23 May 2026 01:05:10 +0200 -Subject: [PATCH] autotools: mbedtls detection fixes - -- fix symbol used for first-round detection. -- skip detecting mbedtls on custom path if custom path was not supplied. - -Reported-by: Ross Burton -Fixes #21727 - -Closes #21729 - -Upstream-Status: Backport [https://github.com/curl/curl/commit/50b1408f97d9e8fc585c5351cbf86bf60a30eb59] -Signed-off-by: Ross Burton ---- - m4/curl-mbedtls.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/m4/curl-mbedtls.m4 b/m4/curl-mbedtls.m4 -index 7c5bccd22983..6887302592d6 100644 ---- a/m4/curl-mbedtls.m4 -+++ b/m4/curl-mbedtls.m4 -@@ -42,7 +42,7 @@ if test "x$OPT_MBEDTLS" != "xno"; then - if test -z "$OPT_MBEDTLS"; then - dnl check for lib first without setting any new path - -- AC_CHECK_LIB(mbedtls, mbedtls_havege_init, -+ AC_CHECK_LIB(mbedtls, mbedtls_ssl_init, - dnl libmbedtls found, set the variable - [ - AC_DEFINE(USE_MBEDTLS, 1, [if mbedTLS is enabled]) -@@ -58,7 +58,7 @@ if test "x$OPT_MBEDTLS" != "xno"; then - addcflags="" - mbedtlslib="" - -- if test "$USE_MBEDTLS" != "yes"; then -+ if test "$USE_MBEDTLS" != "yes" && test -n "$OPT_MBEDTLS"; then - dnl add the path and test again - addld=-L$OPT_MBEDTLS/lib$libsuff - addcflags=-I$OPT_MBEDTLS/include diff --git a/meta/recipes-support/curl/curl/no-test-timeout.patch b/meta/recipes-support/curl/curl/no-test-timeout.patch index 3ece55cab6..f432279728 100644 --- a/meta/recipes-support/curl/curl/no-test-timeout.patch +++ b/meta/recipes-support/curl/curl/no-test-timeout.patch @@ -15,12 +15,12 @@ diff --git a/tests/servers.pm b/tests/servers.pm index 5d5d98b..442cfaf 100644 --- a/tests/servers.pm +++ b/tests/servers.pm -@@ -124,7 +124,7 @@ my $sshdverstr; # for socks server, ssh daemon version string - my $sshderror; # for socks server, ssh daemon version error - my %doesntrun; # servers that do not work, identified by pidfile +@@ -124,7 +124,7 @@ + my $sshderror; # for socks server, ssh daemon version error + my %doesntrun; # servers that do not work, identified by pidfile my %PORT = (nolisten => 47); # port we use for a local non-listening service --my $server_response_maxtime=13; -+my $server_response_maxtime=600; +-my $server_response_maxtime = 13; ++my $server_response_maxtime = 600; my $httptlssrv = find_httptlssrv(); - my %run; # running server - my %runcert; # cert file currently in use by an ssl running server + my %run; # running server + my %runcert; # cert file currently in use by an SSL running server diff --git a/meta/recipes-support/curl/curl_8.20.0.bb b/meta/recipes-support/curl/curl_8.21.0.bb similarity index 97% rename from meta/recipes-support/curl/curl_8.20.0.bb rename to meta/recipes-support/curl/curl_8.21.0.bb index f4a0a2af71..56224f8063 100644 --- a/meta/recipes-support/curl/curl_8.20.0.bb +++ b/meta/recipes-support/curl/curl_8.21.0.bb @@ -14,15 +14,13 @@ SRC_URI = " \ file://run-ptest \ file://disable-tests \ file://no-test-timeout.patch \ - file://mbedtls.patch \ - file://0001-event-fix-wakeup-consumption.patch \ " SRC_URI:append:class-nativesdk = " \ file://environment.d-curl.sh \ " -SRC_URI[sha256sum] = "63fe2dc148ba0ceae89922ef838f7e5c946272c2e78b7c59fab4b79d3ce2b896" +SRC_URI[sha256sum] = "aa1b66a70eace83dc624508745646c08ae561de512ab403adffb93ac87fc72e6" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"