From patchwork Sat Feb 15 12:42:12 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: 57372 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 B1727C021BC for ; Sat, 15 Feb 2025 12:42:21 +0000 (UTC) Received: from a27-31.smtp-out.us-west-2.amazonses.com (a27-31.smtp-out.us-west-2.amazonses.com [54.240.27.31]) by mx.groups.io with SMTP id smtpd.web10.8094.1739623333240363604 for ; Sat, 15 Feb 2025 04:42:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=Rilxeret; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=zIBLKRNI; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.31, mailfrom: 0101019509a17a8d-2c6ce319-252b-4e5a-bce9-980955b1f285-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=1739623332; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=Jjo1WbN4bK9ATVopWOlD4Z3IvlrCNhwwsFk8hp8dVKI=; b=RilxeretWWFdwyflQ0vWp/S1pGkgXrKzks9A31P/ygaxMIMpsmtnrR5QEE0kKNoe h2oefFZMCEhoi8bS3vTuPfxFoBOdVSbLceqqRueW4OnBoiS8MEmNfEnGl4yac9o9kad mvbWTYi+dI/RQhbVwRBt3pw2ROTex6wp8QSmMqGI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1739623332; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=Jjo1WbN4bK9ATVopWOlD4Z3IvlrCNhwwsFk8hp8dVKI=; b=zIBLKRNIotbAR2H3zCnr5MXWrPKJthVDMxXSWXtbNo73KsjCvImFsUCf/U/eRml1 xXaLKQQ4KpZCjODRCuDoHzwPi+Re3zA6LKWN80kBmJCs7TXPsN9DXPC9CSeFeTE6CzN tMG8/3jYmizg6UHMMLuSw5mEESkeCNZUFmP8ZUeg= MIME-Version: 1.0 From: auh@yoctoproject.org To: openembedded-core@lists.openembedded.org Cc: Subject: [AUH] openssl: upgrading to 3.4.1 SUCCEEDED Message-ID: <0101019509a17a8d-2c6ce319-252b-4e5a-bce9-980955b1f285-000000@us-west-2.amazonses.com> Date: Sat, 15 Feb 2025 12:42:12 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2025.02.15-54.240.27.31 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 ; Sat, 15 Feb 2025 12:42:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211409 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *openssl* to *3.4.1* has Succeeded. Next steps: - apply the patch: git am 0001-openssl-upgrade-3.4.0-3.4.1.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 2f206ef94fb6c66c06c0fe474a469af40097c64e Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sat, 15 Feb 2025 06:44:18 +0000 Subject: [PATCH] openssl: upgrade 3.4.0 -> 3.4.1 --- ...ke-history-reporting-when-test-fails.patch | 7 +-- ...1-Configure-do-not-tweak-mips-cflags.patch | 2 +- ...001-Fix-builds-on-riscv64-using-musl.patch | 36 ------------- ...sysroot-and-debug-prefix-map-from-co.patch | 19 ++++--- .../openssl/openssl/aarch64-regs.patch | 52 ------------------- .../{openssl_3.4.0.bb => openssl_3.4.1.bb} | 5 +- 6 files changed, 14 insertions(+), 107 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-builds-on-riscv64-using-musl.patch delete mode 100644 meta/recipes-connectivity/openssl/openssl/aarch64-regs.patch rename meta/recipes-connectivity/openssl/{openssl_3.4.0.bb => openssl_3.4.1.bb} (98%) diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch b/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch index 31bbbd8679..40613d6091 100644 --- a/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch +++ b/meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch @@ -1,4 +1,4 @@ -From 5ba65051fea0513db0d997f0ab7cafb9826ed74a Mon Sep 17 00:00:00 2001 +From bb9dab8736baf9187ec11317c5105483ab16de83 Mon Sep 17 00:00:00 2001 From: William Lyu Date: Fri, 20 Oct 2023 16:22:37 -0400 Subject: [PATCH] Added handshake history reporting when test fails @@ -361,7 +361,4 @@ index ea60851..9d6b093 100644 + return ret; } - --- -2.25.1 - + diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch index c7e9c9d96e..98531ad70b 100644 --- a/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch +++ b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch @@ -1,4 +1,4 @@ -From 0377f0d5b5c1079e3b9a80881f4dcc891cbe9f9a Mon Sep 17 00:00:00 2001 +From b7291e054527fede0be8428093e2b88fbe3c9754 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 30 May 2023 09:11:27 -0700 Subject: [PATCH] Configure: do not tweak mips cflags diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-builds-on-riscv64-using-musl.patch b/meta/recipes-connectivity/openssl/openssl/0001-Fix-builds-on-riscv64-using-musl.patch deleted file mode 100644 index 0ec8c93748..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/0001-Fix-builds-on-riscv64-using-musl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9131291716073c4ea65a29575880a9d796c22ed6 Mon Sep 17 00:00:00 2001 -From: Matt Caswell -Date: Wed, 23 Oct 2024 14:57:20 +0100 -Subject: [PATCH] Fix builds on riscv64 using musl - -Some environments using musl are reported to have the hwprobe.h include -file but not have the __NR_riscv_hwprobe define. - -Fixes #25772 - -Upstream-Status: Backport [https://github.com/openssl/openssl/pull/25787] -Signed-off-by: Khem Raj ---- - include/crypto/riscv_arch.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/include/crypto/riscv_arch.h b/include/crypto/riscv_arch.h -index 4b3573f..8858427 100644 ---- a/include/crypto/riscv_arch.h -+++ b/include/crypto/riscv_arch.h -@@ -15,7 +15,14 @@ - - # if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE) - # if __has_include() --# define OSSL_RISCV_HWPROBE -+# include -+# /* -+ * Some environments using musl are reported to have the hwprobe.h include -+ * file but not have the __NR_riscv_hwprobe define. -+ */ -+# ifdef __NR_riscv_hwprobe -+# define OSSL_RISCV_HWPROBE -+# endif - # endif - # endif - diff --git a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch index b8672735ab..5acb6aea57 100644 --- a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch +++ b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch @@ -1,4 +1,4 @@ -From 5985253f2c9025d7c127443a3a9938946f80c2a1 Mon Sep 17 00:00:00 2001 +From 5e12191905828c7ea6c12347355b5899c5e03dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Tue, 6 Nov 2018 14:50:47 +0100 Subject: [PATCH] buildinfo: strip sysroot and debug-prefix-map from compiler @@ -28,16 +28,15 @@ Signed-off-by: Kai Kang Update to fix buildpaths qa issue for '-ffile-prefix-map'. Signed-off-by: Khem Raj - --- Configurations/unix-Makefile.tmpl | 12 +++++++++++- crypto/build.info | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) -Index: openssl-3.0.4/Configurations/unix-Makefile.tmpl -=================================================================== ---- openssl-3.0.4.orig/Configurations/unix-Makefile.tmpl -+++ openssl-3.0.4/Configurations/unix-Makefile.tmpl +diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl +index 09303c4..66f3993 100644 +--- a/Configurations/unix-Makefile.tmpl ++++ b/Configurations/unix-Makefile.tmpl @@ -502,13 +502,23 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (), '$(CNF_LDFLAGS)', '$(LDFLAGS)') -} BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) @@ -63,10 +62,10 @@ Index: openssl-3.0.4/Configurations/unix-Makefile.tmpl PERLASM_SCHEME= {- $target{perlasm_scheme} -} # For x86 assembler: Set PROCESSOR to 386 if you want to support -Index: openssl-3.0.4/crypto/build.info -=================================================================== ---- openssl-3.0.4.orig/crypto/build.info -+++ openssl-3.0.4/crypto/build.info +diff --git a/crypto/build.info b/crypto/build.info +index 2642d30..4dd649c 100644 +--- a/crypto/build.info ++++ b/crypto/build.info @@ -115,7 +115,7 @@ DEFINE[../libcrypto]=$UPLINKDEF DEPEND[info.o]=buildinf.h diff --git a/meta/recipes-connectivity/openssl/openssl/aarch64-regs.patch b/meta/recipes-connectivity/openssl/openssl/aarch64-regs.patch deleted file mode 100644 index f9773a6183..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/aarch64-regs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3ad2277e4522d363ae31a1888531915bb68964dc Mon Sep 17 00:00:00 2001 -From: Julian Andres Klode -Date: Sat, 18 Jan 2025 21:12:45 +0100 -Subject: [PATCH] Restore correct registers in aarch64 AES-CTR code - -Commit 1d1ca79fe35dbe5c05faed5a2ef8c4de9c5adc49 introduced -save and restore for the registers, saving them as - - stp d8,d9,[sp, #16] - stp d10,d11,[sp, #32] - stp d12,d13,[sp, #48] - stp d14,d15,[sp, #64] - -But the restore code was inadvertently typoed: - - ldp d8,d9,[sp, #16] - ldp d10,d11,[sp, #32] - ldp d12,d13,[sp, #48] - ldp d15,d16,[sp, #64] - -Restoring [sp, #64] into d15,d16 instead of d14,d15. - -Fixes: #26466 - -CLA: trivial - -Reviewed-by: Kurt Roeckx -Reviewed-by: Paul Dale -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/26469) - -(cherry picked from commit 5261f3ca41cda7ad5767e399e9a2dc008bbad5d6) - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - crypto/aes/asm/aesv8-armx.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl -index 33a2dd53dae19..dc019b04ccd25 100755 ---- a/crypto/aes/asm/aesv8-armx.pl -+++ b/crypto/aes/asm/aesv8-armx.pl -@@ -2493,7 +2493,7 @@ () - ldp d8,d9,[sp, #16] - ldp d10,d11,[sp, #32] - ldp d12,d13,[sp, #48] -- ldp d15,d16,[sp, #64] -+ ldp d14,d15,[sp, #64] - ldr x29,[sp],#80 - ret - .size ${prefix}_ctr32_encrypt_blocks_unroll12_eor3,.-${prefix}_ctr32_encrypt_blocks_unroll12_eor3 diff --git a/meta/recipes-connectivity/openssl/openssl_3.4.0.bb b/meta/recipes-connectivity/openssl/openssl_3.4.1.bb similarity index 98% rename from meta/recipes-connectivity/openssl/openssl_3.4.0.bb rename to meta/recipes-connectivity/openssl/openssl_3.4.1.bb index cc413e39ba..7502407949 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.4.0.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.4.1.bb @@ -12,15 +12,14 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ file://0001-Added-handshake-history-reporting-when-test-fails.patch \ - file://0001-Fix-builds-on-riscv64-using-musl.patch \ - file://aarch64-regs.patch \ + file://environment.d-openssl.sh \ " SRC_URI:append:class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf" +SRC_URI[sha256sum] = "002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3" inherit lib_package multilib_header multilib_script ptest perlnative manpages MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"