From patchwork Wed Jan 1 09:32:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 54829 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 D4835E77197 for ; Wed, 1 Jan 2025 09:32:24 +0000 (UTC) Received: from a27-33.smtp-out.us-west-2.amazonses.com (a27-33.smtp-out.us-west-2.amazonses.com [54.240.27.33]) by mx.groups.io with SMTP id smtpd.web11.11329.1735723934603909309 for ; Wed, 01 Jan 2025 01:32:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=OHLc4aPs; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=H+61TRQN; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.33, mailfrom: 0101019421355e87-c042e43d-3007-4202-89e1-67c45ca3044e-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=1735723933; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=a7mOwe2i3y5yWWRveUxqez8FNTR89kusLcxkTmkt14o=; b=OHLc4aPsHaynGnXHjJnGGUpxzrDMd7hCol3RHbsnpDnuvZV44gLUAY09bEWB4zdG cRswFo20tBzbtNE2NkUo/EF+QxQGjmqaveaqQ27vS8or1nSOukqyfpzbL89UoadZmaQ y4vCtWYKWTtHzopoMUruOAou6G7YN8c4sN5bfEZI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1735723933; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=a7mOwe2i3y5yWWRveUxqez8FNTR89kusLcxkTmkt14o=; b=H+61TRQNXOlAlOryOvE9BtUBl8dTmb6VR7f+xy/IpXj47iokn2oeZC4INCmm/5Gm vHYOrRFExO58OyoVNl6E746yb0A1H/9LfsrdqnJGhoWjcCK4wlKpRxzZxjn1iHHHdze neZxlQ/5dlvttXGEjPF0+UDZ2cEPmOiNIp0NoaH4= MIME-Version: 1.0 From: auh@yoctoproject.org To: Khem Raj , Khem Raj Cc: openembedded-core@lists.openembedded.org Subject: [AUH] libxcrypt-compat,libxcrypt: upgrading to 4.4.37,4.4.37 FAILED Message-ID: <0101019421355e87-c042e43d-3007-4202-89e1-67c45ca3044e-000000@us-west-2.amazonses.com> Date: Wed, 1 Jan 2025 09:32:13 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2025.01.01-54.240.27.33 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 ; Wed, 01 Jan 2025 09:32:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209192 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *libxcrypt-compat,libxcrypt* to *4.4.37,4.4.37* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-libxcrypt-compat-libxcrypt-upgrade-4.4.36-4.4.37-4.4.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 c9cf6a57ef110d1d5ca67aaf64d678e0128241c5 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Wed, 1 Jan 2025 05:11:39 +0000 Subject: [PATCH] libxcrypt-compat,libxcrypt: upgrade 4.4.36 -> 4.4.37,4.4.36 -> 4.4.37 --- .../libxcrypt/files/configure-c99.patch | 39 ------------------- .../libxcrypt/files/fix_cflags_handling.patch | 3 +- ...t_4.4.36.bb => libxcrypt-compat_4.4.37.bb} | 1 + meta/recipes-core/libxcrypt/libxcrypt.inc | 9 ++--- ...ibxcrypt_4.4.36.bb => libxcrypt_4.4.37.bb} | 0 5 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-core/libxcrypt/files/configure-c99.patch rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.36.bb => libxcrypt-compat_4.4.37.bb} (99%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.36.bb => libxcrypt_4.4.37.bb} (100%) diff --git a/meta/recipes-core/libxcrypt/files/configure-c99.patch b/meta/recipes-core/libxcrypt/files/configure-c99.patch deleted file mode 100644 index b77ea7af07..0000000000 --- a/meta/recipes-core/libxcrypt/files/configure-c99.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cfe9f4d6b0a5d10a15e10e987d528c5c513a42f1 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Tue, 19 Dec 2023 11:00:11 +0100 -Subject: [PATCH] configure: Only text the makecontext signature we need - -The test/explicit-bzero.c test uses a start routine without any -arguments. There is no need for the multi-argument version. - -This avoids a build failure with glibc and future compilers. -The GNU C library declares the makecontext callback of -type void (*) (void), so no cast is needed. On other systems, -the type may be the (currently distinct) type void (*) (), -but given that this only affects the ability to execute a test, -no further machinery is added here to detect that different type. - -Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/178/] -Signed-off-by: Ross Burton ---- - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 016997c..4b8afd8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -303,13 +303,11 @@ AS_IF([test $ac_cv_header_ucontext_h = yes], - #include - static int x; - static void fn1(void) {} --static void fn2(int a, int b) { x = a - b; } - ]], [[ - ucontext_t uc1, uc2; - if (getcontext(&uc1)) return 1; - if (setcontext(&uc1)) return 1; - makecontext(&uc1, fn1, 0); -- makecontext(&uc2, fn2, 2, 1, 1); - if (swapcontext(&uc1, &uc2)) return 1; - return x; - ]])], diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch index 94aa3fed49..9bb03fcd24 100644 --- a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch +++ b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch @@ -1,4 +1,4 @@ -From 7b2a0cdc281d94a5782c37ef87040c341447b4b4 Mon Sep 17 00:00:00 2001 +From 1d91d150dd593e0c744c13b4ec8ec7cbf5da0f52 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 Apr 2021 10:35:02 +0100 Subject: [PATCH] libxcrypt: Update to 4.4.19 release and fix symbol version @@ -13,7 +13,6 @@ Avoid this by stripping empty elements out of CFLAGS. Upstream-Status: Submitted [https://github.com/besser82/libxcrypt/pull/126] Signed-off-by: Richard Purdie - --- build-aux/scripts/compute-symver-floor | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.37.bb similarity index 99% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.37.bb index 30ec6a4674..bb4e2032dd 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.37.bb @@ -16,3 +16,4 @@ do_install:append () { rm -rf ${D}${libdir}/libcrypt.so rm -rf ${D}${datadir} } + diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index ee6875aa05..9ecb333fb9 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \ inherit autotools pkgconfig -SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf" +SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https \ + file://fix_cflags_handling.patch \ + " +SRCREV = "e5714d1f0a477f91ce3986fa63651c7710f0e183" SRCBRANCH ?= "master" -SRC_URI += "file://fix_cflags_handling.patch \ - file://configure-c99.patch" - PROVIDES = "virtual/crypt" S = "${WORKDIR}/git" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.37.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.36.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.37.bb