From patchwork Mon Jul 21 08:21:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxu Jia X-Patchwork-Id: 67179 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 8A8D3C87FC9 for ; Mon, 21 Jul 2025 08:21:31 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.35604.1753086082496869654 for ; Mon, 21 Jul 2025 01:21:22 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=9297613b94=hongxu.jia@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.8/8.18.1.8) with ESMTP id 56L5Rdur1107151 for ; Mon, 21 Jul 2025 01:21:22 -0700 Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4806n0sh74-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 21 Jul 2025 01:21:22 -0700 (PDT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.57; Mon, 21 Jul 2025 01:21:09 -0700 Received: from pek-lpg-core5.wrs.com (147.11.136.210) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.57 via Frontend Transport; Mon, 21 Jul 2025 01:21:08 -0700 From: Hongxu Jia To: Subject: [PATCH 1/4] gpgme: upgrade 1.24.3 -> 2.0.0 Date: Mon, 21 Jul 2025 16:21:00 +0800 Message-ID: <20250721082103.2262095-1-hongxu.jia@windriver.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE5MDA2OCBTYWx0ZWRfX5XD1VDYAOu9u L80pcxXxm0CKzYT0POZGrSBbR3frQQgdQF6QSImu3XMk//Uw73kQL3Y2UIllx3H6aLy/KTBCUoA B8y5zLYL0Ju2ay3hWyfmIspkdXiyR9OHMahll3InO//72rAEynw2ytNmZJ72QN2QMlJbUP4MlIg Dc74LvY7aEtCFyI5Hqj8nUzrZif6CC2ChwHBmDnvHxUxPWz3/FKB/auwLf30FwFJ+XOfFopbXk6 pEaHlqzR49c51vA6uGiAiS3JT3Su7e2H+dwJAQRQzqZViVjKHOH8/CbB6Jg4YApiTJSqCAZv2Up vfQuEN3CEaiN80GfPxby6f24dJqnFkpHjtjUsY1LlGrjORyncCa9r3VUcmx55e2G1r5gpUQRslN 3Sm+FVqM X-Proofpoint-ORIG-GUID: NyGWh5Dqm0N64y0fUFAGIholfRrvQ_HM X-Proofpoint-GUID: NyGWh5Dqm0N64y0fUFAGIholfRrvQ_HM X-Authority-Analysis: v=2.4 cv=W4g4VQWk c=1 sm=1 tr=0 ts=687df882 cx=c_pps a=/ZJR302f846pc/tyiSlYyQ==:117 a=/ZJR302f846pc/tyiSlYyQ==:17 a=Wb1JkmetP80A:10 a=GwUem0DFAAAA:8 a=vKivue9HAAAA:8 a=t7CeM3EgAAAA:8 a=omOdbC7AAAAA:8 a=pGLkceISAAAA:8 a=hsIBKhB-wN-B9OOGZs8A:9 a=4f0m0rT7cLEA:10 a=r0dl5i_q2XGqDZkti5dn:22 a=czFSAQ7kI4cueanBugmn:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-21_02,2025-07-21_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 bulkscore=0 spamscore=0 malwarescore=0 clxscore=1015 adultscore=0 priorityscore=1501 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2507190068 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 ; Mon, 21 Jul 2025 08:21:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/220664 Refresh 0001-pkgconfig.patch Due to upstream [python: Remove Python bindings][1], remove following patches - 0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch - 0003-Correctly-install-python-modules.patch - 0006-fix-build-path-issue.patch Due to upstream [cpp,qt: Remove C++ and Qt bindings][2], remove cpp and qt bindings License-Update: copyright years updated, remove blank line [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=932caf37d36eca2caec59bf48bc505364a5765bb [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=763d5f5d6a88ec938b8678ab597e1404af724553 Signed-off-by: Hongxu Jia --- .../gpgme/gpgme/0001-pkgconfig.patch | 23 +++++++----- ...n-gpg-error-config-should-not-be-use.patch | 35 ------------------- ...003-Correctly-install-python-modules.patch | 30 ---------------- .../gpgme/0006-fix-build-path-issue.patch | 34 ------------------ .../gpgme/{gpgme_1.24.3.bb => gpgme_2.0.0.bb} | 35 ++++--------------- 5 files changed, 21 insertions(+), 136 deletions(-) delete mode 100644 meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch delete mode 100644 meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch delete mode 100644 meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch rename meta/recipes-support/gpgme/{gpgme_1.24.3.bb => gpgme_2.0.0.bb} (61%) diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 9d0b4b282b7..67b65157d1b 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,6 +1,6 @@ -From 447fd26a43f40ccb071cd19198ee43fdfce87e3a Mon Sep 17 00:00:00 2001 +From 4b4e6fc898dd249387bbed4924fa22c1c494327a Mon Sep 17 00:00:00 2001 From: Hongxu Jia -Date: Tue, 26 Nov 2024 23:04:52 -0800 +Date: Mon, 21 Jul 2025 12:43:29 +0800 Subject: [PATCH] pkgconfig Update gpgme to use pkgconfig instead of -config files since its @@ -17,6 +17,8 @@ Rebase to 1.17.0 Signed-off-by: Wang Mingyu Rebase to 1.24.0 Signed-off-by: Hongxu Jia +Rebase to 2.0.0 +Signed-off-by: Hongxu Jia --- configure.ac | 1 + src/Makefile.am | 4 +- @@ -27,19 +29,19 @@ Signed-off-by: Hongxu Jia create mode 100644 src/gpgme-pthread.pc.in diff --git a/configure.ac b/configure.ac -index c34f700..4eddc3d 100644 +index d4dcb1c..293fcc2 100644 --- a/configure.ac +++ b/configure.ac -@@ -1176,6 +1176,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -844,6 +844,7 @@ AC_CONFIG_FILES(Makefile src/Makefile + src/gpgme.pc src/gpgme-glib.pc src/gpgme.h) - AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) +AC_CONFIG_FILES(src/gpgme-pthread.pc) - AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile) - AC_CONFIG_FILES(lang/cpp/tests/Makefile) - AC_CONFIG_FILES(lang/cpp/src/gpgmepp.pc) + AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) + AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd]) + AC_CONFIG_FILES([lang/js/Makefile lang/js/src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am -index 0370862..e716ce4 100644 +index edc239b..d427044 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,11 +20,11 @@ @@ -293,3 +295,6 @@ index 9ddef5c..932645b 100644 +Cflags: -I${includedir} +Libs: -L${libdir} -lgpgme URL: https://www.gnupg.org/software/gpgme/index.html +-- +2.34.1 + diff --git a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch deleted file mode 100644 index 3a1837e857e..00000000000 --- a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 145adf290571b7dd47b7fca57b11349af0b94e74 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Fri, 10 May 2019 14:30:36 +0800 -Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used - -gpg-error-config was modified by OE to always return an error. -So we want to find an alternative way to retrieve whatever it -is we need. - -Upstream-Status: Inappropriate [changes are specific to OE] - -Signed-off-by: Mark Hatle - -Rebase to 1.13.0 - -Signed-off-by: Hongxu Jia ---- - lang/python/setup.py.in | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in -index 1ddfbe7..d2fa4f0 100755 ---- a/lang/python/setup.py.in -+++ b/lang/python/setup.py.in -@@ -173,9 +173,8 @@ class BuildExtFirstHack(build): - - def _generate_errors_i(self): - -- ge_cflags='@GPG_ERROR_CFLAGS@' - gpg_error_content = self._read_header( -- 'gpg-error.h', ge_cflags.split(' ') if ge_cflags else []) -+ "gpg-error.h", os.environ.get('CFLAGS').split()) - - filter_re = re.compile(r'GPG_ERR_[^ ]* =') - rewrite_re = re.compile(r' *(.*) = .*') diff --git a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch deleted file mode 100644 index 7b2831ba4f9..00000000000 --- a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d8e884d1fa8c35ce68e94a0668548580cf5ba2d3 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Tue, 30 Jan 2018 15:28:49 +0800 -Subject: [PATCH] Correctly install python modules - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - -Rebase to 1.9.0 - -Signed-off-by: Hongxu Jia - -Rebase to 1.10.0 -Signed-off-by: Hongxu Jia ---- - lang/python/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 1aa330f..d1d5c63 100644 ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -97,6 +97,7 @@ install-exec-local: - --build-base="$$(basename "$${PYTHON}")-gpg" \ - install \ - --prefix "$(DESTDIR)$(prefix)" \ -+ --install-lib=$(DESTDIR)${pythondir} \ - --verbose ; \ - done - diff --git a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch deleted file mode 100644 index d64168b4fdb..00000000000 --- a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f9f82874048c5eec08e815ff871462184b6d7d6a Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Wed, 31 Jan 2018 11:01:09 +0800 -Subject: [PATCH] fix build path issue - -Get the "--root" directory supplied to the "install" command, -and use it as a prefix to strip off the purported filename -encoded in bytecode files. - -Since --root added, we need to tweak --prefix and --install-lib -to use relative path. - -Upstream-Status: Submitted [gnupg-devel@gnupg.org] -Signed-off-by: Hongxu Jia ---- - lang/python/Makefile.am | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index d1d5c63..148e1b9 100644 ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -96,8 +96,9 @@ install-exec-local: - build \ - --build-base="$$(basename "$${PYTHON}")-gpg" \ - install \ -- --prefix "$(DESTDIR)$(prefix)" \ -- --install-lib=$(DESTDIR)${pythondir} \ -+ --root=${DESTDIR} \ -+ --prefix "$(prefix)" \ -+ --install-lib=${pythondir} \ - --verbose ; \ - done - diff --git a/meta/recipes-support/gpgme/gpgme_1.24.3.bb b/meta/recipes-support/gpgme/gpgme_2.0.0.bb similarity index 61% rename from meta/recipes-support/gpgme/gpgme_1.24.3.bb rename to meta/recipes-support/gpgme/gpgme_2.0.0.bb index 64e3c6635a1..c6887a0ebdc 100644 --- a/meta/recipes-support/gpgme/gpgme_1.24.3.bb +++ b/meta/recipes-support/gpgme/gpgme_2.0.0.bb @@ -5,14 +5,12 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index" LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & GPL-3.0-or-later" LICENSE:${PN} = "GPL-2.0-or-later & LGPL-2.1-or-later" -LICENSE:${PN}-cpp = "GPL-2.0-or-later & LGPL-2.1-or-later" LICENSE:${PN}-tool = "GPL-3.0-or-later" -LICENSE:python3-gpg = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://src/gpgme.h.in;endline=23;md5=2f0bf06d1c7dcb28532a9d0f94a7ca1d \ - file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d \ + file://src/gpgme.h.in;endline=23;md5=c0d051fa63f5a5514f4ab190d7ca495e \ + file://src/engine.h;endline=21;md5=f58f7a0b6488edae41b925ac9c890068 \ file://src/gpgme-tool.c;endline=21;md5=66c5381e0e05475792e24982d15e7ce8 \ " @@ -20,40 +18,25 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch \ file://0001-pkgconfig.patch \ - file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \ - file://0003-Correctly-install-python-modules.patch \ file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ - file://0006-fix-build-path-issue.patch \ file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \ file://0001-autogen.sh-remove-unknown-in-version.patch \ " -SRC_URI[sha256sum] = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd" +SRC_URI[sha256sum] = "ddf161d3c41ff6a3fcbaf4be6c6e305ca4ef1cc3f1ecdfce0c8c2a167c0cc36d" -PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}" - -DEPENDS = "libgpg-error libassuan ${PYTHON_DEPS}" -RDEPENDS:${PN}-cpp += "libstdc++" - -RDEPENDS:python3-gpg += "python3-unixadmin" +DEPENDS = "libgpg-error libassuan" RRECOMMENDS:${PN} += "${PN}-tool" BINCONFIG = "${bindir}/gpgme-config" -# Default in configure.ac: "cl cpp python qt" -# Supported: "cl cpp python python2 python3 qt" -# python says 'search and find python2 or python3' - -# Building the C++ bindings for native requires a C++ compiler with C++11 -# support. Since these bindings are currently not needed, we can disable them. +# Default in configure.ac: "cl" +# Supported: "cl" DEFAULT_LANGUAGES = "" -DEFAULT_LANGUAGES:class-target = "cpp" LANGUAGES ?= "${DEFAULT_LANGUAGES}" -PYTHON_INHERIT = "${@bb.utils.contains('LANGUAGES', 'python', 'setuptools3-base', '', d)}" - EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ --disable-gpgconf-test \ --disable-gpg-test \ @@ -62,17 +45,14 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ ' inherit autotools texinfo binconfig-disabled pkgconfig multilib_header -inherit_defer ${PYTHON_INHERIT} python3native export PKG_CONFIG = 'pkg-config' BBCLASSEXTEND = "native nativesdk" -PACKAGES =+ "${PN}-cpp ${PN}-tool python3-gpg" +PACKAGES =+ "${PN}-tool" -FILES:${PN}-cpp = "${libdir}/libgpgmepp.so.*" FILES:${PN}-tool = "${bindir}/gpgme-tool" -FILES:python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" FILES:${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" CFLAGS:append:libc-musl = " -D__error_t_defined " @@ -82,7 +62,6 @@ do_configure:prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/gpg-error.m4 rm -f ${S}/m4/libassuan.m4 - rm -f ${S}/m4/python.m4 } do_install:append() { From patchwork Mon Jul 21 08:21:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxu Jia X-Patchwork-Id: 67178 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 99807C87FC8 for ; Mon, 21 Jul 2025 08:21:31 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.35563.1753086083726510835 for ; Mon, 21 Jul 2025 01:21:23 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=9297613b94=hongxu.jia@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.8/8.18.1.8) with ESMTP id 56L6F1011184179 for ; Mon, 21 Jul 2025 01:21:23 -0700 Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4806n0sh75-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 21 Jul 2025 01:21:22 -0700 (PDT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.57; Mon, 21 Jul 2025 01:21:10 -0700 Received: from pek-lpg-core5.wrs.com (147.11.136.210) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.57 via Frontend Transport; Mon, 21 Jul 2025 01:21:09 -0700 From: Hongxu Jia To: Subject: [PATCH 2/4] bash: upgrade 5.2.37 -> 5.3 Date: Mon, 21 Jul 2025 16:21:01 +0800 Message-ID: <20250721082103.2262095-2-hongxu.jia@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250721082103.2262095-1-hongxu.jia@windriver.com> References: <20250721082103.2262095-1-hongxu.jia@windriver.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE5MDA2OCBTYWx0ZWRfX8V37HrR/t0WO opjuZvenTp/xCqyXcXFhb3oekncu7omeC/FZk2IrhjfTzfs01D2wcNgkPLeoOTMq7EhEXYRjlKf Q8gw7/qYMgNuVHUY96THE/CjJoc/VcjEhD3d3H4dY+/x9PoE66/lJ2T8IAN2vUGMYn2GRG/IMs4 2g42v5yGVgvNZeHRWfcSqoVb3rZ8/w29tefLnXUMFcJRI/Bx4ILauX3eoAWb18F+ajJEvxmmkvL 43G913zNd0dcz8cuKaLbc0sVEIMs6DxOWDPkuR+cAQ/q3d1CWxGy4qaU4BhqZ93RQPO1ertPc3b yNw87a5ON8kAtmPg18CjhGsKi6g7T41lfRHmB9X8aWuL1CYc/o5Hyr8h08rpdeIHeZOuno5MklI VSe8o7De X-Proofpoint-ORIG-GUID: jFK0CAxd-cU0kLrXwV5nAoy6tad_Y8WV X-Proofpoint-GUID: jFK0CAxd-cU0kLrXwV5nAoy6tad_Y8WV X-Authority-Analysis: v=2.4 cv=W4g4VQWk c=1 sm=1 tr=0 ts=687df883 cx=c_pps a=/ZJR302f846pc/tyiSlYyQ==:117 a=/ZJR302f846pc/tyiSlYyQ==:17 a=Wb1JkmetP80A:10 a=mDV3o1hIAAAA:8 a=t7CeM3EgAAAA:8 a=fvaPMweRAAAA:8 a=9Wbp7B8dAAAA:8 a=We0TN-cmsFUSj077Xg0A:9 a=FdTzh2GWekK77mhwV6Dw:22 a=vJ2phfYHA-_bQipmD_nH:22 a=BESxJfN36ujmTJQqZ0Zq:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-21_02,2025-07-21_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 bulkscore=0 spamscore=0 malwarescore=0 clxscore=1015 adultscore=0 priorityscore=1501 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2507190068 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 ; Mon, 21 Jul 2025 08:21:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/220665 Refresh patch to 5.3 - mkbuiltins_have_stringize.patch Drop backport patch - 0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch - fix-filesubst-errexit.patch Signed-off-by: Hongxu Jia --- ...T-handler-while-waiting-for-a-child-.patch | 223 ------------------ .../bash/bash/fix-filesubst-errexit.patch | 31 --- .../bash/bash/mkbuiltins_have_stringize.patch | 24 +- .../bash/{bash_5.2.37.bb => bash_5.3.bb} | 4 +- 4 files changed, 17 insertions(+), 265 deletions(-) delete mode 100644 meta/recipes-extended/bash/bash/0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch delete mode 100644 meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch rename meta/recipes-extended/bash/{bash_5.2.37.bb => bash_5.3.bb} (80%) diff --git a/meta/recipes-extended/bash/bash/0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch b/meta/recipes-extended/bash/bash/0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch deleted file mode 100644 index 4e73edb9b3d..00000000000 --- a/meta/recipes-extended/bash/bash/0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch +++ /dev/null @@ -1,223 +0,0 @@ -From e4b9493ae4923595ec3ca67f85322129fb3056cf Mon Sep 17 00:00:00 2001 -From: Chet Ramey -Date: Mon, 30 Oct 2023 12:16:07 -0400 -Subject: [PATCH] changes to SIGINT handler while waiting for a child; skip - vertical whitespace after translating an integer - -Upstream-Status: Backport from -[https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=fe24a6a55e8850298b496c5b9d82f1866eba190e] - -[Adjust and drop some codes to be applicable the tree] - -Signed-off-by: Xiangyu Chen ---- - general.c | 5 +++-- - jobs.c | 24 ++++++++++++++++-------- - tests/redir.right | 4 ++-- - tests/redir11.sub | 2 ++ - tests/type.right | 16 ++++++++-------- - tests/type.tests | 24 ++++++++++++------------ - 6 files changed, 43 insertions(+), 32 deletions(-) - -diff --git a/general.c b/general.c -index bda39f4..94a5339 100644 ---- a/general.c -+++ b/general.c -@@ -264,8 +264,9 @@ legal_number (string, result) - if (errno || ep == string) - return 0; /* errno is set on overflow or underflow */ - -- /* Skip any trailing whitespace, since strtoimax does not. */ -- while (whitespace (*ep)) -+ /* Skip any trailing whitespace, since strtoimax does not, using the same -+ test that strtoimax uses for leading whitespace. */ -+ while (isspace ((unsigned char) *ep)) - ep++; - - /* If *string is not '\0' but *ep is '\0' on return, the entire string -diff --git a/jobs.c b/jobs.c -index d3e4ab0..903cf9c 100644 ---- a/jobs.c -+++ b/jobs.c -@@ -2718,6 +2718,10 @@ wait_for_background_pids (ps) - #define INVALID_SIGNAL_HANDLER (SigHandler *)wait_for_background_pids - static SigHandler *old_sigint_handler = INVALID_SIGNAL_HANDLER; - -+/* The current SIGINT handler as set by restore_sigint_handler. Only valid -+ immediately after restore_sigint_handler, used for continuations. */ -+static SigHandler *cur_sigint_handler = INVALID_SIGNAL_HANDLER; -+ - static int wait_sigint_received; - static int child_caught_sigint; - -@@ -2735,6 +2739,7 @@ wait_sigint_cleanup () - static void - restore_sigint_handler () - { -+ cur_sigint_handler = old_sigint_handler; - if (old_sigint_handler != INVALID_SIGNAL_HANDLER) - { - set_signal_handler (SIGINT, old_sigint_handler); -@@ -2758,8 +2763,7 @@ wait_sigint_handler (sig) - restore_sigint_handler (); - /* If we got a SIGINT while in `wait', and SIGINT is trapped, do - what POSIX.2 says (see builtins/wait.def for more info). */ -- if (this_shell_builtin && this_shell_builtin == wait_builtin && -- signal_is_trapped (SIGINT) && -+ if (signal_is_trapped (SIGINT) && - ((sigint_handler = trap_to_sighandler (SIGINT)) == trap_handler)) - { - trap_handler (SIGINT); /* set pending_traps[SIGINT] */ -@@ -2782,6 +2786,8 @@ wait_sigint_handler (sig) - { - set_exit_status (128+SIGINT); - restore_sigint_handler (); -+ if (cur_sigint_handler == INVALID_SIGNAL_HANDLER) -+ set_sigint_handler (); /* XXX - only do this in one place */ - kill (getpid (), SIGINT); - } - -@@ -2926,11 +2932,13 @@ wait_for (pid, flags) - { - SigHandler *temp_sigint_handler; - -- temp_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); -- if (temp_sigint_handler == wait_sigint_handler) -- internal_debug ("wait_for: recursively setting old_sigint_handler to wait_sigint_handler: running_trap = %d", running_trap); -- else -- old_sigint_handler = temp_sigint_handler; -+ temp_sigint_handler = old_sigint_handler; -+ old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); -+ if (old_sigint_handler == wait_sigint_handler) -+ { -+ internal_debug ("wait_for: recursively setting old_sigint_handler to wait_sigint_handler: running_trap = %d", running_trap); -+ old_sigint_handler = temp_sigint_handler; -+ } - waiting_for_child = 0; - if (old_sigint_handler == SIG_IGN) - set_signal_handler (SIGINT, old_sigint_handler); -@@ -4141,7 +4149,7 @@ set_job_status_and_cleanup (job) - SIGINT (if we reset the sighandler to the default). - In this case, we have to fix things up. What a crock. */ - if (temp_handler == trap_handler && signal_is_trapped (SIGINT) == 0) -- temp_handler = trap_to_sighandler (SIGINT); -+ temp_handler = trap_to_sighandler (SIGINT); - restore_sigint_handler (); - if (temp_handler == SIG_DFL) - termsig_handler (SIGINT); /* XXX */ -diff --git a/tests/redir.right b/tests/redir.right -index 8db1041..9e1403c 100644 ---- a/tests/redir.right -+++ b/tests/redir.right -@@ -154,10 +154,10 @@ foo - 1 - 7 - after: 42 --./redir11.sub: line 53: $(ss= declare -i ss): ambiguous redirect -+./redir11.sub: line 55: $(ss= declare -i ss): ambiguous redirect - after: 42 - a+=3 - foo - foo --./redir11.sub: line 75: 42: No such file or directory -+./redir11.sub: line 77: 42: No such file or directory - 42 -diff --git a/tests/redir11.sub b/tests/redir11.sub -index d417cdb..ca9854c 100644 ---- a/tests/redir11.sub -+++ b/tests/redir11.sub -@@ -34,6 +34,8 @@ a=4 b=7 ss=4 declare -i ss - a=4 b=7 foo - echo after: $a - -+exec 7>&- 4>&- -+ - unset a - a=4 echo foo 2>&1 >&$(foo) | { grep -q 'Bad file' || echo 'redir11 bad 3'; } - a=1 echo foo 2>&1 >&$(foo) | { grep -q 'Bad file' || echo 'redir11 bad 4'; } -diff --git a/tests/type.right b/tests/type.right -index bbc228e..c0c1c8b 100644 ---- a/tests/type.right -+++ b/tests/type.right -@@ -24,15 +24,15 @@ func () - } - while - while is a shell keyword --./type.tests: line 56: type: m: not found --alias m='more' --alias m='more' --m is aliased to `more' -+./type.tests: line 56: type: morealias: not found -+alias morealias='more' -+alias morealias='more' -+morealias is aliased to `more' - alias --alias m='more' --alias m='more' --alias m='more' --m is aliased to `more' -+alias morealias='more' -+alias morealias='more' -+alias morealias='more' -+morealias is aliased to `more' - builtin - builtin is a shell builtin - /bin/sh -diff --git a/tests/type.tests b/tests/type.tests -index fd39c18..ddc1540 100644 ---- a/tests/type.tests -+++ b/tests/type.tests -@@ -25,8 +25,6 @@ type -r ${THIS_SH} - type notthere - command -v notthere - --alias m=more -- - unset -f func 2>/dev/null - func() { echo this is func; } - -@@ -49,24 +47,26 @@ command -V func - command -v while - command -V while - -+alias morealias=more -+ - # the following two lines should produce the same output - # post-3.0 patch makes command -v silent, as posix specifies - # first test with alias expansion off (should all fail or produce no output) --type -t m --type m --command -v m -+type -t morealias -+type morealias -+command -v morealias - alias -p --alias m -+alias morealias - - # then test with alias expansion on - shopt -s expand_aliases --type m --type -t m --command -v m -+type morealias -+type -t morealias -+command -v morealias - alias -p --alias m -+alias morealias - --command -V m -+command -V morealias - shopt -u expand_aliases - - command -v builtin -@@ -76,7 +76,7 @@ command -V /bin/sh - - unset -f func - type func --unalias m -+unalias morealias - type m - - hash -r diff --git a/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch deleted file mode 100644 index c5082ee3558..00000000000 --- a/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 16951b74971c7fd38fd036dac1410a9e53cbe736 Mon Sep 17 00:00:00 2001 -From: Chet Ramey -Date: Fri, 7 Apr 2023 00:28:46 -0700 -Subject: [PATCH] $( ---- - builtins/evalstring.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/builtins/evalstring.c b/builtins/evalstring.c -index 53a7c0b..c5075cc 100644 ---- a/builtins/evalstring.c -+++ b/builtins/evalstring.c -@@ -753,7 +753,7 @@ open_redir_file (r, fnp) - fd = open(fn, O_RDONLY); - if (fd < 0) - { -- file_error (fn); -+ internal_error ("%s: %s", fn, strerror (errno)); - free (fn); - if (fnp) - *fnp = 0; diff --git a/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch b/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch index eb29e7d836d..4ee754e32b9 100644 --- a/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch +++ b/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch @@ -1,6 +1,6 @@ -From d11685286144c2e5630545e435d11387b2908fd0 Mon Sep 17 00:00:00 2001 +From ed7515a5c07addaa3338a24efb36b74fbd1844dc Mon Sep 17 00:00:00 2001 From: Christopher Larson -Date: Wed, 14 Nov 2012 07:55:09 -0700 +Date: Mon, 21 Jul 2025 13:52:00 +0800 Subject: [PATCH] bash: fix mkbuiltins build failure On hosts with FORTIFY_SOURCES, stringize support is required, as it's used by @@ -18,19 +18,27 @@ stringize support, or to not define STRING() at all when FORTIFY_SOURCES is defined, letting the unistd.h one be used, instead. Upstream-Status: Pending + +Signed-off-by: Christopher Larson + +Rebase to 5.3 +Signed-off-by: Hongxu Jia --- builtins/mkbuiltins.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c -index f505ebd..b5b2eed 100644 +index c4cacdf..05d1db1 100644 --- a/builtins/mkbuiltins.c +++ b/builtins/mkbuiltins.c -@@ -28,6 +28,7 @@ - # define HAVE_STDLIB_H - - # define HAVE_RENAME -+# define HAVE_STRINGIZE +@@ -24,6 +24,7 @@ + #else /* CROSS_COMPILING */ + /* A conservative set of defines based on POSIX/SUS3/XPG6 */ + # include ++# define HAVE_STRINGIZE #endif /* CROSS_COMPILING */ #if defined (HAVE_UNISTD_H) +-- +2.34.1 + diff --git a/meta/recipes-extended/bash/bash_5.2.37.bb b/meta/recipes-extended/bash/bash_5.3.bb similarity index 80% rename from meta/recipes-extended/bash/bash_5.2.37.bb rename to meta/recipes-extended/bash/bash_5.3.bb index 2c0645cbd9a..c241ea6d3b7 100644 --- a/meta/recipes-extended/bash/bash_5.2.37.bb +++ b/meta/recipes-extended/bash/bash_5.3.bb @@ -11,11 +11,9 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://run-ptest \ file://run-bash-ptests \ file://fix-run-builtins.patch \ - file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ - file://fix-filesubst-errexit.patch \ " -SRC_URI[tarball.sha256sum] = "9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff" +SRC_URI[tarball.sha256sum] = "62dd49c44c399ed1b3f7f731e87a782334d834f08e098a35f2c87547d5dbb269" DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" From patchwork Mon Jul 21 08:21:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxu Jia X-Patchwork-Id: 67176 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 8A522C83F1A for ; Mon, 21 Jul 2025 08:21:31 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.35564.1753086084555578898 for ; Mon, 21 Jul 2025 01:21:24 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=9297613b94=hongxu.jia@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.8/8.18.1.8) with ESMTP id 56L6W9sM1294783 for ; Mon, 21 Jul 2025 01:21:24 -0700 Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 480avgscqr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 21 Jul 2025 01:21:24 -0700 (PDT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.57; Mon, 21 Jul 2025 01:21:11 -0700 Received: from pek-lpg-core5.wrs.com (147.11.136.210) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.57 via Frontend Transport; Mon, 21 Jul 2025 01:21:10 -0700 From: Hongxu Jia To: Subject: [PATCH 3/4] readline: 8.2.13 -> 8.3 Date: Mon, 21 Jul 2025 16:21:02 +0800 Message-ID: <20250721082103.2262095-3-hongxu.jia@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250721082103.2262095-1-hongxu.jia@windriver.com> References: <20250721082103.2262095-1-hongxu.jia@windriver.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: TCiixrovF3lgvVNAuOtfD-cQZ8KOd9dI X-Authority-Analysis: v=2.4 cv=JPQ7s9Kb c=1 sm=1 tr=0 ts=687df884 cx=c_pps a=/ZJR302f846pc/tyiSlYyQ==:117 a=/ZJR302f846pc/tyiSlYyQ==:17 a=Wb1JkmetP80A:10 a=vTr9H3xdAAAA:8 a=mDV3o1hIAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=j-oCmr_1fYtGWD_PjOYA:9 a=D9EQx5YpYEoA:10 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: TCiixrovF3lgvVNAuOtfD-cQZ8KOd9dI X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE5MDExOCBTYWx0ZWRfX82SA2Iq1JV5i BEbGAFhJXGpoUFann8lyZSabRsQTsHNA2y4EDOxwbMPn7UY7Y1V3eM9cV55NN8DKeXdDqOGJnC0 +AxsbZTV07UVpkcuYyw7bTX9BrnkIq4wxRQfEKdk6kFgCwC+cP1AXTMEcoQOzWgqrv4Q6PWX3TH gu6sFlhx8Va8TUqUb/3WgPtGWi1/bgeuYELge4GRgIIiz3V/fDUv3UcPMLOjgUembLaBN4aV+H+ s7w9ZZnxvaj2e4sXkNzLCnLcLprrDga/Kl2HSDXWn087OApWYeMhMrntc0VIb0/NEytfDqvg7Mh RsOqAi+Dky3O8ko4fPQHflnKV1ZoTcIr2u8R79VEgFxV3brhEln1uClL6h4K1XCtQhzKwNtrPOt kSzoTfPc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-21_02,2025-07-21_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 phishscore=0 spamscore=0 suspectscore=0 clxscore=1015 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2507190118 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 ; Mon, 21 Jul 2025 08:21:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/220666 Remove obsolete patch: - 0001-Add-fix-for-packages-that-are-not-compatible-with-C2.patch Signed-off-by: Hongxu Jia --- ...ages-that-are-not-compatible-with-C2.patch | 29 ------------------- meta/recipes-core/readline/readline_8.2.13.bb | 7 ----- meta/recipes-core/readline/readline_8.3.bb | 6 ++++ 3 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 meta/recipes-core/readline/readline/0001-Add-fix-for-packages-that-are-not-compatible-with-C2.patch delete mode 100644 meta/recipes-core/readline/readline_8.2.13.bb create mode 100644 meta/recipes-core/readline/readline_8.3.bb diff --git a/meta/recipes-core/readline/readline/0001-Add-fix-for-packages-that-are-not-compatible-with-C2.patch b/meta/recipes-core/readline/readline/0001-Add-fix-for-packages-that-are-not-compatible-with-C2.patch deleted file mode 100644 index 3bb4d539601..00000000000 --- a/meta/recipes-core/readline/readline/0001-Add-fix-for-packages-that-are-not-compatible-with-C2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9459ee899a291c55f08341df63e9a1b9b7af200a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 16 Mar 2025 12:48:46 -0700 -Subject: [PATCH] Add fix for packages that are not compatible with C23 - -Fixes builds with GCC-15 -Sourced from Fedora: https://src.fedoraproject.org/rpms/readline/c/c47eb813afb942128253213ad5b8221770557e48?branch=rawhide - -Help getting packages like bluez5 building - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-readline/2025-03/msg00001.html] -Signed-off-by: Khem Raj ---- - rlstdc.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rlstdc.h b/rlstdc.h -index 2aaa30b..a7a0ef3 100644 ---- a/rlstdc.h -+++ b/rlstdc.h -@@ -44,7 +44,7 @@ - - /* Moved from config.h.in because readline.h:rl_message depends on these - defines. */ --#if defined (__STDC__) && defined (HAVE_STDARG_H) -+#if defined (__STDC__) - # define PREFER_STDARG - # define USE_VARARGS - #else diff --git a/meta/recipes-core/readline/readline_8.2.13.bb b/meta/recipes-core/readline/readline_8.2.13.bb deleted file mode 100644 index 19b5cb6f583..00000000000 --- a/meta/recipes-core/readline/readline_8.2.13.bb +++ /dev/null @@ -1,7 +0,0 @@ -require readline.inc - -SRC_URI += "file://norpath.patch \ - file://0001-Add-fix-for-packages-that-are-not-compatible-with-C2.patch \ - " - -SRC_URI[archive.sha256sum] = "0e5be4d2937e8bd9b7cd60d46721ce79f88a33415dd68c2d738fb5924638f656" diff --git a/meta/recipes-core/readline/readline_8.3.bb b/meta/recipes-core/readline/readline_8.3.bb new file mode 100644 index 00000000000..ff5dec6c0a6 --- /dev/null +++ b/meta/recipes-core/readline/readline_8.3.bb @@ -0,0 +1,6 @@ +require readline.inc + +SRC_URI += "file://norpath.patch \ + " + +SRC_URI[archive.sha256sum] = "fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" From patchwork Mon Jul 21 08:21:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxu Jia X-Patchwork-Id: 67177 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 874CDC87FC5 for ; Mon, 21 Jul 2025 08:21:31 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.35565.1753086085533511156 for ; Mon, 21 Jul 2025 01:21:25 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=9297613b94=hongxu.jia@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.8/8.18.1.8) with ESMTP id 56L59Fo41158582 for ; Mon, 21 Jul 2025 01:21:25 -0700 Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 480avgscqs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 21 Jul 2025 01:21:25 -0700 (PDT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.57; Mon, 21 Jul 2025 01:21:12 -0700 Received: from pek-lpg-core5.wrs.com (147.11.136.210) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.57 via Frontend Transport; Mon, 21 Jul 2025 01:21:11 -0700 From: Hongxu Jia To: Subject: [PATCH 4/4] libxml2: upgrade 2.14.3 -> 2.14.5 Date: Mon, 21 Jul 2025 16:21:03 +0800 Message-ID: <20250721082103.2262095-4-hongxu.jia@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250721082103.2262095-1-hongxu.jia@windriver.com> References: <20250721082103.2262095-1-hongxu.jia@windriver.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 2B-vvmO5n5viph9lO2K-R1In2Rwmcexy X-Authority-Analysis: v=2.4 cv=JPQ7s9Kb c=1 sm=1 tr=0 ts=687df885 cx=c_pps a=/ZJR302f846pc/tyiSlYyQ==:117 a=/ZJR302f846pc/tyiSlYyQ==:17 a=Wb1JkmetP80A:10 a=GHR8O2WEAAAA:20 a=SSmOFEACAAAA:8 a=t7CeM3EgAAAA:8 a=a_U1oVfrAAAA:8 a=7CQSdrXTAAAA:8 a=SEUDYsWWKZk9PtqiWv4A:9 a=m9p5bXcFLgAA:10 a=FdTzh2GWekK77mhwV6Dw:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-GUID: 2B-vvmO5n5viph9lO2K-R1In2Rwmcexy X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE5MDExOCBTYWx0ZWRfX8uj0r3lONSpF GoGPfTU8pwq7Yb/+XVz/E+c7NO6x4sR5ZHN2VoZn6RBW0IShhbZPOqaB70Noy1wqz/QkL8Mb2+J 68hF3N8EaALuWjzzccnbs58SLDAckKE18d2rzaFQ1pdmHgGnh/gY5+aGaqApgSROHY160emJWja JaMkc0gdhd5WfqxH99W0adIJCKycf+K2h5XGuv3rxDZ7+nlQ7/jSOlSIWPY4N1ZzrBopaVGSaE/ 0+N0kEnUC4q7JWpOFu7ZWnQFtjKu3svsA31YHDHFt3ukhJBxrCoMxMnfs/pO9w+yLVSfrovKS5L YTJu8y17Y9aT8mGU5NyHFSFFA4YSbxvSq8E7ZVvYQTbxh0JlHfkAwFPVw2n84JHb8IekdfeRKRG bxaHRsGb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-21_02,2025-07-21_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 phishscore=0 spamscore=0 suspectscore=0 clxscore=1015 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2507190118 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 ; Mon, 21 Jul 2025 08:21:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/220667 Release notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.5 Signed-off-by: Hongxu Jia --- ...-installation-directories-in-libxml2.patch | 14 ++++---- .../libxml/libxml2/CVE-2025-6021.patch | 36 +++---------------- .../libxml/libxml2/install-tests.patch | 4 +-- .../{libxml2_2.14.3.bb => libxml2_2.14.5.bb} | 2 +- 4 files changed, 14 insertions(+), 42 deletions(-) rename meta/recipes-core/libxml/{libxml2_2.14.3.bb => libxml2_2.14.5.bb} (97%) diff --git a/meta/recipes-core/libxml/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch b/meta/recipes-core/libxml/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch index 6ea5adafa22..627f8472c38 100644 --- a/meta/recipes-core/libxml/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch +++ b/meta/recipes-core/libxml/libxml2/0001-Revert-cmake-Fix-installation-directories-in-libxml2.patch @@ -1,4 +1,4 @@ -From 55ed199fdb55a1a600616ba14ad0feedcf828d86 Mon Sep 17 00:00:00 2001 +From 1a7e177a7315c856a2f0e3c2a17ee0fd9e297bc9 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Mon, 26 May 2025 21:11:14 +0200 Subject: [PATCH] Revert "cmake: Fix installation directories in @@ -15,10 +15,10 @@ Signed-off-by: Peter Marko 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac -index 40e75151..d21ebfe5 100644 +index aaa02e3..fb241bb 100644 --- a/configure.ac +++ b/configure.ac -@@ -1061,17 +1061,6 @@ AC_SUBST(XML_PRIVATE_LIBS) +@@ -1065,17 +1065,6 @@ AC_SUBST(XML_PRIVATE_LIBS) AC_SUBST(XML_PRIVATE_CFLAGS) AC_SUBST(XML_INCLUDEDIR) @@ -37,7 +37,7 @@ index 40e75151..d21ebfe5 100644 AC_DEFINE_UNQUOTED([XML_SYSCONFDIR], ["$XML_SYSCONFDIR"], [System configuration directory (/etc)]) diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in -index 4945dda4..31036805 100644 +index e040a75..dc0d6b8 100644 --- a/libxml2-config.cmake.in +++ b/libxml2-config.cmake.in @@ -24,17 +24,20 @@ @@ -66,7 +66,7 @@ index 4945dda4..31036805 100644 set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY}) set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR}) diff --git a/meson.build b/meson.build -index 4c59211d..3e5f25d3 100644 +index 98bc6e3..3ef0bd0 100644 --- a/meson.build +++ b/meson.build @@ -599,9 +599,6 @@ config_cmake = configuration_data() @@ -77,5 +77,5 @@ index 4c59211d..3e5f25d3 100644 -config_cmake.set('INSTALL_INCLUDEDIR', dir_include) -config_cmake.set('INSTALL_LIBDIR', dir_lib) config_cmake.set('VERSION', meson.project_version()) - config_cmake.set('WITH_HTTP', want_http.to_int().to_string()) - config_cmake.set('WITH_ICONV', want_iconv.to_int().to_string()) + config_cmake.set10('BUILD_SHARED_LIBS', + get_option('default_library') != 'static') diff --git a/meta/recipes-core/libxml/libxml2/CVE-2025-6021.patch b/meta/recipes-core/libxml/libxml2/CVE-2025-6021.patch index 157486848b9..0b73bceb245 100644 --- a/meta/recipes-core/libxml/libxml2/CVE-2025-6021.patch +++ b/meta/recipes-core/libxml/libxml2/CVE-2025-6021.patch @@ -1,4 +1,4 @@ -From 33d7969baf541326a35e2fbe31943c46af8c71db Mon Sep 17 00:00:00 2001 +From e546e423d69ec9b3c71167d3c3140fa1b9af93c7 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Tue, 27 May 2025 12:53:17 +0200 Subject: [PATCH] tree: Fix integer overflow in xmlBuildQName @@ -14,11 +14,11 @@ CVE: CVE-2025-6021 Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/-/commit/acbbeef9f5dcdcc901c5f3fa14d583ef8cfd22f0] Signed-off-by: Hongxu Jia --- - tree.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) + tree.c | 1 + + 1 file changed, 1 insertion(+) diff --git a/tree.c b/tree.c -index 7454b07..22ec11c 100644 +index e14bc62..22ec11c 100644 --- a/tree.c +++ b/tree.c @@ -23,6 +23,7 @@ @@ -29,31 +29,3 @@ index 7454b07..22ec11c 100644 #ifdef LIBXML_ZLIB_ENABLED #include -@@ -168,10 +169,10 @@ xmlGetParameterEntityFromDtd(const xmlDtd *dtd, const xmlChar *name) { - xmlChar * - xmlBuildQName(const xmlChar *ncname, const xmlChar *prefix, - xmlChar *memory, int len) { -- int lenn, lenp; -+ size_t lenn, lenp; - xmlChar *ret; - -- if (ncname == NULL) return(NULL); -+ if ((ncname == NULL) || (len < 0)) return(NULL); - if (prefix == NULL) return((xmlChar *) ncname); - - #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -@@ -182,8 +183,10 @@ xmlBuildQName(const xmlChar *ncname, const xmlChar *prefix, - - lenn = strlen((char *) ncname); - lenp = strlen((char *) prefix); -+ if (lenn >= SIZE_MAX - lenp - 1) -+ return(NULL); - -- if ((memory == NULL) || (len < lenn + lenp + 2)) { -+ if ((memory == NULL) || ((size_t) len < lenn + lenp + 2)) { - ret = xmlMalloc(lenn + lenp + 2); - if (ret == NULL) - return(NULL); --- -2.34.1 - diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes-core/libxml/libxml2/install-tests.patch index 789aeca119f..4c1faa83cbb 100644 --- a/meta/recipes-core/libxml/libxml2/install-tests.patch +++ b/meta/recipes-core/libxml/libxml2/install-tests.patch @@ -1,4 +1,4 @@ -From 8c1054eacb430472068f21e4840749c384e8e866 Mon Sep 17 00:00:00 2001 +From 7e99fef6eae0642a3f1e511e4d24abf7d6d28f50 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 5 Dec 2022 17:02:32 +0000 Subject: [PATCH] add yocto-specific install-ptest target @@ -12,7 +12,7 @@ Signed-off-by: Ross Burton 1 file changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 4cb9a5c..8adcd7e 100644 +index 6f98144..ecb3b54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,6 +26,16 @@ check_PROGRAMS = \ diff --git a/meta/recipes-core/libxml/libxml2_2.14.3.bb b/meta/recipes-core/libxml/libxml2_2.14.5.bb similarity index 97% rename from meta/recipes-core/libxml/libxml2_2.14.3.bb rename to meta/recipes-core/libxml/libxml2_2.14.5.bb index 4baab59186e..52b2040122b 100644 --- a/meta/recipes-core/libxml/libxml2_2.14.3.bb +++ b/meta/recipes-core/libxml/libxml2_2.14.5.bb @@ -21,7 +21,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt file://CVE-2025-6021.patch \ " -SRC_URI[archive.sha256sum] = "6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833" +SRC_URI[archive.sha256sum] = "24175ec30a97cfa86bdf9befb7ccf4613f8f4b2713c5103e0dd0bc9c711a2773" SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" # Disputed as a security issue, but fixed in d39f780