From patchwork Tue Jul 7 06:45:16 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Szczudlo X-Patchwork-Id: 91907 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 95C69C43458 for ; Tue, 7 Jul 2026 07:32:07 +0000 (UTC) Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.168838.1783406739143039160 for ; Mon, 06 Jul 2026 23:45:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=sUxFXh5M; spf=pass (domain: gmail.com, ip: 209.85.167.53, mailfrom: jakubszczudlo40@gmail.com) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5aeb78090edso2859857e87.0 for ; Mon, 06 Jul 2026 23:45:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783406737; x=1784011537; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=XdwWPzt2er04OHTn3I77LZBMgy//KHOAlfed78VT3UY=; b=sUxFXh5MNmPJe8liyBUqzdDZGXp5DI2DFoSmgOuVcWf0j1nV9UljmrOu2ZCPkwy91C w3/Ddfcd9IBfxuTuVAcSags06S6Xhd+FJ3HM0Sb9B7GoYlV/r376oMwbvwhSrZi5ux5l aTyPfY8PixP/8yGFE3xAq07xZZQsATMQQyHuHWwsc/W8imSKLPeL55yi+yyLehvJgJ5r cdMIG+YgjgTofm45j+Dots2fz+6xznsmiVM3owHPx+VqIkpT37ilmPZ9DndnooTeFCoY smv6nGznow9tjpprF/eodc2cfYJhySGdLMsSfiQPgOo5IEETslIZhtbieK6kEeZJmqb6 aI6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783406737; x=1784011537; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=XdwWPzt2er04OHTn3I77LZBMgy//KHOAlfed78VT3UY=; b=FK7Hu30H4jH7bqybkfKAnqZ0G0+ij8vDcMrYNXwVVZ5Z/sHnUSY0IScr0OcAvZ8di3 fsHqcMQlv4Z/L2JiWgRBlgmI8nQfnk1Xpv1WsmZYz46XhI6lEswK39iesdJeh6ycmyKR NaNIJqUHctqCe6HZuDJ9eNEkgBtQG0trD9Ihc8hfp+jY0jAXbi17NbbFBMFbLriTjtup P8zmWBA2/4PZjtX3TLEWOkmkqgDwtzX8JNqkXZE5kMqwDAzV4pQtQqafKFEU61namVc1 ScMRwPp35r2+TVnAoBLsKzgJqiu+MqTwd4gOwQqjG+SsNakBxW9H978AW+MddixA90iC wMlg== X-Gm-Message-State: AOJu0Yx0HLaywbS55wmIvz8gxRFfdhtPOnf6YupMaJEwXErH0lYkcbUJ Z7j3PilnFK6q/MnFzDlwrxrZyzwEVw2Ovl6q0KnWS/kMKm654htSuWoES5iGlQ== X-Gm-Gg: AfdE7cldaGCGxban5vEFpomOpNggwgKII2FupY7NH1ETrGfJroVu4LNXVpjzzkktgmf IwAgcxKY/QfsFPmei6fk+PI2DID+6plOJaXo6nO8kXS0WWJAbu61R6D8qVRDxt1mAiH/4LTAwPL DaKarq6/+rgStcw2XmuVcDmUOgsQgg1Kjtz3C0NVwQHeXEDUSI/c4zn3a5gGT809HueJm+oNasN vs72vr6NgzTLMYoGZMKTj8GB+tCrNQlr+b039cCgWvnfPh+c8R29znCRJymJhoUDL3++HRj8S7N R8KIcWND8D1sUvarLOSVg0TR1Eu/pjQ/wQ3uJsMPFV4i9XjnC0WABwx4qrgNvtlusTXUKkk5VAg Y1MRxJvWpY8Lj6Jz6h+5WAt+Ui3ErflmTo7zBfnd/anz/S1/tV6ZNTF0akl0wUa9KsyXD/CbmCG UAY/ASap1SHfmAwVinc8jPLoNaKVJV X-Received: by 2002:ac2:4d1b:0:b0:5ae:c745:f39 with SMTP id 2adb3069b0e04-5b007c5331dmr703119e87.44.1783406736616; Mon, 06 Jul 2026 23:45:36 -0700 (PDT) Received: from Nitro5-JS.kielce.vectranet.pl ([2a02:2a40:27ec:2900::3ab6]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5aed13bfd1fsm3386406e87.55.2026.07.06.23.45.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 23:45:34 -0700 (PDT) From: "Jakub Szczudlo" To: openembedded-core@lists.openembedded.org Cc: Hongxu Jia , Jakub Szczudlo , Yoann Congal Subject: [scarthgap][PATCH v3] libgcrypt: upgrade 1.10.3 -> 1.10.4 Date: Tue, 7 Jul 2026 08:45:16 +0200 Message-ID: <20260707064516.32497-1-jakubszczudlo40@gmail.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Jul 2026 07:32:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/240364 Release notes are here: https://dev.gnupg.org/T8233.html Update contains fix for CVE-2026-41989 and because of building error patch need to be updated to fix compile flags in new version. Signed-off-by: Jakub Szczudlo --- v3: - Correct patch file name to be the same as patch title 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 ------------------- ...r-handle-substitution-in-sed-command.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-random-cipher-handle-substitution-in-sed-command.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" -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 - -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 ---- - 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-random-cipher-handle-substitution-in-sed-command.patch b/meta/recipes-support/libgcrypt/files/0002-random-cipher-handle-substitution-in-sed-command.patch new file mode 100644 index 0000000000..35c7527e83 --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/0002-random-cipher-handle-substitution-in-sed-command.patch @@ -0,0 +1,49 @@ +From e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001 +From: "simit.ghane" +Date: Tue, 11 Jun 2024 07:22:28 +0530 +Subject: [PATCH] random:cipher: handle substitution in sed command + +Upstream-Status: Backport [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 +[jk: add changelog to commit message] +Signed-off-by: Jussi Kivilinna +--- + 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..96e3a692b6 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-random-cipher-handle-substitution-in-sed-command.patch \ " -SRC_URI[sha256sum] = "8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa" +SRC_URI[sha256sum] = "d6d2f835a79711ceba54b53d1081d388d24fb0341d79a268a6557e12908a90a0" BINCONFIG = "${bindir}/libgcrypt-config"