Skip to contentSkip to conversation

python3-psycopg: upgrade 3.2.12 -> 3.2.13

PATCH New [email protected] 1 participant 28 messages Jan 19 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/28 python3-psycopg: upgrade 3.2.12 -> 3.2.13

From: Wang Mingyu <[email protected]>

Changelog:
==============
- Show the host name in the error message in case of name resolution error
- Fix Cursor.copy() and AsyncCursor.copy() to hold the connection lock for the entire operation, preventing concurrent access issues
- Fix GSSAPI check with C extension built with libpq < v16

(cherry picked from commit 4b297312d7d256ddbca007f9fbdb1daa337fe431)
---
 .../{python3-psycopg_3.2.12.bb => python3-psycopg_3.2.13.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-devtools/python/{python3-psycopg_3.2.12.bb => python3-psycopg_3.2.13.bb} (85%)
meta-oe/recipes-devtools/python/python3-psycopg_3.2.13.bb renamed from meta-oe/recipes-devtools/python/python3-psycopg_3.2.12.bb +1 -1
similarity index 85%
rename from meta-oe/recipes-devtools/python/python3-psycopg_3.2.12.bb
rename to meta-oe/recipes-devtools/python/python3-psycopg_3.2.13.bb
index 4133a4b5b0..49030c56fd 100644
@@ -7,7 +7,7 @@ features offered by PostgreSQL."
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404"
 
-SRC_URI[sha256sum] = "85c08d6f6e2a897b16280e0ff6406bef29b1327c045db06d21f364d7cd5da90b"
+SRC_URI[sha256sum] = "309adaeda61d44556046ec9a83a93f42bbe5310120b1995f3af49ab6d9f13c1d"
 
 inherit pypi python_setuptools_build_meta
 
#1 lore raw

PATCH 2/28 parallel: upgrade 20251022 -> 20251122

From: Wang Mingyu <[email protected]>

(cherry picked from commit c9c4b5a88718822697ad41d86b8b89961fb23c10)
---
 .../parallel/{parallel_20251022.bb => parallel_20251122.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-extended/parallel/{parallel_20251022.bb => parallel_20251122.bb} (93%)
meta-oe/recipes-extended/parallel/parallel_20251122.bb renamed from meta-oe/recipes-extended/parallel/parallel_20251022.bb +1 -1
similarity index 93%
rename from meta-oe/recipes-extended/parallel/parallel_20251022.bb
rename to meta-oe/recipes-extended/parallel/parallel_20251122.bb
index 9fa1b6052d..c2775472d7 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \
 "
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "474326d59688d2fc078cf89a7b0b4a11cc9684229b3fa0158fe8bc03f1b69ee1"
+SRC_URI[sha256sum] = "368d1982cfd9dbebb8cd0e444de6199559df94ac2dd1edf95f74350f0af1e84d"
 
 inherit autotools bash-completion
 
#2 lore raw

PATCH 3/28 liblognorm: upgrade 2.0.7 -> 2.0.8

In reply to [email protected]

From: Liu Yiding <[email protected]>

Change log
==========
Version 2.0.8, 2025-12-04
- fix potential segfault on some platforms
Thanks to Julian Thomas for a fix
- fix memory leak when a custom type in rules does not match Thanks to Meric Sentunali for the fix and Julian Thomas for alerting me of the missing merge.

(cherry picked from commit c627784366f53c880719994e09f393265d894d35)
---
 .../liblognorm/{liblognorm_2.0.7.bb => liblognorm_2.0.8.bb}    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta-oe/recipes-extended/liblognorm/{liblognorm_2.0.7.bb => liblognorm_2.0.8.bb} (95%)
meta-oe/recipes-extended/liblognorm/liblognorm_2.0.8.bb renamed from meta-oe/recipes-extended/liblognorm/liblognorm_2.0.7.bb +1 -2
similarity index 95%
rename from meta-oe/recipes-extended/liblognorm/liblognorm_2.0.7.bb
rename to meta-oe/recipes-extended/liblognorm/liblognorm_2.0.8.bb
index 6de22d392f..6c68b515e9 100644
@@ -11,8 +11,7 @@ DEPENDS = "libfastjson libestr"
 SRC_URI = "git://github.com/rsyslog/liblognorm;branch=stable;protocol=https;tag=v${PV} \
            file://0001-Add-asprintf-to-autoconf-function-check-macro.patch \
            "
-SRCREV = "3761794fc0d3b0a9fbfe4daa14a545063f48ce6e"
-
+SRCREV = "33ec4b061ad0a6e5508e679e150ce6422ef6be30"
 
 inherit autotools pkgconfig
 
#3 lore raw

PATCH 4/28 libsdl3: upgrade 3.2.26 -> 3.2.28

In reply to [email protected]

From: Wang Mingyu <[email protected]>

(cherry picked from commit 26e3ef119b00bf1910306a2153891140a3df2389)
---
 .../libsdl3/{libsdl3_3.2.26.bb => libsdl3_3.2.28.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-graphics/libsdl3/{libsdl3_3.2.26.bb => libsdl3_3.2.28.bb} (97%)
meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.28.bb renamed from meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.26.bb +1 -1
similarity index 97%
rename from meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.26.bb
rename to meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.28.bb
index 47751ed57b..98eebd30e8 100644
@@ -19,7 +19,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL3-${PV}.tar.gz"
 
 S = "${UNPACKDIR}/SDL3-${PV}"
 
-SRC_URI[sha256sum] = "dad488474a51a0b01d547cd2834893d6299328d2e30f479a3564088b5476bae2"
+SRC_URI[sha256sum] = "1330671214d146f8aeb1ed399fc3e081873cdb38b5189d1f8bb6ab15bbc04211"
 
 inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even
 
#4 lore raw

PATCH 5/28 usb-modeswitch-data: upgrade 20191128 -> 20251207

In reply to [email protected]

From: Wang Mingyu <[email protected]>

(cherry picked from commit 8f2c436db5b4e6ba59550ad63f73a61dd459ba45)
---
 ...eswitch-data_20191128.bb => usb-modeswitch-data_20251207.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/usb-modeswitch/{usb-modeswitch-data_20191128.bb => usb-modeswitch-data_20251207.bb} (84%)
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20251207.bb renamed from meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb +1 -1
similarity index 84%
rename from meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb
rename to meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20251207.bb
index 2dfcd886ca..3bced56f44 100644
@@ -7,7 +7,7 @@ inherit allarch
 DEPENDS += "tcl-native"
 
 SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9"
+SRC_URI[sha256sum] = "0bb12d64aee5e467c31af61a53fb828ff7aa59c54a82ca85eeede4c5690bfa66"
 
 do_install() {
     oe_runmake install DESTDIR=${D} RULESDIR=${D}/${nonarch_base_libdir}/udev/rules.d
#5 lore raw

PATCH 6/28 usb-modeswitch: upgrade 2.6.1 -> 2.6.2

In reply to [email protected]

From: Wang Mingyu <[email protected]>

0001-Fix-build-with-gcc-15.patch
removed since it's included in 2.6.2

(cherry picked from commit dfbe08b6c3d842bf4add77580a579f76a1cd4cee)
---
 .../0001-Fix-build-with-gcc-15.patch          | 51 -------------------
 ...witch_2.6.1.bb => usb-modeswitch_2.6.2.bb} |  6 +--
 2 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch
 rename meta-oe/recipes-support/usb-modeswitch/{usb-modeswitch_2.6.1.bb => usb-modeswitch_2.6.2.bb} (86%)
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch deleted +0 -51
deleted file mode 100644
index eb65beb686..0000000000
@@ -1,51 +0,0 @@
-From f497eef1f38bd79a96a13269f251f1413c54b790 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Tue, 25 Mar 2025 12:36:32 +0100
-Subject: [PATCH] Fix build with gcc-15
-
-* fixes:
-  http://errors.yoctoproject.org/Errors/Details/848747/
-
-usb_modeswitch.c: In function 'main':
-usb_modeswitch.c:573:28: error: too many arguments to function 'get_current_config_value'; expected 0, have 1
-  573 |         currentConfigVal = get_current_config_value(dev);
-      |                            ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~
-In file included from usb_modeswitch.c:59:
-usb_modeswitch.h:55:5: note: declared here
-   55 | int get_current_config_value();
-      |     ^~~~~~~~~~~~~~~~~~~~~~~~
-usb_modeswitch.c:775:52: error: too many arguments to function 'get_current_config_value'; expected 0, have 1
-  775 |                                 currentConfigVal = get_current_config_value(dev);
-      |                                                    ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~
-usb_modeswitch.h:55:5: note: declared here
-   55 | int get_current_config_value();
-      |     ^~~~~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Martin Jansa <[email protected]>
-Upstream-Status: Submitted [https://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=3122]
----
- usb_modeswitch.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/usb_modeswitch.c b/usb_modeswitch.c
-index 2d4c0aa..bfbcbfb 100644
---- a/usb_modeswitch.c
-+++ b/usb_modeswitch.c
-@@ -570,7 +570,7 @@ int main(int argc, char **argv)
- 	/* Get current configuration of default device, note value if Configuration
- 	 * parameter is set. Also sets active_config
- 	 */
--	currentConfigVal = get_current_config_value(dev);
-+	currentConfigVal = get_current_config_value();
- 	if (Configuration > -1) {
- 		SHOW_PROGRESS(output,"Current configuration number is %d\n", currentConfigVal);
- 	} else
-@@ -772,7 +772,7 @@ int main(int argc, char **argv)
- 	if (Configuration > 0) {
- 		if (currentConfigVal != Configuration) {
- 			if (switchConfiguration()) {
--				currentConfigVal = get_current_config_value(dev);
-+				currentConfigVal = get_current_config_value();
- 				if (currentConfigVal == Configuration) {
- 					SHOW_PROGRESS(output,"The configuration was set successfully\n");
- 				} else {
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.2.bb renamed from meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb +2 -4
similarity index 86%
rename from meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb
rename to meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.2.bb
index b6b720fe1e..af2b5b6491 100644
@@ -4,10 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=091556bd6d0154cd4c2d17a1bfc7380a"
 
 DEPENDS = "libusb1"
 
-SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2 \
-    file://0001-Fix-build-with-gcc-15.patch \
-"
-SRC_URI[sha256sum] = "5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34"
+SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "f7abd337784a9d1bd39cb8a587518aff6f2a43d916145eafd80b1b8b7146db66"
 
 inherit pkgconfig systemd
 
#6 lore raw

PATCH 7/28 minicoredumper: fix 2038 year problem in timestamp handling

In reply to [email protected]

From: Jiaying Song <[email protected]>

The minicoredumper has multiple 2038 year problems where 'long' type variables and strtol() function calls cause overflow on 32-bit systems when handling timestamps after 2038-01-19.

This leads to incorrect timestamp formatting in core dump directory names (e.g., sleep40s.20380119.031407+0000.598).

Fix by changing 'long timestamp' to 'time_t timestamp' and replacing strtol() with strtoll() to properly handle 64-bit timestamps on 32-bit systems.

(cherry picked from commit b5685fb375d01d2a146c1707a6f290fad195826f)
---
 ...8-year-problem-in-timestamp-handling.patch | 55 +++++++++++++++++++
 .../minicoredumper/minicoredumper_2.0.7.bb    |  1 +
 2 files changed, 56 insertions(+)
 create mode 100644 meta-oe/recipes-kernel/minicoredumper/files/0002-Fix-2038-year-problem-in-timestamp-handling.patch
meta-oe/recipes-kernel/minicoredumper/files/0002-Fix-2038-year-problem-in-timestamp-handling.patch new file +55 -0
new file mode 100644
index 0000000000..977f59b976
@@ -0,0 +1,55 @@
+From 0f80d5813679320b69ae1d2aefb58af1e0e2d269 Mon Sep 17 00:00:00 2001
+From: Jiaying Song <[email protected]>
+Date: Wed, 10 Dec 2025 14:22:00 +0800
+Subject: [PATCH] Fix 2038 year problem in timestamp handling
+
+The minicoredumper uses 'long' type for timestamp which causes
+overflow on 32-bit systems after 2038-01-19. This leads to
+incorrect timestamp formatting in core dump directory names.
+
+Change timestamp variable from 'long' to 'time_t' and use
+'strtoll' instead of 'strtol' to handle 64-bit timestamps
+properly on 32-bit systems.
+
+Upstream-Status: Submitted
+[https://github.com/diamon/minicoredumper/pull/24]
+
+Signed-off-by: Jiaying Song <[email protected]>
+---
+ src/minicoredumper/corestripper.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/minicoredumper/corestripper.c b/src/minicoredumper/corestripper.c
+index e9e3936..e52802e 100644
+--- a/src/minicoredumper/corestripper.c
++++ b/src/minicoredumper/corestripper.c
+@@ -617,7 +617,7 @@ static int init_di(struct dump_info *di, int argc, char *argv[])
+ 	if (*p != 0)
+ 		return 1;
+ 
+-	di->timestamp = strtol(argv[5], &p, 10);
++	di->timestamp = (time_t)strtoll(argv[5], &p, 10);
+ 	if (*p != 0)
+ 		return 1;
+ 
+@@ -3715,7 +3715,7 @@ static int do_all_dumps(struct dump_info *di, int argc, char *argv[])
+ 	bool live_dumper;
+ 	char *comm_base;
+ 	pid_t core_pid;
+-	long timestamp;
++	time_t timestamp;
+ 	char *comm;
+ 	char *exe;
+ 	char *p;
+@@ -3750,7 +3750,7 @@ static int do_all_dumps(struct dump_info *di, int argc, char *argv[])
+ 	if (*p != 0)
+ 		return 1;
+ 
+-	timestamp = strtol(argv[5], &p, 10);
++	timestamp = (time_t)strtoll(argv[5], &p, 10);
+ 	if (*p != 0)
+ 		return 1;
+ 
+-- 
+2.34.1
+
meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb +1 -0
index 4073381899..f68984b072 100644
@@ -16,6 +16,7 @@ SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \
            file://minicoredumper.init \
            file://run-ptest \
            file://0001-corestripper-Fix-uninitialized-warning.patch \
+           file://0002-Fix-2038-year-problem-in-timestamp-handling.patch \
            "
 
 
#7 lore raw

PATCH 8/28 vulkan-cts: upgrade 1.4.4.0 -> 1.4.4.2

In reply to [email protected]

From: Dmitry Baryshkov <[email protected]>

Upgrade Vulkan CTS to the point release, fixing several tests. While we are at it, refresh Vulkan-Video-Samples patches.

(cherry picked from commit 374949c531de346739efc4e8e7ca79d7b81f270a)
---
 ...01-decode-fix-build-on-ARMv7-targets.patch |  4 +-
 ...ing-for-non-NEON-enabled-ARM-targets.patch | 73 ++++++++++---------
 .../vk-gl-cts/vulkan-cts-sources.inc          |  2 +-
 ...n-cts_1.4.4.0.bb => vulkan-cts_1.4.4.2.bb} |  2 +-
 4 files changed, 45 insertions(+), 36 deletions(-)
 rename meta-oe/recipes-graphics/vk-gl-cts/{vulkan-cts_1.4.4.0.bb => vulkan-cts_1.4.4.2.bb} (94%)
meta-oe/recipes-graphics/vk-gl-cts/files/0001-decode-fix-build-on-ARMv7-targets.patch +3 -1
index d8680a292b..3c13ebe5c0 100644
@@ -9,8 +9,10 @@ Building NEON code on ARMv7 fails with the following error:
 
 Add missing vreinterpret call in order to fix that error.
 
+Fixes KhronosGroup/VK-GL-CTS#547
+
 Signed-off-by: Dmitry Baryshkov <[email protected]>
-Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Video-Samples/pull/109]
+Upstream-Status: Backport [https://github.com/KhronosGroup/Vulkan-Video-Samples/commit/1e665d0f5139114203e04a1398de8c94ef031fd7]
 ---
  vk_video_decoder/libs/NvVideoParser/src/NextStartCodeNEON.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-graphics/vk-gl-cts/files/0001-decode-fix-building-for-non-NEON-enabled-ARM-targets.patch +40 -33

113 lines not on this page · raw message

meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc +1 -1
index a403278699..89d052dbdf 100644
@@ -6,7 +6,7 @@
 RECIPE_UPGRADE_EXTRA_TASKS += "do_refresh_srcuri"
 
 python __anonymous() {
-    if d.getVar("PV") != "1.4.4.0":
+    if d.getVar("PV") != "1.4.4.2":
         bb.warn("-sources.inc out of date, run refresh_srcuri task")
 }
 
meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.4.2.bb renamed from meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.4.0.bb +1 -1
similarity index 94%
rename from meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.4.0.bb
rename to meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.4.2.bb
index 4d2f223a39..0ae7119535 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Vulkan CTS"
 
 require khronos-cts.inc
 
-SRCREV_vk-gl-cts = "03c0746a55b78eab63c664a11948b52419e1f309"
+SRCREV_vk-gl-cts = "aa481ab6eb66a1c74768fabec453ea6e60f0ee0e"
 
 require vulkan-cts-sources.inc
 
#8 lore raw

PATCH 9/28 microsoft-gsl: upgrade 4.2.0 -> 4.2.1

In reply to [email protected]

From: Wang Mingyu <[email protected]>

(cherry picked from commit 1d33fb39d9700a125a02d5bbd8292db2756b6f6c)
---
 .../{microsoft-gsl_4.2.0.bb => microsoft-gsl_4.2.1.bb}    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-devtools/microsoft-gsl/{microsoft-gsl_4.2.0.bb => microsoft-gsl_4.2.1.bb} (93%)
meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.2.1.bb renamed from meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.2.0.bb +4 -4
similarity index 93%
rename from meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.2.0.bb
rename to meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.2.1.bb
index 16a0af334d..87a8cbbb88 100644
@@ -8,10 +8,10 @@ HOMEPAGE = "https://github.com/microsoft/GSL"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=363055e71e77071107ba2bb9a54bd9a7"
 
-SRC_URI = "git://github.com/microsoft/GSL.git;protocol=https;branch=main \
-        file://run-ptest \
-"
-SRCREV = "2828399820ef4928cc89b65605dca5dc68efca6e"
+SRC_URI = "git://github.com/microsoft/GSL.git;protocol=https;branch=rel/4.2;tag=v${PV} \
+           file://run-ptest \
+           "
+SRCREV = "249146590e322123cd0b378b1f364d6069717687"
 
 inherit cmake pkgconfig ptest
 
#9 lore raw

PATCH 10/28 php: upgrade 8.4.16 -> 8.4.17

In reply to [email protected]

From: Ankur Tyagi <[email protected]>

Changelog: https://www.php.net/ChangeLog-8.php#8.4.17

---
 meta-oe/recipes-devtools/php/{php_8.4.16.bb => php_8.4.17.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-devtools/php/{php_8.4.16.bb => php_8.4.17.bb} (99%)
meta-oe/recipes-devtools/php/php_8.4.17.bb renamed from meta-oe/recipes-devtools/php/php_8.4.16.bb +1 -1
similarity index 99%
rename from meta-oe/recipes-devtools/php/php_8.4.16.bb
rename to meta-oe/recipes-devtools/php/php_8.4.17.bb
index 870cb663e6..72901f2a34 100644
@@ -32,7 +32,7 @@ UPSTREAM_CHECK_REGEX = "releases/tag/php-(?P<pver>\d+(\.\d+)+)"
 
 S = "${UNPACKDIR}/php-${PV}"
 
-SRC_URI[sha256sum] = "6c48c65eba6a2f7a102925d08772239b1f45110aed2187fdd81b933ed439c692"
+SRC_URI[sha256sum] = "ea67d83d72dd6f3abaaeae7f532f78fd12192861d96aba8e9eca3b2ddade42d2"
 
 CVE_STATUS_GROUPS += "CVE_STATUS_PHP"
 CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored."
#10 lore raw

PATCH 11/28 nodejs: remove extra CVE_PRODUCT

In reply to [email protected]

From: Gyorgy Sarvari <[email protected]>

CVE_PRODUCT is specified twice - the second instance only duplicates one value from the first instance.

Remove this extra CVE_PRODUCT.

(cherry picked from commit 6ff92524842233efb68eb92d4bf7637ef378900d)
---
 meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb +0 -2
index ca4001a04c..ccaf9f7bb2 100644
@@ -43,8 +43,6 @@ SRC_URI[sha256sum] = "487d73fd4db00dc2420d659a8221b181a7937fbc5bc73f31c30b1680ad
 
 S = "${UNPACKDIR}/node-v${PV}"
 
-CVE_PRODUCT += "node.js"
-
 # v8 errors out if you have set CCACHE
 CCACHE = ""
 
#11 lore raw

PATCH 12/28 cryptsetup: upgrade 2.8.1 -> 2.8.3

In reply to [email protected]

From: Wang Mingyu <[email protected]>

(cherry picked from commit 6f41c5872d9166aa1197ce1b51f8670561548353)
---
 .../cryptsetup/{cryptsetup_2.8.1.bb => cryptsetup_2.8.3.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_2.8.1.bb => cryptsetup_2.8.3.bb} (98%)
meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.1.bb +1 -1
similarity index 98%
rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.1.bb
rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.3.bb
index a77d488f44..44bf66c1ed 100644
@@ -24,7 +24,7 @@ DEPENDS:append:libc-musl = " argp-standalone"
 LDFLAGS:append:libc-musl = " -largp"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "2c3379eb76597dcab50911449b013e2697c4bffcc716dbbf0d9b0e8fbbb46fb4"
+SRC_URI[sha256sum] = "4a8a23b8b9d1a3250452e40acead4421a03e45a38954ad0595634f4266aa800f"
 
 inherit autotools gettext pkgconfig
 
#12 lore raw

PATCH 13/28 libdecor: upgrade 0.2.4 -> 0.2.5

In reply to [email protected]

From: Wang Mingyu <[email protected]>

Changelog:
https://gitlab.freedesktop.org/libdecor/libdecor/-/compare/0.2.4...0.2.5?from_project_id=18349

---
 .../libdecor/{libdecor_0.2.4.bb => libdecor_0.2.5.bb}           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-graphics/libdecor/{libdecor_0.2.4.bb => libdecor_0.2.5.bb} (94%)
meta-oe/recipes-graphics/libdecor/libdecor_0.2.5.bb renamed from meta-oe/recipes-graphics/libdecor/libdecor_0.2.4.bb +1 -1
similarity index 94%
rename from meta-oe/recipes-graphics/libdecor/libdecor_0.2.4.bb
rename to meta-oe/recipes-graphics/libdecor/libdecor_0.2.5.bb
index 8264b5b7ab..0fae3274c6 100644
@@ -12,7 +12,7 @@ DEPENDS = " \
     wayland-protocols \
 "
 
-SRCREV = "4d026d59edbf8e2e876c3f2c07c480f8840aa922"
+SRCREV = "149c6f0b05663aaa69fdf7f94be2483776d1a311"
 
 PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk+3', d)}"
 
#13 lore raw

PATCH 14/28 vboxguestdrivers: Upgrade to 7.2.4

In reply to [email protected]

From: Khem Raj <[email protected]>

This is a maintenance release. The following items were fixed or added:

GUI: Fixed VirtualBox VM Manager crash when host was resuming from sleep (​github:gh-121, ​github:gh-170)
GUI: Updated native language support for Traditional Chinese, Greek, Swedish, Hungarian and Indonesian translations
NAT: Fixed issue when multiple port forwarding rules affected NAT functionality (​github:gh-232)
Linux host and guest: Introduced initial support for kernel 6.18
Linux Guest Additions: Introduced additional fixes for RHEL 9.6 and 9.7 kernels (​github:GH-12)
Windows Guest Additions: Introduced additional fixes for issue when installation was failing in Windows XP SP2 guest (​github:GH-142)

Cc Bruce Ashfield <[email protected]>
(cherry picked from commit 0ecf2814b207cc25962a3949c8265d856a355ea0)
---
 .../{vboxguestdrivers_7.2.2.bb => vboxguestdrivers_7.2.4.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_7.2.2.bb => vboxguestdrivers_7.2.4.bb} (97%)
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.4.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.2.bb +1 -1
similarity index 97%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.2.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.4.bb
index 9b01964334..117cdc967e 100644
@@ -14,7 +14,7 @@ VBOX_NAME = "VirtualBox-${PV}"
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
 "
-SRC_URI[sha256sum] = "b0e63bfb855327aecf1122cda33390c33734e5ffed72f123f5edf786a8ce1393"
+SRC_URI[sha256sum] = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd"
 
 S ?= "${UNPACKDIR}/vbox_module"
 S:task-unpack = "${UNPACKDIR}/${VBOX_NAME}"
#14 lore raw

PATCH 15/28 smarty: extend CVE_PRODUCT

In reply to [email protected]

From: Gyorgy Sarvari <[email protected]>

Some CVEs assign smarty-php as the vendor to the corresponding CPE. E.g CVE-2024-35226[1] is tracked with smarty-php:smarty by mitre (NVD tracks it without CPE).

[1]: https://cveawg.mitre.org/api/cve/CVE-2024-35226

(cherry picked from commit 1aee6a403c1901bc7ae793a2f4581b3cdbd95c1d)
---
 meta-oe/recipes-support/smarty/smarty_5.6.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/smarty/smarty_5.6.0.bb +1 -1
index 88afc55c15..56b239e9c7 100644
@@ -34,4 +34,4 @@ FILES:${PN} += "${datadir}/php/smarty3/"
 
 RDEPENDS:${PN} = "php"
 
-CVE_PRODUCT = "smarty:smarty"
+CVE_PRODUCT = "smarty:smarty smarty-php:smarty"
#15 lore raw

PATCH 16/28 libsdl3-image: upgrade 3.2.4 -> 3.2.6

In reply to [email protected]

From: Wang Mingyu <[email protected]>

Release Notes:
https://github.com/libsdl-org/SDL_image/releases/tag/release-3.2.6

---
 .../libsdl3/{libsdl3-image_3.2.4.bb => libsdl3-image_3.2.6.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-graphics/libsdl3/{libsdl3-image_3.2.4.bb => libsdl3-image_3.2.6.bb} (87%)
meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.6.bb renamed from meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb +1 -1
similarity index 87%
rename from meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb
rename to meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.6.bb
index ac425f6ad2..7c2f4026f2 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
 DEPENDS = "tiff zlib libpng jpeg libsdl3 libwebp"
 
 SRC_URI = "git://github.com/libsdl-org/SDL_image.git;protocol=https;branch=release-3.2.x"
-SRCREV = "11154afb7855293159588b245b446a4ef09e574f"
+SRCREV = "d78dd65454f442bfdbc373201165f1ef579484ab"
 
 
 inherit cmake pkgconfig
#16 lore raw

PATCH 17/28 mozjs-128: Fix build error with arm and musl

In reply to [email protected]

From: Ankur Tyagi <[email protected]>

Build fails for qemuarm with musl with following error:
mozglue/misc/StackWalk.o: in function `unwind_callback(_Unwind_Context*, void*)':
| /usr/src/debug/mozjs-128/128.5.2/mozglue/misc/StackWalk.cpp:810:(.text._ZL15unwind_callbackP15_Unwind_ContextPv+0x4): undefined reference to `_Unwind_GetIP'

Referenced commit[1] for the fix, also refreshed patches.

[1] https://github.com/OSSystems/meta-browser/commit/bb8662912354dae13634c0ec35c3803c344b1e72

(cherry picked from commit 30942cebe8997dbadcd8bcd81ed0e55d42b48677)
---
 ...001-Cargo.toml-do-not-abort-on-panic.patch |  2 +-
 ...nfigure-do-not-look-for-llvm-objdump.patch |  2 +-
 ...o-not-try-to-find-a-suitable-upstrea.patch |  2 +-
 .../mozjs-128/0004-use-asm-sgidefs.h.patch    |  2 +-
 ...2.patch => 0005-Add-RISCV32-support.patch} |  2 +-
 ...x-one-occasionally-reproduced-confi.patch} |  2 +-
 ...ewrite-cargo-host-linker-in-python3.patch} |  2 +-
 ...e-stack-unwinder-like-glibc-therefo.patch} |  2 +-
 ...om-firefox-bugzilla-to-fix-compile-.patch} |  2 +-
 ...on-isn-t-available-in-ARMv5-or-v6-s.patch} |  2 +-
 ...ith-icu-uc-to-fix-build-with-ICU-76.patch} |  2 +-
 ...gc-and-riscv32gc-as-valid-architect.patch} | 38 ++++++++++++-------
 .../0013-Fix-build-error-with-musl.patch      | 30 +++++++++++++++
 .../mozjs/mozjs-128_128.5.2.bb                | 17 +++++----
 14 files changed, 75 insertions(+), 32 deletions(-)
 rename meta-oe/recipes-extended/mozjs/mozjs-128/{riscv32.patch => 0005-Add-RISCV32-support.patch} (97%)
 rename meta-oe/recipes-extended/mozjs/mozjs-128/{0001-util.configure-fix-one-occasionally-reproduced-confi.patch => 0006-util.configure-fix-one-occasionally-reproduced-confi.patch} (96%)
 rename meta-oe/recipes-extended/mozjs/mozjs-128/{0001-rewrite-cargo-host-linker-in-python3.patch => 0007-Rewrite-cargo-host-linker-in-python3.patch} (97%)
 rename meta-oe/recipes-extended/mozjs/mozjs-128/{musl-disable-stackwalk.patch => 0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch} (94%)
 rename meta-oe/recipes-extended/mozjs/mozjs-128/{0001-add-arm-to-list-of-mozinline.patch => 0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch} (95%)
 rename meta-oe/recipes-extended/mozjs/mozjs-128/{armv5.patch => 0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch} (93%)
 rename meta-oe/recipes-extended/mozjs/mozjs-128/{0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch => 0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch} (92%)
 rename meta-oe/recipes-extended/mozjs/mozjs-128/{riscv.patch => 0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch} (60%)
 create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0013-Fix-build-error-with-musl.patch
meta-oe/recipes-extended/mozjs/mozjs-128/0001-Cargo.toml-do-not-abort-on-panic.patch +1 -1
index 97a4439628..5c81126f0b 100644
@@ -1,4 +1,4 @@
-From ddd23f8547f3a56aa542924aa400d3535f734bff Mon Sep 17 00:00:00 2001
+From ffb7b90712189c9fa8634e4dc915c3afb4448d87 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 1 Oct 2021 13:00:24 +0200
 Subject: [PATCH] Cargo.toml: do not abort on panic
meta-oe/recipes-extended/mozjs/mozjs-128/0002-moz.configure-do-not-look-for-llvm-objdump.patch +1 -1
index 9a82acf77b..0616aa3ee7 100644
@@ -1,4 +1,4 @@
-From 1a5331f1997788e9a25bbc2b10eb14e2ee418be9 Mon Sep 17 00:00:00 2001
+From 0f885ae37ef7cd94fd0712cefb5d3314fbcfdf44 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 1 Oct 2021 13:01:10 +0200
 Subject: [PATCH] moz.configure: do not look for llvm-objdump
meta-oe/recipes-extended/mozjs/mozjs-128/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch +1 -1
index 40025fbc68..8367a62a39 100644
@@ -1,4 +1,4 @@
-From 2d7f06cdf631e4d4d94e9d8e33a953dc57672750 Mon Sep 17 00:00:00 2001
+From ca6cf215462de8f82fd27ad75eb20ac24fc0c512 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 1 Oct 2021 13:02:17 +0200
 Subject: [PATCH] rust.configure: do not try to find a suitable upstream target
meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch +1 -1
index eb3ff452b3..5832f36975 100644
@@ -1,4 +1,4 @@
-From 1691939a22ec12245f008993e0b9a1b1dfb91e9c Mon Sep 17 00:00:00 2001
+From af704b888a91fc3a0f88b0ef2f36de1faaf7d6e2 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <[email protected]>
 Date: Sat, 30 Apr 2016 15:29:06 -0700
 Subject: [PATCH] use <asm/sgidefs.h>
meta-oe/recipes-extended/mozjs/mozjs-128/0005-Add-RISCV32-support.patch renamed from meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch +1 -1
similarity index 97%
rename from meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-128/0005-Add-RISCV32-support.patch
index 67e23c5fcc..2359373999 100644
@@ -1,4 +1,4 @@
-From 0cc41bc953974d4852b263708bf8d12f823ca8ad Mon Sep 17 00:00:00 2001
+From 8b7f96cc479c99a286591ac6dcd0be19bcf83b15 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sun, 24 Oct 2021 22:32:50 -0700
 Subject: [PATCH] Add RISCV32 support
meta-oe/recipes-extended/mozjs/mozjs-128/0006-util.configure-fix-one-occasionally-reproduced-confi.patch renamed from meta-oe/recipes-extended/mozjs/mozjs-128/0001-util.configure-fix-one-occasionally-reproduced-confi.patch +1 -1
similarity index 96%
rename from meta-oe/recipes-extended/mozjs/mozjs-128/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-128/0006-util.configure-fix-one-occasionally-reproduced-confi.patch
index d53cc2bd41..9cc7831876 100644
@@ -1,4 +1,4 @@
-From 683cd23dd269509a1d913adb2b049b84771e0a94 Mon Sep 17 00:00:00 2001
+From 13b544e4ed51f41138bf200eb84552e169df87b0 Mon Sep 17 00:00:00 2001
 From: Changqing Li <[email protected]>
 Date: Thu, 11 Nov 2021 16:05:54 +0800
 Subject: [PATCH] util.configure: fix one occasionally reproduced configure
meta-oe/recipes-extended/mozjs/mozjs-128/0007-Rewrite-cargo-host-linker-in-python3.patch renamed from meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch +1 -1
similarity index 97%
rename from meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-128/0007-Rewrite-cargo-host-linker-in-python3.patch
index 94e1651b33..9d6a89214b 100644
@@ -1,4 +1,4 @@
-From 6f6b78628a8edc834aa147c87ebce3eb8e670e7a Mon Sep 17 00:00:00 2001
+From 31d56eba10e7cf856a2a118e0523633195fe9ea2 Mon Sep 17 00:00:00 2001
 From: Changqing Li <[email protected]>
 Date: Thu, 18 Nov 2021 07:16:39 +0000
 Subject: [PATCH] Rewrite cargo-host-linker in python3
meta-oe/recipes-extended/mozjs/mozjs-128/0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch renamed from meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch +1 -1
similarity index 94%
rename from meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-128/0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch
index 3d5452ce4d..91614291c7 100644
@@ -1,4 +1,4 @@
-From d96e9a40e9da9163e0a4b3475178fe30c26deb19 Mon Sep 17 00:00:00 2001
+From fae21326f717f1c0031f3ad0ff4c3112ffb3a936 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 22 Sep 2023 22:59:56 +0000
 Subject: [PATCH] Musl does not have stack unwinder like glibc therefore we can
meta-oe/recipes-extended/mozjs/mozjs-128/0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch renamed from meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch +1 -1
similarity index 95%
rename from meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-128/0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch
index 960b4593c2..a2e3c08edf 100644
@@ -1,4 +1,4 @@
-From 2d1fb35bd81acadc12cc077de86361ac59cee2f1 Mon Sep 17 00:00:00 2001
+From 7dc235e1558b087c69024ed40c6066bd8126f2a3 Mon Sep 17 00:00:00 2001
 From: Kai Kang <[email protected]>
 Date: Fri, 22 Sep 2023 22:59:59 +0000
 Subject: [PATCH] Backport patch from firefox bugzilla to fix compile error for
meta-oe/recipes-extended/mozjs/mozjs-128/0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch renamed from meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch +1 -1
similarity index 93%
rename from meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-128/0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch
index 564f423fb4..e2e935eb03 100644
@@ -1,4 +1,4 @@
-From 0dd6fdbf6a821898617f1bd8e57123be048c07f5 Mon Sep 17 00:00:00 2001
+From e94edc3eba7ea158806283d92ecd71ab87351838 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Mon, 16 Dec 2024 05:49:57 +0000
 Subject: [PATCH] The ISB instruction isn't available in ARMv5 or v6, so guard
meta-oe/recipes-extended/mozjs/mozjs-128/0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch renamed from meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch +1 -1
similarity index 92%
rename from meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-128/0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch
index 4fb7a28eeb..2d85e29005 100644
@@ -1,4 +1,4 @@
-From cbb5cc1022cc27edefc8eabbe21458cac9bda6fb Mon Sep 17 00:00:00 2001
+From 8290fd619582651334fbfdfe7be887d539ce0f2c Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sat, 23 Nov 2024 13:28:33 -0800
 Subject: [PATCH] Link with icu-uc to fix build with ICU-76
meta-oe/recipes-extended/mozjs/mozjs-128/0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch renamed from meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch +25 -13
similarity index 60%
rename from meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch
rename to meta-oe/recipes-extended/mozjs/mozjs-128/0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch
index cb2dc66525..9cdb9fe913 100644
@@ -1,12 +1,35 @@
-Recognise riscv64gc and riscv32gc as valid architectures
+From 93d586d712bf34c243c6174425c78d3ab274c6a0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 7 Jan 2025 15:17:16 -0800
+Subject: [PATCH] Recognise riscv64gc and riscv32gc as valid architectures
 
 Rust uses above for architecture in tuples
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <[email protected]>
+---
+ build/autoconf/config.sub                                     | 2 +-
+ .../mozbuild/test/configure/test_toolchain_configure.py       | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
+index 2c6a07ab3c..f7ee82380c 100755
+--- a/build/autoconf/config.sub
++++ b/build/autoconf/config.sub
+@@ -1236,7 +1236,7 @@ case $cpu-$vendor in
+ 			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+ 			| pru \
+ 			| pyramid \
+-			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
++			| riscv | riscv32 | riscv32be | riscv32gc | riscv64 | riscv64be | riscv64gc \
+ 			| rl78 | romp | rs6000 | rx \
+ 			| s390 | s390x \
+ 			| score \
+diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+index 1be0d02e54..a476d787b2 100644
 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
 +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
-@@ -1327,6 +1327,10 @@ class LinuxCrossCompileToolchainTest(Bas
+@@ -1327,6 +1327,10 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest):
          "mips-unknown-linux-gnu": big_endian + {"__mips__": 1},
          "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32},
          "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64},
@@ -17,14 +40,3 @@ Signed-off-by: Khem Raj <[email protected]>
          "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1},
      }
  
---- a/build/autoconf/config.sub
-+++ b/build/autoconf/config.sub
-@@ -1236,7 +1236,7 @@ case $cpu-$vendor in
- 			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
- 			| pru \
- 			| pyramid \
--			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
-+			| riscv | riscv32 | riscv32be | riscv32gc | riscv64 | riscv64be | riscv64gc \
- 			| rl78 | romp | rs6000 | rx \
- 			| s390 | s390x \
- 			| score \
meta-oe/recipes-extended/mozjs/mozjs-128/0013-Fix-build-error-with-musl.patch new file +30 -0
new file mode 100644
index 0000000000..1900c17f74
@@ -0,0 +1,30 @@
+From 0f903fa0be39e39083599306018fa7bd724dba9d Mon Sep 17 00:00:00 2001
+From: Ankur Tyagi <[email protected]>
+Date: Wed, 7 Jan 2026 20:26:53 +1300
+Subject: [PATCH] Fix build error with musl
+
+_Unwind_GetIP symbol is not implemented by musl, so use it only with libc.
+
+mozglue/misc/StackWalk.o: in function `unwind_callback(_Unwind_Context*, void*)':
+| /usr/src/debug/mozjs-128/128.5.2/mozglue/misc/StackWalk.cpp:810:(.text._ZL15unwind_callbackP15_Unwind_ContextPv+0x4): undefined reference to `_Unwind_GetIP'
+
+Reference: https://github.com/OSSystems/meta-browser/commit/bb8662912354dae13634c0ec35c3803c344b1e72
+Upstream-Status: Inappropriate [musl-specific]
+Signed-off-by: Ankur Tyagi <[email protected]>
+---
+ mozglue/misc/StackWalk.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp
+index d3d9208fdb..9f7155a4f7 100644
+--- a/mozglue/misc/StackWalk.cpp
++++ b/mozglue/misc/StackWalk.cpp
+@@ -696,7 +696,7 @@ MFBT_API bool MozDescribeCodeAddress(void* aPC,
+ //
+ // Changes to to OS/Architecture support here should be reflected in
+ // build/moz.configure/memory.configure
+-#elif HAVE_DLADDR &&                                           \
++#elif defined(__GLIBC__) && HAVE_DLADDR &&                     \
+     (HAVE__UNWIND_BACKTRACE || MOZ_STACKWALK_SUPPORTS_LINUX || \
+      MOZ_STACKWALK_SUPPORTS_MACOSX)
+ 
meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb +9 -8
index ceb81d07e5..fbbe3749ba 100644
@@ -8,14 +8,15 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire
            file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \
            file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \
            file://0004-use-asm-sgidefs.h.patch \
-           file://riscv32.patch \
-           file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \
-           file://0001-rewrite-cargo-host-linker-in-python3.patch  \
-           file://musl-disable-stackwalk.patch \
-           file://0001-add-arm-to-list-of-mozinline.patch \
-           file://armv5.patch \
-           file://0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \
-           file://riscv.patch \
+           file://0005-Add-RISCV32-support.patch \
+           file://0006-util.configure-fix-one-occasionally-reproduced-confi.patch \
+           file://0007-Rewrite-cargo-host-linker-in-python3.patch  \
+           file://0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch \
+           file://0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch \
+           file://0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch \
+           file://0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \
+           file://0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \
+           file://0013-Fix-build-error-with-musl.patch \
            "
 SRC_URI[sha256sum] = "25d633eb81499cbda44b8c64fa1c1a5879d55024b864ef495d4997154d68358f"
 
#17 lore raw

PATCH 18/28 libjxl: Fix build error with arm and musl

In reply to [email protected]

From: Ankur Tyagi <[email protected]>

Build fails for qemuarm with musl with following error:
/build/tmp/work/cortexa15t2hf-neon-poky-linux-musleabi/libjxl/0.11.1/sources/libjxl-0.11.1/lib/jxl/convolve_separable5.cc | error: out of range pc-relative fixup value

(cherry picked from commit 63ae47a70d6d81937f5122c535d890678ed3c13e)
---
 meta-oe/recipes-multimedia/libjxl/libjxl_0.11.1.bb | 3 +++
 1 file changed, 3 insertions(+)
meta-oe/recipes-multimedia/libjxl/libjxl_0.11.1.bb +3 -0
index 7b0a6db9fb..ad5b5d169b 100644
@@ -46,5 +46,8 @@ PACKAGECONFIG[sizeless-vectors] = "-DJPEGXL_ENABLE_SIZELESS_VECTORS=ON,-DJPEGXL_
 # lcms/src/cmsps2.c
 # error: out of range pc-relative fixup value
 CFLAGS:append:toolchain-clang:arm = " -fno-integrated-as"
+# lib/jxl/convolve_separable5.cc
+# error: out of range pc-relative fixup value
+CXXFLAGS:append:toolchain-clang:arm = " -fno-integrated-as"
 
 FILES:${PN} += "${libdir}/gdk-pixbuf-2.0 ${datadir}"
#18 lore raw

PATCH 19/28 libsdl3: upgrade 3.2.28 -> 3.2.30

In reply to [email protected]

From: Liu Yiding <[email protected]>

Changelog:
https://github.com/libsdl-org/SDL/releases/tag/release-3.2.30

(cherry picked from commit a524aaddaceabedcfba002550eaef0b5aa10e0eb)
---
 .../libsdl3/{libsdl3_3.2.28.bb => libsdl3_3.2.30.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-graphics/libsdl3/{libsdl3_3.2.28.bb => libsdl3_3.2.30.bb} (97%)
meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.30.bb renamed from meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.28.bb +1 -1
similarity index 97%
rename from meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.28.bb
rename to meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.30.bb
index 98eebd30e8..bb111050e1 100644
@@ -19,7 +19,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL3-${PV}.tar.gz"
 
 S = "${UNPACKDIR}/SDL3-${PV}"
 
-SRC_URI[sha256sum] = "1330671214d146f8aeb1ed399fc3e081873cdb38b5189d1f8bb6ab15bbc04211"
+SRC_URI[sha256sum] = "4c3b09330d866dc52eb65b66259a6684ad387252ca8c57901b3a2b534eb42e3d"
 
 inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even
 
#19 lore raw

PATCH 20/28 raptor2: set CVE_PRODUCT

In reply to [email protected]

From: Gyorgy Sarvari <[email protected]>

All relevant CVEs are files against these CPEs.

See CVE db query (zediious vendor is not relevant):

sqlite> select * from PRODUCTs where PRODUCT like '%raptor%' and vendor <> 'symantec' and product <> 'velociraptor'; CVE-2012-0037|librdf|raptor|||2.0.7|<

CVE-2017-18926|librdf|raptor_rdf_syntax_library|2.0.15|=||
CVE-2020-25713|librdf|raptor_rdf_syntax_library|2.0.15|=||
CVE-2023-49078|zediious|raptor-web|0.4.4|=||
CVE-2024-57822|librdf|raptor_rdf_syntax_library|||2.0.16|<=
CVE-2024-57823|librdf|raptor_rdf_syntax_library|||2.0.16|<=
(cherry picked from commit 15aca0b2fa03dc25f551e84d381295c89dae8253)
---
 meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb +2 -0
index 7014a28c02..03e57ce86f 100644
@@ -22,3 +22,5 @@ EXTRA_OECONF = " \
     --without-xml2-config \
     --without-xslt-config \
 "
+
+CVE_PRODUCT = "librdf:raptor_rdf_syntax_library librdf:raptor"
#20 lore raw

PATCH 21/28 libcereal: set CVE_PRODUCT

In reply to [email protected]

From: Gyorgy Sarvari <[email protected]>

The relevant CVEs are associated with usc:cereal CPE.

See CVE db query:

sqlite> select * from PRODUCTS where PRODUCT like '%cereal%';

CVE-2020-11104|usc|cereal|||1.3.0|<=
CVE-2020-11105|usc|cereal|||1.3.0|<=
(cherry picked from commit 6e936626cbccf6c17fc8b2d61fd2c7d4bcb022b5)
---
 meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +2 -0
index 7d4a352a31..914058b5d0 100644
@@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "\
     file://include/cereal/external/rapidjson/msinttypes/LICENSE;md5=dffce65b98c773976de2e338bd130f46 \
 "
 
+CVE_PRODUCT = "cereal"
+
 DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} "
 
 PROVIDES += "${PN}-dev"
#21 lore raw

PATCH 22/28 libsodium: patch CVE-2025-69277

In reply to [email protected]

From: Peter Marko <[email protected]>

Pick patch per [1].

[1] https://nvd.nist.gov/vuln/detail/CVE-2025-69277

(cherry picked from commit 264d8acc9232f68eb28703d5110b1b6ce6a3fb48)
---
 .../libsodium/libsodium/CVE-2025-69277.patch  | 61 +++++++++++++++++++
 .../libsodium/libsodium_1.0.20.bb             |  2 +
 2 files changed, 63 insertions(+)
 create mode 100644 meta-oe/recipes-crypto/libsodium/libsodium/CVE-2025-69277.patch
meta-oe/recipes-crypto/libsodium/libsodium/CVE-2025-69277.patch new file +61 -0
new file mode 100644
index 0000000000..a2ced62760
@@ -0,0 +1,61 @@
+From ad3004ec8731730e93fcfbbc824e67eadc1c1bae Mon Sep 17 00:00:00 2001
+From: Frank Denis <[email protected]>
+Date: Mon, 29 Dec 2025 23:22:15 +0100
+Subject: [PATCH] core_ed25519_is_valid_point: check Y==Z in addition to X==0
+
+CVE: CVE-2025-69277
+Upstream-Status: Backport [https://github.com/jedisct1/libsodium/commit/ad3004ec8731730e93fcfbbc824e67eadc1c1bae]
+Signed-off-by: Peter Marko <[email protected]>
+---
+ src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c | 5 ++++-
+ test/default/core_ed25519.c                             | 7 ++++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
+index d3020132..4b824f6d 100644
+--- a/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
++++ b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
+@@ -1141,10 +1141,13 @@ int
+ ge25519_is_on_main_subgroup(const ge25519_p3 *p)
+ {
+     ge25519_p3 pl;
++    fe25519    t;
+ 
+     ge25519_mul_l(&pl, p);
+ 
+-    return fe25519_iszero(pl.X);
++    fe25519_sub(t, pl.Y, pl.Z);
++
++    return fe25519_iszero(pl.X) & fe25519_iszero(t);
+ }
+ 
+ int
+diff --git a/test/default/core_ed25519.c b/test/default/core_ed25519.c
+index bc457493..02f72bd6 100644
+--- a/test/default/core_ed25519.c
++++ b/test/default/core_ed25519.c
+@@ -13,6 +13,10 @@ static const unsigned char max_canonical_p[32] = {
+     0xe4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+ };
++static const unsigned char not_main_subgroup_p[32] = {
++    0x95, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
++    0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99
++};
+ static const unsigned char L_p1[32] = {
+     0xee, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10
+@@ -133,11 +137,12 @@ main(void)
+     assert(crypto_core_ed25519_is_valid_point(p) == 0);
+ 
+     p[0] = 9;
+-    assert(crypto_core_ed25519_is_valid_point(p) == 1);
++    assert(crypto_core_ed25519_is_valid_point(p) == 0);
+ 
+     assert(crypto_core_ed25519_is_valid_point(max_canonical_p) == 1);
+     assert(crypto_core_ed25519_is_valid_point(non_canonical_invalid_p) == 0);
+     assert(crypto_core_ed25519_is_valid_point(non_canonical_p) == 0);
++    assert(crypto_core_ed25519_is_valid_point(not_main_subgroup_p) == 0);
+ 
+     memcpy(p2, p, crypto_core_ed25519_BYTES);
+     add_P(p2);
meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb +2 -0
index 63d21576b4..972b8b8694 100644
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c59be7bb29f8e431b5f2d690b6734185"
 SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz"
 SRC_URI[sha256sum] = "ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19"
 
+SRC_URI += "file://CVE-2025-69277.patch"
+
 inherit autotools
 
 BBCLASSEXTEND = "native nativesdk"
#22 lore raw

PATCH 23/28 asyncmqtt: set CVE_PRODUCT

In reply to [email protected]

From: Gyorgy Sarvari <[email protected]>

The CVEs are tracked with an underscore in the product name:

sqlite> select * from PRODUCTs where product like '%async%mq%'; CVE-2025-65503|redboltz|async_mqtt|10.2.5|=||

This patch sets the correct CVE_PRODUCT.

(cherry picked from commit 4da079d7f572efed610bdf1291e838d0a5fc45cc)
---
 meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.2.6.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.2.6.bb +2 -0
index 6a73543821..47de7a7344 100644
@@ -4,6 +4,8 @@ LICENSE = "BSL-1.0"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c"
 
+CVE_PRODUCT = "async_mqtt"
+
 SRC_URI = "git://github.com/redboltz/async_mqtt;protocol=http;branch=main;protocol=https;tag=${PV}"
 SRCREV = "cb3d37dc3432b9c03fe631eeba2d548de7457bf9"
 
#23 lore raw

PATCH 24/28 boinc-client: set CVE_PRODUCT

In reply to [email protected]

From: Gyorgy Sarvari <[email protected]>

The relevant CVEs are tracked with underscore in their name.

See CVE db query:
sqlite> select vendor, product, count(*) from PRODUCTs where product like '%boinc%' group by 1, 2; berkeley|boinc_client|2
berkeley|boinc_forum|1

universityofcalifornia|boinc_client|165
universityofcalifornia|boinc_server|5

Set the CVE_PRODUCT accordingly.

(cherry picked from commit 31de060b48c57194ea2e6c6844d746eb59a0d056)
---
 meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb | 3 +++
 1 file changed, 3 insertions(+)
meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb +3 -0
index 3e626f32d9..aed6fe6edd 100644
@@ -29,6 +29,9 @@ DEPENDS = "curl \
            ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+3 wxwidgets libnotify xcb-util libxscrnsaver', '', d)} \
            nettle \
 "
+
+CVE_PRODUCT = "boinc_client"
+
 SRCREV = "4774e1cbe0ad13cb9a6f7fffbb626a417316f61d"
 BRANCH = "client_release/7/7.20"
 SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \
#24 lore raw

PATCH 25/28 influxdb: ignore CVE-2024-30896

In reply to [email protected]

From: Ankur Tyagi <[email protected]>

As mentioned in the comment[1], vulnerability is in /api/v2/authorizations API which only exists in 2.x, 1.x is not affected.

Details: https://nvd.nist.gov/vuln/detail/CVE-2024-30896

[1] https://github.com/influxdata/influxdb/issues/24797#issuecomment-2514690740

(cherry picked from commit 2f1d7a8597596d8e51a6f6f3b62e7e5f153f6e73)
---
 meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb | 1 +
 1 file changed, 1 insertion(+)
meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +1 -0
index 5dd5644c4c..d8279492ac 100644
@@ -70,3 +70,4 @@ RDEPENDS:${PN} = "bash"
 RDEPENDS:${PN}-dev = "bash"
 
 CVE_STATUS[CVE-2019-10329] = "cpe-incorrect: Version does not match and only the Jenkins plugin is affected."
+CVE_STATUS[CVE-2024-30896] = "not-applicable-config: vulnerability only exists in version 2.x"
#25 lore raw

PATCH 26/28 boinc-client: mark CVE-2013-2018 patched

In reply to [email protected]

From: Gyorgy Sarvari <[email protected]>

Details: https://nvd.nist.gov/vuln/detail/CVE-2013-2018

According to oss-security email[1], version 7.0.45 included the fixes[2][3][4]

[1]: https://www.openwall.com/lists/oss-security/2013/04/29/11
[2]: https://github.com/BOINC/boinc/commit/6e205de096da83b12ffb2f0183b43e51261eb0c4
[3]: https://github.com/BOINC/boinc/commit/e8d6c33fe158129a5616e18eb84a7a9d44aca15f
[4]: https://github.com/BOINC/boinc/commit/ce3110489bc139b8218252ba1cb0862d69f72ae3

(cherry picked from commit 2a78ad8813845677132ad0f1552fcaa4961c3e15)
---
 meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb | 1 +
 1 file changed, 1 insertion(+)
meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb +1 -0
index aed6fe6edd..4cc0ed2da2 100644
@@ -31,6 +31,7 @@ DEPENDS = "curl \
 "
 
 CVE_PRODUCT = "boinc_client"
+CVE_STATUS[CVE-2013-2018] = "fixed-version: fixed in version 7.0.45 and later"
 
 SRCREV = "4774e1cbe0ad13cb9a6f7fffbb626a417316f61d"
 BRANCH = "client_release/7/7.20"
#26 lore raw

PATCH 27/28 lmdb: patch CVE-2026-22185

In reply to [email protected]

From: Gyorgy Sarvari <[email protected]>

Details: https://nvd.nist.gov/vuln/detail/CVE-2026-22185

Pick the patch that is mentioned as a solution in the related upstream bug[1].

[1]: https://bugs.openldap.org/show_bug.cgi?id=10421

(cherry picked from commit e0f86a4a7f8e413c682fbd4a9c01b12b0234cd71)
---
 .../lmdb/files/CVE-2026-22185.patch           | 31 +++++++++++++++++++
 meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb       |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta-oe/recipes-dbs/lmdb/files/CVE-2026-22185.patch
meta-oe/recipes-dbs/lmdb/files/CVE-2026-22185.patch new file +31 -0
new file mode 100644
index 0000000000..6c85b2b8ed
@@ -0,0 +1,31 @@
+From 94ca20e5aed5d8730e045bb945fa3485b28a7981 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <[email protected]>
+Date: Tue, 6 Jan 2026 20:52:25 +0000
+Subject: [PATCH] ITS#10421 mdb_load: check for malicious input
+
+From: Howard Chu <[email protected]>
+
+CVE: CVE-2026-22185
+Upstream-Status: Backport [https://github.com/LMDB/lmdb/commit/8e1fda85532a3c74276df38a42d234dcdfa1e40d]
+Signed-off-by: Gyorgy Sarvari <[email protected]>
+---
+ libraries/liblmdb/mdb_load.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c
+index d2a3cec..7eccf40 100644
+--- a/libraries/liblmdb/mdb_load.c
++++ b/libraries/liblmdb/mdb_load.c
+@@ -208,6 +208,12 @@ badend:
+ 
+ 	c1 = buf->mv_data;
+ 	len = strlen((char *)c1);
++	if (!len) {
++		/* This can only happen with an intentionally invalid input
++		 * with a NUL byte after the leading SPACE
++		 */
++		goto badend;
++	}
+ 	l2 = len;
+ 
+ 	/* Is buffer too short? */
meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb +1 -0
index 065c8559ff..29bfbb81fa 100644
@@ -12,6 +12,7 @@ SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1;protocol=https \
            file://run-ptest \
            file://0001-Makefile-use-libprefix-instead-of-libdir.patch \
            file://0001-make-set-soname-on-liblmdb.patch;patchdir=../.. \
+           file://CVE-2026-22185.patch;striplevel=3 \
            "
 
 SRCREV = "ce201088de95d26fc0da36ba805bf2ddc2ba74ff"
#27 lore raw

PATCH 28/28 xerces-c: set CVE_PRODUCT

In reply to [email protected]

From: Gyorgy Sarvari <[email protected]>

The related CVEs are tracked with "xerces-c\+\+" (sic).

See CVE db query:
sqlite> select vendor, product, count(*) from PRODUCTs where product like '%xerces%' group by 1, 2;

apache|xerces-c\+\+|29
apache|xerces-j|2
apache|xerces2_java|3
redhat|xerces|3

Set CVE_PRODUCT accordingly.

(cherry picked from commit 29a272744a314564035ec4a337704eb6d31e879e)
---
 meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb +2 -0
index 2819366dc9..102e329878 100644
@@ -9,6 +9,8 @@ SECTION =  "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
+CVE_PRODUCT = "xerces-c\+\+"
+
 SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2 \
     file://0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch \
 "