> > Hello, > > On Mon Jul 6, 2026 at 11:02 PM CEST, Jakub Szczudlo wrote: > > Release notes are here: > > https://dev.gnupg.org/T8233.html > > Update contains fix for CVE-2026-41989 and patch that need to be updated to > > correct setting compile flags in new version. > > > > Signed-off-by: Jakub Szczudlo <[email protected]> > > --- > > v2: > > - Added new patch to fix building error with '-O2' in sysroot path for > > libgcrypt 1.10.4, patch > > was taken from wrynose and backported. > > > > ...ilding-error-with-O2-in-sysroot-path.patch | 64 ------------------- > > ...ilding-error-with-O2-in-sysroot-path.patch | 49 ++++++++++++++ > > ...ibgcrypt_1.10.3.bb => libgcrypt_1.10.4.bb} | 4 +- > > 3 files changed, 51 insertions(+), 66 deletions(-) > > delete mode 100644 > > meta/recipes-support/libgcrypt/files/0001-Fix-building-error-with-O2-in-sysroot-path.patch > > create mode 100644 > > meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch > > rename meta/recipes-support/libgcrypt/{libgcrypt_1.10.3.bb => > > libgcrypt_1.10.4.bb} (92%) > > > > diff --git > > a/meta/recipes-support/libgcrypt/files/0001-Fix-building-error-with-O2-in-sysroot-path.patch > > > > b/meta/recipes-support/libgcrypt/files/0001-Fix-building-error-with-O2-in-sysroot-path.patch > > deleted file mode 100644 > > index dee4969f35..0000000000 > > --- > > a/meta/recipes-support/libgcrypt/files/0001-Fix-building-error-with-O2-in-sysroot-path.patch > > +++ /dev/null > > @@ -1,64 +0,0 @@ > > -From b99952adc6ee611641709610d2e4dc90ba9acf37 Mon Sep 17 00:00:00 2001 > > -From: "simit.ghane" <[email protected]> > > -Date: Tue, 7 May 2024 14:09:03 +0530 > > -Subject: [PATCH] Fix building error with '-O2' in sysroot path > > - > > -* cipher/Makefile.am (o_flag_munging): Tweak the sed script. > > -* random/Makefile.am (o_flag_munging): Ditto. > > --- > > - > > -Characters like '-O2' or '-Ofast' will be replaced by '-O1' and '-O0' > > -respectively when compiling cipher and random in the filesystem > > -paths as well if they happen to contain '-O2' or '-Ofast > > - > > -If we are cross compiling libgcrypt and sysroot contains such > > -characters, we would > > -get compile errors because the sysroot path has been modified. > > - > > -Fix this by adding blank spaces and tabs before the original matching > > -pattern in the sed command. > > - > > -Signed-off-by: simit.ghane <[email protected]> > > - > > -ChangeLog entries added by wk > > - > > -Note that there is also the configure option --disable-O-flag-munging; > > -see the README. > > - > > -Upstream-Status: Backport > > [https://dev.gnupg.org/rCb99952adc6ee611641709610d2e4dc90ba9acf37 > > https://dev.gnupg.org/rC5afadba008918d651afefb842ae123cc18454c74] > > - > > -Signed-off-by: Robert Yang <[email protected]> > > ---- > > - cipher/Makefile.am | 2 +- > > - random/Makefile.am | 2 +- > > - 2 files changed, 2 insertions(+), 2 deletions(-) > > - > > -diff --git a/cipher/Makefile.am b/cipher/Makefile.am > > -index 2c39586e..a914ed2b 100644 > > ---- a/cipher/Makefile.am > > -+++ b/cipher/Makefile.am > > -@@ -168,7 +168,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c > > - > > - > > - if ENABLE_O_FLAG_MUNGING > > --o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e > > 's/-Ofast/-O1/g' > > -+o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e > > 's/[[:blank:]]-Ofast/ -O1 /g' > > - else > > - o_flag_munging = cat > > - endif > > -diff --git a/random/Makefile.am b/random/Makefile.am > > -index 0c935a05..340df38a 100644 > > ---- a/random/Makefile.am > > -+++ b/random/Makefile.am > > -@@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h > > jitterentropy-base-user.h > > - > > - # The rndjent module needs to be compiled without optimization. */ > > - if ENABLE_O_FLAG_MUNGING > > --o_flag_munging = sed -e 's/-O\([1-9sgz][1-9sgz]*\)/-O0/g' -e > > 's/-Ofast/-O0/g' > > -+o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e > > 's/[[:blank:]]-Ofast/ -O0 /g' > > - else > > - o_flag_munging = cat > > - endif > > --- > > -2.44.1 > > - > > diff --git > > a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch > > > > b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch > > new file mode 100644 > > index 0000000000..d1b82ec11e > > --- /dev/null > > +++ > > b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch > > @@ -0,0 +1,49 @@ > > +From e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001 > > +From: "simit.ghane" <[email protected]> > > +Date: Tue, 11 Jun 2024 07:22:28 +0530 > > +Subject: [PATCH] random:cipher: handle substitution in sed command > > Can you name the patch file something related to its title? Here name > and title are really different and this is confusing. > > > + > > +Upstream-Status: Backport > > [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=e96df0c82e086bf348753d2d0fa37fa6191b4b14] > > The URL does not work for me. > You can use the official mirror: > https://github.com/gpg/libgcrypt/commit/e96df0c82e086bf348753d2d0fa37fa6191b4b14 > > > + > > +* cipher/Makefile.am (o_flag_munging): Add 'g' flag for first sed > > +expression. > > +* random/Makefile.am (o_flag_munging): Likewise. > > +-- > > + > > +It was there earlier and accidentally removed from > > +Makefile.am of cipher and random > > + > > +Signed-off-by: simit.ghane <[email protected]> > > +[jk: add changelog to commit message] > > +Signed-off-by: Jussi Kivilinna <[email protected]> > > This patch needs your signed-off-by. > > +--- > > + cipher/Makefile.am | 2 +- > > + random/Makefile.am | 2 +- > > + 2 files changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/cipher/Makefile.am b/cipher/Makefile.am > > +index ea9014cc98..149c9f2101 100644 > > +--- a/cipher/Makefile.am > > ++++ b/cipher/Makefile.am > > +@@ -169,7 +169,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c > > + > > + > > + if ENABLE_O_FLAG_MUNGING > > +-o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e > > 's/[[:blank:]]-Ofast/ -O1 /g' > > ++o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e > > 's/[[:blank:]]-Ofast/ -O1 /g' > > + else > > + o_flag_munging = cat > > + endif > > +diff --git a/random/Makefile.am b/random/Makefile.am > > +index c7100ef8b8..a42e430649 100644 > > +--- a/random/Makefile.am > > ++++ b/random/Makefile.am > > +@@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h > > jitterentropy-base-user.h > > + > > + # The rndjent module needs to be compiled without optimization. */ > > + if ENABLE_O_FLAG_MUNGING > > +-o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O0 /' -e > > 's/[[:blank:]]-Ofast/ -O0 /g' > > ++o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O0 /g' -e > > 's/[[:blank:]]-Ofast/ -O0 /g' > > + else > > + o_flag_munging = cat > > + endif > > diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb > > b/meta/recipes-support/libgcrypt/libgcrypt_1.10.4.bb > > similarity index 92% > > rename from meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb > > rename to meta/recipes-support/libgcrypt/libgcrypt_1.10.4.bb > > index 3d49d586bb..a887dc355e 100644 > > --- a/meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb > > +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.10.4.bb > > @@ -25,9 +25,9 @@ SRC_URI = > > "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ > > file://no-native-gpg-error.patch \ > > file://no-bench-slope.patch \ > > file://run-ptest \ > > - file://0001-Fix-building-error-with-O2-in-sysroot-path.patch \ > > + > > file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ > > " > > -SRC_URI[sha256sum] = > > "8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa" > > +SRC_URI[sha256sum] = > > "d6d2f835a79711ceba54b53d1081d388d24fb0341d79a268a6557e12908a90a0" > > > > BINCONFIG = "${bindir}/libgcrypt-config" > > > > Regards, > -- > Yoann Congal > Smile ECS >
Patch name and commit link corrected in v3: https://lists.openembedded.org/g/openembedded-core/message/240364?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3Arecentpostdate%2Fsticky%2C%2Clibgcrypt%2C20%2C2%2C0%2C120153110 Best regards, Jakub Szczudlo
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#240366): https://lists.openembedded.org/g/openembedded-core/message/240366 Mute This Topic: https://lists.openembedded.org/mt/120147852/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
