From patchwork Sun Sep 15 14:34:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 49084 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C40DC35FE7 for ; Sun, 15 Sep 2024 14:34:06 +0000 (UTC) Received: from a27-30.smtp-out.us-west-2.amazonses.com (a27-30.smtp-out.us-west-2.amazonses.com [54.240.27.30]) by mx.groups.io with SMTP id smtpd.web10.115654.1726410842402556773 for ; Sun, 15 Sep 2024 07:34:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=UWXp+v78; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=mwRHVsM6; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.30, mailfrom: 01010191f61addf5-bdc75b99-06b8-4159-955d-b11659be4573-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1726410841; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=YEWBXOv6I6BL2zRScPUUTNV7f03UYzLsWRGjd2qeD7g=; b=UWXp+v78CooJAMb68NVliFIfjIm8woIYSdd7mAY727JHrJgLy5hGVUT40FofZFhG DmSrKoNtcK45Zh+eZOA44G/Zwdeoexq29Kcp5xMLoq+v+UF106+o9NZcbhTPbdLj/VE 8os/Tu7axmCsevDLSrhfh1hfA3+Yt5rkUbV2sDAE= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1726410841; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=YEWBXOv6I6BL2zRScPUUTNV7f03UYzLsWRGjd2qeD7g=; b=mwRHVsM647/3uGMoFQr+JE8E2srPsjVs5qn1015Rd1uqa5jTlmE6A7Qk6nomCR09 Ks1KvQ8sIjzhZ51hHiBCx6BeD2nKhFhRAO2QtO5A1xL9Eriqo/uVRdEZkeleQeI12E5 jioDRYf/2VlNUQF+7+PVROnbz/GOrlwrlsIEJd9o= MIME-Version: 1.0 From: auh@yoctoproject.org To: Robert Joslyn Cc: openembedded-core@lists.openembedded.org Subject: [AUH] curl: upgrading to 8.10.0 FAILED Message-ID: <01010191f61addf5-bdc75b99-06b8-4159-955d-b11659be4573-000000@us-west-2.amazonses.com> Date: Sun, 15 Sep 2024 14:34:01 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.09.15-54.240.27.30 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 15 Sep 2024 14:34:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204583 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *curl* to *8.10.0* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-curl-upgrade-8.9.1-8.10.0.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 903219745b1a56bdfff0167d6a01ba2dc0e03702 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sun, 15 Sep 2024 14:11:48 +0000 Subject: [PATCH] curl: upgrade 8.9.1 -> 8.10.0 --- ...e-struct-so-that-first-apply-ignores.patch | 38 ------------------- .../curl/curl/no-test-timeout.patch | 4 +- .../curl/{curl_8.9.1.bb => curl_8.10.0.bb} | 14 +++---- 3 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 meta/recipes-support/curl/curl/0001-sigpipe-init-the-struct-so-that-first-apply-ignores.patch rename meta/recipes-support/curl/{curl_8.9.1.bb => curl_8.10.0.bb} (95%) diff --git a/meta/recipes-support/curl/curl/0001-sigpipe-init-the-struct-so-that-first-apply-ignores.patch b/meta/recipes-support/curl/curl/0001-sigpipe-init-the-struct-so-that-first-apply-ignores.patch deleted file mode 100644 index 15c69e1430..0000000000 --- a/meta/recipes-support/curl/curl/0001-sigpipe-init-the-struct-so-that-first-apply-ignores.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3eec5afbd0b6377eca893c392569b2faf094d970 Mon Sep 17 00:00:00 2001 -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 - -Upstream-Status: Backport [https://github.com/curl/curl/commit/3eec5afbd0b6377eca893c392569b2faf094d970] -Signed-off-by: Robert Joslyn ---- - lib/sigpipe.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/sigpipe.h b/lib/sigpipe.h -index b91a2f513..d78afd905 100644 ---- 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; - } - - /* --- -2.44.2 - diff --git a/meta/recipes-support/curl/curl/no-test-timeout.patch b/meta/recipes-support/curl/curl/no-test-timeout.patch index 7122b6f043..414caedf8a 100644 --- a/meta/recipes-support/curl/curl/no-test-timeout.patch +++ b/meta/recipes-support/curl/curl/no-test-timeout.patch @@ -1,4 +1,4 @@ -From 42cddb52e821cfc2f09f1974742714e5f2f1856e Mon Sep 17 00:00:00 2001 +From 97114a75b70e0e9161ad8d95f37fb0bb03a869f3 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 15 Mar 2024 14:37:37 +0000 Subject: [PATCH] Set the max-time timeout to 600 so the timeout is 10 minutes @@ -11,7 +11,7 @@ Signed-off-by: Ross Burton 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/servers.pm b/tests/servers.pm -index d4472d5..9999938 100644 +index 887cf27..e3ccf40 100644 --- a/tests/servers.pm +++ b/tests/servers.pm @@ -120,7 +120,7 @@ my $sshdverstr; # for socks server, ssh daemon version string diff --git a/meta/recipes-support/curl/curl_8.9.1.bb b/meta/recipes-support/curl/curl_8.10.0.bb similarity index 95% rename from meta/recipes-support/curl/curl_8.9.1.bb rename to meta/recipes-support/curl/curl_8.10.0.bb index 745224929b..2319a2cf57 100644 --- a/meta/recipes-support/curl/curl_8.9.1.bb +++ b/meta/recipes-support/curl/curl_8.10.0.bb @@ -9,14 +9,12 @@ SECTION = "console/network" LICENSE = "curl" LIC_FILES_CHKSUM = "file://COPYING;md5=eed2e5088e1ac619c9a1c747da291d75" -SRC_URI = " \ - https://curl.se/download/${BP}.tar.xz \ - file://run-ptest \ - file://disable-tests \ - file://no-test-timeout.patch \ - file://0001-sigpipe-init-the-struct-so-that-first-apply-ignores.patch \ -" -SRC_URI[sha256sum] = "f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5" +SRC_URI = "https://curl.se/download/${BP}.tar.xz \ + file://run-ptest \ + file://disable-tests \ + file://no-test-timeout.patch \ + " +SRC_URI[sha256sum] = "e6b142f0e85e954759d37e26a3627e2278137595be80e3a860c4353e4335e5a0" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"