401 files changed, 6955 insertions, 12071 deletions
diff --git a/meta-filesystems/recipes-filesystems/burnia/libburn/0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch b/meta-filesystems/recipes-filesystems/burnia/libburn/0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch
deleted file mode 100644
index 6061352cb7..0000000000
--- a/meta-filesystems/recipes-filesystems/burnia/libburn/0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d537f9dd35282df834a311ead5f113af67d223b3 Mon Sep 17 00:00:00 2001
-From: Thomas Schmitt <scdbackup@gmx.net>
-Date: Tue, 26 Nov 2024 23:02:03 +0100
-Subject: [PATCH] Bug fix: Faulty signal handler prototype spoiled compilation
- under C23
-Upstream-Status: Backport [https://dev.lovelyhq.com/libburnia/libburn/commit/d537f9dd35282df834a311ead5f113af67d223b3]
---
- test/poll.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/test/poll.c b/test/poll.c
-index 660f384..cd5ff90 100644
--- a/test/poll.c
-+++ b/test/poll.c
-@@ -14,7 +14,7 @@ static struct burn_drive_info *drives;
- static unsigned int n_drives;
- int NEXT;
- 
-static void catch_int ()
-+static void catch_int (int signum)
- {
-        NEXT = 1;
- }
-- 
-2.34.1
diff --git a/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb b/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.8.bb
index e84a60a543..1e84d12a03 100644
--- a/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.6.bb
+++ b/meta-filesystems/recipes-filesystems/burnia/libburn_1.5.8.bb
@@ -5,10 +5,9 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
                    file://COPYRIGHT;md5=a91b9b862895b64e68e5b321873c9111"
-SRC_URI = "http://files.libburnia-project.org/releases/${BP}.tar.gz \
+SRC_URI = "http://files.libburnia-project.org/releases/${BP}.tar.gz"
-           file://0001-Bug-fix-Faulty-signal-handler-prototype-spoiled-comp.patch"
-SRC_URI[sha256sum] = "7295491b4be5eeac5e7a3fb2067e236e2955ffdc6bbd45f546466edee321644b"
+SRC_URI[sha256sum] = "8e24dd99f5b7cafbecf0116d61b619ee89098e20263e6f47c793aaf4a98d6473"
 inherit autotools pkgconfig lib_package
diff --git a/meta-filesystems/recipes-support/python3-pyfuse3/python3-pyfuse3_3.4.2.bb b/meta-filesystems/recipes-support/python3-pyfuse3/python3-pyfuse3_3.4.2.bb
new file mode 100644
index 0000000000..8ef6780788
--- /dev/null
+++ b/meta-filesystems/recipes-support/python3-pyfuse3/python3-pyfuse3_3.4.2.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Python bindings for libfuse3."
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=622e3d340933e3857b7561f37a2f412b"
+inherit pypi python_setuptools_build_meta python_pep517 cython pkgconfig
+SRC_URI[sha256sum] = "0a59031969c4ba51a5ec1b67f3c5c24f641a6a3f8119a86edad56debcb9084d9"
+DEPENDS = " \
+    fuse3 \
+    python3-setuptools-native \
+    python3-setuptools-scm-native \
+"
+RDEPENDS:${PN} = "python3-trio"
diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.124.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.126.bb
index b1e9d96b79..10e2c482a5 100644
--- a/meta-gnome/recipes-gimp/babl/babl_0.1.124.bb
+++ b/meta-gnome/recipes-gimp/babl/babl_0.1.126.bb
@@ -10,7 +10,7 @@ inherit setuptools3 gnomebase gobject-introspection vala
 DEPENDS += "lcms"
 SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz"
-SRC_URI[sha256sum] = "1b0d544ab6f409f2b1b5f677226272d1e8c6d373f2f453ee870bfc7e5dd4f1b1"
+SRC_URI[sha256sum] = "3f090f4b2a61fecf7c8dc60a5804bbc77cefd8d778af2ded059f0e367a52930e"
 FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}"
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch b/meta-gnome/recipes-gimp/gimp/gimp/0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch
new file mode 100644
index 0000000000..4eb6f9553d
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch
@@ -0,0 +1,47 @@
+From d00c3c9fb8267f53cf730b8441a7d7f904af5215 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Mon, 20 Apr 2026 09:14:50 +0200
+Subject: [PATCH] meson.build: dont check for python3-pygobject gexiv2 support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+We only provide support for gexiv2 in python3-pygobject for the target, but
+unfortunately this feature is being requested for the native version, which
+would require gexiv2-native to be compilable — something I consider quite
+hard to achieve and maybe also not desirable at all.
+Remove the test for this feature, since we know that our target provides it.
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+Upstream-Status: Inappropriate [oe-specific]
+---
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/meson.build b/meson.build
+index 4f6f8ce9a4..4509cd2c39 100644
+--- a/meson.build
+++ b/meson.build
+@@ -1224,7 +1224,7 @@ foreach py : py_candidates
+                                         '''except (ImportError):''',
+                                         '''    sys.exit(1)''']),
+                                         check: false).returncode() == 0
+-    if pygobject_found.returncode() == 0 and pygobject_found.stdout().strip().version_compare(pygobject_minver) and pygobject_gexiv2_found
+    if pygobject_found.returncode() == 0 and pygobject_found.stdout().strip().version_compare(pygobject_minver)
+       break
+     endif
+   endif
+@@ -1235,7 +1235,7 @@ if not python.found() or not python.language_version().version_compare(python3_m
+ endif
+ message('Found Python @0@'.format(python.language_version()))
+ 
+-if pygobject_found.returncode() != 0 or not pygobject_found.stdout().strip().version_compare(pygobject_minver) or not pygobject_gexiv2_found
+if pygobject_found.returncode() != 0 or not pygobject_found.stdout().strip().version_compare(pygobject_minver)
+   error('No suitable PyGObject (with GExiv2 submodule) found. Minimum supported version: @0@'.format(pygobject_minver))
+ endif
+ message('Found PyGObject: @0@'.format(pygobject_found.stdout().strip()))
+-- 
+2.53.0
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0005-docs-meson.build-disable-gimprc-man-build.patch b/meta-gnome/recipes-gimp/gimp/gimp/0005-docs-meson.build-disable-gimprc-man-build.patch
new file mode 100644
index 0000000000..91e7f92336
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0005-docs-meson.build-disable-gimprc-man-build.patch
@@ -0,0 +1,33 @@
+From 47948d14777438ca5e8619a1f9293db28af88305 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Mon, 20 Apr 2026 09:24:38 +0200
+Subject: [PATCH] docs/meson.build: disable gimprc man build
+This would require a native variant of gimp-console
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+Upstream-Status: Inappropriate [oe-specific]
+---
+ docs/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/docs/meson.build b/docs/meson.build
+index 70b57b52ef..d36e47dbb5 100644
+--- a/docs/meson.build
+++ b/docs/meson.build
+@@ -16,9 +16,9 @@ gimprc_man = custom_target('gimprc-' + gimp_app_version + '.5',
+                            command: [ gimp_exe, '--no-interface',
+                                       '--dump-gimprc-manpage' ],
+                            capture: true,
+-                           build_by_default: true,
+                           build_by_default: false,
+                            env: gimp_run_env,
+-                           install: true,
+                           install: false,
+                            install_dir: get_option('mandir') / 'man5')
+ 
+ gimptool_man = configure_file(input : 'gimptool.1.in',
+-- 
+2.53.0
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.2.4.bb
index 1b092eb7e5..82c68346eb 100644
--- a/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb
+++ b/meta-gnome/recipes-gimp/gimp/gimp_3.2.4.bb
@@ -37,6 +37,7 @@ DEPENDS = " \
    poppler \
    poppler-data \
    python3-pygobject-native \
+    python3-pycairo-native \
    tiff \
    xz \
    zlib \
@@ -62,8 +63,10 @@ SRC_URI = "https://download.gimp.org/gimp/v3.2/${BP}.tar.xz \
           file://0001-meson.build-dont-check-for-lgi.patch \
           file://0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch \
           file://0003-meson.build-reproducibility-fix.patch \
+           file://0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch \
+           file://0005-docs-meson.build-disable-gimprc-man-build.patch \
 "
-SRC_URI[sha256sum] = "2618391416e51be3c693df9ef90e3860ed72ab3d36363ea1f196e30b75b2e083"
+SRC_URI[sha256sum] = "7312bc53e9c6d2d0056ca7b93f1c6b98707946dd934f714c21b8746ecb601588"
 PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib"
 PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
@@ -132,7 +135,7 @@ do_install:prepend() {
 FILES:${PN} += "${datadir}/metainfo"
-RDEPENDS:${PN} = "mypaint-brushes glib-networking python3-pygobject"
+RDEPENDS:${PN} = "mypaint-brushes glib-networking python3-pygobject python3-pycairo"
 CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux"
 CVE_STATUS[CVE-2025-8672] = "not-applicable-config: the vulnerability only affects MacOS"
diff --git a/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb b/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb
index 8e78162991..62073ebd13 100644
--- a/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb
+++ b/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb
@@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
 inherit gnomebase gobject-introspection vala itstool gtk-icon-cache gsettings gnome-help gtk-doc
-REQUIRED_DISTRO_FEATURES = "opengl"
+# x11 is needed due to libcanberra dependency which does not compile
+# gtk3 support with out it and cheese look for
+# | aarch64-yoe-linux-ld.lld: error: unable to find library -lcanberra-gtk3
+REQUIRED_DISTRO_FEATURES = "opengl x11"
 SRC_URI += "file://0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch"
diff --git a/meta-gnome/recipes-gnome/eog/eog_49.1.bb b/meta-gnome/recipes-gnome/eog/eog_49.3.bb
index 202d68700a..d67c3733af 100644
--- a/meta-gnome/recipes-gnome/eog/eog_49.1.bb
+++ b/meta-gnome/recipes-gnome/eog/eog_49.3.bb
@@ -13,7 +13,6 @@ DEPENDS = " \
    libpeas-1 \
    libportal \
    libexif \
-    lcms \
 "
@@ -22,7 +21,11 @@ inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg fea
 # FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used.
 REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data"
-SRC_URI[archive.sha256sum] = "fadd12e14ba9cd2be6989dfbcef40001645b63440ceed8e04867b07587b066dc"
+SRC_URI[archive.sha256sum] = "6b4e69c7a8086ae85d556ca4a24daa665b5622c4097e1ee59564bff4cc963124"
+PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','cms', '', d)}"
+PACKAGECONFIG[cms] = "-Dcms=true,-Dcms=false,lcms"
 GTKDOC_MESON_OPTION = "gtk_doc"
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_50.0.bb b/meta-gnome/recipes-gnome/gedit/gedit_50.0.bb
index 92685f085a..d15ab8665d 100644
--- a/meta-gnome/recipes-gnome/gedit/gedit_50.0.bb
+++ b/meta-gnome/recipes-gnome/gedit/gedit_50.0.bb
@@ -23,7 +23,7 @@ inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc get
 def gnome_verdir(v):
    return oe.utils.trim_version(v, 1)
-SRC_URI = "git://gitlab.gnome.org/World/gedit/gedit.git;protocol=https;branch=master;tag=${PV}"
+SRC_URI = "gitsm://gitlab.gnome.org/World/gedit/gedit.git;protocol=https;branch=master;tag=${PV}"
 SRCREV = "25d0bf0c3c40b0866fc23ec875f0af6c67f728ef"
 # gobject-introspection is mandatory and cannot be configured
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.4.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.4.1.bb
index 05c30a1e35..87006cc564 100644
--- a/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.4.0.bb
+++ b/meta-gnome/recipes-gnome/gedit/libgedit-gfls_0.4.1.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 gtk+3"
 inherit gobject-introspection features_check gtk-doc gnomebase
 SRC_URI = "git://gitlab.gnome.org/World/gedit/libgedit-gfls.git;branch=main;protocol=https;tag=${PV}"
-SRCREV = "b292896adfb1c371aa8db0819f4754ff3bf4a848"
+SRCREV = "ce4b836dfda4ea3f594b9ded7b60c5cb51ccbc87"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.58.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.58.1.bb
index 62f67460b0..6b80df7781 100644
--- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.58.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.58.1.bb
@@ -8,7 +8,7 @@ REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'goabackend',
 DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr keyutils"
-SRC_URI[archive.sha256sum] = "344d4dff9149a1adc4539417193e1eccc2f76ef40ac24e104ccf58072be55999"
+SRC_URI[archive.sha256sum] = "9ec1900cc51409c2067c07c828c10be06fe3bf68d2999bb72d7d5ed325ed9bbc"
 PACKAGECONFIG ?= "goabackend kerberos owncloud google"
diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.7.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.10.bb
index 8e82b86285..58aefbff2e 100644
--- a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.7.bb
+++ b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.10.bb
@@ -6,6 +6,8 @@ DEPENDS = " \
    glib-2.0 \
    glib-2.0-native \
    bison-native \
+    desktop-file-utils-native \
+    exiv2 \
    gtk+3 \
    gsettings-desktop-schemas \
    zlib \
@@ -13,21 +15,16 @@ DEPENDS = " \
    json-glib \
 "
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'colord', '', d)} exiv2 gstreamer lcms libjxl libraw librsvg libwebp"
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'colord', '', d)} gstreamer lcms libjxl libraw librsvg libwebp"
 PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,gstreamer1.0 gstreamer1.0-plugins-base"
 PACKAGECONFIG[libwebp] = "-Dlibwebp=true,-Dlibwebp=false,libwebp"
 PACKAGECONFIG[libjxl] = "-Dlibjxl=true,-Dlibjxl=false,libjxl"
 PACKAGECONFIG[lcms] = "-Dlcms2=true,-Dlcms2=false,lcms"
 PACKAGECONFIG[colord] = "-Dcolord=true,-Dcolord=false,colord"
-PACKAGECONFIG[exiv2] = "-Dexiv2=true,-Dexiv2=false,exiv2"
 PACKAGECONFIG[librsvg] = "-Dlibrsvg=true,-Dlibrsvg=false,librsvg"
 PACKAGECONFIG[libraw] = "-Dlibraw=true,-Dlibraw=false,libraw"
-# webservices would require libsecret and webkitgtk3 built with deprecated libsoup2
+inherit gnomebase gnome-help gsettings itstool gtk-icon-cache mime-xdg
-EXTRA_OEMESON += "-Dwebservices=false -Dlibsecret=false"
+SRC_URI[archive.sha256sum] = "3222344653cd6fb5d7981b73951ae3d90c414f74220a8b1c8665b25574284c75"
-inherit gnomebase gnome-help gsettings itstool mime-xdg
-SRC_URI[archive.sha256sum] = "ee12d24cf231010241f758d6c95b9d53a7381278fa76b6a518b3d09b371efaec"
 FILES:${PN} += "${datadir}/metainfo"
diff --git a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch
deleted file mode 100644
index 9fb2cd6814..0000000000
--- a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 71804c06c7179333f44b57e04ba268f37fe54f62 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 13 Jul 2017 09:01:04 -0700
-Subject: [PATCH] pypredict/lm: Define error API if platform does not have it
-error() API is not implemented across all libcs on linux
-e.g. musl does not provide it.
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- Onboard/pypredict/lm/lm.cpp         |  1 -
- Onboard/pypredict/lm/lm.h           | 13 +++++++++++++
- Onboard/pypredict/lm/lm_dynamic.cpp |  2 --
- 3 files changed, 13 insertions(+), 3 deletions(-)
-diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp
-index 2e642965..37ae241e 100644
--- a/Onboard/pypredict/lm/lm.cpp
-+++ b/Onboard/pypredict/lm/lm.cpp
-@@ -19,7 +19,6 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
-#include <error.h>
- #include <algorithm>
- #include <cmath>
- #include <string>
-diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h
-index ed4164a4..b8b63ee8 100644
--- a/Onboard/pypredict/lm/lm.h
-+++ b/Onboard/pypredict/lm/lm.h
-@@ -32,6 +32,19 @@
- #include <algorithm>
- #include <string>
- 
-+#if defined(HAVE_ERROR_H)
-+#include <error.h>
-+#else
-+#include <err.h>
-+#define _onboard_error(S, E, F, ...) do { \
-+       if (E) \
-+               err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
-+       else \
-+               err(S, F, ##__VA_ARGS__); \
-+} while(0)
-+
-+#define error _onboard_error
-+#endif
- 
- // break into debugger
- // step twice to come back out of the raise() call into known code
-diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp
-index 7c628240..e7c7f40e 100644
--- a/Onboard/pypredict/lm/lm_dynamic.cpp
-+++ b/Onboard/pypredict/lm/lm_dynamic.cpp
-@@ -17,8 +17,6 @@
-  * along with this program. If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-#include <error.h>
-
- #include "lm_dynamic.h"
- 
- using namespace std;
-- 
-2.34.1
diff --git a/meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb b/meta-gnome/recipes-support/onboard/onboard_1.4.4-1.bb
index d544f169f8..a069fb692e 100644
--- a/meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb
+++ b/meta-gnome/recipes-support/onboard/onboard_1.4.4-1.bb
@@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e \
                    file://COPYING.BSD3;md5=f56403ae5b2d6b82ad136d753c05a82e \
                   "
-SRC_URI = "git://github.com/onboard-osk/onboard.git;protocol=https;branch=main \
+SRC_URI = "git://github.com/onboard-osk/onboard.git;protocol=https;branch=main;tag=${PV} \
-           file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \
           file://0002-toggle-onboard-hoverclick-use-bin-sh-default-shell-i.patch \
          "
-SRCREV = "350f7643576bc8c5f2cff9c6ddce0e1e7cff995d"
+SRCREV = "02b19e2aee88e4bf2cdc7094813ddd4a6c05d1e7"
 inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings mime-xdg
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0002-fix-broken-symlink-in-dracut-config-examples.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0002-fix-broken-symlink-in-dracut-config-examples.patch
deleted file mode 100644
index e2c202a079..0000000000
--- a/meta-initramfs/recipes-devtools/dracut/dracut/0002-fix-broken-symlink-in-dracut-config-examples.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From e01991f1d55d4d1327793790bad3724b89952704 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Thu, 22 May 2025 18:07:27 +0800
-Subject: [PATCH 2/2] fix broken symlink in dracut config examples
-Due to commit [1], it installs dracut config examples under /usr.
-But while enable_test=no, the symlink of test in dracut config is broken
-...
-root@qemux86-64:~# ls /usr/lib/dracut/dracut.conf.d/test*  -ahl
-lrwxrwxrwx 1 root root 27 Apr  5  2011 /usr/lib/dracut/dracut.conf.d/test -> ../test/dracut.conf.d/test/
-lrwxrwxrwx 1 root root 36 Apr  5  2011 /usr/lib/dracut/dracut.conf.d/test-makeroot -> ../test/dracut.conf.d/test-makeroot/
-lrwxrwxrwx 1 root root 31 Apr  5  2011 /usr/lib/dracut/dracut.conf.d/test-root -> ../test/dracut.conf.d/test-root
-root@qemux86-64:~# realpath /usr/lib/dracut/dracut.conf.d/test*
-realpath: /usr/lib/dracut/dracut.conf.d/test: No such file or directory
-realpath: /usr/lib/dracut/dracut.conf.d/test-makeroot: No such file or directory
-realpath: /usr/lib/dracut/dracut.conf.d/test-root: No such file or directory
-...
-This commit cleans up test symlink if enable_test=no
-[1] https://github.com/dracut-ng/dracut-ng/commit/0d369e3e30935dffe48dfff1e90463868e7f804a
-Upstream-Status: Submitted [https://github.com/dracut-ng/dracut-ng/pull/1344]
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/Makefile b/Makefile
-index 3a40594b..df7956ab 100644
--- a/Makefile
-+++ b/Makefile
-@@ -218,6 +218,7 @@ ifeq ($(enable_test),yes)
-        done
- else
-        rm -rf $(DESTDIR)$(pkglibdir)/modules.d/70test*
-+       rm -rf $(DESTDIR)$(pkglibdir)/dracut.conf.d/test*
- endif
- ifneq ($(enable_documentation),no)
-        for i in $(man1pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man1/$${i##*/}; done
-- 
-2.47.3
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_109.bb b/meta-initramfs/recipes-devtools/dracut/dracut_110.bb
index ee6dce4576..d5ca94add8 100644
--- a/meta-initramfs/recipes-devtools/dracut/dracut_109.bb
+++ b/meta-initramfs/recipes-devtools/dracut/dracut_110.bb
@@ -7,10 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PE = "1"
-SRCREV = "13c5e5feee9ba86b960d351f87aa0eb25f242ff0"
+SRCREV = "25bf13842a5c55f4a5ab1523e005b3b11b9ac38e"
-SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main;tag=${PV} \
+SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main;tag=${PV}"
-           file://0002-fix-broken-symlink-in-dracut-config-examples.patch \
-           "
 DEPENDS += "kmod"
 DEPENDS:append:libc-musl = " fts"
diff --git a/meta-multimedia/recipes-multimedia/fswebcam/fswebcam_20200725.bb b/meta-multimedia/recipes-multimedia/fswebcam/fswebcam_20200725.bb
index bdda35df40..bc4f324da5 100644
--- a/meta-multimedia/recipes-multimedia/fswebcam/fswebcam_20200725.bb
+++ b/meta-multimedia/recipes-multimedia/fswebcam/fswebcam_20200725.bb
@@ -18,4 +18,7 @@ DEPENDS = "gd"
 SRC_URI = "git://github.com/fsphil/fswebcam.git;protocol=https;branch=master;tag=${PV}"
 SRCREV = "db35d4bbd336885a44f017ff142bc9523dbdce3c"
+# Compile gd with PACKAGECONFIG fontconfig for easier font selection
+RRECOMMENDS:${PN} = "ttf-dejavu-sans"
 inherit autotools-brokensep
diff --git a/meta-multimedia/recipes-multimedia/libavif/libavif_1.3.0.bb b/meta-multimedia/recipes-multimedia/libavif/libavif_1.3.0.bb
deleted file mode 100644
index 44f5c1819a..0000000000
--- a/meta-multimedia/recipes-multimedia/libavif/libavif_1.3.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SUMMARY = "This library aims to be a friendly, portable C implementation of the AV1 Image File Format"
-HOMEPAGE = "https://github.com/AOMediaCodec/libavif"
-SECTION = "libs"
-# Most is the code is under BSD-2, but libyuv is under BSD-3, and iccjpeg is under IJG
-LICENSE = "BSD-2-Clause & BSD-3-Clause & IJG"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=51549db0941829faeedcc86efec2f4c0"
-SRC_URI = "git://github.com/AOMediaCodec/libavif.git;protocol=https;branch=main;tag=v${PV}"
-SRCREV = "1aadfad932c98c069a1204261b1856f81f3bc199"
-DEPENDS = "dav1d"
-inherit cmake
-EXTRA_OECMAKE += "-DAVIF_CODEC_DAV1D=ON -DAVIF_LIBYUV=OFF"
diff --git a/meta-multimedia/recipes-multimedia/libavif/libavif_1.4.1.bb b/meta-multimedia/recipes-multimedia/libavif/libavif_1.4.1.bb
new file mode 100644
index 0000000000..77b81fffbf
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/libavif/libavif_1.4.1.bb
@@ -0,0 +1,33 @@
+SUMMARY = "This library aims to be a friendly, portable C implementation of the AV1 Image File Format"
+HOMEPAGE = "https://github.com/AOMediaCodec/libavif"
+SECTION = "libs"
+# Most is the code is under BSD-2, but libyuv is under BSD-3, and iccjpeg is under IJG
+LICENSE = "BSD-2-Clause & BSD-3-Clause & IJG"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=51549db0941829faeedcc86efec2f4c0"
+SRC_URI = "git://github.com/AOMediaCodec/libavif.git;protocol=https;branch=main;tag=v${PV};name=libavif"
+SRC_URI += "git://github.com/kmurray/libargparse.git;protocol=https;nobranch=1;name=libargparse;subdir=${S}/ext/libargparse"
+SRC_URI += "git://chromium.googlesource.com/libyuv/libyuv;protocol=https;nobranch=1;name=libyuv;subdir=${S}/ext/libyuv"
+SRCREV_libavif = "6543b22b5bc706c53f038a16fe515f921556d9b3"
+SRCREV_libargparse = "ee74d1b53bd680748af14e737378de57e2a0a954"
+SRCREV_libyuv = "6067afde563c3946eebd94f146b3824ab7a97a9c"
+SRCREV_FORMAT = "libavif"
+DEPENDS = "nasm-native"
+inherit cmake pkgconfig
+EXTRA_OECMAKE += " \
+    -DAVIF_BUILD_MAN_PAGES=OFF \
+    -DAVIF_CODEC_RAV1E=OFF \
+    -DAVIF_LIBYUV=LOCAL \
+"
+PACKAGECONFIG ?= "dav1d gdk-pixbuf"
+PACKAGECONFIG[apps] = "-DAVIF_BUILD_APPS=ON -DAVIF_LIBXML2=SYSTEM,-DAVIF_BUILD_APPS=OFF -DAVIF_LIBXML2=OFF,zlib libjpeg-turbo libpng libwebp libxml2"
+PACKAGECONFIG[gdk-pixbuf] = "-DAVIF_BUILD_GDK_PIXBUF=ON,-DAVIF_BUILD_GDK_PIXBUF=OFF,gdk-pixbuf"
+PACKAGECONFIG[aom] = "-DAVIF_CODEC_AOM=SYSTEM,-DAVIF_CODEC_AOM=OFF,aom"
+PACKAGECONFIG[dav1d] = "-DAVIF_CODEC_DAV1D=SYSTEM,-DAVIF_CODEC_DAV1D=OFF,dav1d"
+PACKAGECONFIG[svt] = "-DAVIF_CODEC_SVT=SYSTEM,-DAVIF_CODEC_SVT=OFF,svt-av1"
+FILES:${PN} += "${libdir}/gdk-pixbuf-2.0 ${datadir}"
diff --git a/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_6.1.1.bb b/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_6.1.1.bb
index 766ee02ca2..cc305f4041 100644
--- a/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_6.1.1.bb
+++ b/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_6.1.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "libdvdread"
-SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.bz2"
+SRC_URI = "https://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.bz2"
 SRC_URI[md5sum] = "46c46cb0294fbd1fcb8a0181818dad15"
 SRC_URI[sha256sum] = "c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48"
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.9.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.9.bb
index cb6bd1569f..0c3d672949 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.9.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.24.9.bb
@@ -24,7 +24,7 @@ SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https;t
 SRCREV = "7a9afa059e95668c912f779219ee8fe1e44dd2aa"
-EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)} \
+EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_user_unitdir}', '-Dsystemd=disabled', d)} \
    -Dadplug=disabled \
    -Dsndio=disabled \
    -Dshine=disabled \
@@ -93,6 +93,8 @@ do_install:append() {
    rm -rf ${D}${datadir}/icons
 }
+FILES:${PN} += "${systemd_user_unitdir}"
 RPROVIDES:${PN} += "${PN}-systemd"
 RREPLACES:${PN} += "${PN}-systemd"
 RCONFLICTS:${PN} += "${PN}-systemd"
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch b/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch
deleted file mode 100644
index 6ded1c15f8..0000000000
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c847b8162959c29b783585e0dcadbfb096e7cb73 Mon Sep 17 00:00:00 2001
-From: Ripley Tom <discofan420@protonmail.com>
-Date: Sat, 21 Feb 2026 19:33:11 +0100
-Subject: [PATCH] spa/plugins/alsa/acp/compat.h: Fix missed
- -Wdiscarded-qualifiers warning
-Upstream-Status: Backport [https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c847b8162959c29b783585e0dcadbfb096e7cb73]
-Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
- spa/plugins/alsa/acp/compat.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/spa/plugins/alsa/acp/compat.h b/spa/plugins/alsa/acp/compat.h
-index f7592e1a6..0f7b959df 100644
--- a/spa/plugins/alsa/acp/compat.h
-+++ b/spa/plugins/alsa/acp/compat.h
-@@ -429,9 +429,9 @@ static PA_PRINTF_FUNC(1,0) inline char *pa_vsprintf_malloc(const char *fmt, va_l
- 
- #define pa_fopen_cloexec(f,m)  fopen(f,m"e")
- 
-static inline char *pa_path_get_filename(const char *p)
-+static inline const char *pa_path_get_filename(const char *p)
- {
-    char *fn;
-+    const char *fn;
-     if (!p)
-         return NULL;
-     if ((fn = strrchr(p, PA_PATH_SEP_CHAR)))
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.6.2.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.6.3.bb
index 1e5e5f0399..82cd928b4a 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.6.2.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.6.3.bb
@@ -12,10 +12,9 @@ LIC_FILES_CHKSUM = " \
 DEPENDS = "dbus ncurses"
-SRCREV = "95da54a482b68475958bbc3fa572a9c20df0df74"
+SRCREV = "cc3d0d1191266b263f6d0fa03fce1d1ef57151cc"
 BRANCH = "${@oe.utils.trim_version('${PV}', 2)}"
 SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=${BRANCH};protocol=https;tag=${PV}"
-SRC_URI += "file://0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch"
 SRC_URI += "file://0002-spa-plugins-alsa-acp-compat.h-p-is-already-const-do-.patch"
 inherit meson pkgconfig systemd gettext useradd
diff --git a/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb b/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
index 1600d9d3ef..480c132473 100644
--- a/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
+++ b/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
@@ -20,6 +20,8 @@ SRC_URI[sha256sum] = "c1d75f2e9c7b38fd4695be66eff4533395248132f3cc61f375196403c4
 inherit autotools pkgconfig
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 EXTRA_OECONF += "--with-included-argv=yes --with-included-libmad=no"
 EXTRA_OECONF += "\
    --with-ogg-includes=${STAGING_INCDIR} \
diff --git a/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.3.bb b/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.3.bb
index 42c771e0ff..a8758b1e9b 100644
--- a/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.3.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "libdvdcss is a simple library designed for accessing DVDs like a
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "http://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2"
+SRC_URI = "https://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2"
 inherit autotools
diff --git a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.13.bb b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.14.bb
index abd54515ca..ad05a8bc87 100644
--- a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.13.bb
+++ b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.14.bb
@@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 glib-2.0-native lua pipewire \
    ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "python3-native python3-lxml-native doxygen-native", "", d)} \
 "
-SRCREV = "84429b47943d789389fbde17c06b82efb197d04e"
+SRCREV = "07e730b279ac7a520699ae9f6b0797848a731b30"
 SRC_URI = " \
    git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https;tag=${PV} \
    file://run-ptest \
diff --git a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb
index 707eeb0e26..04fe9b9acd 100644
--- a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb
+++ b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb
@@ -39,7 +39,7 @@ BIND_EXTRA_CONFIG = "\
        --host=${HOST_SYS} \
        --target=${TARGET_SYS} \
 "
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 EXTRA_OECONF = "--with-bind-extra-config="${BIND_EXTRA_CONFIG}" \
                --enable-paranoia \
                --disable-static \
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb b/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b8.bb
index 7a392b2c23..eabf4027d6 100644
--- a/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb
+++ b/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b8.bb
@@ -4,21 +4,19 @@ HOMEPAGE = "http://sourceforge.net/projects/ez-ipupdate/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7783169b4be06b54e86730eb01bc3a31"
-SRC_URI = "http://sourceforge.net/projects/ez-ipupdate/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
+SRC_URI = "${DEBIAN_MIRROR}/main/e/${BPN}/${BPN}_${PV}.orig.tar.gz \
           file://Makefile.am.patch \
-           file://cache_file.c.patch \
-           file://conf_file.c.patch \
           file://wformat.patch \
           file://0001-ez-ipupdate-Include-time.h-for-time-API-prototype.patch \
           file://CVE-2003-0887.patch \
+                   file://0001-configure-Check-for-string.h-system-header.patch \
           "
-SRC_URI[md5sum] = "525be4550b4461fdf105aed8e753b020"
+SRC_URI[sha256sum] = "bf5b8d11ffe055c5891d0ab64bbfa86e99cbda645d40f346146b939fec8d962d"
-SRC_URI[sha256sum] = "a15ec0dc0b78ec7578360987c68e43a67bc8d3591cbf528a323588830ae22c20"
 inherit autotools pkgconfig
-do_install:append(){
+#do_install:append(){
-    install -m 0744 -d ${D}${localstatedir}/lib/ez-ipupdate
+#    install -m 0744 -d ${D}${localstatedir}/lib/ez-ipupdate
-}
+#}
-FILES:${PN} += "${localstatedir}/lib/ez-ipupdate"
+#FILES:${PN} += "${localstatedir}/lib/ez-ipupdate"
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-configure-Check-for-string.h-system-header.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-configure-Check-for-string.h-system-header.patch
new file mode 100644
index 0000000000..e9995a3500
--- /dev/null
+++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/0001-configure-Check-for-string.h-system-header.patch
@@ -0,0 +1,53 @@
+From 811f253c03464489d445ab6627bb4187d27e98ef Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Sat, 4 Apr 2026 19:12:37 +0000
+Subject: [PATCH] configure: Check for string.h system header
+This is needed for functions like memcpy in md5.c but
+it only includes string.h when its detected by autotools
+however the needed check for detecting it during configure
+are missing. This patch adds them
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ config.h.in  | 3 +++
+ configure.in | 3 ++-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+diff --git a/config.h.in b/config.h.in
+index 2ce447f..52a8d7d 100644
+--- a/config.h.in
+++ b/config.h.in
+@@ -129,6 +129,9 @@
+ /* Define if you have the <signal.h> header file.  */
+ #undef HAVE_SIGNAL_H
+ 
+/* Define if you have the <string.h> header file.  */
+#undef HAVE_STRING_H
+
+ /* Define if you have the <stdarg.h> header file.  */
+ #undef HAVE_STDARG_H
+ 
+diff --git a/configure.in b/configure.in
+index c97b9fc..f5d0808 100644
+--- a/configure.in
+++ b/configure.in
+@@ -62,6 +62,7 @@ AC_CHECK_HEADERS( arpa/inet.h \
+                  sys/stat.h \
+                  fcntl.h \
+                  signal.h \
+                 string.h \
+                  syslog.h \
+                  pwd.h \
+                  stdarg.h \
+@@ -104,7 +105,7 @@ AC_ARG_ENABLE(default-service,
+                           dyndns, dyndns-static, ods, tzo, gnudip, easydns, easydns-partner, dyns, hn, zoneedit, heipv6tb],
+              [ use_SERVICE=$enableval;
+                AC_MSG_RESULT(yes) ],
+-             [ AC_MSG_RESULT(no) 
+             [ AC_MSG_RESULT(no)
+                 use_SERVICE=null
+                 AC_MSG_WARN(not setting default service) ]   )
+ case "$use_SERVICE" in
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/CVE-2003-0887.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/CVE-2003-0887.patch
index 53aa355008..14abe27c00 100644
--- a/meta-networking/recipes-connectivity/ez-ipupdate/files/CVE-2003-0887.patch
+++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/CVE-2003-0887.patch
@@ -26,8 +26,6 @@ Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
 example-tzo.conf       | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
-diff --git a/example-dhs.conf b/example-dhs.conf
-index 3fe9a04..f976ae5 100755
 --- a/example-dhs.conf
 +++ b/example-dhs.conf
 @@ -11,7 +11,7 @@ host=mydomain.whatever.com
@@ -39,8 +37,6 @@ index 3fe9a04..f976ae5 100755
 
 # uncomment this once you have everything working how you want and you are
 # ready to have ez-ipupdate running in the background all the time. to stop it
-diff --git a/example-dyndns.conf b/example-dyndns.conf
-index f539dec..84b4807 100755
 --- a/example-dyndns.conf
 +++ b/example-dyndns.conf
 @@ -19,7 +19,7 @@ max-interval=2073600
@@ -52,8 +48,6 @@ index f539dec..84b4807 100755
 
 # uncomment this once you have everything working how you want and you are
 # ready to have ez-ipupdate running in the background all the time. to stop it
-diff --git a/example-dyns.conf b/example-dyns.conf
-index 868768d..856a4d7 100644
 --- a/example-dyns.conf
 +++ b/example-dyns.conf
 @@ -11,7 +11,7 @@ host=myhost
@@ -65,8 +59,6 @@ index 868768d..856a4d7 100644
 
 # uncomment this once you have everything working how you want and you are
 # ready to have ez-ipupdate running in the background all the time. to stop it
-diff --git a/example-easydns.conf b/example-easydns.conf
-index 0ff20da..15d9b78 100755
 --- a/example-easydns.conf
 +++ b/example-easydns.conf
 @@ -11,7 +11,7 @@ host=mydomain.whatever.com
@@ -78,8 +70,6 @@ index 0ff20da..15d9b78 100755
 
 # uncomment this once you have everything working how you want and you are
 # ready to have ez-ipupdate running in the background all the time. to stop it
-diff --git a/example-gnudip.conf b/example-gnudip.conf
-index 3b2fb63..d09df1f 100755
 --- a/example-gnudip.conf
 +++ b/example-gnudip.conf
 @@ -15,7 +15,7 @@ max-interval=2073600
@@ -91,8 +81,6 @@ index 3b2fb63..d09df1f 100755
 
 # uncomment this once you have everything working how you want and you are
 # ready to have ez-ipupdate running in the background all the time. to stop it
-diff --git a/example-heipv6tb.conf b/example-heipv6tb.conf
-index e31aa9c..3ebc822 100644
 --- a/example-heipv6tb.conf
 +++ b/example-heipv6tb.conf
 @@ -18,7 +18,7 @@ max-interval=2073600
@@ -104,8 +92,6 @@ index e31aa9c..3ebc822 100644
 
 # uncomment this once you have everything working how you want and you are
 # ready to have ez-ipupdate running in the background all the time. to stop it
-diff --git a/example-justlinux.conf b/example-justlinux.conf
-index 0afeb2c..28b3327 100755
 --- a/example-justlinux.conf
 +++ b/example-justlinux.conf
 @@ -11,7 +11,7 @@ host=mydomain.penguinpowered.com
@@ -117,8 +103,6 @@ index 0afeb2c..28b3327 100755
 
 # uncomment this once you have everything working how you want and you are
 # ready to have ez-ipupdate running in the background all the time. to stop it
-diff --git a/example-ods.conf b/example-ods.conf
-index d0ff889..7b16f2c 100755
 --- a/example-ods.conf
 +++ b/example-ods.conf
 @@ -11,7 +11,7 @@ host=mydomain.ods.org
@@ -130,8 +114,6 @@ index d0ff889..7b16f2c 100755
 
 # uncomment this once you have everything working how you want and you are
 # ready to have ez-ipupdate running in the background all the time. to stop it
-diff --git a/example-pgpow.conf b/example-pgpow.conf
-index 29a92d6..81e351b 100755
 --- a/example-pgpow.conf
 +++ b/example-pgpow.conf
 @@ -11,7 +11,7 @@ host=mydomain.penguinpowered.com
@@ -143,8 +125,6 @@ index 29a92d6..81e351b 100755
 
 # uncomment this once you have everything working how you want and you are
 # ready to have ez-ipupdate running in the background all the time. to stop it
-diff --git a/example-tzo.conf b/example-tzo.conf
-index 2a71db3..10b8dc4 100755
 --- a/example-tzo.conf
 +++ b/example-tzo.conf
 @@ -15,7 +15,7 @@ max-interval=2073600
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch
deleted file mode 100644
index 0199cb1278..0000000000
--- a/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Pending
-Dont assume errno type
--- ez-ipupdate-3.0.11b7/cache_file.c.orig      2014-07-02 14:01:07.126029412 -0600
-+++ ez-ipupdate-3.0.11b7/cache_file.c   2014-07-02 14:08:27.422026332 -0600
-@@ -43,11 +43,11 @@
- #include <cache_file.h>
- 
- #if HAVE_STRERROR
-extern int errno;
-+#  include <errno.h>
- #  define error_string strerror(errno)
- #elif HAVE_SYS_ERRLIST
- extern const char *const sys_errlist[];
-extern int errno;
-+#  include <errno.h>
- #  define error_string (sys_errlist[errno])
- #else
- #  define error_string "error message not found"
-@@ -63,11 +63,11 @@
- #  define dprintf(x)
- #endif
- #if HAVE_STRERROR
-extern int errno;
-+#  include <errno.h>
- #  define error_string strerror(errno)
- #elif HAVE_SYS_ERRLIST
- extern const char *const sys_errlist[];
-extern int errno;
-+#  include <errno.h>
- #  define error_string (sys_errlist[errno])
- #else
- #  define error_string "error message not found"
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch
deleted file mode 100644
index 6325c1873f..0000000000
--- a/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream-Status: Pending
-Dont assume errno type
--- ez-ipupdate-3.0.11b7/conf_file.c.orig       2014-07-02 14:01:19.174029328 -0600
-+++ ez-ipupdate-3.0.11b7/conf_file.c    2014-07-02 14:08:42.982026223 -0600
-@@ -38,11 +38,11 @@
- #include <conf_file.h>
- 
- #if HAVE_STRERROR
-extern int errno;
-+#  include <errno.h>
- #  define error_string strerror(errno)
- #elif HAVE_SYS_ERRLIST
- extern const char *const sys_errlist[];
-extern int errno;
-+#  include <errno.h>
- #  define error_string (sys_errlist[errno])
- #else
- #  define error_string "error message not found"
diff --git a/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch b/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch
index 3b791559d5..7463e3c535 100644
--- a/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch
+++ b/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch
@@ -1,4 +1,9 @@
-Upstream-Status: Pending
+This patch is used by Gentoo to mitigate CVE-2004-0980:
+https://bugs.gentoo.org/69658
+CVE: CVE-2004-0980
+Upstream-Status: Inactive-Upstream [last commit: 2002]
 Index: ez-ipupdate-3.0.11b7/ez-ipupdate.c
 ===================================================================
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0001-don-t-load-legacy-provider-on-enable-fips-workaround.patch b/meta-networking/recipes-connectivity/freeradius/files/0001-don-t-load-legacy-provider-on-enable-fips-workaround.patch
deleted file mode 100644
index 594286cdcf..0000000000
--- a/meta-networking/recipes-connectivity/freeradius/files/0001-don-t-load-legacy-provider-on-enable-fips-workaround.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 2c2c6a460ae8cc655df83c8964595581389676c1 Mon Sep 17 00:00:00 2001
-From: "Alan T. DeKok" <aland@freeradius.org>
-Date: Tue, 9 Sep 2025 07:03:21 -0400
-Subject: [PATCH] don't load legacy provider on --enable-fips-workaround. 
- Fixes #5644
-Upstream-Status: Backport
-[https://github.com/FreeRADIUS/freeradius-server/commit/2c2c6a460ae8cc655df83c8964595581389676c1]
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
- src/main/tls.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-diff --git a/src/main/tls.c b/src/main/tls.c
-index ba267983b1..c04f3228e4 100644
--- a/src/main/tls.c
-+++ b/src/main/tls.c
-@@ -64,8 +64,11 @@ USES_APPLE_DEPRECATED_API    /* OpenSSL API has been deprecated by Apple */
- #  include <openssl/provider.h>
- 
- static OSSL_PROVIDER *openssl_default_provider = NULL;
-+
-+#ifndef WITH_FIPS
- static OSSL_PROVIDER *openssl_legacy_provider = NULL;
- #endif
-+#endif
- 
- #define LOG_PREFIX "tls"
- 
-@@ -3693,6 +3696,7 @@ int tls_global_init(TLS_UNUSED bool spawn_flag, TLS_UNUSED bool check)
-                return -1;
-        }
- 
-+#ifndef WITH_FIPS
-        /*
-         *      Needed for MD4
-         *
-@@ -3703,6 +3707,7 @@ int tls_global_init(TLS_UNUSED bool spawn_flag, TLS_UNUSED bool check)
-                ERROR("(TLS) Failed loading legacy provider");
-                return -1;
-        }
-+#endif
- #endif
- 
-        return 0;
-@@ -3777,10 +3782,12 @@ void tls_global_cleanup(void)
-        }
-        openssl_default_provider = NULL;
- 
-+#ifndef WITH_FIPS
-        if (openssl_legacy_provider && !OSSL_PROVIDER_unload(openssl_legacy_provider)) {
-                ERROR("Failed unloading legacy provider");
-        }
-        openssl_legacy_provider = NULL;
-+#endif
- #endif
- 
-        CONF_modules_unload(1);
-- 
-2.43.0
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0002-don-t-load-legacy-provider-on-enable-fips-workaround.patch b/meta-networking/recipes-connectivity/freeradius/files/0002-don-t-load-legacy-provider-on-enable-fips-workaround.patch
deleted file mode 100644
index 84b78320c4..0000000000
--- a/meta-networking/recipes-connectivity/freeradius/files/0002-don-t-load-legacy-provider-on-enable-fips-workaround.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 2ff8eb44bb626e9e63f9bf06c3bcf3b34291c335 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Tue, 31 Mar 2026 07:45:16 -0400
-Subject: [PATCH] don't load legacy provider on --enable-fips-workaround. Fixes
- #5775
-Upstream-Status: Backport
-[https://github.com/FreeRADIUS/freeradius-server/commit/2ff8eb44bb626e9e63f9bf06c3bcf3b34291c335]
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
- src/main/radclient.c                | 6 ++++++
- src/modules/rlm_mschap/smbencrypt.c | 6 ++++++
- 2 files changed, 12 insertions(+)
-diff --git a/src/main/radclient.c b/src/main/radclient.c
-index ea64486dcf..52555603e1 100644
--- a/src/main/radclient.c
-+++ b/src/main/radclient.c
-@@ -168,7 +168,9 @@ static int _rc_request_free(rc_request_t *request)
- #  include <openssl/provider.h>
- 
- static OSSL_PROVIDER *openssl_default_provider = NULL;
-+#ifndef WITH_FIPS
- static OSSL_PROVIDER *openssl_legacy_provider = NULL;
-+#endif
- 
- static int openssl3_init(void)
- {
-@@ -181,6 +183,7 @@ static int openssl3_init(void)
-                return -1;
-        }
- 
-+#ifndef WITH_FIPS
-        /*
-         *      Needed for MD4
-         *
-@@ -191,6 +194,7 @@ static int openssl3_init(void)
-                ERROR("(TLS) Failed loading legacy provider");
-                return -1;
-        }
-+#endif
- 
-        return 0;
- }
-@@ -202,10 +206,12 @@ static void openssl3_free(void)
-        }
-        openssl_default_provider = NULL;
- 
-+#ifndef WITH_FIPS
-        if (openssl_legacy_provider && !OSSL_PROVIDER_unload(openssl_legacy_provider)) {
-                ERROR("Failed unloading legacy provider");
-        }
-        openssl_legacy_provider = NULL;
-+#endif
- }
- #else
- #define openssl3_init()
-diff --git a/src/modules/rlm_mschap/smbencrypt.c b/src/modules/rlm_mschap/smbencrypt.c
-index 9a8a5ab777..531c40ec26 100644
--- a/src/modules/rlm_mschap/smbencrypt.c
-+++ b/src/modules/rlm_mschap/smbencrypt.c
-@@ -43,7 +43,9 @@ static char const hex[] = "0123456789ABCDEF";
- #  include <openssl/provider.h>
- 
- static OSSL_PROVIDER *openssl_default_provider = NULL;
-+#ifndef WITH_FIPS
- static OSSL_PROVIDER *openssl_legacy_provider = NULL;
-+#endif
- 
- #define ERROR(_x) fprintf(stderr, _x)
- 
-@@ -58,6 +60,7 @@ static int openssl3_init(void)
-                return -1;
-        }
- 
-+#ifndef WITH_FIPS
-        /*
-         *      Needed for MD4
-         *
-@@ -68,6 +71,7 @@ static int openssl3_init(void)
-                ERROR("(TLS) Failed loading legacy provider");
-                return -1;
-        }
-+#endif
- 
-        return 0;
- }
-@@ -79,10 +83,12 @@ static void openssl3_free(void)
-        }
-        openssl_default_provider = NULL;
- 
-+#ifndef WITH_FIPS
-        if (openssl_legacy_provider && !OSSL_PROVIDER_unload(openssl_legacy_provider)) {
-                ERROR("Failed unloading legacy provider");
-        }
-        openssl_legacy_provider = NULL;
-+#endif
- }
- #else
- #define openssl3_init()
-- 
-2.43.0
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch b/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch
deleted file mode 100644
index cae27ad3a4..0000000000
--- a/meta-networking/recipes-connectivity/freeradius/files/0010-fix-error-for-expansion-of-macro-in-thread.h.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0475d948ceab91b22172f0fae3bc01e0a1502ae8 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Wed, 18 Jan 2017 14:59:39 +0800
-Subject: [PATCH] fix error for expansion of macro in thread.h
-The parameter declaration is missing in expansion of macro
-which cause the build error:
-| In file included from src/freeradius-devel/libradius.h:80:0,
-|                  from src/lib/log.c:26:
-| src/lib/log.c: In function '__fr_thread_local_destroy_fr_strerror_buffer':
-| src/lib/log.c:37:31: error: 'fr_strerror_buffer' undeclared (first use in this function)
-|  fr_thread_local_setup(char *, fr_strerror_buffer) /* macro */
-|                                ^
-Add the missing declaration in macro.
-Upstream-Status: Pending
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
- src/include/threads.h | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-diff --git a/src/include/threads.h b/src/include/threads.h
-index f2aea776d6..1c4e526797 100644
--- a/src/include/threads.h
-+++ b/src/include/threads.h
-@@ -92,7 +92,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\
- #  define fr_thread_local_get(_n) _n
- #elif defined(HAVE_PTHREAD_H)
- #  include <pthread.h>
-#  define fr_thread_local_setup(_t, _n) \
-+#  define fr_thread_local_setup(_t, _n) static __thread _t _n;\
- static pthread_key_t __fr_thread_local_key_##_n;\
- static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\
- static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\
-@@ -103,17 +103,17 @@ static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\
- static void __fr_thread_local_key_init_##_n(void)\
- {\
-        (void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\
-       (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\
- }\
- static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\
- {\
-        __fr_thread_local_destructor_##_n = func;\
-        if (_n) return _n; \
-        (void) pthread_once(&__fr_thread_local_once_##_n, __fr_thread_local_key_init_##_n);\
-+       (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\
-        return _n;\
- }
-#  define fr_thread_local_init(_n, _f)                 __fr_thread_local_init_##_n(_f)
-#  define fr_thread_local_set(_n, _v)                  __fr_thread_local_set_##_n(_v)
-#  define fr_thread_local_get(_n)                      __fr_thread_local_get_##_n()
-+#  define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f)
-+#  define fr_thread_local_set(_n, _v) ((int)!((_n = _v) || 1))
-+#  define fr_thread_local_get(_n) _n
- #endif
- #endif
-- 
-2.25.1
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0018-update-license-1.patch b/meta-networking/recipes-connectivity/freeradius/files/0018-update-license-1.patch
deleted file mode 100644
index 8647c389ab..0000000000
--- a/meta-networking/recipes-connectivity/freeradius/files/0018-update-license-1.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From 82d874c638c80fbbf1eca7c51aca095fbbf40024 Mon Sep 17 00:00:00 2001
-From: "Alan T. DeKok" <aland@freeradius.org>
-Date: Mon, 27 Oct 2025 06:31:22 -0400
-Subject: [PATCH] update license
-Upstream-Status: Backport
-[https://github.com/FreeRADIUS/freeradius-server/commit/82d874c638c80fbbf1eca7c51aca095fbbf40024]
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
- src/modules/rlm_dpsk/rlm_dpsk.c               | 25 +++++++---------
- .../rlm_eap/types/rlm_eap_teap/eap_teap.c     | 29 +++++++------------
- .../rlm_eap/types/rlm_eap_teap/eap_teap.h     | 29 +++++++------------
- .../rlm_eap/types/rlm_eap_teap/rlm_eap_teap.c | 29 +++++++------------
- 4 files changed, 44 insertions(+), 68 deletions(-)
-diff --git a/src/modules/rlm_dpsk/rlm_dpsk.c b/src/modules/rlm_dpsk/rlm_dpsk.c
-index 4b818d08a5..aa07415540 100644
--- a/src/modules/rlm_dpsk/rlm_dpsk.c
-+++ b/src/modules/rlm_dpsk/rlm_dpsk.c
-@@ -1,20 +1,17 @@
- /*
- * Copyright (C) 2023 Network RADIUS SARL (legal@networkradius.com)
-+ *   This program is is free software; you can redistribute it and/or modify
-+ *   it under the terms of the GNU General Public License as published by
-+ *   the Free Software Foundation; either version 2 of the License, or (at
-+ *   your option) any later version.
-  *
- * This software may not be redistributed in any form without the prior
- * written consent of Network RADIUS.
-+ *   This program is distributed in the hope that it will be useful,
-+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *   GNU General Public License for more details.
-  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-+ *   You should have received a copy of the GNU General Public License
-+ *   along with this program; if not, write to the Free Software
-+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
- /**
-diff --git a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.c b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.c
-index 20646c5ba1..33512788c2 100644
--- a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.c
-+++ b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.c
-@@ -1,24 +1,17 @@
- /*
- * eap_teap.c  contains the interfaces that are called from the main handler
-+ *   This program is is free software; you can redistribute it and/or modify
-+ *   it under the terms of the GNU General Public License as published by
-+ *   the Free Software Foundation; either version 2 of the License, or (at
-+ *   your option) any later version.
-  *
- * Version:     $Id$
-+ *   This program is distributed in the hope that it will be useful,
-+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *   GNU General Public License for more details.
-  *
- * Copyright (C) 2022 Network RADIUS SARL <legal@networkradius.com>
- *
- * This software may not be redistributed in any form without the prior
- * written consent of Network RADIUS.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-+ *   You should have received a copy of the GNU General Public License
-+ *   along with this program; if not, write to the Free Software
-+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
- RCSID("$Id$")
-diff --git a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.h b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.h
-index 59f7835a26..69f4b1ebba 100644
--- a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.h
-+++ b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap.h
-@@ -1,24 +1,17 @@
- /*
- * eap_teap.h
-+ *   This program is is free software; you can redistribute it and/or modify
-+ *   it under the terms of the GNU General Public License as published by
-+ *   the Free Software Foundation; either version 2 of the License, or (at
-+ *   your option) any later version.
-  *
- * Version:     $Id$
-+ *   This program is distributed in the hope that it will be useful,
-+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *   GNU General Public License for more details.
-  *
- * Copyright (C) 2022 Network RADIUS SARL <legal@networkradius.com>
- *
- * This software may not be redistributed in any form without the prior
- * written consent of Network RADIUS.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-+ *   You should have received a copy of the GNU General Public License
-+ *   along with this program; if not, write to the Free Software
-+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- #ifndef _EAP_TEAP_H
- #define _EAP_TEAP_H
-diff --git a/src/modules/rlm_eap/types/rlm_eap_teap/rlm_eap_teap.c b/src/modules/rlm_eap/types/rlm_eap_teap/rlm_eap_teap.c
-index fcf9717257..13c709b287 100644
--- a/src/modules/rlm_eap/types/rlm_eap_teap/rlm_eap_teap.c
-+++ b/src/modules/rlm_eap/types/rlm_eap_teap/rlm_eap_teap.c
-@@ -1,24 +1,17 @@
- /*
- * rlm_eap_teap.c  contains the interfaces that are called from eap
-+ *   This program is is free software; you can redistribute it and/or modify
-+ *   it under the terms of the GNU General Public License as published by
-+ *   the Free Software Foundation; either version 2 of the License, or (at
-+ *   your option) any later version.
-  *
- * Version:     $Id$
-+ *   This program is distributed in the hope that it will be useful,
-+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *   GNU General Public License for more details.
-  *
- * Copyright (C) 2022 Network RADIUS SARL <legal@networkradius.com>
- *
- * This software may not be redistributed in any form without the prior
- * written consent of Network RADIUS.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-+ *   You should have received a copy of the GNU General Public License
-+ *   along with this program; if not, write to the Free Software
-+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
- RCSID("$Id$")
-- 
-2.43.0
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0019-update-license-2.patch b/meta-networking/recipes-connectivity/freeradius/files/0019-update-license-2.patch
deleted file mode 100644
index 4fa3ecd265..0000000000
--- a/meta-networking/recipes-connectivity/freeradius/files/0019-update-license-2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From a46e81a7764b57983ce6724524f745a06222dc0a Mon Sep 17 00:00:00 2001
-From: "Alan T. DeKok" <aland@freeradius.org>
-Date: Tue, 28 Oct 2025 11:33:44 -0400
-Subject: [PATCH] update license
-Upstream-Status: Backport
-[https://github.com/FreeRADIUS/freeradius-server/commit/a46e81a7764b57983ce6724524f745a06222dc0a]
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
- .../rlm_proxy_rate_limit.c                    | 25 ++++++++-----------
- 1 file changed, 11 insertions(+), 14 deletions(-)
-diff --git a/src/modules/rlm_proxy_rate_limit/rlm_proxy_rate_limit.c b/src/modules/rlm_proxy_rate_limit/rlm_proxy_rate_limit.c
-index 744b14a448..a855273784 100644
--- a/src/modules/rlm_proxy_rate_limit/rlm_proxy_rate_limit.c
-+++ b/src/modules/rlm_proxy_rate_limit/rlm_proxy_rate_limit.c
-@@ -1,20 +1,17 @@
- /*
- * Copyright (C) 2024 Network RADIUS SAS (legal@networkradius.com)
-+ *   This program is is free software; you can redistribute it and/or modify
-+ *   it under the terms of the GNU General Public License as published by
-+ *   the Free Software Foundation; either version 2 of the License, or (at
-+ *   your option) any later version.
-  *
- * This software may not be redistributed in any form without the prior
- * written consent of Network RADIUS.
-+ *   This program is distributed in the hope that it will be useful,
-+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *   GNU General Public License for more details.
-  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-+ *   You should have received a copy of the GNU General Public License
-+ *   along with this program; if not, write to the Free Software
-+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
- /**
-- 
-2.43.0
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0020-update-license-3.patch b/meta-networking/recipes-connectivity/freeradius/files/0020-update-license-3.patch
deleted file mode 100644
index f77c585bda..0000000000
--- a/meta-networking/recipes-connectivity/freeradius/files/0020-update-license-3.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From d00440f3290871aef667f80e15f256c64f9b7cd6 Mon Sep 17 00:00:00 2001
-From: "Alan T. DeKok" <aland@freeradius.org>
-Date: Wed, 29 Oct 2025 09:45:17 -0400
-Subject: [PATCH] update license
-Upstream-Status: Backport
-[https://github.com/FreeRADIUS/freeradius-server/commit/d00440f3290871aef667f80e15f256c64f9b7cd6]
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
- .../types/rlm_eap_teap/eap_teap_crypto.c      | 30 +++++++------------
- .../types/rlm_eap_teap/eap_teap_crypto.h      | 30 +++++++------------
- 2 files changed, 22 insertions(+), 38 deletions(-)
-diff --git a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.c b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.c
-index 17f49f9dfc..aaa74837a9 100644
--- a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.c
-+++ b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.c
-@@ -1,26 +1,18 @@
- /*
- * teap-crypto.c  Cryptographic functions for EAP-TEAP.
-+ *   This program is is free software; you can redistribute it and/or modify
-+ *   it under the terms of the GNU General Public License as published by
-+ *   the Free Software Foundation; either version 2 of the License, or (at
-+ *   your option) any later version.
-  *
- * Version:     $Id$
-+ *   This program is distributed in the hope that it will be useful,
-+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *   GNU General Public License for more details.
-  *
- * Copyright (C) 2022 Network RADIUS SARL <legal@networkradius.com>
- *
- * This software may not be redistributed in any form without the prior
- * written consent of Network RADIUS.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-+ *   You should have received a copy of the GNU General Public License
-+ *   along with this program; if not, write to the Free Software
-+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
-
- RCSID("$Id$")
- USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
- 
-diff --git a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.h b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.h
-index b02f2b9083..f9403dcf93 100644
--- a/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.h
-+++ b/src/modules/rlm_eap/types/rlm_eap_teap/eap_teap_crypto.h
-@@ -1,26 +1,18 @@
- /*
- * eap_teap_crypto.h
-+ *   This program is is free software; you can redistribute it and/or modify
-+ *   it under the terms of the GNU General Public License as published by
-+ *   the Free Software Foundation; either version 2 of the License, or (at
-+ *   your option) any later version.
-  *
- * Version:     $Id$
-+ *   This program is distributed in the hope that it will be useful,
-+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *   GNU General Public License for more details.
-  *
- * Copyright (C) 2022 Network RADIUS SARL <legal@networkradius.com>
- *
- * This software may not be redistributed in any form without the prior
- * written consent of Network RADIUS.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-+ *   You should have received a copy of the GNU General Public License
-+ *   along with this program; if not, write to the Free Software
-+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
-
- #ifndef _EAP_TEAP_CRYPTO_H
- #define _EAP_TEAP_CRYPTO_H
- 
-- 
-2.43.0
diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.8.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.8.bb
index 4be127209b..d9b0bc9b1e 100644
--- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.8.bb
+++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.8.bb
@@ -15,7 +15,7 @@ DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc"
 PATCHTOOL = "git"
-SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0;;protocol=https \
+SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0;protocol=https \
    file://freeradius \
    file://volatiles.58_radiusd \
    file://radiusd.service \
@@ -29,7 +29,6 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0
    file://0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch \
    file://0008-libtool-do-not-use-jlibtool.patch \
    file://0009-Fix-quoting-for-BUILD_WITH.patch \
-    file://0010-fix-error-for-expansion-of-macro-in-thread.h.patch \
    file://0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \
    file://0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \
    file://0013-raddb-certs-Makefile-fix-the-occasional-verification.patch \
@@ -37,16 +36,13 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0
    file://0015-bootstrap-check-commands-of-openssl-exist.patch \
    file://0016-version.c-don-t-print-build-flags.patch \
    file://0017-Add-acinclude.m4-to-include-required-macros.patch \
-    file://0018-update-license-1.patch \
-    file://0019-update-license-2.patch \
-    file://0020-update-license-3.patch \
-    file://0001-don-t-load-legacy-provider-on-enable-fips-workaround.patch \
-    file://0002-don-t-load-legacy-provider-on-enable-fips-workaround.patch \
 "
 raddbdir = "${sysconfdir}/${MLPREFIX}raddb"
-SRCREV = "032be31bb52646171099617928ec1703335bcf73"
+SRCREV = "4e4cbbd93ff3b469a773c964c7b5b6f53d01457a"
+PV .= "+git"
 UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)"
@@ -55,6 +51,8 @@ CVE_STATUS[CVE-2011-4966] = "fixed-version: The CPE in the NVD database doesn't
 PARALLEL_MAKE = ""
+# autoconf 2.73+Clang does not detect it correctly so help out
+CFLAGS += "-DTLS_STORAGE_CLASS=__thread"
 LDFLAGS:append:powerpc = " -latomic"
 LDFLAGS:append:mipsarch = " -latomic"
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.10.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.10.bb
deleted file mode 100644
index b126aee7db..0000000000
--- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.10.bb
+++ /dev/null
@@ -1,79 +0,0 @@
-SUMMARY = "Lightweight crypto and SSL/TLS library"
-DESCRIPTION = "mbedtls is a lean open source crypto library          \
-for providing SSL and TLS support in your programs. It offers        \
-an intuitive API and documented header files, so you can actually    \
-understand what the code does. It features:                          \
-                                                                     \
- - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4,  \
-   Camellia and XTEA                                                 \
- - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5            \
- - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG   \
- - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \
-   ECDSA and ECDH                                                    \
- - SSL v3 and TLS 1.0, 1.1 and 1.2                                   \
- - Abstraction layers for ciphers, hashes, public key operations,    \
-   platform abstraction and threading                                \
-"
-HOMEPAGE = "https://tls.mbed.org/"
-LICENSE = "Apache-2.0 | GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
-SECTION = "libs"
-SRCREV = "2fc8413bfcb51354c8e679141b17b3f1a5942561"
-SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=archive/mbedtls-2.28;tag=${BPN} \
-           file://run-ptest \
-          "
-inherit cmake update-alternatives ptest
-PACKAGECONFIG ??= "shared-libs programs ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
-PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF"
-PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF"
-PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OFF"
-# Make X.509 and TLS calls use PSA
-# https://github.com/Mbed-TLS/mbedtls/blob/development/docs/use-psa-crypto.md
-PACKAGECONFIG[psa] = ""
-PACKAGECONFIG[tests] = "-DENABLE_TESTING=ON,-DENABLE_TESTING=OFF"
-EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:STRING=${libdir}"
-# For now the only way to enable PSA is to explicitly pass a -D via CFLAGS
-CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'psa', ' -DMBEDTLS_USE_PSA_CRYPTO', '', d)}"
-PROVIDES += "polarssl"
-RPROVIDES:${PN} = "polarssl"
-PACKAGES =+ "${PN}-programs"
-FILES:${PN}-programs = "${bindir}/"
-ALTERNATIVE:${PN}-programs = "${@bb.utils.contains('PACKAGECONFIG', 'programs', 'hello', '', d)}"
-ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello"
-BBCLASSEXTEND = "native nativesdk"
-CVE_PRODUCT = "mbed_tls"
-CVE_STATUS[CVE-2021-43666] = "backported-patch: Fix merged upstream https://github.com/Mbed-TLS/mbedtls/pull/5310"
-CVE_STATUS[CVE-2021-45451] = "backported-patch: Fix merged upstream https://github.com/Mbed-TLS/mbedtls/commit/9a4a9c66a48edfe9ece03c7e4a53310adf73a86c"
-# Strip host paths from autogenerated test files
-do_compile:append() {
-        sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || :
-        sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || :
-}
-# Export source files/headers needed by Arm Trusted Firmware
-sysroot_stage_all:append() {
-        sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library"
-        sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include"
-}
-do_install_ptest () {
-        install -d ${D}${PTEST_PATH}/tests
-        cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/
-        find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete
-        cp -fR ${S}/tests/data_files ${D}${PTEST_PATH}/tests/
-}
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.6.bb
index bc2ff8ffb5..23d5c0878f 100644
--- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
+++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.6.bb
@@ -27,7 +27,7 @@ SRC_URI = "gitsm://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls
           file://run-ptest \
           "
-SRCREV = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df"
+SRCREV = "0bebf8b8c7f07abe3571ded48a11aa907a1ffb20"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb
index 6a6e554453..8bb6c9009d 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.1.2.bb
@@ -57,6 +57,8 @@ do_install:append() {
        -e 's,@LOCALSTATEDIR@,${localstatedir},g' \
        -e 's,@SYSCONFDIR@,${sysconfdir},g' \
        ${D}${sysconfdir}/init.d/mosquitto
+    install -m 0644 ${S}/mosquitto.conf ${D}${sysconfdir}/mosquitto/mosquitto.conf
 }
 PACKAGE_BEFORE_PN = "libmosquitto1 libmosquittopp1 ${PN}-clients ${PN}-examples"
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb
index f9fc9f3966..b04ad90738 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb
@@ -311,4 +311,9 @@ do_install:append() {
    if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then
        install -Dm 0644 ${UNPACKDIR}/enable-dhcpcd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-dhcpcd.conf
    fi
+    # Don't ship initrd specific services into rootfs to avoid the conflict with the main services
+    rm -f ${D}${systemd_system_unitdir}/NetworkManager-config-initrd.service
+    rm -f ${D}${systemd_system_unitdir}/NetworkManager-initrd.service
+    rm -f ${D}${systemd_system_unitdir}/NetworkManager-wait-online-initrd.service
 }
diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch b/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch
index a498348c20..afa1154827 100644
--- a/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch
+++ b/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch
@@ -9,25 +9,14 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
 Rebase to 4.14.4
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+Rebase to 4.23.5
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
 ---
- lib/ldb/wscript    | 2 +-
 lib/talloc/wscript | 2 +-
 lib/tdb/wscript    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/lib/ldb/wscript b/lib/ldb/wscript
-index ed5d45f..de3c648 100644
--- a/lib/ldb/wscript
-+++ b/lib/ldb/wscript
-@@ -144,7 +144,7 @@ def configure(conf):
-         conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2]))
- 
-     if conf.env.standalone_ldb:
-        conf.CHECK_XSLTPROC_MANPAGES()
-+        #conf.CHECK_XSLTPROC_MANPAGES()
- 
-         # we need this for the ldap backend
-         if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
 diff --git a/lib/talloc/wscript b/lib/talloc/wscript
 index 075f1ec..9bd9f73 100644
 --- a/lib/talloc/wscript
diff --git a/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch
index 2c9d29c9fe..70e7f28cc7 100644
--- a/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch
+++ b/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch
@@ -37,10 +37,10 @@ diff --git a/wscript b/wscript
 index 95ddd9e..6d9577a 100644
 --- a/wscript
 +++ b/wscript
-@@ -123,6 +123,13 @@ def options(opt):
+@@ -131,6 +131,13 @@
                   help=('Disable kernely keyring support for credential storage'),
                   action='store_false', dest='enable_keyring')
- 
 +    opt.add_option('--with-valgrind',
 +                   help=("Enable use of valgrind"),
 +                   action="store_true", dest='enable_valgrind')
@@ -48,9 +48,6 @@ index 95ddd9e..6d9577a 100644
 +                   help=("Disable use of valgrind"),
 +                   action="store_false", dest='enable_valgrind', default=False)
 +
-     gr = opt.option_group('developer options')
+     opt.samba_add_onoff_option('ldap')
- 
-     opt.load('python') # options for disabling pyc or pyo compilation
-- 
-2.25.1
+     opt.option_group('developer options')
diff --git a/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch b/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch
index a96cd062cd..74ea1a7ab4 100644
--- a/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch
+++ b/meta-networking/recipes-connectivity/samba/samba/0003-Replace-memset_s-with-memset_explicit.patch
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 --- a/lib/replace/replace.h
 +++ b/lib/replace/replace.h
-@@ -815,50 +815,50 @@ typedef unsigned long long ptrdiff_t ;
+@@ -811,50 +811,50 @@ typedef unsigned long long ptrdiff_t ;
 /**
  * Zero a structure.
  */
@@ -74,7 +74,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 /**
  * Explicitly zero data in string. This is guaranteed to be not optimized
-@@ -867,7 +867,7 @@ typedef unsigned long long ptrdiff_t ;
+@@ -863,7 +863,7 @@ typedef unsigned long long ptrdiff_t ;
 #define BURN_STR(x)    do { \
                                if ((x) != NULL) { \
                                        size_t s = strlen(x); \
@@ -193,116 +193,3 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
        talloc_free(mem_ctx);
 }
--- a/lib/cmdline/cmdline.c
-+++ b/lib/cmdline/cmdline.c
-@@ -358,7 +358,7 @@ bool samba_cmdline_burn(int argc, char *
-                                p += ulen;
-                        }
- 
-                       memset_s(p, strlen(p), '\0', strlen(p));
-+                       memset_explicit(p, '\0', strlen(p));
-                        burnt = true;
-                }
-        }
--- a/lib/util/data_blob.c
-+++ b/lib/util/data_blob.c
-@@ -1,19 +1,19 @@
-/* 
-+/*
-    Unix SMB/CIFS implementation.
-    Easy management of byte-length data
-    Copyright (C) Andrew Tridgell 2001
-    Copyright (C) Andrew Bartlett 2001
-   
-+
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-   
-+
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-   
-+
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-@@ -67,7 +67,7 @@ _PUBLIC_ DATA_BLOB data_blob_talloc_name
- }
- 
- /**
- construct a zero data blob, using supplied TALLOC_CTX. 
-+ construct a zero data blob, using supplied TALLOC_CTX.
-  use this sparingly as it initialises data - better to initialise
-  yourself if you want specific data in the blob
- **/
-@@ -95,7 +95,7 @@ clear a DATA_BLOB's contents
- _PUBLIC_ void data_blob_clear(DATA_BLOB *d)
- {
-        if (d->data) {
-               memset_s(d->data, d->length, 0, d->length);
-+               memset_explicit(d->data, 0, d->length);
-        }
- }
- 
-@@ -219,7 +219,7 @@ _PUBLIC_ DATA_BLOB data_blob_string_cons
- }
- 
- /**
- * Create a new data blob from const data 
-+ * Create a new data blob from const data
-  */
- 
- _PUBLIC_ DATA_BLOB data_blob_const(const void *p, size_t length)
-@@ -266,7 +266,7 @@ _PUBLIC_ bool data_blob_append(TALLOC_CT
-        if ((const uint8_t *)p + length < (const uint8_t *)p) {
-                return false;
-        }
-       
-+
-        if (!data_blob_realloc(mem_ctx, blob, new_len)) {
-                return false;
-        }
--- a/lib/util/talloc_keep_secret.c
-+++ b/lib/util/talloc_keep_secret.c
-@@ -22,27 +22,13 @@
- 
- static int talloc_keep_secret_destructor(void *ptr)
- {
-       int ret;
-        size_t size = talloc_get_size(ptr);
- 
-        if (unlikely(size == 0)) {
-                return 0;
-        }
- 
-       ret = memset_s(ptr, size, 0, size);
-       if (unlikely(ret != 0)) {
-               char *msg = NULL;
-               int ret2;
-               ret2 = asprintf(&msg,
-                               "talloc_keep_secret_destructor: memset_s() failed: %s",
-                               strerror(ret));
-               if (ret2 != -1) {
-                       smb_panic(msg);
-               } else {
-                       smb_panic("talloc_keep_secret_destructor: memset_s() failed");
-               }
-       }
-
-+       memset_explicit(ptr, 0, size);
-        return 0;
- }
- 
--- a/librpc/ndr/util.c
-+++ b/librpc/ndr/util.c
-@@ -32,5 +32,5 @@ _PUBLIC_ void ndr_print_sockaddr_storage
- 
- _PUBLIC_ void ndr_zero_memory(void *ptr, size_t len)
- {
-       memset_s(ptr, len, 0, len);
-+       memset_explicit(ptr, 0, len);
- }
diff --git a/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch b/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch
index c72bd133ee..88acfeef07 100644
--- a/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch
+++ b/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch
@@ -19,7 +19,7 @@ diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
 index 30cb366..d167551 100644
 --- a/buildtools/wafsamba/wscript
 +++ b/buildtools/wafsamba/wscript
-@@ -145,6 +145,13 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''),
+@@ -155,6 +155,13 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''),
                    help=("Disable use of gettext"),
                    action="store_true", dest='disable_gettext', default=False)
 
@@ -37,40 +37,60 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript
 index 9dd9b48..a22ae59 100644
 --- a/lib/replace/wscript
 +++ b/lib/replace/wscript
-@@ -444,20 +444,21 @@ def configure(conf):
+@@ -444,31 +444,32 @@
- 
     strlcpy_in_bsd = False
- 
 -    # libbsd on some platforms provides strlcpy and strlcat
 -    if not conf.CHECK_FUNCS('strlcpy strlcat'):
 -        if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
 -                               checklibc=True):
 -            strlcpy_in_bsd = True
-    if not conf.CHECK_FUNCS('getpeereid'):
+-    elif conf.env.enable_fuzzing:
-        conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
+-        # Just to complicate it more, some versions of Honggfuzz have
-    if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
+-        # got strlcpy and strlcat in libc, but not in <string.h>
-        conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
+-        # (unless it is there coincidentally, on a BSD). Therefore we
-    if not conf.CHECK_FUNCS('setproctitle_init'):
+-        # can't use CHECK_FUNCS alone to decide whether to add the
-        conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
+-        # headers to replace.h.
-
+-        #
-    if not conf.CHECK_FUNCS('closefrom'):
+-        # As this is only known to happen on a fuzzing compiler, we'll
-        conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
+-        # skip the check when not in fuzzing mode.
+-        conf.CHECK_HEADERS('bsd/string.h')
 +    if Options.options.enable_libbsd:
 +        # libbsd on some platforms provides strlcpy and strlcat
 +        if not conf.CHECK_FUNCS('strlcpy strlcat'):
 +            if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
 +                                   checklibc=True):
 +                strlcpy_in_bsd = True
+        elif conf.env.enable_fuzzing:
+            # Just to complicate it more, some versions of Honggfuzz have
+            # got strlcpy and strlcat in libc, but not in <string.h>
+            # (unless it is there coincidentally, on a BSD). Therefore we
+            # can't use CHECK_FUNCS alone to decide whether to add the
+            # headers to replace.h.
+            #
+            # As this is only known to happen on a fuzzing compiler, we'll
+            # skip the check when not in fuzzing mode.
+            conf.CHECK_HEADERS('bsd/string.h')
+-    if not conf.CHECK_FUNCS('getpeereid'):
+-        conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
+-    if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
+-        conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
+-    if not conf.CHECK_FUNCS('setproctitle_init'):
+-        conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
 +        if not conf.CHECK_FUNCS('getpeereid'):
 +            conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
 +        if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
 +            conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
 +        if not conf.CHECK_FUNCS('setproctitle_init'):
 +            conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
-+
+-    if not conf.CHECK_FUNCS('closefrom'):
+-        conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
 +        if not conf.CHECK_FUNCS('closefrom'):
 +            conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
- 
     conf.CHECK_CODE('''
                 struct ucred cred;
 diff --git a/lib/texpect/wscript b/lib/texpect/wscript
diff --git a/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch b/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch
index 409c36da7c..6e01ae35e7 100644
--- a/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch
+++ b/meta-networking/recipes-connectivity/samba/samba/0004-lib-replace-Remove-memset_s.patch
@@ -24,7 +24,7 @@ diff --git a/lib/replace/README b/lib/replace/README
 index bb9d008..d8431e7 100644
 --- a/lib/replace/README
 +++ b/lib/replace/README
-@@ -74,7 +74,6 @@ realpath
+@@ -73,7 +73,6 @@ realpath
 poll
 setproctitle
 memset_explicit
@@ -36,219 +36,10 @@ diff --git a/lib/replace/replace.c b/lib/replace/replace.c
 index 8615899..a419837 100644
 --- a/lib/replace/replace.c
 +++ b/lib/replace/replace.c
-@@ -1,4 +1,4 @@
+@@ -965,37 +965,6 @@
-/* 
-+/*
-    Unix SMB/CIFS implementation.
-    replacement routines for broken systems
-    Copyright (C) Andrew Tridgell 1992-1998
-@@ -8,7 +8,7 @@
-      ** NOTE! The following LGPL license applies to the replace
-      ** library. This does NOT imply that all of Samba is released
-      ** under the LGPL
-   
-+
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-@@ -91,7 +91,7 @@ size_t rep_strlcpy(char *d, const char *s, size_t bufsize)
- #endif
- 
- #ifndef HAVE_STRLCAT
-/* like strncat but does not 0 fill the buffer and always null 
-+/* like strncat but does not 0 fill the buffer and always null
-    terminates. bufsize is the length of the buffer, which should
-    be one more than the maximum resulting string length */
- size_t rep_strlcat(char *d, const char *s, size_t bufsize)
-@@ -116,7 +116,7 @@ size_t rep_strlcat(char *d, const char *s, size_t bufsize)
- 
- #ifndef HAVE_MKTIME
- /*******************************************************************
-a mktime() replacement for those who don't have it - contributed by 
-+a mktime() replacement for those who don't have it - contributed by
- C.A. Lademann <cal@zls.com>
- Corrections by richard.kettlewell@kewill.com
- ********************************************************************/
-@@ -137,7 +137,7 @@ time_t rep_mktime(struct tm *t)
-     return((time_t)-1);
- 
-   n = t->tm_year + 1900 - 1;
-  epoch = (t->tm_year - 70) * YEAR + 
-+  epoch = (t->tm_year - 70) * YEAR +
-     ((n / 4 - n / 100 + n / 400) - (1969 / 4 - 1969 / 100 + 1969 / 400)) * DAY;
- 
-   y = t->tm_year + 1900;
-@@ -147,7 +147,7 @@ time_t rep_mktime(struct tm *t)
-     epoch += mon [m] * DAY;
-     if(m == 1 && y % 4 == 0 && (y % 100 != 0 || y % 400 == 0))
-       epoch += DAY;
-    
-+
-     if(++m > 11) {
-       m = 0;
-       y++;
-@@ -156,7 +156,7 @@ time_t rep_mktime(struct tm *t)
- 
-   epoch += (t->tm_mday - 1) * DAY;
-   epoch += t->tm_hour * HOUR + t->tm_min * MINUTE + t->tm_sec;
-  
-+
-   if((u = localtime(&epoch)) != NULL) {
-     t->tm_sec = u->tm_sec;
-     t->tm_min = u->tm_min;
-@@ -176,7 +176,7 @@ time_t rep_mktime(struct tm *t)
- 
- #ifndef HAVE_INITGROUPS
- /****************************************************************************
- some systems don't have an initgroups call 
-+ some systems don't have an initgroups call
- ****************************************************************************/
- int rep_initgroups(char *name, gid_t id)
- {
-@@ -194,7 +194,7 @@ int rep_initgroups(char *name, gid_t id)
-        int    i,j;
-        struct group *g;
-        char   *gr;
-       
-+
-        if((grouplst = malloc(sizeof(gid_t) * max_gr)) == NULL) {
-                errno = ENOMEM;
-                return -1;
-@@ -250,9 +250,9 @@ void *rep_memmove(void *dest,const void *src,int size)
- 
-        if (d < s) {
-                /* we can forward copy */
-               if (s-d >= sizeof(int) && 
-                   !(s%sizeof(int)) && 
-                   !(d%sizeof(int)) && 
-+               if (s-d >= sizeof(int) &&
-+                   !(s%sizeof(int)) &&
-+                   !(d%sizeof(int)) &&
-                    !(size%sizeof(int))) {
-                        /* do it all as words */
-                        int *idest = (int *)dest;
-@@ -267,9 +267,9 @@ void *rep_memmove(void *dest,const void *src,int size)
-                }
-        } else {
-                /* must backward copy */
-               if (d-s >= sizeof(int) && 
-                   !(s%sizeof(int)) && 
-                   !(d%sizeof(int)) && 
-+               if (d-s >= sizeof(int) &&
-+                   !(s%sizeof(int)) &&
-+                   !(d%sizeof(int)) &&
-                    !(size%sizeof(int))) {
-                        /* do it all as words */
-                        int *idest = (int *)dest;
-@@ -281,7 +281,7 @@ void *rep_memmove(void *dest,const void *src,int size)
-                        char *cdest = (char *)dest;
-                        char *csrc = (char *)src;
-                        for (i=size-1;i>=0;i--) cdest[i] = csrc[i];
-               }      
-+               }
-        }
-        return(dest);
- }
-@@ -334,16 +334,16 @@ void rep_vsyslog (int facility_priority, const char *format, va_list arglist)
-  size_t rep_strnlen(const char *s, size_t max)
- {
-         size_t len;
-  
-+
-         for (len = 0; len < max; len++) {
-                 if (s[len] == '\0') {
-                         break;
-                 }
-         }
-        return len;  
-+        return len;
 }
 #endif
-  
-+
- #ifndef HAVE_STRNDUP
- /**
-  Some platforms don't have strndup.
-@@ -351,7 +351,7 @@ void rep_vsyslog (int facility_priority, const char *format, va_list arglist)
- char *rep_strndup(const char *s, size_t n)
- {
-        char *ret;
-       
-+
-        n = strnlen(s, n);
-        ret = malloc(n+1);
-        if (!ret)
-@@ -407,7 +407,7 @@ int rep_chroot(const char *dname)
- 
- /*****************************************************************
-  Possibly replace mkstemp if it is broken.
-*****************************************************************/  
-+*****************************************************************/
- 
- #ifndef HAVE_SECURE_MKSTEMP
- int rep_mkstemp(char *template)
-@@ -425,7 +425,7 @@ int rep_mkstemp(char *template)
- char *rep_mkdtemp(char *template)
- {
-        char *dname;
-       
-+
-        if ((dname = mktemp(template))) {
-                if (mkdir(dname, 0700) >= 0) {
-                        return dname;
-@@ -532,7 +532,7 @@ long long int rep_strtoll(const char *str, char **endptr, int base)
- {
- #ifdef HAVE_STRTOQ
-        return strtoq(str, endptr, base);
-#elif defined(HAVE___STRTOLL) 
-+#elif defined(HAVE___STRTOLL)
-        return __strtoll(str, endptr, base);
- #elif SIZEOF_LONG == SIZEOF_LONG_LONG
-        return (long long int) strtol(str, endptr, base);
-@@ -568,7 +568,7 @@ unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
- {
- #ifdef HAVE_STRTOUQ
-        return strtouq(str, endptr, base);
-#elif defined(HAVE___STRTOULL) 
-+#elif defined(HAVE___STRTOULL)
-        return __strtoull(str, endptr, base);
- #elif SIZEOF_LONG == SIZEOF_LONG_LONG
-        return (unsigned long long int) strtoul(str, endptr, base);
-@@ -599,7 +599,7 @@ unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
- #endif /* HAVE_STRTOULL */
- 
- #ifndef HAVE_SETENV
-int rep_setenv(const char *name, const char *value, int overwrite) 
-+int rep_setenv(const char *name, const char *value, int overwrite)
- {
-        char *p;
-        size_t l1, l2;
-@@ -644,10 +644,10 @@ int rep_unsetenv(const char *name)
-        for (i=0;environ[i];i++) /* noop */ ;
- 
-        count=i;
-       
-+
-        for (i=0;i<count;) {
-                if (strncmp(environ[i], name, len) == 0 && environ[i][len] == '=') {
-                       /* note: we do _not_ free the old variable here. It is unsafe to 
-+                       /* note: we do _not_ free the old variable here. It is unsafe to
-                           do so, as the pointer may not have come from malloc */
-                        memmove(&environ[i], &environ[i+1], (count-i)*sizeof(char *));
-                        count--;
-@@ -688,7 +688,7 @@ int rep_utimes(const char *filename, const struct timeval tv[2])
- #endif
- 
- #ifndef HAVE_DUP2
-int rep_dup2(int oldfd, int newfd) 
-+int rep_dup2(int oldfd, int newfd)
- {
-        errno = ENOSYS;
-        return -1;
-@@ -965,37 +965,6 @@ void *rep_memset_explicit(void *block, int c, size_t size)
- }
- #endif
- 
 -#ifndef HAVE_MEMSET_S
 -# ifndef RSIZE_MAX
 -#  define RSIZE_MAX (SIZE_MAX >> 1)
@@ -267,7 +58,7 @@ index 8615899..a419837 100644
 -       }
 -
 -#if defined(HAVE_MEMSET_EXPLICIT)
-       memset_explicit(dest, destsz, ch, count);
+-       memset_explicit(dest, ch, count);
 -#else /* HAVE_MEMSET_EXPLICIT */
 -       memset(dest, ch, count);
 -# if defined(HAVE_GCC_VOLATILE_MEMORY_PROTECTION)
diff --git a/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch b/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch
deleted file mode 100644
index e07e86e887..0000000000
--- a/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 9aa5c43315d83c19514251a11c4fba5a137f2821 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Tue, 21 Jan 2025 17:59:27 +0100
-Subject: [PATCH] lib:replace: Don't use deprecated readline CPPFunction cast
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-HAVE_RL_COMPLETION_FUNC_T was unused and not checking for the right
-function.
-libcli/smbreadline/smbreadline.c: In function ‘smb_readline’:
-libcli/smbreadline/smbreadline.c:139:17: warning: ‘CPPFunction’ is deprecated [-Wdeprecated-declarations]
-  139 |                 rl_attempted_completion_function = RL_COMPLETION_CAST completion_fn;
-      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-libcli/smbreadline/smbreadline.c:139:50: error: assignment to ‘char ** (*)(const char *, int,  int)’ from incompatible pointer type ‘char ** (*)(void)’ [-Wincompatible-pointer-types]
-  139 |                 rl_attempted_completion_function = RL_COMPLETION_CAST completion_fn;
-      |                                                  ^
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=15788
-Signed-off-by: Andreas Schneider <asn@samba.org>
-Reviewed-by: Alexander Bokovoy <ab@samba.org>
-Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
-Autobuild-Date(master): Tue Jan 21 19:38:37 UTC 2025 on atb-devel-224
-Upstream-Status: Backport [https://github.com/samba-team/samba/commit/9aa5c43315d83c19514251a11c4fba5a137f2821]
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
- lib/replace/system/readline.h        | 4 +++-
- libcli/smbreadline/wscript_configure | 8 +++++---
- 2 files changed, 8 insertions(+), 4 deletions(-)
-diff --git a/lib/replace/system/readline.h b/lib/replace/system/readline.h
-index 9a9af266ca6d..ac3604fc12e0 100644
--- a/lib/replace/system/readline.h
-+++ b/lib/replace/system/readline.h
-@@ -46,7 +46,9 @@
- #endif
- 
- #ifdef HAVE_NEW_LIBREADLINE
-#ifdef HAVE_CPPFUNCTION
-+#if defined(HAVE_RL_COMPLETION_FUNC_T)
-+#  define RL_COMPLETION_CAST (rl_completion_func_t *)
-+#elif defined(HAVE_CPPFUNCTION)
- #  define RL_COMPLETION_CAST (CPPFunction *)
- #elif defined(HAVE_RL_COMPLETION_T)
- #  define RL_COMPLETION_CAST (rl_completion_t *)
-diff --git a/libcli/smbreadline/wscript_configure b/libcli/smbreadline/wscript_configure
-index 912ff53a150d..f5a401ebae00 100644
--- a/libcli/smbreadline/wscript_configure
-+++ b/libcli/smbreadline/wscript_configure
-@@ -51,10 +51,12 @@ conf.CHECK_CODE('''
- #    endif
- #  endif
- #endif
-int main(void) {rl_completion_t f; return 0;}
-+int main(void) {rl_completion_func_t f; return 0;}
- ''',
-'HAVE_RL_COMPLETION_FUNC_T', execute=False, addmain=False,
-msg='Checking for rl_completion_t')
-+                'HAVE_RL_COMPLETION_FUNC_T',
-+                execute=False,
-+                addmain=False,
-+                msg='Checking for rl_completion_func_t')
- 
- conf.CHECK_CODE('''
- #ifdef HAVE_READLINE_READLINE_H
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.19.9.bb b/meta-networking/recipes-connectivity/samba/samba_4.23.5.bb
index 3ed1d46754..ec3149562a 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.19.9.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.23.5.bb
@@ -14,6 +14,10 @@ ${SAMBA_MIRROR}    http://www.mirrorservice.org/sites/ftp.samba.org \n \
 export PYTHONHASHSEED = "1"
+# If XML_CATALOG_FILES env var is not defined, waf defaults
+# to build host folders looking for catalogs.
+export XML_CATALOG_FILES = ""
 SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
           file://smb.conf \
           file://volatiles.03_samba \
@@ -24,7 +28,6 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
           file://0005-Fix-pyext_PATTERN-for-cross-compilation.patch \
           file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \
           file://0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch \
-           file://9aa5c43315d83c19514251a11c4fba5a137f2821.patch \
           file://0001-lib-replace-Implement-memset_explicit.patch \
           file://0002-lib-replace-Add-test-for-memset_explicit.patch \
           file://0003-Replace-memset_s-with-memset_explicit.patch \
@@ -36,7 +39,7 @@ SRC_URI:append:libc-musl = " \
           file://samba-4.3.9-remove-getpwent_r.patch \
           "
-SRC_URI[sha256sum] = "71ed406444714c90bb9d36c576d807b67af15449f297e91106d42b3ca2fa5549"
+SRC_URI[sha256sum] = "593a43ddd0d57902237dfa76888f7b02cb7fc7747111369cb31e126db4836b9f"
 UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz"
@@ -47,7 +50,7 @@ CVE_STATUS[CVE-2011-2411] = "not-applicable-platform: vulnerable only on HP NonS
 # remove default added RDEPENDS on perl
 RDEPENDS:${PN}:remove = "perl"
-DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 libtasn1-native jansson libparse-yapp-perl-native gnutls cmocka"
+DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libaio libpam libtasn1 libtasn1-native jansson libparse-yapp-perl-native gnutls cmocka ngtcp2 bison-native"
 inherit features_check
 REQUIRED_DISTRO_FEATURES = "pam"
@@ -62,7 +65,7 @@ INITSCRIPT_NAME = "samba"
 INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
 SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind ctdb"
-SYSTEMD_SERVICE:${PN}-base = "nmb.service smb.service"
+SYSTEMD_SERVICE:${PN}-base = "nmb.service smb.service samba-bgqd.service"
 SYSTEMD_SERVICE:${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}"
 SYSTEMD_SERVICE:winbind = "winbind.service"
 SYSTEMD_SERVICE:ctdb = "ctdb.service"
@@ -109,7 +112,7 @@ SAMBA4_MODULES = "${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MO
 # .so files so there will not be a conflict.  This is not done consistantly, so be very careful
 # when adding to this list.
 #
-SAMBA4_LIBS = "heimdal,NONE"
+SAMBA4_LIBS = "heimdal,libquic,NONE"
 EXTRA_OECONF += "--enable-fhs \
                 --with-piddir=/run \
@@ -132,6 +135,19 @@ EXTRA_OECONF += "--enable-fhs \
 LDFLAGS += "-Wl,-z,relro,-z,now"
+do_configure:prepend() {
+    # The xsltproc tool is actually a wrapper script in OE, which exports its own XML_CATALOG_FILES env var
+    # However samba does that too. So here I'm trying to concatenate the variables.
+    # The original looks like this in the wrapper:
+    # export XML_CATALOG_FILES=oe-core-specific-thing
+    # and this sed prepends the value with $XML_CATALOG_FILES, and encloses it in quotes. So the end value is
+    # export XML_CATALOG_FILES="$XML_CATALOG FILES oe-core-specific-thing"
+    # The first grep just checks if it was already done, so it is not prepended multiple times.
+    grep \$XML_CATALOG_FILES ${STAGING_BINDIR_NATIVE}/xsltproc || \
+        sed -i 's,\(XML_CATALOG_FILES\)=\(.*\),\1="\$XML_CATALOG_FILES \2",' ${STAGING_BINDIR_NATIVE}/xsltproc
+}
 do_configure:append() {
    cd ${S}/pidl/
    perl Makefile.PL PREFIX=${prefix}
@@ -213,6 +229,9 @@ do_install:append() {
    find ${D}${libdir}/perl5/ -type f -name "perllocal.pod" -delete
    find ${D}${libdir}/perl5/ -type f -name ".packlist" -delete
    sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${bindir}/pidl
+    sed -i 's,${UNPACKDIR},,g' ${S}/bin/default/libcli/wsp/wsp_aqs_lexer.c
+    sed -i 's,${UNPACKDIR},,g' ${S}/bin/default/libcli/wsp/wsp_aqs_lexer.h
 }
 PACKAGES =+ "${PN}-python3 ${PN}-pidl \
@@ -245,7 +264,7 @@ PACKAGESPLITFUNCS:prepend = "samba_populate_packages "
 PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*"
 RDEPENDS:${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3"
-RDEPENDS:${PN}-python3 += "pytalloc python3-tdb pyldb"
+RDEPENDS:${PN}-python3 += "pytalloc python3-tdb"
 FILES:${PN}-base = "${sbindir}/nmbd \
                    ${sbindir}/smbd \
diff --git a/meta-networking/recipes-connectivity/tailscale/tailscale-go-mods.inc b/meta-networking/recipes-connectivity/tailscale/tailscale-go-mods.inc
index 3cfea84a55..1f9bff8c39 100644
--- a/meta-networking/recipes-connectivity/tailscale/tailscale-go-mods.inc
+++ b/meta-networking/recipes-connectivity/tailscale/tailscale-go-mods.inc
@@ -1,43 +1,54 @@
-SRC_URI += " \
+# This file has been generated by go-mod-update-modules.bbclass
+#
+# Do not modify it by hand, as the contents will be replaced when
+# running the update-modules task.
+SRC_URI += "\
    gomod://filippo.io/edwards25519;version=v1.1.0;sha256sum=9ac43a686d06fdebd719f7af3866c87eb069302272dfb131007adf471c308b65 \
+    gomod://fyne.io/systray;version=v1.11.1-0.20250812065214-4856ac3adc3c;sha256sum=7782bef2e30904a5e34477f713a4c598b1ddf3b3a70deead056549ad22248311 \
+    gomod://github.com/Kodeworks/golang-image-ico;version=v0.0.0-20141118225523-73f0f4cfade9;sha256sum=1d677069e35c4a3e4f290e68c6e2391f6237aee9ce3f39448ed09a2ddab274b0 \
    gomod://github.com/anmitsu/go-shlex;version=v0.0.0-20200514113438-38f4b401e2be;sha256sum=2a5cf7c9a2709f649fd508cbacb2be96e4fba4d534a28a122ee4d7574af40b5e \
-    gomod://github.com/aws/aws-sdk-go-v2;version=v1.36.0;sha256sum=ec276e274bbe39c35d3c2c8c1ec5cba494d6449cd8166d741676cdf0a9d1697b \
+    gomod://github.com/atotto/clipboard;version=v0.1.4;sha256sum=d67b2c36c662751309fd2ec351df3651584bea840bd27be9a90702c3a238b43f \
+    gomod://github.com/aws/aws-sdk-go-v2;version=v1.41.0;sha256sum=869834493118f72f9349f5493959bcd8fc951fa236eecd0095c16322f5b2f53c \
    gomod://github.com/aws/aws-sdk-go-v2/config;version=v1.29.5;sha256sum=ce165d37c7b1dfee2047137f1176c197dc397a5553ef6fc0dba799b21908475b \
    gomod://github.com/aws/aws-sdk-go-v2/credentials;version=v1.17.58;sha256sum=238cc4a98dde7bc3e94dc0f0005c4d988a244daaa9fe4fda706a781ec62bf7e2 \
    gomod://github.com/aws/aws-sdk-go-v2/feature/ec2/imds;version=v1.16.27;sha256sum=408958244a10036461c3a3b27fcdaf20efa3af19168bd527b6617319a754309c \
-    gomod://github.com/aws/aws-sdk-go-v2/internal/configsources;version=v1.3.31;sha256sum=7929b44beec37b00c9ee5269b0f109d7ccc2bb26a8528ab14e0f172076a41205 \
+    gomod://github.com/aws/aws-sdk-go-v2/internal/configsources;version=v1.4.16;sha256sum=5bd82543507e01fab6a9344a995a431682f4061770b25005f9116f43ae539ac4 \
-    gomod://github.com/aws/aws-sdk-go-v2/internal/endpoints/v2;version=v2.6.31;sha256sum=6ae31e302c828ecf80310e85059c49ce44668b8c62aa52fa964b0d745a6f62b1 \
+    gomod://github.com/aws/aws-sdk-go-v2/internal/endpoints/v2;version=v2.7.16;sha256sum=0a4cc94f6843c9c50a1839783123b4664a07d5a67d8a49157304f8550c0c2e39 \
    gomod://github.com/aws/aws-sdk-go-v2/internal/ini;version=v1.8.2;sha256sum=53d1a9a401283711118c91e6e9fdb8193ce6430ca4bbe6b5454bcaaa51e81de0 \
-    gomod://github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding;version=v1.12.2;sha256sum=6ab252b3b962a6b34f0107583f6ff8e4a68e02dcd8df9573e895e5ca60ff139c \
+    gomod://github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding;version=v1.13.4;sha256sum=e9b9e131812d339f4ac2b20bb504caf1cde680e048e15688bd8126ecd300e5e2 \
-    gomod://github.com/aws/aws-sdk-go-v2/service/internal/presigned-url;version=v1.12.12;sha256sum=a92f4383630fa976eeb484b051a6224a8d1d277c4b3ca93a40cce57d06cbbec2 \
+    gomod://github.com/aws/aws-sdk-go-v2/service/internal/presigned-url;version=v1.13.16;sha256sum=1ba321f470ad6ce8673c303386f15136b8fa2f86b23e6a181dbf5c74cb84ef7b \
    gomod://github.com/aws/aws-sdk-go-v2/service/ssm;version=v1.44.7;sha256sum=e09b97aa37ffd7c003a8a2e7574668e92eabd267d2a78d22fb440bcd93a61e46 \
    gomod://github.com/aws/aws-sdk-go-v2/service/sso;version=v1.24.14;sha256sum=9196a430068584c9d1e621aff0a45b32adaf190b4363dddda8b341901e188f51 \
    gomod://github.com/aws/aws-sdk-go-v2/service/ssooidc;version=v1.28.13;sha256sum=acaeca3476410d64512a4d9feefd6c8d16effa76718f72db4ba7b786c7fcc398 \
-    gomod://github.com/aws/aws-sdk-go-v2/service/sts;version=v1.33.13;sha256sum=1800e76ad35287ca7067374b7489ebd7f1d25426c93ae9e40fd73e2a78f29e75 \
+    gomod://github.com/aws/aws-sdk-go-v2/service/sts;version=v1.41.5;sha256sum=de6f3748c40c13e10b790a7c02023aa559b153c251856e3b3940ee47cc0bc007 \
-    gomod://github.com/aws/smithy-go;version=v1.22.2;sha256sum=e5701b5798a3ff01b7139ec07e5bc2010f76cab82523e8989602003d61d82324 \
+    gomod://github.com/aws/smithy-go;version=v1.24.0;sha256sum=655a1e00489bcf29a94cf26878c2f0b3b74c8bfb5d3c566baa3b94e088fbf417 \
    gomod://github.com/coder/websocket;version=v1.8.12;sha256sum=ad8d323970c04679f4566ee7db98946508c37cdd21a46a875d5257d631a9e990 \
    gomod://github.com/coreos/go-iptables;version=v0.7.1-0.20240112124308-65c67c9f46e6;sha256sum=6d0ae6344f1d355f72e6aaba583ce73822861511337ca92cc1c4727fc8ba66dd \
+    gomod://github.com/creachadair/msync;version=v0.7.1;sha256sum=ee8dd1d2cc8a1e555fcfaecc7407425216ee87cd4414093d9a3d8d50fc622e5d \
    gomod://github.com/creack/pty;version=v1.1.23;sha256sum=2151b7121020954864de83eacf854634866cca0a3bfe33a2ebffa2edebc25df3 \
    gomod://github.com/digitalocean/go-smbios;version=v0.0.0-20180907143718-390a4f403a8e;sha256sum=2bc498a09aa55b3417bebacce448b2d2ab757981e59b6b016d08cf97e4a7bdde \
    gomod://github.com/djherbis/times;version=v1.6.0;sha256sum=21d69060967bc03ea3c39ff8c0b1a95511e96eccd3749a2daef1a02af1bc0a85 \
-    gomod://github.com/fxamacker/cbor/v2;version=v2.7.0;sha256sum=b48771460405bab6896c85e21ebc5ff287d4018c6db5c8d822c55769c80dde03 \
+    gomod://github.com/fogleman/gg;version=v1.3.0;sha256sum=792f7a3ea9eea31b7947dabaf9d5a307389245069078e4bf435d76cb0505439c \
+    gomod://github.com/fxamacker/cbor/v2;version=v2.9.0;sha256sum=5b0ec6424bd522aeeeab30cbdcad6f40bf976a9a2ddf125ab27b97826140d97a \
    gomod://github.com/gaissmai/bart;version=v0.18.0;sha256sum=566f2401988b2536055d87f6851ea596518377ee4592176375b84a5ca791fc77 \
-    gomod://github.com/go-json-experiment/json;version=v0.0.0-20250223041408-d3c622f1b874;sha256sum=96edf3942a5665ff2b27f0da4586e2602fe4816dc31e184d3bcd6fbf4cdb13e4 \
+    gomod://github.com/go-json-experiment/json;version=v0.0.0-20250813024750-ebf49471dced;sha256sum=e20ad9cf462e43db906cd2dc237061d6a5b575d10bd4ece52f1857b15a107006 \
    gomod://github.com/godbus/dbus/v5;version=v5.1.1-0.20230522191255-76236955d466;sha256sum=262f43ec87570238a0e770e7fa656dda70fe6050a7edf5addc30287cb64b21a6 \
-    gomod://github.com/golang/groupcache;version=v0.0.0-20210331224755-41bb18bfe9da;sha256sum=b27034e8fc013627543e1ad098cfc65329f2896df3da5cf3266cc9166f93f3a5 \
+    gomod://github.com/golang/freetype;version=v0.0.0-20170609003504-e2365dfdc4a0;sha256sum=cdcb9e6a14933dcbf167b44dcd5083fc6a2e52c4fae8fb79747c691efeb7d84e \
-    gomod://github.com/google/btree;version=v1.1.2;sha256sum=faee8550c5fffb4ae1dadde5ccaccb13298726f9fad226bb4eed0c03c90a481d \
+    gomod://github.com/golang/groupcache;version=v0.0.0-20241129210726-2c02b8208cf8;sha256sum=163367355442a630b12b0b452892cd98e99fcfdf7e40b68d358be73479cc1c23 \
+    gomod://github.com/google/btree;version=v1.1.3;sha256sum=11b736bc8252b52fecdf346d3707ccf3a2b6d458ba21b4f843616fc12eeb30b2 \
    gomod://github.com/google/go-tpm;version=v0.9.4;sha256sum=a8a5e504fbd78284a50e6ab625f6248cfbb89421fafdfee71d66abc6e1dfc192 \
    gomod://github.com/google/nftables;version=v0.2.1-0.20240414091927-5e242ec57806;sha256sum=ceb96b39a6f9004d8c217a6ae61b91a69c250bc30fbf3a04cd87cbbfddea73c8 \
-    gomod://github.com/gorilla/csrf;version=v1.7.3;sha256sum=39923b0dde0b8be30d3572589a8cc2ea515ca36a3e542269645db36aff7d6842 \
-    gomod://github.com/gorilla/securecookie;version=v1.1.2;sha256sum=fd7c0de7000c2e6a123d73e1249e1dce892ba29d2d03b00dc81d5fcee41d5895 \
    gomod://github.com/hdevalence/ed25519consensus;version=v0.2.0;sha256sum=111cafade3ba9c7c3adf66b6a424386e30829c46c60b80dabe288e1837d30e33 \
+    gomod://github.com/huin/goupnp;version=v1.3.0;sha256sum=df663b90b9b3bf16e1cfa810a6c3dd904993e8c1155dbf65566ce0361f163dce \
    gomod://github.com/illarion/gonotify/v3;version=v3.0.2;sha256sum=fef3e17f676c8ce98b60f0e2180fc4e3331e6e1604eaf96ab8791e073f96a7af \
    gomod://github.com/insomniacslk/dhcp;version=v0.0.0-20231206064809-8c70d406f6d2;sha256sum=be28971fb642a9c4cf9f16e07332310af05c291584b6440b32849ca058dd345d \
    gomod://github.com/jellydator/ttlcache/v3;version=v3.1.0;sha256sum=278dfc9b4882eaeb9b56e925b574028f3e9cc4436645b93f56ccb69de134a898 \
    gomod://github.com/jmespath/go-jmespath;version=v0.4.0;sha256sum=d1f77b6790d7c4321a74260f3675683d3ac06b0a614b5f83e870beae0a8b2867 \
    gomod://github.com/jsimonetti/rtnetlink;version=v1.4.0;sha256sum=81625291f4d0a08718dfd2170873d1adfd8fc2248657584f520c4de6de9e2e4d \
    gomod://github.com/kballard/go-shellquote;version=v0.0.0-20180428030007-95032a82bc51;sha256sum=ae4cb7b097dc4eb0c248dff00ed3bbf0f36984c4162ad1d615266084e58bd6cc \
-    gomod://github.com/klauspost/compress;version=v1.17.11;sha256sum=88dea800cc6a11ccb9dd2f0dd487f30e8701870abdfc11245e41dcfc9f3d428e \
+    gomod://github.com/klauspost/compress;version=v1.18.2;sha256sum=f6f550ecff746f6585db9529a29109e70da0038a8e0e142959567f2207183490 \
    gomod://github.com/kortschak/wol;version=v0.0.0-20200729010619-da482cc4850a;sha256sum=09c15500a0ef54af0796f37282dd5377d2b866e4c36c87dcb6b2894cf3114dc5 \
    gomod://github.com/kr/fs;version=v0.1.0;sha256sum=d376bd98e81aea34585fc3b04bab76363e9e87cde69383964e57e9779f2af81e \
    gomod://github.com/mattn/go-colorable;version=v0.1.13;sha256sum=08be322dcc584a9fcfde5caf0cf878b4e11cd98f252e32bc704e92c5a4ba9d15 \
@@ -46,38 +57,39 @@ SRC_URI += " \
    gomod://github.com/mdlayher/netlink;version=v1.7.3-0.20250113171957-fbb4dce95f42;sha256sum=b427c8c746e87c2f8033678fb87cdcf5cefb21ce16f35930eff91683661395f0 \
    gomod://github.com/mdlayher/sdnotify;version=v1.0.0;sha256sum=26f4efbcba73eaec323973c8ae335bad430e5d6947097976cfbe7c9547f68c90 \
    gomod://github.com/mdlayher/socket;version=v0.5.0;sha256sum=931626341956178fe6015b128fdda22283480d05dc964675307eb61ed39c29fe \
-    gomod://github.com/miekg/dns;version=v1.1.58;sha256sum=179bd419d011fd90802355756f59fff70ddf9a5886a4db6336a6d05783552b16 \
    gomod://github.com/mitchellh/go-ps;version=v1.0.0;sha256sum=f2f0400b1d5e136419daed275c27a930b0f5447ac12bb8acd3ddbe39547b2834 \
    gomod://github.com/peterbourgon/ff/v3;version=v3.4.0;sha256sum=b49537268ce67eb755d773fdd2a3e1c9c6dec0731993a4f742080416eb9b12a6 \
    gomod://github.com/pierrec/lz4/v4;version=v4.1.21;sha256sum=bd2e8ef13800ca42205b0d4085a927a6d012b82cfa831769be4830036e953bec \
+    gomod://github.com/pires/go-proxyproto;version=v0.8.1;sha256sum=a979a2f26160bfcb6f3829dd546d5f53c8b1879e7ad84466e359cf3f6237aa4c \
    gomod://github.com/pkg/sftp;version=v1.13.6;sha256sum=0cdf6bd0edef9db8137ce398c9bbe514713e42cf2d4d415b5025f4a3c33f249d \
    gomod://github.com/safchain/ethtool;version=v0.3.0;sha256sum=bfa1a3fe314a3f2ac4c4385a6c4694708e4881bfd86c34668eca92656e398590 \
    gomod://github.com/skip2/go-qrcode;version=v0.0.0-20200617195104-da1b6568686e;sha256sum=3fc1c4d11c79001d1cc2df0de87493b324b9af141cc59ae8c212612dd2c90e90 \
-    gomod://github.com/tailscale/goupnp;version=v1.0.1-0.20210804011211-c64d0f06ea05;sha256sum=1c7ed6ecc16b6f402c225bae88a067a8bc1574cded894638b820c5da751823cc \
    gomod://github.com/tailscale/hujson;version=v0.0.0-20221223112325-20486734a56a;sha256sum=8e65bacebfc0a1edc067fd97f839fcfeb93c1e7b8cc0186d1773cff4e125d9d5 \
    gomod://github.com/tailscale/netlink;version=v1.1.1-0.20240822203006-4d49adab4de7;sha256sum=a5195ef600f8d9a0fb8501eea85e4fe0321a74bd57dec88f07b8569d0ee4f55e \
    gomod://github.com/tailscale/peercred;version=v0.0.0-20250107143737-35a0c7bd7edc;sha256sum=87d0f4f3b1d59ea45c9a87b775b615bebd721a5870dafedc63cc860ec4aac281 \
    gomod://github.com/tailscale/web-client-prebuilt;version=v0.0.0-20250124233751-d4cd19a26976;sha256sum=1d02f0804bb41e0743b7d889b8e2dbd8466a89793f03997f4c1fd10f9e8974c3 \
-    gomod://github.com/tailscale/wireguard-go;version=v0.0.0-20250304000100-91a0587fb251;sha256sum=7b82eb990f2f3686d335cdff5e988f8d4e27e031d563fb0e37bce1a3b0c5a83f \
+    gomod://github.com/tailscale/wireguard-go;version=v0.0.0-20250716170648-1d0488a3d7da;sha256sum=1f2957ab7cac9bc031c570ce8420b100171f5068bd5feee084bf6bccdfc9740d \
    gomod://github.com/tailscale/xnet;version=v0.0.0-20240729143630-8497ac4dab2e;sha256sum=438abf28ce5fb03adf529c2cb57a451f9b243c4a2a181d9d06cdb61bb10960e7 \
    gomod://github.com/toqueteos/webbrowser;version=v1.2.0;sha256sum=1227d3ebeab16d8232a304a10b087984a96ad30f7439b6687bab2f5747d308cf \
    gomod://github.com/u-root/u-root;version=v0.14.0;sha256sum=a65c0a06236b10a0cea50e603fef0ced0c7e343a66ef957a45ebcd51f304d286 \
    gomod://github.com/u-root/uio;version=v0.0.0-20240224005618-d2acac8f3701;sha256sum=f6e8f912e968744999d508c3df54f0308aaf337052a8d0bd3edd72583adfd9cd \
-    gomod://github.com/vishvananda/netns;version=v0.0.4;sha256sum=cdaebcd80614800a74537e59855730d42393ffc109ebd47e5b8437dcc4d7f429 \
+    gomod://github.com/vishvananda/netns;version=v0.0.5;sha256sum=07804b88c922c2a6780efe392ffef9d126eac584384eb3eb17bcadd34cfa9422 \
    gomod://github.com/x448/float16;version=v0.8.4;sha256sum=73b24a41037ea999ab66851e3798a0973dbb1f214925915b01f0820f7b2f1500 \
+    gomod://go.yaml.in/yaml/v2;version=v2.4.2;sha256sum=ed63e181cbb5a991c104639b0e6d48d45fd951f22b47d4c5d1a36156d8ed06ee \
    gomod://go4.org/mem;version=v0.0.0-20240501181205-ae6ca9944745;sha256sum=9b5037a57122457fdc5c2c0a31e3996b44cf9dfcdee5c53ed72adfd88d077795 \
    gomod://go4.org/netipx;version=v0.0.0-20231129151722-fdeea329fbba;sha256sum=e15f57de368c92b826010181906f26112ba3a0d7fde7d94c8a8c60c525dc4044 \
-    gomod://golang.org/x/crypto;version=v0.37.0;sha256sum=7ce6b2be21be1ce9e04dc784830e08931f09b5903596b8017839322c9e828667 \
+    gomod://golang.org/x/crypto;version=v0.46.0;sha256sum=5f2921ccdf7252ffbe26046948c6044ab0917e500a34710e0ba6664260d6a460 \
-    gomod://golang.org/x/exp;version=v0.0.0-20250210185358-939b2ce775ac;sha256sum=de413a97994a7b97541cb1f867439fa20b60361d79dc35e8e2faf847a2a188df \
+    gomod://golang.org/x/exp;version=v0.0.0-20250620022241-b7579e27df2b;sha256sum=fdaae8f1b98727b49d10228492b2dee1b8c68d12f640a4f17f0fb175581bf547 \
-    gomod://golang.org/x/net;version=v0.36.0;sha256sum=e823a351657b349cd8a705079778769534d90a5c3a6c7caed174a79608257d12 \
+    gomod://golang.org/x/image;version=v0.27.0;sha256sum=db4846c8edb8cdcb556d205840361f62382df9bd5946b756e700c5fb43d90332 \
-    gomod://golang.org/x/oauth2;version=v0.26.0;sha256sum=d4c1bfc661b8ff3ccb3d5d30babf5f67798b59e2bfa932b6f1f739e67e45dcda \
+    gomod://golang.org/x/net;version=v0.48.0;sha256sum=cf5206797e66bbe72fc13542d53a57d069a563cebb6d045c07a870eb4fd888c9 \
-    gomod://golang.org/x/sync;version=v0.13.0;sha256sum=4bdaaffe69cc7c997cff97cd81dc9c6777777bd311175f100f76b049bbbe7ed9 \
+    gomod://golang.org/x/oauth2;version=v0.32.0;sha256sum=64c855b335cc2e90b2d88c1fe6c3a31de53c3ca76fc9c89e6ce266c7334b768b \
-    gomod://golang.org/x/sys;version=v0.32.0;sha256sum=85d47075d21fd7ef35d9a47fc73f2356fb3cd2e7fab7f45c874b814bf312127d \
+    gomod://golang.org/x/sync;version=v0.19.0;sha256sum=25211fe2cffd8020bb405b9adb7a90f5e06760f2818b8fb2e74aaaa21a66ed9e \
-    gomod://golang.org/x/term;version=v0.31.0;sha256sum=bdeda753791b44f6815ccf3367ff57ffaca9bb100bfe8ebe112c8da133e78aec \
+    gomod://golang.org/x/sys;version=v0.40.0;sha256sum=d7f9fe44300fc8d47b30d06cd001d9c62c54c6119818a19a2e33a93538971669 \
-    gomod://golang.org/x/text;version=v0.24.0;sha256sum=f585335a57a6fa5fa0c0bf319b45f0909e5ff1aba91e8567187ba8e423084c00 \
+    gomod://golang.org/x/term;version=v0.38.0;sha256sum=00cec8beae98bb5a15c9ee9e8e705b7cab9c50269e7858bff98df0533b317363 \
-    gomod://golang.org/x/time;version=v0.10.0;sha256sum=7420a12017bb47bd85ccab81f9d1f7a3ff6daf8da768256292bc1dbb3bf9ba63 \
+    gomod://golang.org/x/text;version=v0.32.0;sha256sum=bc6c70d37c37bc625a83abd48ee32372b459a8c559a1cf5f25dfbf7c7941f81b \
+    gomod://golang.org/x/time;version=v0.12.0;sha256sum=cdcb04c43b112919c5e0d0fa1d90769124ad56918a44e6cb0747876ed7e5015c \
    gomod://gvisor.dev/gvisor;version=v0.0.0-20250205023644-9414b50a5633;sha256sum=b373e677e77f28c095b43ed976f5d9ca885d3b1b5407a71a5691e4a47e813bd0 \
-    gomod://k8s.io/client-go;version=v0.32.0;sha256sum=74ee50d42da263c0743212c17a12f16d8a3283f31f7c9209c6327b6656ac1550 \
+    gomod://k8s.io/client-go;version=v0.34.0;sha256sum=3ede34d9df9dcb02779a631ca9c653f92db3714ee887c6fdd86a66bc4889d2c0 \
-    gomod://sigs.k8s.io/yaml;version=v1.4.0;sha256sum=ef031ff78ff9b7036e174eef49dfbd77468dc4f0afb73a639b61f8ab3a1cc425 \
+    gomod://sigs.k8s.io/yaml;version=v1.6.0;sha256sum=cf88648a471581817b00a42ee8d24fd73eb0e3503998cf46d8e63787e11e5052 \
    gomod://software.sslmate.com/src/go-pkcs12;version=v0.4.0;sha256sum=55019a391e5302a51ba62e98909e006224b81207866da90beaf582ec0dee036f \
 "
diff --git a/meta-networking/recipes-connectivity/tailscale/tailscale-licenses.inc b/meta-networking/recipes-connectivity/tailscale/tailscale-licenses.inc
index 53d46dd45c..f1adacfc09 100644
--- a/meta-networking/recipes-connectivity/tailscale/tailscale-licenses.inc
+++ b/meta-networking/recipes-connectivity/tailscale/tailscale-licenses.inc
@@ -1,43 +1,60 @@
-LIC_FILES_CHKSUM += " \
+# This file has been generated by go-mod-update-modules.bbclass
+#
+# Unknown licenses have been checked manually and completed.
+#
+LICENSE += "& Apache-2.0 & BSD-2-Clause & BSD-3-Clause & ISC & MIT"
+LIC_FILES_CHKSUM += "\
    file://pkg/mod/filippo.io/edwards25519@v1.1.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707;spdx=BSD-3-Clause \
+    file://pkg/mod/fyne.io/systray@v1.11.1-0.20250812065214-4856ac3adc3c/LICENSE;md5=a2be13cb34e811436f5388f0a19cc0b0;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/!kodeworks/golang-image-ico@v0.0.0-20141118225523-73f0f4cfade9/LICENSE;md5=591778525c869cdde0ab5a1bf283cd81;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/anmitsu/go-shlex@v0.0.0-20200514113438-38f4b401e2be/LICENSE;md5=45a47c50f5b33ff9ab3347c7db1bfb6a;spdx=MIT \
-    file://pkg/mod/github.com/aws/aws-sdk-go-v2@v1.36.0/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/atotto/clipboard@v0.1.4/LICENSE;md5=489200b65f13bcbcb890a96b99a58a6f;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/aws/aws-sdk-go-v2/config@v1.29.5/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
    file://pkg/mod/github.com/aws/aws-sdk-go-v2/credentials@v1.17.58/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
    file://pkg/mod/github.com/aws/aws-sdk-go-v2/feature/ec2/imds@v1.16.27/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
-    file://pkg/mod/github.com/aws/aws-sdk-go-v2/internal/configsources@v1.3.31/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/aws/aws-sdk-go-v2/internal/configsources@v1.4.16/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
-    file://pkg/mod/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2@v2.6.31/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2@v2.7.16/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
    file://pkg/mod/github.com/aws/aws-sdk-go-v2/internal/ini@v1.8.2/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
-    file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding@v1.12.2/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding@v1.13.4/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
-    file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url@v1.12.12/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url@v1.13.16/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
    file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/ssm@v1.44.7/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
    file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/sso@v1.24.14/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
    file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/ssooidc@v1.28.13/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
-    file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/sts@v1.33.13/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/aws/aws-sdk-go-v2/service/sts@v1.41.5/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
-    file://pkg/mod/github.com/aws/smithy-go@v1.22.2/LICENSE;md5=34400b68072d710fecd0a2940a0d1658;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/aws/aws-sdk-go-v2@v1.41.0/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/aws/aws-sdk-go-v2@v1.41.0/internal/sync/singleflight/LICENSE;md5=bdc234595bc2fe370918f5de5077c8e9;spdx=BSD-3-Clause \
+    file://pkg/mod/github.com/aws/smithy-go@v1.24.0/LICENSE;md5=34400b68072d710fecd0a2940a0d1658;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/aws/smithy-go@v1.24.0/internal/sync/singleflight/LICENSE;md5=bdc234595bc2fe370918f5de5077c8e9;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/coder/websocket@v1.8.12/LICENSE.txt;md5=bc0b6f68116166556efe7184edfda3e9;spdx=ISC \
    file://pkg/mod/github.com/coreos/go-iptables@v0.7.1-0.20240112124308-65c67c9f46e6/LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/creachadair/msync@v0.7.1/LICENSE;md5=b8be277519c5ee121454d43de171668a;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/creack/pty@v1.1.23/LICENSE;md5=93958070863d769117fa33b129020050;spdx=MIT \
    file://pkg/mod/github.com/digitalocean/go-smbios@v0.0.0-20180907143718-390a4f403a8e/LICENSE.md;md5=c1653934903ab2785c09c2bdd7344526;spdx=Apache-2.0 \
    file://pkg/mod/github.com/djherbis/times@v1.6.0/LICENSE;md5=3cafd141825e7a44b1c6a047b2320012;spdx=MIT \
-    file://pkg/mod/github.com/fxamacker/cbor/v2@v2.7.0/LICENSE;md5=827f5a2fa861382d35a3943adf9ebb86;spdx=MIT \
+    file://pkg/mod/github.com/fogleman/gg@v1.3.0/LICENSE.md;md5=1630f0e1bac38694fdc4dcb6a9218f4a;spdx=MIT \
+    file://pkg/mod/github.com/fxamacker/cbor/v2@v2.9.0/LICENSE;md5=827f5a2fa861382d35a3943adf9ebb86;spdx=MIT \
    file://pkg/mod/github.com/gaissmai/bart@v0.18.0/LICENSE;md5=05779e437ec35570aca43cc66a95e056;spdx=MIT \
-    file://pkg/mod/github.com/go-json-experiment/json@v0.0.0-20250223041408-d3c622f1b874/LICENSE;md5=9d210c7471ce08e3db5261f33bf8fce6;spdx=BSD-3-Clause \
+    file://pkg/mod/github.com/go-json-experiment/json@v0.0.0-20250813024750-ebf49471dced/LICENSE;md5=9d210c7471ce08e3db5261f33bf8fce6;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/godbus/dbus/v5@v5.1.1-0.20230522191255-76236955d466/LICENSE;md5=09042bd5c6c96a2b9e45ddf1bc517eed;spdx=BSD-2-Clause \
-    file://pkg/mod/github.com/golang/groupcache@v0.0.0-20210331224755-41bb18bfe9da/LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/golang/freetype@v0.0.0-20170609003504-e2365dfdc4a0/LICENSE;md5=8e050e4860234723098ceeefa49edd05;spdx=BSD-3-Clause \
-    file://pkg/mod/github.com/google/btree@v1.1.2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/golang/groupcache@v0.0.0-20241129210726-2c02b8208cf8/LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/google/btree@v1.1.3/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
    file://pkg/mod/github.com/google/go-tpm@v0.9.4/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
    file://pkg/mod/github.com/google/nftables@v0.2.1-0.20240414091927-5e242ec57806/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
-    file://pkg/mod/github.com/gorilla/csrf@v1.7.3/LICENSE;md5=c30eee78985cf2584cded5f89ba3d787;spdx=BSD-3-Clause \
-    file://pkg/mod/github.com/gorilla/securecookie@v1.1.2/LICENSE;md5=c30eee78985cf2584cded5f89ba3d787;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/hdevalence/ed25519consensus@v0.2.0/LICENSE;md5=4041895a1f717acb5be52e24edb19917;spdx=BSD-3-Clause \
+    file://pkg/mod/github.com/huin/goupnp@v1.3.0/LICENSE;md5=3d7eee8afacfccb446c1ac30289c965d;spdx=BSD-2-Clause \
    file://pkg/mod/github.com/illarion/gonotify/v3@v3.0.2/LICENSE;md5=6b631a3123c7c679195702a8a35c9f21;spdx=MIT \
    file://pkg/mod/github.com/insomniacslk/dhcp@v0.0.0-20231206064809-8c70d406f6d2/LICENSE;md5=ceaf33b8b657b2d342dbd3bb59578d8a;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/jellydator/ttlcache/v3@v3.1.0/LICENSE;md5=4cea77626c625d583c98a85a8658f9d2;spdx=MIT \
    file://pkg/mod/github.com/jmespath/go-jmespath@v0.4.0/LICENSE;md5=9abfa8353fce3f2cb28364e1e9016852;spdx=Apache-2.0 \
    file://pkg/mod/github.com/jsimonetti/rtnetlink@v1.4.0/LICENSE.md;md5=75a8090d4c02945ad9d61c7cce77ed48;spdx=MIT \
    file://pkg/mod/github.com/kballard/go-shellquote@v0.0.0-20180428030007-95032a82bc51/LICENSE;md5=9d95d1ad917c814c23909addb8692eeb;spdx=MIT \
-    file://pkg/mod/github.com/klauspost/compress@v1.17.11/LICENSE;md5=d0fd9ebda39468b51ff4539c9fbb13a8;spdx=BSD-3-Clause \
+    file://pkg/mod/github.com/klauspost/compress@v1.18.2/LICENSE;md5=d0fd9ebda39468b51ff4539c9fbb13a8;spdx=BSD-3-Clause \
+    file://pkg/mod/github.com/klauspost/compress@v1.18.2/internal/snapref/LICENSE;md5=b8b79c7d4cda128290b98c6a21f9aac6;spdx=BSD-3-Clause \
+    file://pkg/mod/github.com/klauspost/compress@v1.18.2/zstd/internal/xxhash/LICENSE.txt;md5=802da049c92a99b4387d3f3d91b00fa9;spdx=MIT \
    file://pkg/mod/github.com/kortschak/wol@v0.0.0-20200729010619-da482cc4850a/LICENSE;md5=5a0acdb344844a21e2df8bc2e1fe5f2d;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/kr/fs@v0.1.0/LICENSE;md5=591778525c869cdde0ab5a1bf283cd81;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/mattn/go-colorable@v0.1.13/LICENSE;md5=24ce168f90aec2456a73de1839037245;spdx=MIT \
@@ -46,40 +63,39 @@ LIC_FILES_CHKSUM += " \
    file://pkg/mod/github.com/mdlayher/netlink@v1.7.3-0.20250113171957-fbb4dce95f42/LICENSE.md;md5=e08504321a9b3e86ee07433c231b33f1;spdx=MIT \
    file://pkg/mod/github.com/mdlayher/sdnotify@v1.0.0/LICENSE.md;md5=a57b2e272a0c75c413c784bb877cda50;spdx=MIT \
    file://pkg/mod/github.com/mdlayher/socket@v0.5.0/LICENSE.md;md5=bdcb2fcb7aea8a34d189ef572a59ff88;spdx=MIT \
-    file://pkg/mod/github.com/miekg/dns@v1.1.58/LICENSE;md5=b5215dfec2c591290f399a181669bef7;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/mitchellh/go-ps@v1.0.0/LICENSE.md;md5=56da355a12d4821cda57b8f23ec34bc4;spdx=MIT \
    file://pkg/mod/github.com/peterbourgon/ff/v3@v3.4.0/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e;spdx=Apache-2.0 \
    file://pkg/mod/github.com/pierrec/lz4/v4@v4.1.21/LICENSE;md5=09ece85f3c312a63b522bfc6ebd44943;spdx=BSD-3-Clause \
+    file://pkg/mod/github.com/pires/go-proxyproto@v0.8.1/LICENSE;md5=ebfe2201eab4c067477cc534908ac12f;spdx=Apache-2.0 \
    file://pkg/mod/github.com/pkg/sftp@v1.13.6/LICENSE;md5=452fc5cc5a9127a0e828d73423d45035;spdx=BSD-2-Clause \
    file://pkg/mod/github.com/safchain/ethtool@v0.3.0/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc;spdx=Apache-2.0 \
    file://pkg/mod/github.com/skip2/go-qrcode@v0.0.0-20200617195104-da1b6568686e/LICENSE;md5=515c25e1450ede2834397875c18439d4;spdx=MIT \
-    file://pkg/mod/github.com/tailscale/goupnp@v1.0.1-0.20210804011211-c64d0f06ea05/LICENSE;md5=3d7eee8afacfccb446c1ac30289c965d;spdx=BSD-2-Clause \
    file://pkg/mod/github.com/tailscale/hujson@v0.0.0-20221223112325-20486734a56a/LICENSE;md5=073f7ac93b9172ac4e1d258584fc0271;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/tailscale/netlink@v1.1.1-0.20240822203006-4d49adab4de7/LICENSE;md5=2ade771c7d7211af507864e8dd520529;spdx=Apache-2.0 \
    file://pkg/mod/github.com/tailscale/peercred@v0.0.0-20250107143737-35a0c7bd7edc/LICENSE;md5=94eaeed21686fd9816f57f86b9914071;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/tailscale/web-client-prebuilt@v0.0.0-20250124233751-d4cd19a26976/LICENSE;md5=a672713a9eb730050e491c92edf7984d;spdx=BSD-3-Clause \
-    file://pkg/mod/github.com/tailscale/wireguard-go@v0.0.0-20250304000100-91a0587fb251/LICENSE;md5=995598bc9de2b4c987c2cb87fc24f341;spdx=MIT \
+    file://pkg/mod/github.com/tailscale/wireguard-go@v0.0.0-20250716170648-1d0488a3d7da/LICENSE;md5=995598bc9de2b4c987c2cb87fc24f341;spdx=MIT \
    file://pkg/mod/github.com/tailscale/xnet@v0.0.0-20240729143630-8497ac4dab2e/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/toqueteos/webbrowser@v1.2.0/LICENSE.md;md5=6072d29ffa4b14338ff8fd68f17f6851;spdx=MIT \
    file://pkg/mod/github.com/u-root/u-root@v0.14.0/LICENSE;md5=bf431bf303eaf01f17bef6624d9f2208;spdx=BSD-3-Clause \
    file://pkg/mod/github.com/u-root/uio@v0.0.0-20240224005618-d2acac8f3701/LICENSE;md5=52bf39fc1e426b6459f5c9a142e5bfbd;spdx=BSD-3-Clause \
-    file://pkg/mod/github.com/vishvananda/netns@v0.0.4/LICENSE;md5=2ade771c7d7211af507864e8dd520529;spdx=Apache-2.0 \
+    file://pkg/mod/github.com/vishvananda/netns@v0.0.5/LICENSE;md5=2ade771c7d7211af507864e8dd520529;spdx=Apache-2.0 \
    file://pkg/mod/github.com/x448/float16@v0.8.4/LICENSE;md5=de8f8e025d57fe7ee0b67f30d571323b;spdx=MIT \
+    file://pkg/mod/go.yaml.in/yaml/v2@v2.4.2/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e;spdx=Apache-2.0 \
    file://pkg/mod/go4.org/mem@v0.0.0-20240501181205-ae6ca9944745/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc;spdx=Apache-2.0 \
    file://pkg/mod/go4.org/netipx@v0.0.0-20231129151722-fdeea329fbba/LICENSE;md5=628df198dc9e033b86b8eedff039ff86;spdx=BSD-3-Clause \
-    file://pkg/mod/golang.org/x/crypto@v0.37.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
+    file://pkg/mod/golang.org/x/crypto@v0.46.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
-    file://pkg/mod/golang.org/x/exp@v0.0.0-20250210185358-939b2ce775ac/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
+    file://pkg/mod/golang.org/x/exp@v0.0.0-20250620022241-b7579e27df2b/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
-    file://pkg/mod/golang.org/x/net@v0.36.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
+    file://pkg/mod/golang.org/x/image@v0.27.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
-    file://pkg/mod/golang.org/x/oauth2@v0.26.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
+    file://pkg/mod/golang.org/x/net@v0.48.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
-    file://pkg/mod/golang.org/x/sync@v0.13.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
+    file://pkg/mod/golang.org/x/oauth2@v0.32.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
-    file://pkg/mod/golang.org/x/sys@v0.32.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
+    file://pkg/mod/golang.org/x/sync@v0.19.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
-    file://pkg/mod/golang.org/x/term@v0.31.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
+    file://pkg/mod/golang.org/x/sys@v0.40.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
-    file://pkg/mod/golang.org/x/text@v0.24.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
+    file://pkg/mod/golang.org/x/term@v0.38.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
-    file://pkg/mod/golang.org/x/time@v0.10.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
+    file://pkg/mod/golang.org/x/text@v0.32.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
+    file://pkg/mod/golang.org/x/time@v0.12.0/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a;spdx=BSD-3-Clause \
    file://pkg/mod/gvisor.dev/gvisor@v0.0.0-20250205023644-9414b50a5633/LICENSE;md5=fbbaf7613c100c84b8f20701859dee2d;spdx=MIT+%26+Apache-2.0 \
-    file://pkg/mod/k8s.io/client-go@v0.32.0/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
+    file://pkg/mod/k8s.io/client-go@v0.34.0/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \
-    file://pkg/mod/sigs.k8s.io/yaml@v1.4.0/LICENSE;md5=b5d30dd5bc47d1b56b678ac06dead1c7;spdx=MIT+%26+Apache-2.0+%26+BSD-3-Clause \
+    file://pkg/mod/sigs.k8s.io/yaml@v1.6.0/LICENSE;md5=b5d30dd5bc47d1b56b678ac06dead1c7;spdx=BSD-3-Clause \
    file://pkg/mod/software.sslmate.com/src/go-pkcs12@v0.4.0/LICENSE;md5=259f3802525423b1a33efb1b85f64e18;spdx=BSD-3-Clause \
 "
-LICENSE += " & Apache-2.0 & BSD-2-Clause & BSD-3-Clause & ISC & MIT"
diff --git a/meta-networking/recipes-connectivity/tailscale/tailscale_1.84.3.bb b/meta-networking/recipes-connectivity/tailscale/tailscale_1.94.2.bb
index 33ae1925d5..7a60d6833c 100644
--- a/meta-networking/recipes-connectivity/tailscale/tailscale_1.84.3.bb
+++ b/meta-networking/recipes-connectivity/tailscale/tailscale_1.94.2.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/tailscale/tailscale.git;protocol=https;branch=releas
           file://default \
           file://tailscaled.init \
           "
-SRCREV = "7648989bc54738b1e40dde74fa822984a63cbc05"
+SRCREV = "2de4d317a8c2595904f1563ebd98fdcf843da275"
 SRCREV_SHORT = "${@d.getVar('SRCREV')[:8]}"
 require ${BPN}-go-mods.inc
@@ -22,7 +22,10 @@ GO_LINKSHARED = ""
 GOBUILDFLAGS:prepend = "-tags=${@','.join(d.getVar('PACKAGECONFIG_CONFARGS').split())} "
 GO_EXTRA_LDFLAGS = "-X tailscale.com/version.longStamp=${PV}-${SRCREV_SHORT} -X tailscale.com/version.shortStamp=${PV}"
-inherit go-mod \
+# Pass build tags so go list in update-modules discovers all conditional deps
+export GOFLAGS = "-tags=${@','.join(d.getVar('PACKAGECONFIG_CONFARGS').split())}"
+inherit go-mod go-mod-update-modules \
    ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'update-rc.d', '', d)} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}
diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.9.0.bb b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.9.1.bb
index a2d6455d93..2978ff1cc1 100644
--- a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.9.0.bb
+++ b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.9.1.bb
@@ -17,7 +17,7 @@ SRC_URI = " \
    file://run-ptest \
 "
-SRCREV = "922d04b3568c6428a9fb905ddee3ef5a68db3108"
+SRCREV = "1d363f3adceba9d1478230ede476a37b0dcdef24"
 inherit autotools ptest
@@ -46,3 +46,26 @@ do_install_ptest() {
    cp -rf ${S}/certs  ${D}${PTEST_PATH}
    cp -rf ${S}/tests  ${D}${PTEST_PATH}
 }
+CVE_STATUS[CVE-2026-0819] = "fixed-version: fixed in 5.9.0"
+CVE_STATUS[CVE-2026-2646] = "fixed-version: fixed in 5.9.0"
+CVE_STATUS[CVE-2026-3503] = "fixed-version: fixed in 5.9.0"
+CVE_STATUS[CVE-2026-3548] = "fixed-version: fixed in 5.9.0"
+CVE_STATUS[CVE-2026-5188] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5194] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5263] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5264] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5392] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5393] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5446] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5447] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5448] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5460] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5466] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5479] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5500] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5503] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5504] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5507] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5772] = "fixed-version: fixed in 5.9.1"
+CVE_STATUS[CVE-2026-5778] = "fixed-version: fixed in 5.9.1"
diff --git a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb b/meta-networking/recipes-daemons/atftp/atftp_0.8.1.bb
index 9db0aebccb..ecd55684f5 100644
--- a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb
+++ b/meta-networking/recipes-daemons/atftp/atftp_0.8.1.bb
@@ -2,9 +2,9 @@ SUMMARY = "Advanced TFTP server and client"
 SECTION = "net"
 HOMEPAGE = "http://packages.debian.org/atftp"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f65159f73e603f89d6867d43191900e5"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=570a9b3749dd0463a1778803b12a6dce"
-SRCREV = "d5c27eb7a9695d83569767e27ef69674173db39a"
+SRCREV = "7238b7b6753157d0c4ad739df3d87a958f78d70b"
 SRC_URI = "git://git.code.sf.net/p/atftp/code;branch=master;protocol=https \
           file://atftpd.init \
diff --git a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5a.bb b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5b.bb
index 611795e17d..e7279013ed 100644
--- a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5a.bb
+++ b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5b.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=05d17535846895e23ea4c79b16a9e904"
 SRC_URI = "git://github.com/obgm/libcoap.git;branch=release-4.3.5-patches;protocol=https;tag=v${PV} \
           file://run-ptest \
           "
-SRCREV = "e3fdcdcfbd1588754fe9dd4b754ac9397260f0f9"
+SRCREV = "851533c3cf63d16984d370ce39d586ecb3694971"
 # patch releases often use alphabetical suffixes
 CVE_VERSION_SUFFIX = "alphabetical"
diff --git a/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35091.patch b/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35091.patch
new file mode 100644
index 0000000000..8afa5d6841
--- /dev/null
+++ b/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35091.patch
@@ -0,0 +1,47 @@
+From b9cb461121c8721c94a94309eb345a3c2f9ee9b4 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <jfriesse@redhat.com>
+Date: Thu, 2 Apr 2026 09:00:39 +0200
+Subject: [PATCH] totemsrp: Return error if sanity check fails
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Previously, the check_memb_commit_token_sanity function correctly
+checked the minimum message length. However, if the message was too
+short, it incorrectly returned a success code (0) instead of the
+expected failure code (-1).
+This commit ensures the appropriate error code is returned when the
+message length sanity check fails.
+Fixes: CVE-2026-35091
+Reported-by: Sebastián Alba Vives (@Sebasteuo / 0xS4bb1) <sebasjosue84@gmail.com>
+Signed-off-by: Jan Friesse <jfriesse@redhat.com>
+Also-proposed-by: nicholasyang <nicholas.yang@suse.com>
+Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
+CVE: CVE-2026-35091
+Upstream-Status: Backport [https://github.com/corosync/corosync/commit/a16614accfdb3481264d7281843fadf439d9ab1b]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ exec/totemsrp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/exec/totemsrp.c b/exec/totemsrp.c
+index 35bf971..94d6c21 100644
+--- a/exec/totemsrp.c
+++ b/exec/totemsrp.c
+@@ -3811,10 +3811,10 @@ static int check_memb_commit_token_sanity(
+                log_printf (instance->totemsrp_log_level_security,
+                    "Received memb_commit_token message is too short...  ignoring.");
+ 
+-               return (0);
+               return (-1);
+        }
+ 
+-       addr_entries= mct_msg->addr_entries;
+       addr_entries = mct_msg->addr_entries;
+        if (endian_conversion_needed) {
+                addr_entries = swab32(addr_entries);
+        }
diff --git a/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35092.patch b/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35092.patch
new file mode 100644
index 0000000000..8182647840
--- /dev/null
+++ b/meta-networking/recipes-extended/corosync/corosync/CVE-2026-35092.patch
@@ -0,0 +1,57 @@
+From 8f8a4747a0223b8897deda9a40a8a099c61fa80f Mon Sep 17 00:00:00 2001
+From: Jan Friesse <jfriesse@redhat.com>
+Date: Thu, 2 Apr 2026 09:44:06 +0200
+Subject: [PATCH] totemsrp: Fix integer overflow in memb_join_sanity
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+This commit addresses an integer overflow (wraparound) vulnerability
+in the check_memb_join_sanity function.
+Previously, the 32-bit unsigned network values proc_list_entries and
+failed_list_entries were added together before being promoted to
+size_t. This allowed the addition to wrap around in 32-bit arithmetic
+(e.g., 0x80000000 + 0x80000000 = 0), resulting in a required_len
+calculation that was incorrectly small.
+The solution is to cast the list entries to size_t and verify that
+neither exceeds the maximum allowed value before the addition occurs.
+Fixes: CVE-2026-35092
+Reported-by: Sebastián Alba Vives (@Sebasteuo / 0xS4bb1) <sebasjosue84@gmail.com>
+Signed-off-by: Jan Friesse <jfriesse@redhat.com>
+Also-proposed-by: nicholasyang <nicholas.yang@suse.com>
+Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
+CVE: CVE-2026-35092
+Upstream-Status: Backport [https://github.com/corosync/corosync/commit/4082294f5094a7591e4e00658c5a605f05d644f1]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ exec/totemsrp.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+diff --git a/exec/totemsrp.c b/exec/totemsrp.c
+index 94d6c21..6845cec 100644
+--- a/exec/totemsrp.c
+++ b/exec/totemsrp.c
+@@ -3786,7 +3786,17 @@ static int check_memb_join_sanity(
+                failed_list_entries = swab32(failed_list_entries);
+        }
+ 
+-       required_len = sizeof(struct memb_join) + ((proc_list_entries + failed_list_entries) * sizeof(struct srp_addr));
+       if (proc_list_entries > PROCESSOR_COUNT_MAX ||
+           failed_list_entries > PROCESSOR_COUNT_MAX) {
+               log_printf (instance->totemsrp_log_level_security,
+                   "Received memb_join message list_entries exceeds the maximum "
+                   "allowed value...  ignoring.");
+
+               return (-1);
+       }
+
+       required_len = sizeof(struct memb_join) +
+         (((size_t)proc_list_entries + (size_t)failed_list_entries) * sizeof(struct srp_addr));
+        if (msg_len < required_len) {
+                log_printf (instance->totemsrp_log_level_security,
+                    "Received memb_join message is too short...  ignoring.");
diff --git a/meta-networking/recipes-extended/corosync/corosync_3.1.10.bb b/meta-networking/recipes-extended/corosync/corosync_3.1.10.bb
index 07d9333ec8..77dea16e98 100644
--- a/meta-networking/recipes-extended/corosync/corosync_3.1.10.bb
+++ b/meta-networking/recipes-extended/corosync/corosync_3.1.10.bb
@@ -9,6 +9,8 @@ inherit autotools pkgconfig systemd github-releases
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \
           file://corosync.conf \
+           file://CVE-2026-35091.patch \
+           file://CVE-2026-35092.patch \
           "
 SRC_URI[sha256sum] = "be361c827f99b215b3bd3fa2fb071c03dac6831c2a351963d938caef62604bc8"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-networking/recipes-protocols/dante/dante_1.4.4.bb b/meta-networking/recipes-protocols/dante/dante_1.4.4.bb
index 52cfba4c5f..6a1eed3edb 100644
--- a/meta-networking/recipes-protocols/dante/dante_1.4.4.bb
+++ b/meta-networking/recipes-protocols/dante/dante_1.4.4.bb
@@ -25,6 +25,8 @@ EXTRA_OECONF += "--without-gssapi --sbindir=${bindir}"
 DEPENDS += "flex-native bison-native libpam libtirpc"
 inherit autotools-brokensep features_check
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 CPPFLAGS += "-P"
 CFLAGS += "-I${STAGING_INCDIR}/tirpc"
 LIBS += "-ltirpc"
diff --git a/meta-networking/recipes-protocols/mjansson-mdns/files/0001-Bump-cmake_minimum_required-version-to-3.5-94.patch b/meta-networking/recipes-protocols/mjansson-mdns/files/0001-Bump-cmake_minimum_required-version-to-3.5-94.patch
new file mode 100644
index 0000000000..2afccbe463
--- /dev/null
+++ b/meta-networking/recipes-protocols/mjansson-mdns/files/0001-Bump-cmake_minimum_required-version-to-3.5-94.patch
@@ -0,0 +1,21 @@
+From ab8f4118469d7a0bb83b9fcb88fe53482c35f0cb Mon Sep 17 00:00:00 2001
+From: skrede <code@skrede.me>
+Date: Sun, 26 Oct 2025 14:35:05 +0100
+Subject: [PATCH] Bump cmake_minimum_required version to 3.5 (#94)
+Upstream-Status: Backport [https://github.com/mjansson/mdns/commit/ab8f4118469d7a0bb83b9fcb88fe53482c35f0cb]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1bce26d..50f1f05 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
+ project(mdns VERSION 1.4.2 LANGUAGES C)
+ 
+ option(MDNS_BUILD_EXAMPLE "build example" ON)
diff --git a/meta-networking/recipes-protocols/mjansson-mdns/mjansson-mdns_1.4.3.bb b/meta-networking/recipes-protocols/mjansson-mdns/mjansson-mdns_1.4.3.bb
new file mode 100644
index 0000000000..5c404cbb9d
--- /dev/null
+++ b/meta-networking/recipes-protocols/mjansson-mdns/mjansson-mdns_1.4.3.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Public domain mDNS/DNS-SD library in C"
+DESCRIPTION = "This library provides a header only cross-platform mDNS and DNS-DS library in C"
+SECTION = "net"
+LICENSE = "Unlicense"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f"
+SRC_URI = "git://github.com/mjansson/mdns.git;protocol=https;branch=main;tag=${PV} \
+    file://0001-Bump-cmake_minimum_required-version-to-3.5-94.patch \
+"
+SRCREV = "1727be0602941a714cb6048a737f0584b1cebf3c"
+inherit cmake
+CVE_PRODUCT = "mjansson:mdns"
diff --git a/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.22.0.bb b/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.22.1.bb
index f7c0ee0d4f..acff7b548b 100644
--- a/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.22.0.bb
+++ b/meta-networking/recipes-protocols/ngtcp2/ngtcp2_1.22.1.bb
@@ -4,8 +4,8 @@ BUGTRACKER = "https://github.com/ngtcp2/ngtcp2/issues"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=de0966c8ff4f62661a3da92967a75434"
-SRC_URI = "gitsm://github.com/ngtcp2/ngtcp2;protocol=https;branch=main;tag=v${PV};name=ngtcp2"
+SRC_URI = "gitsm://github.com/ngtcp2/ngtcp2;protocol=https;branch=release-1.22;tag=v${PV}"
-SRCREV = "2a441e8540d192b0707989b146ce80efcae5f0d6"
+SRCREV = "716e64b05f4a3709dfc0b0522cf9fd4456d055e5"
 DEPENDS = "brotli libev nghttp3"
@@ -18,3 +18,5 @@ PACKAGECONFIG[shared] = "-DENABLE_SHARED_LIB=ON, -DENABLE_SHARED_LIB=OFF"
 PACKAGECONFIG[build-lib-only] = "-DENABLE_LIB_ONLY=ON, -DENABLE_LIB_ONLY=OFF"
 PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON, -DENABLE_OPENSSL=OFF, openssl"
 PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON, -DENABLE_GNUTLS=OFF, gnutls"
+CVE_STATUS[CVE-2026-40170] = "fixed-version: fixed in 1.22.1"
diff --git a/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-networking/recipes-protocols/openflow/openflow_git.bb
index 1588245f8a..d506dd4d01 100644
--- a/meta-networking/recipes-protocols/openflow/openflow_git.bb
+++ b/meta-networking/recipes-protocols/openflow/openflow_git.bb
@@ -40,6 +40,8 @@ DEPENDS:append:libc-musl = " libexecinfo"
 inherit autotools-brokensep pkgconfig
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 do_configure:prepend() {
    ./boot.sh
 }
diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.4.3.bb b/meta-networking/recipes-support/dovecot/dovecot_2.4.3.bb
index a8930979ea..a6b78ea781 100644
--- a/meta-networking/recipes-support/dovecot/dovecot_2.4.3.bb
+++ b/meta-networking/recipes-support/dovecot/dovecot_2.4.3.bb
@@ -16,7 +16,7 @@ SRC_URI = "https://dovecot.org/releases/2.4/dovecot-${PV}.tar.gz \
           file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \
           file://0001-adapt-lua_newstate-to-new-api.patch \
           "
-SRC_URI[sha256sum] = "e0b30330fe51e47ecfcf641bc16041184d91bdd0ac3db789b7cef54e3a75ac9b"
+SRC_URI[sha256sum] = "ff0be85228122f250627b19e67505fdb7fb2f72a702ef6bf35f27fce54c072e5"
 DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native"
 CFLAGS += "-I${STAGING_INCDIR}/tirpc"
@@ -81,3 +81,8 @@ FILES:${PN}-dev += "${libdir}/dovecot/libdovecot*.so"
 FILES:${PN}-dbg += "${libdir}/dovecot/*/.debug"
 CVE_STATUS[CVE-2016-4983] = "not-applicable-platform: Affects only postinstall script on specific distribution."
+CVE_STATUS[CVE-2025-59031] = "fixed-version: fixed since v2.4.2"
+CVE_STATUS[CVE-2026-0394] = "fixed-version: fixed since v2.4.1"
+CVE_STATUS[CVE-2026-24031] = "fixed-version: fixed since v2.4.3"
+CVE_STATUS[CVE-2026-27855] = "fixed-version: fixed since v2.4.3"
+CVE_STATUS[CVE-2026-27860] = "fixed-version: fixed since v2.4.3"
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch
deleted file mode 100644
index 00105fb844..0000000000
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b42265af87d9efcc9aac91b3a3da3df5c5c66e29 Mon Sep 17 00:00:00 2001
-From: Nguyen Dat Tho <tho3.nguyen@lge.com>
-Date: Wed, 9 Apr 2025 17:33:25 +0900
-Subject: [PATCH] Fix build with gcc-15
-To fix the following error:
-In file included from string_matching.cpp:1:
-./string_matching.h:10:18: error: 'uint16_t' does not name a type
-   10 |     extern const uint16_t   PATTERN_LIMIT;
-      |                  ^~~~~~~~
-./string_matching.h:7:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
-Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/50]
-Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
---
- user/drbdmon/string_matching.h | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/user/drbdmon/string_matching.h b/user/drbdmon/string_matching.h
-index 9b3918fe..b783ba48 100644
--- a/user/drbdmon/string_matching.h
-+++ b/user/drbdmon/string_matching.h
-@@ -4,6 +4,7 @@
- #include <string>
- #include <memory>
- #include <stdexcept>
-+#include <cstdint>
- 
- namespace string_matching
- {
-- 
-2.34.1
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-fix-the-hardcoded-legacy-helper-path.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-fix-the-hardcoded-legacy-helper-path.patch
new file mode 100644
index 0000000000..3d7c95b4a8
--- /dev/null
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-fix-the-hardcoded-legacy-helper-path.patch
@@ -0,0 +1,53 @@
+From 301e64db17466316ac34a28e30867cc7853777b5 Mon Sep 17 00:00:00 2001
+From: Haiqing Bai <Haiqing.Bai@windriver.com>
+Date: Thu, 16 Apr 2026 10:00:19 +0000
+Subject: [PATCH] Fix the hardcoded legacy helper path
+Fix the below issue:
+"~# drbdadm --version
+execvp() failed to exec drbdadm-84: No such file or directory"
+The legacy helper path was hardcoded to "/lib/drbd", which does not exist
+on systems where LIBDIR is configured to a different location (e.g.
+/usr/lib). This caused drbdadm to fail when attempting to exec drbdadm-84.
+Use the build-configured DRBD_LEGACY_LIB_DIR (derived from LIBDIR) instead
+of the hardcoded path, so the legacy helper lookup respects the actual
+install prefix.
+Upstream-Status: Pending
+Signed-off-by: Haiqing Bai <haiqing.bai@windriver.com>
+---
+ user/v9/Makefile.in       | 1 +
+ user/v9/drbdtool_common.c | 3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/user/v9/Makefile.in b/user/v9/Makefile.in
+index fa12f79..980c67c 100644
+--- a/user/v9/Makefile.in
+++ b/user/v9/Makefile.in
+@@ -70,6 +70,7 @@ CFLAGS += -DKEYUTILS
+ endif
+ ifeq ($(WITH_84_SUPPORT),yes)
+ CFLAGS += -DWITH_84_SUPPORT
+CFLAGS += -DDRBD_LEGACY_LIB_DIR=\"$(LIBDIR)\"
+ endif
+ CFLAGS += $(EXTRA_CFLAGS)
+ 
+diff --git a/user/v9/drbdtool_common.c b/user/v9/drbdtool_common.c
+index d07d054..ea95a16 100644
+--- a/user/v9/drbdtool_common.c
+++ b/user/v9/drbdtool_common.c
+@@ -332,8 +332,7 @@ void add_component_to_path(const char *path)
+ 
+ void add_lib_drbd_to_path(void)
+ {
+-               /* TODO: if exec-prefix != "/" ? */
+-       add_component_to_path("/lib/drbd");
+       add_component_to_path(DRBD_LEGACY_LIB_DIR);
+ }
+ 
+ /* from linux/crypto/crc32.c */
+-- 
+2.53.0
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.34.0.bb
index 4c520e8c78..abc406b5e0 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_9.34.0.bb
@@ -11,10 +11,10 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot
           git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/drbd-headers;branch=master;protocol=https \
           file://0001-drbdmon-add-LDFLAGS-when-linking.patch \
           ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \
-           file://0001-Fix-build-with-gcc-15.patch \
+           file://0001-fix-the-hardcoded-legacy-helper-path.patch \
           "
-SRCREV_drbd-utils = "36ea199f38b543b2da92219109c2832e122e5bf9"
+SRCREV_drbd-utils = "7fe34d56a7264cfc92fc5270471827bb3f7773e6"
-SRCREV_drbd-headers = "94f4472513f351efba5788f783feba6ac6efe9fc"
+SRCREV_drbd-headers = "8ab631bfa8eb606e53c86f50b9f2d6f51d0f9ca5"
 SRCREV_FORMAT = "drbd-utils_drbd-headers"
@@ -56,7 +56,9 @@ do_install:append() {
    sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd-wait-promotable@.service
    sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd.service
    sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/drbd@.service
-    sed -i -e 's#@nonarch_libdir@#${nonarch_libdir}#g' ${D}${systemd_unitdir}/system/ocf.ra@.service
+    install -D -m 0644 ${D}/50-drbd.preset ${D}${systemd_unitdir}/system-preset/50-drbd.preset
+    rm -f ${D}/50-drbd.preset
 }
 RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy"
@@ -69,6 +71,7 @@ FILES:${PN} += "${nonarch_base_libdir}/drbd \
                ${nonarch_libdir}/tmpfiles.d \
                ${nonarch_libdir}/drbdscripts/* \
                ${systemd_unitdir}/system/* \
+                ${systemd_unitdir}/system-preset/50-drbd.preset \
 "
 FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug"
diff --git a/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch b/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch
deleted file mode 100644
index e1b19ea05b..0000000000
--- a/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a7347f49b928f47fc37805c9f3a70a9487d45a65 Mon Sep 17 00:00:00 2001
-From: Alexander Koeppe <alexander@koeppe.rocks>
-Date: Sun, 8 Mar 2026 17:57:39 +0100
-Subject: [PATCH] Fix heap-out-of-bounds read issue in etterfilter
- (CVE-2026-3606)
-CVE: CVE-2026-3603
-Upstream-Status: Backport [https://github.com/Ettercap/ettercap/commit/41c312d4be6f6067968a275bf66b2abd2a0ba385]
-Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
- include/ec.h                  | 6 ++++++
- utils/etterfilter/ef_output.c | 4 ++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-diff --git a/include/ec.h b/include/ec.h
-index d69de613..80c7eaba 100644
--- a/include/ec.h
-+++ b/include/ec.h
-@@ -94,6 +94,12 @@
-    ON_ERROR(x, NULL, "virtual memory exhausted"); \
- } while(0)
- 
-+#define SAFE_RECALLOC(x, s) do { \
-+   x = realloc(x, s); \
-+   ON_ERROR(x, NULL, "virtual memory exhausted"); \
-+   memset(x, 0, s); \
-+} while(0)
-+
- #define SAFE_STRDUP(x, s) do{ \
-    x = strdup(s); \
-    ON_ERROR(x, NULL, "virtual memory exhausted"); \
-diff --git a/utils/etterfilter/ef_output.c b/utils/etterfilter/ef_output.c
-index 2530e599..2f49177e 100644
--- a/utils/etterfilter/ef_output.c
-+++ b/utils/etterfilter/ef_output.c
-@@ -150,10 +150,10 @@ static size_t create_data_segment(u_char** data, struct filter_header *fh, struc
- static size_t add_data_segment(u_char **data, size_t base, u_char **string, size_t slen)
- {
-    /* make room for the new string */
-   SAFE_REALLOC(*data, base + slen + 1);
-+   SAFE_RECALLOC(*data, base + slen + 1);
- 
-    /* copy the string, NULL separated */
-   memcpy(*data + base, *string, slen + 1);
-+   memcpy(*data + base, *string, slen);
- 
-    /* 
-     * change the pointer to the new string location 
diff --git a/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.1.bb
index 6fac3a0b84..a28de7b2bd 100644
--- a/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb
+++ b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.1.bb
@@ -22,10 +22,9 @@ DEPENDS += "ethtool \
 RDEPENDS:${PN} += "bash ethtool libgcc"
 SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https;tag=v${PV} \
-           file://CVE-2026-3606.patch \
           "
-SRCREV = "41da65f4026a9e4cea928e61941b976d9279f508"
+SRCREV = "0dc8409779f3a09cbfff4434b9a4d7b33480d88d"
 EXTRA_OECMAKE = " \
    -DCMAKE_SKIP_RPATH=TRUE \
diff --git a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
index b43900a94d..f87aa92932 100644
--- a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
+++ b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
@@ -4,6 +4,7 @@ SECTION = "libs"
 LICENSE = "GPL-2.0-only & LGPL-2.0-only"
 DEPENDS = "flex flex-native"
+RRECOMMENDS:${PN} = "kernel-module-atm-tcp"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}.tar.gz \
           file://link-with-ldflags.patch \
@@ -31,6 +32,8 @@ file://COPYING.LGPL;md5=6e29c688d912da12b66b73e32b03d812"
 inherit autotools pkgconfig
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}"
 FILES:${PN} += "${nonarch_base_libdir}/firmware"
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.47.5.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.47.7.bb
index 5ec440fc18..3b64ccb439 100644
--- a/meta-networking/recipes-support/nbdkit/nbdkit_1.47.5.bb
+++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.47.7.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=26250adec854bc317493f6fb98efe049"
 SRC_URI = "git://gitlab.com/nbdkit/nbdkit.git;protocol=https;branch=master;tag=v${PV} \
           file://0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch \
           "
-SRCREV = "131372494a384a2ee21b97ec9375b7a55636a417"
+SRCREV = "12ad24489c3de7b3810ae82fcffbdc113e1859ca"
 DEPENDS = "curl xz e2fsprogs zlib"
diff --git a/meta-networking/recipes-support/netperf/files/0001-cleanup-modernize-sendfile_tcp_stream-signature-from.patch b/meta-networking/recipes-support/netperf/files/0001-cleanup-modernize-sendfile_tcp_stream-signature-from.patch
new file mode 100644
index 0000000000..4e8731fb25
--- /dev/null
+++ b/meta-networking/recipes-support/netperf/files/0001-cleanup-modernize-sendfile_tcp_stream-signature-from.patch
@@ -0,0 +1,25 @@
+From ea9ce6ae6154660f2a1dc7a73aedf906cc935a72 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Sun, 12 Apr 2026 16:38:28 -0700
+Subject: [PATCH] cleanup: modernize sendfile_tcp_stream signature from K&R to ANSI C style
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ src/nettest_bsd.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+diff --git a/src/nettest_bsd.c b/src/nettest_bsd.c
+index 36f5810..e7feb83 100644
+--- a/src/nettest_bsd.c
+++ b/src/nettest_bsd.c
+@@ -4270,8 +4270,7 @@ Size (bytes)\n\
+    all it knows, nothig is different. */
+ void
+-sendfile_tcp_stream(remote_host)
+-     char      remote_host[];
+sendfile_tcp_stream (char      remote_host[])
+ {
+   char *tput_title = "\
diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-networking/recipes-support/netperf/netperf_git.bb
index d5a717b0f6..8f49a7596b 100644
--- a/meta-networking/recipes-support/netperf/netperf_git.bb
+++ b/meta-networking/recipes-support/netperf/netperf_git.bb
@@ -18,6 +18,7 @@ SRC_URI = "git://github.com/HewlettPackard/netperf.git;branch=master;protocol=ht
           file://0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch \
           file://0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch \
           file://0001-Fix-multiple-definitions-with-enable-intervals.patch \
+           file://0001-cleanup-modernize-sendfile_tcp_stream-signature-from.patch \
           "
 SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4"
diff --git a/meta-networking/recipes-support/ntp/ntp/0001-ITS-10011-build-fix-compatibility-with-stricter-C99-.patch b/meta-networking/recipes-support/ntp/ntp/0001-ITS-10011-build-fix-compatibility-with-stricter-C99-.patch
new file mode 100644
index 0000000000..6558fae4ae
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/ntp/0001-ITS-10011-build-fix-compatibility-with-stricter-C99-.patch
@@ -0,0 +1,102 @@
+From 58c160ce28328f9a75d41c283ee9b94c10d6ec62 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 9 Feb 2023 23:17:53 +0000
+Subject: [PATCH] ITS#10011 build: fix compatibility with stricter C99
+ compilers
+Fix the following warnings:
+- -Wimplicit-int (fatal with Clang 16)
+- -Wimplicit-function-declaration (fatal with Clang 16)
+- -Wincompatible-function-pointer-types (fatal with Clang 16)
+- -Wint-conversion (fatal with Clang 15)
+- Old style prototypes (K&R, removed from C23)
+These warnings-now-error led to misconfigurations and failure to build
+OpenLDAP, as the tests used during configure caused the wrong results
+to be emitted.
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
+or the (new) c-std-porting mailing list [3].
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+Bug: https://bugs.gentoo.org/871288
+Upstream-Status: Pending
+Signed-off-by: Sam James <sam@gentoo.org>
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ sntp/m4/openldap.m4 | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+diff --git a/sntp/m4/openldap.m4 b/sntp/m4/openldap.m4
+index 49ffb87..2db6aa3 100644
+--- a/sntp/m4/openldap.m4
+++ b/sntp/m4/openldap.m4
+@@ -154,6 +154,7 @@ fi
+ if test $ol_cv_header_stdc = yes; then
+   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <ctype.h>
+#include <stdlib.h>
+ #ifndef HAVE_EBCDIC
+ #      define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #      define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -610,8 +611,12 @@ AC_DEFUN([OL_PTHREAD_TEST_INCLUDES], [[
+ #define NULL (void*)0
+ #endif
+ 
+#ifdef __STDC__
+static void *task(void *p)
+#else
+ static void *task(p)
+        void *p;
+#endif
+ {
+        return (void *) (p == NULL);
+ }
+@@ -667,9 +672,13 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
+ AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], [
+ AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
+ 
+#ifdef __STDC__
+int main(int argc, char **argv)
+#else
+ int main(argc, argv)
+        int argc;
+        char **argv;
+#endif
+ {
+ OL_PTHREAD_TEST_FUNCTION
+ }
+@@ -791,7 +800,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[
+ #include <sys/types.h>
+ #include <regex.h>
+ static char *pattern, *string;
+-main()
+int main(void)
+ {
+        int rc;
+        regex_t re;
+@@ -818,7 +827,8 @@ AC_DEFUN([OL_C_UPPER_LOWER],
+ [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[
+        AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <ctype.h>
+-main()
+#include <stdlib.h>
+int main(void)
+ {
+        if ('C' == toupper('C'))
+                exit(0);
+@@ -873,7 +883,7 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R],
+                        ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no])
+        else
+                AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-                       main() {
+                       int main(void) {
+                                char buf[100];
+                                buf[0] = 0;
+                                strerror_r( 1, buf, sizeof buf );
diff --git a/meta-networking/recipes-support/ntp/ntp/0001-colcomp-sntp-libpkgver-colcomp.c-Convert-K-R-functio.patch b/meta-networking/recipes-support/ntp/ntp/0001-colcomp-sntp-libpkgver-colcomp.c-Convert-K-R-functio.patch
new file mode 100644
index 0000000000..39f7e537c1
--- /dev/null
+++ b/meta-networking/recipes-support/ntp/ntp/0001-colcomp-sntp-libpkgver-colcomp.c-Convert-K-R-functio.patch
@@ -0,0 +1,32 @@
+From cd54486bdced460c174fcb98680ad5ffe64f906a Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Mon, 13 Apr 2026 19:09:24 -0700
+Subject: [PATCH] colcomp: sntp/libpkgver/colcomp.c: Convert K&R function
+ definition to ANSI C style
+Replace old-style K&R function declaration with modern ANSI C prototype
+syntax for colcomp(). Also remove trailing whitespace after return type.
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ sntp/libpkgver/colcomp.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+diff --git a/sntp/libpkgver/colcomp.c b/sntp/libpkgver/colcomp.c
+index 4b151e3..29ecb3e 100644
+--- a/sntp/libpkgver/colcomp.c
+++ b/sntp/libpkgver/colcomp.c
+@@ -33,10 +33,8 @@
+ #endif
+ 
+ 
+-int 
+-colcomp (s1, s2)
+-     register char *s1;
+-     register char *s2;
+int
+colcomp (register char *s1, register char *s2)
+ {
+   int hilo = 0;                        /* comparison value */
+ 
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb
index e59725e3e9..6f9bb01c02 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb
@@ -17,6 +17,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
           file://0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch \
           file://0001-sntp-Fix-types-in-check-for-pthread_detach.patch \
           file://0001-include-fix-build-failure-with-glibc-2.43-_Generic-m.patch \
+           file://0001-ITS-10011-build-fix-compatibility-with-stricter-C99-.patch \
+           file://0001-colcomp-sntp-libpkgver-colcomp.c-Convert-K-R-functio.patch \
           file://ntpd \
           file://ntp.conf \
           file://ntpd.service \
diff --git a/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch b/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch
index c3ca07a390..739d7f797e 100644
--- a/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch
+++ b/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch
@@ -12,8 +12,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 src/Makefile    |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)
-diff --git a/sample/Makefile b/sample/Makefile
-index 15cafd9..d83641f 100644
 --- a/sample/Makefile
 +++ b/sample/Makefile
 @@ -35,9 +35,9 @@ ifeq ($(PLATFORM),SunOS)
@@ -50,13 +48,23 @@ index 15cafd9..d83641f 100644
 
 %.o: %.c
        $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c $<
-diff --git a/src/Makefile b/src/Makefile
-index 9b56b5e..39a5ea1 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -45,7 +45,7 @@ endif
+@@ -2,7 +2,7 @@
+ # $Id: Makefile,v 1.57 2005/06/13 16:34:53 evertonm Exp $
+ #
 
- WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \
+-#DEBUG += -DRULI_SRV_DEBUG 
+#DEBUG += -DRULI_SRV_DEBUG
+ #DEBUG += -DRULI_HOST_DEBUG
+ #DEBUG += -DRULI_RES_DEBUG
+ #DEBUG += -DRULI_TXT_COMPARE_DEBUG
+@@ -43,9 +43,9 @@ ifeq ($(PLATFORM),SunOS)
+ DEFINE_SOLARIS = -D_RULI_SOLARIS_
+ endif
+ 
+-WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \
+WARN = -Wshadow -Wpointer-arith -Wcast-qual \
        -Wcast-align -Wwrite-strings -Wredundant-decls
 -CC = gcc
 +CC ?= gcc
@@ -72,7 +80,7 @@ index 9b56b5e..39a5ea1 100644
 LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \
        ruli_addr.o ruli_sock.o ruli_txt.o ruli_msg.o ruli_fsm.o \
        ruli_res.o ruli_parse.o ruli_host.o ruli_srv.o ruli_conf.o \
-@@ -66,7 +66,7 @@ LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \
+@@ -66,7 +66,7 @@ LIBOBJ = ruli_isaac.o ruli_mem.o ruli_ra
        ruli_getaddrinfo.o
 SHAREDOBJ = $(LIBOBJ:%.o=%.os)
 SONAME = libruli.so.4
@@ -90,6 +98,3 @@ index 9b56b5e..39a5ea1 100644
        @echo
        @echo "REMINDER:"
        @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:"
-- 
-2.24.0
diff --git a/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-networking/recipes-support/ruli/ruli_0.36.bb
index 0526f842a8..972184ae2c 100644
--- a/meta-networking/recipes-support/ruli/ruli_0.36.bb
+++ b/meta-networking/recipes-support/ruli/ruli_0.36.bb
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "11d32def5b514748fbd9ea8c88049ae99e1bb358efc74eb91a4d268a39
 # -shared is passed via CFLAGS, clang complains since its used during linking
 # and not compiling
-CFLAGS:append:toolchain-clang = " -Wno-error=unused-command-line-argument"
+CFLAGS:append:toolchain-clang = " -std=gnu11 -Wno-error=unused-command-line-argument"
 EXTRA_OEMAKE = 'CC="${CC}" CPPFLAGS="${CFLAGS}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" \
                INSTALL_BASE_DIR="${D}${exec_prefix}" \
diff --git a/meta-networking/recipes-support/strongswan/strongswan_6.0.5.bb b/meta-networking/recipes-support/strongswan/strongswan_6.0.5.bb
index c3909acff2..405080070c 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_6.0.5.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_6.0.5.bb
@@ -189,3 +189,5 @@ SYSTEMD_SERVICE:${PN} = " \
    ${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} \
    ${@bb.utils.contains('PACKAGECONFIG', 'charon', '${BPN}-starter.service', '', d)} \
 "
+CVE_STATUS[CVE-2026-25075] = "fixed-version: fixed in 6.0.5"
diff --git a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
index 3520bf429e..0e94a969c0 100644
--- a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
+++ b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
@@ -1,4 +1,4 @@
-From e08b9760d319d0334f2aad02d32d791c8ebd8564 Mon Sep 17 00:00:00 2001
+From 08b1bf417be039b097fae25708861fe8184c739c Mon Sep 17 00:00:00 2001
 From: Kai Kang <kai.kang@windriver.com>
 Date: Wed, 1 Nov 2017 09:23:41 -0400
 Subject: [PATCH] stunnel: fix compile error when openssl disable des support
@@ -17,10 +17,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
 2 files changed, 5 insertions(+), 3 deletions(-)
 diff --git a/src/common.h b/src/common.h
-index c2229d0..5eaee8c 100644
+index ada7ff7..8484144 100644
 --- a/src/common.h
 +++ b/src/common.h
-@@ -497,7 +497,9 @@ extern char *sys_errlist[];
+@@ -489,7 +489,9 @@ extern char *sys_errlist[];
 #ifndef OPENSSL_NO_MD4
 #include <openssl/md4.h>
 #endif /* !defined(OPENSSL_NO_MD4) */
@@ -29,9 +29,9 @@ index c2229d0..5eaee8c 100644
 +#endif
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
- #if OPENSSL_VERSION_NUMBER<0x10100000L
+ #endif /* !defined(OPENSSL_NO_DH) */
 diff --git a/src/protocol.c b/src/protocol.c
-index c390a6f..7aca745 100644
+index cddc381..ae0f374 100644
 --- a/src/protocol.c
 +++ b/src/protocol.c
 @@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *);
@@ -43,7 +43,7 @@ index c390a6f..7aca745 100644
 NOEXPORT void ntlm(CLI *);
 NOEXPORT char *ntlm1(void);
 NOEXPORT char *ntlm3(char *, char *, char *, char *);
-@@ -1391,7 +1391,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
+@@ -1392,7 +1392,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
     fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host);
     if(c->opt->protocol_username && c->opt->protocol_password) {
         if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) {
@@ -52,7 +52,7 @@ index c390a6f..7aca745 100644
             ntlm(c);
 #else
             s_log(LOG_ERR, "NTLM authentication is not available");
-@@ -1434,7 +1434,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
+@@ -1435,7 +1435,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
     str_free(line);
 }
 
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.77.bb b/meta-networking/recipes-support/stunnel/stunnel_5.78.bb
index 954fa896ba..1740ad41f2 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.77.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.78.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-sta
 HOMEPAGE = "https://www.stunnel.org/"
 SECTION = "net"
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING.md;md5=1e4388407e163ad0cde171362f9a7b94"
+LIC_FILES_CHKSUM = "file://COPYING.md;md5=df2a0f88c5d5e3ebce922682a7b598ec"
 DEPENDS = "autoconf-archive libnsl2 openssl"
@@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \
           file://fix-openssl-no-des.patch \
 "
-SRC_URI[sha256sum] = "ec026f4fae4e0d25b940cc7a9451d925e359e7fd59e9edad20baea66ce45f263"
+SRC_URI[sha256sum] = "8727e53bb8b7528f850327a2a149158422c02183bc120d1d733cc65b1e2c349d"
 inherit autotools bash-completion pkgconfig
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch
deleted file mode 100644
index e06e0d3eae..0000000000
--- a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cee659d2ac1e4e9d1ce388338f46df6c4bae8278 Mon Sep 17 00:00:00 2001
-From: Gyorgy Sarvari <skandigraun@gmail.com>
-Date: Fri, 17 Oct 2025 22:57:39 +0000
-Subject: [PATCH] reqs: fix integer overflow in port number processing
-From: rofl0r <rofl0r@users.noreply.github.com>
-closes #586
-CVE: CVE-2025-63938
-Upstream-Status: Backport [https://github.com/tinyproxy/tinyproxy/commit/3c0fde94981b025271ffa1788ae425257841bf5a]
-Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
- src/reqs.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-diff --git a/src/reqs.c b/src/reqs.c
-index a65ed54..1e5895c 100644
--- a/src/reqs.c
-+++ b/src/reqs.c
-@@ -174,7 +174,7 @@ static int strip_return_port (char *host)
- {
-         char *ptr1;
-         char *ptr2;
-        int port;
-+        unsigned port;
- 
-         ptr1 = strrchr (host, ':');
-         if (ptr1 == NULL)
-@@ -186,8 +186,11 @@ static int strip_return_port (char *host)
-                 return 0;
- 
-         *ptr1++ = '\0';
-        if (sscanf (ptr1, "%d", &port) != 1)    /* one conversion required */
-                return 0;
-+
-+        port = atoi(ptr1);
-+        /* check that port string is in the valid range 1-0xffff) */
-+        if(strlen(ptr1) > 5 || (port & 0xffff0000)) return 0;
-+
-         return port;
- }
- 
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-1.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-1.patch
new file mode 100644
index 0000000000..99c4ea705d
--- /dev/null
+++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-1.patch
@@ -0,0 +1,29 @@
+From 245946bb789c8fc0e4758c344f735a5d53827dce Mon Sep 17 00:00:00 2001
+From: rofl0r <rofl0r@users.noreply.github.com>
+Date: Thu, 12 Mar 2026 14:26:24 +0000
+Subject: [PATCH] reqs: check negative length values when reading chunked data
+this could lead to a DoS when a legitimate client reads from an
+attacker-controlled web server.
+closes #597
+CVE: CVE-2026-3945
+Upstream-Status: Backport [https://github.com/tinyproxy/tinyproxy/commit/969852ccdb1d19d7ed302f0e1d324661be641e0a]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/reqs.c | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/src/reqs.c b/src/reqs.c
+index a562c68..94ce767 100644
+--- a/src/reqs.c
+++ b/src/reqs.c
+@@ -613,6 +613,7 @@ static int pull_client_data_chunked (struct conn_s *connptr) {
+                 }
+ 
+                 chunklen = strtol (buffer, (char**)0, 16);
+                if (chunklen < 0) goto ERROR_EXIT;
+ 
+                 if (pull_client_data (connptr, chunklen+2, 0) < 0)
+                         goto ERROR_EXIT;
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-2.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-2.patch
new file mode 100644
index 0000000000..3da30b54eb
--- /dev/null
+++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2026-3945-2.patch
@@ -0,0 +1,31 @@
+From 8f12872b8e50fe22be0a65ead260ebbedde905cd Mon Sep 17 00:00:00 2001
+From: rofl0r <rofl0r@users.noreply.github.com>
+Date: Sun, 29 Mar 2026 16:48:54 +0200
+Subject: [PATCH] reqs: prevent potential int overflow when parsing chunked
+ data (#603)
+follow-up to 969852ccdb1d19d7ed302f0e1d324661be641e0a
+closes #602
+CVE: CVE-2026-3945
+Upstream-Status: Backport [https://github.com/tinyproxy/tinyproxy/commit/bb7edc4778041b3bc8ad7fca448b67d98039cc7d]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/reqs.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/src/reqs.c b/src/reqs.c
+index 94ce767..7aacfd3 100644
+--- a/src/reqs.c
+++ b/src/reqs.c
+@@ -613,7 +613,8 @@ static int pull_client_data_chunked (struct conn_s *connptr) {
+                 }
+ 
+                 chunklen = strtol (buffer, (char**)0, 16);
+-                if (chunklen < 0) goto ERROR_EXIT;
+                /* prevent negative or huge values causing overflow */
+                if (chunklen < 0 || chunklen > 0x0fffffff) goto ERROR_EXIT;
+ 
+                 if (pull_client_data (connptr, chunklen+2, 0) < 0)
+                         goto ERROR_EXIT;
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.3.bb
index 8558291c18..56e3296066 100644
--- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb
+++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.3.bb
@@ -7,10 +7,11 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz
           file://tinyproxy.service \
           file://tinyproxy.conf \
           file://run-ptest \
-           file://CVE-2025-63938.patch \
+           file://CVE-2026-3945-1.patch \
+           file://CVE-2026-3945-2.patch \
           "
-SRC_URI[sha256sum] = "2c8fe5496f2c642bfd189020504ab98d74b9edbafcdb94d9f108e157b5bdf96d"
+SRC_URI[sha256sum] = "9bcf46db1a2375ff3e3d27a41982f1efec4706cce8899ff9f33323a8218f7592"
 UPSTREAM_CHECK_URI = "https://github.com/tinyproxy/tinyproxy/releases"
diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
index ca800f12fa..b764d5dd58 100644
--- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
+++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
@@ -58,7 +58,8 @@ PTESTS_FAST_META_OE = "\
    uriparser \
    utf8proc \
    uthash \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'xrdp', '', d)} \
+    xdg-dbus-proxy \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'pam x11', 'xrdp', '', d)} \
    zeromq \
 "
 PTESTS_FAST_META_OE:append:x86 = " mcelog"
@@ -73,6 +74,7 @@ PTESTS_SLOW_META_OE = "\
    c-ares \
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'freerdp', '', d)} \
    fftw \
+    jsoncpp \
    libusb-compat \
    mariadb \
    postgresql \
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index c6974f6dfe..78df6e3c03 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -120,7 +120,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
 DEFAULT_TEST_SUITES:pn-meta-oe-ptest-image = " ${PTESTTESTSUITE}"
-NON_MULTILIB_RECIPES:append = " crash pahole libbpf bpftrace bpftool"
+NON_MULTILIB_RECIPES:append = " crash pahole libbpf bpftrace bpftool bcc"
 NON_MULTILIB_RECIPES:remove:x86 = "libbpf"
 NON_MULTILIB_RECIPES:remove:x86-64 = "libbpf"
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch
index 663a80ecde..8d5c3da7c0 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch
+++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch
@@ -1,4 +1,4 @@
-From 668ee79f39614ad758edd44c42b8b0eff57877cf Mon Sep 17 00:00:00 2001
+From 3790a098f4905cd330234fc4d18b4d4536b360bf Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Sun, 3 Oct 2021 21:52:16 +0200
 Subject: [PATCH] meson.build: do not use -Werror
@@ -12,7 +12,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/meson.build b/meson.build
-index 30f33fe2..0b214795 100644
+index 6f517b5a..2ecb7f5d 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -4,7 +4,7 @@ project('netplan', 'c',
@@ -22,8 +22,8 @@ index 30f33fe2..0b214795 100644
 -            'werror=true',
 +            'werror=false',
         ],
-         meson_version: '>= 0.61.0',
+         meson_version: '>= 1.3.0',
 )
 -- 
-2.25.1
+2.34.1
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.2.1.bb
index ef1945b4fe..22159dbcab 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.2.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.2.1.bb
@@ -14,13 +14,13 @@ inherit meson pkgconfig systemd python3targetconfig features_check
 REQUIRED_DISTRO_FEATURES = "systemd"
-SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=stable/1.1;protocol=https \
+SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \
           file://0001-meson.build-do-not-use-Werror.patch \
          "
 SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch"
-SRCREV = "01045f683b9419beb90119497cd1b2be44e83b8e"
+SRCREV = "f758e3f6415aa68b7cf28991bc5b3e9631297d6d"
 DEPENDS = "glib-2.0 libyaml util-linux-libuuid \
@@ -43,6 +43,7 @@ PACKAGES += "${PN}-dbus libnetplan"
 FILES:libnetplan = "${libdir}/libnetplan.so.*"
 FILES:${PN} = "${sbindir} ${libexecdir}/netplan/generate \
+               ${libexecdir}/netplan/configure \
               ${datadir}/netplan ${datadir}/bash-completion \
               ${systemd_unitdir} ${PYTHON_SITEPACKAGES_DIR} \
               ${sysconfdir}/netplan \
diff --git a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-misc-fix-discarded-const-qualifiers-in-char-pointer-.patch b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-misc-fix-discarded-const-qualifiers-in-char-pointer-.patch
new file mode 100644
index 0000000000..1b37633a36
--- /dev/null
+++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-misc-fix-discarded-const-qualifiers-in-char-pointer-.patch
@@ -0,0 +1,56 @@
+From d0326cd89b01600a6d8ba5e32e8e090f2ea29f2d Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Wed, 15 Apr 2026 16:28:28 -0700
+Subject: [PATCH] misc: fix discarded const qualifiers in char pointer
+ assignments
+These show up with glibc 2.43 + clang-22, glibc-2.43 has C23 versions
+of str* mem* functions
+Upstream-Status: Backport [https://github.com/taisei-project/taisei/commit/1c8f773912cbbd72b4a4df271fda1bd6d2aeb27f]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ src/log.c           | 2 +-
+ src/pixmap/pixmap.c | 2 +-
+ src/vfs/pathutil.c  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+diff --git a/src/log.c b/src/log.c
+index 8194535a..88f34386 100644
+--- a/src/log.c
+++ b/src/log.c
+@@ -161,7 +161,7 @@ static void add_debug_info(StringBuffer *buf) {
+ static size_t modname(const char *filename, size_t filename_len, char *mod) {
+        size_t mlen = filename_len;
+-       char *dot = memchr(filename, '.', mlen);
+       const char *dot = memchr(filename, '.', mlen);
+        if(dot) {
+                mlen = dot - filename;
+        }
+diff --git a/src/pixmap/pixmap.c b/src/pixmap/pixmap.c
+index 25105215..9717f22a 100644
+--- a/src/pixmap/pixmap.c
+++ b/src/pixmap/pixmap.c
+@@ -49,7 +49,7 @@ void *pixmap_alloc_buffer_for_conversion(const Pixmap *src, PixmapFormat format,
+ }
+ static PixmapFileFormatHandler *pixmap_handler_for_filename(const char *file) {
+-       char *ext = strrchr(file, '.');
+       const char *ext = strrchr(file, '.');
+        if(!ext || !*(++ext)) {
+                return NULL;
+diff --git a/src/vfs/pathutil.c b/src/vfs/pathutil.c
+index f6bd6a80..85ccf5ee 100644
+--- a/src/vfs/pathutil.c
+++ b/src/vfs/pathutil.c
+@@ -14,7 +14,7 @@ char *vfs_path_normalize(const char *path, char *out) {
+        const char *p = path;
+        char *o = out;
+        char *last_sep = out - 1;
+-       char *path_end = strchr(path, 0);
+       const char *path_end = strchr(path, 0);
+        #define IS_SEP_OR_NUL(chr) (VFS_IS_PATH_SEPARATOR(chr) || (chr == '\0'))
diff --git a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-vfs-avoid-unnecessary-recursion-in-vfs_mkparents.patch b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-vfs-avoid-unnecessary-recursion-in-vfs_mkparents.patch
new file mode 100644
index 0000000000..9f5d7a17d4
--- /dev/null
+++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-vfs-avoid-unnecessary-recursion-in-vfs_mkparents.patch
@@ -0,0 +1,71 @@
+From c9c00a88c10db4ce93ffcc043c661727d2ec9758 Mon Sep 17 00:00:00 2001
+From: laochailan <239670+laochailan@users.noreply.github.com>
+Date: Fri, 13 Feb 2026 20:21:44 -0500
+Subject: [PATCH] vfs: avoid unnecessary recursion in vfs_mkparents
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+Upstream-Status: Backport [https://github.com/taisei-project/taisei/commit/f2e074f4a6aecf78b980014ed98f12fc6ddfd016]
+---
+ src/vfs/public.c | 43 +++++++++++++++++--------------------------
+ 1 file changed, 17 insertions(+), 26 deletions(-)
+diff --git a/src/vfs/public.c b/src/vfs/public.c
+index abaa050f..cfeef83a 100644
+--- a/src/vfs/public.c
+++ b/src/vfs/public.c
+@@ -146,38 +146,29 @@ void vfs_mkdir_required(const char *path) {
+        }
+ }
+-static bool vfs_mkparents_recurse(const char *path) {
+-       // FIXME this has stupid space complexity and is probably silly in general; optimize if you care
+-
+-       char *psep = strrchr(path, VFS_PATH_SEPARATOR);
+-
+-       if(!psep) {
+-               // parent is root
+-               return true;
+-       }
+bool vfs_mkparents(const char *path) {
+       char p[strlen(path)+1];
+       path = vfs_path_normalize(path, p);
+-       char p[strlen(path) + 1];
+-       strcpy(p, path);
+-       psep += p - path;
+-       *psep = 0;
+       // loop over all parent directories
+       char *psep = p;
+       while((psep = strchr(psep, VFS_PATH_SEPARATOR))) {
+               *psep = 0;
+-       VFSInfo i = vfs_query(p);
+               VFSInfo i = vfs_query(p);
+               if(i.error) {
+                       return false;
+               }
+-       if(i.error) {
+-               return false;
+-       }
+               if(!i.exists || !i.is_dir) {
+                       vfs_mkdir(p);
+               }
+-       if(i.exists) {
+-               return i.is_dir;
+               *psep = VFS_PATH_SEPARATOR;
+               psep++;
+        }
+-       return vfs_mkparents_recurse(p) && vfs_mkdir(p);
+-}
+-
+-bool vfs_mkparents(const char *path) {
+-       char p[strlen(path)+1];
+-       path = vfs_path_normalize(path, p);
+-       return vfs_mkparents_recurse(p);
+       return true;
+ }
+ char* vfs_repr(const char *path, bool try_syspath) {
diff --git a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.4.bb b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.4.bb
index bb08ad4a1c..844e735b69 100644
--- a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.4.bb
+++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.4.bb
@@ -20,7 +20,10 @@ DEPENDS = "\
 DEPENDS:append:libc-musl = " libucontext"
 LDFLAGS:append:libc-musl = " -lucontext"
-SRC_URI = "gitsm://github.com/taisei-project/taisei.git;branch=v1.4.x;protocol=https;tag=v${PV}"
+SRC_URI = "gitsm://github.com/taisei-project/taisei.git;branch=v1.4.x;protocol=https;tag=v${PV} \
+           file://0001-misc-fix-discarded-const-qualifiers-in-char-pointer-.patch \
+                   file://0001-vfs-avoid-unnecessary-recursion-in-vfs_mkparents.patch \
+                  "
 SRCREV = "6a484e6e61cc51a22a9943762dc2ff6883914f38"
 inherit features_check meson mime mime-xdg pkgconfig
diff --git a/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted/0001-Added-sepolicy-for-adb-service.patch b/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted/0001-Added-sepolicy-for-adb-service.patch
deleted file mode 100644
index 62f81e4ffb..0000000000
--- a/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted/0001-Added-sepolicy-for-adb-service.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From c110d893be565ade574ee2933c6e89197f833006 Mon Sep 17 00:00:00 2001
-From: Gargi Misra <gmisra@qti.qualcomm.com>
-Date: Thu, 5 Mar 2026 12:39:42 +0530
-Subject: [PATCH] refpolicy-targeted: Added sepolicy for adb service
-    - Labeled adb binary
-    - Moved adb shell from initrc_t to unconfined_t
-Upstream-Status: Inappropriate [meta-oe Specific]
-Signed-off-by: Gargi Misra <gmisra@qti.qualcomm.com>
---
- policy/modules/services/adbd.fc |  5 +++++
- policy/modules/services/adbd.if |  5 +++++
- policy/modules/services/adbd.te | 25 +++++++++++++++++++++++++
- 3 files changed, 35 insertions(+)
- create mode 100644 policy/modules/services/adbd.fc
- create mode 100644 policy/modules/services/adbd.if
- create mode 100644 policy/modules/services/adbd.te
-diff --git a/policy/modules/services/adbd.fc b/policy/modules/services/adbd.fc
-new file mode 100644
-index 000000000..6f5bb9269
--- /dev/null
-+++ b/policy/modules/services/adbd.fc
-@@ -0,0 +1,5 @@
-+/usr/bin/adbd        --  gen_context(system_u:object_r:adbd_exec_t,s0)
-+
-+
-+
-+
-diff --git a/policy/modules/services/adbd.if b/policy/modules/services/adbd.if
-new file mode 100644
-index 000000000..612fc0106
--- /dev/null
-+++ b/policy/modules/services/adbd.if
-@@ -0,0 +1,5 @@
-+## <summary>adb service.</summary>
-+
-+
-+
-+
-diff --git a/policy/modules/services/adbd.te b/policy/modules/services/adbd.te
-new file mode 100644
-index 000000000..f7e8ac7d0
--- /dev/null
-+++ b/policy/modules/services/adbd.te
-@@ -0,0 +1,25 @@
-+policy_module(adbd)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+type adbd_t;
-+type adbd_exec_t;
-+
-+init_daemon_domain(adbd_t, adbd_exec_t)
-+
-+# Move adb from system_r:initrc_t to unconfined_r:unconfined_t
-+unconfined_shell_domtrans(adbd_t)
-+
-+# Minimal Rules Required for adbd service
-+allow adbd_t self:capability sys_resource;
-+
-+domain_interactive_fd(adbd_t)
-+dev_rw_usbfs(adbd_t)
-+files_read_etc_files(adbd_t)
-+files_rw_etc_runtime_files(adbd_t)
-+term_use_ptmx(adbd_t)
-+term_use_generic_ptys(adbd_t)
-+
-- 
-2.43.0
diff --git a/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted_git.bbappend b/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted_git.bbappend
deleted file mode 100644
index 429b3ea9b5..0000000000
--- a/meta-oe/dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted_git.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
-SRC_URI:append = " \
-        file://0001-Added-sepolicy-for-adb-service.patch \
-        "
diff --git a/meta-oe/licenses/LicenseRef-EEMBC-AUA b/meta-oe/licenses/LicenseRef-EEMBC-AUA
new file mode 100644
index 0000000000..14e53e9eec
--- /dev/null
+++ b/meta-oe/licenses/LicenseRef-EEMBC-AUA
@@ -0,0 +1,100 @@
+# COREMARK® ACCEPTABLE USE AGREEMENT 
+This ACCEPTABLE USE AGREEMENT (this “Agreement”) is offered by Embedded Microprocessor Benchmark Consortium, a California nonprofit corporation (“Licensor”), to users of its CoreMark® software (“Licensee”) exclusively on the following terms.
+Licensor offers benchmarking software (“Software”) pursuant to an open source license, but carefully controls use of its benchmarks and their associated goodwill. Licensor has registered its trademark in one of the benchmarks available through the Software, COREMARK, Ser. No. 85/487,290; Reg. No. 4,179,307 (the “Trademark”), and promotes the use of a standard metric as a benchmark for assessing the performance of embedded systems. Solely on the terms described herein, Licensee may use and display the Trademark in connection with the generation of data regarding measurement and analysis of computer and embedded system benchmarking via the Software (the “Licensed Use”).
+## Article 1 – License Grant.
+1.1.    License. Subject to the terms and conditions of this Agreement, Licensor hereby grants to Licensee, and Licensee hereby accepts from Licensor, a personal, non-exclusive, royalty-free, revocable right and license to use and display the Trademark during the term of this Agreement (the “Term”), solely and exclusively in connection with the Licensed Use. During the Term, Licensee (i) shall not modify or otherwise create derivative works of the Trademark, and (ii) may use the Trademark only to the extent permitted under this License. Neither Licensee nor any affiliate or agent thereof shall otherwise use the Trademark without the prior express written consent of Licensor, which may be withheld in its sole and absolute discretion. All rights not expressly granted to Licensee hereunder shall remain the exclusive property of Licensor.
+1.2.    Modifications to the Software.  Licensee shall not use the Trademark in connection with any use of a modified, derivative, or otherwise altered copy of the Software.
+1.3.    Licensor’s Use. Nothing in this Agreement shall preclude Licensor or any of its successors or assigns from using or permitting other entities to use the Trademark, whether or not such entity directly or indirectly competes or conflicts with Licensee’s Licensed Use in any manner. 
+1.4.    Term and Termination.  This Agreement is perpetual unless terminated by either of the parties.  Licensee may terminate this Agreement for convenience, without cause or liability, for any reason or for no reason whatsoever, upon ten (10) business days written notice. Licensor may terminate this Agreement effective immediately upon notice of breach.  Upon termination, Licensee shall immediately remove all implementations of the Trademark from the Licensed Use, and delete all digitals files and records of all materials related to the Trademark. 
+## Article 2 – Ownership.
+2.1.    Ownership. Licensee acknowledges and agrees that Licensor is the owner of all right, title, and interest in and to the Trademark, and all such right, title, and interest shall remain with Licensor. Licensee shall not contest, dispute, challenge, oppose, or seek to cancel Licensor’s right, title, and interest in and to the Trademark. Licensee shall not prosecute any application for registration of the Trademark. Licensee shall display appropriate notices regarding ownership of the Trademark in connection with the Licensed Use.
+2.2.    Goodwill. Licensee acknowledges that Licensee shall not acquire any right, title, or interest in the Trademark by virtue of this Agreement other than the license granted hereunder, and disclaims any such right, title, interest, or ownership. All goodwill and reputation generated by Licensee’s use of the Trademark shall inure to the exclusive benefit of Licensor. Licensee shall not by any act or omission use the Trademark in any manner that disparages or reflects adversely on Licensor or its Licensed Use or reputation. Licensee shall not take any action that would interfere with or prejudice Licensor’s ownership or registration of the Trademark, the validity of the Trademark or the validity of the license granted by this Agreement. If Licensor determines and notifies Licensee that any act taken in connection with the Licensed Use (i) is inaccurate, unlawful or offensive to good taste; (ii) fails to provide for proper trademark notices, or (iii) otherwise violates Licensee’s obligations under this Agreement, the license granted under this Agreement shall terminate. 
+## Article 3 – Indemnification. 
+3.1.    Indemnification Generally.  Licensee agrees to indemnify, defend, and hold harmless (collectively “indemnify” or “indemnification”) Licensor, including Licensor’s members, managers, officers, and employees (collectively “Related Persons”), from and against, and pay or reimburse Licensor and such Related Persons for, any and all third-party actions, claims, demands, proceedings, investigations, inquiries (collectively, “Claims”), and any and all liabilities, obligations, fines, deficiencies, costs, expenses, royalties, losses, and damages (including reasonable outside counsel fees and expenses) associated with such Claims, to the extent that such Claim arises out of (i) Licensee’s material breach of this Agreement, or (ii) any allegation(s) that Licensee’s actions infringe or violate any third-party intellectual property right, including without limitation, any U.S. copyright, patent, or trademark, or are otherwise found to be tortious or criminal (whether or not such indemnified person is a named party in a legal proceeding).  
+3.2.    Notice and Defense of Claims. Licensor shall promptly notify Licensee of any Claim for which indemnification is sought, following actual knowledge of such Claim, provided however that the failure to give such notice shall not relieve Licensee of its obligations hereunder except to the extent that Licensee is materially prejudiced by such failure. In the event that any third-party Claim is brought, Licensee shall have the right and option to undertake and control the defense of such action with counsel of its choice, provided however that (i) Licensor at its own expense may participate and appear on an equal footing with Licensee in the defense of any such Claim, (ii) Licensor may undertake and control such defense in the event of the material failure of Licensee to undertake and control the same; and (iii) the defense of any Claim relating to the intellectual property rights of Licensor or its licensors and any related counterclaims shall be solely controlled by Licensor with counsel of its choice. Licensee shall not consent to judgment or concede or settle or compromise any Claim without the prior written approval of Licensor (whose approval shall not be unreasonably withheld), unless such concession or settlement or compromise includes a full and unconditional release of Licensor and any applicable Related Persons from all liabilities in respect of such Claim.
+## Article 4 – Miscellaneous.
+4.1.    Relationship of the Parties. This Agreement does not create a partnership, franchise, joint venture, agency, fiduciary, or employment relationship between the parties. 
+4.2.    No Third-Party Beneficiaries. Except for the rights of Related Persons under Article 3 (Indemnification), there are no third-party beneficiaries to this Agreement.
+4.3.    Assignment. Licensee’s rights hereunder are non-assignable, and may not be sublicensed. 
+4.4.    Equitable Relief. Licensee acknowledges that the remedies available at law for any breach of this Agreement will, by their nature, be inadequate.  Accordingly, Licensor may obtain injunctive relief or other equitable relief to restrain a breach or threatened breach of this Agreement or to specifically enforce this Agreement, without proving that any monetary damages have been sustained, and without the requirement of posting of a bond prior to obtaining such equitable relief.
+4.5.    Governing Law. This Agreement will be interpreted, construed, and enforced in all respects in accordance with the laws of the State of California, without reference to its conflict of law principles. 
+4.6.    Attorneys’ Fees.  If any legal action, arbitration or other proceeding is brought for the enforcement of this Agreement, or because of an alleged dispute, breach, default, or misrepresentation in connection with any of the provisions of this Agreement, the successful or prevailing party shall be entitled to recover its reasonable attorneys’ fees and other reasonable costs incurred in that action or proceeding, in addition to any other relief to which it may be entitled.
+4.7.    Amendment; Waiver.  This Agreement may not be amended, nor may any rights under it be waived, except in writing by Licensor.
+4.8.    Severability. If any provision of this Agreement is held by a court of competent jurisdiction to be contrary to law, the provision shall be modified by the court and interpreted so as best to accomplish the objectives of the original provision to the fullest extent 
+permitted by law, and the remaining provisions of this Agreement shall remain in effect.
+4.9.    Entire Agreement. This Agreement constitutes the entire agreement between the parties and supersedes all prior and contemporaneous agreements, proposals or representations, written or oral, concerning its subject matter.
+# Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+## TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+1. Definitions.
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+    You must give any other recipients of the Work or Derivative Works a copy of this License; and
+    You must cause any modified files to carry prominent notices stating that You changed the files; and
+    You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+    If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+    You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+END OF TERMS AND CONDITIONS
diff --git a/meta-oe/recipes-benchmark/coremark/coremark_git.bb b/meta-oe/recipes-benchmark/coremark/coremark_git.bb
new file mode 100644
index 0000000000..f4974b754f
--- /dev/null
+++ b/meta-oe/recipes-benchmark/coremark/coremark_git.bb
@@ -0,0 +1,23 @@
+SUMMARY = "EEMBC CoreMark CPU benchmark"
+DESCRIPTION = "CoreMark is a CPU benchmark program"
+HOMEPAGE = "https://www.eembc.org/coremark/"
+LICENSE = "Apache-2.0 & LicenseRef-EEMBC-AUA"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=0a18b17ae63deaa8a595035f668aebe1"
+SRC_URI = "git://github.com/eembc/coremark.git;branch=main;protocol=https"
+SRCREV = "1f483d5b8316753a742cbf5590caf5bd0a4e4777"
+inherit pkgconfig
+do_configure[noexec] = "1"
+TARGET_CC_ARCH += "${LDFLAGS}"
+do_compile() {
+    oe_runmake compile
+}
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/coremark.exe ${D}${bindir}/coremark
+}
diff --git a/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch b/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch
deleted file mode 100644
index 6c0d69d6e8..0000000000
--- a/meta-oe/recipes-benchmark/fio/fio/0001-fix-musl-builds.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ccce76d2850d6e52da3d7986c950af068fbfe0fd Mon Sep 17 00:00:00 2001
-From: Arthur Gautier <arthur.gautier@arista.com>
-Date: Sat, 13 Dec 2025 20:07:11 -0800
-Subject: [PATCH] fix musl builds
-This commit fixes the build on musl which fails with the following
-error:
-```
-oslib/linux-blkzoned.c: In function 'blkzoned_move_zone_wp':
-oslib/linux-blkzoned.c:389:37: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function)
-  389 |                 ret = fallocate(fd, FALLOC_FL_ZERO_RANGE, z->wp, length);
-      |                                     ^~~~~~~~~~~~~~~~~~~~
-oslib/linux-blkzoned.c:389:37: note: each undeclared identifier is reported only once for each function it appears in
-make: *** [Makefile:501: oslib/linux-blkzoned.o] Error 1
-make: *** Waiting for unfinished jobs....
-```
-Upstream-Status: Backport [https://github.com/axboe/fio/commit/ccce76d2850d6e52da3d7986c950af068fbfe0fd]
-Signed-off-by: Arthur Gautier <arthur.gautier@arista.com>
---
- oslib/linux-blkzoned.c | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/oslib/linux-blkzoned.c b/oslib/linux-blkzoned.c
-index 78e25fca..c45ef623 100644
--- a/oslib/linux-blkzoned.c
-+++ b/oslib/linux-blkzoned.c
-@@ -25,6 +25,7 @@
- #ifndef BLKFINISHZONE
- #define BLKFINISHZONE _IOW(0x12, 136, struct blk_zone_range)
- #endif
-+#include <linux/falloc.h>
- 
- /*
-  * If the uapi headers installed on the system lacks zone capacity support,
-- 
-2.51.0
diff --git a/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch b/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch
deleted file mode 100644
index c5813273c7..0000000000
--- a/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6a39dfaffdb8a6c2080eec0dc7fb1ee532d54025 Mon Sep 17 00:00:00 2001
-From: Jens Axboe <axboe@kernel.dk>
-Date: Tue, 23 Sep 2025 11:50:46 -0600
-Subject: [PATCH] options: check for NULL input string and fail
-Waste of time busy work.
-Link: https://github.com/axboe/fio/issues/1982
-CVE: CVE-2025-10823
-Upstream-Status: Backport
-https://github.com/axboe/fio/commit/6a39dfaffdb8a6c2080eec0dc7fb1ee532d54025
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Saravanan <saravanan.kadambathursubramaniyam@windriver.com>
---
- options.c | 3 +++
- 1 file changed, 3 insertions(+)
-diff --git a/options.c b/options.c
-index c35878f..562c5bc 100644
--- a/options.c
-+++ b/options.c
-@@ -1616,6 +1616,9 @@ static int str_buffer_pattern_cb(void *data, const char *input)
-        struct thread_data *td = cb_data_to_td(data);
-        int ret;
- 
-+       if (!input)
-+               return 1;
-+
-        /* FIXME: for now buffer pattern does not support formats */
-        ret = parse_and_fill_pattern_alloc(input, strlen(input),
-                                &td->o.buffer_pattern, NULL, NULL, NULL);
-- 
-2.48.1
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.41.bb b/meta-oe/recipes-benchmark/fio/fio_3.42.bb
index 3f03c41f22..dac7548d08 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.41.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.42.bb
@@ -24,15 +24,11 @@ PACKAGECONFIG[numa] = ",--disable-numa,numactl"
 SRC_URI = " \
    git://git.kernel.dk/fio.git;branch=master;tag=${BP} \
-    file://0001-fix-musl-builds.patch \
 "
-SRCREV = "ed675d3477a70a42d2e757b713f6c7125a27cdca"
+SRCREV = "ab77643023f5d7e3c1b71a7576a564f368bf577a"
-SRC_URI += "file://CVE-2025-10823.patch"
 UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)"
 # avoids build breaks when using no-static-libs.inc
 DISABLE_STATIC = ""
@@ -50,3 +46,4 @@ do_install() {
 }
 CVE_STATUS[CVE-2025-10824] = "disputed: Maintainer could not reproduce the issue, issue is closed without change."
+CVE_STATUS[CVE-2026-30656] = "fixed-version: fixed in 3.42"
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.20.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.21.bb
index 7d4d6beeb8..de266551ae 100644
--- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.20.bb
+++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.21.bb
@@ -10,14 +10,14 @@ SECTION = "console/network"
 BUGTRACKER = "https://github.com/esnet/iperf/issues"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b51332d7f45357a9410daa9a14a3655f"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f2eb355b6d3b9d63b6b7a861cdc62440"
-SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https;tag=${PV} \
           file://0002-Remove-pg-from-profile_CFLAGS.patch \
           file://0001-configure.ac-check-for-CPP-prog.patch \
          "
-SRCREV = "0711330bacfaf1c2a804be66e7ecc26f481ede5d"
+SRCREV = "d39cf41526626b4e5a130f115d931cd6cbdffc19"
 RDEPENDS:${PN} = "libgcc"
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb
index 89ce11f6e4..dd2fbbc7cd 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb
@@ -31,7 +31,7 @@ SRC_URI = " \
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
-COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*"
+COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|riscv64|aarch64|arm).*-linux*"
 LIBARGS = "LIB32=${baselib} LIB64=${baselib}"
 LIBHUGETLBFS_ARCH = "${TARGET_ARCH}"
diff --git a/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb b/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb
index 198552e5c6..3154db2705 100644
--- a/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb
+++ b/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb
@@ -15,7 +15,7 @@ SRCREV = "ebf1c90da05dea94648165e4f149abc20c979557"
 COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64).*-linux*"
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 EXTRA_OECONF += "--enable-largefile --with-system-luajit --with-system-ck --without-gcc-arch --with-lib-prefix=no"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[aio] = "--enable-aio,--disable-aio,libaio,"
diff --git a/meta-oe/recipes-bsp/bolt/bolt_0.9.10.bb b/meta-oe/recipes-bsp/bolt/bolt_0.9.11.bb
index 3d1686bcf6..924964f6b6 100644
--- a/meta-oe/recipes-bsp/bolt/bolt_0.9.10.bb
+++ b/meta-oe/recipes-bsp/bolt/bolt_0.9.11.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 DEPENDS = "udev polkit dbus"
 REQUIRED_DISTRO_FEATURES = "polkit"
-SRC_URI = "git://gitlab.freedesktop.org/bolt/bolt.git;protocol=https;branch=master"
+SRC_URI = "git://gitlab.freedesktop.org/bolt/bolt.git;protocol=https;branch=master;tag=${PV}"
-SRCREV = "c0d4cb2f4399e86417907a37c0d8ef3bb9fb406f"
+SRCREV = "9d1d66380353dab94c28466f34adb2ba6c7e4393"
 CVE_PRODUCT = "freedesktop:bolt"
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-configure.ac-replace-K5_AC_INIT-with-explicit-AC_INI.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-configure.ac-replace-K5_AC_INIT-with-explicit-AC_INI.patch
new file mode 100644
index 0000000000..9fb9b38a63
--- /dev/null
+++ b/meta-oe/recipes-connectivity/krb5/krb5/0001-configure.ac-replace-K5_AC_INIT-with-explicit-AC_INI.patch
@@ -0,0 +1,37 @@
+From 1b54d6a42677bd4209cf5c893802c7f60dc0ad75 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Fri, 3 Apr 2026 23:43:18 -0700
+Subject: [PATCH] configure.ac: replace K5_AC_INIT with explicit AC_INIT
+autoreconf expects configure.ac to contain a literal AC_INIT invocation.
+krb5 currently uses the custom K5_AC_INIT wrapper, which expands to
+AC_INIT but is not recognized by autoreconf's initial sanity check,
+causing configuration to fail with:
+  autoreconf: error: configure.ac: AC_INIT not found
+Replace K5_AC_INIT([aclocal.m4]) with its explicit expansion:
+AC_INIT(...), AC_CONFIG_SRCDIR([aclocal.m4]), and build_dynobj=no.
+This preserves the existing behavior while allowing autoreconf-based
+builds to succeed.
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ src/configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+diff --git a/src/configure.ac b/src/configure.ac
+index 4325fae..03e224f 100644
+--- a/src/configure.ac
+++ b/src/configure.ac
+@@ -1,4 +1,6 @@
+-K5_AC_INIT([aclocal.m4])
+AC_INIT([Kerberos 5], m4_defn([K5_VERSION]), m4_defn([K5_BUGADDR]), [krb5])
+AC_CONFIG_SRCDIR([aclocal.m4])
+build_dynobj=no
+ 
+ # If $runstatedir isn't set by autoconf (<2.70), set it manually.
+ if test x"$runstatedir" = x; then
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb
index 5d8ab2dc01..89e5502847 100644
--- a/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb
+++ b/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb
@@ -23,6 +23,7 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \
           file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \
           file://fix-strchr-conformance-to-C23.patch;striplevel=2 \
           file://crosscompile_nm.patch \
+           file://0001-configure.ac-replace-K5_AC_INIT-with-explicit-AC_INI.patch;striplevel=2 \
           file://etc/init.d/krb5-kdc \
           file://etc/init.d/krb5-admin-server \
           file://etc/default/krb5-kdc \
diff --git a/meta-oe/recipes-connectivity/libcppconnman/libcppconnman_git.bb b/meta-oe/recipes-connectivity/libcppconnman/libcppconnman_1.0.0.bb
index daa32a8d48..bd1686e9a9 100644
--- a/meta-oe/recipes-connectivity/libcppconnman/libcppconnman_git.bb
+++ b/meta-oe/recipes-connectivity/libcppconnman/libcppconnman_1.0.0.bb
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a87a7059d580c45495c1218f53e3610d"
 SECTION = "libs"
-SRC_URI = "git://github.com/amarula/libcppconnman.git;protocol=https;branch=main"
+SRC_URI = "git://github.com/amarula/libcppconnman.git;protocol=https;branch=main;tag=v${PV}"
-SRCREV = "d89262c2cd7336da8ba9eb06228d422847fe4b20"
+SRCREV = "84fa99d3ba0908ff9debd9191c4eddabf08079d4"
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.8.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.9.bb
index 1e9d9d74f1..63c8a0bb7d 100644
--- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.8.bb
+++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.9.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 DEPENDS = "zlib curl libsigc++-2.0 openssl cppunit"
 SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https;tag=v${PV}"
-SRCREV = "1534b1563f464fd1636c0b55e1591b72f7d8ab6b"
+SRCREV = "e88d4e7854abacd3036a0dec11927c1276c1e6b2"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.5.8.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.5.8.bb
index 02843be7c3..a18f88390e 100644
--- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.5.8.bb
+++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.5.8.bb
@@ -22,7 +22,7 @@ PACKAGECONFIG[libevent] = "-DLWS_WITH_LIBEVENT=ON,-DLWS_WITH_LIBEVENT=OFF,libeve
 PACKAGECONFIG[libev] = "-DLWS_WITH_LIBEV=ON,-DLWS_WITH_LIBEV=OFF,libev"
 PACKAGECONFIG[libuv] = "-DLWS_WITH_LIBUV=ON,-DLWS_WITH_LIBUV=OFF,libuv"
 PACKAGECONFIG[server] = "-DLWS_WITHOUT_SERVER=OFF,-DLWS_WITHOUT_SERVER=ON,"
-PACKAGECONFIG[ssl] = "-DLWS_WITH_SSL=ON,-DLWS_WITH_SSL=OFF,openssl"
+PACKAGECONFIG[ssl] = "-DLWS_WITH_SSL=ON,-DLWS_WITH_SSL=OFF,openssl libcap"
 PACKAGECONFIG[static] = "-DLWS_WITH_STATIC=ON,-DLWS_WITH_STATIC=OFF -DLWS_LINK_TESTAPPS_DYNAMIC=ON,"
 PACKAGECONFIG[systemd] = "-DLWS_WITH_SDEVENT=ON,-DLWS_WITH_SDEVENT=OFF,systemd"
 PACKAGECONFIG[examples] = "-DLWS_WITH_MINIMAL_EXAMPLES=ON,-DLWS_WITH_MINIMAL_EXAMPLES=OFF"
@@ -34,6 +34,7 @@ python __anonymous() {
 EXTRA_OECMAKE += " \
    -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
+    -DLWS_WITHOUT_TESTAPPS=ON \
 "
 do_compile:prepend() {
@@ -41,6 +42,8 @@ do_compile:prepend() {
 }
 do_install:append() {
+    sed -i -e 's|${STAGING_BASELIBDIR}/libcap.so|cap|g' ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake
+    sed -i -e 's|${STAGING_BASELIBDIR}/libcap.so|cap|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake
    sed -i -e 's|${STAGING_LIBDIR}/libcrypto.so|crypto|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake
    sed -i -e 's|${STAGING_LIBDIR}/libssl.so|ssl|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake
    sed -i -e 's|${STAGING_LIBDIR}/libuv.so|uv|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake
diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.8.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.9.bb
index 9fc6f1e5e9..7ce38e9597 100644
--- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.8.bb
+++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.9.bb
@@ -7,7 +7,7 @@ DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurse
 SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https;tag=v${PV}"
-SRCREV = "39f186e523f6ea2e72a3715a72d6e9ae4081ed84"
+SRCREV = "b78fd9aef5d0060fe7bd8447cace38606e03f41c"
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-connectivity/ttyd/ttyd_1.7.7.bb b/meta-oe/recipes-connectivity/ttyd/ttyd_1.7.7.bb
new file mode 100644
index 0000000000..8f4a1d3211
--- /dev/null
+++ b/meta-oe/recipes-connectivity/ttyd/ttyd_1.7.7.bb
@@ -0,0 +1,11 @@
+SUMMARY = "ttyd is a simple command-line tool for sharing terminal over the web."
+SECTION = "console/network"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4fe5f001c65f923d49dc96cce96ce935"
+SRC_URI = "git://github.com/tsl0922/ttyd.git;protocol=https;branch=main;tag=${PV}"
+SRCREV = "40e79c706be14029b391f369bee6613c31667abb"
+inherit cmake
+DEPENDS = "libuv json-c zlib libwebsockets"
diff --git a/meta-oe/recipes-core/minizip/minizip/0001-Add-dependency-to-ints.h-in-minizip-Makefile.am.patch b/meta-oe/recipes-core/minizip/minizip/0001-Add-dependency-to-ints.h-in-minizip-Makefile.am.patch
new file mode 100644
index 0000000000..1d05989c74
--- /dev/null
+++ b/meta-oe/recipes-core/minizip/minizip/0001-Add-dependency-to-ints.h-in-minizip-Makefile.am.patch
@@ -0,0 +1,25 @@
+From cb14dc9ade3759352417a300e6c2ed73268f1d97 Mon Sep 17 00:00:00 2001
+From: Rui Chen <rui@chenrui.dev>
+Date: Tue, 17 Feb 2026 10:48:39 -0500
+Subject: [PATCH] Add dependency to ints.h in minizip Makefile.am.
+So that ints.h is part of the installation.
+Upstream-Status: Backport
+Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
+---
+ contrib/minizip/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am
+index d343011..b7dea4f 100644
+--- a/contrib/minizip/Makefile.am
+++ b/contrib/minizip/Makefile.am
+@@ -27,6 +27,7 @@ libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
+ minizip_includedir = $(includedir)/minizip
+ minizip_include_HEADERS = \
+        crypt.h \
+       ints.h \
+        ioapi.h \
+        mztools.h \
+        unzip.h \
diff --git a/meta-oe/recipes-core/minizip/minizip_1.3.1.bb b/meta-oe/recipes-core/minizip/minizip_1.3.2.bb
index 51a74d039b..95a605ecf4 100644
--- a/meta-oe/recipes-core/minizip/minizip_1.3.1.bb
+++ b/meta-oe/recipes-core/minizip/minizip_1.3.2.bb
@@ -4,15 +4,17 @@ library which is used by many different programs."
 HOMEPAGE = "http://www.winimage.com/zLibDll/minizip.html"
 SECTION = "libs"
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=8eaa8535a3a1a2296b303f40f75385e7"
+LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=b7d2930a7332b2bc68fc1a7fdc5ba775"
 GITHUB_BASE_URI ?= "https://github.com/madler/zlib/releases/"
-SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/zlib-${PV}.tar.xz"
+SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/zlib-${PV}.tar.xz \
+           file://0001-Add-dependency-to-ints.h-in-minizip-Makefile.am.patch;patchdir=../.. \
+           "
 S = "${UNPACKDIR}/zlib-${PV}/contrib/minizip"
-SRC_URI[sha256sum] = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32"
+SRC_URI[sha256sum] = "d7a0654783a4da529d1bb793b7ad9c3318020af77667bcae35f95d0e42a792f3"
 PACKAGECONFIG ??= "demos"
 PACKAGECONFIG[demos] = "--enable-demos=yes,,,"
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index c74114ee61..7c2df00207 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -836,17 +836,15 @@ RDEPENDS:packagegroup-meta-oe-support = "\
    nss \
    numactl \
    onig \
-    openct \
    opencv \
    openldap \
    opensc \
    p910nd \
-    pcp \
    pcsc-lite \
    pcsc-tools \
    picocom \
    pidgin \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pidgin-otr", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pcp pidgin-otr", "", d)} \
    pidgin-sipe \
    pngcheck \
    poco \
@@ -862,7 +860,6 @@ RDEPENDS:packagegroup-meta-oe-support = "\
    rdfind \
    re2 \
    read-edid \
-    remmina \
    rsnapshot \
    sassc \
    satyr \
@@ -876,7 +873,7 @@ RDEPENDS:packagegroup-meta-oe-support = "\
    srecord \
    ssiapi \
    stm32flash \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "synergy", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "remmina synergy", "", d)} \
    syslog-ng \
    tbb \
    thin-provisioning-tools \
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-missing_type.h-add-comparison_fn_t.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-missing_type.h-add-comparison_fn_t.patch
deleted file mode 100644
index 2aa5dee6b5..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-missing_type.h-add-comparison_fn_t.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 01195eb9f7d59139fb45df506ac6b3968c14a57f Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Mon, 25 Feb 2019 13:55:12 +0800
-Subject: [PATCH 01/22] missing_type.h: add comparison_fn_t
-Make it work with musl where comparison_fn_t and is not provided.
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-[Rebased for v244]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[Rebased for v242]
-Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
-[Rebased for v250, Drop __compare_fn_t]
-Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
---
- src/basic/missing_type.h            | 4 ++++
- src/basic/sort-util.h               | 1 +
- src/libsystemd/sd-journal/catalog.c | 1 +
- 3 files changed, 6 insertions(+)
-diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
-index f6233090a9..6c0456349d 100644
--- a/src/basic/missing_type.h
-+++ b/src/basic/missing_type.h
-@@ -10,3 +10,7 @@
- #if !HAVE_CHAR16_T
- #define char16_t uint16_t
- #endif
-+
-+#ifndef __GLIBC__
-+typedef int (*comparison_fn_t)(const void *, const void *);
-+#endif
-diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
-index 9c818bd747..ef10c8be2c 100644
--- a/src/basic/sort-util.h
-+++ b/src/basic/sort-util.h
-@@ -4,6 +4,7 @@
- #include <stdlib.h>
- 
- #include "macro.h"
-+#include "missing_type.h"
- 
- /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the
-  * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that
-diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c
-index ae91534198..7f67eea38b 100644
--- a/src/libsystemd/sd-journal/catalog.c
-+++ b/src/libsystemd/sd-journal/catalog.c
-@@ -28,6 +28,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "tmpfile-util.h"
-+#include "missing_type.h"
- 
- const char * const catalog_file_dirs[] = {
-         "/usr/local/lib/systemd/catalog/",
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0002-add-fallback-parse_printf_format-implementation.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0002-add-fallback-parse_printf_format-implementation.patch
deleted file mode 100644
index 900a931632..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0002-add-fallback-parse_printf_format-implementation.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-From 872b72739e62123867ce6c4f82aa37de24cc3f75 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Sat, 22 May 2021 20:26:24 +0200
-Subject: [PATCH 02/22] add fallback parse_printf_format implementation
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Emil Renner Berthing <systemd@esmil.dk>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[rebased for systemd 243]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
- meson.build                              |   1 +
- src/basic/meson.build                    |   5 +
- src/basic/parse-printf-format.c          | 273 +++++++++++++++++++++++
- src/basic/parse-printf-format.h          |  57 +++++
- src/basic/stdio-util.h                   |   2 +-
- src/libsystemd/sd-journal/journal-send.c |   2 +-
- 6 files changed, 338 insertions(+), 2 deletions(-)
- create mode 100644 src/basic/parse-printf-format.c
- create mode 100644 src/basic/parse-printf-format.h
-diff --git a/meson.build b/meson.build
-index 7419e2b0b0..01fd3ffc19 100644
--- a/meson.build
-+++ b/meson.build
-@@ -725,6 +725,7 @@ endif
- foreach header : ['crypt.h',
-                   'linux/memfd.h',
-                   'linux/vm_sockets.h',
-+                  'printf.h',
-                   'sys/auxv.h',
-                   'threads.h',
-                   'valgrind/memcheck.h',
-diff --git a/src/basic/meson.build b/src/basic/meson.build
-index d7450d8b44..c3e3daf4bd 100644
--- a/src/basic/meson.build
-+++ b/src/basic/meson.build
-@@ -183,6 +183,11 @@ endforeach
- 
- basic_sources += generated_gperf_headers
- 
-+if conf.get('HAVE_PRINTF_H') != 1
-+        basic_sources += [files('parse-printf-format.c')]
-+endif
-+
-+
- ############################################################
- 
- arch_list = [
-diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c
-new file mode 100644
-index 0000000000..49437e5445
--- /dev/null
-+++ b/src/basic/parse-printf-format.c
-@@ -0,0 +1,273 @@
-+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-+
-+/***
-+  This file is part of systemd.
-+
-+  Copyright 2014 Emil Renner Berthing <systemd@esmil.dk>
-+
-+  With parts from the musl C library
-+  Copyright 2005-2014 Rich Felker, et al.
-+
-+  systemd is free software; you can redistribute it and/or modify it
-+  under the terms of the GNU Lesser General Public License as published by
-+  the Free Software Foundation; either version 2.1 of the License, or
-+  (at your option) any later version.
-+
-+  systemd is distributed in the hope that it will be useful, but
-+  WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+  Lesser General Public License for more details.
-+
-+  You should have received a copy of the GNU Lesser General Public License
-+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-+***/
-+
-+#include <stddef.h>
-+#include <string.h>
-+
-+#include "parse-printf-format.h"
-+
-+static const char *consume_nonarg(const char *fmt)
-+{
-+        do {
-+                if (*fmt == '\0')
-+                        return fmt;
-+        } while (*fmt++ != '%');
-+        return fmt;
-+}
-+
-+static const char *consume_num(const char *fmt)
-+{
-+        for (;*fmt >= '0' && *fmt <= '9'; fmt++)
-+                /* do nothing */;
-+        return fmt;
-+}
-+
-+static const char *consume_argn(const char *fmt, size_t *arg)
-+{
-+        const char *p = fmt;
-+        size_t val = 0;
-+
-+        if (*p < '1' || *p > '9')
-+                return fmt;
-+        do {
-+                val = 10*val + (*p++ - '0');
-+        } while (*p >= '0' && *p <= '9');
-+
-+        if (*p != '$')
-+                return fmt;
-+        *arg = val;
-+        return p+1;
-+}
-+
-+static const char *consume_flags(const char *fmt)
-+{
-+        while (1) {
-+                switch (*fmt) {
-+                case '#':
-+                case '0':
-+                case '-':
-+                case ' ':
-+                case '+':
-+                case '\'':
-+                case 'I':
-+                        fmt++;
-+                        continue;
-+                }
-+                return fmt;
-+        }
-+}
-+
-+enum state {
-+        BARE,
-+        LPRE,
-+        LLPRE,
-+        HPRE,
-+        HHPRE,
-+        BIGLPRE,
-+        ZTPRE,
-+        JPRE,
-+        STOP
-+};
-+
-+enum type {
-+        NONE,
-+        PTR,
-+        INT,
-+        UINT,
-+        ULLONG,
-+        LONG,
-+        ULONG,
-+        SHORT,
-+        USHORT,
-+        CHAR,
-+        UCHAR,
-+        LLONG,
-+        SIZET,
-+        IMAX,
-+        UMAX,
-+        PDIFF,
-+        UIPTR,
-+        DBL,
-+        LDBL,
-+        MAXTYPE
-+};
-+
-+static const short pa_types[MAXTYPE] = {
-+        [NONE]   = PA_INT,
-+        [PTR]    = PA_POINTER,
-+        [INT]    = PA_INT,
-+        [UINT]   = PA_INT,
-+        [ULLONG] = PA_INT | PA_FLAG_LONG_LONG,
-+        [LONG]   = PA_INT | PA_FLAG_LONG,
-+        [ULONG]  = PA_INT | PA_FLAG_LONG,
-+        [SHORT]  = PA_INT | PA_FLAG_SHORT,
-+        [USHORT] = PA_INT | PA_FLAG_SHORT,
-+        [CHAR]   = PA_CHAR,
-+        [UCHAR]  = PA_CHAR,
-+        [LLONG]  = PA_INT | PA_FLAG_LONG_LONG,
-+        [SIZET]  = PA_INT | PA_FLAG_LONG,
-+        [IMAX]   = PA_INT | PA_FLAG_LONG_LONG,
-+        [UMAX]   = PA_INT | PA_FLAG_LONG_LONG,
-+        [PDIFF]  = PA_INT | PA_FLAG_LONG_LONG,
-+        [UIPTR]  = PA_INT | PA_FLAG_LONG,
-+        [DBL]    = PA_DOUBLE,
-+        [LDBL]   = PA_DOUBLE | PA_FLAG_LONG_DOUBLE
-+};
-+
-+#define S(x) [(x)-'A']
-+#define E(x) (STOP + (x))
-+
-+static const unsigned char states[]['z'-'A'+1] = {
-+        { /* 0: bare types */
-+                S('d') = E(INT), S('i') = E(INT),
-+                S('o') = E(UINT),S('u') = E(UINT),S('x') = E(UINT), S('X') = E(UINT),
-+                S('e') = E(DBL), S('f') = E(DBL), S('g') = E(DBL),  S('a') = E(DBL),
-+                S('E') = E(DBL), S('F') = E(DBL), S('G') = E(DBL),  S('A') = E(DBL),
-+                S('c') = E(CHAR),S('C') = E(INT),
-+                S('s') = E(PTR), S('S') = E(PTR), S('p') = E(UIPTR),S('n') = E(PTR),
-+                S('m') = E(NONE),
-+                S('l') = LPRE,   S('h') = HPRE, S('L') = BIGLPRE,
-+                S('z') = ZTPRE,  S('j') = JPRE, S('t') = ZTPRE
-+        }, { /* 1: l-prefixed */
-+                S('d') = E(LONG), S('i') = E(LONG),
-+                S('o') = E(ULONG),S('u') = E(ULONG),S('x') = E(ULONG),S('X') = E(ULONG),
-+                S('e') = E(DBL),  S('f') = E(DBL),  S('g') = E(DBL),  S('a') = E(DBL),
-+                S('E') = E(DBL),  S('F') = E(DBL),  S('G') = E(DBL),  S('A') = E(DBL),
-+                S('c') = E(INT),  S('s') = E(PTR),  S('n') = E(PTR),
-+                S('l') = LLPRE
-+        }, { /* 2: ll-prefixed */
-+                S('d') = E(LLONG), S('i') = E(LLONG),
-+                S('o') = E(ULLONG),S('u') = E(ULLONG),
-+                S('x') = E(ULLONG),S('X') = E(ULLONG),
-+                S('n') = E(PTR)
-+        }, { /* 3: h-prefixed */
-+                S('d') = E(SHORT), S('i') = E(SHORT),
-+                S('o') = E(USHORT),S('u') = E(USHORT),
-+                S('x') = E(USHORT),S('X') = E(USHORT),
-+                S('n') = E(PTR),
-+                S('h') = HHPRE
-+        }, { /* 4: hh-prefixed */
-+                S('d') = E(CHAR), S('i') = E(CHAR),
-+                S('o') = E(UCHAR),S('u') = E(UCHAR),
-+                S('x') = E(UCHAR),S('X') = E(UCHAR),
-+                S('n') = E(PTR)
-+        }, { /* 5: L-prefixed */
-+                S('e') = E(LDBL),S('f') = E(LDBL),S('g') = E(LDBL), S('a') = E(LDBL),
-+                S('E') = E(LDBL),S('F') = E(LDBL),S('G') = E(LDBL), S('A') = E(LDBL),
-+                S('n') = E(PTR)
-+        }, { /* 6: z- or t-prefixed (assumed to be same size) */
-+                S('d') = E(PDIFF),S('i') = E(PDIFF),
-+                S('o') = E(SIZET),S('u') = E(SIZET),
-+                S('x') = E(SIZET),S('X') = E(SIZET),
-+                S('n') = E(PTR)
-+        }, { /* 7: j-prefixed */
-+                S('d') = E(IMAX), S('i') = E(IMAX),
-+                S('o') = E(UMAX), S('u') = E(UMAX),
-+                S('x') = E(UMAX), S('X') = E(UMAX),
-+                S('n') = E(PTR)
-+        }
-+};
-+
-+size_t parse_printf_format(const char *fmt, size_t n, int *types)
-+{
-+        size_t i = 0;
-+        size_t last = 0;
-+
-+        memset(types, 0, n);
-+
-+        while (1) {
-+                size_t arg;
-+                unsigned int state;
-+
-+                fmt = consume_nonarg(fmt);
-+                if (*fmt == '\0')
-+                        break;
-+                if (*fmt == '%') {
-+                        fmt++;
-+                        continue;
-+                }
-+                arg = 0;
-+                fmt = consume_argn(fmt, &arg);
-+                /* flags */
-+                fmt = consume_flags(fmt);
-+                /* width */
-+                if (*fmt == '*') {
-+                        size_t warg = 0;
-+                        fmt = consume_argn(fmt+1, &warg);
-+                        if (warg == 0)
-+                                warg = ++i;
-+                        if (warg > last)
-+                                last = warg;
-+                        if (warg <= n && types[warg-1] == NONE)
-+                                types[warg-1] = INT;
-+                } else
-+                        fmt = consume_num(fmt);
-+                /* precision */
-+                if (*fmt == '.') {
-+                        fmt++;
-+                        if (*fmt == '*') {
-+                                size_t parg = 0;
-+                                fmt = consume_argn(fmt+1, &parg);
-+                                if (parg == 0)
-+                                        parg = ++i;
-+                                if (parg > last)
-+                                        last = parg;
-+                                if (parg <= n && types[parg-1] == NONE)
-+                                        types[parg-1] = INT;
-+                        } else {
-+                                if (*fmt == '-')
-+                                        fmt++;
-+                                fmt = consume_num(fmt);
-+                        }
-+                }
-+                /* length modifier and conversion specifier */
-+                state = BARE;
-+                do {
-+                        unsigned char c = *fmt++;
-+
-+                        if (c < 'A' || c > 'z')
-+                                continue;
-+                        state = states[state]S(c);
-+                        if (state == 0)
-+                                continue;
-+                } while (state < STOP);
-+
-+                if (state == E(NONE))
-+                        continue;
-+
-+                if (arg == 0)
-+                        arg = ++i;
-+                if (arg > last)
-+                        last = arg;
-+                if (arg <= n)
-+                        types[arg-1] = state - STOP;
-+        }
-+
-+        if (last > n)
-+                last = n;
-+        for (i = 0; i < last; i++)
-+                types[i] = pa_types[types[i]];
-+
-+        return last;
-+}
-diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h
-new file mode 100644
-index 0000000000..47be7522d7
--- /dev/null
-+++ b/src/basic/parse-printf-format.h
-@@ -0,0 +1,57 @@
-+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-+
-+/***
-+  This file is part of systemd.
-+
-+  Copyright 2014 Emil Renner Berthing <systemd@esmil.dk>
-+
-+  With parts from the GNU C Library
-+  Copyright 1991-2014 Free Software Foundation, Inc.
-+
-+  systemd is free software; you can redistribute it and/or modify it
-+  under the terms of the GNU Lesser General Public License as published by
-+  the Free Software Foundation; either version 2.1 of the License, or
-+  (at your option) any later version.
-+
-+  systemd is distributed in the hope that it will be useful, but
-+  WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+  Lesser General Public License for more details.
-+
-+  You should have received a copy of the GNU Lesser General Public License
-+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-+***/
-+
-+#pragma once
-+
-+#include "config.h"
-+
-+#if HAVE_PRINTF_H
-+#include <printf.h>
-+#else
-+
-+#include <stddef.h>
-+
-+enum {                         /* C type: */
-+  PA_INT,                      /* int */
-+  PA_CHAR,                     /* int, cast to char */
-+  PA_WCHAR,                    /* wide char */
-+  PA_STRING,                   /* const char *, a '\0'-terminated string */
-+  PA_WSTRING,                  /* const wchar_t *, wide character string */
-+  PA_POINTER,                  /* void * */
-+  PA_FLOAT,                    /* float */
-+  PA_DOUBLE,                   /* double */
-+  PA_LAST
-+};
-+
-+/* Flag bits that can be set in a type returned by `parse_printf_format'.  */
-+#define        PA_FLAG_MASK            0xff00
-+#define        PA_FLAG_LONG_LONG       (1 << 8)
-+#define        PA_FLAG_LONG_DOUBLE     PA_FLAG_LONG_LONG
-+#define        PA_FLAG_LONG            (1 << 9)
-+#define        PA_FLAG_SHORT           (1 << 10)
-+#define        PA_FLAG_PTR             (1 << 11)
-+
-+size_t parse_printf_format(const char *fmt, size_t n, int *types);
-+
-+#endif /* HAVE_PRINTF_H */
-diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
-index 4e93ac90c9..f9deb6f662 100644
--- a/src/basic/stdio-util.h
-+++ b/src/basic/stdio-util.h
-@@ -1,12 +1,12 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- #pragma once
- 
-#include <printf.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- 
- #include "macro.h"
-+#include "parse-printf-format.h"
- 
- _printf_(3, 4)
- static inline char *snprintf_ok(char *buf, size_t len, const char *format, ...) {
-diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c
-index be23b2fe75..69a2eb6404 100644
--- a/src/libsystemd/sd-journal/journal-send.c
-+++ b/src/libsystemd/sd-journal/journal-send.c
-@@ -2,7 +2,6 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-#include <printf.h>
- #include <stddef.h>
- #include <sys/un.h>
- #include <unistd.h>
-@@ -28,6 +27,7 @@
- #include "stdio-util.h"
- #include "string-util.h"
- #include "tmpfile-util.h"
-+#include "parse-printf-format.h"
- 
- #define SNDBUF_SIZE (8*1024*1024)
- 
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
deleted file mode 100644
index be231cf6b2..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 29a58009a172e369ad7166e16dab2f4945c6b0d2 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Thu, 21 Feb 2019 16:23:24 +0800
-Subject: [PATCH 1/2] binfmt: Don't install dependency links at install time
- for the binfmt services
-use [Install] blocks so that they get created when the service is enabled
-like a traditional service.
-The [Install] blocks were rejected upstream as they don't have a way to
-"enable" it on install without static symlinks which can't be disabled,
-only masked. We however can do that in a postinst.
-Upstream-Status: Denied
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[rebased for systemd 243]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
- units/meson.build                       | 2 --
- units/proc-sys-fs-binfmt_misc.automount | 3 +++
- units/systemd-binfmt.service.in         | 4 ++++
- 3 files changed, 7 insertions(+), 2 deletions(-)
-diff --git a/units/meson.build b/units/meson.build
-index e7bfb7f838..1d5ec4b178 100644
--- a/units/meson.build
-+++ b/units/meson.build
-@@ -154,7 +154,6 @@ units = [
-         {
-           'file' : 'proc-sys-fs-binfmt_misc.automount',
-           'conditions' : ['ENABLE_BINFMT'],
-          'symlinks' : ['sysinit.target.wants/'],
-         },
-         {
-           'file' : 'proc-sys-fs-binfmt_misc.mount',
-@@ -251,7 +250,6 @@ units = [
-         {
-           'file' : 'systemd-binfmt.service.in',
-           'conditions' : ['ENABLE_BINFMT'],
-          'symlinks' : ['sysinit.target.wants/'],
-         },
-         {
-           'file' : 'systemd-bless-boot.service.in',
-diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
-index 5d212015a5..6c2900ca77 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
-+++ b/units/proc-sys-fs-binfmt_misc.automount
-@@ -22,3 +22,6 @@ Before=shutdown.target
- 
- [Automount]
- Where=/proc/sys/fs/binfmt_misc
-+
-+[Install]
-+WantedBy=sysinit.target
-diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
-index 6861c76674..531e9fbd90 100644
--- a/units/systemd-binfmt.service.in
-+++ b/units/systemd-binfmt.service.in
-@@ -14,6 +14,7 @@ Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html
- Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
- DefaultDependencies=no
- Conflicts=shutdown.target
-+Wants=proc-sys-fs-binfmt_misc.automount
- After=proc-sys-fs-binfmt_misc.automount
- After=proc-sys-fs-binfmt_misc.mount
- After=local-fs.target
-@@ -31,3 +32,6 @@ RemainAfterExit=yes
- ExecStart={{LIBEXECDIR}}/systemd-binfmt
- ExecStop={{LIBEXECDIR}}/systemd-binfmt --unregister
- TimeoutSec=90s
-+
-+[Install]
-+WantedBy=sysinit.target
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
deleted file mode 100644
index 5595b5bc23..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
+++ /dev/null
@@ -1,699 +0,0 @@
-From 87f1d38f40c5fe9cadf2b2de442473e4e5605788 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Mon, 25 Feb 2019 14:18:21 +0800
-Subject: [PATCH 03/22] src/basic/missing.h: check for missing strndupa
-include missing.h  for definition of strndupa
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[Rebased for v242]
-Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
-[rebased for systemd 243]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-[rebased for systemd 244]
-[Rebased for v247]
-Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
-[Rebased for v254]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[Rebased for v255.1]
---
- meson.build                                |  1 +
- src/backlight/backlight.c                  |  1 +
- src/basic/cgroup-util.c                    |  1 +
- src/basic/env-util.c                       |  1 +
- src/basic/log.c                            |  1 +
- src/basic/missing_stdlib.h                 | 12 ++++++++++++
- src/basic/mkdir.c                          |  1 +
- src/basic/mountpoint-util.c                |  1 +
- src/basic/parse-util.c                     |  1 +
- src/basic/path-lookup.c                    |  1 +
- src/basic/percent-util.c                   |  1 +
- src/basic/proc-cmdline.c                   |  1 +
- src/basic/procfs-util.c                    |  1 +
- src/basic/time-util.c                      |  1 +
- src/boot/bless-boot.c                      |  1 +
- src/core/dbus-cgroup.c                     |  1 +
- src/core/dbus-execute.c                    |  1 +
- src/core/dbus-util.c                       |  1 +
- src/core/execute.c                         |  1 +
- src/core/kmod-setup.c                      |  1 +
- src/core/service.c                         |  1 +
- src/coredump/coredump-vacuum.c             |  1 +
- src/fstab-generator/fstab-generator.c      |  1 +
- src/journal-remote/journal-remote-main.c   |  1 +
- src/journal/journalctl.c                   |  1 +
- src/libsystemd/sd-bus/bus-message.c        |  1 +
- src/libsystemd/sd-bus/bus-objects.c        |  1 +
- src/libsystemd/sd-bus/bus-socket.c         |  1 +
- src/libsystemd/sd-bus/sd-bus.c             |  1 +
- src/libsystemd/sd-bus/test-bus-benchmark.c |  1 +
- src/libsystemd/sd-journal/sd-journal.c     |  1 +
- src/login/pam_systemd.c                    |  1 +
- src/network/generator/network-generator.c  |  1 +
- src/nspawn/nspawn-settings.c               |  1 +
- src/nss-mymachines/nss-mymachines.c        |  1 +
- src/portable/portable.c                    |  1 +
- src/resolve/resolvectl.c                   |  1 +
- src/shared/bus-get-properties.c            |  1 +
- src/shared/bus-unit-procs.c                |  1 +
- src/shared/bus-unit-util.c                 |  1 +
- src/shared/bus-util.c                      |  1 +
- src/shared/dns-domain.c                    |  1 +
- src/shared/journal-importer.c              |  1 +
- src/shared/logs-show.c                     |  1 +
- src/shared/pager.c                         |  1 +
- src/socket-proxy/socket-proxyd.c           |  1 +
- src/test/test-hexdecoct.c                  |  1 +
- src/udev/udev-builtin-net_id.c             |  1 +
- src/udev/udev-builtin-path_id.c            |  1 +
- src/udev/udev-event.c                      |  1 +
- src/udev/udev-rules.c                      |  1 +
- 51 files changed, 62 insertions(+)
-diff --git a/meson.build b/meson.build
-index 01fd3ffc19..61a872b753 100644
--- a/meson.build
-+++ b/meson.build
-@@ -567,6 +567,7 @@ foreach ident : ['secure_getenv', '__secure_getenv']
- endforeach
- 
- foreach ident : [
-+        ['strndupa' ,         '''#include <string.h>'''],
-         ['memfd_create',      '''#include <sys/mman.h>'''],
-         ['gettid',            '''#include <sys/types.h>
-                                  #include <unistd.h>'''],
-diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index 5ac9f904a9..99d5122dd7 100644
--- a/src/backlight/backlight.c
-+++ b/src/backlight/backlight.c
-@@ -20,6 +20,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "terminal-util.h"
-+#include "missing_stdlib.h"
- 
- #define PCI_CLASS_GRAPHICS_CARD 0x30000
- 
-diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
-index 18b16ecc0e..d2be79622f 100644
--- a/src/basic/cgroup-util.c
-+++ b/src/basic/cgroup-util.c
-@@ -38,6 +38,7 @@
- #include "unit-name.h"
- #include "user-util.h"
- #include "xattr-util.h"
-+#include "missing_stdlib.h"
- 
- static int cg_enumerate_items(const char *controller, const char *path, FILE **ret, const char *item) {
-         _cleanup_free_ char *fs = NULL;
-diff --git a/src/basic/env-util.c b/src/basic/env-util.c
-index d3bf73385f..16b17358ca 100644
--- a/src/basic/env-util.c
-+++ b/src/basic/env-util.c
-@@ -19,6 +19,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
- 
- /* We follow bash for the character set. Different shells have different rules. */
- #define VALID_BASH_ENV_NAME_CHARS               \
-diff --git a/src/basic/log.c b/src/basic/log.c
-index 1470611a75..9924ec2b9a 100644
--- a/src/basic/log.c
-+++ b/src/basic/log.c
-@@ -40,6 +40,7 @@
- #include "terminal-util.h"
- #include "time-util.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
- 
- #define SNDBUF_SIZE (8*1024*1024)
- #define IOVEC_MAX 256U
-diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
-index 8c76f93eb2..9068bfb4f0 100644
--- a/src/basic/missing_stdlib.h
-+++ b/src/basic/missing_stdlib.h
-@@ -11,3 +11,15 @@
- #    error "neither secure_getenv nor __secure_getenv are available"
- #  endif
- #endif
-+
-+/* string.h */
-+#if ! HAVE_STRNDUPA
-+#define strndupa(s, n) \
-+  ({ \
-+    const char *__old = (s); \
-+    size_t __len = strnlen(__old, (n)); \
-+    char *__new = (char *)alloca(__len + 1); \
-+    __new[__len] = '\0'; \
-+    (char *)memcpy(__new, __old, __len); \
-+  })
-+#endif
-diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
-index c770e5ed32..1fd8816cd0 100644
--- a/src/basic/mkdir.c
-+++ b/src/basic/mkdir.c
-@@ -16,6 +16,7 @@
- #include "stat-util.h"
- #include "stdio-util.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
- 
- int mkdirat_safe_internal(
-                 int dir_fd,
-diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c
-index bf67f7e01a..409f8d8a73 100644
--- a/src/basic/mountpoint-util.c
-+++ b/src/basic/mountpoint-util.c
-@@ -18,6 +18,7 @@
- #include "missing_stat.h"
- #include "missing_syscall.h"
- #include "mkdir.h"
-+#include "missing_stdlib.h"
- #include "mountpoint-util.h"
- #include "nulstr-util.h"
- #include "parse-util.h"
-diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
-index 0430e33e40..f3728de026 100644
--- a/src/basic/parse-util.c
-+++ b/src/basic/parse-util.c
-@@ -18,6 +18,7 @@
- #include "stat-util.h"
- #include "string-util.h"
- #include "strv.h"
-+#include "missing_stdlib.h"
- 
- int parse_boolean(const char *v) {
-         if (!v)
-diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
-index 4e3d59fc56..726e240df0 100644
--- a/src/basic/path-lookup.c
-+++ b/src/basic/path-lookup.c
-@@ -16,6 +16,7 @@
- #include "strv.h"
- #include "tmpfile-util.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
- 
- int xdg_user_runtime_dir(char **ret, const char *suffix) {
-         const char *e;
-diff --git a/src/basic/percent-util.c b/src/basic/percent-util.c
-index cab9d0eaea..5f6ca258e9 100644
--- a/src/basic/percent-util.c
-+++ b/src/basic/percent-util.c
-@@ -3,6 +3,7 @@
- #include "percent-util.h"
- #include "string-util.h"
- #include "parse-util.h"
-+#include "missing_stdlib.h"
- 
- static int parse_parts_value_whole(const char *p, const char *symbol) {
-         const char *pc, *n;
-diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
-index 522d8de1f4..7c129dc0fc 100644
--- a/src/basic/proc-cmdline.c
-+++ b/src/basic/proc-cmdline.c
-@@ -16,6 +16,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "virt.h"
-+#include "missing_stdlib.h"
- 
- int proc_cmdline_filter_pid1_args(char **argv, char ***ret) {
-         enum {
-diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
-index d7cfcd9105..6cb0ddf575 100644
--- a/src/basic/procfs-util.c
-+++ b/src/basic/procfs-util.c
-@@ -12,6 +12,7 @@
- #include "procfs-util.h"
- #include "stdio-util.h"
- #include "string-util.h"
-+#include "missing_stdlib.h"
- 
- int procfs_get_pid_max(uint64_t *ret) {
-         _cleanup_free_ char *value = NULL;
-diff --git a/src/basic/time-util.c b/src/basic/time-util.c
-index f9014dc560..1d7840a5b5 100644
--- a/src/basic/time-util.c
-+++ b/src/basic/time-util.c
-@@ -27,6 +27,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "time-util.h"
-+#include "missing_stdlib.h"
- 
- static clockid_t map_clock_id(clockid_t c) {
- 
-diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
-index 0c0b4f23c7..68fe5ca509 100644
--- a/src/boot/bless-boot.c
-+++ b/src/boot/bless-boot.c
-@@ -22,6 +22,7 @@
- #include "terminal-util.h"
- #include "verbs.h"
- #include "virt.h"
-+#include "missing_stdlib.h"
- 
- static char **arg_path = NULL;
- 
-diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
-index 4237e694c0..05f9d9d9a9 100644
--- a/src/core/dbus-cgroup.c
-+++ b/src/core/dbus-cgroup.c
-@@ -25,6 +25,7 @@
- #include "parse-util.h"
- #include "path-util.h"
- #include "percent-util.h"
-+#include "missing_stdlib.h"
- #include "socket-util.h"
- 
- BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", CGroupTasksMax, cgroup_tasks_max_resolve);
-diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
-index 4daa1cefd3..2c77901471 100644
--- a/src/core/dbus-execute.c
-+++ b/src/core/dbus-execute.c
-@@ -42,6 +42,7 @@
- #include "unit-printf.h"
- #include "user-util.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
- 
- BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput);
- static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput);
-diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
-index d680a64268..e59f48103e 100644
--- a/src/core/dbus-util.c
-+++ b/src/core/dbus-util.c
-@@ -9,6 +9,7 @@
- #include "unit-printf.h"
- #include "user-util.h"
- #include "unit.h"
-+#include "missing_stdlib.h"
- 
- int bus_property_get_triggered_unit(
-                 sd_bus *bus,
-diff --git a/src/core/execute.c b/src/core/execute.c
-index ef0bf88687..bd3da0c401 100644
--- a/src/core/execute.c
-+++ b/src/core/execute.c
-@@ -72,6 +72,7 @@
- #include "unit-serialize.h"
- #include "user-util.h"
- #include "utmp-wtmp.h"
-+#include "missing_stdlib.h"
- 
- static bool is_terminal_input(ExecInput i) {
-         return IN_SET(i,
-diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
-index b8e3f7aadd..8ce8ca68d8 100644
--- a/src/core/kmod-setup.c
-+++ b/src/core/kmod-setup.c
-@@ -13,6 +13,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "virt.h"
-+#include "missing_stdlib.h"
- 
- #if HAVE_KMOD
- #include "module-util.h"
-diff --git a/src/core/service.c b/src/core/service.c
-index b9eb40c555..268fe7573b 100644
--- a/src/core/service.c
-+++ b/src/core/service.c
-@@ -45,6 +45,7 @@
- #include "unit-name.h"
- #include "unit.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
- 
- #define service_spawn(...) service_spawn_internal(__func__, __VA_ARGS__)
- 
-diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
-index 7e0c98cb7d..978a7f5874 100644
--- a/src/coredump/coredump-vacuum.c
-+++ b/src/coredump/coredump-vacuum.c
-@@ -17,6 +17,7 @@
- #include "string-util.h"
- #include "time-util.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
- 
- #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL)           /* 1 MiB */
- #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL)   /* 4 GiB */
-diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 016f3baa7f..b1def81313 100644
--- a/src/fstab-generator/fstab-generator.c
-+++ b/src/fstab-generator/fstab-generator.c
-@@ -37,6 +37,7 @@
- #include "unit-name.h"
- #include "virt.h"
- #include "volatile-util.h"
-+#include "missing_stdlib.h"
- 
- typedef enum MountPointFlags {
-         MOUNT_NOAUTO    = 1 << 0,
-diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
-index da0f20d3ce..f22ce41908 100644
--- a/src/journal-remote/journal-remote-main.c
-+++ b/src/journal-remote/journal-remote-main.c
-@@ -27,6 +27,7 @@
- #include "stat-util.h"
- #include "string-table.h"
- #include "strv.h"
-+#include "missing_stdlib.h"
- 
- #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem"
- #define CERT_FILE     CERTIFICATE_ROOT "/certs/journal-remote.pem"
-diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 7f3dcd56a4..41b7cbaaf1 100644
--- a/src/journal/journalctl.c
-+++ b/src/journal/journalctl.c
-@@ -77,6 +77,7 @@
- #include "unit-name.h"
- #include "user-util.h"
- #include "varlink.h"
-+#include "missing_stdlib.h"
- 
- #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
- #define PROCESS_INOTIFY_INTERVAL 1024   /* Every 1,024 messages processed */
-diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
-index ff0228081f..9066fcb133 100644
--- a/src/libsystemd/sd-bus/bus-message.c
-+++ b/src/libsystemd/sd-bus/bus-message.c
-@@ -19,6 +19,7 @@
- #include "strv.h"
- #include "time-util.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
- 
- static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
- static int message_parse_fields(sd_bus_message *m);
-diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
-index c25c40ff37..57a5da704f 100644
--- a/src/libsystemd/sd-bus/bus-objects.c
-+++ b/src/libsystemd/sd-bus/bus-objects.c
-@@ -11,6 +11,7 @@
- #include "missing_capability.h"
- #include "string-util.h"
- #include "strv.h"
-+#include "missing_stdlib.h"
- 
- static int node_vtable_get_userdata(
-                 sd_bus *bus,
-diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
-index 3c59d0d615..746922d46f 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
-+++ b/src/libsystemd/sd-bus/bus-socket.c
-@@ -29,6 +29,7 @@
- #include "string-util.h"
- #include "user-util.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
- 
- #define SNDBUF_SIZE (8*1024*1024)
- 
-diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
-index 4a0259f8bb..aaa90d2223 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
-+++ b/src/libsystemd/sd-bus/sd-bus.c
-@@ -46,6 +46,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
- 
- #define log_debug_bus_message(m)                                         \
-         do {                                                             \
-diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
-index d988588de0..458df8df9a 100644
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
-+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
-@@ -14,6 +14,7 @@
- #include "string-util.h"
- #include "tests.h"
- #include "time-util.h"
-+#include "missing_stdlib.h"
- 
- #define MAX_SIZE (2*1024*1024)
- 
-diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c
-index 6b9ff0a4ed..4a5027ad0f 100644
--- a/src/libsystemd/sd-journal/sd-journal.c
-+++ b/src/libsystemd/sd-journal/sd-journal.c
-@@ -44,6 +44,7 @@
- #include "strv.h"
- #include "syslog-util.h"
- #include "uid-alloc-range.h"
-+#include "missing_stdlib.h"
- 
- #define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC)
- 
-diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
-index b8da266e27..4bb8dd9496 100644
--- a/src/login/pam_systemd.c
-+++ b/src/login/pam_systemd.c
-@@ -35,6 +35,7 @@
- #include "login-util.h"
- #include "macro.h"
- #include "missing_syscall.h"
-+#include "missing_stdlib.h"
- #include "pam-util.h"
- #include "parse-util.h"
- #include "path-util.h"
-diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
-index 48527a2c73..9777fe0561 100644
--- a/src/network/generator/network-generator.c
-+++ b/src/network/generator/network-generator.c
-@@ -14,6 +14,7 @@
- #include "string-table.h"
- #include "string-util.h"
- #include "strv.h"
-+#include "missing_stdlib.h"
- 
- /*
-   # .network
-diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
-index 161b1c1c70..ba1c459f78 100644
--- a/src/nspawn/nspawn-settings.c
-+++ b/src/nspawn/nspawn-settings.c
-@@ -16,6 +16,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
- 
- Settings *settings_new(void) {
-         Settings *s;
-diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
-index c64e79bdff..eda26b0b9a 100644
--- a/src/nss-mymachines/nss-mymachines.c
-+++ b/src/nss-mymachines/nss-mymachines.c
-@@ -21,6 +21,7 @@
- #include "nss-util.h"
- #include "signal-util.h"
- #include "string-util.h"
-+#include "missing_stdlib.h"
- 
- static void setup_logging_once(void) {
-         static pthread_once_t once = PTHREAD_ONCE_INIT;
-diff --git a/src/portable/portable.c b/src/portable/portable.c
-index d4b448a627..bb26623565 100644
--- a/src/portable/portable.c
-+++ b/src/portable/portable.c
-@@ -40,6 +40,7 @@
- #include "strv.h"
- #include "tmpfile-util.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
- 
- /* Markers used in the first line of our 20-portable.conf unit file drop-in to determine, that a) the unit file was
-  * dropped there by the portable service logic and b) for which image it was dropped there. */
-diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
-index afa537f160..32ccee4ae5 100644
--- a/src/resolve/resolvectl.c
-+++ b/src/resolve/resolvectl.c
-@@ -48,6 +48,7 @@
- #include "varlink.h"
- #include "verb-log-control.h"
- #include "verbs.h"
-+#include "missing_stdlib.h"
- 
- static int arg_family = AF_UNSPEC;
- static int arg_ifindex = 0;
-diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c
-index 53e5d6b99f..851ecd5644 100644
--- a/src/shared/bus-get-properties.c
-+++ b/src/shared/bus-get-properties.c
-@@ -4,6 +4,7 @@
- #include "rlimit-util.h"
- #include "stdio-util.h"
- #include "string-util.h"
-+#include "missing_stdlib.h"
- 
- int bus_property_get_bool(
-                 sd_bus *bus,
-diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c
-index 8b462b5627..183ce1c18e 100644
--- a/src/shared/bus-unit-procs.c
-+++ b/src/shared/bus-unit-procs.c
-@@ -11,6 +11,7 @@
- #include "sort-util.h"
- #include "string-util.h"
- #include "terminal-util.h"
-+#include "missing_stdlib.h"
- 
- struct CGroupInfo {
-         char *cgroup_path;
-diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
-index 4ee9706847..30c8084847 100644
--- a/src/shared/bus-unit-util.c
-+++ b/src/shared/bus-unit-util.c
-@@ -50,6 +50,7 @@
- #include "unit-def.h"
- #include "user-util.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
- 
- int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
-         assert(message);
-diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
-index 4123152d93..74f148c8b4 100644
--- a/src/shared/bus-util.c
-+++ b/src/shared/bus-util.c
-@@ -24,6 +24,7 @@
- #include "path-util.h"
- #include "socket-util.h"
- #include "stdio-util.h"
-+#include "missing_stdlib.h"
- 
- static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
-         sd_event *e = ASSERT_PTR(userdata);
-diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
-index b41c9b06ca..e69050a507 100644
--- a/src/shared/dns-domain.c
-+++ b/src/shared/dns-domain.c
-@@ -18,6 +18,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "utf8.h"
-+#include "missing_stdlib.h"
- 
- int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) {
-         const char *n;
-diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
-index 83e9834bbf..74eaae6f5e 100644
--- a/src/shared/journal-importer.c
-+++ b/src/shared/journal-importer.c
-@@ -16,6 +16,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "unaligned.h"
-+#include "missing_stdlib.h"
- 
- enum {
-         IMPORTER_STATE_LINE = 0,    /* waiting to read, or reading line */
-diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
-index a5d04003bd..10392c132d 100644
--- a/src/shared/logs-show.c
-+++ b/src/shared/logs-show.c
-@@ -41,6 +41,7 @@
- #include "time-util.h"
- #include "utf8.h"
- #include "web-util.h"
-+#include "missing_stdlib.h"
- 
- /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
- #define PRINT_LINE_THRESHOLD 3
-diff --git a/src/shared/pager.c b/src/shared/pager.c
-index 19deefab56..6b6d0af1a0 100644
--- a/src/shared/pager.c
-+++ b/src/shared/pager.c
-@@ -25,6 +25,7 @@
- #include "string-util.h"
- #include "strv.h"
- #include "terminal-util.h"
-+#include "missing_stdlib.h"
- 
- static pid_t pager_pid = 0;
- 
-diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
-index 287fd6c181..8f8d5493da 100644
--- a/src/socket-proxy/socket-proxyd.c
-+++ b/src/socket-proxy/socket-proxyd.c
-@@ -27,6 +27,7 @@
- #include "set.h"
- #include "socket-util.h"
- #include "string-util.h"
-+#include "missing_stdlib.h"
- 
- #define BUFFER_SIZE (256 * 1024)
- 
-diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
-index f884008660..987e180697 100644
--- a/src/test/test-hexdecoct.c
-+++ b/src/test/test-hexdecoct.c
-@@ -7,6 +7,7 @@
- #include "macro.h"
- #include "random-util.h"
- #include "string-util.h"
-+#include "missing_stdlib.h"
- #include "tests.h"
- 
- TEST(hexchar) {
-diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 91b40088f4..f528a46b8e 100644
--- a/src/udev/udev-builtin-net_id.c
-+++ b/src/udev/udev-builtin-net_id.c
-@@ -39,6 +39,7 @@
- #include "strv.h"
- #include "strxcpyx.h"
- #include "udev-builtin.h"
-+#include "missing_stdlib.h"
- 
- #define ONBOARD_14BIT_INDEX_MAX ((1U << 14) - 1)
- #define ONBOARD_16BIT_INDEX_MAX ((1U << 16) - 1)
-diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index 467c9a6ad3..f74dae60af 100644
--- a/src/udev/udev-builtin-path_id.c
-+++ b/src/udev/udev-builtin-path_id.c
-@@ -24,6 +24,7 @@
- #include "sysexits.h"
- #include "udev-builtin.h"
- #include "udev-util.h"
-+#include "missing_stdlib.h"
- 
- _printf_(2,3)
- static void path_prepend(char **path, const char *fmt, ...) {
-diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
-index ed22c8b679..19ebe20237 100644
--- a/src/udev/udev-event.c
-+++ b/src/udev/udev-event.c
-@@ -16,6 +16,7 @@
- #include "udev-util.h"
- #include "udev-watch.h"
- #include "user-util.h"
-+#include "missing_stdlib.h"
- 
- UdevEvent *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_netlink *rtnl, int log_level) {
-         UdevEvent *event;
-diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
-index 5f12002394..febe345b4c 100644
--- a/src/udev/udev-rules.c
-+++ b/src/udev/udev-rules.c
-@@ -41,6 +41,7 @@
- #include "udev-util.h"
- #include "user-util.h"
- #include "virt.h"
-+#include "missing_stdlib.h"
- 
- #define RULES_DIRS ((const char* const*) CONF_PATHS_STRV("udev/rules.d"))
- 
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
deleted file mode 100644
index 15877bea88..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 5325ab5813617f35f03806ec420829dde7104387 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Mon, 25 Feb 2019 14:56:21 +0800
-Subject: [PATCH 04/22] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not
- defined
-If the standard library doesn't provide brace
-expansion users just won't get it.
-Dont use GNU GLOB extentions on non-glibc systems
-Conditionalize use of GLOB_ALTDIRFUNC
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[rebased for systemd 243]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
- src/basic/glob-util.c     | 12 ++++++++++++
- src/test/test-glob-util.c | 16 ++++++++++++++++
- src/tmpfiles/tmpfiles.c   | 10 ++++++++++
- 3 files changed, 38 insertions(+)
-diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
-index 802ca8c655..23818a67c6 100644
--- a/src/basic/glob-util.c
-+++ b/src/basic/glob-util.c
-@@ -12,6 +12,12 @@
- #include "path-util.h"
- #include "strv.h"
- 
-+/* Don't fail if the standard library
-+ * doesn't provide brace expansion */
-+#ifndef GLOB_BRACE
-+#define GLOB_BRACE 0
-+#endif
-+
- static void closedir_wrapper(void* v) {
-         (void) closedir(v);
- }
-@@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) {
- int safe_glob(const char *path, int flags, glob_t *pglob) {
-         int k;
- 
-+#ifdef GLOB_ALTDIRFUNC
-         /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */
-         assert(!(flags & GLOB_ALTDIRFUNC));
- 
-@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
-                 pglob->gl_lstat = lstat;
-         if (!pglob->gl_stat)
-                 pglob->gl_stat = stat;
-+#endif
- 
-         errno = 0;
-+#ifdef GLOB_ALTDIRFUNC
-         k = glob(path, flags | GLOB_ALTDIRFUNC, NULL, pglob);
-+#else
-+        k = glob(path, flags, NULL, pglob);
-+#endif
-         if (k == GLOB_NOMATCH)
-                 return -ENOENT;
-         if (k == GLOB_NOSPACE)
-diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
-index 9b3e73cce0..3790ba3be5 100644
--- a/src/test/test-glob-util.c
-+++ b/src/test/test-glob-util.c
-@@ -34,6 +34,12 @@ TEST(glob_first) {
-         assert_se(first == NULL);
- }
- 
-+/* Don't fail if the standard library
-+ * doesn't provide brace expansion */
-+#ifndef GLOB_BRACE
-+#define GLOB_BRACE 0
-+#endif
-+
- TEST(glob_exists) {
-         char name[] = "/tmp/test-glob_exists.XXXXXX";
-         int fd = -EBADF;
-@@ -61,11 +67,13 @@ TEST(glob_no_dot) {
-         const char *fn;
- 
-         _cleanup_globfree_ glob_t g = {
-+#ifdef GLOB_ALTDIRFUNC
-                 .gl_closedir = closedir_wrapper,
-                 .gl_readdir = (struct dirent *(*)(void *)) readdir_no_dot,
-                 .gl_opendir = (void *(*)(const char *)) opendir,
-                 .gl_lstat = lstat,
-                 .gl_stat = stat,
-+#endif
-         };
- 
-         int r;
-@@ -73,11 +81,19 @@ TEST(glob_no_dot) {
-         assert_se(mkdtemp(template));
- 
-         fn = strjoina(template, "/*");
-+#ifdef GLOB_ALTDIRFUNC
-         r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g);
-+#else
-+        r = glob(fn, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
-+#endif
-         assert_se(r == GLOB_NOMATCH);
- 
-         fn = strjoina(template, "/.*");
-+#ifdef GLOB_ALTDIRFUNC
-         r = glob(fn, GLOB_NOSORT|GLOB_BRACE|GLOB_ALTDIRFUNC, NULL, &g);
-+#else
-+        r = glob(fn, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
-+#endif
-         assert_se(r == GLOB_NOMATCH);
- 
-         (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
-diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 230ec09b97..2cc5f391d7 100644
--- a/src/tmpfiles/tmpfiles.c
-+++ b/src/tmpfiles/tmpfiles.c
-@@ -73,6 +73,12 @@
- #include "user-util.h"
- #include "virt.h"
- 
-+/* Don't fail if the standard library
-+ * doesn't provide brace expansion */
-+#ifndef GLOB_BRACE
-+#define GLOB_BRACE 0
-+#endif
-+
- /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
-  * them in the file system. This is intended to be used to create
-  * properly owned directories beneath /tmp, /var/tmp, /run, which are
-@@ -2434,7 +2440,9 @@ finish:
- 
- static int glob_item(Context *c, Item *i, action_t action) {
-         _cleanup_globfree_ glob_t g = {
-+#ifdef GLOB_ALTDIRFUNC
-                 .gl_opendir = (void *(*)(const char *)) opendir_nomod,
-+#endif
-         };
-         int r = 0, k;
- 
-@@ -2461,7 +2469,9 @@ static int glob_item_recursively(
-                 fdaction_t action) {
- 
-         _cleanup_globfree_ glob_t g = {
-+#ifdef GLOB_ALTDIRFUNC
-                 .gl_opendir = (void *(*)(const char *)) opendir_nomod,
-+#endif
-         };
-         int r = 0, k;
- 
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0005-add-missing-FTW_-macros-for-musl.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0005-add-missing-FTW_-macros-for-musl.patch
deleted file mode 100644
index a1dfca22cd..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0005-add-missing-FTW_-macros-for-musl.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From dad7f897c0de654fa5592fda3e90f874639849f9 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Mon, 25 Feb 2019 15:00:06 +0800
-Subject: [PATCH 05/22] add missing FTW_ macros for musl
-This is to avoid build failures like below for musl.
-  locale-util.c:296:24: error: 'FTW_STOP' undeclared
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
- src/basic/missing_type.h    | 4 ++++
- src/test/test-recurse-dir.c | 1 +
- 2 files changed, 5 insertions(+)
-diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
-index 6c0456349d..73a5b90e3c 100644
--- a/src/basic/missing_type.h
-+++ b/src/basic/missing_type.h
-@@ -14,3 +14,7 @@
- #ifndef __GLIBC__
- typedef int (*comparison_fn_t)(const void *, const void *);
- #endif
-+
-+#ifndef FTW_CONTINUE
-+#define FTW_CONTINUE 0
-+#endif
-diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c
-index 8684d064ec..70fc2b5376 100644
--- a/src/test/test-recurse-dir.c
-+++ b/src/test/test-recurse-dir.c
-@@ -8,6 +8,7 @@
- #include "recurse-dir.h"
- #include "strv.h"
- #include "tests.h"
-+#include "missing_type.h"
- 
- static char **list_nftw = NULL;
- 
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0006-Use-uintmax_t-for-handling-rlim_t.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0006-Use-uintmax_t-for-handling-rlim_t.patch
deleted file mode 100644
index 4be14b72ec..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0006-Use-uintmax_t-for-handling-rlim_t.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 96e975a2412a20e5f80bd3ab144057d275eb8597 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Mon, 25 Feb 2019 15:12:41 +0800
-Subject: [PATCH 06/22] Use uintmax_t for handling rlim_t
-PRIu{32,64} is not right format to represent rlim_t type
-therefore use %ju and typecast the rlim_t variables to
-uintmax_t.
-Fixes portablility errors like
-execute.c:3446:36: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'rlim_t {aka long long unsigned int}' [-Werror=format=]
-|                          fprintf(f, "%s%s: " RLIM_FMT "\n",
-|                                     ^~~~~~~~
-|                                  prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max);
-|                                                               ~~~~~~~~~~~~~~~~~~~~~~
-Upstream-Status: Denied [https://github.com/systemd/systemd/pull/7199]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-[Rebased for v241]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
- src/basic/format-util.h |  8 +-------
- src/basic/rlimit-util.c | 12 ++++++------
- src/core/execute.c      |  4 ++--
- 3 files changed, 9 insertions(+), 15 deletions(-)
-diff --git a/src/basic/format-util.h b/src/basic/format-util.h
-index 8719df3e29..9becc96066 100644
--- a/src/basic/format-util.h
-+++ b/src/basic/format-util.h
-@@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t));
- #  error Unknown timex member size
- #endif
- 
-#if SIZEOF_RLIM_T == 8
-#  define RLIM_FMT "%" PRIu64
-#elif SIZEOF_RLIM_T == 4
-#  define RLIM_FMT "%" PRIu32
-#else
-#  error Unknown rlim_t size
-#endif
-+#define RLIM_FMT "%ju"
- 
- #if SIZEOF_DEV_T == 8
- #  define DEV_FMT "%" PRIu64
-diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
-index c1f0b2b974..61c5412582 100644
--- a/src/basic/rlimit-util.c
-+++ b/src/basic/rlimit-util.c
-@@ -44,7 +44,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) {
-             fixed.rlim_max == highest.rlim_max)
-                 return 0;
- 
-        log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", rlim->rlim_max, rlimit_to_string(resource), fixed.rlim_max);
-+        log_debug("Failed at setting rlimit " RLIM_FMT " for resource RLIMIT_%s. Will attempt setting value " RLIM_FMT " instead.", (uintmax_t)rlim->rlim_max, rlimit_to_string(resource), (uintmax_t)fixed.rlim_max);
- 
-         return RET_NERRNO(setrlimit(resource, &fixed));
- }
-@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) {
-         if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY)
-                 r = free_and_strdup(&s, "infinity");
-         else if (rl->rlim_cur >= RLIM_INFINITY)
-                r = asprintf(&s, "infinity:" RLIM_FMT, rl->rlim_max);
-+                r = asprintf(&s, "infinity:" RLIM_FMT, (uintmax_t)rl->rlim_max);
-         else if (rl->rlim_max >= RLIM_INFINITY)
-                r = asprintf(&s, RLIM_FMT ":infinity", rl->rlim_cur);
-+                r = asprintf(&s, RLIM_FMT ":infinity", (uintmax_t)rl->rlim_cur);
-         else if (rl->rlim_cur == rl->rlim_max)
-                r = asprintf(&s, RLIM_FMT, rl->rlim_cur);
-+                r = asprintf(&s, RLIM_FMT, (uintmax_t)rl->rlim_cur);
-         else
-                r = asprintf(&s, RLIM_FMT ":" RLIM_FMT, rl->rlim_cur, rl->rlim_max);
-+                r = asprintf(&s, RLIM_FMT ":" RLIM_FMT, (uintmax_t)rl->rlim_cur, (uintmax_t)rl->rlim_max);
-         if (r < 0)
-                 return -ENOMEM;
- 
-@@ -422,7 +422,7 @@ int rlimit_nofile_safe(void) {
-         rl.rlim_max = MIN(rl.rlim_max, (rlim_t) read_nr_open());
-         rl.rlim_cur = MIN((rlim_t) FD_SETSIZE, rl.rlim_max);
-         if (setrlimit(RLIMIT_NOFILE, &rl) < 0)
-                return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", rl.rlim_cur);
-+                return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", (uintmax_t)rl.rlim_cur);
- 
-         return 1;
- }
-diff --git a/src/core/execute.c b/src/core/execute.c
-index bd3da0c401..df1870fd2f 100644
--- a/src/core/execute.c
-+++ b/src/core/execute.c
-@@ -1045,9 +1045,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
-         for (unsigned i = 0; i < RLIM_NLIMITS; i++)
-                 if (c->rlimit[i]) {
-                         fprintf(f, "%sLimit%s: " RLIM_FMT "\n",
-                                prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max);
-+                                prefix, rlimit_to_string(i), (uintmax_t)c->rlimit[i]->rlim_max);
-                         fprintf(f, "%sLimit%sSoft: " RLIM_FMT "\n",
-                                prefix, rlimit_to_string(i), c->rlimit[i]->rlim_cur);
-+                                prefix, rlimit_to_string(i), (uintmax_t)c->rlimit[i]->rlim_cur);
-                 }
- 
-         if (c->ioprio_set) {
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
deleted file mode 100644
index 8d6084239e..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 4842cff4f1329f0b5034b529d56f8ad1f234ac4c Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <armccurdy@gmail.com>
-Date: Tue, 10 Oct 2017 14:33:30 -0700
-Subject: [PATCH 07/22] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
-Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right
-thing to do and it's not portable (not supported by musl). See:
-  http://lists.landley.net/pipermail/toybox-landley.net/2014-September/003610.html
-  http://www.openwall.com/lists/musl/2015/02/05/2
-Note that laccess() is never passing AT_EACCESS so a lot of the
-discussion in the links above doesn't apply. Note also that
-(currently) all systemd callers of laccess() pass mode as F_OK, so
-only check for existence of a file, not access permissions.
-Therefore, in this case, the only distiction between faccessat()
-with (flag == 0) and (flag == AT_SYMLINK_NOFOLLOW) is the behaviour
-for broken symlinks; laccess() on a broken symlink will succeed with
-(flag == AT_SYMLINK_NOFOLLOW) and fail (flag == 0).
-The laccess() macros was added to systemd some time ago and it's not
-clear if or why it needs to return success for broken symlinks. Maybe
-just historical and not actually necessary or desired behaviour?
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
- src/basic/fs-util.h          | 21 ++++++++++++++++++++-
- src/shared/base-filesystem.c |  6 +++---
- 2 files changed, 23 insertions(+), 4 deletions(-)
-diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
-index 1023ab73ca..c78ff6f27f 100644
--- a/src/basic/fs-util.h
-+++ b/src/basic/fs-util.h
-@@ -49,8 +49,27 @@ int futimens_opath(int fd, const struct timespec ts[2]);
- int fd_warn_permissions(const char *path, int fd);
- int stat_warn_permissions(const char *path, const struct stat *st);
- 
-+/*
-+   Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to
-+   do and it's not portable (not supported by musl). See:
-+
-+     http://lists.landley.net/pipermail/toybox-landley.net/2014-September/003610.html
-+     http://www.openwall.com/lists/musl/2015/02/05/2
-+
-+   Note that laccess() is never passing AT_EACCESS so a lot of the discussion in
-+   the links above doesn't apply. Note also that (currently) all systemd callers
-+   of laccess() pass mode as F_OK, so only check for existence of a file, not
-+   access permissions. Therefore, in this case, the only distiction between
-+   faccessat() with (flag == 0) and (flag == AT_SYMLINK_NOFOLLOW) is the
-+   behaviour for broken symlinks; laccess() on a broken symlink will succeed
-+   with (flag == AT_SYMLINK_NOFOLLOW) and fail (flag == 0).
-+
-+   The laccess() macros was added to systemd some time ago and it's not clear if
-+   or why it needs to return success for broken symlinks. Maybe just historical
-+   and not actually necessary or desired behaviour?
-+*/
- #define laccess(path, mode)                                             \
-        RET_NERRNO(faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW))
-+        RET_NERRNO(faccessat(AT_FDCWD, (path), (mode), 0))
- 
- int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
- 
-diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
-index 569ef466c3..7ae921a113 100644
--- a/src/shared/base-filesystem.c
-+++ b/src/shared/base-filesystem.c
-@@ -145,7 +145,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) {
-         /* The "root" parameter is decoration only – it's only used as part of log messages */
- 
-         for (size_t i = 0; i < ELEMENTSOF(table); i++) {
-                if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0)
-+                if (faccessat(fd, table[i].dir, F_OK, 0) >= 0)
-                         continue;
- 
-                 if (table[i].target) { /* Create as symlink? */
-@@ -153,7 +153,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) {
- 
-                         /* check if one of the targets exists */
-                         NULSTR_FOREACH(s, table[i].target) {
-                                if (faccessat(fd, s, F_OK, AT_SYMLINK_NOFOLLOW) < 0)
-+                                if (faccessat(fd, s, F_OK, 0) < 0)
-                                         continue;
- 
-                                 /* check if a specific file exists at the target path */
-@@ -164,7 +164,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) {
-                                         if (!p)
-                                                 return log_oom();
- 
-                                        if (faccessat(fd, p, F_OK, AT_SYMLINK_NOFOLLOW) < 0)
-+                                        if (faccessat(fd, p, F_OK, 0) < 0)
-                                                 continue;
-                                 }
- 
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch
deleted file mode 100644
index c1a8bb19fe..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bab07e779ff23d5593bb118efaaa31b60a6dce87 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 27 May 2018 08:36:44 -0700
-Subject: [PATCH 08/22] Define glibc compatible basename() for non-glibc
- systems
-Fixes builds with musl, even though systemd is adamant about
-using non-posix basename implementation, we have a way out
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/basic/string-util.h | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/src/basic/string-util.h b/src/basic/string-util.h
-index b6d8be3083..0a29036c4c 100644
--- a/src/basic/string-util.h
-+++ b/src/basic/string-util.h
-@@ -26,6 +26,10 @@
- #define URI_UNRESERVED      ALPHANUMERICAL "-._~"       /* [RFC3986] */
- #define URI_VALID           URI_RESERVED URI_UNRESERVED /* [RFC3986] */
- 
-+#if !defined(__GLIBC__)
-+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
-+#endif
-+
- static inline char* strstr_ptr(const char *haystack, const char *needle) {
-         if (!haystack || !needle)
-                 return NULL;
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0008-implment-systemd-sysv-install-for-OE.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0008-implment-systemd-sysv-install-for-OE.patch
deleted file mode 100644
index acff18dc43..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0008-implment-systemd-sysv-install-for-OE.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 5712d56f1cd654d2e5d2e9117ff77fe4c299f76b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 5 Sep 2015 06:31:47 +0000
-Subject: [PATCH] implment systemd-sysv-install for OE
-Use update-rc.d for enabling/disabling and status command
-to check the status of the sysv service
-Upstream-Status: Inappropriate [OE-Specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/systemctl/systemd-sysv-install.SKELETON | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON
-index cb58d8243b..000bdf6165 100755
--- a/src/systemctl/systemd-sysv-install.SKELETON
-+++ b/src/systemctl/systemd-sysv-install.SKELETON
-@@ -34,17 +34,17 @@ case "$1" in
-     enable)
-         # call the command to enable SysV init script $NAME here
-         # (consider optional $ROOT)
-        echo "IMPLEMENT ME: enabling SysV init.d script $NAME"
-+        update-rc.d -f $NAME defaults
-         ;;
-     disable)
-         # call the command to disable SysV init script $NAME here
-         # (consider optional $ROOT)
-        echo "IMPLEMENT ME: disabling SysV init.d script $NAME"
-+        update-rc.d -f $NAME remove
-         ;;
-     is-enabled)
-         # exit with 0 if $NAME is enabled, non-zero if it is disabled
-         # (consider optional $ROOT)
-        echo "IMPLEMENT ME: checking SysV init.d script $NAME"
-+        /etc/init.d/$NAME status
-         ;;
-     *)
-         usage ;;
-- 
-2.39.2
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
deleted file mode 100644
index 3ff0177ae3..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 25093c5017725b8577c444dfea0f42ad85b43522 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Wed, 4 Jul 2018 15:00:44 +0800
-Subject: [PATCH 09/22] Do not disable buffering when writing to oom_score_adj
-On musl, disabling buffering when writing to oom_score_adj will
-cause the following error.
-  Failed to adjust OOM setting: Invalid argument
-This error appears for systemd-udevd.service and dbus.service.
-This is because kernel receives '-' instead of the whole '-900'
-if buffering is disabled.
-This is libc implementation specific, as glibc does not have this issue.
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[rebased for systemd 243]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
- src/basic/process-util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/basic/process-util.c b/src/basic/process-util.c
-index 201c5596ae..ea51595b6c 100644
--- a/src/basic/process-util.c
-+++ b/src/basic/process-util.c
-@@ -1716,7 +1716,7 @@ int set_oom_score_adjust(int value) {
-         xsprintf(t, "%i", value);
- 
-         return write_string_file("/proc/self/oom_score_adj", t,
-                                 WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER);
-+                                 WRITE_STRING_FILE_VERIFY_ON_FAILURE);
- }
- 
- int get_oom_score_adjust(int *ret) {
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
deleted file mode 100644
index cf59ac7d06..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 2adbe9773cd65c48eec9df96868d4a738927c8d9 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Tue, 10 Jul 2018 15:40:17 +0800
-Subject: [PATCH 10/22] distinguish XSI-compliant strerror_r from GNU-specifi
- strerror_r
-XSI-compliant strerror_r and GNU-specifi strerror_r are different.
-       int strerror_r(int errnum, char *buf, size_t buflen);
-                   /* XSI-compliant */
-       char *strerror_r(int errnum, char *buf, size_t buflen);
-                   /* GNU-specific */
-We need to distinguish between them. Otherwise, we'll get an int value
-assigned to (char *) variable, resulting in segment fault.
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
- src/libsystemd/sd-bus/bus-error.c        | 11 ++++++++++-
- src/libsystemd/sd-journal/journal-send.c |  5 +++++
- 2 files changed, 15 insertions(+), 1 deletion(-)
-diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
-index 77b2e1a0fd..fdba0e0142 100644
--- a/src/libsystemd/sd-bus/bus-error.c
-+++ b/src/libsystemd/sd-bus/bus-error.c
-@@ -408,7 +408,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) {
-                         return;
- 
-                 errno = 0;
-+#ifndef __GLIBC__
-+                strerror_r(error, m, k);
-+                x = m;
-+#else
-                 x = strerror_r(error, m, k);
-+#endif
-                 if (errno == ERANGE || strlen(x) >= k - 1) {
-                         free(m);
-                         k *= 2;
-@@ -593,8 +598,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static
- 
-         if (e && e->message)
-                 return e->message;
-
-+#ifndef __GLIBC__
-+        strerror_r(abs(error), buf, ERRNO_BUF_LEN);
-+        return buf;
-+#else
-         return strerror_r(abs(error), buf, ERRNO_BUF_LEN);
-+#endif
- }
- 
- static bool map_ok(const sd_bus_error_map *map) {
-diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c
-index 69a2eb6404..1561859650 100644
--- a/src/libsystemd/sd-journal/journal-send.c
-+++ b/src/libsystemd/sd-journal/journal-send.c
-@@ -361,7 +361,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove
-                 char* j;
- 
-                 errno = 0;
-+#ifndef __GLIBC__
-+                strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k);
-+                j = buffer + 8 + k;
-+#else
-                 j = strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k);
-+#endif
-                 if (errno == 0) {
-                         char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1];
- 
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch
deleted file mode 100644
index e481b2e2e4..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 49c446cfb78cf74a909bed8c3798b77a5469866a Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Mon, 25 Feb 2019 15:44:54 +0800
-Subject: [PATCH 11/22] avoid redefinition of prctl_mm_map structure
-Fix the following compile failure:
-error: redefinition of 'struct prctl_mm_map'
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
- src/basic/missing_prctl.h | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h
-index 7d9e395c92..88c2d7dfac 100644
--- a/src/basic/missing_prctl.h
-+++ b/src/basic/missing_prctl.h
-@@ -1,7 +1,9 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- #pragma once
- 
-+#ifdef __GLIBC__
- #include <linux/prctl.h>
-+#endif
- 
- /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */
- #ifndef PR_CAP_AMBIENT
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch
deleted file mode 100644
index c23d9b7551..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch
+++ /dev/null
@@ -1,515 +0,0 @@
-From e4885a8e60f883d9217e26e1db3754c2906aca31 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Fri, 1 Mar 2019 15:22:15 +0800
-Subject: [PATCH 12/22] do not disable buffer in writing files
-Do not disable buffer in writing files, otherwise we get
-failure at boot for musl like below.
-  [!!!!!!] Failed to allocate manager object.
-And there will be other failures, critical or not critical.
-This is specific to musl.
-Upstream-Status: Inappropriate [musl]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[Rebased for v242]
-Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
-[rebased for systemd 243]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-[rebased for systemd 254]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[rebased for systemd 255.1]
---
- src/basic/cgroup-util.c              | 12 ++++++------
- src/basic/namespace-util.c           |  4 ++--
- src/basic/procfs-util.c              |  4 ++--
- src/basic/sysctl-util.c              |  2 +-
- src/binfmt/binfmt.c                  |  6 +++---
- src/core/cgroup.c                    |  2 +-
- src/core/main.c                      |  2 +-
- src/core/smack-setup.c               |  8 ++++----
- src/home/homework.c                  |  2 +-
- src/libsystemd/sd-device/sd-device.c |  2 +-
- src/nspawn/nspawn-cgroup.c           |  2 +-
- src/nspawn/nspawn.c                  |  6 +++---
- src/shared/binfmt-util.c             |  2 +-
- src/shared/cgroup-setup.c            |  4 ++--
- src/shared/coredump-util.c           |  4 ++--
- src/shared/hibernate-util.c          |  4 ++--
- src/shared/smack-util.c              |  2 +-
- src/shared/watchdog.c                |  2 +-
- src/sleep/sleep.c                    |  4 ++--
- src/storagetm/storagetm.c            | 24 ++++++++++++------------
- src/udev/udev-rules.c                |  1 -
- src/vconsole/vconsole-setup.c        |  2 +-
- 22 files changed, 50 insertions(+), 51 deletions(-)
--- a/src/basic/cgroup-util.c
-+++ b/src/basic/cgroup-util.c
-@@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *p
-         if (r < 0)
-                 return r;
- 
-        r = write_string_file(killfile, "1", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file(killfile, "1", 0);
-         if (r < 0)
-                 return r;
- 
-@@ -843,7 +843,7 @@ int cg_install_release_agent(const char
- 
-         sc = strstrip(contents);
-         if (isempty(sc)) {
-                r = write_string_file(fs, agent, WRITE_STRING_FILE_DISABLE_BUFFER);
-+                r = write_string_file(fs, agent, 0);
-                 if (r < 0)
-                         return r;
-         } else if (!path_equal(sc, agent))
-@@ -861,7 +861,7 @@ int cg_install_release_agent(const char
- 
-         sc = strstrip(contents);
-         if (streq(sc, "0")) {
-                r = write_string_file(fs, "1", WRITE_STRING_FILE_DISABLE_BUFFER);
-+                r = write_string_file(fs, "1", 0);
-                 if (r < 0)
-                         return r;
- 
-@@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const cha
-         if (r < 0)
-                 return r;
- 
-        r = write_string_file(fs, "0", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file(fs, "0", 0);
-         if (r < 0)
-                 return r;
- 
-@@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const cha
-         if (r < 0)
-                 return r;
- 
-        r = write_string_file(fs, "", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file(fs, "", 0);
-         if (r < 0)
-                 return r;
- 
-@@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *control
-         if (r < 0)
-                 return r;
- 
-        return write_string_file(p, value, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        return write_string_file(p, value, 0);
- }
- 
- int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) {
--- a/src/basic/namespace-util.c
-+++ b/src/basic/namespace-util.c
-@@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map,
-                 freeze();
- 
-         xsprintf(path, "/proc/" PID_FMT "/uid_map", pid);
-        r = write_string_file(path, uid_map, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file(path, uid_map, 0);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to write UID map: %m");
- 
-         xsprintf(path, "/proc/" PID_FMT "/gid_map", pid);
-        r = write_string_file(path, gid_map, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file(path, gid_map, 0);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to write GID map: %m");
- 
--- a/src/basic/procfs-util.c
-+++ b/src/basic/procfs-util.c
-@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limi
-          * decrease it, as threads-max is the much more relevant sysctl. */
-         if (limit > pid_max-1) {
-                 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */
-                r = write_string_file("/proc/sys/kernel/pid_max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER);
-+                r = write_string_file("/proc/sys/kernel/pid_max", buffer, 0);
-                 if (r < 0)
-                         return r;
-         }
- 
-         sprintf(buffer, "%" PRIu64, limit);
-        r = write_string_file("/proc/sys/kernel/threads-max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/proc/sys/kernel/threads-max", buffer, 0);
-         if (r < 0) {
-                 uint64_t threads_max;
- 
--- a/src/basic/sysctl-util.c
-+++ b/src/basic/sysctl-util.c
-@@ -58,7 +58,7 @@ int sysctl_write(const char *property, c
- 
-         log_debug("Setting '%s' to '%s'", p, value);
- 
-        return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_SUPPRESS_REDUNDANT_VIRTUAL);
-+        return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_SUPPRESS_REDUNDANT_VIRTUAL);
- }
- 
- int sysctl_writef(const char *property, const char *format, ...) {
--- a/src/binfmt/binfmt.c
-+++ b/src/binfmt/binfmt.c
-@@ -30,7 +30,7 @@ static bool arg_unregister = false;
- 
- static int delete_rule(const char *rulename) {
-         const char *fn = strjoina("/proc/sys/fs/binfmt_misc/", rulename);
-        return write_string_file(fn, "-1", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        return write_string_file(fn, "-1", 0);
- }
- 
- static int apply_rule(const char *filename, unsigned line, const char *rule) {
-@@ -58,7 +58,7 @@ static int apply_rule(const char *filena
-         if (r >= 0)
-                 log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename);
- 
-        r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, 0);
-         if (r < 0)
-                 return log_error_errno(r, "%s:%u: Failed to add binary format '%s': %m",
-                                        filename, line, rulename);
-@@ -248,7 +248,7 @@ static int run(int argc, char *argv[]) {
-                         return r;
- 
-                 /* Flush out all rules */
-                r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER);
-+                r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0);
-                 if (r < 0)
-                         log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m");
-                 else
--- a/src/core/cgroup.c
-+++ b/src/core/cgroup.c
-@@ -4578,7 +4578,7 @@ int unit_cgroup_freezer_action(Unit *u,
-                         u->freezer_state = FREEZER_THAWING;
-         }
- 
-        r = write_string_file(path, one_zero(action == FREEZER_FREEZE), WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file(path, one_zero(action == FREEZER_FREEZE), 0);
-         if (r < 0)
-                 return r;
- 
--- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool
-         if (getpid_cached() != 1)
-                 return;
- 
-        r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, 0);
-         if (r < 0)
-                 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m",
-                                   arg_early_core_pattern);
--- a/src/core/smack-setup.c
-+++ b/src/core/smack-setup.c
-@@ -321,17 +321,17 @@ int mac_smack_setup(bool *loaded_policy)
-         }
- 
- #if HAVE_SMACK_RUN_LABEL
-        r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0);
-         if (r < 0)
-                 log_warning_errno(r, "Failed to set SMACK label \"" SMACK_RUN_LABEL "\" on self: %m");
-        r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, 0);
-         if (r < 0)
-                 log_warning_errno(r, "Failed to set SMACK ambient label \"" SMACK_RUN_LABEL "\": %m");
-         r = write_string_file("/sys/fs/smackfs/netlabel",
-                              "0.0.0.0/0 " SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER);
-+                              "0.0.0.0/0 " SMACK_RUN_LABEL, 0);
-         if (r < 0)
-                 log_warning_errno(r, "Failed to set SMACK netlabel rule \"0.0.0.0/0 " SMACK_RUN_LABEL "\": %m");
-        r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", 0);
-         if (r < 0)
-                 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m");
- #endif
--- a/src/home/homework.c
-+++ b/src/home/homework.c
-@@ -278,7 +278,7 @@ static void drop_caches_now(void) {
-          * for details. We write "2" into /proc/sys/vm/drop_caches to ensure dentries/inodes are flushed, but
-          * not more. */
- 
-        r = write_string_file("/proc/sys/vm/drop_caches", "2\n", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/proc/sys/vm/drop_caches", "2\n", 0);
-         if (r < 0)
-                 log_warning_errno(r, "Failed to drop caches, ignoring: %m");
-         else
--- a/src/libsystemd/sd-device/sd-device.c
-+++ b/src/libsystemd/sd-device/sd-device.c
-@@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value
-         if (!value)
-                 return -ENOMEM;
- 
-        r = write_string_file(path, value, WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_NOFOLLOW);
-+        r = write_string_file(path, value, 0 | WRITE_STRING_FILE_NOFOLLOW);
-         if (r < 0) {
-                 /* On failure, clear cache entry, as we do not know how it fails. */
-                 device_remove_cached_sysattr_value(device, sysattr);
--- a/src/nspawn/nspawn-cgroup.c
-+++ b/src/nspawn/nspawn-cgroup.c
-@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified
-         fn = strjoina(tree, cgroup, "/cgroup.procs");
- 
-         sprintf(pid_string, PID_FMT, pid);
-        r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER|WRITE_STRING_FILE_MKDIR_0755);
-+        r = write_string_file(fn, pid_string, WRITE_STRING_FILE_MKDIR_0755);
-         if (r < 0) {
-                 log_error_errno(r, "Failed to move process: %m");
-                 goto finish;
--- a/src/nspawn/nspawn.c
-+++ b/src/nspawn/nspawn.c
-@@ -2690,7 +2690,7 @@ static int reset_audit_loginuid(void) {
-         if (streq(p, "4294967295"))
-                 return 0;
- 
-        r = write_string_file("/proc/self/loginuid", "4294967295", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/proc/self/loginuid", "4294967295", 0);
-         if (r < 0) {
-                 log_error_errno(r,
-                                 "Failed to reset audit login UID. This probably means that your kernel is too\n"
-@@ -4143,7 +4143,7 @@ static int setup_uid_map(
-                 return log_oom();
- 
-         xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid);
-        r = write_string_file(uid_map, s, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file(uid_map, s, 0);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to write UID map: %m");
- 
-@@ -4153,7 +4153,7 @@ static int setup_uid_map(
-                 return log_oom();
- 
-         xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid);
-        r = write_string_file(uid_map, s, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file(uid_map, s, 0);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to write GID map: %m");
- 
--- a/src/shared/binfmt-util.c
-+++ b/src/shared/binfmt-util.c
-@@ -46,7 +46,7 @@ int disable_binfmt(void) {
-                 return 0;
-         }
- 
-        r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0);
-         if (r < 0)
-                 return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m");
- 
--- a/src/shared/cgroup-setup.c
-+++ b/src/shared/cgroup-setup.c
-@@ -351,7 +351,7 @@ int cg_attach(const char *controller, co
- 
-         xsprintf(c, PID_FMT "\n", pid);
- 
-        r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file(fs, c, 0);
-         if (r == -EOPNOTSUPP && cg_is_threaded(path) > 0)
-                 /* When the threaded mode is used, we cannot read/write the file. Let's return recognizable error. */
-                 return -EUCLEAN;
-@@ -966,7 +966,7 @@ int cg_enable_everywhere(
-                                         return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p);
-                         }
- 
-                        r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER);
-+                        r = write_string_stream(f, s, 0);
-                         if (r < 0) {
-                                 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m",
-                                                 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs);
--- a/src/shared/coredump-util.c
-+++ b/src/shared/coredump-util.c
-@@ -163,7 +163,7 @@ int set_coredump_filter(uint64_t value)
-         xsprintf(t, "0x%"PRIx64, value);
- 
-         return write_string_file("/proc/self/coredump_filter", t,
-                                 WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER);
-+                                 0);
- }
- 
- /* Turn off core dumps but only if we're running outside of a container. */
-@@ -173,7 +173,7 @@ void disable_coredumps(void) {
-         if (detect_container() > 0)
-                 return;
- 
-        r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0);
-         if (r < 0)
-                 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m");
- }
--- a/src/shared/hibernate-util.c
-+++ b/src/shared/hibernate-util.c
-@@ -501,7 +501,7 @@ int write_resume_config(dev_t devno, uin
- 
-         /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so
-          * fail gracefully if it doesn't exist and we're only overwriting it with 0. */
-        r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/sys/power/resume_offset", offset_str, 0);
-         if (r == -ENOENT) {
-                 if (offset != 0)
-                         return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
-@@ -517,7 +517,7 @@ int write_resume_config(dev_t devno, uin
-                 log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.",
-                           offset_str, device);
- 
-        r = write_string_file("/sys/power/resume", devno_str, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/sys/power/resume", devno_str, 0);
-         if (r < 0)
-                 return log_error_errno(r,
-                                        "Failed to write device '%s' (%s) to /sys/power/resume: %m",
--- a/src/shared/smack-util.c
-+++ b/src/shared/smack-util.c
-@@ -113,7 +113,7 @@ int mac_smack_apply_pid(pid_t pid, const
-                 return 0;
- 
-         p = procfs_file_alloca(pid, "attr/current");
-        r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file(p, label, 0);
-         if (r < 0)
-                 return r;
- 
--- a/src/shared/watchdog.c
-+++ b/src/shared/watchdog.c
-@@ -93,7 +93,7 @@ static int set_pretimeout_governor(const
- 
-         r = write_string_file(sys_fn,
-                               governor,
-                              WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE);
-+                              WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to set watchdog pretimeout_governor to '%s': %m", governor);
- 
--- a/src/sleep/sleep.c
-+++ b/src/sleep/sleep.c
-@@ -137,7 +137,7 @@ static int write_state(int fd, char * co
-                 if (k < 0)
-                         return RET_GATHER(r, k);
- 
-                k = write_string_stream(f, *state, WRITE_STRING_FILE_DISABLE_BUFFER);
-+                k = write_string_stream(f, *state, 0);
-                 if (k >= 0) {
-                         log_debug("Using sleep state '%s'.", *state);
-                         return 0;
-@@ -155,7 +155,7 @@ static int write_mode(char * const *mode
-         STRV_FOREACH(mode, modes) {
-                 int k;
- 
-                k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER);
-+                k = write_string_file("/sys/power/disk", *mode, 0);
-                 if (k >= 0) {
-                         log_debug("Using sleep disk mode '%s'.", *mode);
-                         return 0;
--- a/src/storagetm/storagetm.c
-+++ b/src/storagetm/storagetm.c
-@@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSub
-                                         if (!enable_fn)
-                                                 return log_oom();
- 
-                                        r = write_string_file_at(namespaces_fd, enable_fn, "0", WRITE_STRING_FILE_DISABLE_BUFFER);
-+                                        r = write_string_file_at(namespaces_fd, enable_fn, "0", 0);
-                                         if (r < 0)
-                                                 log_warning_errno(r, "Failed to disable namespace '%s' of NVME subsystem '%s', ignoring: %m", e->d_name, s->name);
- 
-@@ -254,7 +254,7 @@ static int nvme_subsystem_write_metadata
-                 _cleanup_free_ char *truncated = strndup(w, 40); /* kernel refuses more than 40 chars (as per nvme spec) */
- 
-                 /* The default string stored in 'attr_model' is "Linux" btw. */
-                r = write_string_file_at(subsystem_fd, "attr_model", truncated, WRITE_STRING_FILE_DISABLE_BUFFER);
-+                r = write_string_file_at(subsystem_fd, "attr_model", truncated, 0);
-                 if (r < 0)
-                         log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", w);
-         }
-@@ -268,7 +268,7 @@ static int nvme_subsystem_write_metadata
-                         return log_oom();
- 
-                  /* The default string stored in 'attr_firmware' is `uname -r` btw, but truncated to 8 chars. */
-                r = write_string_file_at(subsystem_fd, "attr_firmware", truncated, WRITE_STRING_FILE_DISABLE_BUFFER);
-+                r = write_string_file_at(subsystem_fd, "attr_firmware", truncated, 0);
-                 if (r < 0)
-                         log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", truncated);
-         }
-@@ -295,7 +295,7 @@ static int nvme_subsystem_write_metadata
-                 if (!truncated)
-                         return log_oom();
- 
-                r = write_string_file_at(subsystem_fd, "attr_serial", truncated, WRITE_STRING_FILE_DISABLE_BUFFER);
-+                r = write_string_file_at(subsystem_fd, "attr_serial", truncated, 0);
-                 if (r < 0)
-                         log_warning_errno(r, "Failed to set serial of subsystem to '%s', ignoring: %m", truncated);
-         }
-@@ -345,7 +345,7 @@ static int nvme_namespace_write_metadata
-                 id = id128_digest(j, l);
-         }
- 
-        r = write_string_file_at(namespace_fd, "device_uuid", SD_ID128_TO_UUID_STRING(id), WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file_at(namespace_fd, "device_uuid", SD_ID128_TO_UUID_STRING(id), 0);
-         if (r < 0)
-                 log_warning_errno(r, "Failed to set uuid of namespace to '%s', ignoring: %m", SD_ID128_TO_UUID_STRING(id));
- 
-@@ -408,7 +408,7 @@ static int nvme_subsystem_add(const char
-         if (subsystem_fd < 0)
-                 return log_error_errno(subsystem_fd, "Failed to create NVME subsystem '%s': %m", j);
- 
-        r = write_string_file_at(subsystem_fd, "attr_allow_any_host", "1", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file_at(subsystem_fd, "attr_allow_any_host", "1", 0);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to set 'attr_allow_any_host' flag: %m");
- 
-@@ -423,11 +423,11 @@ static int nvme_subsystem_add(const char
- 
-         /* We use /proc/$PID/fd/$FD rather than /proc/self/fd/$FD, because this string is visible to others
-          * via configfs, and by including the PID it's clear to who the stuff belongs. */
-        r = write_string_file_at(namespace_fd, "device_path", FORMAT_PROC_PID_FD_PATH(0, fd), WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file_at(namespace_fd, "device_path", FORMAT_PROC_PID_FD_PATH(0, fd), 0);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to write 'device_path' attribute: %m");
- 
-        r = write_string_file_at(namespace_fd, "enable", "1", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file_at(namespace_fd, "enable", "1", 0);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to write 'enable' attribute: %m");
- 
-@@ -557,19 +557,19 @@ static int nvme_port_add_portnr(
-                 return 0;
-         }
- 
-        r = write_string_file_at(port_fd, "addr_adrfam", af_to_ipv4_ipv6(ip_family), WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file_at(port_fd, "addr_adrfam", af_to_ipv4_ipv6(ip_family), 0);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to set address family on NVME port %" PRIu16 ": %m", portnr);
- 
-        r = write_string_file_at(port_fd, "addr_trtype", "tcp", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file_at(port_fd, "addr_trtype", "tcp", 0);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to set transport type on NVME port %" PRIu16 ": %m", portnr);
- 
-        r = write_string_file_at(port_fd, "addr_trsvcid", fname, WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file_at(port_fd, "addr_trsvcid", fname, 0);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to set IP port on NVME port %" PRIu16 ": %m", portnr);
- 
-        r = write_string_file_at(port_fd, "addr_traddr", ip_family == AF_INET6 ? "::" : "0.0.0.0", WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file_at(port_fd, "addr_traddr", ip_family == AF_INET6 ? "::" : "0.0.0.0", 0);
-         if (r < 0)
-                 return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr);
- 
--- a/src/udev/udev-rules.c
-+++ b/src/udev/udev-rules.c
-@@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_even
-                 log_event_debug(dev, token, "ATTR '%s' writing '%s'", buf, value);
-                 r = write_string_file(buf, value,
-                                       WRITE_STRING_FILE_VERIFY_ON_FAILURE |
-                                      WRITE_STRING_FILE_DISABLE_BUFFER |
-                                       WRITE_STRING_FILE_AVOID_NEWLINE |
-                                       WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE);
-                 if (r < 0)
--- a/src/vconsole/vconsole-setup.c
-+++ b/src/vconsole/vconsole-setup.c
-@@ -261,7 +261,7 @@ static int toggle_utf8_vc(const char *na
- static int toggle_utf8_sysfs(bool utf8) {
-         int r;
- 
-        r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), WRITE_STRING_FILE_DISABLE_BUFFER);
-+        r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), 0);
-         if (r < 0)
-                 return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8));
- 
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0013-Handle-__cpu_mask-usage.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0013-Handle-__cpu_mask-usage.patch
deleted file mode 100644
index 43f75373a6..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0013-Handle-__cpu_mask-usage.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2f90f8463423cfbb7e83fcef42f1071018c3b56e Mon Sep 17 00:00:00 2001
-From: Scott Murray <scott.murray@konsulko.com>
-Date: Fri, 13 Sep 2019 19:26:27 -0400
-Subject: [PATCH 13/22] Handle __cpu_mask usage
-Fixes errors:
-src/test/test-cpu-set-util.c:18:54: error: '__cpu_mask' undeclared (first use in this function)
-src/test/test-sizeof.c:73:14: error: '__cpu_mask' undeclared (first use in this function)
-__cpu_mask is an internal type of glibc's cpu_set implementation, not
-part of the POSIX definition, which is problematic when building with
-musl, which does not define a matching type.  From inspection of musl's
-sched.h, however, it is clear that the corresponding type would be
-unsigned long, which does match glibc's actual __CPU_MASK_TYPE.  So,
-add a typedef to cpu-set-util.h defining __cpu_mask appropriately.
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
- src/shared/cpu-set-util.h | 2 ++
- src/test/test-sizeof.c    | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h
-index 3c63a58826..4c2d4347fc 100644
--- a/src/shared/cpu-set-util.h
-+++ b/src/shared/cpu-set-util.h
-@@ -6,6 +6,8 @@
- #include "macro.h"
- #include "missing_syscall.h"
- 
-+typedef unsigned long __cpu_mask;
-+
- /* This wraps the libc interface with a variable to keep the allocated size. */
- typedef struct CPUSet {
-         cpu_set_t *set;
-diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
-index ea0c58770e..b65c0bd370 100644
--- a/src/test/test-sizeof.c
-+++ b/src/test/test-sizeof.c
-@@ -1,6 +1,5 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-#include <sched.h>
- #include <stdio.h>
- #include <string.h>
- #include <sys/resource.h>
-@@ -12,6 +11,7 @@
- #include <float.h>
- 
- #include "time-util.h"
-+#include "cpu-set-util.h"
- 
- /* Print information about various types. Useful when diagnosing
-  * gcc diagnostics on an unfamiliar architecture. */
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0014-Handle-missing-gshadow.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0014-Handle-missing-gshadow.patch
deleted file mode 100644
index a751e1ba6f..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0014-Handle-missing-gshadow.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From b7c827bb44edbb6251c9fcdb80aa03982c0e7bf3 Mon Sep 17 00:00:00 2001
-From: Alex Kiernan <alex.kiernan@gmail.com>
-Date: Tue, 10 Mar 2020 11:05:20 +0000
-Subject: [PATCH 14/22] Handle missing gshadow
-gshadow usage is now present in the userdb code. Mask all uses of it to
-allow compilation on musl
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-[Rebased for v247]
-Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
---
- src/shared/user-record-nss.c | 20 ++++++++++++++++++++
- src/shared/user-record-nss.h |  4 ++++
- src/shared/userdb.c          |  7 ++++++-
- 3 files changed, 30 insertions(+), 1 deletion(-)
-diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c
-index 414a49331b..1a4e1b628c 100644
--- a/src/shared/user-record-nss.c
-+++ b/src/shared/user-record-nss.c
-@@ -329,8 +329,10 @@ int nss_group_to_group_record(
-         if (isempty(grp->gr_name))
-                 return -EINVAL;
- 
-+#if ENABLE_GSHADOW
-         if (sgrp && !streq_ptr(sgrp->sg_namp, grp->gr_name))
-                 return -EINVAL;
-+#endif
- 
-         g = group_record_new();
-         if (!g)
-@@ -346,6 +348,7 @@ int nss_group_to_group_record(
- 
-         g->gid = grp->gr_gid;
- 
-+#if ENABLE_GSHADOW
-         if (sgrp) {
-                 if (looks_like_hashed_password(utf8_only(sgrp->sg_passwd))) {
-                         g->hashed_password = strv_new(sgrp->sg_passwd);
-@@ -361,6 +364,7 @@ int nss_group_to_group_record(
-                 if (r < 0)
-                         return r;
-         }
-+#endif
- 
-         r = json_build(&g->json, JSON_BUILD_OBJECT(
-                                        JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)),
-@@ -387,6 +391,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
-         assert(ret_sgrp);
-         assert(ret_buffer);
- 
-+#if ENABLE_GSHADOW
-         for (;;) {
-                 _cleanup_free_ char *buf = NULL;
-                 struct sgrp sgrp, *result;
-@@ -415,6 +420,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
-                 buflen *= 2;
-                 buf = mfree(buf);
-         }
-+#else
-+        return -ESRCH;
-+#endif
- }
- 
- int nss_group_record_by_name(
-@@ -426,7 +434,9 @@ int nss_group_record_by_name(
-         struct group grp, *result;
-         bool incomplete = false;
-         size_t buflen = 4096;
-+#if ENABLE_GSHADOW
-         struct sgrp sgrp, *sresult = NULL;
-+#endif
-         int r;
- 
-         assert(name);
-@@ -455,6 +465,7 @@ int nss_group_record_by_name(
-                 buf = mfree(buf);
-         }
- 
-+#if ENABLE_GSHADOW
-         if (with_shadow) {
-                 r = nss_sgrp_for_group(result, &sgrp, &sbuf);
-                 if (r < 0) {
-@@ -466,6 +477,9 @@ int nss_group_record_by_name(
-                 incomplete = true;
- 
-         r = nss_group_to_group_record(result, sresult, ret);
-+#else
-+        r = nss_group_to_group_record(result, NULL, ret);
-+#endif
-         if (r < 0)
-                 return r;
- 
-@@ -483,7 +497,9 @@ int nss_group_record_by_gid(
-         struct group grp, *result;
-         bool incomplete = false;
-         size_t buflen = 4096;
-+#if ENABLE_GSHADOW
-         struct sgrp sgrp, *sresult = NULL;
-+#endif
-         int r;
- 
-         for (;;) {
-@@ -509,6 +525,7 @@ int nss_group_record_by_gid(
-                 buf = mfree(buf);
-         }
- 
-+#if ENABLE_GSHADOW
-         if (with_shadow) {
-                 r = nss_sgrp_for_group(result, &sgrp, &sbuf);
-                 if (r < 0) {
-@@ -520,6 +537,9 @@ int nss_group_record_by_gid(
-                 incomplete = true;
- 
-         r = nss_group_to_group_record(result, sresult, ret);
-+#else
-+        r = nss_group_to_group_record(result, NULL, ret);
-+#endif
-         if (r < 0)
-                 return r;
- 
-diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h
-index 22ab04d6ee..4e52e7a911 100644
--- a/src/shared/user-record-nss.h
-+++ b/src/shared/user-record-nss.h
-@@ -2,7 +2,11 @@
- #pragma once
- 
- #include <grp.h>
-+#if ENABLE_GSHADOW
- #include <gshadow.h>
-+#else
-+struct sgrp;
-+#endif
- #include <pwd.h>
- #include <shadow.h>
- 
-diff --git a/src/shared/userdb.c b/src/shared/userdb.c
-index f60d48ace4..e878199a28 100644
--- a/src/shared/userdb.c
-+++ b/src/shared/userdb.c
-@@ -1038,13 +1038,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
-                 if (gr) {
-                         _cleanup_free_ char *buffer = NULL;
-                         bool incomplete = false;
-+#if ENABLE_GSHADOW
-                         struct sgrp sgrp;
-
-+#endif
-                         if (streq_ptr(gr->gr_name, "root"))
-                                 iterator->synthesize_root = false;
-                         if (gr->gr_gid == GID_NOBODY)
-                                 iterator->synthesize_nobody = false;
- 
-+#if ENABLE_GSHADOW
-                         if (!FLAGS_SET(iterator->flags, USERDB_SUPPRESS_SHADOW)) {
-                                 r = nss_sgrp_for_group(gr, &sgrp, &buffer);
-                                 if (r < 0) {
-@@ -1057,6 +1059,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
-                         }
- 
-                         r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret);
-+#else
-+                        r = nss_group_to_group_record(gr, NULL, ret);
-+#endif
-                         if (r < 0)
-                                 return r;
- 
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
deleted file mode 100644
index e112766a9b..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3dc9d9d410bcce54fddfd94f43f7f77f3aa8e281 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 12 Apr 2021 23:44:53 -0700
-Subject: [PATCH 15/22] missing_syscall.h: Define MIPS ABI defines for musl
-musl does not define _MIPS_SIM_ABI32, _MIPS_SIM_NABI32, _MIPS_SIM_ABI64
-unlike glibc where these are provided by libc headers, therefore define
-them here in case they are undefined
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/basic/missing_syscall.h  | 6 ++++++
- src/shared/base-filesystem.c | 1 +
- 2 files changed, 7 insertions(+)
-diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
-index d795efd8f2..d6729d3c1d 100644
--- a/src/basic/missing_syscall.h
-+++ b/src/basic/missing_syscall.h
-@@ -20,6 +20,12 @@
- #include <asm/sgidefs.h>
- #endif
- 
-+#ifndef _MIPS_SIM_ABI32
-+#define _MIPS_SIM_ABI32        1
-+#define _MIPS_SIM_NABI32 2
-+#define _MIPS_SIM_ABI64        3
-+#endif
-+
- #include "macro.h"
- #include "missing_keyctl.h"
- #include "missing_stat.h"
-diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
-index 7ae921a113..0ef9d1fd39 100644
--- a/src/shared/base-filesystem.c
-+++ b/src/shared/base-filesystem.c
-@@ -20,6 +20,7 @@
- #include "string-util.h"
- #include "umask-util.h"
- #include "user-util.h"
-+#include "missing_syscall.h"
- 
- typedef struct BaseFilesystem {
-         const char *dir;      /* directory or symlink to create */
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0016-pass-correct-parameters-to-getdents64.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0016-pass-correct-parameters-to-getdents64.patch
deleted file mode 100644
index 0be817e62d..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0016-pass-correct-parameters-to-getdents64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0994b59dba9f248ad31cb7087046dc00b72cb4ea Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 21 Jan 2022 15:15:11 -0800
-Subject: [PATCH 16/22] pass correct parameters to getdents64
-Fixes
-../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types]
-                n = getdents64(dir_fd, (uint8_t*) de->buffer + de->buffer_size, bs - de->buffer_size);
-                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-../git/src/basic/stat-util.c:102:28: error: incompatible pointer types passing 'union (unnamed union at ../git/src/basic/stat-util.c:78:9) *' to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types]
-        n = getdents64(fd, &buffer, sizeof(buffer));
-                           ^~~~~~~
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
---
- src/basic/recurse-dir.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c
-index 5e98b7a5d8..aef065047b 100644
--- a/src/basic/recurse-dir.c
-+++ b/src/basic/recurse-dir.c
-@@ -55,7 +55,7 @@ int readdir_all(int dir_fd,
-                 bs = MIN(MALLOC_SIZEOF_SAFE(de) - offsetof(DirectoryEntries, buffer), (size_t) SSIZE_MAX);
-                 assert(bs > de->buffer_size);
- 
-                n = getdents64(dir_fd, (uint8_t*) de->buffer + de->buffer_size, bs - de->buffer_size);
-+                n = getdents64(dir_fd, (struct dirent*)((uint8_t*) de->buffer + de->buffer_size), bs - de->buffer_size);
-                 if (n < 0)
-                         return -errno;
-                 if (n == 0)
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0017-Adjust-for-musl-headers.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0017-Adjust-for-musl-headers.patch
deleted file mode 100644
index 4176522a1c..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0017-Adjust-for-musl-headers.patch
+++ /dev/null
@@ -1,572 +0,0 @@
-From 3c094d443ca30f19114392fd8ef274af6eabc12d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 21 Jan 2022 22:19:37 -0800
-Subject: [PATCH 17/22] Adjust for musl headers
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-[Rebased for v255.1]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
- src/libsystemd-network/sd-dhcp6-client.c      | 2 +-
- src/network/netdev/bareudp.c                  | 2 +-
- src/network/netdev/batadv.c                   | 2 +-
- src/network/netdev/bond.c                     | 2 +-
- src/network/netdev/bridge.c                   | 2 +-
- src/network/netdev/dummy.c                    | 2 +-
- src/network/netdev/geneve.c                   | 2 +-
- src/network/netdev/ifb.c                      | 2 +-
- src/network/netdev/ipoib.c                    | 2 +-
- src/network/netdev/ipvlan.c                   | 2 +-
- src/network/netdev/macsec.c                   | 2 +-
- src/network/netdev/macvlan.c                  | 2 +-
- src/network/netdev/netdev.c                   | 2 +-
- src/network/netdev/netdevsim.c                | 2 +-
- src/network/netdev/nlmon.c                    | 2 +-
- src/network/netdev/tunnel.c                   | 2 +-
- src/network/netdev/vcan.c                     | 2 +-
- src/network/netdev/veth.c                     | 2 +-
- src/network/netdev/vlan.c                     | 2 +-
- src/network/netdev/vrf.c                      | 2 +-
- src/network/netdev/vxcan.c                    | 2 +-
- src/network/netdev/vxlan.c                    | 2 +-
- src/network/netdev/wireguard.c                | 2 +-
- src/network/netdev/xfrm.c                     | 2 +-
- src/network/networkd-bridge-mdb.c             | 4 ++--
- src/network/networkd-dhcp-common.c            | 3 ++-
- src/network/networkd-dhcp-prefix-delegation.c | 3 ++-
- src/network/networkd-dhcp-server.c            | 2 +-
- src/network/networkd-dhcp4.c                  | 2 +-
- src/network/networkd-ipv6ll.c                 | 2 +-
- src/network/networkd-link.c                   | 2 +-
- src/network/networkd-ndisc.c                  | 2 +-
- src/network/networkd-route.c                  | 8 ++++----
- src/network/networkd-setlink.c                | 2 +-
- src/network/networkd-sysctl.c                 | 2 +-
- src/shared/linux/ethtool.h                    | 3 ++-
- src/shared/netif-util.c                       | 2 +-
- src/udev/udev-builtin-net_id.c                | 2 +-
- 38 files changed, 45 insertions(+), 42 deletions(-)
-diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
-index c20367dfc9..b8d4cd8c2a 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
-+++ b/src/libsystemd-network/sd-dhcp6-client.c
-@@ -5,7 +5,7 @@
- 
- #include <errno.h>
- #include <sys/ioctl.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/if_infiniband.h>
- 
- #include "sd-dhcp6-client.h"
-diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c
-index 1df886573b..c8b6714726 100644
--- a/src/network/netdev/bareudp.c
-+++ b/src/network/netdev/bareudp.c
-@@ -2,7 +2,7 @@
-  * Copyright © 2020 VMware, Inc. */
- 
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "bareudp.h"
- #include "netlink-util.h"
-diff --git a/src/network/netdev/batadv.c b/src/network/netdev/batadv.c
-index 26da0231d4..2e8002af8c 100644
--- a/src/network/netdev/batadv.c
-+++ b/src/network/netdev/batadv.c
-@@ -3,7 +3,7 @@
- #include <inttypes.h>
- #include <netinet/in.h>
- #include <linux/genetlink.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "batadv.h"
- #include "fileio.h"
-diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
-index 4d75a0d6bf..985b3197e0 100644
--- a/src/network/netdev/bond.c
-+++ b/src/network/netdev/bond.c
-@@ -1,7 +1,7 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "alloc-util.h"
- #include "bond.h"
-diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
-index 3e394edadf..f12f667687 100644
--- a/src/network/netdev/bridge.c
-+++ b/src/network/netdev/bridge.c
-@@ -2,7 +2,7 @@
- 
- #include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/if_bridge.h>
- 
- #include "bridge.h"
-diff --git a/src/network/netdev/dummy.c b/src/network/netdev/dummy.c
-index 00df1d2787..77b506b422 100644
--- a/src/network/netdev/dummy.c
-+++ b/src/network/netdev/dummy.c
-@@ -1,6 +1,6 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "dummy.h"
- 
-diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c
-index bc655ec7ff..a77e8e17e4 100644
--- a/src/network/netdev/geneve.c
-+++ b/src/network/netdev/geneve.c
-@@ -2,7 +2,7 @@
- 
- #include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "alloc-util.h"
- #include "conf-parser.h"
-diff --git a/src/network/netdev/ifb.c b/src/network/netdev/ifb.c
-index d7ff44cb9e..e037629ae4 100644
--- a/src/network/netdev/ifb.c
-+++ b/src/network/netdev/ifb.c
-@@ -1,7 +1,7 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later
-  * Copyright © 2019 VMware, Inc. */
- 
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "ifb.h"
- 
-diff --git a/src/network/netdev/ipoib.c b/src/network/netdev/ipoib.c
-index d5fe299b7b..c9c8002eac 100644
--- a/src/network/netdev/ipoib.c
-+++ b/src/network/netdev/ipoib.c
-@@ -1,6 +1,6 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/if_link.h>
- 
- #include "ipoib.h"
-diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c
-index 05d5d010f6..d440f49537 100644
--- a/src/network/netdev/ipvlan.c
-+++ b/src/network/netdev/ipvlan.c
-@@ -2,7 +2,7 @@
- 
- #include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "conf-parser.h"
- #include "ipvlan.h"
-diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
-index 17d6acefb6..679d0984f9 100644
--- a/src/network/netdev/macsec.c
-+++ b/src/network/netdev/macsec.c
-@@ -1,7 +1,7 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/if_ether.h>
- #include <linux/if_macsec.h>
- #include <linux/genetlink.h>
-diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c
-index 203807e3a5..8ab09a387e 100644
--- a/src/network/netdev/macvlan.c
-+++ b/src/network/netdev/macvlan.c
-@@ -2,7 +2,7 @@
- 
- #include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "conf-parser.h"
- #include "macvlan.h"
-diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
-index 57127a861a..7f787d0b9f 100644
--- a/src/network/netdev/netdev.c
-+++ b/src/network/netdev/netdev.c
-@@ -2,7 +2,7 @@
- 
- #include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <unistd.h>
- 
- #include "alloc-util.h"
-diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c
-index 15d5c132f9..a3ffa48b15 100644
--- a/src/network/netdev/netdevsim.c
-+++ b/src/network/netdev/netdevsim.c
-@@ -1,6 +1,6 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "netdevsim.h"
- 
-diff --git a/src/network/netdev/nlmon.c b/src/network/netdev/nlmon.c
-index ff372092e6..eef66811f4 100644
--- a/src/network/netdev/nlmon.c
-+++ b/src/network/netdev/nlmon.c
-@@ -1,6 +1,6 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "nlmon.h"
- 
-diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
-index db84e7cf6e..93d5642962 100644
--- a/src/network/netdev/tunnel.c
-+++ b/src/network/netdev/tunnel.c
-@@ -2,7 +2,7 @@
- 
- #include <netinet/in.h>
- #include <linux/fou.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/if_tunnel.h>
- #include <linux/ip.h>
- #include <linux/ip6_tunnel.h>
-diff --git a/src/network/netdev/vcan.c b/src/network/netdev/vcan.c
-index 380547ee1e..137c1adf8a 100644
--- a/src/network/netdev/vcan.c
-+++ b/src/network/netdev/vcan.c
-@@ -1,6 +1,6 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "vcan.h"
- 
-diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c
-index e0f5b4ebb1..8a424ed03d 100644
--- a/src/network/netdev/veth.c
-+++ b/src/network/netdev/veth.c
-@@ -3,7 +3,7 @@
- #include <errno.h>
- #include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/veth.h>
- 
- #include "netlink-util.h"
-diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c
-index 2390206993..efec630e30 100644
--- a/src/network/netdev/vlan.c
-+++ b/src/network/netdev/vlan.c
-@@ -2,7 +2,7 @@
- 
- #include <errno.h>
- #include <net/if.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/if_vlan.h>
- 
- #include "parse-util.h"
-diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c
-index b75ec2bcc6..6aeeea640b 100644
--- a/src/network/netdev/vrf.c
-+++ b/src/network/netdev/vrf.c
-@@ -2,7 +2,7 @@
- 
- #include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "vrf.h"
- 
-diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c
-index c0343f45b6..f9e718f40b 100644
--- a/src/network/netdev/vxcan.c
-+++ b/src/network/netdev/vxcan.c
-@@ -1,7 +1,7 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
- #include <linux/can/vxcan.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "vxcan.h"
- 
-diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c
-index b11fdbbd0d..a971a917f0 100644
--- a/src/network/netdev/vxlan.c
-+++ b/src/network/netdev/vxlan.c
-@@ -2,7 +2,7 @@
- 
- #include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "conf-parser.h"
- #include "alloc-util.h"
-diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
-index 4c7d837c41..6df6dfb816 100644
--- a/src/network/netdev/wireguard.c
-+++ b/src/network/netdev/wireguard.c
-@@ -6,7 +6,7 @@
- #include <sys/ioctl.h>
- #include <net/if.h>
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/ipv6_route.h>
- 
- #include "sd-resolve.h"
-diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c
-index 905bfc0bdf..39e34dbb3b 100644
--- a/src/network/netdev/xfrm.c
-+++ b/src/network/netdev/xfrm.c
-@@ -1,6 +1,6 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "missing_network.h"
- #include "xfrm.h"
-diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c
-index bd1a9745dc..949d3da029 100644
--- a/src/network/networkd-bridge-mdb.c
-+++ b/src/network/networkd-bridge-mdb.c
-@@ -1,7 +1,5 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-#include <net/if.h>
-#include <linux/if_bridge.h>
- 
- #include "netlink-util.h"
- #include "networkd-bridge-mdb.h"
-@@ -11,6 +9,8 @@
- #include "networkd-queue.h"
- #include "string-util.h"
- #include "vlan-util.h"
-+#include <net/if.h>
-+#include <linux/if_bridge.h>
- 
- #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U
- 
-diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
-index 080b15387c..efe8283957 100644
--- a/src/network/networkd-dhcp-common.c
-+++ b/src/network/networkd-dhcp-common.c
-@@ -1,7 +1,8 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
-+#include <net/if.h>
- 
- #include "bus-error.h"
- #include "bus-locator.h"
-diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c
-index af2fe9efcd..511565700f 100644
--- a/src/network/networkd-dhcp-prefix-delegation.c
-+++ b/src/network/networkd-dhcp-prefix-delegation.c
-@@ -1,6 +1,5 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-#include <linux/ipv6_route.h>
- 
- #include "dhcp6-lease-internal.h"
- #include "hashmap.h"
-@@ -20,6 +19,8 @@
- #include "strv.h"
- #include "tunnel.h"
- 
-+#include <linux/ipv6_route.h>
-+
- bool link_dhcp_pd_is_enabled(Link *link) {
-         assert(link);
- 
-diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
-index 607fe0053c..9ce4005874 100644
--- a/src/network/networkd-dhcp-server.c
-+++ b/src/network/networkd-dhcp-server.c
-@@ -1,7 +1,7 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
- #include <netinet/in.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/if.h>
- 
- #include "sd-dhcp-server.h"
-diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
-index efbae6d868..1ea2151d50 100644
--- a/src/network/networkd-dhcp4.c
-+++ b/src/network/networkd-dhcp4.c
-@@ -3,7 +3,7 @@
- #include <netinet/in.h>
- #include <netinet/ip.h>
- #include <linux/if.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "alloc-util.h"
- #include "dhcp-client-internal.h"
-diff --git a/src/network/networkd-ipv6ll.c b/src/network/networkd-ipv6ll.c
-index 32229a3fc7..662a345d6e 100644
--- a/src/network/networkd-ipv6ll.c
-+++ b/src/network/networkd-ipv6ll.c
-@@ -1,7 +1,7 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
- #include <linux/if.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "in-addr-util.h"
- #include "networkd-address.h"
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index ee5f0f2c0a..ea5269a2de 100644
--- a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
-@@ -3,7 +3,7 @@
- #include <net/if.h>
- #include <netinet/in.h>
- #include <linux/if.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/if_link.h>
- #include <linux/netdevice.h>
- #include <sys/socket.h>
-diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
-index ab9eeb13a5..dd96fe7483 100644
--- a/src/network/networkd-ndisc.c
-+++ b/src/network/networkd-ndisc.c
-@@ -6,7 +6,7 @@
- #include <arpa/inet.h>
- #include <netinet/icmp6.h>
- #include <linux/if.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "sd-ndisc.h"
- 
-diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
-index 7218d799fc..30d5574eae 100644
--- a/src/network/networkd-route.c
-+++ b/src/network/networkd-route.c
-@@ -1,9 +1,5 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
-#include <linux/icmpv6.h>
-#include <linux/ipv6_route.h>
-#include <linux/nexthop.h>
-
- #include "alloc-util.h"
- #include "event-util.h"
- #include "netlink-util.h"
-@@ -21,6 +17,10 @@
- #include "vrf.h"
- #include "wireguard.h"
- 
-+#include <linux/icmpv6.h>
-+#include <linux/ipv6_route.h>
-+#include <linux/nexthop.h>
-+
- int route_new(Route **ret) {
-         _cleanup_(route_freep) Route *route = NULL;
- 
-diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c
-index 2298f9ea3a..7d5f87de53 100644
--- a/src/network/networkd-setlink.c
-+++ b/src/network/networkd-setlink.c
-@@ -2,7 +2,7 @@
- 
- #include <netinet/in.h>
- #include <linux/if.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/if_bridge.h>
- 
- #include "missing_network.h"
-diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c
-index 2b226b2e2a..f12a474e2f 100644
--- a/src/network/networkd-sysctl.c
-+++ b/src/network/networkd-sysctl.c
-@@ -2,7 +2,7 @@
- 
- #include <netinet/in.h>
- #include <linux/if.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "missing_network.h"
- #include "networkd-link.h"
-diff --git a/src/shared/linux/ethtool.h b/src/shared/linux/ethtool.h
-index 3d1da515c0..3fca9a4faf 100644
--- a/src/shared/linux/ethtool.h
-+++ b/src/shared/linux/ethtool.h
-@@ -16,7 +16,8 @@
- 
- #include <linux/const.h>
- #include <linux/types.h>
-#include <linux/if_ether.h>
-+#include <netinet/if_ether.h>
-+//#include <linux/if_ether.h>
- 
- #include <limits.h> /* for INT_MAX */
- 
-diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c
-index f56c5646c1..5af28ff119 100644
--- a/src/shared/netif-util.c
-+++ b/src/shared/netif-util.c
-@@ -1,7 +1,7 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
- #include <linux/if.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- 
- #include "arphrd-util.h"
- #include "device-util.h"
-diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index f528a46b8e..830318cda5 100644
--- a/src/udev/udev-builtin-net_id.c
-+++ b/src/udev/udev-builtin-net_id.c
-@@ -18,7 +18,7 @@
- #include <stdarg.h>
- #include <unistd.h>
- #include <linux/if.h>
-#include <linux/if_arp.h>
-+//#include <linux/if_arp.h>
- #include <linux/netdevice.h>
- #include <linux/pci_regs.h>
- 
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
deleted file mode 100644
index 75f6b9094a..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From be02bd0876a061728661535a709d313e39fe1ac3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 8 Nov 2022 13:31:34 -0800
-Subject: [PATCH 18/22] test-bus-error: strerror() is assumed to be GNU
- specific version mark it so
-Upstream-Status: Inappropriate [Upstream systemd only supports glibc]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/libsystemd/sd-bus/test-bus-error.c | 2 ++
- src/test/test-errno-util.c             | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c
-index a55f3f9856..4123bf3da0 100644
--- a/src/libsystemd/sd-bus/test-bus-error.c
-+++ b/src/libsystemd/sd-bus/test-bus-error.c
-@@ -99,7 +99,9 @@ TEST(error) {
-         assert_se(!sd_bus_error_is_set(&error));
-         assert_se(sd_bus_error_set_errno(&error, EBUSY) == -EBUSY);
-         assert_se(streq(error.name, "System.Error.EBUSY"));
-+#ifdef __GLIBC__
-         assert_se(streq(error.message, STRERROR(EBUSY)));
-+#endif
-         assert_se(sd_bus_error_has_name(&error, "System.Error.EBUSY"));
-         assert_se(sd_bus_error_get_errno(&error) == EBUSY);
-         assert_se(sd_bus_error_is_set(&error));
-diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c
-index 376d532281..967cfd4d67 100644
--- a/src/test/test-errno-util.c
-+++ b/src/test/test-errno-util.c
-@@ -4,7 +4,7 @@
- #include "stdio-util.h"
- #include "string-util.h"
- #include "tests.h"
-
-+#ifdef __GLIBC__
- TEST(strerror_not_threadsafe) {
-         /* Just check that strerror really is not thread-safe. */
-         log_info("strerror(%d) → %s", 200, strerror(200));
-@@ -46,6 +46,7 @@ TEST(STRERROR_OR_ELSE) {
-         log_info("STRERROR_OR_ELSE(EPERM, \"EOF\") → %s", STRERROR_OR_EOF(EPERM));
-         log_info("STRERROR_OR_ELSE(-EPERM, \"EOF\") → %s", STRERROR_OR_EOF(-EPERM));
- }
-+#endif /* __GLIBC__ */
- 
- TEST(PROTECT_ERRNO) {
-         errno = 12;
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch
deleted file mode 100644
index e038b73678..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 46d80840bfe37e67d4f18c37a77751ea1fe63a07 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 23 Jan 2023 23:39:46 -0800
-Subject: [PATCH 19/22] errno-util: Make STRERROR portable for musl
-Sadly, systemd has decided to use yet another GNU extention in a macro
-lets make this such that we can use XSI compliant strerror_r() for
-non-glibc hosts
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/basic/errno-util.h | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h
-index 27804e6382..274c1c6ef1 100644
--- a/src/basic/errno-util.h
-+++ b/src/basic/errno-util.h
-@@ -15,8 +15,16 @@
-  * https://stackoverflow.com/questions/34880638/compound-literal-lifetime-and-if-blocks
-  *
-  * Note that we use the GNU variant of strerror_r() here. */
-#define STRERROR(errnum) strerror_r(abs(errnum), (char[ERRNO_BUF_LEN]){}, ERRNO_BUF_LEN)
-
-+static inline const char * STRERROR(int errnum);
-+
-+static inline const char * STRERROR(int errnum) {
-+#ifdef __GLIBC__
-+        return strerror_r(abs(errnum), (char[ERRNO_BUF_LEN]){}, ERRNO_BUF_LEN);
-+#else
-+        static __thread char buf[ERRNO_BUF_LEN];
-+        return strerror_r(abs(errnum), buf, ERRNO_BUF_LEN) ? "unknown error" : buf;
-+#endif
-+}
- /* A helper to print an error message or message for functions that return 0 on EOF.
-  * Note that we can't use ({ … }) to define a temporary variable, so errnum is
-  * evaluated twice. */
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch
deleted file mode 100644
index b83fffe793..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9eb4867b4e2dbdb2484ae854022aff97e2f0feb3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 2 Aug 2023 12:06:27 -0700
-Subject: [PATCH 20/22] sd-event: Make malloc_trim() conditional on glibc
-musl does not have this API
-Upstream-Status: Inappropriate [musl-specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/libsystemd/sd-event/sd-event.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
-index 288798a0dc..6419a7f216 100644
--- a/src/libsystemd/sd-event/sd-event.c
-+++ b/src/libsystemd/sd-event/sd-event.c
-@@ -1874,7 +1874,7 @@ _public_ int sd_event_add_exit(
- }
- 
- _public_ int sd_event_trim_memory(void) {
-        int r;
-+        int r = 0;
- 
-         /* A default implementation of a memory pressure callback. Simply releases our own allocation caches
-          * and glibc's. This is automatically used when people call sd_event_add_memory_pressure() with a
-@@ -1888,7 +1888,9 @@ _public_ int sd_event_trim_memory(void) {
- 
-         usec_t before_timestamp = now(CLOCK_MONOTONIC);
-         hashmap_trim_pools();
-+#ifdef __GLIBC__
-         r = malloc_trim(0);
-+#endif
-         usec_t after_timestamp = now(CLOCK_MONOTONIC);
- 
-         if (r > 0)
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0021-shared-Do-not-use-malloc_info-on-musl.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0021-shared-Do-not-use-malloc_info-on-musl.patch
deleted file mode 100644
index 7eff069bb7..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0021-shared-Do-not-use-malloc_info-on-musl.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 502597b9ddd6b145541b23fadca0b1d3ca9f6367 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 2 Aug 2023 12:20:40 -0700
-Subject: [PATCH 21/22] shared: Do not use malloc_info on musl
-Upstream-Status: Inappropriate [musl-specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/shared/bus-util.c      | 5 +++--
- src/shared/common-signal.c | 4 ++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
-diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
-index 74f148c8b4..2d862a123d 100644
--- a/src/shared/bus-util.c
-+++ b/src/shared/bus-util.c
-@@ -611,15 +611,16 @@ static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdat
-         _cleanup_close_ int fd = -EBADF;
-         size_t dump_size;
-         FILE *f;
-        int r;
-+        int r = 0;
- 
-         assert(message);
- 
-         f = memstream_init(&m);
-         if (!f)
-                 return -ENOMEM;
-
-+#ifdef __GLIBC__
-         r = RET_NERRNO(malloc_info(/* options= */ 0, f));
-+#endif
-         if (r < 0)
-                 return r;
- 
-diff --git a/src/shared/common-signal.c b/src/shared/common-signal.c
-index 8e70e365dd..9e782caec9 100644
--- a/src/shared/common-signal.c
-+++ b/src/shared/common-signal.c
-@@ -65,12 +65,12 @@ int sigrtmin18_handler(sd_event_source *s, const struct signalfd_siginfo *si, vo
-                         log_oom();
-                         break;
-                 }
-
-+#ifdef __GLIBC__
-                 if (malloc_info(0, f) < 0) {
-                         log_error_errno(errno, "Failed to invoke malloc_info(): %m");
-                         break;
-                 }
-
-+#endif
-                 (void) memstream_dump(LOG_INFO, &m);
-                 break;
-         }
-- 
-2.34.1
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch
deleted file mode 100644
index 56755ac559..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 97d3ed7834bd86615ba4acdbef984c677b7e7791 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Tue, 2 Jan 2024 11:03:27 +0800
-Subject: [PATCH] avoid missing LOCK_EX declaration
-This only happens on MUSL. Include sys/file.h to avoid compilation
-error about missing LOCK_EX declaration.
-Upstream-Status: Inappropriate [musl specific]
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
- src/core/exec-invoke.c | 1 +
- src/shared/dev-setup.h | 1 +
- 2 files changed, 2 insertions(+)
--- a/src/core/exec-invoke.c
-+++ b/src/core/exec-invoke.c
-@@ -4,6 +4,7 @@
- #include <sys/ioctl.h>
- #include <sys/mount.h>
- #include <sys/prctl.h>
-+#include <sys/file.h>
- 
- #if HAVE_PAM
- #include <security/pam_appl.h>
--- a/src/shared/dev-setup.h
-+++ b/src/shared/dev-setup.h
-@@ -2,6 +2,7 @@
- #pragma once
- 
- #include <sys/types.h>
-+#include <sys/file.h>
- 
- int lock_dev_console(void);
- 
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb
deleted file mode 100644
index 9c39d40d23..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb
+++ /dev/null
@@ -1,76 +0,0 @@
-SUMMARY = "libsystemd static library"
-DESCRIPTION = "libsystemd static library built specifically as an integral component of sdbus-c++"
-SECTION = "libs"
-LICENSE = "LGPL-2.1-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
-inherit meson pkgconfig
-DEPENDS += "gperf-native gettext-native util-linux libcap util-linux python3-jinja2-native"
-SRCREV = "5810c25792d4268282dd3892af1a253b690423c9"
-SRCBRANCH = "v255-stable"
-SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
-           file://static-libsystemd-pkgconfig.patch \
-           "
-# patches needed by musl
-SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}"
-SRC_URI_MUSL = "\
-    file://0001-missing_type.h-add-comparison_fn_t.patch \
-    file://0002-add-fallback-parse_printf_format-implementation.patch \
-    file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
-    file://0003-src-basic-missing.h-check-for-missing-strndupa.patch \
-    file://0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \
-    file://0005-add-missing-FTW_-macros-for-musl.patch \
-    file://0006-Use-uintmax_t-for-handling-rlim_t.patch \
-    file://0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \
-    file://0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch \
-    file://0008-implment-systemd-sysv-install-for-OE.patch \
-    file://0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \
-    file://0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \
-    file://0011-avoid-redefinition-of-prctl_mm_map-structure.patch \
-    file://0012-do-not-disable-buffer-in-writing-files.patch \
-    file://0013-Handle-__cpu_mask-usage.patch \
-    file://0014-Handle-missing-gshadow.patch \
-    file://0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \
-    file://0016-pass-correct-parameters-to-getdents64.patch \
-    file://0017-Adjust-for-musl-headers.patch \
-    file://0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \
-    file://0019-errno-util-Make-STRERROR-portable-for-musl.patch \
-    file://0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch \
-    file://0021-shared-Do-not-use-malloc_info-on-musl.patch \
-    file://0022-avoid-missing-LOCK_EX-declaration.patch \
-"
-PACKAGECONFIG ??= "gshadow idn"
-PACKAGECONFIG:remove:libc-musl = " gshadow idn"
-PACKAGECONFIG[gshadow] = "-Dgshadow=true,-Dgshadow=false"
-PACKAGECONFIG[idn] = "-Didn=true,-Didn=false"
-CFLAGS:append:libc-musl = " -D__UAPI_DEF_ETHHDR=0 "
-EXTRA_OEMESON += "-Dstatic-libsystemd=pic"
-RDEPENDS:${PN}-dev = ""
-do_compile() {
-    ninja -v ${PARALLEL_MAKE} version.h
-    ninja -v ${PARALLEL_MAKE} libsystemd.a
-    ninja -v ${PARALLEL_MAKE} src/libsystemd/libsystemd.pc
-}
-do_install () {
-    install -d ${D}${libdir}
-    install ${B}/libsystemd.a ${D}${libdir}
-    install -d ${D}${includedir}/systemd
-    install ${S}/src/systemd/*.h ${D}${includedir}/systemd
-    install -d ${D}${libdir}/pkgconfig
-    install ${B}/src/libsystemd/libsystemd.pc ${D}${libdir}/pkgconfig
-}
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_259.5.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_259.5.bb
new file mode 100644
index 0000000000..63a7bc7c27
--- /dev/null
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_259.5.bb
@@ -0,0 +1,45 @@
+SUMMARY = "libsystemd static library"
+DESCRIPTION = "libsystemd static library built specifically as an integral component of sdbus-c++"
+SECTION = "libs"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=be0aaf4a380f73f7e00b420a007368f2"
+inherit meson pkgconfig
+DEPENDS += "gperf-native gettext-native util-linux libcap util-linux python3-jinja2-native"
+SRCREV = "b3d8fc43e9cb531d958c17ef2cd93b374bc14e8a"
+SRCBRANCH = "v259-stable"
+SRC_URI = "git://github.com/systemd/systemd;protocol=https;branch=${SRCBRANCH};tag=v${PV} \
+           file://static-libsystemd-pkgconfig.patch \
+           "
+PACKAGECONFIG ??= "gshadow idn"
+PACKAGECONFIG:remove:libc-musl = " gshadow idn"
+PACKAGECONFIG[gshadow] = "-Dgshadow=true,-Dgshadow=false"
+PACKAGECONFIG[idn] = "-Didn=true,-Didn=false"
+CFLAGS:append:libc-musl = " -D__UAPI_DEF_ETHHDR=0 "
+EXTRA_OEMESON += "-Dstatic-libsystemd=pic"
+RDEPENDS:${PN}-dev = ""
+do_compile() {
+    ninja -v ${PARALLEL_MAKE} libsystemd.a
+    ninja -v ${PARALLEL_MAKE} src/libsystemd/libsystemd.pc
+}
+do_install () {
+    install -d ${D}${libdir}
+    install ${B}/libsystemd.a ${D}${libdir}
+    install -d ${D}${includedir}/systemd
+    install ${S}/src/systemd/*.h ${D}${includedir}/systemd
+    install -d ${D}${libdir}/pkgconfig
+    install ${B}/src/libsystemd/libsystemd.pc ${D}${libdir}/pkgconfig
+}
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc
index 0e842a9c91..0118cc3f32 100644
--- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc
+++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc
@@ -7,9 +7,9 @@ SRC_URI += " \
    crate://crates.io/allocator-api2/0.2.21 \
    crate://crates.io/android_system_properties/0.1.5 \
    crate://crates.io/ansi-width/0.1.0 \
-    crate://crates.io/anstream/0.6.21 \
+    crate://crates.io/anstream/1.0.0 \
    crate://crates.io/anstyle/1.0.13 \
-    crate://crates.io/anstyle-parse/0.2.7 \
+    crate://crates.io/anstyle-parse/1.0.0 \
    crate://crates.io/anstyle-query/1.1.5 \
    crate://crates.io/anstyle-wincon/3.0.11 \
    crate://crates.io/anyhow/1.0.101 \
@@ -22,43 +22,47 @@ SRC_URI += " \
    crate://crates.io/binary-heap-plus/0.5.0 \
    crate://crates.io/bindgen/0.72.1 \
    crate://crates.io/bitflags/1.3.2 \
-    crate://crates.io/bitflags/2.10.0 \
+    crate://crates.io/bitflags/2.11.0 \
    crate://crates.io/bitvec/1.0.1 \
    crate://crates.io/blake2b_simd/1.0.4 \
-    crate://crates.io/blake3/1.8.3 \
+    crate://crates.io/blake3/1.8.4 \
    crate://crates.io/block-buffer/0.10.4 \
+    crate://crates.io/block-buffer/0.12.0 \
    crate://crates.io/block2/0.6.2 \
    crate://crates.io/bstr/1.12.1 \
    crate://crates.io/bumpalo/3.19.1 \
    crate://crates.io/bytecount/0.6.9 \
    crate://crates.io/byteorder/1.5.0 \
-    crate://crates.io/calendrical_calculations/0.2.3 \
+    crate://crates.io/calendrical_calculations/0.2.4 \
    crate://crates.io/cc/1.2.55 \
    crate://crates.io/cexpr/0.6.0 \
    crate://crates.io/cfg-if/1.0.4 \
    crate://crates.io/cfg_aliases/0.2.1 \
+    crate://crates.io/chacha20/0.10.0 \
    crate://crates.io/chrono/0.4.43 \
    crate://crates.io/clang-sys/1.8.1 \
-    crate://crates.io/clap/4.5.60 \
+    crate://crates.io/clap/4.6.0 \
-    crate://crates.io/clap_builder/4.5.60 \
+    crate://crates.io/clap_builder/4.6.0 \
-    crate://crates.io/clap_complete/4.5.66 \
+    crate://crates.io/clap_complete/4.6.0 \
    crate://crates.io/clap_lex/1.0.0 \
-    crate://crates.io/clap_mangen/0.2.31 \
+    crate://crates.io/clap_mangen/0.3.0 \
-    crate://crates.io/codspeed/4.3.0 \
+    crate://crates.io/codspeed/4.4.1 \
-    crate://crates.io/codspeed-divan-compat/4.3.0 \
+    crate://crates.io/codspeed-divan-compat/4.4.1 \
-    crate://crates.io/codspeed-divan-compat-macros/4.3.0 \
+    crate://crates.io/codspeed-divan-compat-macros/4.4.1 \
-    crate://crates.io/codspeed-divan-compat-walltime/4.3.0 \
+    crate://crates.io/codspeed-divan-compat-walltime/4.4.1 \
    crate://crates.io/colorchoice/1.0.4 \
    crate://crates.io/colored/2.2.0 \
    crate://crates.io/compare/0.1.0 \
    crate://crates.io/condtype/1.3.0 \
-    crate://crates.io/console/0.16.2 \
+    crate://crates.io/console/0.16.3 \
+    crate://crates.io/const-oid/0.10.2 \
    crate://crates.io/const-random/0.1.18 \
    crate://crates.io/const-random-macro/0.1.16 \
    crate://crates.io/constant_time_eq/0.4.2 \
    crate://crates.io/core-foundation-sys/0.8.7 \
    crate://crates.io/core_maths/0.1.1 \
    crate://crates.io/cpufeatures/0.2.17 \
+    crate://crates.io/cpufeatures/0.3.0 \
    crate://crates.io/crc/3.3.0 \
    crate://crates.io/crc-catalog/2.4.0 \
    crate://crates.io/crc-fast/1.9.0 \
@@ -70,22 +74,24 @@ SRC_URI += " \
    crate://crates.io/crossterm_winapi/0.9.1 \
    crate://crates.io/crunchy/0.2.4 \
    crate://crates.io/crypto-common/0.1.7 \
-    crate://crates.io/ctor/0.6.3 \
+    crate://crates.io/crypto-common/0.2.1 \
+    crate://crates.io/ctor/0.8.0 \
    crate://crates.io/ctor-proc-macro/0.0.7 \
-    crate://crates.io/ctrlc/3.5.1 \
+    crate://crates.io/ctrlc/3.5.2 \
    crate://crates.io/data-encoding/2.10.0 \
    crate://crates.io/data-encoding-macro/0.1.19 \
    crate://crates.io/data-encoding-macro-internal/0.1.17 \
    crate://crates.io/deranged/0.5.5 \
    crate://crates.io/diff/0.1.13 \
    crate://crates.io/digest/0.10.7 \
+    crate://crates.io/digest/0.11.2 \
    crate://crates.io/dispatch2/0.3.0 \
    crate://crates.io/displaydoc/0.2.5 \
    crate://crates.io/divan-macros/0.1.17 \
    crate://crates.io/dlv-list/0.5.2 \
    crate://crates.io/dns-lookup/3.0.1 \
    crate://crates.io/document-features/0.2.12 \
-    crate://crates.io/dtor/0.1.1 \
+    crate://crates.io/dtor/0.3.0 \
    crate://crates.io/dtor-proc-macro/0.0.6 \
    crate://crates.io/dunce/1.0.5 \
    crate://crates.io/either/1.15.0 \
@@ -98,7 +104,7 @@ SRC_URI += " \
    crate://crates.io/filedescriptor/0.8.3 \
    crate://crates.io/filetime/0.2.27 \
    crate://crates.io/find-msvc-tools/0.1.9 \
-    crate://crates.io/fixed_decimal/0.7.1 \
+    crate://crates.io/fixed_decimal/0.7.2 \
    crate://crates.io/flate2/1.1.9 \
    crate://crates.io/fluent/0.17.0 \
    crate://crates.io/fluent-bundle/0.16.0 \
@@ -118,39 +124,42 @@ SRC_URI += " \
    crate://crates.io/gcd/2.3.0 \
    crate://crates.io/generic-array/0.14.7 \
    crate://crates.io/getrandom/0.2.17 \
-    crate://crates.io/getrandom/0.3.4 \
+    crate://crates.io/getrandom/0.4.2 \
    crate://crates.io/glob/0.3.3 \
    crate://crates.io/half/2.7.1 \
    crate://crates.io/hashbrown/0.14.5 \
    crate://crates.io/hashbrown/0.15.5 \
    crate://crates.io/hashbrown/0.16.1 \
+    crate://crates.io/heck/0.5.0 \
    crate://crates.io/hex/0.4.3 \
    crate://crates.io/hex-literal/1.1.0 \
    crate://crates.io/hostname/0.4.2 \
+    crate://crates.io/hybrid-array/0.4.8 \
    crate://crates.io/iana-time-zone/0.1.65 \
    crate://crates.io/iana-time-zone-haiku/0.1.2 \
-    crate://crates.io/icu_calendar/2.1.1 \
+    crate://crates.io/icu_calendar/2.2.1 \
-    crate://crates.io/icu_calendar_data/2.1.1 \
+    crate://crates.io/icu_calendar_data/2.2.0 \
-    crate://crates.io/icu_collator/2.1.1 \
+    crate://crates.io/icu_collator/2.2.0 \
-    crate://crates.io/icu_collator_data/2.1.1 \
+    crate://crates.io/icu_collator_data/2.2.0 \
-    crate://crates.io/icu_collections/2.1.1 \
+    crate://crates.io/icu_collections/2.2.0 \
-    crate://crates.io/icu_datetime/2.1.1 \
+    crate://crates.io/icu_datetime/2.2.0 \
-    crate://crates.io/icu_datetime_data/2.1.2 \
+    crate://crates.io/icu_datetime_data/2.2.0 \
-    crate://crates.io/icu_decimal/2.1.1 \
+    crate://crates.io/icu_decimal/2.2.0 \
-    crate://crates.io/icu_decimal_data/2.1.1 \
+    crate://crates.io/icu_decimal_data/2.2.0 \
-    crate://crates.io/icu_locale/2.1.1 \
+    crate://crates.io/icu_locale/2.2.0 \
-    crate://crates.io/icu_locale_core/2.1.1 \
+    crate://crates.io/icu_locale_core/2.2.0 \
-    crate://crates.io/icu_locale_data/2.1.2 \
+    crate://crates.io/icu_locale_data/2.2.0 \
-    crate://crates.io/icu_normalizer/2.1.1 \
+    crate://crates.io/icu_normalizer/2.2.0 \
-    crate://crates.io/icu_normalizer_data/2.1.1 \
+    crate://crates.io/icu_normalizer_data/2.2.0 \
-    crate://crates.io/icu_pattern/0.4.1 \
+    crate://crates.io/icu_pattern/0.4.2 \
-    crate://crates.io/icu_plurals/2.1.1 \
+    crate://crates.io/icu_plurals/2.2.0 \
-    crate://crates.io/icu_plurals_data/2.1.1 \
+    crate://crates.io/icu_plurals_data/2.2.0 \
-    crate://crates.io/icu_properties/2.1.2 \
+    crate://crates.io/icu_properties/2.2.0 \
-    crate://crates.io/icu_properties_data/2.1.2 \
+    crate://crates.io/icu_properties_data/2.2.0 \
-    crate://crates.io/icu_provider/2.1.1 \
+    crate://crates.io/icu_provider/2.2.0 \
-    crate://crates.io/icu_time/2.1.1 \
+    crate://crates.io/icu_time/2.2.0 \
-    crate://crates.io/icu_time_data/2.1.1 \
+    crate://crates.io/icu_time_data/2.2.0 \
+    crate://crates.io/id-arena/2.3.0 \
    crate://crates.io/indexmap/2.13.0 \
    crate://crates.io/indicatif/0.18.4 \
    crate://crates.io/inotify/0.11.0 \
@@ -160,8 +169,7 @@ SRC_URI += " \
    crate://crates.io/is_terminal_polyfill/1.70.2 \
    crate://crates.io/itertools/0.13.0 \
    crate://crates.io/itertools/0.14.0 \
-    crate://crates.io/itoa/1.0.17 \
+    crate://crates.io/itoa/1.0.18 \
-    crate://crates.io/ixdtf/0.6.4 \
    crate://crates.io/jiff/0.2.23 \
    crate://crates.io/jiff-icu/0.2.2 \
    crate://crates.io/jiff-static/0.2.23 \
@@ -172,10 +180,11 @@ SRC_URI += " \
    crate://crates.io/kqueue/1.1.1 \
    crate://crates.io/kqueue-sys/1.0.4 \
    crate://crates.io/lazy_static/1.5.0 \
+    crate://crates.io/leb128fmt/0.1.0 \
    crate://crates.io/libc/0.2.182 \
    crate://crates.io/libloading/0.8.9 \
    crate://crates.io/libm/0.2.16 \
-    crate://crates.io/libredox/0.1.12 \
+    crate://crates.io/libredox/0.1.15 \
    crate://crates.io/linux-raw-sys/0.12.1 \
    crate://crates.io/litemap/0.8.1 \
    crate://crates.io/litrs/1.0.0 \
@@ -190,7 +199,7 @@ SRC_URI += " \
    crate://crates.io/minimal-lexical/0.2.1 \
    crate://crates.io/miniz_oxide/0.8.9 \
    crate://crates.io/mio/1.1.1 \
-    crate://crates.io/nix/0.30.1 \
+    crate://crates.io/nix/0.31.2 \
    crate://crates.io/nom/7.1.3 \
    crate://crates.io/nom/8.0.0 \
    crate://crates.io/notify/8.2.0 \
@@ -221,7 +230,8 @@ SRC_URI += " \
    crate://crates.io/phf_shared/0.13.1 \
    crate://crates.io/pin-project-lite/0.2.16 \
    crate://crates.io/pkg-config/0.3.32 \
-    crate://crates.io/platform-info/2.0.5 \
+    crate://crates.io/plain/0.2.3 \
+    crate://crates.io/platform-info/2.1.0 \
    crate://crates.io/portable-atomic/1.13.1 \
    crate://crates.io/portable-atomic-util/0.2.5 \
    crate://crates.io/potential_utf/0.1.4 \
@@ -234,14 +244,14 @@ SRC_URI += " \
    crate://crates.io/procfs/0.18.0 \
    crate://crates.io/procfs-core/0.18.0 \
    crate://crates.io/quote/1.0.45 \
-    crate://crates.io/r-efi/5.3.0 \
+    crate://crates.io/r-efi/6.0.0 \
    crate://crates.io/radium/0.7.0 \
    crate://crates.io/rand/0.8.5 \
-    crate://crates.io/rand/0.9.2 \
+    crate://crates.io/rand/0.10.0 \
    crate://crates.io/rand_chacha/0.3.1 \
-    crate://crates.io/rand_chacha/0.9.0 \
+    crate://crates.io/rand_chacha/0.10.0 \
    crate://crates.io/rand_core/0.6.4 \
-    crate://crates.io/rand_core/0.9.5 \
+    crate://crates.io/rand_core/0.10.0 \
    crate://crates.io/rayon/1.11.0 \
    crate://crates.io/rayon-core/1.13.0 \
    crate://crates.io/redox_syscall/0.5.18 \
@@ -252,11 +262,12 @@ SRC_URI += " \
    crate://crates.io/regex-syntax/0.8.9 \
    crate://crates.io/relative-path/1.9.3 \
    crate://crates.io/rlimit/0.11.0 \
-    crate://crates.io/roff/0.2.2 \
+    crate://crates.io/roff/1.1.0 \
    crate://crates.io/rstest/0.26.1 \
    crate://crates.io/rstest_macros/0.26.1 \
+    crate://crates.io/rstest_reuse/0.7.0 \
    crate://crates.io/rust-ini/0.21.3 \
-    crate://crates.io/rustc-hash/2.1.1 \
+    crate://crates.io/rustc-hash/2.1.2 \
    crate://crates.io/rustc_version/0.4.1 \
    crate://crates.io/rustix/1.1.4 \
    crate://crates.io/rustversion/1.0.22 \
@@ -280,7 +291,7 @@ SRC_URI += " \
    crate://crates.io/simd-adler32/0.3.8 \
    crate://crates.io/siphasher/1.0.2 \
    crate://crates.io/slab/0.4.12 \
-    crate://crates.io/sm3/0.4.2 \
+    crate://crates.io/sm3/0.5.0 \
    crate://crates.io/smallvec/1.15.1 \
    crate://crates.io/smawk/0.3.2 \
    crate://crates.io/socket2/0.6.2 \
@@ -292,8 +303,8 @@ SRC_URI += " \
    crate://crates.io/syn/2.0.114 \
    crate://crates.io/synstructure/0.13.2 \
    crate://crates.io/tap/1.0.1 \
-    crate://crates.io/tempfile/3.26.0 \
+    crate://crates.io/tempfile/3.27.0 \
-    crate://crates.io/terminal_size/0.4.3 \
+    crate://crates.io/terminal_size/0.4.4 \
    crate://crates.io/textwrap/0.16.2 \
    crate://crates.io/thiserror/1.0.69 \
    crate://crates.io/thiserror/2.0.18 \
@@ -303,7 +314,7 @@ SRC_URI += " \
    crate://crates.io/time-core/0.1.8 \
    crate://crates.io/time-macros/0.2.27 \
    crate://crates.io/tiny-keccak/2.0.2 \
-    crate://crates.io/tinystr/0.8.2 \
+    crate://crates.io/tinystr/0.8.3 \
    crate://crates.io/toml_datetime/0.7.5+spec-1.1.0 \
    crate://crates.io/toml_edit/0.23.10+spec-1.0.0 \
    crate://crates.io/toml_parser/1.0.6+spec-1.1.0 \
@@ -316,6 +327,7 @@ SRC_URI += " \
    crate://crates.io/unicode-linebreak/0.1.5 \
    crate://crates.io/unicode-width/0.1.14 \
    crate://crates.io/unicode-width/0.2.2 \
+    crate://crates.io/unicode-xid/0.2.6 \
    crate://crates.io/unindent/0.2.4 \
    crate://crates.io/unit-prefix/0.5.2 \
    crate://crates.io/utf16_iter/1.0.5 \
@@ -324,16 +336,20 @@ SRC_URI += " \
    crate://crates.io/utmp-classic/0.1.6 \
    crate://crates.io/utmp-classic-raw/0.1.3 \
    crate://crates.io/uuid/1.20.0 \
-    crate://crates.io/uutils_term_grid/0.7.0 \
+    crate://crates.io/uutils_term_grid/0.8.0 \
    crate://crates.io/version_check/0.9.5 \
    crate://crates.io/vsimd/0.8.0 \
    crate://crates.io/walkdir/2.5.0 \
    crate://crates.io/wasi/0.11.1+wasi-snapshot-preview1 \
    crate://crates.io/wasip2/1.0.2+wasi-0.2.9 \
+    crate://crates.io/wasip3/0.4.0+wasi-0.3.0-rc-2026-01-06 \
    crate://crates.io/wasm-bindgen/0.2.108 \
    crate://crates.io/wasm-bindgen-macro/0.2.108 \
    crate://crates.io/wasm-bindgen-macro-support/0.2.108 \
    crate://crates.io/wasm-bindgen-shared/0.2.108 \
+    crate://crates.io/wasm-encoder/0.244.0 \
+    crate://crates.io/wasm-metadata/0.244.0 \
+    crate://crates.io/wasmparser/0.244.0 \
    crate://crates.io/web-time/1.1.0 \
    crate://crates.io/wild/2.2.1 \
    crate://crates.io/winapi/0.3.9 \
@@ -369,13 +385,18 @@ SRC_URI += " \
    crate://crates.io/windows_x86_64_msvc/0.53.1 \
    crate://crates.io/winnow/0.7.14 \
    crate://crates.io/wit-bindgen/0.51.0 \
+    crate://crates.io/wit-bindgen-core/0.51.0 \
+    crate://crates.io/wit-bindgen-rust/0.51.0 \
+    crate://crates.io/wit-bindgen-rust-macro/0.51.0 \
+    crate://crates.io/wit-component/0.244.0 \
+    crate://crates.io/wit-parser/0.244.0 \
    crate://crates.io/write16/1.0.0 \
    crate://crates.io/writeable/0.6.2 \
    crate://crates.io/wyz/0.5.1 \
    crate://crates.io/xattr/1.6.1 \
    crate://crates.io/yansi/1.0.1 \
-    crate://crates.io/yoke/0.8.1 \
+    crate://crates.io/yoke/0.8.2 \
-    crate://crates.io/yoke-derive/0.8.1 \
+    crate://crates.io/yoke-derive/0.8.2 \
    crate://crates.io/z85/3.0.7 \
    crate://crates.io/zerocopy/0.7.35 \
    crate://crates.io/zerocopy/0.8.39 \
@@ -383,10 +404,10 @@ SRC_URI += " \
    crate://crates.io/zerocopy-derive/0.8.39 \
    crate://crates.io/zerofrom/0.1.6 \
    crate://crates.io/zerofrom-derive/0.1.6 \
-    crate://crates.io/zerotrie/0.2.3 \
+    crate://crates.io/zerotrie/0.2.4 \
-    crate://crates.io/zerovec/0.11.5 \
+    crate://crates.io/zerovec/0.11.6 \
-    crate://crates.io/zerovec-derive/0.11.2 \
+    crate://crates.io/zerovec-derive/0.11.3 \
-    crate://crates.io/zip/8.2.0 \
+    crate://crates.io/zip/8.5.0 \
    crate://crates.io/zlib-rs/0.6.0 \
    crate://crates.io/zmij/1.0.19 \
    crate://crates.io/zopfli/0.8.3 \
@@ -397,9 +418,9 @@ SRC_URI[aho-corasick-1.1.4.sha256sum] = "ddd31a130427c27518df266943a5308ed92d4b2
 SRC_URI[allocator-api2-0.2.21.sha256sum] = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
 SRC_URI[ansi-width-0.1.0.sha256sum] = "219e3ce6f2611d83b51ec2098a12702112c29e57203a6b0a0929b2cddb486608"
-SRC_URI[anstream-0.6.21.sha256sum] = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+SRC_URI[anstream-1.0.0.sha256sum] = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 SRC_URI[anstyle-1.0.13.sha256sum] = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
-SRC_URI[anstyle-parse-0.2.7.sha256sum] = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+SRC_URI[anstyle-parse-1.0.0.sha256sum] = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
 SRC_URI[anstyle-query-1.1.5.sha256sum] = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 SRC_URI[anstyle-wincon-3.0.11.sha256sum] = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 SRC_URI[anyhow-1.0.101.sha256sum] = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea"
@@ -412,43 +433,47 @@ SRC_URI[bigdecimal-0.4.10.sha256sum] = "4d6867f1565b3aad85681f1015055b087fcfd840
 SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296"
 SRC_URI[bindgen-0.72.1.sha256sum] = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-SRC_URI[bitflags-2.10.0.sha256sum] = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+SRC_URI[bitflags-2.11.0.sha256sum] = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
 SRC_URI[bitvec-1.0.1.sha256sum] = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 SRC_URI[blake2b_simd-1.0.4.sha256sum] = "b79834656f71332577234b50bfc009996f7449e0c056884e6a02492ded0ca2f3"
-SRC_URI[blake3-1.8.3.sha256sum] = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d"
+SRC_URI[blake3-1.8.4.sha256sum] = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e"
 SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+SRC_URI[block-buffer-0.12.0.sha256sum] = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
 SRC_URI[block2-0.6.2.sha256sum] = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 SRC_URI[bstr-1.12.1.sha256sum] = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
 SRC_URI[bumpalo-3.19.1.sha256sum] = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
 SRC_URI[bytecount-0.6.9.sha256sum] = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"
 SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-SRC_URI[calendrical_calculations-0.2.3.sha256sum] = "3a0b39595c6ee54a8d0900204ba4c401d0ab4eb45adaf07178e8d017541529e7"
+SRC_URI[calendrical_calculations-0.2.4.sha256sum] = "5abbd6eeda6885048d357edc66748eea6e0268e3dd11f326fff5bd248d779c26"
 SRC_URI[cc-1.2.55.sha256sum] = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29"
 SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+SRC_URI[chacha20-0.10.0.sha256sum] = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
 SRC_URI[chrono-0.4.43.sha256sum] = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
 SRC_URI[clang-sys-1.8.1.sha256sum] = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-SRC_URI[clap-4.5.60.sha256sum] = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a"
+SRC_URI[clap-4.6.0.sha256sum] = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
-SRC_URI[clap_builder-4.5.60.sha256sum] = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876"
+SRC_URI[clap_builder-4.6.0.sha256sum] = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
-SRC_URI[clap_complete-4.5.66.sha256sum] = "c757a3b7e39161a4e56f9365141ada2a6c915a8622c408ab6bb4b5d047371031"
+SRC_URI[clap_complete-4.6.0.sha256sum] = "19c9f1dde76b736e3681f28cec9d5a61299cbaae0fce80a68e43724ad56031eb"
 SRC_URI[clap_lex-1.0.0.sha256sum] = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
-SRC_URI[clap_mangen-0.2.31.sha256sum] = "439ea63a92086df93893164221ad4f24142086d535b3a0957b9b9bea2dc86301"
+SRC_URI[clap_mangen-0.3.0.sha256sum] = "d82842b45bf9f6a3be090dd860095ac30728042c08e0d6261ca7259b5d850f07"
-SRC_URI[codspeed-4.3.0.sha256sum] = "38c2eb3388ebe26b5a0ab6bf4969d9c4840143d7f6df07caa3cc851b0606cef6"
+SRC_URI[codspeed-4.4.1.sha256sum] = "b684e94583e85a5ca7e1a6454a89d76a5121240f2fb67eb564129d9bafdb9db0"
-SRC_URI[codspeed-divan-compat-4.3.0.sha256sum] = "b2de65b7489a59709724d489070c6d05b7744039e4bf751d0a2006b90bb5593d"
+SRC_URI[codspeed-divan-compat-4.4.1.sha256sum] = "89e4bf8c7793c170fd0fcf3be97b9032b2ae39c2b9e8818aba3cc10ca0f0c6c0"
-SRC_URI[codspeed-divan-compat-macros-4.3.0.sha256sum] = "56ca01ce4fd22b8dcc6c770dcd6b74343642e842482b94e8920d14e10c57638d"
+SRC_URI[codspeed-divan-compat-macros-4.4.1.sha256sum] = "78aae02f2a278588e16e8ca62ea1915b8ab30f8230a09926671bba19ede801a4"
-SRC_URI[codspeed-divan-compat-walltime-4.3.0.sha256sum] = "720ab9d0714718afe5f5832be6e5f5eb5ce97836e24ca7bf7042eea4308b9fb8"
+SRC_URI[codspeed-divan-compat-walltime-4.4.1.sha256sum] = "59ffd32c0c59ab8b674b15be65ba7c59aebac047036cfa7fa1e11bc2c178b81f"
 SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 SRC_URI[colored-2.2.0.sha256sum] = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3"
 SRC_URI[condtype-1.3.0.sha256sum] = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af"
-SRC_URI[console-0.16.2.sha256sum] = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4"
+SRC_URI[console-0.16.3.sha256sum] = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87"
+SRC_URI[const-oid-0.10.2.sha256sum] = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
 SRC_URI[const-random-0.1.18.sha256sum] = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
 SRC_URI[const-random-macro-0.1.16.sha256sum] = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
 SRC_URI[constant_time_eq-0.4.2.sha256sum] = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
 SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 SRC_URI[core_maths-0.1.1.sha256sum] = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30"
 SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+SRC_URI[cpufeatures-0.3.0.sha256sum] = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
 SRC_URI[crc-3.3.0.sha256sum] = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
 SRC_URI[crc-catalog-2.4.0.sha256sum] = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 SRC_URI[crc-fast-1.9.0.sha256sum] = "2fd92aca2c6001b1bf5ba0ff84ee74ec8501b52bbef0cac80bf25a6c1d87a83d"
@@ -460,22 +485,24 @@ SRC_URI[crossterm-0.29.0.sha256sum] = "d8b9f2e4c67f833b660cdb0a3523065869fb35570
 SRC_URI[crossterm_winapi-0.9.1.sha256sum] = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
 SRC_URI[crunchy-0.2.4.sha256sum] = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 SRC_URI[crypto-common-0.1.7.sha256sum] = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
-SRC_URI[ctor-0.6.3.sha256sum] = "424e0138278faeb2b401f174ad17e715c829512d74f3d1e81eb43365c2e0590e"
+SRC_URI[crypto-common-0.2.1.sha256sum] = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710"
+SRC_URI[ctor-0.8.0.sha256sum] = "352d39c2f7bef1d6ad73db6f5160efcaed66d94ef8c6c573a8410c00bf909a98"
 SRC_URI[ctor-proc-macro-0.0.7.sha256sum] = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1"
-SRC_URI[ctrlc-3.5.1.sha256sum] = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790"
+SRC_URI[ctrlc-3.5.2.sha256sum] = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162"
 SRC_URI[data-encoding-2.10.0.sha256sum] = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
 SRC_URI[data-encoding-macro-0.1.19.sha256sum] = "8142a83c17aa9461d637e649271eae18bf2edd00e91f2e105df36c3c16355bdb"
 SRC_URI[data-encoding-macro-internal-0.1.17.sha256sum] = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de"
 SRC_URI[deranged-0.5.5.sha256sum] = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+SRC_URI[digest-0.11.2.sha256sum] = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c"
 SRC_URI[dispatch2-0.3.0.sha256sum] = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
 SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 SRC_URI[divan-macros-0.1.17.sha256sum] = "8dc51d98e636f5e3b0759a39257458b22619cac7e96d932da6eeb052891bb67c"
 SRC_URI[dlv-list-0.5.2.sha256sum] = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
 SRC_URI[dns-lookup-3.0.1.sha256sum] = "6e39034cee21a2f5bbb66ba0e3689819c4bb5d00382a282006e802a7ffa6c41d"
 SRC_URI[document-features-0.2.12.sha256sum] = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
-SRC_URI[dtor-0.1.1.sha256sum] = "404d02eeb088a82cfd873006cb713fe411306c7d182c344905e101fb1167d301"
+SRC_URI[dtor-0.3.0.sha256sum] = "f1057d6c64987086ff8ed0fd3fbf377a6b7d205cc7715868cd401705f715cbe4"
 SRC_URI[dtor-proc-macro-0.0.6.sha256sum] = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5"
 SRC_URI[dunce-1.0.5.sha256sum] = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
@@ -488,7 +515,7 @@ SRC_URI[file_diff-1.0.0.sha256sum] = "31a7a908b8f32538a2143e59a6e4e2508988832d5d
 SRC_URI[filedescriptor-0.8.3.sha256sum] = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d"
 SRC_URI[filetime-0.2.27.sha256sum] = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db"
 SRC_URI[find-msvc-tools-0.1.9.sha256sum] = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
-SRC_URI[fixed_decimal-0.7.1.sha256sum] = "35eabf480f94d69182677e37571d3be065822acfafd12f2f085db44fbbcc8e57"
+SRC_URI[fixed_decimal-0.7.2.sha256sum] = "79c3c892f121fff406e5dd6b28c1b30096b95111c30701a899d4f2b18da6d1bd"
 SRC_URI[flate2-1.1.9.sha256sum] = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
 SRC_URI[fluent-0.17.0.sha256sum] = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f112d30cb0cd4a78670477"
 SRC_URI[fluent-bundle-0.16.0.sha256sum] = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4"
@@ -508,39 +535,42 @@ SRC_URI[futures-util-0.3.32.sha256sum] = "389ca41296e6190b48053de0321d02a77f32f8
 SRC_URI[gcd-2.3.0.sha256sum] = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a"
 SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 SRC_URI[getrandom-0.2.17.sha256sum] = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
-SRC_URI[getrandom-0.3.4.sha256sum] = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+SRC_URI[getrandom-0.4.2.sha256sum] = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
 SRC_URI[glob-0.3.3.sha256sum] = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 SRC_URI[half-2.7.1.sha256sum] = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 SRC_URI[hashbrown-0.15.5.sha256sum] = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 SRC_URI[hashbrown-0.16.1.sha256sum] = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 SRC_URI[hex-literal-1.1.0.sha256sum] = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1"
 SRC_URI[hostname-0.4.2.sha256sum] = "617aaa3557aef3810a6369d0a99fac8a080891b68bd9f9812a1eeda0c0730cbd"
+SRC_URI[hybrid-array-0.4.8.sha256sum] = "8655f91cd07f2b9d0c24137bd650fe69617773435ee5ec83022377777ce65ef1"
 SRC_URI[iana-time-zone-0.1.65.sha256sum] = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-SRC_URI[icu_calendar-2.1.1.sha256sum] = "d6f0e52e009b6b16ba9c0693578796f2dd4aaa59a7f8f920423706714a89ac4e"
+SRC_URI[icu_calendar-2.2.1.sha256sum] = "a2b2acc6263f494f1df50685b53ff8e57869e47d5c6fe39c23d518ae9a4f3e45"
-SRC_URI[icu_calendar_data-2.1.1.sha256sum] = "527f04223b17edfe0bd43baf14a0cb1b017830db65f3950dc00224860a9a446d"
+SRC_URI[icu_calendar_data-2.2.0.sha256sum] = "118577bcf3a0fa7c6ac0a7d6e951814da84ee56b9b1f68fb4d8d10b08cefaf4d"
-SRC_URI[icu_collator-2.1.1.sha256sum] = "32eed11a5572f1088b63fa21dc2e70d4a865e5739fc2d10abc05be93bae97019"
+SRC_URI[icu_collator-2.2.0.sha256sum] = "b521b92a2666061ddda902769d8a4cf730b5c9529a845cc1b69770b12a6c9a71"
-SRC_URI[icu_collator_data-2.1.1.sha256sum] = "5ab06f0e83a613efddba3e4913e00e43ed4001fae651cb7d40fc7e66b83b6fb9"
+SRC_URI[icu_collator_data-2.2.0.sha256sum] = "038ed8e5817f2059c2f3efb0945ba78d060d3d25e8f1a1bea5139f821a21a2f0"
-SRC_URI[icu_collections-2.1.1.sha256sum] = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+SRC_URI[icu_collections-2.2.0.sha256sum] = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
-SRC_URI[icu_datetime-2.1.1.sha256sum] = "1b9d49f41ded8e63761b6b4c3120dfdc289415a1ed10107db6198eb311057ca5"
+SRC_URI[icu_datetime-2.2.0.sha256sum] = "989d56ea5bbc43ae2b4e0388874b002884eaf4ed3a76c84a6c8c5ad575e04d72"
-SRC_URI[icu_datetime_data-2.1.2.sha256sum] = "46597233625417b7c8052a63d916e4fdc73df21614ac0b679492a5d6e3b01aeb"
+SRC_URI[icu_datetime_data-2.2.0.sha256sum] = "40d3cc1b690d9703202bc319692ac8a1f3a6390686f0930ff40542450fa34f0b"
-SRC_URI[icu_decimal-2.1.1.sha256sum] = "a38c52231bc348f9b982c1868a2af3195199623007ba2c7650f432038f5b3e8e"
+SRC_URI[icu_decimal-2.2.0.sha256sum] = "288247df2e32aa776ac54fdd64de552149ac43cb840f2761811f0e8d09719dd4"
-SRC_URI[icu_decimal_data-2.1.1.sha256sum] = "2905b4044eab2dd848fe84199f9195567b63ab3a93094711501363f63546fef7"
+SRC_URI[icu_decimal_data-2.2.0.sha256sum] = "6f14a5ca9e8af29eef62064f269078424283d90dbaffeac5225addf62aaabc22"
-SRC_URI[icu_locale-2.1.1.sha256sum] = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60"
+SRC_URI[icu_locale-2.2.0.sha256sum] = "d5a396343c7208121dc86e35623d3dfe19814a7613cfd14964994cdc9c9a2e26"
-SRC_URI[icu_locale_core-2.1.1.sha256sum] = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
+SRC_URI[icu_locale_core-2.2.0.sha256sum] = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
-SRC_URI[icu_locale_data-2.1.2.sha256sum] = "1c5f1d16b4c3a2642d3a719f18f6b06070ab0aef246a6418130c955ae08aa831"
+SRC_URI[icu_locale_data-2.2.0.sha256sum] = "d5fdcc9ac77c6d74ff5cf6e65ef3181d6af32003b16fce3a77fb451d2f695993"
-SRC_URI[icu_normalizer-2.1.1.sha256sum] = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
+SRC_URI[icu_normalizer-2.2.0.sha256sum] = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
-SRC_URI[icu_normalizer_data-2.1.1.sha256sum] = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
+SRC_URI[icu_normalizer_data-2.2.0.sha256sum] = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
-SRC_URI[icu_pattern-0.4.1.sha256sum] = "7a7ff8c0ff6f61cdce299dcb54f557b0a251adbc78f6f0c35a21332c452b4a1b"
+SRC_URI[icu_pattern-0.4.2.sha256sum] = "1c4c568054ffe735398a9f4c55aec37ad7c768844553cc0978f09cc9b933a1fb"
-SRC_URI[icu_plurals-2.1.1.sha256sum] = "4f9cfe49f5b1d1163cc58db451562339916a9ca5cbcaae83924d41a0bf839474"
+SRC_URI[icu_plurals-2.2.0.sha256sum] = "2a50023f1d49ad5c4333380328a0d4a19e4b9d6d842ec06639affd5ba47c8103"
-SRC_URI[icu_plurals_data-2.1.1.sha256sum] = "f018a98dccf7f0eb02ba06ac0ff67d102d8ded80734724305e924de304e12ff0"
+SRC_URI[icu_plurals_data-2.2.0.sha256sum] = "8485497155dc865f901decb93ecc20d3e467df67bfeceb91e3ba34e2b11e8e1d"
-SRC_URI[icu_properties-2.1.2.sha256sum] = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
+SRC_URI[icu_properties-2.2.0.sha256sum] = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
-SRC_URI[icu_properties_data-2.1.2.sha256sum] = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
+SRC_URI[icu_properties_data-2.2.0.sha256sum] = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
-SRC_URI[icu_provider-2.1.1.sha256sum] = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+SRC_URI[icu_provider-2.2.0.sha256sum] = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
-SRC_URI[icu_time-2.1.1.sha256sum] = "8242b00da3b3b6678f731437a11c8833a43c821ae081eca60ba1b7579d45b6d8"
+SRC_URI[icu_time-2.2.0.sha256sum] = "ec3af0c141da0a61d4f6970cd1d5f4b388b17ea22f8124f8f6049d3d5147586a"
-SRC_URI[icu_time_data-2.1.1.sha256sum] = "3e10b0e5e87a2c84bd5fa407705732052edebe69291d347d0c3033785470edbf"
+SRC_URI[icu_time_data-2.2.0.sha256sum] = "6f2f8aeca682d874a5247084aa4fb7d1cef9ba45d889c21209a8818dcaaa0ec9"
+SRC_URI[id-arena-2.3.0.sha256sum] = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 SRC_URI[indexmap-2.13.0.sha256sum] = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 SRC_URI[indicatif-0.18.4.sha256sum] = "25470f23803092da7d239834776d653104d551bc4d7eacaf31e6837854b8e9eb"
 SRC_URI[inotify-0.11.0.sha256sum] = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
@@ -550,8 +580,7 @@ SRC_URI[intl_pluralrules-7.0.2.sha256sum] = "078ea7b7c29a2b4df841a7f6ac8775ff607
 SRC_URI[is_terminal_polyfill-1.70.2.sha256sum] = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 SRC_URI[itertools-0.14.0.sha256sum] = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
-SRC_URI[itoa-1.0.17.sha256sum] = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+SRC_URI[itoa-1.0.18.sha256sum] = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
-SRC_URI[ixdtf-0.6.4.sha256sum] = "84de9d95a6d2547d9b77ee3f25fa0ee32e3c3a6484d47a55adebc0439c077992"
 SRC_URI[jiff-0.2.23.sha256sum] = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359"
 SRC_URI[jiff-icu-0.2.2.sha256sum] = "0e67c2beaae8b10a82d849b9aabb698a43a682f32b17bcdc035d5ecadb44d646"
 SRC_URI[jiff-static-0.2.23.sha256sum] = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4"
@@ -562,10 +591,11 @@ SRC_URI[keccak-0.1.6.sha256sum] = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56d
 SRC_URI[kqueue-1.1.1.sha256sum] = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
 SRC_URI[kqueue-sys-1.0.4.sha256sum] = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
 SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+SRC_URI[leb128fmt-0.1.0.sha256sum] = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 SRC_URI[libc-0.2.182.sha256sum] = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
 SRC_URI[libloading-0.8.9.sha256sum] = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 SRC_URI[libm-0.2.16.sha256sum] = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
-SRC_URI[libredox-0.1.12.sha256sum] = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
+SRC_URI[libredox-0.1.15.sha256sum] = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08"
 SRC_URI[linux-raw-sys-0.12.1.sha256sum] = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 SRC_URI[litemap-0.8.1.sha256sum] = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 SRC_URI[litrs-1.0.0.sha256sum] = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
@@ -580,7 +610,7 @@ SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce444
 SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 SRC_URI[miniz_oxide-0.8.9.sha256sum] = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 SRC_URI[mio-1.1.1.sha256sum] = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
-SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+SRC_URI[nix-0.31.2.sha256sum] = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
 SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 SRC_URI[nom-8.0.0.sha256sum] = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
 SRC_URI[notify-8.2.0.sha256sum] = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
@@ -611,7 +641,8 @@ SRC_URI[phf_generator-0.13.1.sha256sum] = "135ace3a761e564ec88c03a77317a7c6b80bb
 SRC_URI[phf_shared-0.13.1.sha256sum] = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
 SRC_URI[pin-project-lite-0.2.16.sha256sum] = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 SRC_URI[pkg-config-0.3.32.sha256sum] = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
-SRC_URI[platform-info-2.0.5.sha256sum] = "7539aeb3fdd8cb4f6a331307cf71a1039cee75e94e8a71725b9484f4a0d9451a"
+SRC_URI[plain-0.2.3.sha256sum] = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+SRC_URI[platform-info-2.1.0.sha256sum] = "9368d62437c8cbb7c31ee37fd8c08a7d390e09a3ff75698a674953f46705ffcb"
 SRC_URI[portable-atomic-1.13.1.sha256sum] = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 SRC_URI[portable-atomic-util-0.2.5.sha256sum] = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5"
 SRC_URI[potential_utf-0.1.4.sha256sum] = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
@@ -624,14 +655,14 @@ SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa
 SRC_URI[procfs-0.18.0.sha256sum] = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7"
 SRC_URI[procfs-core-0.18.0.sha256sum] = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405"
 SRC_URI[quote-1.0.45.sha256sum] = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
-SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+SRC_URI[r-efi-6.0.0.sha256sum] = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-SRC_URI[rand-0.9.2.sha256sum] = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+SRC_URI[rand-0.10.0.sha256sum] = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
 SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+SRC_URI[rand_chacha-0.10.0.sha256sum] = "3e6af7f3e25ded52c41df4e0b1af2d047e45896c2f3281792ed68a1c243daedb"
 SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-SRC_URI[rand_core-0.9.5.sha256sum] = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
+SRC_URI[rand_core-0.10.0.sha256sum] = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
 SRC_URI[rayon-1.11.0.sha256sum] = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 SRC_URI[rayon-core-1.13.0.sha256sum] = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 SRC_URI[redox_syscall-0.5.18.sha256sum] = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
@@ -642,11 +673,12 @@ SRC_URI[regex-lite-0.1.9.sha256sum] = "cab834c73d247e67f4fae452806d17d3c7501756d
 SRC_URI[regex-syntax-0.8.9.sha256sum] = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
 SRC_URI[relative-path-1.9.3.sha256sum] = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 SRC_URI[rlimit-0.11.0.sha256sum] = "f35ee2729c56bb610f6dba436bf78135f728b7373bdffae2ec815b2d3eb98cc3"
-SRC_URI[roff-0.2.2.sha256sum] = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3"
+SRC_URI[roff-1.1.0.sha256sum] = "dbf2048e0e979efb2ca7b91c4f1a8d77c91853e9b987c94c555668a8994915ad"
 SRC_URI[rstest-0.26.1.sha256sum] = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49"
 SRC_URI[rstest_macros-0.26.1.sha256sum] = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0"
+SRC_URI[rstest_reuse-0.7.0.sha256sum] = "b3a8fb4672e840a587a66fc577a5491375df51ddb88f2a2c2a792598c326fe14"
 SRC_URI[rust-ini-0.21.3.sha256sum] = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7"
-SRC_URI[rustc-hash-2.1.1.sha256sum] = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+SRC_URI[rustc-hash-2.1.2.sha256sum] = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
 SRC_URI[rustc_version-0.4.1.sha256sum] = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 SRC_URI[rustix-1.1.4.sha256sum] = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 SRC_URI[rustversion-1.0.22.sha256sum] = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
@@ -670,7 +702,7 @@ SRC_URI[signal-hook-registry-1.4.8.sha256sum] = "c4db69cba1110affc0e9f7bcd48bbf8
 SRC_URI[simd-adler32-0.3.8.sha256sum] = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 SRC_URI[siphasher-1.0.2.sha256sum] = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
 SRC_URI[slab-0.4.12.sha256sum] = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
-SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860"
+SRC_URI[sm3-0.5.0.sha256sum] = "da6a89ba31723d185fd7413b98c576a575f356d9b84729d8ecb6ead60000a5b6"
 SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 SRC_URI[smawk-0.3.2.sha256sum] = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 SRC_URI[socket2-0.6.2.sha256sum] = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
@@ -682,8 +714,8 @@ SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70
 SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 SRC_URI[synstructure-0.13.2.sha256sum] = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-SRC_URI[tempfile-3.26.0.sha256sum] = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0"
+SRC_URI[tempfile-3.27.0.sha256sum] = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
-SRC_URI[terminal_size-0.4.3.sha256sum] = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
+SRC_URI[terminal_size-0.4.4.sha256sum] = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874"
 SRC_URI[textwrap-0.16.2.sha256sum] = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
 SRC_URI[thiserror-1.0.69.sha256sum] = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 SRC_URI[thiserror-2.0.18.sha256sum] = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
@@ -693,7 +725,7 @@ SRC_URI[time-0.3.47.sha256sum] = "743bd48c283afc0388f9b8827b976905fb217ad9e647fa
 SRC_URI[time-core-0.1.8.sha256sum] = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 SRC_URI[time-macros-0.2.27.sha256sum] = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
 SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-SRC_URI[tinystr-0.8.2.sha256sum] = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+SRC_URI[tinystr-0.8.3.sha256sum] = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
 SRC_URI[toml_datetime-0.7.5+spec-1.1.0.sha256sum] = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
 SRC_URI[toml_edit-0.23.10+spec-1.0.0.sha256sum] = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
 SRC_URI[toml_parser-1.0.6+spec-1.1.0.sha256sum] = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
@@ -706,6 +738,7 @@ SRC_URI[unicode-ident-1.0.22.sha256sum] = "9312f7c4f6ff9069b165498234ce8be658059
 SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 SRC_URI[unicode-width-0.1.14.sha256sum] = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 SRC_URI[unicode-width-0.2.2.sha256sum] = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
+SRC_URI[unicode-xid-0.2.6.sha256sum] = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 SRC_URI[unindent-0.2.4.sha256sum] = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
 SRC_URI[unit-prefix-0.5.2.sha256sum] = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3"
 SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
@@ -714,16 +747,20 @@ SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa570
 SRC_URI[utmp-classic-0.1.6.sha256sum] = "e24c654e19afaa6b8f3877ece5d3bed849c2719c56f6752b18ca7da4fcc6e85a"
 SRC_URI[utmp-classic-raw-0.1.3.sha256sum] = "22c226537a3d6e01c440c1926ca0256dbee2d19b2229ede6fc4863a6493dd831"
 SRC_URI[uuid-1.20.0.sha256sum] = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
-SRC_URI[uutils_term_grid-0.7.0.sha256sum] = "fcba141ce511bad08e80b43f02976571072e1ff4286f7d628943efbd277c6361"
+SRC_URI[uutils_term_grid-0.8.0.sha256sum] = "382d49b39de4a115f203305057741126b09a615892d773a2d419a2b816e30e39"
 SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 SRC_URI[vsimd-0.8.0.sha256sum] = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
 SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 SRC_URI[wasi-0.11.1+wasi-snapshot-preview1.sha256sum] = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 SRC_URI[wasip2-1.0.2+wasi-0.2.9.sha256sum] = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+SRC_URI[wasip3-0.4.0+wasi-0.3.0-rc-2026-01-06.sha256sum] = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 SRC_URI[wasm-bindgen-0.2.108.sha256sum] = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
 SRC_URI[wasm-bindgen-macro-0.2.108.sha256sum] = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
 SRC_URI[wasm-bindgen-macro-support-0.2.108.sha256sum] = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
 SRC_URI[wasm-bindgen-shared-0.2.108.sha256sum] = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
+SRC_URI[wasm-encoder-0.244.0.sha256sum] = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+SRC_URI[wasm-metadata-0.244.0.sha256sum] = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+SRC_URI[wasmparser-0.244.0.sha256sum] = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 SRC_URI[web-time-1.1.0.sha256sum] = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1"
 SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
@@ -759,13 +796,18 @@ SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661
 SRC_URI[windows_x86_64_msvc-0.53.1.sha256sum] = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 SRC_URI[winnow-0.7.14.sha256sum] = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
 SRC_URI[wit-bindgen-0.51.0.sha256sum] = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+SRC_URI[wit-bindgen-core-0.51.0.sha256sum] = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+SRC_URI[wit-bindgen-rust-0.51.0.sha256sum] = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+SRC_URI[wit-bindgen-rust-macro-0.51.0.sha256sum] = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+SRC_URI[wit-component-0.244.0.sha256sum] = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+SRC_URI[wit-parser-0.244.0.sha256sum] = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
 SRC_URI[writeable-0.6.2.sha256sum] = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
 SRC_URI[xattr-1.6.1.sha256sum] = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
 SRC_URI[yansi-1.0.1.sha256sum] = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-SRC_URI[yoke-0.8.1.sha256sum] = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+SRC_URI[yoke-0.8.2.sha256sum] = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
-SRC_URI[yoke-derive-0.8.1.sha256sum] = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+SRC_URI[yoke-derive-0.8.2.sha256sum] = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 SRC_URI[z85-3.0.7.sha256sum] = "c6e61e59a957b7ccee15d2049f86e8bfd6f66968fcd88f018950662d9b86e675"
 SRC_URI[zerocopy-0.7.35.sha256sum] = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 SRC_URI[zerocopy-0.8.39.sha256sum] = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a"
@@ -773,10 +815,10 @@ SRC_URI[zerocopy-derive-0.7.35.sha256sum] = "fa4f8080344d4671fb4e831a13ad1e68092
 SRC_URI[zerocopy-derive-0.8.39.sha256sum] = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
 SRC_URI[zerofrom-0.1.6.sha256sum] = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 SRC_URI[zerofrom-derive-0.1.6.sha256sum] = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
-SRC_URI[zerotrie-0.2.3.sha256sum] = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+SRC_URI[zerotrie-0.2.4.sha256sum] = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
-SRC_URI[zerovec-0.11.5.sha256sum] = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+SRC_URI[zerovec-0.11.6.sha256sum] = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
-SRC_URI[zerovec-derive-0.11.2.sha256sum] = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+SRC_URI[zerovec-derive-0.11.3.sha256sum] = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
-SRC_URI[zip-8.2.0.sha256sum] = "b680f2a0cd479b4cff6e1233c483fdead418106eae419dc60200ae9850f6d004"
+SRC_URI[zip-8.5.0.sha256sum] = "2726508a48f38dceb22b35ecbbd2430efe34ff05c62bd3285f965d7911b33464"
 SRC_URI[zlib-rs-0.6.0.sha256sum] = "a7948af682ccbc3342b6e9420e8c51c1fe5d7bf7756002b4a3c6cabfe96a7e3c"
 SRC_URI[zmij-1.0.19.sha256sum] = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"
 SRC_URI[zopfli-0.8.3.sha256sum] = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
@@ -790,6 +832,7 @@ SRC_URI += " \
    crate://crates.io/anstyle-parse/0.2.7 \
    crate://crates.io/anstyle-query/1.1.5 \
    crate://crates.io/anstyle-wincon/3.0.11 \
+    crate://crates.io/anyhow/1.0.102 \
    crate://crates.io/arbitrary/1.4.2 \
    crate://crates.io/arrayref/0.3.9 \
    crate://crates.io/arrayvec/0.7.6 \
@@ -801,6 +844,7 @@ SRC_URI += " \
    crate://crates.io/blake2b_simd/1.0.4 \
    crate://crates.io/blake3/1.8.3 \
    crate://crates.io/block-buffer/0.10.4 \
+    crate://crates.io/block-buffer/0.12.0 \
    crate://crates.io/block2/0.6.2 \
    crate://crates.io/bstr/1.12.1 \
    crate://crates.io/bumpalo/3.19.1 \
@@ -809,19 +853,22 @@ SRC_URI += " \
    crate://crates.io/cc/1.2.55 \
    crate://crates.io/cfg-if/1.0.4 \
    crate://crates.io/cfg_aliases/0.2.1 \
+    crate://crates.io/chacha20/0.10.0 \
    crate://crates.io/chrono/0.4.43 \
    crate://crates.io/clap/4.5.57 \
    crate://crates.io/clap_builder/4.5.57 \
    crate://crates.io/clap_lex/0.7.7 \
    crate://crates.io/colorchoice/1.0.4 \
    crate://crates.io/compare/0.1.0 \
-    crate://crates.io/console/0.16.2 \
+    crate://crates.io/console/0.16.3 \
+    crate://crates.io/const-oid/0.10.2 \
    crate://crates.io/const-random/0.1.18 \
    crate://crates.io/const-random-macro/0.1.16 \
    crate://crates.io/constant_time_eq/0.4.2 \
    crate://crates.io/core-foundation-sys/0.8.7 \
    crate://crates.io/core_maths/0.1.1 \
    crate://crates.io/cpufeatures/0.2.17 \
+    crate://crates.io/cpufeatures/0.3.0 \
    crate://crates.io/crc-fast/1.10.0 \
    crate://crates.io/crc32fast/1.5.0 \
    crate://crates.io/crossbeam-deque/0.8.6 \
@@ -829,17 +876,20 @@ SRC_URI += " \
    crate://crates.io/crossbeam-utils/0.8.21 \
    crate://crates.io/crunchy/0.2.4 \
    crate://crates.io/crypto-common/0.1.7 \
-    crate://crates.io/ctrlc/3.5.1 \
+    crate://crates.io/crypto-common/0.2.1 \
+    crate://crates.io/ctrlc/3.5.2 \
    crate://crates.io/data-encoding/2.10.0 \
    crate://crates.io/data-encoding-macro/0.1.19 \
    crate://crates.io/data-encoding-macro-internal/0.1.17 \
    crate://crates.io/digest/0.10.7 \
+    crate://crates.io/digest/0.11.2 \
    crate://crates.io/dispatch2/0.3.0 \
    crate://crates.io/displaydoc/0.2.5 \
    crate://crates.io/dlv-list/0.5.2 \
    crate://crates.io/dunce/1.0.5 \
    crate://crates.io/either/1.15.0 \
    crate://crates.io/encode_unicode/1.0.0 \
+    crate://crates.io/equivalent/1.0.2 \
    crate://crates.io/errno/0.3.14 \
    crate://crates.io/fastrand/2.3.0 \
    crate://crates.io/find-msvc-tools/0.1.9 \
@@ -849,13 +899,19 @@ SRC_URI += " \
    crate://crates.io/fluent-bundle/0.16.0 \
    crate://crates.io/fluent-langneg/0.13.1 \
    crate://crates.io/fluent-syntax/0.12.0 \
+    crate://crates.io/foldhash/0.1.5 \
    crate://crates.io/foldhash/0.2.0 \
    crate://crates.io/generic-array/0.14.7 \
    crate://crates.io/getrandom/0.2.17 \
    crate://crates.io/getrandom/0.3.4 \
+    crate://crates.io/getrandom/0.4.1 \
    crate://crates.io/glob/0.3.3 \
    crate://crates.io/hashbrown/0.14.5 \
+    crate://crates.io/hashbrown/0.15.5 \
+    crate://crates.io/hashbrown/0.16.1 \
+    crate://crates.io/heck/0.5.0 \
    crate://crates.io/hex/0.4.3 \
+    crate://crates.io/hybrid-array/0.4.8 \
    crate://crates.io/iana-time-zone/0.1.65 \
    crate://crates.io/iana-time-zone-haiku/0.1.2 \
    crate://crates.io/icu_calendar/2.1.1 \
@@ -880,11 +936,13 @@ SRC_URI += " \
    crate://crates.io/icu_provider/2.1.1 \
    crate://crates.io/icu_time/2.1.1 \
    crate://crates.io/icu_time_data/2.1.1 \
+    crate://crates.io/id-arena/2.3.0 \
+    crate://crates.io/indexmap/2.13.0 \
    crate://crates.io/intl-memoizer/0.5.3 \
    crate://crates.io/intl_pluralrules/7.0.2 \
    crate://crates.io/is_terminal_polyfill/1.70.2 \
    crate://crates.io/itertools/0.14.0 \
-    crate://crates.io/ixdtf/0.6.4 \
+    crate://crates.io/itoa/1.0.17 \
    crate://crates.io/jiff/0.2.19 \
    crate://crates.io/jiff-icu/0.2.2 \
    crate://crates.io/jiff-static/0.2.19 \
@@ -893,6 +951,7 @@ SRC_URI += " \
    crate://crates.io/jobserver/0.1.34 \
    crate://crates.io/js-sys/0.3.85 \
    crate://crates.io/keccak/0.1.6 \
+    crate://crates.io/leb128fmt/0.1.0 \
    crate://crates.io/libc/0.2.182 \
    crate://crates.io/libfuzzer-sys/0.4.12 \
    crate://crates.io/libm/0.2.16 \
@@ -902,7 +961,7 @@ SRC_URI += " \
    crate://crates.io/md-5/0.10.6 \
    crate://crates.io/memchr/2.8.0 \
    crate://crates.io/miniz_oxide/0.8.9 \
-    crate://crates.io/nix/0.30.1 \
+    crate://crates.io/nix/0.31.2 \
    crate://crates.io/nom/8.0.0 \
    crate://crates.io/num-bigint/0.4.6 \
    crate://crates.io/num-integer/0.1.46 \
@@ -922,14 +981,17 @@ SRC_URI += " \
    crate://crates.io/portable-atomic-util/0.2.5 \
    crate://crates.io/potential_utf/0.1.4 \
    crate://crates.io/ppv-lite86/0.2.21 \
+    crate://crates.io/prettyplease/0.2.37 \
    crate://crates.io/proc-macro2/1.0.106 \
    crate://crates.io/procfs/0.18.0 \
    crate://crates.io/procfs-core/0.18.0 \
    crate://crates.io/quote/1.0.44 \
    crate://crates.io/r-efi/5.3.0 \
    crate://crates.io/rand/0.9.2 \
+    crate://crates.io/rand/0.10.0 \
    crate://crates.io/rand_chacha/0.9.0 \
    crate://crates.io/rand_core/0.9.5 \
+    crate://crates.io/rand_core/0.10.0 \
    crate://crates.io/rayon/1.11.0 \
    crate://crates.io/rayon-core/1.13.0 \
    crate://crates.io/regex/1.12.3 \
@@ -940,23 +1002,25 @@ SRC_URI += " \
    crate://crates.io/rustix/1.1.4 \
    crate://crates.io/rustversion/1.0.22 \
    crate://crates.io/self_cell/1.2.2 \
+    crate://crates.io/semver/1.0.27 \
    crate://crates.io/serde/1.0.228 \
    crate://crates.io/serde_core/1.0.228 \
    crate://crates.io/serde_derive/1.0.228 \
+    crate://crates.io/serde_json/1.0.149 \
    crate://crates.io/sha1/0.10.6 \
    crate://crates.io/sha2/0.10.9 \
    crate://crates.io/sha3/0.10.8 \
    crate://crates.io/shlex/1.3.0 \
    crate://crates.io/simd-adler32/0.3.8 \
-    crate://crates.io/similar/2.7.0 \
+    crate://crates.io/similar/3.0.0 \
-    crate://crates.io/sm3/0.4.2 \
+    crate://crates.io/sm3/0.5.0 \
    crate://crates.io/smallvec/1.15.1 \
    crate://crates.io/spin/0.10.0 \
    crate://crates.io/stable_deref_trait/1.2.1 \
    crate://crates.io/strsim/0.11.1 \
    crate://crates.io/syn/2.0.114 \
    crate://crates.io/synstructure/0.13.2 \
-    crate://crates.io/tempfile/3.26.0 \
+    crate://crates.io/tempfile/3.27.0 \
    crate://crates.io/terminal_size/0.4.3 \
    crate://crates.io/thiserror/2.0.18 \
    crate://crates.io/thiserror-impl/2.0.18 \
@@ -968,6 +1032,7 @@ SRC_URI += " \
    crate://crates.io/unic-langid-impl/0.9.6 \
    crate://crates.io/unicode-ident/1.0.22 \
    crate://crates.io/unicode-width/0.2.2 \
+    crate://crates.io/unicode-xid/0.2.6 \
    crate://crates.io/unit-prefix/0.5.2 \
    crate://crates.io/utf16_iter/1.0.5 \
    crate://crates.io/utf8_iter/1.0.4 \
@@ -976,10 +1041,14 @@ SRC_URI += " \
    crate://crates.io/vsimd/0.8.0 \
    crate://crates.io/wasi/0.11.1+wasi-snapshot-preview1 \
    crate://crates.io/wasip2/1.0.2+wasi-0.2.9 \
+    crate://crates.io/wasip3/0.4.0+wasi-0.3.0-rc-2026-01-06 \
    crate://crates.io/wasm-bindgen/0.2.108 \
    crate://crates.io/wasm-bindgen-macro/0.2.108 \
    crate://crates.io/wasm-bindgen-macro-support/0.2.108 \
    crate://crates.io/wasm-bindgen-shared/0.2.108 \
+    crate://crates.io/wasm-encoder/0.244.0 \
+    crate://crates.io/wasm-metadata/0.244.0 \
+    crate://crates.io/wasmparser/0.244.0 \
    crate://crates.io/wild/2.2.1 \
    crate://crates.io/winapi-util/0.1.11 \
    crate://crates.io/windows-core/0.62.2 \
@@ -1001,6 +1070,11 @@ SRC_URI += " \
    crate://crates.io/windows_x86_64_msvc/0.53.1 \
    crate://crates.io/winnow/0.7.14 \
    crate://crates.io/wit-bindgen/0.51.0 \
+    crate://crates.io/wit-bindgen-core/0.51.0 \
+    crate://crates.io/wit-bindgen-rust/0.51.0 \
+    crate://crates.io/wit-bindgen-rust-macro/0.51.0 \
+    crate://crates.io/wit-component/0.244.0 \
+    crate://crates.io/wit-parser/0.244.0 \
    crate://crates.io/write16/1.0.0 \
    crate://crates.io/writeable/0.6.2 \
    crate://crates.io/yoke/0.8.1 \
@@ -1013,6 +1087,7 @@ SRC_URI += " \
    crate://crates.io/zerotrie/0.2.3 \
    crate://crates.io/zerovec/0.11.5 \
    crate://crates.io/zerovec-derive/0.11.2 \
+    crate://crates.io/zmij/1.0.21 \
 "
 SRC_URI[adler2-2.0.1.sha256sum] = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
@@ -1023,6 +1098,7 @@ SRC_URI[anstyle-1.0.13.sha256sum] = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfe
 SRC_URI[anstyle-parse-0.2.7.sha256sum] = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 SRC_URI[anstyle-query-1.1.5.sha256sum] = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 SRC_URI[anstyle-wincon-3.0.11.sha256sum] = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
+SRC_URI[anyhow-1.0.102.sha256sum] = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 SRC_URI[arbitrary-1.4.2.sha256sum] = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
 SRC_URI[arrayref-0.3.9.sha256sum] = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 SRC_URI[arrayvec-0.7.6.sha256sum] = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
@@ -1034,6 +1110,7 @@ SRC_URI[bitflags-2.10.0.sha256sum] = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acf
 SRC_URI[blake2b_simd-1.0.4.sha256sum] = "b79834656f71332577234b50bfc009996f7449e0c056884e6a02492ded0ca2f3"
 SRC_URI[blake3-1.8.3.sha256sum] = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d"
 SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+SRC_URI[block-buffer-0.12.0.sha256sum] = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
 SRC_URI[block2-0.6.2.sha256sum] = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 SRC_URI[bstr-1.12.1.sha256sum] = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
 SRC_URI[bumpalo-3.19.1.sha256sum] = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
@@ -1042,19 +1119,22 @@ SRC_URI[calendrical_calculations-0.2.3.sha256sum] = "3a0b39595c6ee54a8d0900204ba
 SRC_URI[cc-1.2.55.sha256sum] = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29"
 SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+SRC_URI[chacha20-0.10.0.sha256sum] = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
 SRC_URI[chrono-0.4.43.sha256sum] = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
 SRC_URI[clap-4.5.57.sha256sum] = "6899ea499e3fb9305a65d5ebf6e3d2248c5fab291f300ad0a704fbe142eae31a"
 SRC_URI[clap_builder-4.5.57.sha256sum] = "7b12c8b680195a62a8364d16b8447b01b6c2c8f9aaf68bee653be34d4245e238"
 SRC_URI[clap_lex-0.7.7.sha256sum] = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
 SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3"
-SRC_URI[console-0.16.2.sha256sum] = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4"
+SRC_URI[console-0.16.3.sha256sum] = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87"
+SRC_URI[const-oid-0.10.2.sha256sum] = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
 SRC_URI[const-random-0.1.18.sha256sum] = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
 SRC_URI[const-random-macro-0.1.16.sha256sum] = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
 SRC_URI[constant_time_eq-0.4.2.sha256sum] = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
 SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 SRC_URI[core_maths-0.1.1.sha256sum] = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30"
 SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+SRC_URI[cpufeatures-0.3.0.sha256sum] = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
 SRC_URI[crc-fast-1.10.0.sha256sum] = "e75b2483e97a5a7da73ac68a05b629f9c53cff58d8ed1c77866079e18b00dba5"
 SRC_URI[crc32fast-1.5.0.sha256sum] = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
@@ -1062,17 +1142,20 @@ SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5
 SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 SRC_URI[crunchy-0.2.4.sha256sum] = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 SRC_URI[crypto-common-0.1.7.sha256sum] = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
-SRC_URI[ctrlc-3.5.1.sha256sum] = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790"
+SRC_URI[crypto-common-0.2.1.sha256sum] = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710"
+SRC_URI[ctrlc-3.5.2.sha256sum] = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162"
 SRC_URI[data-encoding-2.10.0.sha256sum] = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
 SRC_URI[data-encoding-macro-0.1.19.sha256sum] = "8142a83c17aa9461d637e649271eae18bf2edd00e91f2e105df36c3c16355bdb"
 SRC_URI[data-encoding-macro-internal-0.1.17.sha256sum] = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de"
 SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+SRC_URI[digest-0.11.2.sha256sum] = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c"
 SRC_URI[dispatch2-0.3.0.sha256sum] = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
 SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 SRC_URI[dlv-list-0.5.2.sha256sum] = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
 SRC_URI[dunce-1.0.5.sha256sum] = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 SRC_URI[encode_unicode-1.0.0.sha256sum] = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+SRC_URI[equivalent-1.0.2.sha256sum] = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 SRC_URI[errno-0.3.14.sha256sum] = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 SRC_URI[find-msvc-tools-0.1.9.sha256sum] = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
@@ -1082,13 +1165,19 @@ SRC_URI[fluent-0.17.0.sha256sum] = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f1
 SRC_URI[fluent-bundle-0.16.0.sha256sum] = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4"
 SRC_URI[fluent-langneg-0.13.1.sha256sum] = "7eebbe59450baee8282d71676f3bfed5689aeab00b27545e83e5f14b1195e8b0"
 SRC_URI[fluent-syntax-0.12.0.sha256sum] = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198"
+SRC_URI[foldhash-0.1.5.sha256sum] = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 SRC_URI[foldhash-0.2.0.sha256sum] = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 SRC_URI[getrandom-0.2.17.sha256sum] = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 SRC_URI[getrandom-0.3.4.sha256sum] = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+SRC_URI[getrandom-0.4.1.sha256sum] = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec"
 SRC_URI[glob-0.3.3.sha256sum] = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+SRC_URI[hashbrown-0.15.5.sha256sum] = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+SRC_URI[hashbrown-0.16.1.sha256sum] = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+SRC_URI[hybrid-array-0.4.8.sha256sum] = "8655f91cd07f2b9d0c24137bd650fe69617773435ee5ec83022377777ce65ef1"
 SRC_URI[iana-time-zone-0.1.65.sha256sum] = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 SRC_URI[icu_calendar-2.1.1.sha256sum] = "d6f0e52e009b6b16ba9c0693578796f2dd4aaa59a7f8f920423706714a89ac4e"
@@ -1113,11 +1202,13 @@ SRC_URI[icu_properties_data-2.1.2.sha256sum] = "616c294cf8d725c6afcd8f55abc17c56
 SRC_URI[icu_provider-2.1.1.sha256sum] = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 SRC_URI[icu_time-2.1.1.sha256sum] = "8242b00da3b3b6678f731437a11c8833a43c821ae081eca60ba1b7579d45b6d8"
 SRC_URI[icu_time_data-2.1.1.sha256sum] = "3e10b0e5e87a2c84bd5fa407705732052edebe69291d347d0c3033785470edbf"
+SRC_URI[id-arena-2.3.0.sha256sum] = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+SRC_URI[indexmap-2.13.0.sha256sum] = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 SRC_URI[intl-memoizer-0.5.3.sha256sum] = "310da2e345f5eb861e7a07ee182262e94975051db9e4223e909ba90f392f163f"
 SRC_URI[intl_pluralrules-7.0.2.sha256sum] = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972"
 SRC_URI[is_terminal_polyfill-1.70.2.sha256sum] = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 SRC_URI[itertools-0.14.0.sha256sum] = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
-SRC_URI[ixdtf-0.6.4.sha256sum] = "84de9d95a6d2547d9b77ee3f25fa0ee32e3c3a6484d47a55adebc0439c077992"
+SRC_URI[itoa-1.0.17.sha256sum] = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 SRC_URI[jiff-0.2.19.sha256sum] = "d89a5b5e10d5a9ad6e5d1f4bd58225f655d6fe9767575a5e8ac5a6fe64e04495"
 SRC_URI[jiff-icu-0.2.2.sha256sum] = "0e67c2beaae8b10a82d849b9aabb698a43a682f32b17bcdc035d5ecadb44d646"
 SRC_URI[jiff-static-0.2.19.sha256sum] = "ff7a39c8862fc1369215ccf0a8f12dd4598c7f6484704359f0351bd617034dbf"
@@ -1126,6 +1217,7 @@ SRC_URI[jiff-tzdb-platform-0.1.3.sha256sum] = "875a5a69ac2bab1a891711cf5eccbec1c
 SRC_URI[jobserver-0.1.34.sha256sum] = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 SRC_URI[js-sys-0.3.85.sha256sum] = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
 SRC_URI[keccak-0.1.6.sha256sum] = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653"
+SRC_URI[leb128fmt-0.1.0.sha256sum] = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 SRC_URI[libc-0.2.182.sha256sum] = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
 SRC_URI[libfuzzer-sys-0.4.12.sha256sum] = "f12a681b7dd8ce12bff52488013ba614b869148d54dd79836ab85aafdd53f08d"
 SRC_URI[libm-0.2.16.sha256sum] = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
@@ -1135,7 +1227,7 @@ SRC_URI[log-0.4.29.sha256sum] = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a659083
 SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 SRC_URI[memchr-2.8.0.sha256sum] = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 SRC_URI[miniz_oxide-0.8.9.sha256sum] = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+SRC_URI[nix-0.31.2.sha256sum] = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
 SRC_URI[nom-8.0.0.sha256sum] = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
 SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
@@ -1155,14 +1247,17 @@ SRC_URI[portable-atomic-1.13.1.sha256sum] = "c33a9471896f1c69cecef8d20cbe2f7accd
 SRC_URI[portable-atomic-util-0.2.5.sha256sum] = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5"
 SRC_URI[potential_utf-0.1.4.sha256sum] = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
 SRC_URI[ppv-lite86-0.2.21.sha256sum] = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+SRC_URI[prettyplease-0.2.37.sha256sum] = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 SRC_URI[procfs-0.18.0.sha256sum] = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7"
 SRC_URI[procfs-core-0.18.0.sha256sum] = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405"
 SRC_URI[quote-1.0.44.sha256sum] = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
 SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 SRC_URI[rand-0.9.2.sha256sum] = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+SRC_URI[rand-0.10.0.sha256sum] = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
 SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 SRC_URI[rand_core-0.9.5.sha256sum] = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
+SRC_URI[rand_core-0.10.0.sha256sum] = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
 SRC_URI[rayon-1.11.0.sha256sum] = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 SRC_URI[rayon-core-1.13.0.sha256sum] = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 SRC_URI[regex-1.12.3.sha256sum] = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
@@ -1173,23 +1268,25 @@ SRC_URI[rustc-hash-2.1.1.sha256sum] = "357703d41365b4b27c590e3ed91eabb1b663f07c4
 SRC_URI[rustix-1.1.4.sha256sum] = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 SRC_URI[rustversion-1.0.22.sha256sum] = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 SRC_URI[self_cell-1.2.2.sha256sum] = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89"
+SRC_URI[semver-1.0.27.sha256sum] = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+SRC_URI[serde_json-1.0.149.sha256sum] = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 SRC_URI[simd-adler32-0.3.8.sha256sum] = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
-SRC_URI[similar-2.7.0.sha256sum] = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
+SRC_URI[similar-3.0.0.sha256sum] = "26d0b06eba54f0ca0770f970a3e89823e766ca638dd940f8469fa0fa50c75396"
-SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860"
+SRC_URI[sm3-0.5.0.sha256sum] = "da6a89ba31723d185fd7413b98c576a575f356d9b84729d8ecb6ead60000a5b6"
 SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 SRC_URI[spin-0.10.0.sha256sum] = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
 SRC_URI[stable_deref_trait-1.2.1.sha256sum] = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 SRC_URI[synstructure-0.13.2.sha256sum] = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
-SRC_URI[tempfile-3.26.0.sha256sum] = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0"
+SRC_URI[tempfile-3.27.0.sha256sum] = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 SRC_URI[terminal_size-0.4.3.sha256sum] = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
 SRC_URI[thiserror-2.0.18.sha256sum] = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 SRC_URI[thiserror-impl-2.0.18.sha256sum] = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
@@ -1201,6 +1298,7 @@ SRC_URI[unic-langid-0.9.6.sha256sum] = "a28ba52c9b05311f4f6e62d5d9d46f094bd6e84c
 SRC_URI[unic-langid-impl-0.9.6.sha256sum] = "dce1bf08044d4b7a94028c93786f8566047edc11110595914de93362559bc658"
 SRC_URI[unicode-ident-1.0.22.sha256sum] = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 SRC_URI[unicode-width-0.2.2.sha256sum] = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
+SRC_URI[unicode-xid-0.2.6.sha256sum] = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 SRC_URI[unit-prefix-0.5.2.sha256sum] = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3"
 SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
 SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
@@ -1209,10 +1307,14 @@ SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5
 SRC_URI[vsimd-0.8.0.sha256sum] = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
 SRC_URI[wasi-0.11.1+wasi-snapshot-preview1.sha256sum] = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 SRC_URI[wasip2-1.0.2+wasi-0.2.9.sha256sum] = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+SRC_URI[wasip3-0.4.0+wasi-0.3.0-rc-2026-01-06.sha256sum] = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 SRC_URI[wasm-bindgen-0.2.108.sha256sum] = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
 SRC_URI[wasm-bindgen-macro-0.2.108.sha256sum] = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
 SRC_URI[wasm-bindgen-macro-support-0.2.108.sha256sum] = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
 SRC_URI[wasm-bindgen-shared-0.2.108.sha256sum] = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
+SRC_URI[wasm-encoder-0.244.0.sha256sum] = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+SRC_URI[wasm-metadata-0.244.0.sha256sum] = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+SRC_URI[wasmparser-0.244.0.sha256sum] = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1"
 SRC_URI[winapi-util-0.1.11.sha256sum] = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 SRC_URI[windows-core-0.62.2.sha256sum] = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
@@ -1234,6 +1336,11 @@ SRC_URI[windows_x86_64_gnullvm-0.53.1.sha256sum] = "0ffa179e2d07eee8ad8f57493436
 SRC_URI[windows_x86_64_msvc-0.53.1.sha256sum] = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 SRC_URI[winnow-0.7.14.sha256sum] = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
 SRC_URI[wit-bindgen-0.51.0.sha256sum] = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+SRC_URI[wit-bindgen-core-0.51.0.sha256sum] = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+SRC_URI[wit-bindgen-rust-0.51.0.sha256sum] = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+SRC_URI[wit-bindgen-rust-macro-0.51.0.sha256sum] = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+SRC_URI[wit-component-0.244.0.sha256sum] = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+SRC_URI[wit-parser-0.244.0.sha256sum] = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
 SRC_URI[writeable-0.6.2.sha256sum] = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 SRC_URI[yoke-0.8.1.sha256sum] = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
@@ -1246,3 +1353,4 @@ SRC_URI[zerofrom-derive-0.1.6.sha256sum] = "d71e5d6e06ab090c67b5e44993ec16b72dcb
 SRC_URI[zerotrie-0.2.3.sha256sum] = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
 SRC_URI[zerovec-0.11.5.sha256sum] = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 SRC_URI[zerovec-derive-0.11.2.sha256sum] = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+SRC_URI[zmij-1.0.21.sha256sum] = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.7.0.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.8.0.bb
index 5103d86e92..8b9b4dc199 100644
--- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.7.0.bb
+++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.8.0.bb
@@ -11,7 +11,7 @@ SRC_URI = " \
    git://github.com/uutils/coreutils.git;protocol=https;branch=main;tag=${PV} \
 "
-SRCREV = "995c9e04a6cc34a3a95b23a26fa59ae87e7744bd"
+SRCREV = "c4093734e2ebe2efb7d65e216cd1444664bcf26a"
 require ${BPN}-crates.inc
diff --git a/meta-oe/recipes-crypto/botan/botan_3.11.0.bb b/meta-oe/recipes-crypto/botan/botan_3.11.1.bb
index e60d826459..2d6b64ad64 100644
--- a/meta-oe/recipes-crypto/botan/botan_3.11.0.bb
+++ b/meta-oe/recipes-crypto/botan/botan_3.11.1.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
 SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz \
           file://run-ptest"
-SRC_URI[sha256sum] = "e8dd48556818da2c03a9a30932ad05db9e50b12fec90809301ecc64ea51bd11e"
+SRC_URI[sha256sum] = "c1cd7152519f4188591fa4f6ddeb116bc1004491f5f3c58aa99b00582eb8a137"
 S = "${UNPACKDIR}/Botan-${PV}"
@@ -65,3 +65,6 @@ FILES:${PN}-test = "${bindir}/botan-test  ${datadir}/${PN}/tests/data"
 COMPATIBLE_HOST:riscv32 = "null"
 BBCLASSEXTEND = "native nativesdk"
+CVE_STATUS[CVE-2026-32877] = "fixed-version: fixed since 3.11.0"
+CVE_STATUS[CVE-2026-32883] = "fixed-version: fixed since 3.11.0"
diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.4.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.6.bb
index 34755fc3ad..c74b7a1f35 100644
--- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.4.bb
+++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.6.bb
@@ -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] = "443e46f8964c9acc780f455afbb8e23aa0e8ed7ec504cfc59e04f406fa1e8a83"
+SRC_URI[sha256sum] = "8004265fd993885d08f7b633dbe056851de1a210307613a4ebddc743fccefe5a"
 inherit autotools gettext pkgconfig
diff --git a/meta-oe/recipes-crypto/leancrypto/leancrypto_1.7.0.bb b/meta-oe/recipes-crypto/leancrypto/leancrypto_1.7.2.bb
index 7c9187ab94..4c42b77490 100644
--- a/meta-oe/recipes-crypto/leancrypto/leancrypto_1.7.0.bb
+++ b/meta-oe/recipes-crypto/leancrypto/leancrypto_1.7.2.bb
@@ -14,11 +14,12 @@ SECTION = "libs"
 SRC_URI = "git://github.com/smuellerDD/leancrypto.git;branch=master;protocol=https;tag=v${PV} \
           file://leancrypto-tests.sh \
           "
-# SRCREV tagged v1.7.0
+SRCREV = "8a3e942baa3388ec9597c35005264ef9aefbf97c"
-SRCREV = "e60fba94e8cabf1661a1da488b78b84a4fba56e9"
 inherit pkgconfig meson
+CVE_STATUS[CVE-2026-34610] = "fixed-version: fixed since v1.7.1"
 EXTRA_OEMESON = "-Dstrip=false"
 TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}"
diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb
index 7d27081964..532c9e29df 100644
--- a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb
+++ b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb
@@ -9,6 +9,8 @@ SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https
 inherit autotools
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[testapp] = "--enable-kcapi-test,,,bash"
 PACKAGECONFIG[apps] = "--enable-kcapi-speed --enable-kcapi-hasher --enable-kcapi-rngapp --enable-kcapi-encapp --enable-kcapi-dgstapp,,,"
diff --git a/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb b/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
index c55a01d3b9..fca29eed05 100644
--- a/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
+++ b/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
@@ -16,6 +16,8 @@ UPSTREAM_CHECK_REGEX = "Libmcrypt/(?P<pver>\d+(\.\d+)+)/"
 inherit autotools-brokensep gettext binconfig multilib_script
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 CFLAGS += "-Wno-error=implicit-int"
 do_configure() {
diff --git a/meta-oe/recipes-crypto/libsodium/libsodium/0001-Fix-compilation-with-GCC-on-aarch64.patch b/meta-oe/recipes-crypto/libsodium/libsodium/0001-Fix-compilation-with-GCC-on-aarch64.patch
deleted file mode 100644
index c5c0d12b87..0000000000
--- a/meta-oe/recipes-crypto/libsodium/libsodium/0001-Fix-compilation-with-GCC-on-aarch64.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From fc66d1bd0d3db6392424a1fd10dcf4343ce72c52 Mon Sep 17 00:00:00 2001
-From: Frank Denis <github@pureftpd.org>
-Date: Wed, 7 Jan 2026 12:00:49 +0100
-Subject: [PATCH] Fix compilation with GCC on aarch64
-Use unsigned NEON intrinsics everywhere
-Fixes #1502
-Upstream-Status: Backport [https://github.com/jedisct1/libsodium/commit/6702f69bef6044163acc7715e6ac7e430890ce78]
---
- src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-diff --git a/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c b/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c
-index c5a27e92..bad4ce38 100644
--- a/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c
-+++ b/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c
-@@ -37,7 +37,7 @@ typedef uint64x2_t BlockVec;
- #    define XOR128_3(a, b, c) veorq_u64(veorq_u64((a), (b)), (c))
- #    define SET64x2(a, b)     vsetq_lane_u64((uint64_t) (a), vmovq_n_u64((uint64_t) (b)), 1)
- #    define BYTESHL128(a, b) \
-        vreinterpretq_u64_u8(vextq_s8(vdupq_n_s8(0), vreinterpretq_s8_u64(a), 16 - (b)))
-+        vreinterpretq_u64_u8(vextq_u8(vdupq_n_u8(0), vreinterpretq_u8_u64(a), 16 - (b)))
- 
- #    define AES_XENCRYPT(block_vec, rkey) \
-         vreinterpretq_u64_u8(             \
-@@ -348,12 +348,12 @@ pfx_set_bit(uint8_t ip16[16], const unsigned int bit_index, const uint8_t bit_va
- static void
- pfx_shift_left(uint8_t ip16[16])
- {
-    BlockVec       v       = LOAD128(ip16);
-    const BlockVec shl     = vshlq_n_u8(vreinterpretq_u8_u64(v), 1);
-    const BlockVec msb     = vshrq_n_u8(vreinterpretq_u8_u64(v), 7);
-    const BlockVec zero    = vdupq_n_u8(0);
-    const BlockVec carries = vextq_u8(vreinterpretq_u8_u64(msb), zero, 1);
-    v                      = vreinterpretq_u64_u8(vorrq_u8(shl, carries));
-+    BlockVec         v       = LOAD128(ip16);
-+    const uint8x16_t shl     = vshlq_n_u8(vreinterpretq_u8_u64(v), 1);
-+    const uint8x16_t msb     = vshrq_n_u8(vreinterpretq_u8_u64(v), 7);
-+    const uint8x16_t zero    = vdupq_n_u8(0);
-+    const uint8x16_t carries = vextq_u8(msb, zero, 1);
-+    v                        = vreinterpretq_u64_u8(vorrq_u8(shl, carries));
-     STORE128(ip16, v);
- }
- 
-- 
-2.47.3
diff --git a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.21.bb b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.22.bb
index a1647d2a30..fbd14a8181 100644
--- a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.21.bb
+++ b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.22.bb
@@ -4,10 +4,8 @@ BUGTRACKER = "https://github.com/jedisct1/libsodium/issues"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4942a8ebbbc7f2212bd68a47df264a4f"
-SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz \
+SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz"
-           file://0001-Fix-compilation-with-GCC-on-aarch64.patch \
+SRC_URI[sha256sum] = "adbdd8f16149e81ac6078a03aca6fc03b592b89ef7b5ed83841c086191be3349"
-           "
-SRC_URI[sha256sum] = "9e4285c7a419e82dedb0be63a72eea357d6943bc3e28e6735bf600dd4883feaf"
 inherit autotools
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_10.10.1.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_10.10.1.bb
index cc0e887ea5..b810911b98 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_10.10.1.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_10.10.1.bb
@@ -41,6 +41,7 @@ PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib"
 PACKAGECONFIG[zstd] = "-DWITH_ZSTD=ON,-DWITH_ZSTD=OFF,zstd"
 PACKAGECONFIG[liburing] = "-DWITH_LIBURING=ON,-DWITH_LIBURING=OFF,liburing"
 PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags"
+PACKAGECONFIG[rocksdb_static] = "-DROCKSDB_BUILD_STATIC=ON, -DROCKSDB_BUILD_STATIC=OFF"
 # Tools and tests currently don't compile on armv5 so we disable them
 EXTRA_OECMAKE = "\
@@ -49,7 +50,6 @@ EXTRA_OECMAKE = "\
    -DWITH_BENCHMARK_TOOLS=OFF \
    -DWITH_TOOLS=OFF \
    -DFAIL_ON_WARNINGS=OFF \
-    -DROCKSDB_BUILD_STATIC=OFF \
 "
 CXXFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}"
diff --git a/meta-oe/recipes-devtools/b4/b4_0.15.1.bb b/meta-oe/recipes-devtools/b4/b4_0.15.2.bb
index beb8dcbd27..002f6ccfeb 100644
--- a/meta-oe/recipes-devtools/b4/b4_0.15.1.bb
+++ b/meta-oe/recipes-devtools/b4/b4_0.15.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 inherit pypi python_pep517 python_setuptools_build_meta
-SRC_URI[sha256sum] = "e48c44bb579fadabb1fc3f15bf1874afd721bc1a63fba10c96f568bc1f47ccb3"
+SRC_URI[sha256sum] = "b815f2aed2288718cfe2a14c76421a00bc4f0918ea32b45dd1645c999fdda69d"
 RDEPENDS:${PN} += " \
    python3-mailbox \
diff --git a/meta-oe/recipes-devtools/giflib/giflib_6.1.2.bb b/meta-oe/recipes-devtools/giflib/giflib_6.1.2.bb
index 77f8905358..9cb2a51879 100644
--- a/meta-oe/recipes-devtools/giflib/giflib_6.1.2.bb
+++ b/meta-oe/recipes-devtools/giflib/giflib_6.1.2.bb
@@ -26,3 +26,5 @@ FILES:${PN}-utils = "${bindir}"
 BBCLASSEXTEND = "native"
 RDEPENDS:${PN}-utils = "perl"
+CVE_STATUS[CVE-2026-23868] = "fixed-version: fixed since v6.1.2"
diff --git a/meta-oe/recipes-devtools/jq/jq/0001-Support-building-with-disable-maintainer-mode-and-so.patch b/meta-oe/recipes-devtools/jq/jq/0001-Support-building-with-disable-maintainer-mode-and-so.patch
new file mode 100644
index 0000000000..12a64a75ed
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/0001-Support-building-with-disable-maintainer-mode-and-so.patch
@@ -0,0 +1,44 @@
+From 27f417f4812e688a59fc5186b7768cec004cd6e5 Mon Sep 17 00:00:00 2001
+From: Peter Kjellerstedt <peter.kjellerstedt@gmail.com>
+Date: Wed, 8 Apr 2026 05:58:49 +0200
+Subject: [PATCH] Support building with --disable-maintainer-mode and source !=
+ build dir (#3518)
+If --disable-maintainer-mode is enabled, then the rules for generating
+parser.[ch] and lexer.[ch] did nothing. This worked fine if the source
+and build directories are the same as the pre-generated parser.c and
+lexer.c files would suffice. However, if the build directory is not the
+same as the source directory, then the rest of the Make rules expect
+parser.[ch] and lexer.[ch] to have been created in the build directory
+if their source files (parser.y and lexer.l) are newer than the target
+files, which can happen in case the source is fetched using Git.
+Avoid the problem by copying the files to the build directory if needed.
+Co-authored-by: Peter Kjellerstedt <pkj@axis.com>
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/27f417f4812e688a59fc5186b7768cec004cd6e5]
+---
+ Makefile.am | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+diff --git a/Makefile.am b/Makefile.am
+index 96d6038..acb9443 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -41,9 +41,14 @@ src/lexer.h: src/lexer.c
+ else
+ BUILT_SOURCES = src/builtin.inc src/config_opts.inc src/version.h
+ .y.c:
+-       $(AM_V_YACC) echo "NOT building parser.c!"
+       $(AM_V_YACC) [ "$(<D)" = "$(@D)" ] || cp $(<D)/$(@F) $@
+       $(AM_V_YACC) [ "$(<D)" = "$(@D)" ] || cp $(<D)/$(*F).h $*.h
+       $(AM_V_YACC) touch $@ $*.h
+
+ .l.c:
+-       $(AM_V_LEX) echo "NOT building lexer.c!"
+       $(AM_V_LEX) [ "$(<D)" = "$(@D)" ] || cp $(<D)/$(@F) $@
+       $(AM_V_LEX) [ "$(<D)" = "$(@D)" ] || cp $(<D)/$(*F).h $*.h
+       $(AM_V_LEX) touch $@ $*.h
+ endif
+ 
+ # Tell YACC (Bison) autoconf macros that you want a header file created.
diff --git a/meta-oe/recipes-devtools/jq/jq/CVE-2026-32316.patch b/meta-oe/recipes-devtools/jq/jq/CVE-2026-32316.patch
new file mode 100644
index 0000000000..1277b356d8
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/CVE-2026-32316.patch
@@ -0,0 +1,53 @@
+From 321e62b356df2d4ed47aba4f3818e447ec4d77fc Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Thu, 12 Mar 2026 20:28:43 +0900
+Subject: [PATCH] Fix heap buffer overflow in `jvp_string_append` and
+ `jvp_string_copy_replace_bad`
+In `jvp_string_append`, the allocation size `(currlen + len) * 2` could
+overflow `uint32_t` when `currlen + len` exceeds `INT_MAX`, causing a small
+allocation followed by a large `memcpy`.
+In `jvp_string_copy_replace_bad`, the output buffer size calculation
+`length * 3 + 1` could overflow `uint32_t`, again resulting in a small
+allocation followed by a large write.
+Add overflow checks to both functions to return an error for strings
+that would exceed `INT_MAX` in length. Fixes CVE-2026-32316.
+CVE: CVE-2026-32316
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/e47e56d226519635768e6aab2f38f0ab037c09e5]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/jv.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+diff --git a/src/jv.c b/src/jv.c
+index e4529a4..74be05a 100644
+--- a/src/jv.c
+++ b/src/jv.c
+@@ -1114,7 +1114,12 @@ static jv jvp_string_copy_replace_bad(const char* data, uint32_t length) {
+   const char* end = data + length;
+   const char* i = data;
+ 
+-  uint32_t maxlength = length * 3 + 1; // worst case: all bad bytes, each becomes a 3-byte U+FFFD
+  // worst case: all bad bytes, each becomes a 3-byte U+FFFD
+  uint64_t maxlength = (uint64_t)length * 3 + 1;
+  if (maxlength >= INT_MAX) {
+    return jv_invalid_with_msg(jv_string("String too long"));
+  }
+
+   jvp_string* s = jvp_string_alloc(maxlength);
+   char* out = s->data;
+   int c = 0;
+@@ -1174,6 +1179,10 @@ static uint32_t jvp_string_remaining_space(jvp_string* s) {
+ static jv jvp_string_append(jv string, const char* data, uint32_t len) {
+   jvp_string* s = jvp_string_ptr(string);
+   uint32_t currlen = jvp_string_length(s);
+  if ((uint64_t)currlen + len >= INT_MAX) {
+    jv_free(string);
+    return jv_invalid_with_msg(jv_string("String too long"));
+  }
+ 
+   if (jvp_refcnt_unshared(string.u.ptr) &&
+       jvp_string_remaining_space(s) >= len) {
diff --git a/meta-oe/recipes-devtools/jq/jq/CVE-2026-33947.patch b/meta-oe/recipes-devtools/jq/jq/CVE-2026-33947.patch
new file mode 100644
index 0000000000..69a8381f06
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/CVE-2026-33947.patch
@@ -0,0 +1,104 @@
+From 5fd935884a6f5b3d8ecdcacfc5d3982140f3a478 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Mon, 13 Apr 2026 11:23:40 +0900
+Subject: [PATCH] Limit path depth to prevent stack overflow
+Deeply nested path arrays can cause unbounded recursion in
+`jv_setpath`, `jv_getpath`, and `jv_delpaths`, leading to
+stack overflow. Add a depth limit of 10000 to match the
+existing `tojson` depth limit. This fixes CVE-2026-33947.
+CVE: CVE-2026-33947
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/fb59f1491058d58bdc3e8dd28f1773d1ac690a1f]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/jv_aux.c  | 21 +++++++++++++++++++++
+ tests/jq.test | 25 +++++++++++++++++++++++++
+ 2 files changed, 46 insertions(+)
+diff --git a/src/jv_aux.c b/src/jv_aux.c
+index bc1405f..594a21f 100644
+--- a/src/jv_aux.c
+++ b/src/jv_aux.c
+@@ -375,6 +375,10 @@ static jv jv_dels(jv t, jv keys) {
+   return t;
+ }
+ 
+#ifndef MAX_PATH_DEPTH
+#define MAX_PATH_DEPTH (10000)
+#endif
+
+ jv jv_setpath(jv root, jv path, jv value) {
+   if (jv_get_kind(path) != JV_KIND_ARRAY) {
+     jv_free(value);
+@@ -382,6 +386,12 @@ jv jv_setpath(jv root, jv path, jv value) {
+     jv_free(path);
+     return jv_invalid_with_msg(jv_string("Path must be specified as an array"));
+   }
+  if (jv_array_length(jv_copy(path)) > MAX_PATH_DEPTH) {
+    jv_free(value);
+    jv_free(root);
+    jv_free(path);
+    return jv_invalid_with_msg(jv_string("Path too deep"));
+  }
+   if (!jv_is_valid(root)){
+     jv_free(value);
+     jv_free(path);
+@@ -434,6 +444,11 @@ jv jv_getpath(jv root, jv path) {
+     jv_free(path);
+     return jv_invalid_with_msg(jv_string("Path must be specified as an array"));
+   }
+  if (jv_array_length(jv_copy(path)) > MAX_PATH_DEPTH) {
+    jv_free(root);
+    jv_free(path);
+    return jv_invalid_with_msg(jv_string("Path too deep"));
+  }
+   if (!jv_is_valid(root)) {
+     jv_free(path);
+     return root;
+@@ -511,6 +526,12 @@ jv jv_delpaths(jv object, jv paths) {
+       jv_free(elem);
+       return err;
+     }
+    if (jv_array_length(jv_copy(elem)) > MAX_PATH_DEPTH) {
+      jv_free(object);
+      jv_free(paths);
+      jv_free(elem);
+      return jv_invalid_with_msg(jv_string("Path too deep"));
+    }
+     jv_free(elem);
+   }
+   if (jv_array_length(jv_copy(paths)) == 0) {
+diff --git a/tests/jq.test b/tests/jq.test
+index 4ecf72f..6186d8b 100644
+--- a/tests/jq.test
+++ b/tests/jq.test
+@@ -2507,3 +2507,28 @@ strflocaltime("" | ., @uri)
+ 0
+ ""
+ ""
+
+# regression test for CVE-2026-33947
+setpath([range(10000) | 0]; 0) | flatten
+null
+[0]
+
+try setpath([range(10001) | 0]; 0) catch .
+null
+"Path too deep"
+
+getpath([range(10000) | 0])
+null
+null
+
+try getpath([range(10001) | 0]) catch .
+null
+"Path too deep"
+
+delpaths([[range(10000) | 0]])
+null
+null
+
+try delpaths([[range(10001) | 0]]) catch .
+null
+"Path too deep"
diff --git a/meta-oe/recipes-devtools/jq/jq/CVE-2026-33948.patch b/meta-oe/recipes-devtools/jq/jq/CVE-2026-33948.patch
new file mode 100644
index 0000000000..8625429c74
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/CVE-2026-33948.patch
@@ -0,0 +1,49 @@
+From 19a792c4cdb6b91c056eac033ac3367af6e67755 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Mon, 13 Apr 2026 08:46:11 +0900
+Subject: [PATCH] Fix NUL truncation in the JSON parser
+This fixes CVE-2026-33948.
+CVE: CVE-2026-33948
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/6374ae0bcdfe33a18eb0ae6db28493b1f34a0a5b]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/util.c   | 8 +-------
+ tests/shtest | 6 ++++++
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+diff --git a/src/util.c b/src/util.c
+index bcb86da..60ec4d5 100644
+--- a/src/util.c
+++ b/src/util.c
+@@ -309,13 +309,7 @@ static int jq_util_input_read_more(jq_util_input_state *state) {
+       if (p != NULL)
+         state->current_line++;
+ 
+-      if (p == NULL && state->parser != NULL) {
+-        /*
+-         * There should be no NULs in JSON texts (but JSON text
+-         * sequences are another story).
+-         */
+-        state->buf_valid_len = strlen(state->buf);
+-      } else if (p == NULL && feof(state->current_input)) {
+      if (p == NULL && feof(state->current_input)) {
+         size_t i;
+ 
+         /*
+diff --git a/tests/shtest b/tests/shtest
+index 887a6bb..a046afe 100755
+--- a/tests/shtest
+++ b/tests/shtest
+@@ -842,4 +842,10 @@ if ! $msys && ! $mingw; then
+   fi
+ fi
+ 
+# CVE-2026-33948: No NUL truncation in the JSON parser
+if printf '{}\x00{}' | $JQ >/dev/null 2> /dev/null; then
+  printf 'Error expected but jq exited successfully\n' 1>&2
+  exit 1
+fi
+
+ exit 0
diff --git a/meta-oe/recipes-devtools/jq/jq/CVE-2026-39979.patch b/meta-oe/recipes-devtools/jq/jq/CVE-2026-39979.patch
new file mode 100644
index 0000000000..40c57a46a0
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/CVE-2026-39979.patch
@@ -0,0 +1,31 @@
+From ac09f274b6c029a23e3dffc38afac819b5daacc4 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Mon, 13 Apr 2026 11:04:52 +0900
+Subject: [PATCH] Fix out-of-bounds read in jv_parse_sized()
+This fixes CVE-2026-39979.
+Co-authored-by: Mattias Wadman <mattias.wadman@gmail.com>
+CVE: CVE-2026-39979
+Upstream-Status: Backport [https://github.com/jqlang/jq/commit/2f09060afab23fe9390cce7cb860b10416e1bf5f]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/jv_parse.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/src/jv_parse.c b/src/jv_parse.c
+index ffcf51f..e6b8aa9 100644
+--- a/src/jv_parse.c
+++ b/src/jv_parse.c
+@@ -892,8 +892,9 @@ jv jv_parse_sized_custom_flags(const char* string, int length, int flags) {
+ 
+   if (!jv_is_valid(value) && jv_invalid_has_msg(jv_copy(value))) {
+     jv msg = jv_invalid_get_msg(value);
+-    value = jv_invalid_with_msg(jv_string_fmt("%s (while parsing '%s')",
+    value = jv_invalid_with_msg(jv_string_fmt("%s (while parsing '%.*s')",
+                                               jv_string_value(msg),
+                                              length,
+                                               string));
+     jv_free(msg);
+   }
diff --git a/meta-oe/recipes-devtools/jq/jq_1.8.1.bb b/meta-oe/recipes-devtools/jq/jq_1.8.1.bb
index b9383c76f7..026f6bfa71 100644
--- a/meta-oe/recipes-devtools/jq/jq_1.8.1.bb
+++ b/meta-oe/recipes-devtools/jq/jq_1.8.1.bb
@@ -8,15 +8,20 @@ SECTION = "utils"
 LICENSE = "MIT & BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cf7fcb0a1def4a7ad62c028f7d0dca47"
-GITHUB_BASE_URI = "https://github.com/jqlang/${BPN}/releases/"
+SRCREV = "4467af7068b1bcd7f882defff6e7ea674c5357f4"
-SRC_URI = "${GITHUB_BASE_URI}/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
-    file://run-ptest \
-    "
-SRC_URI[sha256sum] = "2be64e7129cecb11d5906290eba10af694fb9e3e7f9fc208a311dc33ca837eb0"
-inherit autotools github-releases ptest
+SRC_URI = "git://github.com/jqlang/jq.git;protocol=https;branch=master;tag=jq-${PV} \
+           file://run-ptest \
+           file://0001-Support-building-with-disable-maintainer-mode-and-so.patch \
+           file://CVE-2026-32316.patch \
+           file://CVE-2026-33947.patch \
+           file://CVE-2026-33948.patch \
+           file://CVE-2026-39979.patch \
+           "
-UPSTREAM_CHECK_REGEX = "releases/tag/${BPN}-(?P<pver>\d+(\.\d+)+)"
+inherit autotools ptest
+UPSTREAM_CHECK_GITTAGREGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
 PACKAGECONFIG ?= "oniguruma"
diff --git a/meta-oe/recipes-devtools/jsoncpp/files/run-ptest b/meta-oe/recipes-devtools/jsoncpp/files/run-ptest
new file mode 100644
index 0000000000..2cb892b187
--- /dev/null
+++ b/meta-oe/recipes-devtools/jsoncpp/files/run-ptest
@@ -0,0 +1,4 @@
+#!/bin/sh
+cd src
+ctest --force-new-ctest-process | sed -u 's/\*\*\*/   /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}'
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.7.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.7.bb
index b70a84304f..797f093f33 100644
--- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.7.bb
+++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.7.bb
@@ -14,11 +14,33 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926"
 PE = "1"
 SRCREV = "3455302847cf1e4671f1d8f5fa953fd46a7b1404"
-SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https;tag=${PV}"
+SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https;tag=${PV} \
+           file://run-ptest \
+           "
-inherit cmake
+inherit cmake ptest
-EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DBUILD_OBJECT_LIBS=OFF -DJSONCPP_WITH_TESTS=OFF"
+EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DBUILD_OBJECT_LIBS=OFF \
+                  ${@bb.utils.contains('PTEST_ENABLED', '1', '-DJSONCPP_WITH_TESTS=ON -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF', '-DJSONCPP_WITH_TESTS=OFF', d)} \
+                  "
+DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'rsync-native', '', d)}"
+RDEPENDS:${PN}-ptest += "cmake python3-core"
+do_install_ptest () {
+    cp -r ${B}/bin ${D}${PTEST_PATH}
+    cp -r ${S}/test ${D}${PTEST_PATH}
+    
+    rsync -a ${B}/src ${D}${PTEST_PATH} \
+          --exclude CMakeFiles \
+          --exclude cmake_install.cmake \
+          --exclude Makefile \
+          --exclude generated
+    sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${PYTHON}#/usr/bin/python3#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${WORKDIR}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+}
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-more-whitespaces-after-operator.patch b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-more-whitespaces-after-operator.patch
new file mode 100644
index 0000000000..5bff81eaf6
--- /dev/null
+++ b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-more-whitespaces-after-operator.patch
@@ -0,0 +1,34 @@
+From 6af7de3d5eaae59c53c42aab8eca1e1e9a365da5 Mon Sep 17 00:00:00 2001
+From: Steffen Winter <steffen.winter@proton.me>
+Date: Thu, 25 Dec 2025 20:48:02 +0100
+Subject: [PATCH] Remove more whitespaces after operator""
+Upstream-Status: Submitted [https://github.com/ToruNiina/toml11/pull/306]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ include/toml11/fwd/literal_fwd.hpp   | 4 ++--
+ include/toml11/impl/literal_impl.hpp | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+--- a/include/toml11/fwd/literal_fwd.hpp
+++ b/include/toml11/fwd/literal_fwd.hpp
+@@ -24,7 +24,7 @@ inline namespace toml_literals
+ #if defined(TOML11_HAS_CHAR8_T)
+ // value of u8"" literal has been changed from char to char8_t and char8_t is
+ // NOT compatible to char
+-::toml::value operator"" _toml(const char8_t* str, std::size_t len);
+::toml::value operator""_toml(const char8_t* str, std::size_t len);
+ #endif
+ 
+ } // toml_literals
+--- a/include/toml11/impl/literal_impl.hpp
+++ b/include/toml11/impl/literal_impl.hpp
+@@ -146,7 +146,7 @@ operator""_toml(const char* str, std::si
+ // value of u8"" literal has been changed from char to char8_t and char8_t is
+ // NOT compatible to char
+ TOML11_INLINE ::toml::value
+-operator"" _toml(const char8_t* str, std::size_t len)
+operator""_toml(const char8_t* str, std::size_t len)
+ {
+     if(len == 0)
+     {
diff --git a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
index 7e097e4612..49f9840f06 100644
--- a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
+++ b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
@@ -16,12 +16,15 @@ PE = "1"
 SRC_URI = "\
    gitsm://github.com/ToruNiina/toml11.git;protocol=https;branch=main;tag=v${PV} \
    file://0001-Remove-whitespace-in-operator.patch \
+    file://0001-Remove-more-whitespaces-after-operator.patch \
    file://run-ptest \
 "
 SRCREV = "be08ba2be2a964edcdb3d3e3ea8d100abc26f286"
 inherit cmake ptest
+CXXFLAGS:append:toolchain-clang = " -Wno-error=c2y-extensions"
 EXTRA_OECMAKE += "-DTOML11_PRECOMPILE=ON \
                  -DTOML11_BUILD_TESTS=${@bb.utils.contains("PTEST_ENABLED", "1", "ON", "OFF", d)} \
 "
diff --git a/meta-oe/recipes-devtools/lshw/lshw_02.20.bb b/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
index 95e2084255..2f1367341a 100644
--- a/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
+++ b/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
@@ -32,11 +32,11 @@ EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS} RPM_OPT_FLAGS='${CFLAGS}'"
 do_compile() {
    # build core only - don't ship gui
-    oe_runmake -C src core
+    oe_runmake -C src SBINDIR=${sbindir} core
 }
 do_install() {
-    oe_runmake install DESTDIR=${D}
+    oe_runmake install DESTDIR=${D} SBINDIR=${sbindir}
 }
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-type-of-single-bit-bitfields.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-type-of-single-bit-bitfields.patch
deleted file mode 100644
index 61932269bd..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-type-of-single-bit-bitfields.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 491b3b153f6b5cbf2d23a9778e5676eb29a6705f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 6 Feb 2023 16:37:19 -0800
-Subject: [PATCH] Fix type of single bit bitfields
-clang16 warns
-trace.c:311:22: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion]
-quash the warning by using an unsigned type to allow
-an assignment of 0 or 1 without implicit conversion.
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- library.h                 |  6 +++---
- prototype.h               |  2 +-
- sysdeps/linux-gnu/trace.h | 10 +++++-----
- 3 files changed, 9 insertions(+), 9 deletions(-)
--- a/library.h
-+++ b/library.h
-@@ -71,20 +71,20 @@ struct library_symbol {
-         * looking up one in LIB->protolib.  */
-        struct prototype *proto;
- 
-       int own_name : 1;
-+       unsigned int own_name : 1;
- 
-        /* This is relevant for PLT symbols.  Latent PLT symbols are
-         * those that don't match any of the -e rules, but that might
-         * potentially become active if a library implementing them
-         * appears that matches a -l rule.  Ltrace core is responsible
-         * for clearing latent flag.  */
-       int latent : 1;
-+       unsigned latent : 1;
- 
-        /* Delayed symbols are those for which a breakpoint shouldn't
-         * be enabled yet.  They are similar to latent symbols, but
-         * backend is responsible for clearing the delayed flag.  See
-         * proc_activate_delayed_symbol.  */
-       int delayed : 1;
-+       unsigned int delayed : 1;
- 
-        struct arch_library_symbol_data arch;
-        struct os_library_symbol_data os;
--- a/prototype.h
-+++ b/prototype.h
-@@ -162,7 +162,7 @@ struct protolib_cache {
- 
-        /* For tracking uses of cache during cache's own
-         * initialization.  */
-       int bootstrap : 1;
-+       unsigned int bootstrap : 1;
- };
- 
- /* Initialize CACHE.  Returns 0 on success or a negative value on
--- a/sysdeps/linux-gnu/trace.h
-+++ b/sysdeps/linux-gnu/trace.h
-@@ -33,11 +33,11 @@
- struct pid_task {
-        pid_t pid;      /* This may be 0 for tasks that exited
-                         * mid-handling.  */
-       int sigstopped : 1;
-       int got_event : 1;
-       int delivered : 1;
-       int vforked : 1;
-       int sysret : 1;
-+       unsigned int sigstopped : 1;
-+       unsigned int got_event : 1;
-+       unsigned int delivered : 1;
-+       unsigned int vforked : 1;
-+       unsigned int sysret : 1;
- };
- 
- struct pid_set {
--- a/sysdeps/linux-gnu/trace.c
-+++ b/sysdeps/linux-gnu/trace.c
-@@ -1043,7 +1043,7 @@ ltrace_exiting_install_handler(struct pr
- struct process_vfork_handler
- {
-        struct event_handler super;
-       int vfork_bp_refd:1;
-+       unsigned int vfork_bp_refd:1;
- };
- 
- static Event *
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch
deleted file mode 100644
index f3a6d9e599..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c1d3aaf5ec810c2594938438c7b4ccd20943f255 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 7 Jul 2017 10:20:52 -0700
-Subject: [PATCH] configure: Recognise linux-musl as a host OS
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/configure.ac b/configure.ac
-index 3e8667f..95d6642 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -35,6 +35,7 @@ AC_CANONICAL_HOST
- case "${host_os}" in
-     linux-gnu*) HOST_OS="linux-gnu" ;;
-     linux-uclibc*) HOST_OS="linux-gnu" ;;
-+    linux-musl*) HOST_OS="linux-gnu" ;;
-     *)         AC_MSG_ERROR([unkown host-os ${host_os}]) ;;
- esac
- AC_SUBST(HOST_OS)
-- 
-2.13.2
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-dwarf_prototypes-return-NULL-from-NEXT_SIBLING-on-er.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-dwarf_prototypes-return-NULL-from-NEXT_SIBLING-on-er.patch
new file mode 100644
index 0000000000..e7aa0fdabe
--- /dev/null
+++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-dwarf_prototypes-return-NULL-from-NEXT_SIBLING-on-er.patch
@@ -0,0 +1,34 @@
+From d568c0cbdecf31a7020f2a0574470d014f447a86 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Sun, 12 Apr 2026 00:07:06 -0700
+Subject: [PATCH] dwarf_prototypes: return NULL from NEXT_SIBLING on error
+NEXT_SIBLING is used in functions that return pointers, so returning
+false on error is misleading and relies on implicit conversion.
+Return (void *)0 instead to make the failure value explicit and match
+the surrounding function return type.
+This is flagged by clang-22 due to
+Replacing return false with return (void *)0
+avoids clang's -Wbool-conversion error when the macro expands
+inside functions returning a pointer type.
+Upstream-Status: Submitted [https://gitlab.com/cespedes/ltrace/-/merge_requests/30]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ dwarf_prototypes.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/dwarf_prototypes.c b/dwarf_prototypes.c
+index bfac177..e7ea1bc 100644
+--- a/dwarf_prototypes.c
+++ b/dwarf_prototypes.c
+@@ -36,7 +36,7 @@
+ #define NEXT_SIBLING(die)                                      \
+        int res = dwarf_siblingof(die, die);                    \
+        if (res == 0) continue;     /* sibling exists    */     \
+-       if (res < 0)  return false; /* error             */     \
+       if (res < 0)  return (void *)0;  /* error             */        \
+        break                       /* no sibling exists */
+ static struct arg_type_info *get_type(int *newly_allocated_info,
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-trace-fix-1-bit-bitfield-assignments-for-clang-Wsing.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-trace-fix-1-bit-bitfield-assignments-for-clang-Wsing.patch
new file mode 100644
index 0000000000..0f8a9766f4
--- /dev/null
+++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-trace-fix-1-bit-bitfield-assignments-for-clang-Wsing.patch
@@ -0,0 +1,86 @@
+From 65c5a621a366a25b8572cd29c01b4aa92c02903a Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Sun, 12 Apr 2026 00:46:20 -0700
+Subject: [PATCH] trace: fix 1-bit bitfield assignments for clang
+ -Wsingle-bit-bitfield-constant-conversion
+Replace '1' with 'true' for all 1-bit signed bitfield assignments.
+Assigning integer 1 to a 1-bit signed bitfield truncates to -1; using
+'true' which is a bool is well-defined and avoids the clang error.
+Upstream-Status: Submitted [https://gitlab.com/cespedes/ltrace/-/merge_requests/30]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ ltrace-elf.c              |  2 +-
+ sysdeps/linux-gnu/trace.c | 12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+diff --git a/ltrace-elf.c b/ltrace-elf.c
+index beaf69f..2be609c 100644
+--- a/ltrace-elf.c
+++ b/ltrace-elf.c
+@@ -819,7 +819,7 @@ mark_chain_latent(struct library_symbol *libsym)
+ {
+        for (; libsym != NULL; libsym = libsym->next) {
+                debug(DEBUG_FUNCTION, "marking %s latent", libsym->name);
+-               libsym->latent = 1;
+               libsym->latent = true;
+        }
+ }
+diff --git a/sysdeps/linux-gnu/trace.c b/sysdeps/linux-gnu/trace.c
+index 12c8747..b7f4c57 100644
+--- a/sysdeps/linux-gnu/trace.c
+++ b/sysdeps/linux-gnu/trace.c
+@@ -310,13 +310,13 @@ send_sigstop(struct process *task, void *data)
+         * weed out unnecessary looping.  */
+        if (st == PS_SLEEPING
+            && is_vfork_parent(task)) {
+-               task_info->vforked = 1;
+               task_info->vforked = true;
+                return CBS_CONT;
+        }
+        if (task_kill(task->pid, SIGSTOP) >= 0) {
+                debug(DEBUG_PROCESS, "send SIGSTOP to %d", task->pid);
+-               task_info->sigstopped = 1;
+               task_info->sigstopped = true;
+        } else
+                fprintf(stderr,
+                        "Warning: couldn't send SIGSTOP to %d\n", task->pid);
+@@ -442,7 +442,7 @@ handle_stopping_event(struct pid_task *task_info, Event **eventp)
+ {
+        /* Mark all events, so that we know whom to SIGCONT later.  */
+        if (task_info != NULL)
+-               task_info->got_event = 1;
+               task_info->got_event = true;
+        Event *event = *eventp;
+@@ -454,7 +454,7 @@ handle_stopping_event(struct pid_task *task_info, Event **eventp)
+                debug(DEBUG_PROCESS, "SIGSTOP delivered to %d", task_info->pid);
+                if (task_info->sigstopped
+                    && !task_info->delivered) {
+-                       task_info->delivered = 1;
+                       task_info->delivered = true;
+                        *eventp = NULL; // sink the event
+                } else
+                        fprintf(stderr, "suspicious: %d got SIGSTOP, but "
+@@ -748,7 +748,7 @@ process_stopping_on_event(struct event_handler *super, Event *event)
+                debug(1, "%d LT_EV_SYSRET", event->proc->pid);
+                event_to_queue = 0;
+                if (task_info != NULL)
+-                       task_info->sysret = 1;
+                       task_info->sysret = true;
+        }
+        switch (state) {
+@@ -1070,7 +1070,7 @@ process_vfork_on_event(struct event_handler *super, Event *event)
+                                      &event->e_un.brk_addr, &sbp);
+                        assert(sbp != NULL);
+                        breakpoint_turn_on(sbp, proc->leader);
+-                       self->vfork_bp_refd = 1;
+                       self->vfork_bp_refd = true;
+                }
+                break;
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_0.8.1.bb
index f84d989eef..77bb61830b 100644
--- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
+++ b/meta-oe/recipes-devtools/ltrace/ltrace_0.8.1.bb
@@ -9,25 +9,24 @@ HOMEPAGE = "http://ltrace.org/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
-PE = "1"
+PE = "2"
-PV = "7.91+git"
+SRCREV = "7ef6e6097586b751cce298c256a919404dab259d"
-SRCREV = "8eabf684ba6b11ae7a1a843aca3c0657c6329d73"
 DEPENDS = "elfutils"
-SRC_URI = "git://gitlab.com/cespedes/ltrace.git;protocol=https;branch=main \
+SRC_URI = "git://gitlab.com/cespedes/ltrace.git;protocol=https;branch=main;tag=${PV} \
           file://configure-allow-to-disable-selinux-support.patch \
           file://0001-Use-correct-enum-type.patch \
           file://0002-Fix-const-qualifier-error.patch \
           file://0001-Add-support-for-mips64-n32-n64.patch \
-           file://0001-configure-Recognise-linux-musl-as-a-host-OS.patch \
           file://0001-mips-plt.c-Delete-include-error.h.patch \
           file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \
           file://0001-hook-Do-not-append-int-to-std-string.patch \
           file://0001-Bug-fix-for-data-type-length-judgment.patch \
           file://0001-ppc-Remove-unused-host_powerpc64-function.patch \
           file://0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch \
-           file://0001-Fix-type-of-single-bit-bitfields.patch \
           file://0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch \
+           file://0001-dwarf_prototypes-return-NULL-from-NEXT_SIBLING-on-er.patch \
+           file://0001-trace-fix-1-bit-bitfield-assignments-for-clang-Wsing.patch \
           "
 SRC_URI:append:libc-musl = " file://add_ppc64le.patch"
diff --git a/meta-oe/recipes-devtools/mpich/mpich_5.0.0.bb b/meta-oe/recipes-devtools/mpich/mpich_5.0.1.bb
index 505fc6f92b..55f6cde82f 100644
--- a/meta-oe/recipes-devtools/mpich/mpich_5.0.0.bb
+++ b/meta-oe/recipes-devtools/mpich/mpich_5.0.1.bb
@@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a296dfb961b957b0e8adf67d8478d3d"
 SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz"
-SRC_URI[sha256sum] = "e9350e32224283e95311f22134f36c98e3cd1c665d17fae20a6cc92ed3cffe11"
+SRC_URI[sha256sum] = "8c1832a13ddacf071685069f5fadfd1f2877a29e1a628652892c65211b1f3327"
 RDEPENDS:${PN} += "bash perl libxml2"
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_22.22.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.22.2.bb
index 8bd5f008af..3a1385f70a 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_22.22.2.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.22.2.bb
@@ -214,3 +214,11 @@ python __anonymous () {
 }
 BBCLASSEXTEND = "native"
+CVE_STATUS[CVE-2026-21710] = "fixed-version: fixed since v22.22.2"
+CVE_STATUS[CVE-2026-21712] = "cpe-incorrect: only v24 and v25 are affected"
+CVE_STATUS[CVE-2026-21713] = "fixed-version: fixed since v22.22.2"
+CVE_STATUS[CVE-2026-21714] = "fixed-version: fixed since v22.22.2"
+CVE_STATUS[CVE-2026-21715] = "fixed-version: fixed since v22.22.2"
+CVE_STATUS[CVE-2026-21716] = "fixed-version: fixed since v22.22.2"
+CVE_STATUS[CVE-2026-21717] = "fixed-version: fixed since v22.22.2"
diff --git a/meta-oe/recipes-devtools/php/php_8.5.4.bb b/meta-oe/recipes-devtools/php/php_8.5.5.bb
index efa778b6d8..2924b478ad 100644
--- a/meta-oe/recipes-devtools/php/php_8.5.4.bb
+++ b/meta-oe/recipes-devtools/php/php_8.5.5.bb
@@ -32,7 +32,7 @@ UPSTREAM_CHECK_REGEX = "releases/tag/php-(?P<pver>\d+(\.\d+)+)"
 S = "${UNPACKDIR}/php-${PV}"
-SRC_URI[sha256sum] = "2ac929a29a6b7ef4b8acec981a417b91bdf7f548f597df665cc56ab9ea95fc75"
+SRC_URI[sha256sum] = "ee262beff61c431965d1f97192854b36208adeac38983c3498bb3500ae87283c"
 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."
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch
deleted file mode 100644
index 1aae1f17b0..0000000000
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch
+++ /dev/null
@@ -1,1446 +0,0 @@
-From b28683f8027bf1e886b748b5603eb16d203b5a92 Mon Sep 17 00:00:00 2001
-From: Robert Edmonds <edmonds@users.noreply.github.com>
-Date: Sat, 8 Feb 2025 18:18:33 -0500
-Subject: [PATCH 01/11] protoc-gen-c/c_helpers.h: Move compat defines into new
- header file compat.h
-Upstream-Status: Backport [https://gitlab.archlinux.org/archlinux/packaging/packages/protobuf-c/-/blob/main/protobuf-30.patch]
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- protoc-gen-c/c_field.cc           |  1 +
- protoc-gen-c/c_helpers.cc         |  1 +
- protoc-gen-c/c_helpers.h          | 10 -------
- protoc-gen-c/c_message.cc         |  1 +
- protoc-gen-c/c_primitive_field.cc |  1 +
- protoc-gen-c/compat.h             | 46 +++++++++++++++++++++++++++++++
- protoc-gen-c/main.cc              |  1 +
- 7 files changed, 51 insertions(+), 10 deletions(-)
- create mode 100644 protoc-gen-c/compat.h
-diff --git a/protoc-gen-c/c_field.cc b/protoc-gen-c/c_field.cc
-index 5e79967b..d6d8597e 100644
--- a/protoc-gen-c/c_field.cc
-+++ b/protoc-gen-c/c_field.cc
-@@ -74,6 +74,7 @@
- #include "c_message_field.h"
- #include "c_primitive_field.h"
- #include "c_string_field.h"
-+#include "compat.h"
- 
- namespace protobuf_c {
- 
-diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
-index 5edcf904..c38843f8 100644
--- a/protoc-gen-c/c_helpers.cc
-+++ b/protoc-gen-c/c_helpers.cc
-@@ -73,6 +73,7 @@
- #include <google/protobuf/stubs/common.h>
- 
- #include "c_helpers.h"
-+#include "compat.h"
- 
- namespace protobuf_c {
- 
-diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
-index 943676e9..e69504bb 100644
--- a/protoc-gen-c/c_helpers.h
-+++ b/protoc-gen-c/c_helpers.h
-@@ -186,16 +186,6 @@ inline int FieldSyntax(const google::protobuf::FieldDescriptor* field) {
-   return 2;
- }
- 
-// Work around changes in protobuf >= 22.x without breaking compilation against
-// older protobuf versions.
-#if GOOGLE_PROTOBUF_VERSION >= 4022000
-# define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
-# define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
-# define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
-# define GOOGLE_DCHECK_GE      ABSL_DCHECK_GE
-# define GOOGLE_LOG            ABSL_LOG
-#endif
-
- }  // namespace protobuf_c
- 
- #endif  // PROTOBUF_C_PROTOC_GEN_C_C_HELPERS_H__
-diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
-index d4a9a01e..46413873 100644
--- a/protoc-gen-c/c_message.cc
-+++ b/protoc-gen-c/c_message.cc
-@@ -78,6 +78,7 @@
- #include "c_extension.h"
- #include "c_helpers.h"
- #include "c_message.h"
-+#include "compat.h"
- 
- namespace protobuf_c {
- 
-diff --git a/protoc-gen-c/c_primitive_field.cc b/protoc-gen-c/c_primitive_field.cc
-index 253b00bd..588f60e6 100644
--- a/protoc-gen-c/c_primitive_field.cc
-+++ b/protoc-gen-c/c_primitive_field.cc
-@@ -67,6 +67,7 @@
- 
- #include "c_helpers.h"
- #include "c_primitive_field.h"
-+#include "compat.h"
- 
- namespace protobuf_c {
- 
-diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
-new file mode 100644
-index 00000000..2ee78281
--- /dev/null
-+++ b/protoc-gen-c/compat.h
-@@ -0,0 +1,46 @@
-+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
-+// All rights reserved.
-+//
-+// Redistribution and use in source and binary forms, with or without
-+// modification, are permitted provided that the following conditions are
-+// met:
-+//
-+//     * Redistributions of source code must retain the above copyright
-+// notice, this list of conditions and the following disclaimer.
-+//
-+//     * Redistributions in binary form must reproduce the above
-+// copyright notice, this list of conditions and the following disclaimer
-+// in the documentation and/or other materials provided with the
-+// distribution.
-+//
-+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+#ifndef PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
-+#define PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
-+
-+#if GOOGLE_PROTOBUF_VERSION >= 4022000
-+# define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
-+# define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
-+# define GOOGLE_DCHECK_GE      ABSL_DCHECK_GE
-+# define GOOGLE_LOG            ABSL_LOG
-+#endif
-+
-+namespace protobuf_c {
-+
-+namespace compat {
-+
-+}  // namespace compat
-+
-+}  // namespace protobuf_c
-+
-+#endif  // PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
-diff --git a/protoc-gen-c/main.cc b/protoc-gen-c/main.cc
-index 0656c113..5ab929d3 100644
--- a/protoc-gen-c/main.cc
-+++ b/protoc-gen-c/main.cc
-@@ -32,6 +32,7 @@
- 
- #include "c_generator.h"
- #include "c_helpers.h"
-+#include "compat.h"
- 
- int main(int argc, char* argv[]) {
-   protobuf_c::CGenerator c_generator;
-From 1678f1fba6f2d3e5c1db2817495ddcd72bd4e87b Mon Sep 17 00:00:00 2001
-From: Robert Edmonds <edmonds@users.noreply.github.com>
-Date: Sat, 8 Feb 2025 20:09:03 -0500
-Subject: [PATCH 02/11] protoc-gen-c/compat.h: Add `compat::StringView` type
-protobuf >= 30.x replaces `const std::string&` in various APIs with
-its own string view type that may actually be a `absl::string_view`.
-Introduce our own `compat::StringView` type that we can use instead
-of `const std::string&` in order to support compiling across multiple
-protobuf versions.
---
- protoc-gen-c/compat.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
-index 2ee78281..fe8041b5 100644
--- a/protoc-gen-c/compat.h
-+++ b/protoc-gen-c/compat.h
-@@ -28,6 +28,8 @@
- #ifndef PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
- #define PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
- 
-+#include <string>
-+
- #if GOOGLE_PROTOBUF_VERSION >= 4022000
- # define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
- # define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
-@@ -39,6 +41,12 @@ namespace protobuf_c {
- 
- namespace compat {
- 
-+#if GOOGLE_PROTOBUF_VERSION >= 6030000
-+typedef google::protobuf::internal::DescriptorStringView StringView;
-+#else
-+typedef const std::string& StringView;
-+#endif
-+
- }  // namespace compat
- 
- }  // namespace protobuf_c
-From db5252c131c82fb48ee599179b6989a577b7fbc8 Mon Sep 17 00:00:00 2001
-From: Robert Edmonds <edmonds@users.noreply.github.com>
-Date: Sat, 8 Feb 2025 20:13:44 -0500
-Subject: [PATCH 03/11] Remove some unused functions
---
- protoc-gen-c/c_helpers.cc | 64 ---------------------------------------
- protoc-gen-c/c_helpers.h  |  3 --
- 2 files changed, 67 deletions(-)
-diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
-index c38843f8..bbb4a615 100644
--- a/protoc-gen-c/c_helpers.cc
-+++ b/protoc-gen-c/c_helpers.cc
-@@ -90,14 +90,6 @@ namespace protobuf_c {
- #pragma warning(disable:4996)
- #endif
- 
-std::string DotsToUnderscores(const std::string& name) {
-  return StringReplace(name, ".", "_", true);
-}
-
-std::string DotsToColons(const std::string& name) {
-  return StringReplace(name, ".", "::", true);
-}
-
- std::string SimpleFtoa(float f) {
-   char buf[100];
-   snprintf(buf,sizeof(buf),"%.*g", FLT_DIG, f);
-@@ -333,11 +325,6 @@ std::string FilenameIdentifier(const std::string& filename) {
-   return result;
- }
- 
-// Return the name of the BuildDescriptors() function for a given file.
-std::string GlobalBuildDescriptorsName(const std::string& filename) {
-  return "proto_BuildDescriptors_" + FilenameIdentifier(filename);
-}
-
- std::string GetLabelName(google::protobuf::FieldDescriptor::Label label) {
-   switch (label) {
-     case google::protobuf::FieldDescriptor::LABEL_OPTIONAL: return "optional";
-@@ -392,57 +379,6 @@ WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *
-   }
- }
-     
-
-
-// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx
-// XXXXXXXXX  this stuff is copied from strutils.cc !!!!   XXXXXXXXXXXXXXXXXXXXXXXXXXXXx
-// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx
-// ----------------------------------------------------------------------
-// StringReplace()
-//    Replace the "old" pattern with the "new" pattern in a string,
-//    and append the result to "res".  If replace_all is false,
-//    it only replaces the first instance of "old."
-// ----------------------------------------------------------------------
-
-void StringReplace(const std::string& s, const std::string& oldsub,
-                   const std::string& newsub, bool replace_all,
-                   std::string* res) {
-  if (oldsub.empty()) {
-    res->append(s);  // if empty, append the given string.
-    return;
-  }
-
-  std::string::size_type start_pos = 0;
-  std::string::size_type pos;
-  do {
-    pos = s.find(oldsub, start_pos);
-    if (pos == std::string::npos) {
-      break;
-    }
-    res->append(s, start_pos, pos - start_pos);
-    res->append(newsub);
-    start_pos = pos + oldsub.size();  // start searching again after the "old"
-  } while (replace_all);
-  res->append(s, start_pos, s.length() - start_pos);
-}
-
-
-// ----------------------------------------------------------------------
-// StringReplace()
-//    Give me a string and two patterns "old" and "new", and I replace
-//    the first instance of "old" in the string with "new", if it
-//    exists.  If "global" is true; call this repeatedly until it
-//    fails.  RETURN a new string, regardless of whether the replacement
-//    happened or not.
-// ----------------------------------------------------------------------
-
-std::string StringReplace(const std::string& s, const std::string& oldsub,
-                          const std::string& newsub, bool replace_all) {
-  std::string ret;
-  StringReplace(s, oldsub, newsub, replace_all, &ret);
-  return ret;
-}
-
- // ----------------------------------------------------------------------
- // SplitStringUsing()
- //    Split a string using a character delimiter. Append the components
-diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
-index e69504bb..377d4272 100644
--- a/protoc-gen-c/c_helpers.h
-+++ b/protoc-gen-c/c_helpers.h
-@@ -150,9 +150,6 @@ const char* DeclaredTypeMethodName(google::protobuf::FieldDescriptor::Type type)
- // Convert a file name into a valid identifier.
- std::string FilenameIdentifier(const std::string& filename);
- 
-// Return the name of the BuildDescriptors() function for a given file.
-std::string GlobalBuildDescriptorsName(const std::string& filename);
-
- // return 'required', 'optional', or 'repeated'
- std::string GetLabelName(google::protobuf::FieldDescriptor::Label label);
- 
-From bc2cb66d908f016dd3f7082c8a6ad7c58bc03412 Mon Sep 17 00:00:00 2001
-From: Robert Edmonds <edmonds@users.noreply.github.com>
-Date: Sat, 8 Feb 2025 20:18:05 -0500
-Subject: [PATCH 04/11] Use `compat::StringView` type across various function
- signatures
---
- protoc-gen-c/c_helpers.cc | 44 +++++++++++++++++++++------------------
- protoc-gen-c/c_helpers.h  | 36 ++++++++++++++++----------------
- 2 files changed, 42 insertions(+), 38 deletions(-)
-diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
-index bbb4a615..c759c8c2 100644
--- a/protoc-gen-c/c_helpers.cc
-+++ b/protoc-gen-c/c_helpers.cc
-@@ -96,6 +96,7 @@ std::string SimpleFtoa(float f) {
-   buf[sizeof(buf)-1] = 0;              /* should NOT be necessary */
-   return buf;
- }
-+
- std::string SimpleDtoa(double d) {
-   char buf[100];
-   snprintf(buf,sizeof(buf),"%.*g", DBL_DIG, d);
-@@ -103,7 +104,7 @@ std::string SimpleDtoa(double d) {
-   return buf;
- }
- 
-std::string CamelToUpper(const std::string &name) {
-+std::string CamelToUpper(compat::StringView name) {
-   bool was_upper = true;               // suppress initial _
-   std::string rv = "";
-   int len = name.length();
-@@ -120,7 +121,8 @@ std::string CamelToUpper(const std::string &name) {
-   }
-   return rv;
- }
-std::string CamelToLower(const std::string &name) {
-+
-+std::string CamelToLower(compat::StringView name) {
-   bool was_upper = true;               // suppress initial _
-   std::string rv = "";
-   int len = name.length();
-@@ -138,8 +140,7 @@ std::string CamelToLower(const std::string &name) {
-   return rv;
- }
- 
-
-std::string ToUpper(const std::string &name) {
-+std::string ToUpper(compat::StringView name) {
-   std::string rv = "";
-   int len = name.length();
-   for (int i = 0; i < len; i++) {
-@@ -147,7 +148,8 @@ std::string ToUpper(const std::string &name) {
-   }
-   return rv;
- }
-std::string ToLower(const std::string &name) {
-+
-+std::string ToLower(compat::StringView name) {
-   std::string rv = "";
-   int len = name.length();
-   for (int i = 0; i < len; i++) {
-@@ -155,7 +157,8 @@ std::string ToLower(const std::string &name) {
-   }
-   return rv;
- }
-std::string ToCamel(const std::string &name) {
-+
-+std::string ToCamel(compat::StringView name) {
-   std::string rv = "";
-   int len = name.length();
-   bool next_is_upper = true;
-@@ -172,7 +175,7 @@ std::string ToCamel(const std::string &name) {
-   return rv;
- }
- 
-std::string OverrideFullName(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
-+std::string OverrideFullName(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
-   const ProtobufCFileOptions opt = file->options().GetExtension(pb_c_file);
-   if (!opt.has_c_package())
-     return full_name;
-@@ -184,7 +187,7 @@ std::string OverrideFullName(const std::string &full_name, const google::protobu
-   return new_name + full_name.substr(file->package().length());
- }
- 
-std::string FullNameToLower(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
-+std::string FullNameToLower(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
-   std::vector<std::string> pieces;
-   SplitStringUsing(OverrideFullName(full_name, file), ".", &pieces);
-   std::string rv = "";
-@@ -195,7 +198,8 @@ std::string FullNameToLower(const std::string &full_name, const google::protobuf
-   }
-   return rv;
- }
-std::string FullNameToUpper(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
-+
-+std::string FullNameToUpper(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
-   std::vector<std::string> pieces;
-   SplitStringUsing(OverrideFullName(full_name, file), ".", &pieces);
-   std::string rv = "";
-@@ -206,7 +210,8 @@ std::string FullNameToUpper(const std::string &full_name, const google::protobuf
-   }
-   return rv;
- }
-std::string FullNameToC(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
-+
-+std::string FullNameToC(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
-   std::vector<std::string> pieces;
-   SplitStringUsing(OverrideFullName(full_name, file), ".", &pieces);
-   std::string rv = "";
-@@ -248,7 +253,7 @@ void PrintComment(google::protobuf::io::Printer* printer, std::string comment)
-    }
- }
- 
-std::string ConvertToSpaces(const std::string &input) {
-+std::string ConvertToSpaces(compat::StringView input) {
-   return std::string(input.size(), ' ');
- }
- 
-@@ -259,8 +264,7 @@ int compare_name_indices_by_name(const void *a, const void *b)
-   return strcmp (ni_a->name, ni_b->name);
- }
- 
-
-std::string CEscape(const std::string& src);
-+std::string CEscape(compat::StringView src);
- 
- const char* const kKeywordList[] = {
-   "and", "and_eq", "asm", "auto", "bitand", "bitor", "bool", "break", "case",
-@@ -300,7 +304,7 @@ std::string FieldDeprecated(const google::protobuf::FieldDescriptor* field) {
-   return "";
- }
- 
-std::string StripProto(const std::string& filename) {
-+std::string StripProto(compat::StringView filename) {
-   if (HasSuffixString(filename, ".protodevel")) {
-     return StripSuffixString(filename, ".protodevel");
-   } else {
-@@ -309,7 +313,7 @@ std::string StripProto(const std::string& filename) {
- }
- 
- // Convert a file name into a valid identifier.
-std::string FilenameIdentifier(const std::string& filename) {
-+std::string FilenameIdentifier(compat::StringView filename) {
-   std::string result;
-   for (unsigned i = 0; i < filename.size(); i++) {
-     if (isalnum(filename[i])) {
-@@ -335,7 +339,7 @@ std::string GetLabelName(google::protobuf::FieldDescriptor::Label label) {
- }
- 
- unsigned
-WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, const std::string &name)
-+WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, compat::StringView name)
- {
-   std::map<std::string, std::string> vars;
-   vars["name"] = name;
-@@ -389,7 +393,7 @@ WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *
- // ----------------------------------------------------------------------
- template <typename ITR>
- static inline
-void SplitStringToIteratorUsing(const std::string& full,
-+void SplitStringToIteratorUsing(compat::StringView full,
-                                 const char* delim,
-                                 ITR& result) {
-   // Optimize the common case where delim is a single character.
-@@ -422,7 +426,7 @@ void SplitStringToIteratorUsing(const std::string& full,
-   }
- }
- 
-void SplitStringUsing(const std::string& full,
-+void SplitStringUsing(compat::StringView full,
-                       const char* delim,
-                       std::vector<std::string>* result) {
-   std::back_insert_iterator< std::vector<std::string> > it(*result);
-@@ -435,7 +439,6 @@ char* FastHexToBuffer(int i, char* buffer)
-   return buffer;
- }
- 
-
- static int CEscapeInternal(const char* src, int src_len, char* dest,
-                            int dest_len, bool use_hex) {
-   const char* src_end = src + src_len;
-@@ -478,7 +481,8 @@ static int CEscapeInternal(const char* src, int src_len, char* dest,
-   dest[used] = '\0';   // doesn't count towards return value though
-   return used;
- }
-std::string CEscape(const std::string& src) {
-+
-+std::string CEscape(compat::StringView src) {
-   const int dest_length = src.size() * 4 + 1; // Maximum possible expansion
-   std::unique_ptr<char[]> dest(new char[dest_length]);
-   const int len = CEscapeInternal(src.data(), src.size(),
-diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
-index 377d4272..ccd39ca2 100644
--- a/protoc-gen-c/c_helpers.h
-+++ b/protoc-gen-c/c_helpers.h
-@@ -73,6 +73,8 @@
- 
- #include <protobuf-c/protobuf-c.pb.h>
- 
-+#include "compat.h"
-+
- namespace protobuf_c {
- 
- // --- Borrowed from stubs. ---
-@@ -84,11 +86,10 @@ template <typename T> std::string SimpleItoa(T n) {
- 
- std::string SimpleFtoa(float f);
- std::string SimpleDtoa(double f);
-void SplitStringUsing(const std::string &str, const char *delim, std::vector<std::string> *out);
-std::string CEscape(const std::string& src);
-std::string StringReplace(const std::string& s, const std::string& oldsub, const std::string& newsub, bool replace_all);
-inline bool HasSuffixString(const std::string& str, const std::string& suffix) { return str.size() >= suffix.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0; }
-inline std::string StripSuffixString(const std::string& str, const std::string& suffix) { if (HasSuffixString(str, suffix)) { return str.substr(0, str.size() - suffix.size()); } else { return str; } }
-+void SplitStringUsing(compat::StringView str, const char *delim, std::vector<std::string> *out);
-+std::string CEscape(compat::StringView src);
-+inline bool HasSuffixString(compat::StringView str, compat::StringView suffix) { return str.size() >= suffix.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0; }
-+inline std::string StripSuffixString(compat::StringView str, compat::StringView suffix) { if (HasSuffixString(str, suffix)) { return str.substr(0, str.size() - suffix.size()); } else { return str; } }
- char* FastHexToBuffer(int i, char* buffer);
- 
- 
-@@ -110,31 +111,31 @@ inline const google::protobuf::Descriptor* FieldScope(const google::protobuf::Fi
- 
- // convert a CamelCase class name into an all uppercase affair
- // with underscores separating words, e.g. MyClass becomes MY_CLASS.
-std::string CamelToUpper(const std::string &class_name);
-std::string CamelToLower(const std::string &class_name);
-+std::string CamelToUpper(compat::StringView class_name);
-+std::string CamelToLower(compat::StringView class_name);
- 
- // lowercased, underscored name to camel case
-std::string ToCamel(const std::string &name);
-+std::string ToCamel(compat::StringView name);
- 
- // lowercase the string
-std::string ToLower(const std::string &class_name);
-std::string ToUpper(const std::string &class_name);
-+std::string ToLower(compat::StringView class_name);
-+std::string ToUpper(compat::StringView class_name);
- 
- // full_name() to lowercase with underscores
-std::string FullNameToLower(const std::string &full_name, const google::protobuf::FileDescriptor *file);
-std::string FullNameToUpper(const std::string &full_name, const google::protobuf::FileDescriptor *file);
-+std::string FullNameToLower(compat::StringView full_name, const google::protobuf::FileDescriptor *file);
-+std::string FullNameToUpper(compat::StringView full_name, const google::protobuf::FileDescriptor *file);
- 
- // full_name() to c-typename (with underscores for packages, otherwise camel case)
-std::string FullNameToC(const std::string &class_name, const google::protobuf::FileDescriptor *file);
-+std::string FullNameToC(compat::StringView class_name, const google::protobuf::FileDescriptor *file);
- 
- // Splits, indents, formats, and prints comment lines
- void PrintComment(google::protobuf::io::Printer* printer, std::string comment);
- 
- // make a string of spaces as long as input
-std::string ConvertToSpaces(const std::string &input);
-+std::string ConvertToSpaces(compat::StringView input);
- 
- // Strips ".proto" or ".protodevel" from the end of a filename.
-std::string StripProto(const std::string& filename);
-+std::string StripProto(compat::StringView filename);
- 
- // Get the C++ type name for a primitive type (e.g. "double", "::google::protobuf::int32", etc.).
- // Note:  non-built-in type names will be qualified, meaning they will start
-@@ -148,15 +149,14 @@ const char* PrimitiveTypeName(google::protobuf::FieldDescriptor::CppType type);
- const char* DeclaredTypeMethodName(google::protobuf::FieldDescriptor::Type type);
- 
- // Convert a file name into a valid identifier.
-std::string FilenameIdentifier(const std::string& filename);
-+std::string FilenameIdentifier(compat::StringView filename);
- 
- // return 'required', 'optional', or 'repeated'
- std::string GetLabelName(google::protobuf::FieldDescriptor::Label label);
- 
-
- // write IntRanges entries for a bunch of sorted values.
- // returns the number of ranges there are to bsearch.
-unsigned WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, const std::string &name);
-+unsigned WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, compat::StringView name);
- 
- struct NameIndex
- {
-From 75f1c32cc429233a3726358c999009f9ea373b45 Mon Sep 17 00:00:00 2001
-From: Robert Edmonds <edmonds@users.noreply.github.com>
-Date: Sat, 8 Feb 2025 20:25:43 -0500
-Subject: [PATCH 05/11] Convert string views to owned strings where necessary
---
- protoc-gen-c/c_enum.cc       | 2 +-
- protoc-gen-c/c_enum_field.cc | 2 +-
- protoc-gen-c/c_helpers.cc    | 8 ++++----
- protoc-gen-c/c_helpers.h     | 3 +--
- 4 files changed, 7 insertions(+), 8 deletions(-)
-diff --git a/protoc-gen-c/c_enum.cc b/protoc-gen-c/c_enum.cc
-index 9212ab82..311e4c86 100644
--- a/protoc-gen-c/c_enum.cc
-+++ b/protoc-gen-c/c_enum.cc
-@@ -152,7 +152,7 @@ void EnumGenerator::GenerateValueInitializer(google::protobuf::io::Printer *prin
-     descriptor_->file()->options().optimize_for() ==
-     google::protobuf::FileOptions_OptimizeMode_CODE_SIZE;
-   vars["enum_value_name"] = vd->name();
-  vars["c_enum_value_name"] = FullNameToUpper(descriptor_->full_name(), descriptor_->file()) + "__" + vd->name();
-+  vars["c_enum_value_name"] = FullNameToUpper(descriptor_->full_name(), descriptor_->file()) + "__" + std::string(vd->name());
-   vars["value"] = SimpleItoa(vd->number());
-   if (optimize_code_size)
-     printer->Print(vars, "  { NULL, NULL, $value$ }, /* CODE_SIZE */\n");
-diff --git a/protoc-gen-c/c_enum_field.cc b/protoc-gen-c/c_enum_field.cc
-index 0926ae59..c3111f50 100644
--- a/protoc-gen-c/c_enum_field.cc
-+++ b/protoc-gen-c/c_enum_field.cc
-@@ -78,7 +78,7 @@ void SetEnumVariables(const google::protobuf::FieldDescriptor* descriptor,
-   (*variables)["type"] = FullNameToC(descriptor->enum_type()->full_name(), descriptor->enum_type()->file());
-   const google::protobuf::EnumValueDescriptor* default_value = descriptor->default_value_enum();
-   (*variables)["default"] = FullNameToUpper(default_value->type()->full_name(), default_value->type()->file())
-                          + "__" + default_value->name();
-+                          + "__" + std::string(default_value->name());
-   (*variables)["deprecated"] = FieldDeprecated(descriptor);
- }
- 
-diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
-index c759c8c2..1aecef93 100644
--- a/protoc-gen-c/c_helpers.cc
-+++ b/protoc-gen-c/c_helpers.cc
-@@ -178,13 +178,13 @@ std::string ToCamel(compat::StringView name) {
- std::string OverrideFullName(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
-   const ProtobufCFileOptions opt = file->options().GetExtension(pb_c_file);
-   if (!opt.has_c_package())
-    return full_name;
-+    return std::string(full_name);
- 
-   std::string new_name = opt.c_package();
-   if (file->package().empty())
-     new_name += ".";
- 
-  return new_name + full_name.substr(file->package().length());
-+  return new_name + std::string(full_name.substr(file->package().length()));
- }
- 
- std::string FullNameToLower(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
-@@ -418,10 +418,10 @@ void SplitStringToIteratorUsing(compat::StringView full,
-   while (begin_index != std::string::npos) {
-     end_index = full.find_first_of(delim, begin_index);
-     if (end_index == std::string::npos) {
-      *result++ = full.substr(begin_index);
-+      *result++ = std::string(full.substr(begin_index));
-       return;
-     }
-    *result++ = full.substr(begin_index, (end_index - begin_index));
-+    *result++ = std::string(full.substr(begin_index, (end_index - begin_index)));
-     begin_index = full.find_first_not_of(delim, end_index);
-   }
- }
-diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
-index ccd39ca2..985e4db6 100644
--- a/protoc-gen-c/c_helpers.h
-+++ b/protoc-gen-c/c_helpers.h
-@@ -89,10 +89,9 @@ std::string SimpleDtoa(double f);
- void SplitStringUsing(compat::StringView str, const char *delim, std::vector<std::string> *out);
- std::string CEscape(compat::StringView src);
- inline bool HasSuffixString(compat::StringView str, compat::StringView suffix) { return str.size() >= suffix.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0; }
-inline std::string StripSuffixString(compat::StringView str, compat::StringView suffix) { if (HasSuffixString(str, suffix)) { return str.substr(0, str.size() - suffix.size()); } else { return str; } }
-+inline std::string StripSuffixString(compat::StringView str, compat::StringView suffix) { if (HasSuffixString(str, suffix)) { return std::string(str.substr(0, str.size() - suffix.size())); } else { return std::string(str); } }
- char* FastHexToBuffer(int i, char* buffer);
- 
-
- // Get the (unqualified) name that should be used for this field in C code.
- // The name is coerced to lower-case to emulate proto1 behavior.  People
- // should be using lowercase-with-underscores style for proto field names
-From 0edca93db369fb84f01cc0d4e3ee4cd6c2ad7f4f Mon Sep 17 00:00:00 2001
-From: Robert Edmonds <edmonds@users.noreply.github.com>
-Date: Sat, 8 Feb 2025 20:39:11 -0500
-Subject: [PATCH 06/11] Convert various uses of `const char *` to
- `compat::StringView`
-Also replace some uses of arrays manually allocated with new/delete with
-uses of `std::vector`.
---
- protoc-gen-c/c_enum.cc    | 35 ++++++++++++++++++-----------------
- protoc-gen-c/c_helpers.cc |  2 +-
- protoc-gen-c/c_helpers.h  |  2 +-
- protoc-gen-c/c_message.cc | 28 ++++++++++++----------------
- protoc-gen-c/c_service.cc | 19 +++++++++----------
- 5 files changed, 41 insertions(+), 45 deletions(-)
-diff --git a/protoc-gen-c/c_enum.cc b/protoc-gen-c/c_enum.cc
-index 311e4c86..c7839edd 100644
--- a/protoc-gen-c/c_enum.cc
-+++ b/protoc-gen-c/c_enum.cc
-@@ -142,7 +142,7 @@ struct ValueIndex
-   int value;
-   unsigned index;
-   unsigned final_index;                /* index in uniqified array of values */
-  const char *name;
-+  compat::StringView name;
- };
- void EnumGenerator::GenerateValueInitializer(google::protobuf::io::Printer *printer, int index)
- {
-@@ -176,7 +176,7 @@ static int compare_value_indices_by_name(const void *a, const void *b)
- {
-   const ValueIndex *vi_a = (const ValueIndex *) a;
-   const ValueIndex *vi_b = (const ValueIndex *) b;
-  return strcmp (vi_a->name, vi_b->name);
-+  return vi_a->name.compare(vi_b->name);
- }
- 
- void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printer) {
-@@ -194,18 +194,20 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
- 
-   // Sort by name and value, dropping duplicate values if they appear later.
-   // TODO: use a c++ paradigm for this!
-  NameIndex *name_index = new NameIndex[descriptor_->value_count()];
-  ValueIndex *value_index = new ValueIndex[descriptor_->value_count()];
-  for (int j = 0; j < descriptor_->value_count(); j++) {
-+  std::vector<ValueIndex> value_index;
-+  for (unsigned j = 0; j < descriptor_->value_count(); j++) {
-     const google::protobuf::EnumValueDescriptor *vd = descriptor_->value(j);
-    name_index[j].index = j;
-    name_index[j].name = vd->name().c_str();
-    value_index[j].index = j;
-    value_index[j].value = vd->number();
-    value_index[j].name = vd->name().c_str();
-+    value_index.push_back({
-+      .value = vd->number(),
-+      .index = j,
-+      .final_index = 0,
-+      .name = vd->name(),
-+    });
-   }
-  qsort(value_index, descriptor_->value_count(),
-       sizeof(ValueIndex), compare_value_indices_by_value_then_index);
-+  qsort(&value_index[0],
-+        value_index.size(),
-+        sizeof(ValueIndex),
-+        compare_value_indices_by_value_then_index);
- 
-   // only record unique values
-   int n_unique_values;
-@@ -275,8 +277,10 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
-   vars["n_ranges"] = SimpleItoa(n_ranges);
- 
-   if (!optimize_code_size) {
-    qsort(value_index, descriptor_->value_count(),
-        sizeof(ValueIndex), compare_value_indices_by_name);
-+    qsort(&value_index[0],
-+          value_index.size(),
-+          sizeof(ValueIndex),
-+          compare_value_indices_by_name);
-     printer->Print(vars,
-         "static const ProtobufCEnumValueIndex $lcclassname$__enum_values_by_name[$value_count$] =\n"
-         "{\n");
-@@ -319,9 +323,6 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
-         "  NULL,NULL,NULL,NULL   /* reserved[1234] */\n"
-         "};\n");
-   }
-
-  delete[] value_index;
-  delete[] name_index;
- }
- 
- }  // namespace protobuf_c
-diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
-index 1aecef93..dec9ce28 100644
--- a/protoc-gen-c/c_helpers.cc
-+++ b/protoc-gen-c/c_helpers.cc
-@@ -261,7 +261,7 @@ int compare_name_indices_by_name(const void *a, const void *b)
- {
-   const NameIndex *ni_a = (const NameIndex *) a;
-   const NameIndex *ni_b = (const NameIndex *) b;
-  return strcmp (ni_a->name, ni_b->name);
-+  return ni_a->name.compare(ni_b->name);
- }
- 
- std::string CEscape(compat::StringView src);
-diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
-index 985e4db6..69369997 100644
--- a/protoc-gen-c/c_helpers.h
-+++ b/protoc-gen-c/c_helpers.h
-@@ -160,7 +160,7 @@ unsigned WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, co
- struct NameIndex
- {
-   unsigned index;
-  const char *name;
-+  compat::StringView name;
- };
- int compare_name_indices_by_name(const void*, const void*);
- 
-diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
-index 46413873..7252923c 100644
--- a/protoc-gen-c/c_message.cc
-+++ b/protoc-gen-c/c_message.cc
-@@ -567,27 +567,26 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
-        "static const ProtobufCFieldDescriptor $lcclassname$__field_descriptors[$n_fields$] =\n"
-        "{\n");
-   printer->Indent();
-  const google::protobuf::FieldDescriptor **sorted_fields = new const google::protobuf::FieldDescriptor *[descriptor_->field_count()];
-+
-+  std::vector<const google::protobuf::FieldDescriptor*> sorted_fields;
-   for (int i = 0; i < descriptor_->field_count(); i++) {
-    sorted_fields[i] = descriptor_->field(i);
-+    sorted_fields.push_back(descriptor_->field(i));
-   }
-  qsort (sorted_fields, descriptor_->field_count(),
-+  qsort(&sorted_fields[0], sorted_fields.size(),
-        sizeof(const google::protobuf::FieldDescriptor*), 
-        compare_pfields_by_number);
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const google::protobuf::FieldDescriptor* field = sorted_fields[i];
-+  for (auto field : sorted_fields) {
-     field_generators_.get(field).GenerateDescriptorInitializer(printer);
-   }
-   printer->Outdent();
-   printer->Print(vars, "};\n");
- 
-   if (!optimize_code_size) {
-    NameIndex *field_indices = new NameIndex [descriptor_->field_count()];
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      field_indices[i].name = sorted_fields[i]->name().c_str();
-      field_indices[i].index = i;
-+    std::vector<NameIndex> field_indices;
-+    for (unsigned i = 0; i < descriptor_->field_count(); i++) {
-+      field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
-     }
-    qsort (field_indices, descriptor_->field_count(), sizeof (NameIndex),
-+    qsort(&field_indices[0], field_indices.size(), sizeof(NameIndex),
-         compare_name_indices_by_name);
-     printer->Print(vars, "static const unsigned $lcclassname$__field_indices_by_name[] = {\n");
-     for (int i = 0; i < descriptor_->field_count(); i++) {
-@@ -596,19 +595,16 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
-       printer->Print(vars, "  $index$,   /* field[$index$] = $name$ */\n");
-     }
-     printer->Print("};\n");
-    delete[] field_indices;
-   }
- 
-   // create range initializers
-  int *values = new int[descriptor_->field_count()];
-+  std::vector<int> values;
-   for (int i = 0; i < descriptor_->field_count(); i++) {
-    values[i] = sorted_fields[i]->number();
-+    values.push_back(sorted_fields[i]->number());
-   }
-   int n_ranges = WriteIntRanges(printer,
-                               descriptor_->field_count(), values,
-+                               descriptor_->field_count(), &values[0],
-                                vars["lcclassname"] + "__number_ranges");
-  delete [] values;
-  delete [] sorted_fields;
- 
-   vars["n_ranges"] = SimpleItoa(n_ranges);
-     } else {
-diff --git a/protoc-gen-c/c_service.cc b/protoc-gen-c/c_service.cc
-index ee4d4a95..2c3ddcf3 100644
--- a/protoc-gen-c/c_service.cc
-+++ b/protoc-gen-c/c_service.cc
-@@ -184,19 +184,19 @@ void ServiceGenerator::GenerateInit(google::protobuf::io::Printer* printer)
-                 "}\n");
- }
- 
-struct MethodIndexAndName { unsigned i; const char *name; };
-+struct MethodIndexAndName { unsigned i; compat::StringView name; };
- static int
- compare_method_index_and_name_by_name (const void *a, const void *b)
- {
-   const MethodIndexAndName *ma = (const MethodIndexAndName *) a;
-   const MethodIndexAndName *mb = (const MethodIndexAndName *) b;
-  return strcmp (ma->name, mb->name);
-+  return ma->name.compare(mb->name);
- }
- 
- void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer* printer)
- {
-   int n_methods = descriptor_->method_count();
-  MethodIndexAndName *mi_array = new MethodIndexAndName[n_methods];
-+  std::vector<MethodIndexAndName> mi_array;
- 
-   bool optimize_code_size = descriptor_->file()->options().has_optimize_for() &&
-     descriptor_->file()->options().optimize_for() ==
-@@ -205,7 +205,7 @@ void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer*
-   vars_["n_methods"] = SimpleItoa(n_methods);
-   printer->Print(vars_, "static const ProtobufCMethodDescriptor $lcfullname$__method_descriptors[$n_methods$] =\n"
-                        "{\n");
-  for (int i = 0; i < n_methods; i++) {
-+  for (unsigned i = 0; i < n_methods; i++) {
-     const google::protobuf::MethodDescriptor* method = descriptor_->method(i);
-     vars_["method"] = method->name();
-     vars_["input_descriptor"] = "&" + FullNameToLower(method->input_type()->full_name(), method->input_type()->file()) + "__descriptor";
-@@ -217,14 +217,15 @@ void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer*
-       printer->Print(vars_,
-           "  { \"$method$\", $input_descriptor$, $output_descriptor$ },\n");
-     }
-    mi_array[i].i = i;
-    mi_array[i].name = method->name().c_str();
-+    mi_array.push_back({i, method->name()});
-   }
-   printer->Print(vars_, "};\n");
- 
-   if (!optimize_code_size) {
-    qsort ((void*)mi_array, n_methods, sizeof (MethodIndexAndName),
-        compare_method_index_and_name_by_name);
-+    qsort(&mi_array[0],
-+          mi_array.size(),
-+          sizeof(MethodIndexAndName),
-+          compare_method_index_and_name_by_name);
-     printer->Print(vars_, "const unsigned $lcfullname$__method_indices_by_name[] = {\n");
-     for (int i = 0; i < n_methods; i++) {
-       vars_["i"] = SimpleItoa(mi_array[i].i);
-@@ -258,8 +259,6 @@ void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer*
-         "  $lcfullname$__method_indices_by_name\n"
-         "};\n");
-   }
-
-  delete[] mi_array;
- }
- 
- void ServiceGenerator::GenerateCallersImplementations(google::protobuf::io::Printer* printer)
-From ebeddac1a746393a16d9ba4cf80e3d12c3ab7d7f Mon Sep 17 00:00:00 2001
-From: Robert Edmonds <edmonds@users.noreply.github.com>
-Date: Sat, 8 Feb 2025 20:56:48 -0500
-Subject: [PATCH 07/11] Fix indentation of
- MessageGenerator::GenerateMessageDescriptor()
---
- protoc-gen-c/c_message.cc | 321 +++++++++++++++++++-------------------
- 1 file changed, 159 insertions(+), 162 deletions(-)
-diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
-index 7252923c..2a3b2a2f 100644
--- a/protoc-gen-c/c_message.cc
-+++ b/protoc-gen-c/c_message.cc
-@@ -461,199 +461,196 @@ GenerateHelperFunctionDefinitions(google::protobuf::io::Printer* printer,
- 
- void MessageGenerator::
- GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init) {
-    std::map<std::string, std::string> vars;
-    vars["fullname"] = descriptor_->full_name();
-    vars["classname"] = FullNameToC(descriptor_->full_name(), descriptor_->file());
-    vars["lcclassname"] = FullNameToLower(descriptor_->full_name(), descriptor_->file());
-    vars["shortname"] = ToCamel(descriptor_->name());
-    vars["n_fields"] = SimpleItoa(descriptor_->field_count());
-    vars["packagename"] = descriptor_->file()->package();
-
-    bool optimize_code_size = descriptor_->file()->options().has_optimize_for() &&
-        descriptor_->file()->options().optimize_for() ==
-        google::protobuf::FileOptions_OptimizeMode_CODE_SIZE;
-
-    const ProtobufCMessageOptions opt =
-           descriptor_->options().GetExtension(pb_c_msg);
-    // Override parent settings, if needed
-    if (opt.has_gen_init_helpers())
-      gen_init = opt.gen_init_helpers();
-
-    for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-      nested_generators_[i]->GenerateMessageDescriptor(printer, gen_init);
-    }
-+  std::map<std::string, std::string> vars;
-+  vars["fullname"] = descriptor_->full_name();
-+  vars["classname"] = FullNameToC(descriptor_->full_name(), descriptor_->file());
-+  vars["lcclassname"] = FullNameToLower(descriptor_->full_name(), descriptor_->file());
-+  vars["shortname"] = ToCamel(descriptor_->name());
-+  vars["n_fields"] = SimpleItoa(descriptor_->field_count());
-+  vars["packagename"] = descriptor_->file()->package();
- 
-    for (int i = 0; i < descriptor_->enum_type_count(); i++) {
-      enum_generators_[i]->GenerateEnumDescriptor(printer);
-    }
-+  bool optimize_code_size = descriptor_->file()->options().has_optimize_for() &&
-+    descriptor_->file()->options().optimize_for() ==
-+      google::protobuf::FileOptions_OptimizeMode_CODE_SIZE;
- 
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
-      if (fd->has_default_value()) {
-       field_generators_.get(fd).GenerateDefaultValueImplementations(printer);
-      }
-    }
-+  const ProtobufCMessageOptions opt = descriptor_->options().GetExtension(pb_c_msg);
-+  // Override parent settings, if needed
-+  if (opt.has_gen_init_helpers()) {
-+    gen_init = opt.gen_init_helpers();
-+  }
- 
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
-      const ProtobufCFieldOptions opt = fd->options().GetExtension(pb_c_field);
-      if (fd->has_default_value()) {
-
-       bool already_defined = false;
-       vars["name"] = fd->name();
-       vars["lcname"] = CamelToLower(fd->name());
-       vars["maybe_static"] = "static ";
-       vars["field_dv_ctype_suffix"] = "";
-       vars["default_value"] = field_generators_.get(fd).GetDefaultValue();
-       switch (fd->cpp_type()) {
-       case google::protobuf::FieldDescriptor::CPPTYPE_INT32:
-         vars["field_dv_ctype"] = "int32_t";
-         break;
-       case google::protobuf::FieldDescriptor::CPPTYPE_INT64:
-         vars["field_dv_ctype"] = "int64_t";
-         break;
-       case google::protobuf::FieldDescriptor::CPPTYPE_UINT32:
-         vars["field_dv_ctype"] = "uint32_t";
-         break;
-       case google::protobuf::FieldDescriptor::CPPTYPE_UINT64:
-         vars["field_dv_ctype"] = "uint64_t";
-         break;
-       case google::protobuf::FieldDescriptor::CPPTYPE_FLOAT:
-         vars["field_dv_ctype"] = "float";
-         break;
-       case google::protobuf::FieldDescriptor::CPPTYPE_DOUBLE:
-         vars["field_dv_ctype"] = "double";
-         break;
-       case google::protobuf::FieldDescriptor::CPPTYPE_BOOL:
-         vars["field_dv_ctype"] = "protobuf_c_boolean";
-         break;
-         
-       case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE:
-         // NOTE: not supported by protobuf
-         vars["maybe_static"] = "";
-         vars["field_dv_ctype"] = "{ ... }";
-         GOOGLE_LOG(FATAL) << "Messages can't have default values!";
-         break;
-       case google::protobuf::FieldDescriptor::CPPTYPE_STRING:
-         if (fd->type() == google::protobuf::FieldDescriptor::TYPE_BYTES || opt.string_as_bytes())
-         {
-           vars["field_dv_ctype"] = "ProtobufCBinaryData";
-         }
-         else   /* STRING type */
-         {
-           already_defined = true;
-           vars["maybe_static"] = "";
-           vars["field_dv_ctype"] = "char";
-           vars["field_dv_ctype_suffix"] = "[]";
-         }
-         break;
-       case google::protobuf::FieldDescriptor::CPPTYPE_ENUM:
-         {
-           const google::protobuf::EnumValueDescriptor* vd = fd->default_value_enum();
-           vars["field_dv_ctype"] = FullNameToC(vd->type()->full_name(), vd->type()->file());
-           break;
-         }
-       default:
-         GOOGLE_LOG(FATAL) << "Unknown CPPTYPE";
-         break;
-       }
-       if (!already_defined)
-         printer->Print(vars, "$maybe_static$const $field_dv_ctype$ $lcclassname$__$lcname$__default_value$field_dv_ctype_suffix$ = $default_value$;\n");
-      }
-    }
-+  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-+    nested_generators_[i]->GenerateMessageDescriptor(printer, gen_init);
-+  }
- 
-    if ( descriptor_->field_count() ) {
-  printer->Print(vars,
-       "static const ProtobufCFieldDescriptor $lcclassname$__field_descriptors[$n_fields$] =\n"
-       "{\n");
-  printer->Indent();
-+  for (int i = 0; i < descriptor_->enum_type_count(); i++) {
-+    enum_generators_[i]->GenerateEnumDescriptor(printer);
-+  }
- 
-  std::vector<const google::protobuf::FieldDescriptor*> sorted_fields;
-   for (int i = 0; i < descriptor_->field_count(); i++) {
-    sorted_fields.push_back(descriptor_->field(i));
-  }
-  qsort(&sorted_fields[0], sorted_fields.size(),
-       sizeof(const google::protobuf::FieldDescriptor*), 
-       compare_pfields_by_number);
-  for (auto field : sorted_fields) {
-    field_generators_.get(field).GenerateDescriptorInitializer(printer);
-+    const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
-+    if (fd->has_default_value()) {
-+      field_generators_.get(fd).GenerateDefaultValueImplementations(printer);
-+    }
-   }
-  printer->Outdent();
-  printer->Print(vars, "};\n");
- 
-  if (!optimize_code_size) {
-    std::vector<NameIndex> field_indices;
-    for (unsigned i = 0; i < descriptor_->field_count(); i++) {
-      field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
-+  for (int i = 0; i < descriptor_->field_count(); i++) {
-+    const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
-+    const ProtobufCFieldOptions opt = fd->options().GetExtension(pb_c_field);
-+    if (fd->has_default_value()) {
-+      bool already_defined = false;
-+      vars["name"] = fd->name();
-+      vars["lcname"] = CamelToLower(fd->name());
-+      vars["maybe_static"] = "static ";
-+      vars["field_dv_ctype_suffix"] = "";
-+      vars["default_value"] = field_generators_.get(fd).GetDefaultValue();
-+      switch (fd->cpp_type()) {
-+      case google::protobuf::FieldDescriptor::CPPTYPE_INT32:
-+        vars["field_dv_ctype"] = "int32_t";
-+        break;
-+      case google::protobuf::FieldDescriptor::CPPTYPE_INT64:
-+        vars["field_dv_ctype"] = "int64_t";
-+        break;
-+      case google::protobuf::FieldDescriptor::CPPTYPE_UINT32:
-+        vars["field_dv_ctype"] = "uint32_t";
-+        break;
-+      case google::protobuf::FieldDescriptor::CPPTYPE_UINT64:
-+        vars["field_dv_ctype"] = "uint64_t";
-+        break;
-+      case google::protobuf::FieldDescriptor::CPPTYPE_FLOAT:
-+        vars["field_dv_ctype"] = "float";
-+        break;
-+      case google::protobuf::FieldDescriptor::CPPTYPE_DOUBLE:
-+        vars["field_dv_ctype"] = "double";
-+        break;
-+      case google::protobuf::FieldDescriptor::CPPTYPE_BOOL:
-+        vars["field_dv_ctype"] = "protobuf_c_boolean";
-+        break;
-+      case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE:
-+        // NOTE: not supported by protobuf
-+        vars["maybe_static"] = "";
-+        vars["field_dv_ctype"] = "{ ... }";
-+        GOOGLE_LOG(FATAL) << "Messages can't have default values!";
-+        break;
-+      case google::protobuf::FieldDescriptor::CPPTYPE_STRING:
-+        if (fd->type() == google::protobuf::FieldDescriptor::TYPE_BYTES || opt.string_as_bytes()) {
-+          vars["field_dv_ctype"] = "ProtobufCBinaryData";
-+        } else {
-+          /* STRING type */
-+          already_defined = true;
-+          vars["maybe_static"] = "";
-+          vars["field_dv_ctype"] = "char";
-+          vars["field_dv_ctype_suffix"] = "[]";
-+        }
-+        break;
-+      case google::protobuf::FieldDescriptor::CPPTYPE_ENUM: {
-+        const google::protobuf::EnumValueDescriptor* vd = fd->default_value_enum();
-+        vars["field_dv_ctype"] = FullNameToC(vd->type()->full_name(), vd->type()->file());
-+        break;
-+      }
-+      default:
-+        GOOGLE_LOG(FATAL) << "Unknown CPPTYPE";
-+        break;
-+      }
-+      if (!already_defined) {
-+        printer->Print(vars, "$maybe_static$const $field_dv_ctype$ $lcclassname$__$lcname$__default_value$field_dv_ctype_suffix$ = $default_value$;\n");
-+      }
-     }
-    qsort(&field_indices[0], field_indices.size(), sizeof(NameIndex),
-        compare_name_indices_by_name);
-    printer->Print(vars, "static const unsigned $lcclassname$__field_indices_by_name[] = {\n");
-+  }
-+
-+  if (descriptor_->field_count()) {
-+    printer->Print(vars,
-+      "static const ProtobufCFieldDescriptor $lcclassname$__field_descriptors[$n_fields$] =\n"
-+      "{\n");
-+    printer->Indent();
-+
-+    std::vector<const google::protobuf::FieldDescriptor*> sorted_fields;
-     for (int i = 0; i < descriptor_->field_count(); i++) {
-      vars["index"] = SimpleItoa(field_indices[i].index);
-      vars["name"] = field_indices[i].name;
-      printer->Print(vars, "  $index$,   /* field[$index$] = $name$ */\n");
-+      sorted_fields.push_back(descriptor_->field(i));
-     }
-    printer->Print("};\n");
-  }
-+    qsort(&sorted_fields[0],
-+          sorted_fields.size(),
-+          sizeof(const google::protobuf::FieldDescriptor*),
-+          compare_pfields_by_number);
-+    for (auto field : sorted_fields) {
-+      field_generators_.get(field).GenerateDescriptorInitializer(printer);
-+    }
-+    printer->Outdent();
-+    printer->Print(vars, "};\n");
- 
-  // create range initializers
-  std::vector<int> values;
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    values.push_back(sorted_fields[i]->number());
-  }
-  int n_ranges = WriteIntRanges(printer,
-                               descriptor_->field_count(), &values[0],
-                               vars["lcclassname"] + "__number_ranges");
-+    if (!optimize_code_size) {
-+      std::vector<NameIndex> field_indices;
-+      for (unsigned i = 0; i < descriptor_->field_count(); i++) {
-+        field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
-+      }
-+      qsort(&field_indices[0],
-+            field_indices.size(),
-+            sizeof(NameIndex),
-+            compare_name_indices_by_name);
-+      printer->Print(vars, "static const unsigned $lcclassname$__field_indices_by_name[] = {\n");
-+      for (int i = 0; i < descriptor_->field_count(); i++) {
-+        vars["index"] = SimpleItoa(field_indices[i].index);
-+        vars["name"] = field_indices[i].name;
-+        printer->Print(vars, "  $index$,   /* field[$index$] = $name$ */\n");
-+      }
-+      printer->Print("};\n");
-+    }
- 
-  vars["n_ranges"] = SimpleItoa(n_ranges);
-    } else {
-      /* MS compiler can't handle arrays with zero size and empty
-       * initialization list. Furthermore it is an extension of GCC only but
-       * not a standard. */
-      vars["n_ranges"] = "0";
-  printer->Print(vars,
-        "#define $lcclassname$__field_descriptors NULL\n"
-        "#define $lcclassname$__field_indices_by_name NULL\n"
-        "#define $lcclassname$__number_ranges NULL\n");
-+    // create range initializers
-+    std::vector<int> values;
-+    for (int i = 0; i < descriptor_->field_count(); i++) {
-+      values.push_back(sorted_fields[i]->number());
-     }
-+    int n_ranges = WriteIntRanges(printer,
-+                                  descriptor_->field_count(),
-+                                  &values[0],
-+                                  vars["lcclassname"] + "__number_ranges");
-+
-+    vars["n_ranges"] = SimpleItoa(n_ranges);
-+  } else {
-+    /* MS compiler can't handle arrays with zero size and empty
-+     * initialization list. Furthermore it is an extension of GCC only but
-+     * not a standard. */
-+    vars["n_ranges"] = "0";
-+    printer->Print(vars,
-+      "#define $lcclassname$__field_descriptors NULL\n"
-+      "#define $lcclassname$__field_indices_by_name NULL\n"
-+      "#define $lcclassname$__number_ranges NULL\n");
-+  }
- 
-   printer->Print(vars,
-      "const ProtobufCMessageDescriptor $lcclassname$__descriptor =\n"
-      "{\n"
-      "  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,\n");
-+    "const ProtobufCMessageDescriptor $lcclassname$__descriptor =\n"
-+    "{\n"
-+    "  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,\n");
-   if (optimize_code_size) {
-     printer->Print("  NULL,NULL,NULL,NULL, /* CODE_SIZE */\n");
-   } else {
-     printer->Print(vars,
-        "  \"$fullname$\",\n"
-        "  \"$shortname$\",\n"
-        "  \"$classname$\",\n"
-        "  \"$packagename$\",\n");
-+      "  \"$fullname$\",\n"
-+      "  \"$shortname$\",\n"
-+      "  \"$classname$\",\n"
-+      "  \"$packagename$\",\n");
-   }
-   printer->Print(vars,
-      "  sizeof($classname$),\n"
-      "  $n_fields$,\n"
-      "  $lcclassname$__field_descriptors,\n");
-+    "  sizeof($classname$),\n"
-+    "  $n_fields$,\n"
-+    "  $lcclassname$__field_descriptors,\n");
-   if (optimize_code_size) {
-     printer->Print("  NULL, /* CODE_SIZE */\n");
-   } else {
-    printer->Print(vars,
-        "  $lcclassname$__field_indices_by_name,\n");
-+    printer->Print(vars, "  $lcclassname$__field_indices_by_name,\n");
-   }
-   printer->Print(vars,
-      "  $n_ranges$,"
-      "  $lcclassname$__number_ranges,\n");
-+    "  $n_ranges$,"
-+    "  $lcclassname$__number_ranges,\n");
-   if (gen_init) {
-    printer->Print(vars,
-      "  (ProtobufCMessageInit) $lcclassname$__init,\n");
-+    printer->Print(vars, "  (ProtobufCMessageInit) $lcclassname$__init,\n");
-   } else {
-    printer->Print(vars,
-      "  NULL, /* gen_init_helpers = false */\n");
-+    printer->Print(vars, "  NULL, /* gen_init_helpers = false */\n");
-   }
-   printer->Print(vars,
-      "  NULL,NULL,NULL    /* reserved[123] */\n"
-      "};\n");
-+    "  NULL,NULL,NULL    /* reserved[123] */\n"
-+    "};\n");
- }
- 
- int MessageGenerator::GetOneofUnionOrder(const google::protobuf::FieldDescriptor* fd)
-From c59b146aee2d97091ca2adeecd3f2741cb7f0082 Mon Sep 17 00:00:00 2001
-From: Robert Edmonds <edmonds@users.noreply.github.com>
-Date: Sat, 8 Feb 2025 21:10:37 -0500
-Subject: [PATCH 08/11] compat: Use absl::string_view instead of
- google::protobuf::internal::DescriptorStringView
-Even though google::protobuf::internal::DescriptorStringView is exposed
-in public protobuf headers, it's probably not a good idea to rely on an
-"internal" typedef.
-According to https://protobuf.dev/news/2024-10-02/#descriptor-apis:
-    v30 will update return types in descriptor (such as full_name) to be
-    absl::string_view.
-So `absl::string_view` is probably the right type to use here.
---
- protoc-gen-c/compat.h | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
-index fe8041b5..a70cef34 100644
--- a/protoc-gen-c/compat.h
-+++ b/protoc-gen-c/compat.h
-@@ -37,12 +37,16 @@
- # define GOOGLE_LOG            ABSL_LOG
- #endif
- 
-+#if GOOGLE_PROTOBUF_VERSION >= 6030000
-+# include <absl/strings/string_view.h>
-+#endif
-+
- namespace protobuf_c {
- 
- namespace compat {
- 
- #if GOOGLE_PROTOBUF_VERSION >= 6030000
-typedef google::protobuf::internal::DescriptorStringView StringView;
-+typedef absl::string_view StringView;
- #else
- typedef const std::string& StringView;
- #endif
-From 9c56038fd9d3cc2552c297457d7a66efe5cbd2c7 Mon Sep 17 00:00:00 2001
-From: Robert Edmonds <edmonds@users.noreply.github.com>
-Date: Sat, 8 Feb 2025 21:37:30 -0500
-Subject: [PATCH 09/11] Makefile.am: Add compat.h to
- protoc_gen_c_protoc_gen_c_SOURCES
---
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/Makefile.am b/Makefile.am
-index 77aa9d99..26d19f16 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -102,6 +102,7 @@ protoc_gen_c_protoc_gen_c_SOURCES = \
-        protoc-gen-c/c_service.h \
-        protoc-gen-c/c_string_field.cc \
-        protoc-gen-c/c_string_field.h \
-+       protoc-gen-c/compat.h \
-        protobuf-c/protobuf-c.pb.cc \
-        protobuf-c/protobuf-c.pb.h \
-        protoc-gen-c/main.cc
-From 4ebd5cd8238d1f2ac6291b8c8925f34e16ce2123 Mon Sep 17 00:00:00 2001
-From: Robert Edmonds <edmonds@users.noreply.github.com>
-Date: Sat, 8 Feb 2025 21:38:07 -0500
-Subject: [PATCH 10/11] compat: Conditionalize the include of <string>
-It is only needed on older protobuf versions where absl::string_view is
-not being used.
---
- protoc-gen-c/compat.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
-index a70cef34..f6ace7cb 100644
--- a/protoc-gen-c/compat.h
-+++ b/protoc-gen-c/compat.h
-@@ -28,8 +28,6 @@
- #ifndef PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
- #define PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
- 
-#include <string>
-
- #if GOOGLE_PROTOBUF_VERSION >= 4022000
- # define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
- # define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
-@@ -39,6 +37,8 @@
- 
- #if GOOGLE_PROTOBUF_VERSION >= 6030000
- # include <absl/strings/string_view.h>
-+#else
-+# include <string>
- #endif
- 
- namespace protobuf_c {
-From 9a6b35e1e6956fb5cb044910448049b7a5339244 Mon Sep 17 00:00:00 2001
-From: Robert Edmonds <edmonds@users.noreply.github.com>
-Date: Sat, 8 Feb 2025 21:44:42 -0500
-Subject: [PATCH 11/11] Cater to Microsoft Visual C++
-Apparently MSVC doesn't support designated initializers for some reason.
---
- protoc-gen-c/c_enum.cc    | 9 ++-------
- protoc-gen-c/c_message.cc | 2 +-
- 2 files changed, 3 insertions(+), 8 deletions(-)
-diff --git a/protoc-gen-c/c_enum.cc b/protoc-gen-c/c_enum.cc
-index c7839edd..1940ba9d 100644
--- a/protoc-gen-c/c_enum.cc
-+++ b/protoc-gen-c/c_enum.cc
-@@ -195,14 +195,9 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
-   // Sort by name and value, dropping duplicate values if they appear later.
-   // TODO: use a c++ paradigm for this!
-   std::vector<ValueIndex> value_index;
-  for (unsigned j = 0; j < descriptor_->value_count(); j++) {
-+  for (int j = 0; j < descriptor_->value_count(); j++) {
-     const google::protobuf::EnumValueDescriptor *vd = descriptor_->value(j);
-    value_index.push_back({
-      .value = vd->number(),
-      .index = j,
-      .final_index = 0,
-      .name = vd->name(),
-    });
-+    value_index.push_back({ vd->number(), (unsigned)j, 0, vd->name() });
-   }
-   qsort(&value_index[0],
-         value_index.size(),
-diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
-index 2a3b2a2f..94889179 100644
--- a/protoc-gen-c/c_message.cc
-+++ b/protoc-gen-c/c_message.cc
-@@ -581,7 +581,7 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
-     if (!optimize_code_size) {
-       std::vector<NameIndex> field_indices;
-       for (unsigned i = 0; i < descriptor_->field_count(); i++) {
-        field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
-+        field_indices.push_back({ i, sorted_fields[i]->name() });
-       }
-       qsort(&field_indices[0],
-             field_indices.size(),
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.2.bb
index 30c9e19b16..7fe514fe07 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.2.bb
@@ -13,11 +13,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bd8de4f63e06b1ccc06e9f8dc5b1aa97"
 DEPENDS = "protobuf-native protobuf"
 SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https \
-           file://protobuf-30.patch \
 "
 SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch"
-SRCREV = "185beed28e65494be7505b30c1afeaf199e19b23"
+SRCREV = "4719fdd7760624388c2c5b9d6759eb6a47490626"
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_6.33.6.bb b/meta-oe/recipes-devtools/protobuf/protobuf_6.33.6.bb
index 4af48b0b99..880dd82b1d 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_6.33.6.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_6.33.6.bb
@@ -29,6 +29,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d\.\d+\.\d+)"
 CVE_PRODUCT = "google:protobuf protobuf:protobuf google-protobuf protobuf-cpp"
 CVE_STATUS[CVE-2026-0994] = "cpe-incorrect: the vulnerability affects only python3-protobuf recipe"
+CVE_STATUS[CVE-2026-6409] = "cpe-incorrect: the vulnerability affects only the php library"
 inherit cmake pkgconfig ptest
diff --git a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb
index 102e329878..0a3fbf5b93 100644
--- a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb
+++ b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb
@@ -9,7 +9,7 @@ SECTION =  "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-CVE_PRODUCT = "xerces-c\+\+"
+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 \
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists.txt-make-CONFIGURATION_FILES_DIR-aligned.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists.txt-make-CONFIGURATION_FILES_DIR-aligned.patch
new file mode 100644
index 0000000000..2d51253e69
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists.txt-make-CONFIGURATION_FILES_DIR-aligned.patch
@@ -0,0 +1,42 @@
+From bad5d689a69dca3d1dc3e7653946f1205661afbf Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 10 Apr 2026 13:25:39 +0800
+Subject: [PATCH 1/2] CMakeLists.txt: make CONFIGURATION_FILES_DIR aligned
+Commit [723e90e dlt: Adaptation for QNX build system with SDP 7.x
+(#609)], refer [1], make CONFIGURATION_FILES_DIR not aligned.  the CMake
+variable CONFIGURATION_FILES_DIR set to CMAKE_INSTALL_SYSCONFDIR, but
+the tell the compiler to define macro CONFIGURATION_FILES_DIR as
+${CMAKE_INSTALL_PREFIX}/${CONFIGURATION_FILES_DIR}.
+At least for linux, this will cause failure of the systemd service. Eg:
+if CMAKE_INSTALL_PREFIX is /usr, then the configuration file is
+installed under ${CONFIGURATION_FILES_DIR}, usually is /etc. But the
+application like dlt-daemon/dlt-system will find the default
+configuration file under /usr/etc. This makes service start failed.
+[1] https://github.com/COVESA/dlt-daemon/commit/723e90e77db91130375238a592b9a292302a32bb
+Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/issues/848]
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bb9250f..821730a 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -289,7 +289,7 @@ endif()
+ 
+ set(CONFIGURATION_FILES_DIR ${CMAKE_INSTALL_SYSCONFDIR})
+ 
+-add_definitions(-DCONFIGURATION_FILES_DIR="${CMAKE_INSTALL_PREFIX}/${CONFIGURATION_FILES_DIR}")
+add_definitions(-DCONFIGURATION_FILES_DIR="${CONFIGURATION_FILES_DIR}")
+ 
+ add_subdirectory(cmake)
+ 
+-- 
+2.34.1
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-daemon.c-fix-wrong-len.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-daemon.c-fix-wrong-len.patch
new file mode 100644
index 0000000000..bac7691c32
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-dlt-daemon.c-fix-wrong-len.patch
@@ -0,0 +1,37 @@
+From 7e94c281563ff0eb67e521cf0a6fc3049f732214 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Wed, 15 Apr 2026 16:52:19 +0800
+Subject: [PATCH] dlt-daemon.c: fix wrong len
+Set len to 0 makes the application description always empty.
+One of the failure case:
+Running "dlt-example-user 'test'",
+Check "dlt-control -j localhost", will not get application description:
+APID:LOG-
+Expected:
+APID:LOG- Test Application for Logging
+Upstream-Status: Backport [https://github.com/COVESA/dlt-daemon/pull/852]
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ src/daemon/dlt-daemon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c
+index 8c318a4..38fe824 100644
+--- a/src/daemon/dlt-daemon.c
+++ b/src/daemon/dlt-daemon.c
+@@ -4110,7 +4110,7 @@ int dlt_daemon_process_user_message_register_application(DltDaemon *daemon,
+             to_remove = (uint32_t) temp;
+         }
+ 
+-        len = 0;
+        len = userapp.description_length;
+ 
+         if (len > DLT_DAEMON_DESCSIZE) {
+             len = DLT_DAEMON_DESCSIZE;
+-- 
+2.34.1
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-fix-build-failure-when-systemd-is-enabled.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-fix-build-failure-when-systemd-is-enabled.patch
index d19a23cd9c..b1ba08a7d3 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-fix-build-failure-when-systemd-is-enabled.patch
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-fix-build-failure-when-systemd-is-enabled.patch
@@ -1,4 +1,4 @@
-From 28322f951bb8510ddb4cf767426a67c81ce826ab Mon Sep 17 00:00:00 2001
+From 6a95cc20d3c5adfc5c16f269f6dca9f7e2305b4e Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Tue, 17 Mar 2026 13:04:11 +0800
 Subject: [PATCH] fix build failure when systemd is enabled
@@ -42,10 +42,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 src/system/dlt-system-logfile.c          |  4 +--
 src/system/dlt-system-process-handling.c |  2 +-
 src/system/dlt-system-processes.c        |  2 +-
- src/system/dlt-system-syslog.c           |  6 ++--
+ src/system/dlt-system-syslog.c           |  8 ++---
 src/system/dlt-system-watchdog.c         |  8 ++---
 systemd/3rdparty/sd-daemon.c             |  5 +--
- 10 files changed, 40 insertions(+), 42 deletions(-)
+ 10 files changed, 41 insertions(+), 43 deletions(-)
 diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c
 index ef42f89..8c318a4 100644
@@ -329,10 +329,10 @@ index c35596c..b17b8ee 100644
 
     /* go through all process files in directory */
 diff --git a/src/system/dlt-system-syslog.c b/src/system/dlt-system-syslog.c
-index 59e9d3f..d6b1b8a 100644
+index 59e9d3f..f0bf3dc 100644
 --- a/src/system/dlt-system-syslog.c
 +++ b/src/system/dlt-system-syslog.c
-@@ -88,7 +88,7 @@ int init_socket(SyslogOptions opts)
+@@ -88,11 +88,11 @@ int init_socket(SyslogOptions opts)
 #ifdef DLT_USE_IPv6
     syslog_addr.sin6_family = AF_INET6;
     syslog_addr.sin6_addr = in6addr_any;
@@ -341,6 +341,11 @@ index 59e9d3f..d6b1b8a 100644
 #else
     syslog_addr.sin_family = AF_INET;
     syslog_addr.sin_addr.s_addr = INADDR_ANY;
+-    syslog_addr.sin_port = htons(opts.Port);
+    syslog_addr.sin_port = htons((uint16_t)opts.Port);
+     memset(&(syslog_addr.sin_zero), 0, 8);
+ #endif
+ 
 @@ -117,7 +117,7 @@ int read_socket(int sock)
     struct sockaddr_in client_addr;
     socklen_t addr_len = sizeof(struct sockaddr_in);
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-warnings-Fix-clang-generated-warnings.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-warnings-Fix-clang-generated-warnings.patch
new file mode 100644
index 0000000000..208e433e53
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-warnings-Fix-clang-generated-warnings.patch
@@ -0,0 +1,1003 @@
+From 74b36fab6e7e66ca470b7b2ca2a494edd8c673d5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Fri, 10 Apr 2026 23:42:05 -0700
+Subject: [PATCH] warnings: Fix clang generated warnings
+This patch ensures that it can compile with clang-22
+Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/850]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ CMakeLists.txt                                |  3 +
+ examples/example1/example1.c                  |  2 +-
+ examples/example1_v2/example1.c               |  2 +-
+ examples/example2/example2.c                  |  2 +-
+ examples/example2_v2/example2.c               |  2 +-
+ examples/example3/example3.c                  |  2 +-
+ examples/example3_v2/example3.c               |  2 +-
+ examples/example4/example4.c                  |  2 +-
+ examples/example4_v2/example4.c               |  2 +-
+ src/console/dlt-control-v2.c                  |  2 +-
+ src/console/dlt-passive-node-ctrl.c           |  8 +--
+ src/console/dlt-receive-v2.c                  |  2 +-
+ src/console/dlt-sortbytimestamp.c             |  2 +-
+ src/console/logstorage/dlt-logstorage-ctrl.c  |  2 +-
+ src/daemon/dlt-daemon.c                       |  6 +-
+ src/daemon/dlt-daemon.h                       |  2 +-
+ src/daemon/dlt_daemon_client.c                |  6 +-
+ src/examples/dlt-example-filetransfer.c       |  8 ++-
+ .../dlt-example-multicast-clientmsg-view.c    |  4 +-
+ src/examples/dlt-example-user-common-api.c    |  2 +-
+ src/examples/dlt-example-user-func-v2.c       |  2 +-
+ src/examples/dlt-example-user-func.c          |  2 +-
+ src/examples/dlt-example-user-v2.c            |  4 +-
+ src/examples/dlt-example-user.c               |  2 +-
+ src/lib/dlt_env_ll.c                          |  3 +-
+ src/lib/dlt_user.c                            | 70 +++++++++----------
+ .../dlt_offline_logstorage.c                  |  2 +-
+ src/shared/dlt_log.c                          |  8 +--
+ src/system/dlt-system-journal.c               |  8 ++-
+ src/system/dlt-system-process-handling.c      |  2 +-
+ src/system/dlt-system-shell.c                 |  2 +-
+ src/system/dlt-system.h                       |  4 +-
+ src/tests/dlt-test-client-v2.c                |  2 +-
+ src/tests/dlt-test-fork-handler-v2.c          |  2 +-
+ src/tests/dlt-test-fork-handler.c             |  2 +-
+ src/tests/dlt-test-multi-process-v2.c         |  8 +--
+ src/tests/dlt-test-multi-process.c            |  8 +--
+ src/tests/dlt-test-non-verbose.c              |  4 +-
+ src/tests/dlt-test-preregister-context-v2.c   |  2 +-
+ src/tests/dlt-test-preregister-context.c      |  2 +-
+ src/tests/dlt-test-qnx-slogger.c              |  2 +-
+ src/tests/dlt-test-stress-client-v2.c         |  2 +-
+ src/tests/dlt-test-stress-user-v2.c           |  2 +-
+ src/tests/dlt-test-stress-v2.c                |  2 +-
+ src/tests/dlt-test-stress.c                   |  2 +-
+ src/tests/dlt-test-user-v2.c                  |  2 +-
+ src/tests/dlt-test-user.c                     |  2 +-
+ tests/dlt_test_receiver.c                     |  2 +-
+ 48 files changed, 110 insertions(+), 108 deletions(-)
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -261,7 +261,11 @@ add_compile_options(
+     -Wcast-qual
+     -Wno-system-headers
+     -Wno-unused-function
+-    -Wno-stringop-truncation
+    $<$<AND:$<COMPILE_LANGUAGE:C>,$<C_COMPILER_ID:Clang>>:-Wno-gnu-statement-expression-from-macro-expansion>
+    $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:Clang>>:-Wno-gnu-statement-expression-from-macro-expansion>
+    $<$<CXX_COMPILER_ID:Clang>:-Wno-gnu-zero-variadic-macro-arguments>
+    $<$<AND:$<COMPILE_LANGUAGE:C>,$<C_COMPILER_ID:GNU>>:-Wno-stringop-truncation>
+    $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:GNU>>:-Wno-stringop-truncation>
+ )
+ 
+ if(WITH_DOC STREQUAL "OFF")
+--- a/examples/example1/example1.c
+++ b/examples/example1/example1.c
+@@ -50,7 +50,7 @@
+ 
+ DLT_DECLARE_CONTEXT(con_exa1);
+ 
+-int main()
+int main(void)
+ {
+     struct timespec ts;
+ 
+--- a/examples/example1_v2/example1.c
+++ b/examples/example1_v2/example1.c
+@@ -50,7 +50,7 @@
+ 
+ DLT_DECLARE_CONTEXT(con_exa1);
+ 
+-int main()
+int main(void)
+ {
+     struct timespec ts;
+ 
+--- a/examples/example2/example2.c
+++ b/examples/example2/example2.c
+@@ -52,7 +52,7 @@
+ 
+ DLT_DECLARE_CONTEXT(con_exa2);
+ 
+-int main()
+int main(void)
+ {
+     int num;
+     struct timespec ts;
+--- a/examples/example2_v2/example2.c
+++ b/examples/example2_v2/example2.c
+@@ -52,7 +52,7 @@
+ 
+ DLT_DECLARE_CONTEXT(con_exa2);
+ 
+-int main()
+int main(void)
+ {
+     int num;
+     struct timespec ts;
+--- a/examples/example3/example3.c
+++ b/examples/example3/example3.c
+@@ -52,7 +52,7 @@
+ 
+ DLT_DECLARE_CONTEXT(con_exa3);
+ 
+-int main()
+int main(void)
+ {
+     int num;
+     struct timespec ts;
+--- a/examples/example3_v2/example3.c
+++ b/examples/example3_v2/example3.c
+@@ -52,7 +52,7 @@
+ 
+ DLT_DECLARE_CONTEXT(con_exa3);
+ 
+-int main()
+int main(void)
+ {
+     int num;
+     struct timespec ts;
+--- a/examples/example4/example4.c
+++ b/examples/example4/example4.c
+@@ -50,7 +50,7 @@
+ 
+ DLT_DECLARE_CONTEXT(con_exa1);
+ 
+-int main()
+int main(void)
+ {
+     unsigned char buffer[256];
+     int num;
+--- a/examples/example4_v2/example4.c
+++ b/examples/example4_v2/example4.c
+@@ -50,7 +50,7 @@
+ 
+ DLT_DECLARE_CONTEXT(con_exa1);
+ 
+-int main()
+int main(void)
+ {
+     unsigned char buffer[256];
+     int num;
+--- a/src/console/dlt-control-v2.c
+++ b/src/console/dlt-control-v2.c
+@@ -129,7 +129,7 @@ typedef struct {
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/console/dlt-passive-node-ctrl.c
+++ b/src/console/dlt-passive-node-ctrl.c
+@@ -118,7 +118,7 @@ void set_node_id(char *id)
+     }
+ }
+ 
+-char *get_node_id()
+char *get_node_id(void)
+ {
+     return g_options.node_id;
+ }
+@@ -211,7 +211,7 @@ static int dlt_passive_node_analyze_resp
+  *
+  * @return Pointer ot DltControlMsgBody, NULL otherwise
+  */
+-DltControlMsgBody *dlt_passive_node_prepare_message_body()
+DltControlMsgBody *dlt_passive_node_prepare_message_body(void)
+ {
+     DltControlMsgBody *mb = calloc(1, sizeof(DltControlMsgBody));
+     char *ecuid = get_node_id();
+@@ -271,7 +271,7 @@ void dlt_passive_node_destroy_message_bo
+  *
+  * @return 0 on success, -1 on error
+  */
+-static int dlt_passive_node_ctrl_single_request()
+static int dlt_passive_node_ctrl_single_request(void)
+ {
+     int ret = -1;
+ 
+@@ -301,7 +301,7 @@ static int dlt_passive_node_ctrl_single_
+     return ret;
+ }
+ 
+-static void usage()
+static void usage(void)
+ {
+     printf("Usage: dlt-passive-node-ctrl [options]\n");
+     printf("Send a trigger to DLT daemon to (dis)connect a passive node "
+--- a/src/console/dlt-receive-v2.c
+++ b/src/console/dlt-receive-v2.c
+@@ -144,7 +144,7 @@ typedef struct {
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/console/dlt-sortbytimestamp.c
+++ b/src/console/dlt-sortbytimestamp.c
+@@ -194,7 +194,7 @@ void write_messages(int ohandle, DltFile
+ /**
+  * Print usage information of tool.
+  */
+-void usage() {
+void usage(void) {
+     char version[DLT_VERBUFSIZE];
+ 
+     dlt_get_version(version, DLT_VERBUFSIZE);
+--- a/src/console/logstorage/dlt-logstorage-ctrl.c
+++ b/src/console/logstorage/dlt-logstorage-ctrl.c
+@@ -354,7 +354,7 @@ static int dlt_logstorage_ctrl_setup_eve
+  *
+  * @return 0 on success, -1 otherwise.
+  */
+-static int dlt_logstorage_ctrl_single_request()
+static int dlt_logstorage_ctrl_single_request(void)
+ {
+     int ret = 0;
+ 
+--- a/src/daemon/dlt-daemon.c
+++ b/src/daemon/dlt-daemon.c
+@@ -207,7 +207,7 @@ void close_pipes(int fds[2])
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[DLT_DAEMON_TEXTBUFSIZE];
+     dlt_get_version(version, DLT_DAEMON_TEXTBUFSIZE);
+@@ -2489,7 +2489,7 @@ void dlt_daemon_local_cleanup(DltDaemon
+     free(daemon_local->flags.ipNodes);
+ }
+ 
+-void dlt_daemon_exit_trigger()
+void dlt_daemon_exit_trigger(void)
+ {
+     /* stop event loop */
+     g_exit = -1;
+@@ -2655,7 +2655,7 @@ int dlt_daemon_log_internal(DltDaemon *d
+ 
+         msg.storageheadersizev2 = (uint32_t)(STORAGE_HEADER_V2_FIXED_SIZE + strlen(DLT_DAEMON_ECU_ID));
+         msg.baseheadersizev2 = BASE_HEADER_V2_FIXED_SIZE;
+-        msg.baseheaderextrasizev2 = (int32_t)dlt_message_get_extraparameters_size_v2(msgcontent);
+        msg.baseheaderextrasizev2 = (uint32_t)dlt_message_get_extraparameters_size_v2(msgcontent);
+         /* Ecu Id, App Id, Ctx Id and Session Id*/
+         msg.extendedheadersizev2 = (uint32_t)(1 + strlen(DLT_DAEMON_ECU_ID) + 1 + strlen(app_id) + 1 + strlen(ctx_id) + sizeof(uint32_t));
+ 
+--- a/src/daemon/dlt-daemon.h
+++ b/src/daemon/dlt-daemon.h
+@@ -217,7 +217,7 @@ int dlt_daemon_local_connection_init(Dlt
+ int dlt_daemon_local_ecu_version_init(DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose);
+ 
+ void dlt_daemon_daemonize(int verbose);
+-void dlt_daemon_exit_trigger();
+void dlt_daemon_exit_trigger(void);
+ void dlt_daemon_signal_handler(int sig);
+ #ifdef __QNX__
+ void dlt_daemon_cleanup_timers();
+--- a/src/daemon/dlt_daemon_client.c
+++ b/src/daemon/dlt_daemon_client.c
+@@ -817,7 +817,7 @@ int dlt_daemon_client_send_control_messa
+ 
+     msg->storageheadersizev2 = (uint32_t)(STORAGE_HEADER_V2_FIXED_SIZE + (daemon->ecuid2len));
+     msg->baseheadersizev2 = BASE_HEADER_V2_FIXED_SIZE;
+-    msg->baseheaderextrasizev2 = (int32_t)dlt_message_get_extraparameters_size_v2(DLT_CONTROL_MSG);
+    msg->baseheaderextrasizev2 = (uint32_t)dlt_message_get_extraparameters_size_v2(DLT_CONTROL_MSG);
+     msg->extendedheadersizev2 = (uint32_t)((daemon->ecuid2len) + 1 + appidlen + 1 + ctxidlen + 1);
+ 
+     msg->headersizev2 = (int32_t)(msg->storageheadersizev2 + msg->baseheadersizev2 +
+@@ -5388,7 +5388,7 @@ void dlt_daemon_control_passive_node_con
+ 
+         con = &daemon_local->pGateway.connections[i];
+ 
+-        resp->connection_status[i] = con->status;
+        resp->connection_status[i] = (uint8_t)con->status;
+         //TBD: Review node_id[i * con->ecuid2len]
+         memcpy(&resp->node_id[i * con->ecuid2len], con->ecuid2, con->ecuid2len);
+     }
+@@ -5471,7 +5471,7 @@ void dlt_daemon_control_passive_node_con
+ 
+         con = &daemon_local->pGateway.connections[i];
+ 
+-        resp->connection_status[i] = con->status;
+        resp->connection_status[i] = (uint8_t)con->status;
+         memcpy(&resp->node_id[i * DLT_ID_SIZE], con->ecuid, DLT_ID_SIZE);
+     }
+ 
+--- a/src/examples/dlt-example-filetransfer.c
+++ b/src/examples/dlt-example-filetransfer.c
+@@ -84,9 +84,10 @@ bool shutdownStatus = false;
+  * The function will set the flag (shutdownStatus) to true after .2 sec
+  * @return Null to stop thread
+  */
+-void *cancel_filetransfer()
+void *cancel_filetransfer(void* arg)
+ {
+     // wait 200msec once a filetransfer is started and then set the flag to true
+    (void)arg;
+     struct timespec ts;
+     ts.tv_sec = 0;
+     ts.tv_nsec = 200000000; // 200 ms
+@@ -99,8 +100,9 @@ void *cancel_filetransfer()
+  * The function will start dlt filetransfer and will throw error if status of shutdownStatus is high
+  * @return Null to stop thread
+  */
+-void *filetransfer()
+void *filetransfer(void* arg)
+ {
+    (void)arg;
+     int transferResult;
+ 
+     transferResult = dlt_user_log_file_header(&fileContext, file);
+@@ -125,7 +127,7 @@ void *filetransfer()
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/examples/dlt-example-multicast-clientmsg-view.c
+++ b/src/examples/dlt-example-multicast-clientmsg-view.c
+@@ -96,7 +96,7 @@ int dlt_receive_message_callback_udp(Dlt
+ {
+     static char text[DLT_RECEIVE_TEXTBUFSIZE];
+ 
+-    if ((message == NULL)) {
+    if (message == NULL) {
+         printf("NULL message in dlt_receive_message_callback_udp\n");
+         return -1;
+     }
+@@ -119,7 +119,7 @@ int dlt_receive_message_callback_udp(Dlt
+ }
+ 
+ 
+-int main()
+int main(void)
+ {
+     struct clientinfostruct clientinfo;
+     struct ip_mreq mreq;
+--- a/src/examples/dlt-example-user-common-api.c
+++ b/src/examples/dlt-example-user-common-api.c
+@@ -66,7 +66,7 @@ DLT_DECLARE_CONTEXT(mycontext)
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/examples/dlt-example-user-func-v2.c
+++ b/src/examples/dlt-example-user-func-v2.c
+@@ -84,7 +84,7 @@ DltContextData mycontextdata;
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/examples/dlt-example-user-func.c
+++ b/src/examples/dlt-example-user-func.c
+@@ -82,7 +82,7 @@ DltContextData mycontextdata;
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/examples/dlt-example-user-v2.c
+++ b/src/examples/dlt-example-user-v2.c
+@@ -88,7 +88,7 @@ DLT_DECLARE_CONTEXT(mycontext3)
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+@@ -458,4 +458,4 @@ int dlt_user_injection_callback_with_spe
+ void dlt_user_log_level_changed_callback_v2(char *context_id, uint8_t log_level, uint8_t trace_status)
+ {
+     printf("Log level changed of context %s, LogLevel=%u, TraceState=%u\n", context_id, log_level, trace_status);
+-}
+\ No newline at end of file
+}
+--- a/src/examples/dlt-example-user.c
+++ b/src/examples/dlt-example-user.c
+@@ -86,7 +86,7 @@ DLT_DECLARE_CONTEXT(mycontext3)
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/lib/dlt_env_ll.c
+++ b/src/lib/dlt_env_ll.c
+@@ -125,7 +125,8 @@ int dlt_env_helper_to_lower(char **const
+ 
+ int dlt_env_extract_symbolic_ll(char **const env, int8_t *ll)
+ {
+-    char result[strlen("verbose") + 1];
+    char result[sizeof("verbose")];
+
+ 
+     if (!env || !ll) {
+         return -1;
+--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
+@@ -545,7 +545,7 @@ DltReturnValue dlt_init(void)
+ 
+     /* Check logging mode and internal log file is opened or not*/
+     if (logging_mode == DLT_LOG_TO_FILE && logging_handle == NULL) {
+-        dlt_log_init(logging_mode);
+        dlt_log_init((int)logging_mode);
+     }
+ 
+     /* Initialize common part of dlt_init()/dlt_init_file() */
+@@ -2391,14 +2391,14 @@ DltReturnValue dlt_set_application_ll_ts
+ 
+     /* Update local structures */
+     for (i = 0; i < dlt_user.dlt_ll_ts_num_entries; i++) {
+-        dlt_user.dlt_ll_ts[i].log_level = loglevel;
+-        dlt_user.dlt_ll_ts[i].trace_status = tracestatus;
+        dlt_user.dlt_ll_ts[i].log_level = (int8_t)loglevel;
+        dlt_user.dlt_ll_ts[i].trace_status = (int8_t)tracestatus;
+ 
+         if (dlt_user.dlt_ll_ts[i].log_level_ptr)
+-            *(dlt_user.dlt_ll_ts[i].log_level_ptr) = loglevel;
+            *(dlt_user.dlt_ll_ts[i].log_level_ptr) = (int8_t)loglevel;
+ 
+         if (dlt_user.dlt_ll_ts[i].trace_status_ptr)
+-            *(dlt_user.dlt_ll_ts[i].trace_status_ptr) = tracestatus;
+            *(dlt_user.dlt_ll_ts[i].trace_status_ptr) = (int8_t)tracestatus;
+     }
+ 
+     dlt_mutex_unlock();
+@@ -2413,7 +2413,7 @@ DltReturnValue dlt_set_application_ll_ts
+     }
+ }
+ 
+-int dlt_get_log_state()
+int dlt_get_log_state(void)
+ {
+     return dlt_user.log_state;
+ }
+@@ -2500,25 +2500,6 @@ DltReturnValue dlt_user_log_write_start_
+     return DLT_RETURN_TRUE;
+ }
+ 
+-static DltReturnValue dlt_user_log_write_start_internal(DltContext *handle,
+-                                                        DltContextData *log,
+-                                                        DltLogLevelType loglevel,
+-                                                        uint32_t messageid,
+-                                                        bool is_verbose);
+-
+-inline DltReturnValue dlt_user_log_write_start(DltContext *handle, DltContextData *log, DltLogLevelType loglevel)
+-{
+-    return dlt_user_log_write_start_internal(handle, log, loglevel, DLT_USER_DEFAULT_MSGID, true);
+-}
+-
+-DltReturnValue dlt_user_log_write_start_id(DltContext *handle,
+-                                           DltContextData *log,
+-                                           DltLogLevelType loglevel,
+-                                           uint32_t messageid)
+-{
+-    return dlt_user_log_write_start_internal(handle, log, loglevel, messageid, false);
+-}
+-
+ DltReturnValue dlt_user_log_write_start_internal(DltContext *handle,
+                                            DltContextData *log,
+                                            DltLogLevelType loglevel,
+@@ -2587,6 +2568,19 @@ DltReturnValue dlt_user_log_write_start_
+     return ret;
+ }
+ 
+inline DltReturnValue dlt_user_log_write_start(DltContext *handle, DltContextData *log, DltLogLevelType loglevel)
+{
+    return dlt_user_log_write_start_internal(handle, log, loglevel, DLT_USER_DEFAULT_MSGID, true);
+}
+
+DltReturnValue dlt_user_log_write_start_id(DltContext *handle,
+                                           DltContextData *log,
+                                           DltLogLevelType loglevel,
+                                           uint32_t messageid)
+{
+    return dlt_user_log_write_start_internal(handle, log, loglevel, messageid, false);
+}
+
+ DltReturnValue dlt_user_log_write_start_w_given_buffer(DltContext *handle,
+                                                        DltContextData *log,
+                                                        DltLogLevelType loglevel,
+@@ -3746,7 +3740,7 @@ DltReturnValue dlt_user_trace_network_se
+         }
+ 
+         log.args_num = 0;
+-        log.trace_status = nw_trace_type;
+        log.trace_status = (int32_t)nw_trace_type;
+         log.size = 0;
+ 
+         gettimeofday(&tv, NULL);
+@@ -3848,7 +3842,7 @@ DltReturnValue dlt_user_trace_network_se
+         }
+ 
+         log.args_num = 0;
+-        log.trace_status = nw_trace_type;
+        log.trace_status = (int32_t)nw_trace_type;
+         log.size = 0;
+ 
+         /* Write identifier */
+@@ -3917,7 +3911,7 @@ DltReturnValue dlt_user_trace_network_se
+         }
+ 
+         log.args_num = 0;
+-        log.trace_status = nw_trace_type;
+        log.trace_status = (int32_t)nw_trace_type;
+         log.size = 0;
+ 
+         /* Write identifier */
+@@ -4184,7 +4178,7 @@ DltReturnValue dlt_user_trace_network_tr
+         }
+ 
+         log.args_num = 0;
+-        log.trace_status = nw_trace_type;
+        log.trace_status = (int32_t)nw_trace_type;
+         log.size = 0;
+ 
+         if (header == NULL)
+@@ -4556,7 +4550,7 @@ DltReturnValue dlt_log_raw_v2(DltContext
+     return DLT_RETURN_OK;
+ }
+ 
+-DltReturnValue dlt_log_marker()
+DltReturnValue dlt_log_marker(void)
+ {
+     if (!DLT_USER_INITIALIZED) {
+         if (dlt_init() < DLT_RETURN_OK) {
+@@ -6299,8 +6293,8 @@ DltReturnValue dlt_send_app_ll_ts_limit(
+ 
+     /* set usercontext */
+     dlt_set_id(usercontext.apid, apid);       /* application id */
+-    usercontext.log_level = loglevel;
+-    usercontext.trace_status = tracestatus;
+    usercontext.log_level = (uint8_t)loglevel;
+    usercontext.trace_status = (uint8_t)tracestatus;
+ 
+     if (dlt_user.dlt_is_file)
+         return DLT_RETURN_OK;
+@@ -6354,8 +6348,8 @@ DltReturnValue dlt_send_app_ll_ts_limit_
+     }
+     usercontext.apidlen = (uint8_t)apidlen_sz;
+     dlt_set_id_v2(usercontext.apid, apid, usercontext.apidlen); /* application id */
+-    usercontext.log_level = loglevel;
+-    usercontext.trace_status = tracestatus;
+    usercontext.log_level = (uint8_t)loglevel;
+    usercontext.trace_status = (uint8_t)tracestatus;
+ 
+     size_t buffersize = sizeof(uint8_t) + usercontext.apidlen + sizeof(uint8_t) + sizeof(uint8_t);
+     uint8_t buffer[DLT_ID_SIZE + 3];
+@@ -6435,7 +6429,7 @@ DltReturnValue dlt_user_log_send_log_mod
+     return DLT_RETURN_OK;
+ }
+ 
+-DltReturnValue dlt_user_log_send_marker()
+DltReturnValue dlt_user_log_send_marker(void)
+ {
+     DltUserHeader userheader;
+     DltReturnValue ret;
+@@ -7349,7 +7343,7 @@ void dlt_user_test_corrupt_message_size(
+ #endif
+ 
+ 
+-int dlt_start_threads()
+int dlt_start_threads(void)
+ {
+     struct timespec time_to_wait, single_wait;
+     struct timespec now;
+@@ -7438,7 +7432,7 @@ int dlt_start_threads()
+     return 0;
+ }
+ 
+-void dlt_stop_threads()
+void dlt_stop_threads(void)
+ {
+     int dlt_housekeeperthread_result = 0;
+     int joined = 0;
+@@ -7510,7 +7504,7 @@ void dlt_stop_threads()
+ #endif /* DLT_NETWORK_TRACE_ENABLE */
+ }
+ 
+-static void dlt_fork_child_fork_handler()
+static void dlt_fork_child_fork_handler(void)
+ {
+     g_dlt_is_child = 1;
+     dlt_user_init_state = INIT_UNITIALIZED;
+--- a/src/offlinelogstorage/dlt_offline_logstorage.c
+++ b/src/offlinelogstorage/dlt_offline_logstorage.c
+@@ -1732,7 +1732,7 @@ DLT_STATIC int dlt_daemon_offline_setup_
+             continue;
+ 
+         /* check value and store temporary */
+-        ret = dlt_logstorage_check_param(&tmp_data, i, value);
+        ret = dlt_logstorage_check_param(&tmp_data, (DltLogstorageFilterConfType)i, value);
+ 
+         if (ret != 0) {
+             if (tmp_data.apids != NULL) {
+--- a/src/shared/dlt_log.c
+++ b/src/shared/dlt_log.c
+@@ -113,7 +113,7 @@ DltReturnValue dlt_log_init_multiple_log
+     return result;
+ }
+ 
+-DltReturnValue dlt_log_init_single_logfile()
+DltReturnValue dlt_log_init_single_logfile(void)
+ {
+     /* internal logging to file */
+     errno = 0;
+@@ -333,14 +333,14 @@ void dlt_log_free(void)
+     }
+ }
+ 
+-void dlt_log_free_single_logfile()
+void dlt_log_free_single_logfile(void)
+ {
+     if (logging_handle != NULL) {
+         fclose(logging_handle);
+     }
+ }
+ 
+-void dlt_log_free_multiple_logfiles()
+void dlt_log_free_multiple_logfiles(void)
+ {
+     if (DLT_RETURN_ERROR == multiple_files_buffer_free(&multiple_files_ring_buffer)) return;
+ 
+@@ -348,7 +348,7 @@ void dlt_log_free_multiple_logfiles()
+     multiple_files_ring_buffer.ohandle = -1;
+ }
+ 
+-bool dlt_is_log_in_multiple_files_active()
+bool dlt_is_log_in_multiple_files_active(void)
+ {
+     return multiple_files_ring_buffer.ohandle > -1;
+ }
+--- a/src/system/dlt-system-journal.c
+++ b/src/system/dlt-system-journal.c
+@@ -73,7 +73,7 @@ typedef struct
+ DLT_IMPORT_CONTEXT(dltsystem)
+ DLT_DECLARE_CONTEXT(journalContext)
+ 
+-int journal_checkUserBufferForFreeSpace()
+int journal_checkUserBufferForFreeSpace(void)
+ {
+     int total_size, used_size;
+ 
+@@ -87,7 +87,7 @@ int journal_checkUserBufferForFreeSpace(
+ 
+ int dlt_system_journal_get(sd_journal *j, char *target, const char *field, size_t max_size)
+ {
+-    char *data;
+    const char *data;
+     size_t length;
+     int error_code;
+     size_t field_size;
+@@ -100,7 +100,9 @@ int dlt_system_journal_get(sd_journal *j
+     target[0] = 0;
+ 
+     /* get data from journal */
+-    error_code = sd_journal_get_data(j, field, (const void **)&data, &length);
+    const void *tmp;
+    error_code = sd_journal_get_data(j, field, &tmp, &length);
+    data = (const char *)tmp;
+ 
+     /* check if an error */
+     if (error_code)
+--- a/src/system/dlt-system-process-handling.c
+++ b/src/system/dlt-system-process-handling.c
+@@ -72,7 +72,7 @@ volatile uint8_t quit = 0;
+ extern s_ft_inotify ino;
+ #endif
+ 
+-int daemonize()
+int daemonize(void)
+ {
+     DLT_LOG(dltsystem, DLT_LOG_DEBUG,
+             DLT_STRING("dlt-system-process-handling, daemonize"));
+--- a/src/system/dlt-system-shell.c
+++ b/src/system/dlt-system-shell.c
+@@ -112,7 +112,7 @@ int dlt_shell_injection_callback(uint32_
+     return 0;
+ }
+ 
+-void init_shell()
+void init_shell(void)
+ {
+     DLT_LOG(dltsystem, DLT_LOG_DEBUG,
+             DLT_STRING("dlt-system-shell, register callback"));
+--- a/src/system/dlt-system.h
+++ b/src/system/dlt-system.h
+@@ -193,8 +193,8 @@ int read_configuration_file(DltSystemCon
+ void cleanup_config(DltSystemConfiguration *config, DltSystemCliOptions *options);
+ 
+ /* For dlt-process-handling.c */
+-int daemonize();
+-void init_shell();
+int daemonize(void);
+void init_shell(void);
+ void dlt_system_signal_handler(int sig);
+ 
+ /* Main function for creating/registering all needed file descriptors and starting the poll for all of them. */
+--- a/src/tests/dlt-test-client-v2.c
+++ b/src/tests/dlt-test-client-v2.c
+@@ -125,7 +125,7 @@ typedef struct
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/tests/dlt-test-fork-handler-v2.c
+++ b/src/tests/dlt-test-fork-handler-v2.c
+@@ -91,7 +91,7 @@ void dlt_log_message(DltContext *context
+ /**
+  * @brief sample code for using at_fork-handler
+  */
+-int main()
+int main(void)
+ {
+     DltContext mainContext;
+     struct timespec timeout, r;
+--- a/src/tests/dlt-test-fork-handler.c
+++ b/src/tests/dlt-test-fork-handler.c
+@@ -49,7 +49,7 @@ void dlt_log_message(DltContext *context
+ /**
+  * @brief sample code for using at_fork-handler
+  */
+-int main()
+int main(void)
+ {
+     DltContext mainContext;
+     struct timespec timeout, r;
+--- a/src/tests/dlt-test-multi-process-v2.c
+++ b/src/tests/dlt-test-multi-process-v2.c
+@@ -112,11 +112,11 @@ typedef struct {
+ /* Forward declarations */
+ void init_params(s_parameters *params);
+ void quit_handler(int signum);
+-void cleanup();
+void cleanup(void);
+ void do_forks(s_parameters params);
+ void run_threads(s_parameters params);
+ void *do_logging(void *data);
+-int wait_for_death();
+int wait_for_death(void);
+ 
+ /* State information */
+ volatile sig_atomic_t in_handler = 0;
+@@ -323,7 +323,7 @@ void quit_handler(int signum)
+ /**
+  * Ask the child processes to die
+  */
+-void cleanup()
+void cleanup(void)
+ {
+     unsigned int i;
+ 
+@@ -458,7 +458,7 @@ void run_threads(s_parameters params)
+ /**
+  * Wait for child processes to complete their work.
+  */
+-int wait_for_death()
+int wait_for_death(void)
+ {
+     int pids_left = (int) pidcount;
+ 
+--- a/src/tests/dlt-test-multi-process.c
+++ b/src/tests/dlt-test-multi-process.c
+@@ -89,11 +89,11 @@ typedef struct {
+ /* Forward declarations */
+ void init_params(s_parameters *params);
+ void quit_handler(int signum);
+-void cleanup();
+void cleanup(void);
+ void do_forks(s_parameters params);
+ void run_threads(s_parameters params);
+ void *do_logging(void *arg);
+-int wait_for_death();
+int wait_for_death(void);
+ 
+ /* State information */
+ volatile sig_atomic_t in_handler = 0;
+@@ -300,7 +300,7 @@ void quit_handler(int signum)
+ /**
+  * Ask the child processes to die
+  */
+-void cleanup()
+void cleanup(void)
+ {
+     unsigned int i;
+ 
+@@ -435,7 +435,7 @@ void run_threads(s_parameters params)
+ /**
+  * Wait for child processes to complete their work.
+  */
+-int wait_for_death()
+int wait_for_death(void)
+ {
+     int pids_left = (int) pidcount;
+ 
+--- a/src/tests/dlt-test-non-verbose.c
+++ b/src/tests/dlt-test-non-verbose.c
+@@ -58,7 +58,7 @@ DltContextData context_data;
+ 
+ void dlt_user_log_level_changed_callback(char context_id[DLT_ID_SIZE],uint8_t log_level,uint8_t trace_status);
+ 
+-void usage()
+void usage(void)
+ {
+     char version[DLT_COMMON_BUFFER_LENGTH];
+ 
+@@ -84,7 +84,7 @@ void usage()
+ /******************/
+ /* The test cases */
+ /******************/
+-int test_logstorage()
+int test_logstorage(void)
+ {
+     int delay = LOG_DELAY;
+     int i;
+--- a/src/tests/dlt-test-preregister-context-v2.c
+++ b/src/tests/dlt-test-preregister-context-v2.c
+@@ -72,7 +72,7 @@
+ /**
+  * @brief sample code for using pre-registered contexts
+  */
+-int main()
+int main(void)
+ {
+     DltContext mainContext;
+     struct timespec ts;
+--- a/src/tests/dlt-test-preregister-context.c
+++ b/src/tests/dlt-test-preregister-context.c
+@@ -30,7 +30,7 @@
+ /**
+  * @brief sample code for using pre-registered contexts
+  */
+-int main()
+int main(void)
+ {
+     DltContext mainContext;
+     struct timespec ts;
+--- a/src/tests/dlt-test-qnx-slogger.c
+++ b/src/tests/dlt-test-qnx-slogger.c
+@@ -28,7 +28,7 @@
+ #define DELAY 500
+ #define LENGTH 100
+ 
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/tests/dlt-test-stress-client-v2.c
+++ b/src/tests/dlt-test-stress-client-v2.c
+@@ -127,7 +127,7 @@ typedef struct
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/tests/dlt-test-stress-user-v2.c
+++ b/src/tests/dlt-test-stress-user-v2.c
+@@ -86,7 +86,7 @@ DltContextData context_data;
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/tests/dlt-test-stress-v2.c
+++ b/src/tests/dlt-test-stress-v2.c
+@@ -104,7 +104,7 @@ char *env_manual_interruption = 0;
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/tests/dlt-test-stress.c
+++ b/src/tests/dlt-test-stress.c
+@@ -105,7 +105,7 @@ char *env_manual_interruption = 0;
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/tests/dlt-test-user-v2.c
+++ b/src/tests/dlt-test-user-v2.c
+@@ -142,7 +142,7 @@ DltContextData context_data;
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/tests/dlt-test-user.c
+++ b/src/tests/dlt-test-user.c
+@@ -144,7 +144,7 @@ DltContextData context_data;
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/tests/dlt_test_receiver.c
+++ b/tests/dlt_test_receiver.c
+@@ -107,7 +107,7 @@ int result = 0;
+ /**
+  * Print usage information of tool.
+  */
+-void usage()
+void usage(void)
+ {
+     char version[255];
+ 
+--- a/src/shared/dlt_common.c
+++ b/src/shared/dlt_common.c
+@@ -6108,7 +6108,7 @@ DltReturnValue dlt_message_argument_prin
+     return DLT_RETURN_OK;
+ }
+ 
+-void dlt_check_envvar()
+void dlt_check_envvar(void)
+ {
+     char *env_log_filename = getenv("DLT_LOG_FILENAME");
+ 
+--- a/src/system/dlt-system-filetransfer.c
+++ b/src/system/dlt-system-filetransfer.c
+@@ -724,10 +724,14 @@ int process_files(FiletransferOptions co
+                         }
+ 
+                         char *tosend = malloc(length);
+#ifndef __clang__
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wformat-truncation="
+#endif
+                         snprintf(tosend, length, "%s/%s", opts->Directory[j], ie->name);
+#ifndef __clang__
+ #pragma GCC diagnostic pop
+#endif
+                         send_one(tosend, opts, j);
+                         free(tosend);
+                     }
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/char_conversion.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/char_conversion.patch
new file mode 100644
index 0000000000..8d943b9764
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/char_conversion.patch
@@ -0,0 +1,27 @@
+daemon: fix sign-conversion warning in dlt_timer_conn_types array type
+Change dlt_timer_conn_types from char[] to DltConnectionType[] to match
+the actual type of values stored in the array.
+This was silently working on arm64 because char is unsigned by default on
+that architecture, making it compatible with DltConnectionType (an unsigned
+enum). On x86_64, char is signed by default, causing an implicit signed-to-
+unsigned conversion when passing array elements to dlt_connection_create(),
+which triggered -Wsign-conversion and broke the build.
+The fix corrects the array's declared type to match its contents, making the
+code portable regardless of the platform's char signedness.
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+--- a/src/daemon/dlt-daemon.c
+++ b/src/daemon/dlt-daemon.c
+@@ -140,7 +140,7 @@ int g_signo = 0;
+ /* used for value from conf file */
+ static int value_length = 1024;
+ 
+-static char dlt_timer_conn_types[DLT_TIMER_UNKNOWN + 1] = {
+static DltConnectionType dlt_timer_conn_types[DLT_TIMER_UNKNOWN + 1] = {
+     [DLT_TIMER_PACKET] = DLT_CONNECTION_ONE_S_TIMER,
+     [DLT_TIMER_ECU] = DLT_CONNECTION_SIXTY_S_TIMER,
+ #ifdef DLT_SYSTEMD_WATCHDOG_ENABLE
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_3.0.0.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_3.0.0.bb
index 431e9f3067..6de62c2a3d 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_3.0.0.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_3.0.0.bb
@@ -22,6 +22,10 @@ SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \
           file://0001-Fix-build-failures.patch \
           file://0001-fix-build-failure-when-systemd-is-enabled.patch \
           file://0001-Fix-build-failure-with-glibc-2.43.patch \
+           file://0001-CMakeLists.txt-make-CONFIGURATION_FILES_DIR-aligned.patch \
+           file://0001-warnings-Fix-clang-generated-warnings.patch \
+           file://0001-dlt-daemon.c-fix-wrong-len.patch \
+           file://char_conversion.patch \
           "
 SRCREV = "f595ea29d1007ca1c3b2d1fd3a88adf7d3db6320"
@@ -53,7 +57,7 @@ inherit autotools gettext cmake pkgconfig systemd
 # -DWITH_DLT_COREDUMPHANDLER=ON this feature is too experimental, disable for now
 #FILES:${PN} += "${libdir}/sysctl.d"
-EXTRA_OECMAKE += "-DWITH_DLT_LOGSTORAGE_GZIP=ON -DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}"
+EXTRA_OECMAKE += "-DWITH_DLT_LOGSTORAGE_GZIP=ON -DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir} -DWITH_DLT_USE_IPv6=OFF"
 PACKAGES += "${PN}-systemd"
 SYSTEMD_PACKAGES = "${PN} ${PN}-systemd"
diff --git a/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb b/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
index 4ca7c081ea..d1480e836a 100644
--- a/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
+++ b/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
@@ -19,6 +19,8 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
 inherit autotools gettext
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 EXTRA_OECONF += "PERL='${USRBINPATH}/env perl'"
 SRC_URI[sha256sum] = "6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb"
diff --git a/meta-oe/recipes-extended/figlet/figlet_git.bb b/meta-oe/recipes-extended/figlet/figlet_git.bb
index d226806050..6a8bb42699 100644
--- a/meta-oe/recipes-extended/figlet/figlet_git.bb
+++ b/meta-oe/recipes-extended/figlet/figlet_git.bb
@@ -10,5 +10,6 @@ SRCREV = "5bbcd7383a8c3a531299b216b0c734e1495c6db3"
 PV = "2.2.5+git"
 inherit autotools
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.17.3.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.17.6.bb
index cd461e2632..1512b7239f 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak_1.17.3.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak_1.17.6.bb
@@ -8,7 +8,7 @@ SRC_URI = " \
    file://0001-flatpak-pc-add-pc_sysrootdir.patch \
 "
-SRCREV = "13b26a94a3bd6fec309a16982a3a80d83776d7ac"
+SRCREV = "9b21874f1a175a9b7c79175a221fa043e202ca73"
 inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native mime features_check useradd
@@ -76,3 +76,6 @@ USERADD_PACKAGES = "${PN}"
 USERADD_PARAM:${PN} = "--system --no-create-home --user-group --shell /sbin/nologin flatpak"
 FILES:${PN} += "${libdir} ${datadir}"
+CVE_STATUS[CVE-2026-34078] = "fixed-version: fixed in v1.17.4"
+CVE_STATUS[CVE-2026-34079] = "fixed-version: fixed in v1.17.4"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch
index 1756d74560..55fb0c7414 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch
@@ -1,4 +1,4 @@
-From 4b47a8f0e3d1d429356cdda8efa7682ab88d344a Mon Sep 17 00:00:00 2001
+From 8d93bb7c866f88dd7f2cac81d2acfcffae9d555d Mon Sep 17 00:00:00 2001
 From: Niko Mauno <niko.mauno@vaisala.com>
 Date: Sun, 29 Sep 2024 12:00:00 +0000
 Subject: [PATCH] lib: Do not use private makefile targets in CMakelists.txt
@@ -48,7 +48,7 @@ index 489570026..06d99cbbe 100644
 
 
 diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt
-index 5421f8c80..0dcf7645c 100644
+index a3385a8ba..80170f8e7 100644
 --- a/lib/cmetrics/CMakeLists.txt
 +++ b/lib/cmetrics/CMakeLists.txt
 @@ -60,12 +60,8 @@ if(NOT MSVC)
@@ -67,11 +67,11 @@ index 5421f8c80..0dcf7645c 100644
 # Configuration options
 option(CMT_DEV                       "Enable development mode"                    No)
 diff --git a/lib/ctraces/CMakeLists.txt b/lib/ctraces/CMakeLists.txt
-index 73723433d..9f60699d5 100644
+index bb2c54fa6..7d59dd834 100644
 --- a/lib/ctraces/CMakeLists.txt
 +++ b/lib/ctraces/CMakeLists.txt
-@@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR  6)
+@@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR  7)
- set(CTR_VERSION_PATCH  6)
+ set(CTR_VERSION_PATCH  1)
 set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}")
 
 -# Define __FILENAME__ consistently across Operating Systems
@@ -86,7 +86,7 @@ index 73723433d..9f60699d5 100644
 # Configuration options
 option(CTR_DEV             "Enable development mode"                   No)
 diff --git a/lib/monkey/CMakeLists.txt b/lib/monkey/CMakeLists.txt
-index 3fbace595..1c6ad031c 100644
+index 3dc1ef28a..2d08fc5fd 100644
 --- a/lib/monkey/CMakeLists.txt
 +++ b/lib/monkey/CMakeLists.txt
 @@ -15,10 +15,8 @@ include(GNUInstallDirs)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
index 4c6cac0cbd..51f48544b1 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
@@ -1,4 +1,4 @@
-From 596a53c35166e6cc5c20fb1d28bb5c92a248f695 Mon Sep 17 00:00:00 2001
+From e7b98c452343a43b924bca684e5ec423eae5d644 Mon Sep 17 00:00:00 2001
 From: Paulo Neves <ptsneves@gmail.com>
 Date: Thu, 28 Jul 2022 11:42:31 +0200
 Subject: [PATCH] flb_info.h.in: Do not hardcode compilation directories
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch
index 6bd4c6bbb6..2e0e988c19 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch
@@ -1,4 +1,4 @@
-From 5cc79bdede89e75d713e23cf0fde26634320bc3e Mon Sep 17 00:00:00 2001
+From fef234a565d5150dc3d3d1374843024381e4f4de Mon Sep 17 00:00:00 2001
 From: Niko Mauno <niko.mauno@vaisala.com>
 Date: Mon, 21 Oct 2024 16:02:46 +0000
 Subject: [PATCH] CMakeLists.txt: Revise init manager deduction
@@ -15,10 +15,10 @@ Upstream-Status: Inappropriate [configuration]
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ac5fe5ef8..f47a01b82 100644
+index a47a5d9d6..ddc93827c 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -600,7 +600,7 @@ if(FLB_BINARY)
+@@ -627,7 +627,7 @@ if(FLB_BINARY)
     set(SYSTEMD_UNITDIR  /lib/systemd/system)
   endif()
 
@@ -27,7 +27,7 @@ index ac5fe5ef8..f47a01b82 100644
     if (FLB_AMAZON_LINUX2)
       set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
       configure_file(
-@@ -625,7 +625,7 @@ if(FLB_BINARY)
+@@ -652,7 +652,7 @@ if(FLB_BINARY)
       install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
       install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
     endif()
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch
index 6df53613c3..1192449909 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch
@@ -1,4 +1,4 @@
-From cc688b91c02df9a45ca8816a1d09649fadb9dc4a Mon Sep 17 00:00:00 2001
+From 26431b786b4c703bc2dcdb57d59487a3fef4a139 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 10 Aug 2022 01:27:16 -0700
 Subject: [PATCH] chunkio: Link with fts library with musl
@@ -10,7 +10,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Upstream-Status: Pending
 ---
 lib/chunkio/src/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_4.2.3.1.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_5.0.2.bb
index 03f9e0e003..3f3299459c 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_4.2.3.1.bb
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_5.0.2.bb
@@ -17,7 +17,7 @@ DEPENDS = "\
 "
 DEPENDS:append:libc-musl = " fts"
-SRCREV = "fca8b5bf46416267a4c8de185e4044da09cf0f16"
+SRCREV = "66ffbe43bd0b393ec418e6f5851a23461fa478d4"
 SRC_URI = "\
    git://github.com/fluent/fluent-bit.git;nobranch=1;protocol=https;tag=v${PV} \
    file://0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch \
diff --git a/meta-oe/recipes-extended/highway/highway_1.3.0.bb b/meta-oe/recipes-extended/highway/highway_1.3.0.bb
index d279994301..ddd684bb45 100644
--- a/meta-oe/recipes-extended/highway/highway_1.3.0.bb
+++ b/meta-oe/recipes-extended/highway/highway_1.3.0.bb
@@ -2,14 +2,15 @@ SUMMARY = "Highway is a C++ library for SIMD (Single Instruction, Multiple Data)
 HOMEPAGE = "https://github.com/google/highway/"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e583f1fc1c22da0f388b23a31df5b591"
 inherit cmake
 SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master \
           file://0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch"
-SRCREV = "ac0d5d297b13ab1b89f48484fc7911082d76a93f"
+SRCREV = "c34a36fb145de0a922a6e719b217033e1ff2eece"
+PV .= "+git"
 EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release"
diff --git a/meta-oe/recipes-extended/libcbor/libcbor_0.13.0.bb b/meta-oe/recipes-extended/libcbor/libcbor_0.14.0.bb
index 3bed8a6e72..7d65688384 100755
--- a/meta-oe/recipes-extended/libcbor/libcbor_0.13.0.bb
+++ b/meta-oe/recipes-extended/libcbor/libcbor_0.14.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f3b3881df62ca763a02d359a6e94071"
 SRC_URI = "git://github.com/PJK/libcbor.git;protocol=https;branch=master;tag=v${PV}"
-SRCREV = "9826a4315116a588f7416912db9da6fcecd8da11"
+SRCREV = "6730c20ab487c0b4dc5fb3fea918937085355bac"
 inherit cmake
diff --git a/meta-oe/recipes-extended/lprng/lprng_3.9.0.bb b/meta-oe/recipes-extended/lprng/lprng_3.9.0.bb
index 04376b66ed..0f427a7d05 100644
--- a/meta-oe/recipes-extended/lprng/lprng_3.9.0.bb
+++ b/meta-oe/recipes-extended/lprng/lprng_3.9.0.bb
@@ -10,6 +10,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lprng/files/lprng/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
 inherit autotools gettext
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost \
                                CHOWN=${base_bindir}/chown CHGRP=${base_bindir}/chgrp \
diff --git a/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb b/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb
index 6d5399c8d0..958ae21065 100644
--- a/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb
+++ b/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb
@@ -16,7 +16,8 @@ SRC_URI = " \
    file://run-ptest \
 "
-SRCREV = "e046b69a3736d314fad813e159b1c192eaef92cd"
+SRCREV = "7d87efb4a3dddbbe8caa9ca14eff05ede1102ab8"
+PV .= "+git"
 inherit cmake ptest
diff --git a/meta-oe/recipes-extended/minio/minio_git.bb b/meta-oe/recipes-extended/minio/minio_git.bb
index 511dd4d869..d08b5e754d 100644
--- a/meta-oe/recipes-extended/minio/minio_git.bb
+++ b/meta-oe/recipes-extended/minio/minio_git.bb
@@ -169,4 +169,4 @@ CVE_STATUS_GROUPS += "CVE_STATUS_WRONG_CPE"
 CVE_STATUS_WRONG_CPE[status] = "cpe-incorrect: The vulnerability is in minio server, not in minio client-tools"
 CVE_STATUS_WRONG_CPE = "CVE-2018-1000538 CVE-2020-11012 CVE-2021-21287 CVE-2021-21362 \
                        CVE-2021-21390 CVE-2021-43858 CVE-2022-35919 CVE-2023-28433 \
-                        CVE-2023-28434 CVE-2024-36107"
+                        CVE-2023-28434 CVE-2024-36107 CVE-2026-33419 CVE-2026-34204"
diff --git a/meta-oe/recipes-extended/networking/mstpd_0.1.1.bb b/meta-oe/recipes-extended/networking/mstpd_0.2.0.bb
index 3ac4d5b1fe..0d60111554 100644
--- a/meta-oe/recipes-extended/networking/mstpd_0.1.1.bb
+++ b/meta-oe/recipes-extended/networking/mstpd_0.2.0.bb
@@ -6,7 +6,7 @@ SRC_URI = " \
    file://bridge-stp \
    file://mstpd.service \
 "
-SRCREV = "d7dd987b101f277bfef8ac71de7c1d962a424e8e"
+SRCREV = "8995e5d11ee89f2251734e34cea711bb5a5bb911"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+){2,})"
diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch b/meta-oe/recipes-extended/ostree/ostree/0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch
new file mode 100644
index 0000000000..cc0c3d1318
--- /dev/null
+++ b/meta-oe/recipes-extended/ostree/ostree/0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch
@@ -0,0 +1,29 @@
+From 3b8255e24d0785d6049d473471da53b0c5fd52c1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Thu, 9 Apr 2026 16:28:07 -0700
+Subject: [PATCH] trivial-httpd: Fix const-correctness of slash pointer
+strrchr() returns a 'const char *' when passed a 'const char *'
+argument. Declare the local 'slash' variable as 'const char *'
+to match, fixing a build failure with clang when
+-Werror,-Wincompatible-pointer-types-discards-qualifiers is active.
+Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/3579]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ src/ostree/ostree-trivial-httpd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/ostree/ostree-trivial-httpd.c b/src/ostree/ostree-trivial-httpd.c
+index 4a0c6b00..b5a52e61 100644
+--- a/src/ostree/ostree-trivial-httpd.c
+++ b/src/ostree/ostree-trivial-httpd.c
+@@ -281,7 +281,7 @@ do_get (OtTrivialHttpd *self, SoupServer *server, SoupServerMessage *msg, const
+ do_get (OtTrivialHttpd *self, SoupServer *server, SoupServerMessage *msg, const char *path)
+ #endif
+ {
+-  char *slash;
+  const char *slash;
+   int ret;
+   struct stat stbuf;
diff --git a/meta-oe/recipes-extended/ostree/ostree_2025.7.bb b/meta-oe/recipes-extended/ostree/ostree_2026.1.bb
index a2094f68c3..af726fff12 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2025.7.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2026.1.bb
@@ -21,8 +21,9 @@ DEPENDS = " \
 GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases"
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \
           file://run-ptest \
+           file://0001-trivial-httpd-Fix-const-correctness-of-slash-pointer.patch \
           "
-SRC_URI[sha256sum] = "af8d080b9585e7fd1faba8f022967e1c268ae62e20ecf32ee7b364c1e307570b"
+SRC_URI[sha256sum] = "8e77c285dd6fa5ec5fb063130390977be727fe11107335ed8778a40385069e95"
 S = "${UNPACKDIR}/libostree-${PV}"
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb
index c50a7a3f7a..186e1ccf24 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb
@@ -40,6 +40,7 @@ CVE_STATUS[CVE-2015-3243] = "fix-file-included: The shipped default rsyslog.conf
 inherit autotools pkgconfig systemd update-rc.d ptest
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 EXTRA_OECONF += "--enable-imfile-tests ${ATOMICS}"
 ATOMICS = "ap_cv_atomic_builtins_64=yes ap_cv_atomic_builtins=yes"
 ATOMICS:mipsarch = ""
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_4.2.0.bb b/meta-oe/recipes-extended/sanlock/sanlock_5.1.0.bb
index 8babaf8017..72242946c1 100644
--- a/meta-oe/recipes-extended/sanlock/sanlock_4.2.0.bb
+++ b/meta-oe/recipes-extended/sanlock/sanlock_5.1.0.bb
@@ -11,22 +11,18 @@ SECTION = "utils"
 LICENSE = "LGPL-2.0-or-later & GPL-2.0-only & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22"
-PV .= "+git"
+SRC_URI = "git://codeberg.org/sanlock/sanlock.git;protocol=https;branch=master;tag=${BPN}-${PV} \
-SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \
           file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \
           file://0001-add-missing-system-header-string.h.patch \
           "
-SRCREV = "efe86d2e691383da07942fe9a4bccab13046f3d4"
+SRCREV = "995685ac3ad8909cb7562e74dd13e3b450833d9c"
 CVE_STATUS[CVE-2012-5638] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
-DEPENDS = "libaio util-linux"
+DEPENDS = "libaio util-linux libdevmapper"
+RDEPENDS:${PN} += "libdevmapper"
-inherit setuptools3 useradd
-SETUPTOOLS_SETUP_PATH = "${S}/python"
+inherit useradd
 do_compile:prepend () {
    oe_runmake -C ${S}/wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}"
diff --git a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
index e624b26941..79b8ee18e7 100644
--- a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
+++ b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
@@ -15,6 +15,8 @@ UPSTREAM_CHECK_COMMITS = "1"
 inherit autotools
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 AUTOTOOLS_SCRIPT_PATH = "${S}/src"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
index 0e08bed8a1..e0b91f02a9 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
@@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = " \
        file://COPYING.tools;md5=570a9b3749dd0463a1778803b12a6dce \
 "
-DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native"
+DEPENDS = "glib-2.0-native pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native"
 GNOMEBN = "gtkmm"
 inherit gnomebase features_check
-REQUIRED_DISTRO_FEATURES = "opengl x11"
+REQUIRED_DISTRO_FEATURES = "opengl"
 SRC_URI[archive.sha256sum] = "daad9bf9b70f90975f91781fc7a656c923a91374261f576c883cd3aebd59c833"
diff --git a/meta-oe/recipes-graphics/feh/feh_3.11.3.bb b/meta-oe/recipes-graphics/feh/feh_3.12.1.bb
index c79ad488ba..2ac504a551 100644
--- a/meta-oe/recipes-graphics/feh/feh_3.11.3.bb
+++ b/meta-oe/recipes-graphics/feh/feh_3.12.1.bb
@@ -9,7 +9,7 @@ DEPENDS = "\
 "
 SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "f2cca3592a433922c0db7a9365fd63e5402c121d932a9327e279c71be6501063"
+SRC_URI[sha256sum] = "6772f48e7956a16736e4c165a8367f357efc413b895f5b04133366e01438f95d"
 inherit mime-xdg features_check
 # depends on virtual/libx11
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch
deleted file mode 100644
index e0c3de469a..0000000000
--- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 366930ccc1a261c3eb883da2bf3c655162ccd75f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 1 Mar 2023 22:58:37 -0800
-Subject: [PATCH] Match prototypes of callbacks with libgphoto
-In https://github.com/gphoto/gphoto2/pull/535/commits/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e
-we tried to fix by using pthread_t but it also needs to make changes in
-libgphoto and these changes can be invasive, therefore lets revert to
-older types and to fix musl problem fix it via type casts
-Upstream-Status: Backport [https://github.com/gphoto/gphoto2/pull/569]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- gphoto2/main.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/gphoto2/main.c b/gphoto2/main.c
-index 0dac947..cd3c990 100644
--- a/gphoto2/main.c
-+++ b/gphoto2/main.c
-@@ -1198,7 +1198,7 @@ thread_func (void *data)
-        pthread_cleanup_pop (1);
- }
- 
-static pthread_t
-+static unsigned int
- start_timeout_func (Camera *camera, unsigned int timeout,
-                    CameraTimeoutFunc func, void __unused__ *data)
- {
-@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout,
- 
-        pthread_create (&tid, NULL, thread_func, td);
- 
-       return (tid);
-+       return (unsigned int)tid;
- }
- 
- static void
-stop_timeout_func (Camera __unused__ *camera, pthread_t id,
-+stop_timeout_func (Camera __unused__ *camera, unsigned int id,
-                   void __unused__ *data)
- {
-       pthread_t tid = id;
-+       pthread_t tid = (pthread_t)id;
- 
-        pthread_cancel (tid);
-        pthread_join (tid, NULL);
-- 
-2.39.2
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch
index 3d54d58e18..bd916e339a 100644
--- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch
+++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch
@@ -14,13 +14,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 --- a/configure.ac
 +++ b/configure.ac
 @@ -26,7 +26,9 @@ AC_PROG_INSTALL
- AC_SYS_LARGEFILE
+ ])
 
- GP_CONFIG_MSG([Compiler],[${CC}])
+ GP_CONFIG_MSG([Compiler], [${CC}])
-AC_DEFINE_UNQUOTED([HAVE_CC],"$CC",[The C compiler we're using])
+-AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC"], [The C compiler we are using])
 +CC_NO_SYSROOT=`echo $CC | sed -e \
 +       's|--sysroot=.*\b||g'`
-+AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"], [The C compiler we're using])
+AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"], [The C compiler we are using])
 
 dnl AC_STRUCT_TIMEZONE
 
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
index 14976ffb72..358dbbb51a 100644
--- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
+++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
@@ -14,10 +14,10 @@ Upstream-Status: Pending
 --- a/configure.ac
 +++ b/configure.ac
 @@ -46,7 +46,6 @@ dnl i18n support
- dnl ---------------------------------------------------------------------------
+ GP_GETTEXT_SETUP([GETTEXT_PACKAGE_GPHOTO2],
- GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}])
+                  [gphoto2],
- ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW"
+                  [po])
 -AM_PO_SUBDIRS()
- AM_GNU_GETTEXT_VERSION([0.14.1])
+ AM_GNU_GETTEXT_VERSION([0.19.1])
 AM_GNU_GETTEXT([external])
 AM_ICONV()
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch
deleted file mode 100644
index a27c02cefc..0000000000
--- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 23c67e93e51f700d0aeecfc08277e39f51201fc3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 2 Sep 2022 12:59:46 -0700
-Subject: [PATCH] gphoto2: Use pthread_t abstract type for thead IDs
-This is not a plain old datatype in every libc, e.g. with musl this
-would fail in type conversion
-Upstream-Status: Submitted [https://github.com/gphoto/gphoto2/pull/535]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- gphoto2/main.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/gphoto2/main.c b/gphoto2/main.c
-index 2bf5964..9a6b05d 100644
--- a/gphoto2/main.c
-+++ b/gphoto2/main.c
-@@ -1198,7 +1198,7 @@ thread_func (void *data)
-        pthread_cleanup_pop (1);
- }
- 
-static unsigned int
-+static pthread_t
- start_timeout_func (Camera *camera, unsigned int timeout,
-                    CameraTimeoutFunc func, void __unused__ *data)
- {
-@@ -1219,7 +1219,7 @@ start_timeout_func (Camera *camera, unsigned int timeout,
- }
- 
- static void
-stop_timeout_func (Camera __unused__ *camera, unsigned int id,
-+stop_timeout_func (Camera __unused__ *camera, pthread_t id,
-                   void __unused__ *data)
- {
-        pthread_t tid = id;
-- 
-2.37.3
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.32.bb
index 40409ed388..e5e7c6926f 100644
--- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb
+++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.32.bb
@@ -8,11 +8,9 @@ RDEPENDS:gphoto2 = "libgphoto2"
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/${BP}.tar.bz2;name=gphoto2 \
           file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
-           file://0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch \
-           file://0001-Match-prototypes-of-callbacks-with-libgphoto.patch \
           file://0001-configure-Filter-out-buildpaths-from-CC.patch \
 "
-SRC_URI[gphoto2.sha256sum] = "2a648dcdf12da19e208255df4ebed3e7d2a02f905be4165f2443c984cf887375"
+SRC_URI[gphoto2.sha256sum] = "4e379a0f12f72b49ee5ee2283ffd806b5d12d099939d75197a3f4bbc7f27a1a1"
 inherit autotools pkgconfig gettext
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-libgphoto2-fix-const-correctness-for-c23-builds.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-libgphoto2-fix-const-correctness-for-c23-builds.patch
new file mode 100644
index 0000000000..9ded174095
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-libgphoto2-fix-const-correctness-for-c23-builds.patch
@@ -0,0 +1,84 @@
+From bfa786a260bfd4660e8186ebad8778718e85e8cd Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Sat, 4 Apr 2026 14:56:01 -0700
+Subject: [PATCH] libgphoto2: fix const-correctness for c23 builds
+C23 treats the return values of strrchr() and strchr() as const char *
+when the input string is const-qualified. Update local variables to use
+const char * where appropriate to avoid discarded-qualifier warnings and
+build failures with -std=gnu23.
+No functional change intended.
+Upstream-Status: Submitted [https://github.com/gphoto/libgphoto2/pull/1235]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ camlibs/directory/directory.c         | 2 +-
+ libgphoto2/gphoto2-file.c             | 6 +++---
+ libgphoto2/gphoto2-filesys.c          | 2 +-
+ packaging/generic/print-camera-list.c | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c
+index 790405d54..cc63c6684 100644
+--- a/camlibs/directory/directory.c
+++ b/camlibs/directory/directory.c
+@@ -125,7 +125,7 @@ static const char *
+ get_mime_type (const char *filename)
+ {
+ 
+-       char *dot;
+       const char *dot;
+        int x=0;
+ 
+        dot = strrchr(filename, '.');
+diff --git a/libgphoto2/gphoto2-file.c b/libgphoto2/gphoto2-file.c
+index 04d4d5e3e..1a9dbc193 100644
+--- a/libgphoto2/gphoto2-file.c
+++ b/libgphoto2/gphoto2-file.c
+@@ -610,7 +610,7 @@ int
+ gp_file_open (CameraFile *file, const char *filename)
+ {
+        FILE *fp;
+-       char *name, *dot;
+       const char *name, *dot;
+        long size, size_read;
+        int  i;
+        struct stat s;
+@@ -906,8 +906,8 @@ gp_file_get_name (CameraFile *file, const char **name)
+ int
+ gp_file_get_name_by_type (CameraFile *file, const char *basename, CameraFileType type, char **newname)
+ {
+-       char *prefix = NULL, *s, *new, *slash = NULL;
+-       const char *suffix = NULL;
+       char *prefix = NULL, *new;
+       const char *suffix = NULL, *s, *slash = NULL;
+        int i;
+ 
+        C_PARAMS (file && basename && newname);
+diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c
+index 45f957292..07decff24 100644
+--- a/libgphoto2/gphoto2-filesys.c
+++ b/libgphoto2/gphoto2-filesys.c
+@@ -521,7 +521,7 @@ append_to_folder (CameraFilesystemFolder *folder,
+        CameraFilesystemFolder **newfolder
+ ) {
+        CameraFilesystemFolder  *f;
+-       char    *s;
+       const char      *s;
+ 
+        GP_LOG_D ("Append to folder %p/%s - %s", folder, folder->name, foldername);
+        /* Handle multiple slashes, and slashes at the end */
+diff --git a/packaging/generic/print-camera-list.c b/packaging/generic/print-camera-list.c
+index 1707b4e87..44530b4ae 100644
+--- a/packaging/generic/print-camera-list.c
+++ b/packaging/generic/print-camera-list.c
+@@ -1138,7 +1138,7 @@ escape_html(const char *str) {
+        newstr = malloc(strlen(str)+1+inc);
+        s = str; ns = newstr;
+        do {
+-               char *x;
+               const char *x;
+                x = strchr(s,'&');
+                if (x) {
+                        memcpy (ns, s, x-s);
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40333.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40333.patch
new file mode 100644
index 0000000000..77c307e88d
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40333.patch
@@ -0,0 +1,150 @@
+From 8fefd2da7b9e2c7c448086cd251b108c0ebf1262 Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Wed, 8 Apr 2026 15:18:42 +0200
+Subject: [PATCH] Fixed EOS ImageFormat/CustomFuncEx Parsers Lack Length
+ Parameter
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+ptp_unpack_EOS_ImageFormat() and ptp_unpack_EOS_CustomFuncEx() accept
+const unsigned char** data but no length/size parameter. They perform
+unbounded reads via dtoh32o calls (up to 36 bytes for ImageFormat,
+up to 1024 bytes for CustomFuncEx). Callers in ptp_unpack_EOS_events()
+have xsize available but never pass it.
+ CVE-2026-40333
+Reported-By: Sebastián Alba <sebasjosue84@gmail.com>
+CVE: CVE-2026-40333
+Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/1817ecead20c2aafa7549dac9619fe38f47b2f53]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ camlibs/ptp2/ptp-pack.c | 53 ++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 44 insertions(+), 9 deletions(-)
+diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c
+index 09421b7..09dcc24 100644
+--- a/camlibs/ptp2/ptp-pack.c
+++ b/camlibs/ptp2/ptp-pack.c
+@@ -1448,7 +1448,7 @@ ptp_unpack_Canon_EOS_FE (PTPParams *params, const unsigned char* data, unsigned
+ 
+ 
+ static inline uint16_t
+-ptp_unpack_EOS_ImageFormat (PTPParams* params, const unsigned char** data )
+ptp_unpack_EOS_ImageFormat (PTPParams* params, const unsigned char** data, unsigned int *size )
+ {
+        /*
+          EOS ImageFormat entries look are a sequence of u32 values:
+@@ -1492,30 +1492,57 @@ ptp_unpack_EOS_ImageFormat (PTPParams* params, const unsigned char** data )
+ 
+        const uint8_t* d = *data;
+        uint32_t offset = 0;
+-       uint32_t n = dtoh32o (d, offset);
+       uint32_t n;
+        uint32_t l, t1, s1, c1, t2 = 0, s2 = 0, c2 = 0;
+ 
+       if (*size < sizeof(uint32_t)) {
+               ptp_debug (params, "parsing EOS ImageFormat property failed 1 (size %d)", *size);
+               return 0;
+       }
+       n = dtoh32o (d, offset);
+       *size -= sizeof(uint32_t);
+
+        if (n != 1 && n !=2) {
+                ptp_debug (params, "parsing EOS ImageFormat property failed (n != 1 && n != 2: %d)", n);
+                return 0;
+        }
+-
+       if (*size < sizeof(uint32_t)) {
+               ptp_debug (params, "parsing EOS ImageFormat property failed 2 (size %d)", *size);
+               return 0;
+       }
+        l = dtoh32o (d, offset);
+       *size -= sizeof(uint32_t);
+
+        if (l != 0x10) {
+                ptp_debug (params, "parsing EOS ImageFormat property failed (l != 0x10: 0x%x)", l);
+                return 0;
+        }
+ 
+       if (*size < 3*sizeof(uint32_t)) {
+               ptp_debug (params, "parsing EOS ImageFormat property failed 3 (size %d)", *size);
+               return 0;
+       }
+        t1 = dtoh32o (d, offset);
+        s1 = dtoh32o (d, offset);
+        c1 = dtoh32o (d, offset);
+       *size -= 3*sizeof(uint32_t);
+ 
+        if (n == 2) {
+               if (*size < sizeof(uint32_t)) {
+                       ptp_debug (params, "parsing EOS ImageFormat property failed 4 (size %d)", *size);
+                       return 0;
+               }
+                l = dtoh32o (d, offset);
+               *size -= sizeof(uint32_t);
+
+                if (l != 0x10) {
+                        ptp_debug (params, "parsing EOS ImageFormat property failed (l != 0x10: 0x%x)", l);
+                        return 0;
+                }
+               if (*size < 3*sizeof(uint32_t)) {
+                       ptp_debug (params, "parsing EOS ImageFormat property failed 5 (size %d)", *size);
+                       return 0;
+               }
+                t2 = dtoh32o (d, offset);
+                s2 = dtoh32o (d, offset);
+                c2 = dtoh32o (d, offset);
+@@ -1668,12 +1695,20 @@ ptp_unpack_EOS_FocusInfoEx (PTPParams* params, const unsigned char** data, uint3
+ 
+ 
+ static inline char*
+-ptp_unpack_EOS_CustomFuncEx (PTPParams* params, const unsigned char** data )
+ptp_unpack_EOS_CustomFuncEx (PTPParams* params, const unsigned char** data, unsigned int *size )
+ {
+-       uint32_t s = dtoh32a( *data );
+-       uint32_t n = s/4, i;
+       uint32_t s, n, i;
+        char    *str, *p;
+ 
+       if (*size < sizeof(uint32_t))
+               return strdup("bad length");
+
+       s = dtoh32a( *data );
+       n = s/4;
+
+       if (*size < 4+s)
+               return strdup("bad length");
+
+        if (s > 1024) {
+                ptp_debug (params, "customfuncex data is larger than 1k / %d... unexpected?", s);
+                return strdup("bad length");
+@@ -1962,7 +1997,7 @@ ptp_unpack_EOS_events (PTPParams *params, const unsigned char* data, unsigned in
+                        case PTP_DPC_CANON_EOS_ImageFormatExtHD:
+                                /* special handling of ImageFormat properties */
+                                for (j=0;j<dpd_count;j++) {
+-                                       dpd->FORM.Enum.SupportedValue[j].u16 = ptp_unpack_EOS_ImageFormat( params, &xdata );
+                                       dpd->FORM.Enum.SupportedValue[j].u16 = ptp_unpack_EOS_ImageFormat( params, &xdata, &xsize );
+                                        ptp_debug (params, INDENT "prop %x option[%2d] == 0x%04x", dpc, j, dpd->FORM.Enum.SupportedValue[j].u16);
+                                }
+                                break;
+@@ -2267,7 +2302,7 @@ ptp_unpack_EOS_events (PTPParams *params, const unsigned char* data, unsigned in
+                        case PTP_DPC_CANON_EOS_ImageFormatSD:
+                        case PTP_DPC_CANON_EOS_ImageFormatExtHD:
+                                dpd->DataType = PTP_DTC_UINT16;
+-                               dpd->DefaultValue.u16 = ptp_unpack_EOS_ImageFormat( params, &xdata );
+                               dpd->DefaultValue.u16 = ptp_unpack_EOS_ImageFormat( params, &xdata, &xsize );
+                                dpd->CurrentValue.u16 = dpd->DefaultValue.u16;
+                                ptp_debug (params, INDENT "prop %x value == 0x%04x (u16)", dpc, dpd->CurrentValue.u16);
+                                break;
+@@ -2275,7 +2310,7 @@ ptp_unpack_EOS_events (PTPParams *params, const unsigned char* data, unsigned in
+                                dpd->DataType = PTP_DTC_STR;
+                                free (dpd->DefaultValue.str);
+                                free (dpd->CurrentValue.str);
+-                               dpd->DefaultValue.str = ptp_unpack_EOS_CustomFuncEx( params, &xdata );
+                               dpd->DefaultValue.str = ptp_unpack_EOS_CustomFuncEx( params, &xdata, &xsize );
+                                dpd->CurrentValue.str = strdup( (char*)dpd->DefaultValue.str );
+                                ptp_debug (params, INDENT "prop %x value == %s", dpc, dpd->CurrentValue.str);
+                                break;
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40334.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40334.patch
new file mode 100644
index 0000000000..883582dff0
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40334.patch
@@ -0,0 +1,37 @@
+From 20b33a26b2efdbf2c35c5cacc54a041855ec764b Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Wed, 8 Apr 2026 15:15:54 +0200
+Subject: [PATCH] Fixed Canon FolderEntry Missing Null Termination
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+ptp_unpack_Canon_FE() copies filename with strncpy into a 13-byte
+buffer without explicit null termination. The EOS variant at line
+1451–1452 correctly adds fe->Filename[PTP_CANON_FilenameBufferLen-1]
+= 0; confirming this was recognized as necessary but not applied to the
+original Canon path.
+ CVE-2026-40334
+Reported-By: Sebastián Alba <sebasjosue84@gmail.com>
+CVE: CVE-2026-40334
+Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/259fc7d3bfe534ce4b114c464f55b448670ab873]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ camlibs/ptp2/ptp-pack.c | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c
+index 09dcc24..982b4f4 100644
+--- a/camlibs/ptp2/ptp-pack.c
+++ b/camlibs/ptp2/ptp-pack.c
+@@ -1369,6 +1369,7 @@ ptp_unpack_Canon_FE (PTPParams *params, const unsigned char* data, PTPCANONFolde
+        fe->ObjectSize       = dtoh32a(data + PTP_cfe_ObjectSize);
+        fe->Time     = (time_t)dtoh32a(data + PTP_cfe_Time);
+        strncpy(fe->Filename, (char*)data + PTP_cfe_Filename, PTP_CANON_FilenameBufferLen);
+       fe->Filename[PTP_CANON_FilenameBufferLen-1] = '\0';
+ }
+ 
+ /*
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40335.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40335.patch
new file mode 100644
index 0000000000..dfe832e6c8
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40335.patch
@@ -0,0 +1,43 @@
+From edcdf804662eb4340fdc371af4853d6579e969ab Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Wed, 8 Apr 2026 15:07:38 +0200
+Subject: [PATCH] =?UTF-8?q?Fixed=20UINT128/INT128=20Unchecked=20Offset=20A?=
+ =?UTF-8?q?dvance=20(CWE-125)=20=E2=80=94=20MEDIUM?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Finding 5: UINT128/INT128 Unchecked Offset Advance (CWE-125) — MEDIUM
+In ptp_unpack_DPV(), the PTP_DTC_UINT128 and PTP_DTC_INT128 cases advance *offset += 16 without verifying 16 bytes remain. The entry check at line 609 only guarantees *offset < total (at least 1 byte available). After the unchecked advance, *offset can exceed total, and the CTVAL macro's bounds check (total - *offset < sizeof(target)) wraps due to unsigned arithmetic.
+CVE-2026-40335
+Reported-By: Sebastián Alba <sebasjosue84@gmail.com>
+CVE: CVE-2026-40335
+Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/433bde9888d70aa726e32744cd751d7dbe94379a]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ camlibs/ptp2/ptp-pack.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c
+index 982b4f4..7fc120d 100644
+--- a/camlibs/ptp2/ptp-pack.c
+++ b/camlibs/ptp2/ptp-pack.c
+@@ -614,10 +614,14 @@ ptp_unpack_DPV (
+        case PTP_DTC_UINT64: CTVAL(value->u64,dtoh64a); break;
+ 
+        case PTP_DTC_UINT128:
+               if (total - *offset < 16)
+                       return 0;
+                *offset += 16;
+                /*fprintf(stderr,"unhandled unpack of uint128n");*/
+                break;
+        case PTP_DTC_INT128:
+               if (total - *offset < 16)
+                       return 0;
+                *offset += 16;
+                /*fprintf(stderr,"unhandled unpack of int128n");*/
+                break;
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40336.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40336.patch
new file mode 100644
index 0000000000..1a809b4f25
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40336.patch
@@ -0,0 +1,44 @@
+From e19c45d3530f1585805711e14aa4ea788e499f46 Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Wed, 8 Apr 2026 15:13:51 +0200
+Subject: [PATCH] Fixed Sony DPD Secondary Enum List Memory Leak
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Finding 4: Sony DPD Secondary Enum List Memory Leak (CWE-401) — LOW
+File: ptp-pack.c:884-885
+When processing a secondary enumeration list (2024+ Sony cameras), line
+884–885 overwrites dpd->FORM.Enum.SupportedValue with a new calloc()
+without freeing the previous allocation from line 857. The original
+array and any string values it contains are leaked.
+CVE-2026-40336
+Reported-By: Sebastián Alba <sebasjosue84@gmail.com>
+CVE: CVE-2026-40336
+Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/404ff02c75f3cb280196fc260a63c4d26cf1a8f6]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ camlibs/ptp2/ptp-pack.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c
+index 7fc120d..fc51d77 100644
+--- a/camlibs/ptp2/ptp-pack.c
+++ b/camlibs/ptp2/ptp-pack.c
+@@ -879,6 +879,11 @@ ptp_unpack_Sony_DPD (PTPParams *params, const unsigned char* data, PTPDeviceProp
+                /* check if we have a secondary list of items, this is for newer Sonys (2024) */
+                if (val < 0x200) {      /* if a secondary list is not provided, this will be the next property code - 0x5XXX or 0xDxxx */
+                        if (dpd->FormFlag == PTP_DPFF_Enumeration) {
+                               /* free old enum variables */
+                               for (i=0;i<dpd->FORM.Enum.NumberOfValues;i++)
+                                       ptp_free_propvalue (dpd->DataType, dpd->FORM.Enum.SupportedValue+i);
+                               free (dpd->FORM.Enum.SupportedValue);
+
+                                N = dtoh16o(data, *poffset);
+                                dpd->FORM.Enum.SupportedValue = calloc(N,sizeof(dpd->FORM.Enum.SupportedValue[0]));
+                                if (!dpd->FORM.Enum.SupportedValue)
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40338.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40338.patch
new file mode 100644
index 0000000000..9f233f2ec9
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40338.patch
@@ -0,0 +1,34 @@
+From 43cc20e807cd2935869617a7d8b9488070712c0e Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Sat, 11 Apr 2026 10:47:52 +0200
+Subject: [PATCH] =?UTF-8?q?Fixed=20Sony=20DPD=20Enum=20Count=20OOB=20Read?=
+ =?UTF-8?q?=20(CWE-125)=20=E2=80=94=20MEDIUM?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+In the PTP_DPFF_Enumeration case of ptp_unpack_Sony_DPD(), dtoh16o(data, *poffset) reads 2 bytes for enumeration count N without verifying 2 bytes remain. The standard parser at line 704 has this check.
+CVE-2026-40338
+Reported-By: Sebastián Alba <sebasjosue84@gmail.com>
+CVE: CVE-2026-40338
+Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/3b9f9696be76ae51dca983d9dd8ce586a2561845]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ camlibs/ptp2/ptp-pack.c | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c
+index fc51d77..f90d2a5 100644
+--- a/camlibs/ptp2/ptp-pack.c
+++ b/camlibs/ptp2/ptp-pack.c
+@@ -851,6 +851,7 @@ ptp_unpack_Sony_DPD (PTPParams *params, const unsigned char* data, PTPDeviceProp
+                break;
+        case PTP_DPFF_Enumeration: {
+ #define N      dpd->FORM.Enum.NumberOfValues
+               if (*poffset + sizeof(uint16_t) > dpdlen) goto outofmemory;
+                N = dtoh16o(data, *poffset);
+                dpd->FORM.Enum.SupportedValue = calloc(N,sizeof(dpd->FORM.Enum.SupportedValue[0]));
+                if (!dpd->FORM.Enum.SupportedValue)
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40339.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40339.patch
new file mode 100644
index 0000000000..b00ac72772
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40339.patch
@@ -0,0 +1,41 @@
+From 585e8113b541469347d09c341c2e8b468b431adb Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Sat, 11 Apr 2026 10:50:47 +0200
+Subject: [PATCH] =?UTF-8?q?Fixed=20Sony=20DPD=20FormFlag=20OOB=20Read=20(C?=
+ =?UTF-8?q?WE-125)=20=E2=80=94=20MEDIUM?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+ptp_unpack_Sony_DPD() reads the FormFlag byte via dtoh8o(data, *poffset)
+without a prior bounds check. The standard ptp_unpack_DPD() at line
+686–687 correctly validates *offset + sizeof(uint8_t) > dpdlen before
+this same read, but the Sony variant omits this check.
+CVE-2026-40339
+Reported-By: Sebastián Alba <sebasjosue84@gmail.com>
+CVE: CVE-2026-40339
+Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/09f8a940b1e418b5693f5c11e3016a1ad2cea62d]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ camlibs/ptp2/ptp-pack.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c
+index f90d2a5..28648a5 100644
+--- a/camlibs/ptp2/ptp-pack.c
+++ b/camlibs/ptp2/ptp-pack.c
+@@ -833,9 +833,10 @@ ptp_unpack_Sony_DPD (PTPParams *params, const unsigned char* data, PTPDeviceProp
+           code or the Data Type is a string (with two empty strings as
+           values). In both cases Form Flag should be set to 0x00 and FORM is
+           not present. */
+-
+        if (*poffset==PTP_dpd_Sony_DefaultValue)
+                return 1;
+       if (*poffset + sizeof(uint8_t) > dpdlen)
+               return 1;
+ 
+        dpd->FormFlag = dtoh8o(data, *poffset);
+        ptp_debug (params, "formflag 0x%04x", dpd->FormFlag);
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40340.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40340.patch
new file mode 100644
index 0000000000..a0852692b0
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40340.patch
@@ -0,0 +1,40 @@
+From fd9f234df894caec6c65144b5a4f0264aadf0989 Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Wed, 8 Apr 2026 16:01:48 +0200
+Subject: [PATCH] Fixed ObjectInfo Parser OOB Read
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+ptp_unpack_OI() validates len < PTP_oi_SequenceNumber (i.e., len < 48) but then accesses:
+    Offsets 48–51: dtoh32a(data + PTP_oi_SequenceNumber) at line 563 (4 bytes OOB)
+    Offset 52: data[PTP_oi_filenamelen] at line 547 (5 bytes OOB)
+    Offset 56: data[PTP_oi_filenamelen+4] at line 547 (9 bytes OOB)
+The Samsung Galaxy 64-bit objectsize detection heuristic reads up to 9 bytes beyond the validated boundary.
+ CVE-2026-40340
+Reported-By: Sebastián Alba <sebasjosue84@gmail.com>
+CVE: CVE-2026-40340
+Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/7c7f515bc88c3d0c4098ac965d313518e0ccbe33]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ camlibs/ptp2/ptp-pack.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c
+index 28648a5..9eba06f 100644
+--- a/camlibs/ptp2/ptp-pack.c
+++ b/camlibs/ptp2/ptp-pack.c
+@@ -526,7 +526,7 @@ ptp_unpack_OI (PTPParams *params, const unsigned char* data, PTPObjectInfo *oi,
+ {
+        char *capture_date;
+ 
+-       if (!data || len < PTP_oi_SequenceNumber)
+       if (!data || len < PTP_oi_filenamelen + 5)
+                return;
+ 
+        oi->Filename = oi->Keywords = NULL;
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40341.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40341.patch
new file mode 100644
index 0000000000..b71792c185
--- /dev/null
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40341.patch
@@ -0,0 +1,69 @@
+From 3674dbeafa5157a264ca5e562ffdbef159a2185f Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Wed, 8 Apr 2026 15:28:52 +0200
+Subject: [PATCH] Fixed OOB read in ptp_unpack_EOS_FocusInfoEx
+Do not read out values before checking there is sufficient size
+CVE-2026-40341
+CVE: CVE-2026-40341
+Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/c385b34af260595dfbb5f9329526be5158985987]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ camlibs/ptp2/ptp-pack.c | 34 +++++++++++++++++++++++++---------
+ 1 file changed, 25 insertions(+), 9 deletions(-)
+diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c
+index 9eba06f..11428ab 100644
+--- a/camlibs/ptp2/ptp-pack.c
+++ b/camlibs/ptp2/ptp-pack.c
+@@ -1629,23 +1629,39 @@ ptp_pack_EOS_ImageFormat (PTPParams* params, unsigned char* data, uint16_t value
+ static inline char*
+ ptp_unpack_EOS_FocusInfoEx (PTPParams* params, const unsigned char** data, uint32_t datasize)
+ {
+-       uint32_t size                   = dtoh32a( *data );
+-       uint32_t halfsize               = dtoh16a( (*data) + 4);
+-       uint32_t version                = dtoh16a( (*data) + 6);
+-       uint32_t focus_points_in_struct = dtoh16a( (*data) + 8);
+-       uint32_t focus_points_in_use    = dtoh16a( (*data) + 10);
+-       uint32_t sizeX                  = dtoh16a( (*data) + 12);
+-       uint32_t sizeY                  = dtoh16a( (*data) + 14);
+-       uint32_t size2X                 = dtoh16a( (*data) + 16);
+-       uint32_t size2Y                 = dtoh16a( (*data) + 18);
+       uint32_t size;
+       uint32_t halfsize;
+       uint32_t version;
+       uint32_t focus_points_in_struct;
+       uint32_t focus_points_in_use;
+       uint32_t sizeX;
+       uint32_t sizeY;
+       uint32_t size2X;
+       uint32_t size2Y;
+        uint32_t i;
+        uint32_t maxlen;
+        char    *str, *p;
+ 
+       if (datasize<4) {
+               ptp_error(params, "FocusInfoEx has invalid size (%d)", datasize);
+               return strdup("bad size 0");
+       }
+
+       size                    = dtoh32a( *data );
+        if ((size > datasize) || (size < 20)) {
+                ptp_error(params, "FocusInfoEx has invalid size (%d) vs datasize (%d)", size, datasize);
+                return strdup("bad size 1");
+        }
+
+       halfsize                = dtoh16a( (*data) + 4);
+       version                 = dtoh16a( (*data) + 6);
+       focus_points_in_struct  = dtoh16a( (*data) + 8);
+       focus_points_in_use     = dtoh16a( (*data) + 10);
+       sizeX                   = dtoh16a( (*data) + 12);
+       sizeY                   = dtoh16a( (*data) + 14);
+       size2X                  = dtoh16a( (*data) + 16);
+       size2Y                  = dtoh16a( (*data) + 18);
+
+        /* If data is zero-filled, then it is just a placeholder, so nothing
+           useful, but also not an error */
+        if (!focus_points_in_struct || !focus_points_in_use) {
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.33.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.33.bb
index 6b5e6c21b9..04c4786f84 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.33.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.33.bb
@@ -12,7 +12,16 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2"
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/${BP}.tar.xz;name=libgphoto2 \
           file://40-libgphoto2.rules \
           file://0001-configure-Filter-out-buildpaths-from-CC.patch \
-"
+           file://0001-libgphoto2-fix-const-correctness-for-c23-builds.patch \
+           file://CVE-2026-40333.patch \
+           file://CVE-2026-40334.patch \
+           file://CVE-2026-40335.patch \
+           file://CVE-2026-40336.patch \
+           file://CVE-2026-40338.patch \
+           file://CVE-2026-40339.patch \
+           file://CVE-2026-40340.patch \
+           file://CVE-2026-40341.patch \
+           "
 SRC_URI[libgphoto2.sha256sum] = "28825f767a85544cb58f6e15028f8e53a5bb37a62148b3f1708b524781c3bef2"
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gphoto/files/libgphoto/"
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_14.1.4.bb b/meta-oe/recipes-graphics/graphviz/graphviz_14.1.5.bb
index a5f08d0c85..388de9b452 100644
--- a/meta-oe/recipes-graphics/graphviz/graphviz_14.1.4.bb
+++ b/meta-oe/recipes-graphics/graphviz/graphviz_14.1.5.bb
@@ -23,7 +23,7 @@ SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-re
 SRC_URI:append:class-nativesdk = "\
           file://graphviz-setup.sh \
 "
-SRC_URI[sha256sum] = "043877c0857d8d46067cd2f18809d54fc876c399f0ecd438f60ea7f4d8037451"
+SRC_URI[sha256sum] = "b017378835f7ca12f1a3f1db5c338d7e7af16b284b7007ad73ccec960c1b45b3"
 UPSTREAM_CHECK_URI = "https://graphviz.org/download/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-graphics/libraqm/libraqm_0.10.5.bb b/meta-oe/recipes-graphics/libraqm/libraqm_0.10.5.bb
new file mode 100644
index 0000000000..8eaaee4492
--- /dev/null
+++ b/meta-oe/recipes-graphics/libraqm/libraqm_0.10.5.bb
@@ -0,0 +1,25 @@
+SUMMARY = "A library for complex text layout"
+DESCRIPTION = "\
+    Raqm is a small library that encapsulates the logic for complex text \
+    layout and provides a convenient API. It currently provides bidirectional \
+    text support (using FriBiDi or SheenBidi), shaping (using HarfBuzz), and \
+    proper script itemization. As a result, Raqm can support most writing \
+    systems covered by Unicode. \
+"
+HOMEPAGE = "https://github.com/HOST-Oman/libraqm"
+BUGTRACKER = "https://github.com/HOST-Oman/libraqm/issues"
+SECTION = "graphics"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7dc444a99e2824eac906383266fe4fa6"
+SRC_URI = "git://github.com/HOST-Oman/libraqm.git;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "3a6b891a3db0e0db1364aa38088422f68d8d81e6"
+DEPENDS = "freetype fribidi harfbuzz"
+inherit meson pkgconfig
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[sheenbidi] = "-Dsheenbidi=true,-Dsheenbidi=false,sheenbidi"
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.10.bb
index c15e986dc3..27ddc35381 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.10.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
 DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp"
 SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz"
-SRC_URI[sha256sum] = "2213b56fdaff2220d0e38c8e420cbe1a83c87374190cba8c70af2156097ce30a"
+SRC_URI[sha256sum] = "ebc059d01c007a62f4b04f10cf858527c875062532296943174df9a80264fd65"
 S = "${UNPACKDIR}/SDL2_image-${PV}"
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.0.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.2.bb
index 324332eb84..0f7ce92efd 100644
--- a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.0.bb
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.2.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=df8f4d887d3997f6e9cf81bb7f43dbf7"
 DEPENDS = "tiff zlib libpng jpeg libsdl3 libwebp libjxl"
-SRC_URI = "git://github.com/libsdl-org/SDL_image.git;protocol=https;branch=release-3.4.x"
+SRC_URI = "git://github.com/libsdl-org/SDL_image.git;protocol=https;branch=release-3.4.x;tag=release-${PV}"
-SRCREV = "ad58ecfc27a1bd09e510ceff8bbbdb1094806476"
+SRCREV = "96a73a551a857b7c8d0ca3cc553a266eabbab6a7"
 EXTRA_OECMAKE += "-DSDLIMAGE_JXL=ON"
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.2.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.4.bb
index d6501f855c..0159021280 100644
--- a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.2.bb
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.4.bb
@@ -18,7 +18,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL3-${PV}.tar.gz"
 S = "${UNPACKDIR}/SDL3-${PV}"
-SRC_URI[sha256sum] = "ef39a2e3f9a8a78296c40da701967dd1b0d0d6e267e483863ce70f8a03b4050c"
+SRC_URI[sha256sum] = "ee712dbe6a89bb140bbfc2ce72358fb5ee5cc2240abeabd54855012db30b3864"
 inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2026-6192.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2026-6192.patch
new file mode 100644
index 0000000000..49be9bd0a6
--- /dev/null
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2026-6192.patch
@@ -0,0 +1,35 @@
+From 776b00ff792a3c54b65f3bd92dbe7476a5a54106 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sun, 5 Apr 2026 13:25:27 +0200
+Subject: [PATCH] opj_pi_initialise_encode() (write code path): avoid potential
+ integer overflow leading to insufficient memory allocation
+Fixes #1619
+CVE: CVE-2026-6192
+Upstream-Status: Backport [https://github.com/uclouvain/openjpeg/commit/839936aa33eb8899bbbd80fda02796bb65068951]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/lib/openjp2/pi.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
+index 15ac3314..4abb87af 100644
+--- a/src/lib/openjp2/pi.c
+++ b/src/lib/openjp2/pi.c
+@@ -1694,9 +1694,12 @@ opj_pi_iterator_t *opj_pi_initialise_encode(const opj_image_t *p_image,
+     l_current_pi = l_pi;
+ 
+     /* memory allocation for include*/
+-    l_current_pi->include_size = l_tcp->numlayers * l_step_l;
+-    l_current_pi->include = (OPJ_INT16*) opj_calloc(l_current_pi->include_size,
+-                            sizeof(OPJ_INT16));
+    l_current_pi->include = NULL;
+    if (l_step_l <= UINT_MAX / l_tcp->numlayers) {
+        l_current_pi->include_size = l_tcp->numlayers * l_step_l;
+        l_current_pi->include = (OPJ_INT16*) opj_calloc(l_current_pi->include_size,
+                                sizeof(OPJ_INT16));
+    }
+     if (!l_current_pi->include) {
+         opj_free(l_tmp_data);
+         opj_free(l_tmp_ptr);
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb
index 33dc48b2ea..968b7a0a5c 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb
@@ -8,6 +8,7 @@ DEPENDS = "libpng tiff lcms zlib"
 SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \
           file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
           file://CVE-2023-39327.patch \
+           file://CVE-2026-6192.patch \
           "
 SRCREV = "6c4a29b00211eb0430fa0e5e890f1ce5c80f409f"
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_407.bb b/meta-oe/recipes-graphics/xorg-app/xterm_408.bb
index 4aecd77f98..0f76bc1209 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_407.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_408.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=413ff95100710d7a81
 SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
           file://0001-include-missing-pty.h-header-for-openpty.patch \
          "
-SRC_URI[sha256sum] = "2136eba530068a1b7565abbf17823274f5cefb7fe3618355cbc89dc55c8b7b6a"
+SRC_URI[sha256sum] = "27dc9e770885f98fbd0b5b40bcda959dc11ec9ba21f0a33b12aafffcc7f9b813"
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native"
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
index 430b5974b3..5c001696d0 100644
--- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
+++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
@@ -12,12 +12,17 @@ S = "${UNPACKDIR}"
 SRC_URI:append:libc-musl = "\
                      file://userfaultfd.patch \
                      "
+# Fix liburing detection (from Linux v7.0)
+MM_PATCH = "file://0001-selftests-mm-pass-down-full-CC-and-CFLAGS-to-check_c.patch"
 SRC_URI += "file://run-ptest \
            file://COPYING \
            file://0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch \
+            ${@bb.utils.contains('PACKAGECONFIG', 'mm', '${MM_PATCH}', '', d)} \
            "
-# now we just test bpf and vm
+# now we just test bpf and mm (formerly known as vm)
 # we will append other kernel selftest in the future
 # bpf was added in 4.10 with: https://github.com/torvalds/linux/commit/5aa5bd14c5f8660c64ceedf14a549781be47e53d
 # if you have older kernel than that you need to remove it from PACKAGECONFIG
@@ -25,20 +30,17 @@ PACKAGECONFIG ??= "firmware"
 # bpf needs working clang compiler anyway
 PACKAGECONFIG:append:toolchain-clang:x86-64 = " bpf"
 PACKAGECONFIG:remove:x86 = "bpf"
-PACKAGECONFIG:remove:arm = "bpf vm"
+PACKAGECONFIG:remove:arm = "bpf mm"
 # host ptrace.h is used to compile BPF target but mips ptrace.h is needed
 # progs/loop1.c:21:9: error: incomplete definition of type 'struct user_pt_regs'
 # m = PT_REGS_RC(ctx);
-# vm tests need libhugetlbfs starting 5.8+ (https://lkml.org/lkml/2020/4/22/1654)
+PACKAGECONFIG:remove:qemumips = "bpf"
-PACKAGECONFIG:remove:qemumips = "bpf vm"
+PACKAGECONFIG:remove:riscv64 = "bpf"
+PACKAGECONFIG:remove:riscv32 = "bpf"
-# riscv does not support libhugetlbfs yet
-PACKAGECONFIG:remove:riscv64 = "bpf vm"
-PACKAGECONFIG:remove:riscv32 = "bpf vm"
 PACKAGECONFIG[bpf] = ",,elfutils elfutils-native libcap libcap-ng rsync-native python3-docutils-native,"
 PACKAGECONFIG[firmware] = ",,libcap, bash"
-PACKAGECONFIG[vm] = ",,libcap libhugetlbfs,libgcc bash"
+PACKAGECONFIG[mm] = ",,libcap liburing numactl, libgcc bash"
 do_patch[depends] += "virtual/kernel:do_shared_workdir"
 do_compile[depends] += "virtual/kernel:do_install"
@@ -48,7 +50,7 @@ inherit linux-kernel-base module-base kernel-arch ptest siteinfo
 DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map"
 TEST_LIST = "\
-    ${@bb.utils.filter('PACKAGECONFIG', 'bpf firmware vm', d)} \
+    ${@bb.utils.filter('PACKAGECONFIG', 'bpf firmware mm', d)} \
    cpufreq \
    cpu-hotplug \
    rtc \
@@ -78,6 +80,7 @@ KERNEL_SELFTEST_SRC ?= "Makefile \
                        tools \
                        scripts \
                        arch \
+                        ${@bb.utils.filter('PACKAGECONFIG', 'mm', d)} \
                        LICENSES \
 "
 do_compile() {
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-mm-pass-down-full-CC-and-CFLAGS-to-check_c.patch b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-mm-pass-down-full-CC-and-CFLAGS-to-check_c.patch
new file mode 100644
index 0000000000..a115d56dd1
--- /dev/null
+++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-mm-pass-down-full-CC-and-CFLAGS-to-check_c.patch
@@ -0,0 +1,76 @@
+From 8f9e6395f1f8121b577eeb4cb54f671a9088bddd Mon Sep 17 00:00:00 2001
+From: Kevin Brodsky <kevin.brodsky@arm.com>
+Date: Thu, 22 Jan 2026 17:02:18 +0000
+Subject: [PATCH] selftests/mm: pass down full CC and CFLAGS to check_config.sh
+check_config.sh checks that liburing is available by running the compiler
+provided as its first argument.  This makes two assumptions:
+1. CC consists of only one word
+2. No extra flag is required
+Unfortunately, there are many situations where these assumptions don't
+hold.  For instance:
+- When using Clang, CC consists of multiple words
+- When cross-compiling, extra flags may be required to allow the
+  compiler to find headers
+Remove these assumptions by passing down CC and CFLAGS as-is from the
+Makefile, so that the same command line is used as when actually building
+the tests.
+Link: https://lkml.kernel.org/r/20260122170224.4056513-4-kevin.brodsky@arm.com
+Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com>
+Reviewed-by: Mark Brown <broonie@kernel.org>
+Acked-by: David Hildenbrand (Red Hat) <david@kernel.org>
+Cc: Jason Gunthorpe <jgg@nvidia.com>
+Cc: John Hubbard <jhubbard@nvidia.com>
+Cc: Dev Jain <dev.jain@arm.com>
+Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
+Cc: Paolo Abeni <pabeni@redhat.com>
+Cc: Ryan Roberts <ryan.roberts@arm.com>
+Cc: SeongJae Park <sj@kernel.org>
+Cc: Shuah Khan <shuah@kernel.org>
+Cc: Usama Anjum <Usama.Anjum@arm.com>
+Cc: wang lian <lianux.mm@gmail.com>
+Cc: Yunsheng Lin <linyunsheng@huawei.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Upstream-Status: Backport [from commit 7f532d19c8be7, in tag v7.0]
+---
+ tools/testing/selftests/mm/Makefile        | 2 +-
+ tools/testing/selftests/mm/check_config.sh | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile
+index ae6f994d3add..fc9b9ec367c3 100644
+--- a/tools/testing/selftests/mm/Makefile
+++ b/tools/testing/selftests/mm/Makefile
+@@ -228,7 +228,7 @@ $(OUTPUT)/ksm_tests: LDLIBS += -lnuma
+ $(OUTPUT)/migration: LDLIBS += -lnuma
+ 
+ local_config.mk local_config.h: check_config.sh
+-       /bin/sh ./check_config.sh $(CC)
+       CC="$(CC)" CFLAGS="$(CFLAGS)" ./check_config.sh
+ 
+ EXTRA_CLEAN += local_config.mk local_config.h
+ 
+diff --git a/tools/testing/selftests/mm/check_config.sh b/tools/testing/selftests/mm/check_config.sh
+index 3954f4746161..b84c82bbf875 100755
+--- a/tools/testing/selftests/mm/check_config.sh
+++ b/tools/testing/selftests/mm/check_config.sh
+@@ -16,8 +16,7 @@ echo "#include <sys/types.h>"        > $tmpfile_c
+ echo "#include <liburing.h>"        >> $tmpfile_c
+ echo "int func(void) { return 0; }" >> $tmpfile_c
+ 
+-CC=${1:?"Usage: $0 <compiler> # example compiler: gcc"}
+-$CC -c $tmpfile_c -o $tmpfile_o >/dev/null 2>&1
+$CC $CFLAGS -c $tmpfile_c -o $tmpfile_o
+ 
+ if [ -f $tmpfile_o ]; then
+     echo "#define LOCAL_CONFIG_HAVE_LIBURING 1"  > $OUTPUT_H_FILE
+-- 
+2.47.0
diff --git a/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb b/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb
index 6ebb54e261..c837dad87c 100644
--- a/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb
+++ b/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb
@@ -30,7 +30,7 @@ SRC_URI[sha256sum] = "ea2449ad3f201ec590d811db9da6d02ffc5e87a677d06b92ab15363d8c
 inherit autotools lib_package pkgconfig ptest
-CXXFLAGS += "-std=c++14"
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 DEPENDS = " \
    asciidoc-native \
diff --git a/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.3.bb b/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.3.bb
index 9090cabb12..463e9a3dd7 100644
--- a/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.3.bb
+++ b/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs/multimedia"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27"
-SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2"
+SRC_URI = "https://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2"
 SRC_URI[sha256sum] = "ce35454997a208cbe50e91232f0e73fb1ac3471965813a13b8730a8f18a15369"
 inherit autotools lib_package binconfig pkgconfig
diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_6.2.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_6.2.bb
index 9e54f49dcb..b6b9a068a9 100644
--- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_6.2.bb
+++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_6.2.bb
@@ -9,7 +9,6 @@ DEPENDS = "gtkmm4 pulseaudio json-glib"
 inherit meson features_check pkgconfig gettext
 ANY_OF_DISTRO_FEATURES = "opengl vulkan"
-REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "http://www.freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz"
 SRC_URI[sha256sum] = "e93a7836c7307dcbc989e95fc7ec0878322514c475fabd90e89ed52fd4f15d32"
diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.8.0.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.8.1.bb
index 54c938c908..4769ed033a 100644
--- a/meta-oe/recipes-navigation/geoclue/geoclue_2.8.0.bb
+++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.8.1.bb
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native"
 inherit meson pkgconfig gtk-doc gobject-introspection vala
-SRCREV = "f59a42a9fbbcfcb341708e5efd6edfe72a9da768"
+SRCREV = "81ddcb11208a59328a04bf022542504ac80602f5"
-SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;branch=master \
+SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;branch=master;tag=${PV} \
    file://0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch \
 "
diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-style-convert-K-R-function-definitions-to-ANSI-C-sty.patch b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-style-convert-K-R-function-definitions-to-ANSI-C-sty.patch
new file mode 100644
index 0000000000..d8efc9b5d7
--- /dev/null
+++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-style-convert-K-R-function-definitions-to-ANSI-C-sty.patch
@@ -0,0 +1,301 @@
+From 80bc0c1bfff769728d18ac5d9e22755e60fc23d8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Fri, 10 Apr 2026 13:08:52 -0700
+Subject: [PATCH] style: convert K&R function definitions to ANSI C style in
+ md5.c
+Replace old-style K&R function parameter declarations with modern ANSI
+C prototypes across all functions in lib/md5.c. Also strip trailing
+whitespace throughout the file. No functional changes.
+Upstream-Status: Inappropriate [md5 does not exist in master branch]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ lib/md5.c       | 231 +++++++++++++++++++++++++-----------------------
+ saslauthd/md5.c |  77 +++++++++-------
+ 2 files changed, 163 insertions(+), 145 deletions(-)
+--- a/saslauthd/md5.c
+++ b/saslauthd/md5.c
+@@ -98,8 +98,9 @@ Rotation is separate from addition to pr
+ /* MD5 initialization. Begins an MD5 operation, writing a new context.
+ */
+ 
+-void _saslauthd_MD5Init (context)
+-MD5_CTX *context; /* context */
+void _saslauthd_MD5Init (
+MD5_CTX *context /* context */
+)
+ {
+        context->count[0] = context->count[1] = 0; 
+ 
+@@ -114,10 +115,11 @@ MD5_CTX *context; /* context */
+        operation, processing another message block, and updating the context. 
+ */
+ 
+-void _saslauthd_MD5Update (context, input, inputLen)
+-MD5_CTX *context; /* context */
+-unsigned char *input; /* input block */
+-unsigned int inputLen; /* length of input block */
+void _saslauthd_MD5Update (
+MD5_CTX *context, /* context */
+unsigned char *input, /* input block */
+unsigned int inputLen /* length of input block */
+)
+ {
+        unsigned int i, index, partLen; 
+ 
+@@ -159,9 +161,10 @@ unsigned int inputLen; /* length of inpu
+        the message digest and zeroizing the context. 
+ */
+ 
+-void _saslauthd_MD5Final (digest, context)
+-unsigned char digest[16]; /* message digest */
+-MD5_CTX *context; /* context */
+void _saslauthd_MD5Final (
+unsigned char digest[16], /* message digest */
+MD5_CTX *context /* context */
+)
+ {
+        unsigned char bits[8]; 
+        unsigned int index, padLen; 
+@@ -186,9 +189,10 @@ MD5_CTX *context; /* context */
+ 
+ /* MD5 basic transformation. Transforms state based on block. */
+ 
+-static void MD5Transform (state, block)
+-UINT4 state[4];
+-unsigned char block[64];
+static void MD5Transform (
+UINT4 state[4],
+unsigned char block[64]
+)
+ {
+        UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; 
+ 
+@@ -281,10 +285,11 @@ unsigned char block[64];
+ 
+         */
+ 
+-static void Encode (output, input, len)
+-unsigned char *output;
+-UINT4 *input;
+-unsigned int len;
+static void Encode (
+unsigned char *output,
+UINT4 *input,
+unsigned int len
+)
+ {
+        unsigned int i, j; 
+ 
+@@ -301,10 +306,11 @@ unsigned int len;
+ 
+         */
+ 
+-static void Decode (output, input, len)
+-UINT4 *output;
+-unsigned char *input;
+-unsigned int len;
+static void Decode (
+UINT4 *output,
+unsigned char *input,
+unsigned int len
+)
+ {
+        unsigned int i, j; 
+ 
+@@ -317,10 +323,11 @@ unsigned int len;
+ 
+         */
+ 
+-static void MD5_memcpy (output, input, len)
+-POINTER output;
+-POINTER input;
+-unsigned int len;
+static void MD5_memcpy (
+POINTER output,
+POINTER input,
+unsigned int len
+)
+ {
+        unsigned int i; 
+ 
+@@ -331,10 +338,11 @@ unsigned int len;
+ /* Note: Replace "for loop" with standard memset if possible.
+ */
+ 
+-static void MD5_memset (output, value, len)
+-POINTER output;
+-int value;
+-unsigned int len;
+static void MD5_memset (
+POINTER output,
+int value,
+unsigned int len
+)
+ {
+        unsigned int i; 
+ 
+@@ -452,12 +460,13 @@ void _saslauthd_hmac_md5_final(unsigned
+ }
+ 
+ 
+-void _saslauthd_hmac_md5(text, text_len, key, key_len, digest)
+-const unsigned char* text; /* pointer to data stream */
+-int text_len; /* length of data stream */
+-const unsigned char* key; /* pointer to authentication key */
+-int key_len; /* length of authentication key */
+-unsigned char *digest; /* caller digest to be filled in */
+void _saslauthd_hmac_md5(
+const unsigned char* text, /* pointer to data stream */
+int text_len, /* length of data stream */
+const unsigned char* key, /* pointer to authentication key */
+int key_len, /* length of authentication key */
+unsigned char *digest /* caller digest to be filled in */
+)
+ {
+   MD5_CTX context; 
+ 
+--- a/lib/md5.c
+++ b/lib/md5.c
+@@ -98,8 +98,9 @@ Rotation is separate from addition to pr
+ /* MD5 initialization. Begins an MD5 operation, writing a new context.
+ */
+ 
+-void _sasl_MD5Init (context)
+-MD5_CTX *context; /* context */
+void _sasl_MD5Init (
+MD5_CTX *context /* context */
+)
+ {
+        context->count[0] = context->count[1] = 0; 
+ 
+@@ -114,10 +115,11 @@ MD5_CTX *context; /* context */
+        operation, processing another message block, and updating the context. 
+ */
+ 
+-void _sasl_MD5Update (context, input, inputLen)
+-MD5_CTX *context; /* context */
+-const unsigned char *input; /* input block */
+-unsigned int inputLen; /* length of input block */
+void _sasl_MD5Update (
+MD5_CTX *context, /* context */
+const unsigned char *input, /* input block */
+unsigned int inputLen /* length of input block */
+)
+ {
+        unsigned int i, index, partLen; 
+ 
+@@ -159,9 +161,10 @@ unsigned int inputLen; /* length of inpu
+        the message digest and zeroizing the context. 
+ */
+ 
+-void _sasl_MD5Final (digest, context)
+-unsigned char digest[16]; /* message digest */
+-MD5_CTX *context; /* context */
+void _sasl_MD5Final (
+unsigned char digest[16], /* message digest */
+MD5_CTX *context /* context */
+)
+ {
+        unsigned char bits[8]; 
+        unsigned int index, padLen; 
+@@ -186,9 +189,10 @@ MD5_CTX *context; /* context */
+ 
+ /* MD5 basic transformation. Transforms state based on block. */
+ 
+-static void MD5Transform (state, block)
+-UINT4 state[4];
+-const unsigned char block[64];
+static void MD5Transform (
+UINT4 state[4],
+const unsigned char block[64]
+)
+ {
+        UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; 
+ 
+@@ -281,10 +285,11 @@ const unsigned char block[64];
+ 
+         */
+ 
+-static void Encode (output, input, len)
+-unsigned char *output;
+-UINT4 *input;
+-unsigned int len;
+static void Encode (
+unsigned char *output,
+UINT4 *input,
+unsigned int len
+)
+ {
+        unsigned int i, j; 
+ 
+@@ -301,10 +306,11 @@ unsigned int len;
+ 
+         */
+ 
+-static void Decode (output, input, len)
+-UINT4 *output;
+-const unsigned char *input;
+-unsigned int len;
+static void Decode (
+UINT4 *output,
+const unsigned char *input,
+unsigned int len
+)
+ {
+        unsigned int i, j; 
+ 
+@@ -317,10 +323,11 @@ unsigned int len;
+ 
+         */
+ 
+-static void MD5_memcpy (output, input, len)
+-POINTER output;
+-POINTER input;
+-unsigned int len;
+static void MD5_memcpy (
+POINTER output,
+POINTER input,
+unsigned int len
+)
+ {
+        unsigned int i; 
+ 
+@@ -331,10 +338,11 @@ unsigned int len;
+ /* Note: Replace "for loop" with standard memset if possible.
+ */
+ 
+-static void MD5_memset (output, value, len)
+-POINTER output;
+-int value;
+-unsigned int len;
+static void MD5_memset (
+POINTER output,
+int value,
+unsigned int len
+)
+ {
+        unsigned int i; 
+ 
+@@ -452,12 +460,13 @@ void _sasl_hmac_md5_final(unsigned char
+ }
+ 
+ 
+-void _sasl_hmac_md5(text, text_len, key, key_len, digest)
+-const unsigned char* text; /* pointer to data stream */
+-int text_len; /* length of data stream */
+-const unsigned char* key; /* pointer to authentication key */
+-int key_len; /* length of authentication key */
+-unsigned char *digest; /* caller digest to be filled in */
+void _sasl_hmac_md5(
+const unsigned char* text, /* pointer to data stream */
+int text_len, /* length of data stream */
+const unsigned char* key, /* pointer to authentication key */
+int key_len, /* length of authentication key */
+unsigned char *digest /* caller digest to be filled in */
+)
+ {
+   MD5_CTX context; 
+ 
diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb
index bd15b0bda8..26ec8a71a1 100644
--- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb
+++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb
@@ -20,6 +20,7 @@ SRC_URI = " \
    file://0001-configure-prototypes.patch \
    file://0002-Fix-incompatible-pointer-types-error-with-gcc-15.patch \
    file://0003-Add-compatibility-for-gcc-15-869.patch \
+    file://0001-style-convert-K-R-function-definitions-to-ANSI-C-sty.patch \
 "
 UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives"
diff --git a/meta-oe/recipes-security/audit/audit/0001-m4-update-ax_prog_cc_for_build.m4-to-latest.patch b/meta-oe/recipes-security/audit/audit/0001-m4-update-ax_prog_cc_for_build.m4-to-latest.patch
new file mode 100644
index 0000000000..cf322b8e1a
--- /dev/null
+++ b/meta-oe/recipes-security/audit/audit/0001-m4-update-ax_prog_cc_for_build.m4-to-latest.patch
@@ -0,0 +1,196 @@
+From 3da79b330527b5f9d6e6243c8ba12968810965a3 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Fri, 10 Apr 2026 14:53:41 +0200
+Subject: [PATCH] m4: update ax_prog_cc_for_build.m4 to latest
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+After the autoconf update to 2.73 this was using -std=gnu23
+even on hosts with gcc-13 which doesn't support it:
+ac_cv_prog_ac_ct_CC_FOR_BUILD='gcc '
+ac_cv_prog_cc_c23=-std=gnu23
+ac_cv_prog_cc_g=yes
+ac_cv_prog_cc_stdc=-std=gnu23
+Leading to:
+gcc  -std=gnu23 -DHAVE_CONFIG_H -I. -I../../sources/audit-4.1.4/lib -I..  -I. -I../../sources/audit-4.1.4 -I../../sources/audit-4.1.4/auparse -I../../sources/audit-4.1.4/common -isystem/audit/4.1.4/recipe-sysroot-native/usr/include '-DTABLE_H="fieldtab.h"' -isystem/audit/4.1.4/recipe-sysroot-native/usr/include -O2 -pipe -c -o gen_fieldtabs_h-gen_tables.o `test -f 'gen_tables.c' || echo '../../sources/audit-4.1.4/lib/'`gen_tables.c
+gcc: error: unrecognized command-line option â-std=gnu23â; did you mean â-std=gnu2xâ?
+Needs the updated ac_cv_prog_cc_c23 from:
+https://github.com/autoconf-archive/autoconf-archive/commit/8a970ce96721f516fef4226e5eca8da341159765
+Upstream-Status: Submitted [https://github.com/linux-audit/audit-userspace/pull/524]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ m4/ax_prog_cc_for_build.m4 | 100 +++++++++++++++++++++++++++----------
+ 1 file changed, 75 insertions(+), 25 deletions(-)
+diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4
+index 77fd346a..4d1de993 100644
+--- a/m4/ax_prog_cc_for_build.m4
+++ b/m4/ax_prog_cc_for_build.m4
+@@ -1,5 +1,5 @@
+ # ===========================================================================
+-#   http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
+#   https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
+ # ===========================================================================
+ #
+ # SYNOPSIS
+@@ -32,28 +32,32 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 8
+#serial 26
+ 
+ AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
+ AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_PROG_CPP])dnl
+-AC_REQUIRE([AC_EXEEXT])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ 
+ dnl Use the standard macros, but make them use other variable names
+ dnl
+ pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
+ pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
+pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl
+pushdef([ac_cv_prog_cc_c99], ac_cv_build_prog_cc_c99)dnl
+pushdef([ac_cv_prog_cc_c11], ac_cv_build_prog_cc_c11)dnl
+pushdef([ac_cv_prog_cc_c23], ac_cv_build_prog_cc_c23)dnl
+pushdef([ac_cv_prog_cc_stdc], ac_cv_build_prog_cc_stdc)dnl
+ pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
+ pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
+ pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
+-pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
+-pushdef([ac_cv_objext], ac_cv_build_objext)dnl
+pushdef([ac_prog_cc_stdc], ac_build_prog_cc_stdc)dnl
+ pushdef([ac_exeext], ac_build_exeext)dnl
+ pushdef([ac_objext], ac_build_objext)dnl
+ pushdef([CC], CC_FOR_BUILD)dnl
+ pushdef([CPP], CPP_FOR_BUILD)dnl
+pushdef([GCC], GCC_FOR_BUILD)dnl
+ pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
+ pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
+ pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
+@@ -67,27 +71,58 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
+ pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
+ pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
+ pushdef([ac_cv_host_os], ac_cv_build_os)dnl
+-pushdef([ac_cpp], ac_build_cpp)dnl
+-pushdef([ac_compile], ac_build_compile)dnl
+-pushdef([ac_link], ac_build_link)dnl
+pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl
+pushdef([am_cv_CC_dependencies_compiler_type], am_cv_build_CC_dependencies_compiler_type)dnl
+pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl
+pushdef([cross_compiling], cross_compiling_build)dnl
+dnl
+dnl These variables are problematic to rename by M4 macros, so we save
+dnl their values in alternative names, and restore the values later.
+dnl
+dnl _AC_COMPILER_EXEEXT and _AC_COMPILER_OBJEXT internally call
+dnl AC_SUBST which prevents the renaming of EXEEXT and OBJEXT
+dnl variables. It's not a good idea to rename ac_cv_exeext and
+dnl ac_cv_objext either as they're related.
+dnl Renaming ac_exeext and ac_objext is safe though.
+dnl
+ac_cv_host_exeext=$ac_cv_exeext
+AS_VAR_SET_IF([ac_cv_build_exeext],
+  [ac_cv_exeext=$ac_cv_build_exeext],
+  [AS_UNSET([ac_cv_exeext])])
+ac_cv_host_objext=$ac_cv_objext
+AS_VAR_SET_IF([ac_cv_build_objext],
+  [ac_cv_objext=$ac_cv_build_objext],
+  [AS_UNSET([ac_cv_objext])])
+dnl
+dnl ac_cv_c_compiler_gnu is used in _AC_LANG_COMPILER_GNU (called by
+dnl AC_PROG_CC) indirectly.
+dnl
+ac_cv_host_c_compiler_gnu=$ac_cv_c_compiler_gnu
+AS_VAR_SET_IF([ac_cv_build_c_compiler_gnu],
+  [ac_cv_c_compiler_gnu=$ac_cv_build_c_compiler_gnu],
+  [AS_UNSET([ac_cv_c_compiler_gnu])])
+
+cross_compiling_build=no
+ 
+-save_cross_compiling=$cross_compiling
+-save_ac_tool_prefix=$ac_tool_prefix
+-cross_compiling=no
+-ac_tool_prefix=
+ac_build_tool_prefix=
+AS_IF([test -n "$build"],      [ac_build_tool_prefix="$build-"],
+      [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"])
+ 
+AC_LANG_PUSH([C])
+ AC_PROG_CC
+_AC_COMPILER_EXEEXT
+_AC_COMPILER_OBJEXT
+ AC_PROG_CPP
+-AC_EXEEXT
+ 
+-ac_tool_prefix=$save_ac_tool_prefix
+-cross_compiling=$save_cross_compiling
+BUILD_EXEEXT=$ac_cv_exeext
+BUILD_OBJEXT=$ac_cv_objext
+ 
+ dnl Restore the old definitions
+ dnl
+-popdef([ac_link])dnl
+-popdef([ac_compile])dnl
+-popdef([ac_cpp])dnl
+popdef([cross_compiling])dnl
+popdef([am_cv_prog_cc_c_o])dnl
+popdef([am_cv_CC_dependencies_compiler_type])dnl
+popdef([ac_tool_prefix])dnl
+ popdef([ac_cv_host_os])dnl
+ popdef([ac_cv_host_vendor])dnl
+ popdef([ac_cv_host_cpu])dnl
+@@ -101,24 +136,39 @@ popdef([host])dnl
+ popdef([LDFLAGS])dnl
+ popdef([CPPFLAGS])dnl
+ popdef([CFLAGS])dnl
+popdef([GCC])dnl
+ popdef([CPP])dnl
+ popdef([CC])dnl
+ popdef([ac_objext])dnl
+ popdef([ac_exeext])dnl
+-popdef([ac_cv_objext])dnl
+-popdef([ac_cv_exeext])dnl
+popdef([ac_prog_cc_stdc])dnl
+ popdef([ac_cv_prog_cc_g])dnl
+ popdef([ac_cv_prog_cc_cross])dnl
+ popdef([ac_cv_prog_cc_works])dnl
+popdef([ac_cv_prog_cc_stdc])dnl
+popdef([ac_cv_prog_cc_c23])dnl
+popdef([ac_cv_prog_cc_c11])dnl
+popdef([ac_cv_prog_cc_c99])dnl
+popdef([ac_cv_prog_cc_c89])dnl
+ popdef([ac_cv_prog_gcc])dnl
+ popdef([ac_cv_prog_CPP])dnl
+dnl
+ac_cv_exeext=$ac_cv_host_exeext
+EXEEXT=$ac_cv_host_exeext
+ac_cv_objext=$ac_cv_host_objext
+OBJEXT=$ac_cv_host_objext
+ac_cv_c_compiler_gnu=$ac_cv_host_c_compiler_gnu
+ac_compiler_gnu=$ac_cv_host_c_compiler_gnu
+
+dnl restore global variables ac_ext, ac_cpp, ac_compile,
+dnl ac_link, ac_compiler_gnu (dependent on the current
+dnl language after popping):
+AC_LANG_POP([C])
+ 
+ dnl Finally, set Makefile variables
+ dnl
+-BUILD_EXEEXT=$ac_build_exeext
+-BUILD_OBJEXT=$ac_build_objext
+-AC_SUBST(BUILD_EXEEXT)dnl
+-AC_SUBST(BUILD_OBJEXT)dnl
+AC_SUBST([BUILD_EXEEXT])dnl
+AC_SUBST([BUILD_OBJEXT])dnl
+ AC_SUBST([CFLAGS_FOR_BUILD])dnl
+ AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
+ AC_SUBST([LDFLAGS_FOR_BUILD])dnl
diff --git a/meta-oe/recipes-security/audit/audit_4.1.4.bb b/meta-oe/recipes-security/audit/audit_4.1.4.bb
index 05d6f1d277..e349ee76d0 100644
--- a/meta-oe/recipes-security/audit/audit_4.1.4.bb
+++ b/meta-oe/recipes-security/audit/audit_4.1.4.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https;tag=v${PV} \
           file://0001-Fixed-swig-host-contamination-issue.patch \
+           file://0001-m4-update-ax_prog_cc_for_build.m4-to-latest.patch \
           file://auditd \
          "
diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.3.bb b/meta-oe/recipes-security/keyutils/keyutils_1.6.3.bb
index 86f45656f6..2e7503cd42 100644
--- a/meta-oe/recipes-security/keyutils/keyutils_1.6.3.bb
+++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.3.bb
@@ -44,6 +44,8 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \
    NO_GLIBC_KEYERR=1 \
    "
+LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
 do_install () {
    oe_runmake DESTDIR=${D} install
 }
diff --git a/meta-oe/recipes-security/spdm-emu/spdm-emu_git.bb b/meta-oe/recipes-security/spdm-emu/spdm-emu_git.bb
index ae196946d9..662519d5b2 100644
--- a/meta-oe/recipes-security/spdm-emu/spdm-emu_git.bb
+++ b/meta-oe/recipes-security/spdm-emu/spdm-emu_git.bb
@@ -34,7 +34,7 @@ def get_spdm_multiarch(d):
    if target_arch in multiarch_options:
        return multiarch_options[target_arch]
-    bb.fatal("unsupported architecture '%s'" % target_arch)
+    bb.parse.SkipRecipe("unsupported architecture '%s'" % target_arch)
 EXTRA_OECMAKE += "\
    -DARCH=${@get_spdm_multiarch(d)} \
diff --git a/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_git.bb b/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_26.26.0404682.bb
index e239770584..454e702e66 100644
--- a/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_git.bb
+++ b/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_26.26.0404682.bb
@@ -8,10 +8,8 @@ BUGTRACKER = "https://github.com/speed47/spectre-meltdown-checker/issues"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://spectre-meltdown-checker.sh;beginline=2;endline=2;md5=3ae5399e70af7be9b93f72568069e2f4"
-PV = "0.46+git"
+SRC_URI = "git://github.com/speed47/spectre-meltdown-checker;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "8a6f9d5d638c601d2a875669015a6cb217e40f49"
-SRC_URI = "git://github.com/speed47/spectre-meltdown-checker;protocol=https;branch=master"
-SRCREV = "a20641fbad57f37da6093203484ca28769e5bb64"
 # binutils: readelf,objdump might be used for deeper analysis
 # coreutils: dd with iflag=skip_bytes oflag=seek_bytes in some cases
diff --git a/meta-oe/recipes-support/atop/atop_2.12.1.bb b/meta-oe/recipes-support/atop/atop_2.12.1.bb
index 4ca74edbaf..d40b95ce6c 100644
--- a/meta-oe/recipes-support/atop/atop_2.12.1.bb
+++ b/meta-oe/recipes-support/atop/atop_2.12.1.bb
@@ -7,7 +7,7 @@ etc. At regular intervals, it shows system-level activity related to the CPU, \
 memory, swap, disks (including LVM) and network layers, and for every process \
 (and thread) it shows e.g. the CPU utilization, memory growth, disk \
 utilization, priority, username, state, and exit code."
-HOMEPAGE = "http://www.atoptool.nl"
+HOMEPAGE = "https://www.atoptool.nl"
 SECTION = "console/utils"
 LICENSE = "GPL-2.0-only"
@@ -37,7 +37,7 @@ do_compile() {
 do_install() {
    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
        make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \
-            PMPATHD=${systemd_unitdir}/system-sleep install
+            PMPATHD=${systemd_unitdir}/system-sleep SBINPATH=${sbindir} install
        install -d ${D}${sysconfdir}/tmpfiles.d
        install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf
        rm -f ${D}${systemd_system_unitdir}/atopacct.service
@@ -51,16 +51,19 @@ do_install() {
    # /var/log/atop will be created in runtime
    rm -rf ${D}${localstatedir}/log
    rmdir --ignore-fail-on-non-empty ${D}${localstatedir}
-    # remove atopacct related files
-    rm -rf ${D}${sbindir} ${D}${mandir}/man8
 }
 inherit systemd
+PACKAGES =+ "${PN}-acctd ${PN}-gpud"
 SYSTEMD_SERVICE:${PN} = "atop.service atopgpu.service atop-rotate.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 FILES:${PN} += "${systemd_unitdir}/system-sleep ${systemd_system_unitdir}/atop-rotate.timer"
+FILES:${PN}-acctd += "${sbindir}/atopacctd ${mandir}/man8/atopacctd.8"
+FILES:${PN}-gpud += "${sbindir}/atopgpud ${mandir}/man8/atopgpud.8"
 RDEPENDS:${PN} = "procps"
+RDEPENDS:${PN}-gpud = "python3-core"
+RRECOMMENDS:${PN} = "${PN}-acctd ${PN}-gpud"
diff --git a/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.3.bb b/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.4.bb
index e08525b1c9..657ba60e1d 100644
--- a/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.3.bb
+++ b/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.4.bb
@@ -9,11 +9,14 @@ LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e49f4652534af377a713df3d9dec60cb"
 SRC_URI = "git://github.com/embetrix/${BPN};branch=master;protocol=https;tag=${PV}"
-SRCREV = "991e2c4264b843f61e502712f497103472a1b6e7"
+SRCREV = "52919b145d04953a91cf846f3db3d8cee8d989ac"
 DEPENDS = "libtinyxml2 libarchive"
 inherit cmake pkgconfig
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[libkcapi]  = "-DUSE_KERNEL_CRYPTO_API=ON, -DUSE_KERNEL_CRYPTO_API=OFF, libkcapi"
 FILES:${PN} = "${bindir}"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb
index 0a8f237180..5368bdeeb4 100644
--- a/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb
+++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb
@@ -3,12 +3,11 @@ HOMEPAGE = "http://ceres-solver.org/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3585a26c9cd9ec0cb36a7d65542878ca"
-DEPENDS = "libeigen glog"
+DEPENDS = "libeigen"
 SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https"
 SRCREV = "85331393dc0dff09f6fb9903ab0c4bfa3e134b01"
 inherit cmake
 do_configure:prepend() {
@@ -19,6 +18,14 @@ do_configure:prepend() {
    touch ${S}/.git/hooks/commit-msg 2>/dev/null || :
 }
+EXTRA_OECMAKE += " \
+    -DBUILD_BENCHMARKS=OFF \
+    -DBUILD_EXAMPLES=OFF \
+    -DBUILD_TESTING=OFF \
+    -DGFLAGS=OFF \
+    -DUSE_CUDA=OFF \
+"
 # We don't want path to eigen3 in ceres-solver RSS to be
 # used by components which use CeresConfig.cmake from their
 # own RSS
@@ -27,11 +34,12 @@ do_configure:prepend() {
 # ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake:    set(glog_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/lib/cmake/glog)
 SSTATE_SCAN_FILES += "*.cmake"
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "glog"
 # suitesparse* recipes will be in meta-ros layer
 PACKAGECONFIG[suitesparse] = "-DSUITESPARSE=ON,-DSUITESPARSE=OFF,suitesparse-config suitesparse-amd suitesparse-camd suitesparse-colamd suitesparse-ccolamd suitesparse-cholmod suitesparse-metis suitesparse-spqr"
 PACKAGECONFIG[cxsparse] = "-DCXSPARSE=ON,-DCXSPARSE=OFF,suitesparse-cxsparse"
+PACKAGECONFIG[glog] = "-DMINIGLOG=OFF,-DMINIGLOG=ON,glog"
 PACKAGECONFIG[lapack] = "-DLAPACK=ON,-DLAPACK=OFF,lapack"
 # Only a static library and headers are created
diff --git a/meta-oe/recipes-support/composefs/composefs/0001-mkcomposefs-use-const-char-for-memchr-return-values.patch b/meta-oe/recipes-support/composefs/composefs/0001-mkcomposefs-use-const-char-for-memchr-return-values.patch
new file mode 100644
index 0000000000..9c45d4fcc0
--- /dev/null
+++ b/meta-oe/recipes-support/composefs/composefs/0001-mkcomposefs-use-const-char-for-memchr-return-values.patch
@@ -0,0 +1,45 @@
+From 9d82303c7a3a780d481469cd8eafa016dcbff86f Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Thu, 16 Apr 2026 08:25:28 -0700
+Subject: [PATCH] mkcomposefs: use const char* for memchr return values
+memchr returns void*, which when assigned to char* discards the
+const qualifier of the input pointer. Cast to const char* to
+preserve const'ness.
+Fixes build with clang-22/glibc-2.43
+tools/mkcomposefs.c
+../sources/composefs-1.0.8/tools/mkcomposefs.c:413:8: error: initializing 'char *' with an expression of type 'const void *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
+  413 |         char *embedded_nul_offset = memchr(line, 0, line_len);
+      |               ^                     ~~~~~~~~~~~~~~~~~~~~~~~~~
+1 error generated.
+Upstream-Status: Submitted [https://github.com/composefs/composefs/pull/435]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ tools/mkcomposefs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/tools/mkcomposefs.c b/tools/mkcomposefs.c
+index 13b505d..e14d8d0 100644
+--- a/tools/mkcomposefs.c
+++ b/tools/mkcomposefs.c
+@@ -63,7 +63,7 @@ static __attribute__((format(printf, 1, 2))) char *make_error(const char *fmt, .
+ static size_t split_at(const char **start, size_t *length, char split_char,
+                       bool *partial)
+ {
+-       char *end = memchr(*start, split_char, *length);
+       const char *end = (const char*)memchr(*start, split_char, *length);
+        if (end == NULL) {
+                size_t part_len = *length;
+                *start = *start + *length;
+@@ -410,7 +410,7 @@ static char *tree_from_dump_line(dump_info *info, const char *line,
+         * We didn't document support for embedded NULs, and it only introduces
+         * ambiguity in parsing, so let's just reject this early on.
+         */
+-       char *embedded_nul_offset = memchr(line, 0, line_len);
+       const char *embedded_nul_offset = (const char*)memchr(line, 0, line_len);
+        if (embedded_nul_offset != NULL) {
+                size_t off = embedded_nul_offset - line;
+                return make_error("Invalid embedded NUL character at position %lld",
diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.8.bb b/meta-oe/recipes-support/composefs/composefs_1.0.8.bb
index f2bae91f44..3450f9a339 100644
--- a/meta-oe/recipes-support/composefs/composefs_1.0.8.bb
+++ b/meta-oe/recipes-support/composefs/composefs_1.0.8.bb
@@ -14,8 +14,9 @@ LIC_FILES_CHKSUM = "\
 "
 SRCREV = "858ce1b38e1534c2602eb431124b5dca706bc746"
-SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main"
+SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main;tag=v${PV} \
+           file://0001-mkcomposefs-use-const-char-for-memchr-return-values.patch \
+          "
 inherit meson
diff --git a/meta-oe/recipes-support/crow/crow_1.3.2.bb b/meta-oe/recipes-support/crow/crow_1.3.2.bb
new file mode 100644
index 0000000000..09970fcfc2
--- /dev/null
+++ b/meta-oe/recipes-support/crow/crow_1.3.2.bb
@@ -0,0 +1,20 @@
+SUMMARY = "A Fast and Easy to use microframework for the web"
+HOMEPAGE = "https://crowcpp.org/"
+DESCRIPTION = "Crow is a C++ framework for creating HTTP or Websocket web services. \
+It uses routing similar to Python's Flask which makes it easy to use. \
+It is also extremely fast, beating multiple existing C++ frameworks as well as non-C++ frameworks."
+SECTION = "libs"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e08502e395a6f7c037ddfe7d2915f58e"
+SRC_URI = "git://github.com/CrowCpp/Crow.git;protocol=https;branch=v1.3;tag=v${PV}"
+SRCREV = "f8c060c51feeca2c65828fb6f538603db4392d55"
+inherit cmake
+DEPENDS = "asio"
+EXTRA_OECMAKE = "\
+    -DCROW_BUILD_EXAMPLES=OFF \
+    -DCROW_BUILD_TESTS=OFF \
+"
diff --git a/meta-oe/recipes-support/enca/enca_1.19.bb b/meta-oe/recipes-support/enca/enca_1.19.bb
index 61da50ba52..395d7abe70 100644
--- a/meta-oe/recipes-support/enca/enca_1.19.bb
+++ b/meta-oe/recipes-support/enca/enca_1.19.bb
@@ -17,4 +17,6 @@ SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362
 inherit autotools
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 EXTRA_OECONF += "MKTEMP_PROG=mktemp"
diff --git a/meta-oe/recipes-support/fastfetch/fastfetch_2.61.0.bb b/meta-oe/recipes-support/fastfetch/fastfetch_2.61.0.bb
index 8d2daeb24f..8db0b608f1 100644
--- a/meta-oe/recipes-support/fastfetch/fastfetch_2.61.0.bb
+++ b/meta-oe/recipes-support/fastfetch/fastfetch_2.61.0.bb
@@ -17,7 +17,6 @@ inherit cmake pkgconfig
 EXTRA_OECMAKE += "\
    -DENABLE_SYSTEM_YYJSON=ON \
-    -DENABLE_DIRECTX_HEADERS=OFF \
 "
 PACKAGECONFIG ??= "\
diff --git a/meta-oe/recipes-support/freeipmi/freeipmi_1.6.17.bb b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.17.bb
index 50a1877c0e..7970e0f563 100644
--- a/meta-oe/recipes-support/freeipmi/freeipmi_1.6.17.bb
+++ b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.17.bb
@@ -23,3 +23,4 @@ inherit pkgconfig autotools
 EXTRA_OECONF = "--without-random-device"
+CVE_STATUS[CVE-2026-33554] = "fixed-version: fixed since 1.6.17"
diff --git a/meta-oe/recipes-support/gd/gd_2.3.3.bb b/meta-oe/recipes-support/gd/gd_2.3.3.bb
index 0d7a6d34f9..062c4b4a8f 100644
--- a/meta-oe/recipes-support/gd/gd_2.3.3.bb
+++ b/meta-oe/recipes-support/gd/gd_2.3.3.bb
@@ -23,14 +23,23 @@ SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc"
 inherit autotools binconfig gettext pkgconfig
-EXTRA_OECONF += " --disable-rpath \
+PACKAGECONFIG ?= "jpeg freetype"
-                  --with-jpeg=${STAGING_LIBDIR}/.. \
-                  --with-freetype=yes \
+PACKAGECONFIG[avif] = "--with-avif,--without-avif"
-                  --without-fontconfig \
+PACKAGECONFIG[fontconfig] = "--with-fontconfig,--without-fontconfig"
-                  --without-webp \
+PACKAGECONFIG[freetype] = "--with-freetype,--without-freetype"
-                  --without-xpm \
+PACKAGECONFIG[heif] = "--with-heif,--without-heif"
-                  --without-x \
+PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg"
-                "
+PACKAGECONFIG[liq] = "--with-liq,--without-liq"
+PACKAGECONFIG[png] = "--with-png,--without-png"
+PACKAGECONFIG[raqm] = "--with-raqm,--without-raqm,libraqm"
+PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff"
+PACKAGECONFIG[webp] = "--with-webp,--without-webp"
+PACKAGECONFIG[x] = "--with-x,--without-x"
+PACKAGECONFIG[xpm] = "--with-xpm,--without-xpm"
+PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib"
+EXTRA_OECONF += "--disable-rpath"
 EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"'
diff --git a/meta-oe/recipes-support/glaze/glaze_7.2.2.bb b/meta-oe/recipes-support/glaze/glaze_7.3.3.bb
index 807f8811d1..e733d166b2 100644
--- a/meta-oe/recipes-support/glaze/glaze_7.2.2.bb
+++ b/meta-oe/recipes-support/glaze/glaze_7.3.3.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4d29875d83fbbf50485c846dbbbed8"
 SRC_URI = "git://github.com/stephenberry/glaze;protocol=https;branch=main;tag=v${PV}"
-SRCREV = "959c50207aa552a8de5aabfcbb6801d08fa6fb9d"
+SRCREV = "dbf6caec935b768546587a413e45d033480c4483"
 inherit cmake
diff --git a/meta-oe/recipes-support/gtk-layer-shell/gtk-layer-shell_0.10.0.bb b/meta-oe/recipes-support/gtk-layer-shell/gtk-layer-shell_0.10.1.bb
index 2bfe9b0e77..46a0562d2c 100644
--- a/meta-oe/recipes-support/gtk-layer-shell/gtk-layer-shell_0.10.0.bb
+++ b/meta-oe/recipes-support/gtk-layer-shell/gtk-layer-shell_0.10.1.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
 SRC_URI = " \
        git://github.com/wmww/gtk-layer-shell.git;protocol=https;branch=master;tag=v${PV} \
 "
-SRCREV = "3964966d72ea3359f4ff748081493e979c080b7e"
+SRCREV = "fd88ba666c18ff65ea786bf7b2e270d840030817"
 inherit meson pkgconfig features_check gobject-introspection vala
diff --git a/meta-oe/recipes-support/htop/files/0001-configure.ac-Remove-usr-include-libnl3.patch b/meta-oe/recipes-support/htop/files/0001-configure.ac-Remove-usr-include-libnl3.patch
index f00f3ac4db..c1f763ce17 100644
--- a/meta-oe/recipes-support/htop/files/0001-configure.ac-Remove-usr-include-libnl3.patch
+++ b/meta-oe/recipes-support/htop/files/0001-configure.ac-Remove-usr-include-libnl3.patch
@@ -1,6 +1,6 @@
-From 87d66b3b60176197e785670214b0bbc5bedd6552 Mon Sep 17 00:00:00 2001
+From 652b208b8c3038934fb55169f44068bbdf399b69 Mon Sep 17 00:00:00 2001
-From: Leon Anavi <leon.anavi@konsulko.com>
+From: Liu Yiding <liuyd.fnst@fujitsu.com>
-Date: Mon, 8 Dec 2025 11:06:01 +0000
+Date: Wed, 15 Apr 2026 01:34:56 +0000
 Subject: [PATCH] configure.ac: Remove /usr/include/libnl3
 Fixes:
@@ -11,40 +11,35 @@ netlink/attr.h, netlink/handlers.h, netlink/msg.h
 Upstream-Status: Inappropriate [OE-specific]
 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+Update for 3.5.0.
+Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
 ---
- configure.ac | 6 +++---
+ configure.ac | 4 ++--
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/configure.ac b/configure.ac
-index 9f2f46b3..f3906692 100644
+index 2d174d73..ee8b29ca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -980,14 +980,14 @@ case "$enable_delayacct" in
+@@ -1638,7 +1638,7 @@ case "$enable_delayacct" in
-          enable_delayacct=no
+ 
-       else
+       htop_save_CFLAGS=$CFLAGS
-          old_CFLAGS="$CFLAGS"
+       # New include path searched after what user has specified
-         CFLAGS="$CFLAGS -I/usr/include/libnl3"
+-      CFLAGS="$CFLAGS $LIBNL3_CFLAGS"
-+         CFLAGS="$CFLAGS"
-          AC_CHECK_HEADERS([netlink/attr.h netlink/handlers.h netlink/msg.h], [enable_delayacct=yes], [enable_delayacct=no])
-          CFLAGS="$old_CFLAGS"
-       fi
-       ;;
-    yes)
-       old_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -I/usr/include/libnl3"
 +      CFLAGS="$CFLAGS"
-       AC_CHECK_HEADERS([netlink/attr.h netlink/handlers.h netlink/msg.h], [], [AC_MSG_ERROR([can not find required header files netlink/attr.h, netlink/handlers.h, netlink/msg.h])])
+       AC_CHECK_HEADERS(
-       CFLAGS="$old_CFLAGS"
+          [netlink/attr.h netlink/handlers.h netlink/msg.h],
-       ;;
+          [],
-@@ -997,7 +997,7 @@ case "$enable_delayacct" in
+@@ -1681,7 +1681,7 @@ case "$enable_delayacct" in
 esac
 if test "$enable_delayacct" = yes; then
-   AC_DEFINE([HAVE_DELAYACCT], [1], [Define if delay accounting support should be enabled.])
+    AC_DEFINE([HAVE_DELAYACCT], [1], [Define if delay accounting support should be enabled.])
-  AM_CFLAGS="$AM_CFLAGS -I/usr/include/libnl3"
+-   AM_CFLAGS="$AM_CFLAGS $LIBNL3_CFLAGS"
-+  AM_CFLAGS="$AM_CFLAGS"
+   AM_CFLAGS="$AM_CFLAGS"
 fi
 AM_CONDITIONAL([HAVE_DELAYACCT], [test "$enable_delayacct" = yes])
 
 -- 
-2.47.3
+2.43.0
diff --git a/meta-oe/recipes-support/htop/htop_3.4.1.bb b/meta-oe/recipes-support/htop/htop_3.5.0.bb
index e3f8a7fdb4..961a87097b 100644
--- a/meta-oe/recipes-support/htop/htop_3.4.1.bb
+++ b/meta-oe/recipes-support/htop/htop_3.5.0.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "ncurses libnl"
-SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \
+SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https;tag=${PV} \
           file://0001-configure.ac-Remove-usr-include-libnl3.patch \
 "
-SRCREV = "348c0a6bf4f33571835a0b6a1a0f5deb15132128"
+SRCREV = "a21f043b253a6dfa89df1ff4130fe7d2e505000f"
 inherit autotools pkgconfig
@@ -23,7 +23,7 @@ PACKAGECONFIG ??= " \
 "
 PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode"
 PACKAGECONFIG[affinity] = "--enable-affinity,--disable-affinity,,,,hwloc"
-PACKAGECONFIG[unwind] = "--enable-unwind,--disable-unwind,libunwind"
+PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind"
 PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc,,,affinity"
 PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz"
 PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver"
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-18.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-19.bb
index 49bf257cd3..18c23cb0d4 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-18.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-19.bb
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt
           file://imagemagick-ptest.sh \
 "
-SRCREV = "d4e4b2b35a573fb7d96bc64ff1a417415bbe0f4c"
+SRCREV = "9fbd2b79450e930edb95e8158d412e57a7b27e83"
 inherit autotools pkgconfig update-alternatives ptest
 export ac_cv_sys_file_offset_bits = "64"
diff --git a/meta-oe/recipes-support/lcms/lcms/CVE-2026-41254_1.patch b/meta-oe/recipes-support/lcms/lcms/CVE-2026-41254_1.patch
new file mode 100644
index 0000000000..2ed8e9f587
--- /dev/null
+++ b/meta-oe/recipes-support/lcms/lcms/CVE-2026-41254_1.patch
@@ -0,0 +1,28 @@
+From c83cfcd249d06950a307cee8d1e22b7f6a78a8a7 Mon Sep 17 00:00:00 2001
+From: Marti Maria <marti.maria@littlecms.com>
+Date: Thu, 19 Feb 2026 09:07:20 +0100
+Subject: [PATCH] Fix integer overflow in CubeSize()
+Thanks to @zerojackyi for reporting
+CVE: CVE-2026-41254
+Upstream-Status: Backport [https://github.com/mm2/Little-CMS/commit/da6110b1d14abc394633a388209abd5ebedd7ab0]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/cmslut.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/src/cmslut.c b/src/cmslut.c
+index 1089148..b245209 100644
+--- a/src/cmslut.c
+++ b/src/cmslut.c
+@@ -460,7 +460,8 @@ void EvaluateCLUTfloatIn16(const cmsFloat32Number In[], cmsFloat32Number Out[],
+ static
+ cmsUInt32Number CubeSize(const cmsUInt32Number Dims[], cmsUInt32Number b)
+ {
+-    cmsUInt32Number rv, dim;
+    cmsUInt32Number dim;
+    cmsUInt64Number rv;
+ 
+     _cmsAssert(Dims != NULL);
+ 
diff --git a/meta-oe/recipes-support/lcms/lcms/CVE-2026-41254_2.patch b/meta-oe/recipes-support/lcms/lcms/CVE-2026-41254_2.patch
new file mode 100644
index 0000000000..be8c759a6f
--- /dev/null
+++ b/meta-oe/recipes-support/lcms/lcms/CVE-2026-41254_2.patch
@@ -0,0 +1,34 @@
+From f5994aea02d5620f3182cafdcf116ffe9d6c9fd2 Mon Sep 17 00:00:00 2001
+From: Marti Maria <marti.maria@littlecms.com>
+Date: Thu, 12 Mar 2026 22:57:35 +0100
+Subject: [PATCH] check for overflow
+Thanks to Guanni Qu for detecting & reporting the issue
+CVE: CVE-2026-41254
+Upstream-Status: Backport [https://github.com/mm2/Little-CMS/commit/e0641b1828d0a1af5ecb1b11fe22f24fceefd4bc]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/cmslut.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+diff --git a/src/cmslut.c b/src/cmslut.c
+index b245209..c1dbb32 100644
+--- a/src/cmslut.c
+++ b/src/cmslut.c
+@@ -468,12 +468,12 @@ cmsUInt32Number CubeSize(const cmsUInt32Number Dims[], cmsUInt32Number b)
+     for (rv = 1; b > 0; b--) {
+ 
+         dim = Dims[b-1];
+-        if (dim <= 1) return 0;  // Error
+-
+-        rv *= dim;
+        if (dim <= 1) return 0;  
+ 
+         // Check for overflow
+         if (rv > UINT_MAX / dim) return 0;
+
+        rv *= dim;
+     }
+ 
+     // Again, prevent overflow
diff --git a/meta-oe/recipes-support/lcms/lcms_2.18.bb b/meta-oe/recipes-support/lcms/lcms_2.18.bb
index 79e4a6f694..1ff3b3908f 100644
--- a/meta-oe/recipes-support/lcms/lcms_2.18.bb
+++ b/meta-oe/recipes-support/lcms/lcms_2.18.bb
@@ -3,7 +3,10 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e9ce323c4b71c943a785db90142b228a"
-SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz \
+           file://CVE-2026-41254_1.patch \
+           file://CVE-2026-41254_2.patch \
+           "
 SRC_URI[sha256sum] = "ee67be3566f459362c1ee094fde2c159d33fa0390aa4ed5f5af676f9e5004347"
 DEPENDS = "tiff"
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30-19.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30-20.bb
index 2c063fd995..2f10a10931 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30-19.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30-20.bb
@@ -12,13 +12,14 @@ SRC_URI = " \
    git://salsa.debian.org/gnome-team/libcanberra;protocol=https;branch=debian/latest;tag=debian/${PV} \
    file://0001-Determine-audio-buffer-size-for-a-time-of-500ms.patch \
 "
-SRCREV = "d1ed1ac0c9950ed3908c04abb7c4a6de5c51ed94"
+SRCREV = "47d67f43c58af36143060888fc8e69a9cb0eddea"
 EXTRA_OECONF = "\
    --enable-null \
    --disable-oss \
    --disable-tdb \
    --disable-lynx \
+    --disable-gtk-doc \
 "
 PACKAGECONFIG ??= " \
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-tools-tests-remove-SIGINT-test-cases.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-tools-tests-remove-SIGINT-test-cases.patch
deleted file mode 100644
index 7fe06b9882..0000000000
--- a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-tools-tests-remove-SIGINT-test-cases.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 3c38c5f9ab49384039f35408656a88f87619dd03 Mon Sep 17 00:00:00 2001
-From: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
-Date: Wed, 18 Mar 2026 14:07:06 +0100
-Subject: [libgpiod][PATCH] tools: tests: remove SIGINT test cases
-In coreutils v9.10 (specifically with commit 8c2461933411 ("timeout:
-honor ignored signal dispositions")) the behavior of timeout changed and
-it will no longer propagate SIGINT or SIGQUIT in shell background jobs.
-This breaks the test cases checking the behavior of tools after SIGINT.
-We have to assume that if exit after SIGTERM works, then so does it
-after SIGINT and remove the failing tests.
-Upstream-Status: Submitted [https://lore.kernel.org/all/20260318131413.56575-1-bartosz.golaszewski@oss.qualcomm.com/]
-Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
---
- tools/gpio-tools-test.bash | 37 -------------------------------------
- 1 file changed, 37 deletions(-)
-diff --git a/tools/gpio-tools-test.bash b/tools/gpio-tools-test.bash
-index 71d6e3d..62f6836 100755
--- a/tools/gpio-tools-test.bash
-+++ b/tools/gpio-tools-test.bash
-@@ -1415,17 +1415,6 @@ test_gpioset_with_lines_strictly_by_name() {
-        gpiosim_check_value sim0 6 0
- }
- 
-test_gpioset_interactive_after_SIGINT() {
-       gpiosim_chip sim0 num_lines=8 line_name=1:foo
-
-       dut_run gpioset -i foo=1
-
-       dut_kill -SIGINT
-       dut_wait
-
-       status_is 130
-}
-
- test_gpioset_interactive_after_SIGTERM() {
-        gpiosim_chip sim0 num_lines=8 line_name=1:foo
- 
-@@ -1907,20 +1896,6 @@ test_gpiomon_multiple_lines_across_multiple_chips() {
-        assert_fail dut_readable
- }
- 
-test_gpiomon_exit_after_SIGINT() {
-       gpiosim_chip sim0 num_lines=8
-
-       local sim0=${GPIOSIM_CHIP_NAME[sim0]}
-
-       dut_run gpiomon --banner --chip "$sim0" 4
-       dut_regex_match "Monitoring line .*"
-
-       dut_kill -SIGINT
-       dut_wait
-
-       status_is 130
-}
-
- test_gpiomon_exit_after_SIGTERM() {
-        gpiosim_chip sim0 num_lines=8
- 
-@@ -2503,18 +2478,6 @@ test_gpionotify_multiple_lines_across_multiple_chips() {
-        assert_fail dut_readable
- }
- 
-test_gpionotify_exit_after_SIGINT() {
-       gpiosim_chip sim0 num_lines=8
-
-       dut_run gpionotify --banner --chip "${GPIOSIM_CHIP_NAME[sim0]}" 4
-       dut_regex_match "Watching line .*"
-
-       dut_kill -SIGINT
-       dut_wait
-
-       status_is 130
-}
-
- test_gpionotify_exit_after_SIGTERM() {
-        gpiosim_chip sim0 num_lines=8
- 
-- 
-2.47.3
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.2.3.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.4.bb
index 38829a620f..2c8d9f1873 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod_2.2.3.bb
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.4.bb
@@ -13,10 +13,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-2.x:"
 SRC_URI += " \
    file://gpio-manager.init \
-    file://0001-tools-tests-remove-SIGINT-test-cases.patch \
 "
-SRC_URI[sha256sum] = "70012b0262e4b90f140431efa841ca89643b02ea6c09f507e23cec664a51b71a"
+SRC_URI[sha256sum] = "13207176b0eb9b3e0f02552d5f49f5a6a449343ce47416158bb484d9d3019592"
 # Enable all project features for ptest
 PACKAGECONFIG[tests] = " \
diff --git a/meta-oe/recipes-support/liboauth2/liboauth2/0001-build-guard-coverage-linker-flag-behind-CODE_COVERAG.patch b/meta-oe/recipes-support/liboauth2/liboauth2/0001-build-guard-coverage-linker-flag-behind-CODE_COVERAG.patch
new file mode 100644
index 0000000000..f234cbd50b
--- /dev/null
+++ b/meta-oe/recipes-support/liboauth2/liboauth2/0001-build-guard-coverage-linker-flag-behind-CODE_COVERAG.patch
@@ -0,0 +1,33 @@
+From 7c70315f7f6b4305d761804fb03f8f90ad7572eb Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Fri, 17 Apr 2026 14:01:46 -0700
+Subject: [PATCH] build: guard --coverage linker flag behind
+ CODE_COVERAGE_ENABLED
+AM_LDFLAGS passes --coverage to the linker unconditionally,
+it causes coverage instrumentation to be enabled even when
+configured with --disable-code-coverage. Wrap it in the
+automake conditional provided by AX_CODE_COVERAGE.
+Upstream-Status: Submitted [https://github.com/OpenIDC/liboauth2/pull/74]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+diff --git a/Makefile.am b/Makefile.am
+index a079dcc..a3f991d 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -8,7 +8,10 @@ EXTRA_DIST = autogen.sh ChangeLog README.md LICENSE
+ AM_CPPFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -I${srcdir}/include -I${srcdir}/src @JANSSON_CFLAGS@ @OPENSSL_CFLAGS@
+ AM_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS) $(CODE_COVERAGE_CFLAGS)
+-AM_LDFLAGS = --coverage
+AM_LDFLAGS =
+if CODE_COVERAGE_ENABLED
+AM_LDFLAGS += --coverage
+endif
+ LDADD = @JANSSON_LIBS@ @OPENSSL_LIBS@
+ LDADD += $(CODE_COVERAGE_LIBS)
diff --git a/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb b/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb
index 5b1ecd23dd..83825c69a5 100644
--- a/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb
+++ b/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb
@@ -7,6 +7,7 @@ SRC_URI = " \
    git://github.com/OpenIDC/liboauth2;protocol=https;branch=master;tag=v${PV} \
    file://0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch \
    file://0002-Fix-use-of-strchr-with-new-GCC.patch \
+    file://0001-build-guard-coverage-linker-flag-behind-CODE_COVERAG.patch \
    "
 SRCREV = "12571b6d6568c2db7d5f080f60ecb55795c0db19"
@@ -20,4 +21,4 @@ PACKAGECONFIG[memcache] = "--with-memcache,--without-memcache,libmemcached"
 PACKAGECONFIG[redis] = "--with-redis,--without-redis,hiredis"
 PACKAGECONFIG[jq] = "--with-jq,--without-jq,jq"
 PACKAGECONFIG[apache] = "--with-apache,--without-apache,apache2"
+PACKAGECONFIG[ccov] = "--enable-code-coverage,--disable-code-coverage,"
diff --git a/meta-oe/recipes-support/libraw/libraw_0.21.4.bb b/meta-oe/recipes-support/libraw/libraw_0.21.4.bb
deleted file mode 100644
index ef0a0255d9..0000000000
--- a/meta-oe/recipes-support/libraw/libraw_0.21.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SUMMARY = "raw image decoder"
-LICENSE = "LGPL-2.1-only | CDDL-1.0"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1501ae0aa3c8544e63f08d6f7bf88a6f"
-SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https;tag=${PV}"
-SRCREV = "9646d776c7c61976080a8f2be67928df0750493e"
-inherit autotools pkgconfig
-DEPENDS = "jpeg jasper lcms"
diff --git a/meta-oe/recipes-support/libraw/libraw_0.22.1.bb b/meta-oe/recipes-support/libraw/libraw_0.22.1.bb
new file mode 100644
index 0000000000..e99f0e46b6
--- /dev/null
+++ b/meta-oe/recipes-support/libraw/libraw_0.22.1.bb
@@ -0,0 +1,17 @@
+SUMMARY = "raw image decoder"
+LICENSE = "LGPL-2.1-only | CDDL-1.0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1d66195044cfbe4327c055d1c9c1a229"
+SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=0.22-stable;protocol=https;tag=${PV}"
+SRCREV = "b860248a89d9082b8e0a1e202e516f46af9adb29"
+inherit autotools pkgconfig
+DEPENDS = "jpeg jasper lcms"
+CVE_STATUS[CVE-2026-5318] = "fixed-version: fixed since 0.22.1"
+CVE_STATUS[CVE-2026-5342] = "fixed-version: fixed since 0.22.1"
+CVE_STATUS[CVE-2026-20884] = "fixed-version: fixed since 0.22.1"
+CVE_STATUS[CVE-2026-24450] = "fixed-version: fixed since 0.22.1"
+CVE_STATUS[CVE-2026-20911] = "fixed-version: fixed since 0.22.1"
+CVE_STATUS[CVE-2026-21413] = "fixed-version: fixed since 0.22.1"
diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
index 85eac33369..99d0939b34 100644
--- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
+++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
@@ -20,6 +20,9 @@ UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
 DEPENDS += "bison-native flex-native wget-native gawk-native"
 inherit autotools-brokensep update-alternatives
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 ALTERNATIVE_PRIORITY = "50"
 ALTERNATIVE:${PN}-yang = " ietf-interfaces ietf-netconf-acm ietf-netconf-with-defaults ietf-netconf"
 ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang"
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-14523.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-14523.patch
new file mode 100644
index 0000000000..7815dba55a
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-14523.patch
@@ -0,0 +1,52 @@
+From d6028a6e6a8417b7fb6c89f6c10fb94781435ee6 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Wed, 4 Feb 2026 15:08:50 +0800
+Subject: [PATCH] Reject duplicate Host headers (for libsoup 2)
+This is a simplified version of my patch for libsoup 3:
+!491
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/d3db5a6f8f03e1f0133754872877c92c0284c472]
+CVE: CVE-2025-14523
+This patch is a MR for branch 2-74, but not merged yet, maybe it will
+not be merged.
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-headers.c         | 3 +++
+ libsoup/soup-message-headers.c | 3 +++
+ 2 files changed, 6 insertions(+)
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index ea2f986..6cd3dad 100644
+--- a/libsoup/soup-headers.c
+++ b/libsoup/soup-headers.c
+@@ -138,6 +138,9 @@ soup_headers_parse (const char *str, int len, SoupMessageHeaders *dest)
+                for (p = strchr (value, '\r'); p; p = strchr (p, '\r'))
+                        *p = ' ';
+ 
+               if (g_ascii_strcasecmp (name, "Host") == 0 && soup_message_headers_get_one (dest, "Host"))
+                       goto done;
+
+                soup_message_headers_append (dest, name, value);
+         }
+        success = TRUE;
+diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
+index f612bff..bb20bbb 100644
+--- a/libsoup/soup-message-headers.c
+++ b/libsoup/soup-message-headers.c
+@@ -220,6 +220,9 @@ soup_message_headers_append (SoupMessageHeaders *hdrs,
+        }
+ #endif
+ 
+       if (g_ascii_strcasecmp (name, "Host") == 0 && soup_message_headers_get_one (hdrs, "Host"))
+               return;
+
+        header.name = intern_header_name (name, &setter);
+        header.value = g_strdup (value);
+        g_array_append_val (hdrs->array, header);
+-- 
+2.34.1
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32049-1.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32049-1.patch
new file mode 100644
index 0000000000..64e87cb1ec
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32049-1.patch
@@ -0,0 +1,229 @@
+From c574e659c41c18fad3973bbaa3b3ec75664b3137 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 5 Feb 2026 16:20:02 +0800
+Subject: [PATCH 1/2] websocket: add a way to restrict the total message size
+Otherwise a client could send small packages smaller than
+total-incoming-payload-size but still to break the server
+with a big allocation
+Fixes: #390
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/db87805ab565d67533dfed2cb409dbfd63c7fdce]
+CVE: CVE-2025-32049
+libsoup2 is not maintained, the patch is backported from libsoup3, and
+change accordingly
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-websocket-connection.c | 104 ++++++++++++++++++++++++++--
+ libsoup/soup-websocket-connection.h |   7 ++
+ 2 files changed, 107 insertions(+), 4 deletions(-)
+diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c
+index 9d5f4f8..3dad477 100644
+--- a/libsoup/soup-websocket-connection.c
+++ b/libsoup/soup-websocket-connection.c
+@@ -85,7 +85,8 @@ enum {
+        PROP_STATE,
+        PROP_MAX_INCOMING_PAYLOAD_SIZE,
+        PROP_KEEPALIVE_INTERVAL,
+-       PROP_EXTENSIONS
+       PROP_EXTENSIONS,
+       PROP_MAX_TOTAL_MESSAGE_SIZE,
+ };
+ 
+ enum {
+@@ -120,6 +121,7 @@ struct _SoupWebsocketConnectionPrivate {
+        char *origin;
+        char *protocol;
+        guint64 max_incoming_payload_size;
+       guint64 max_total_message_size;
+        guint keepalive_interval;
+ 
+        gushort peer_close_code;
+@@ -152,6 +154,7 @@ struct _SoupWebsocketConnectionPrivate {
+ };
+ 
+ #define MAX_INCOMING_PAYLOAD_SIZE_DEFAULT   128 * 1024
+#define MAX_TOTAL_MESSAGE_SIZE_DEFAULT   128 * 1024
+ #define READ_BUFFER_SIZE 1024
+ #define MASK_LENGTH 4
+ 
+@@ -664,7 +667,7 @@ bad_data_error_and_close (SoupWebsocketConnection *self)
+ }
+ 
+ static void
+-too_big_error_and_close (SoupWebsocketConnection *self,
+too_big_incoming_payload_error_and_close (SoupWebsocketConnection *self,
+                          guint64 payload_len)
+ {
+        GError *error;
+@@ -680,6 +683,23 @@ too_big_error_and_close (SoupWebsocketConnection *self,
+        emit_error_and_close (self, error, TRUE);
+ }
+ 
+static void
+too_big_message_error_and_close (SoupWebsocketConnection *self,
+                                 guint64 len)
+{
+       GError *error;
+
+       error = g_error_new_literal (SOUP_WEBSOCKET_ERROR,
+                                    SOUP_WEBSOCKET_CLOSE_TOO_BIG,
+                                    self->pv->connection_type == SOUP_WEBSOCKET_CONNECTION_SERVER ?
+                                    "Received WebSocket payload from the client larger than configured max-total-message-size" :
+                                    "Received WebSocket payload from the server larger than configured max-total-message-size");
+       g_debug ("%s received message of size %" G_GUINT64_FORMAT " or greater, but max supported size is %" G_GUINT64_FORMAT,
+                self->pv->connection_type == SOUP_WEBSOCKET_CONNECTION_SERVER ? "server" : "client",
+                len, self->pv->max_total_message_size);
+       emit_error_and_close (self, error, TRUE);
+}
+
+ static void
+ close_connection (SoupWebsocketConnection *self,
+                   gushort                  code,
+@@ -913,6 +933,12 @@ process_contents (SoupWebsocketConnection *self,
+                switch (pv->message_opcode) {
+                case 0x01:
+                case 0x02:
+                       /* Safety valve */
+                       if (pv->max_total_message_size > 0 &&
+                           (pv->message_data->len + payload_len) > pv->max_total_message_size) {
+                               too_big_message_error_and_close (self, (pv->message_data->len + payload_len));
+                               return;
+                       }
+                        g_byte_array_append (pv->message_data, payload, payload_len);
+                        break;
+                default:
+@@ -1050,7 +1076,7 @@ process_frame (SoupWebsocketConnection *self)
+        /* Safety valve */
+        if (self->pv->max_incoming_payload_size > 0 &&
+            payload_len >= self->pv->max_incoming_payload_size) {
+-               too_big_error_and_close (self, payload_len);
+               too_big_incoming_payload_error_and_close (self, payload_len);
+                return FALSE;
+        }
+ 
+@@ -1357,6 +1383,10 @@ soup_websocket_connection_get_property (GObject *object,
+                g_value_set_pointer (value, pv->extensions);
+                break;
+ 
+       case PROP_MAX_TOTAL_MESSAGE_SIZE:
+               g_value_set_uint64 (value, pv->max_total_message_size);
+               break;
+
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+@@ -1410,6 +1440,10 @@ soup_websocket_connection_set_property (GObject *object,
+                pv->extensions = g_value_get_pointer (value);
+                break;
+ 
+       case PROP_MAX_TOTAL_MESSAGE_SIZE:
+               pv->max_total_message_size = g_value_get_uint64 (value);
+               break;
+
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+@@ -1631,7 +1665,24 @@ soup_websocket_connection_class_init (SoupWebsocketConnectionClass *klass)
+                                                                G_PARAM_READWRITE |
+                                                                G_PARAM_CONSTRUCT_ONLY |
+                                                                G_PARAM_STATIC_STRINGS));
+-
+       /**
+        * SoupWebsocketConnection:max-total-message-size:
+        *
+        * The total message size for incoming packets.
+        *
+        * The protocol expects or 0 to not limit it.
+        *
+        */
+       g_object_class_install_property (gobject_class, PROP_MAX_TOTAL_MESSAGE_SIZE,
+                                       g_param_spec_uint64 ("max-total-message-size",
+                                                            "Max total message size",
+                                                            "Max total message size ",
+                                                            0,
+                                                            G_MAXUINT64,
+                                                            MAX_TOTAL_MESSAGE_SIZE_DEFAULT,
+                                                            G_PARAM_READWRITE |
+                                                            G_PARAM_CONSTRUCT |
+                                                            G_PARAM_STATIC_STRINGS));
+        /**
+         * SoupWebsocketConnection::message:
+         * @self: the WebSocket
+@@ -2145,6 +2196,51 @@ soup_websocket_connection_set_max_incoming_payload_size (SoupWebsocketConnection
+        }
+ }
+ 
+/**
+ * soup_websocket_connection_get_max_total_message_size:
+ * @self: the WebSocket
+ *
+ * Gets the maximum total message size allowed for packets.
+ *
+ * Returns: the maximum total message size.
+ *
+ */
+guint64
+soup_websocket_connection_get_max_total_message_size (SoupWebsocketConnection *self)
+{
+   SoupWebsocketConnectionPrivate *pv;
+
+   g_return_val_if_fail (SOUP_IS_WEBSOCKET_CONNECTION (self), MAX_TOTAL_MESSAGE_SIZE_DEFAULT);
+   pv = self->pv;
+
+   return pv->max_total_message_size;
+}
+
+/**
+ * soup_websocket_connection_set_max_total_message_size:
+ * @self: the WebSocket
+ * @max_total_message_size: the maximum total message size
+ *
+ * Sets the maximum total message size allowed for packets.
+ *
+ * It does not limit the outgoing packet size.
+ *
+ */
+void
+soup_websocket_connection_set_max_total_message_size (SoupWebsocketConnection *self,
+                                                      guint64                  max_total_message_size)
+{
+   SoupWebsocketConnectionPrivate *pv;
+
+   g_return_if_fail (SOUP_IS_WEBSOCKET_CONNECTION (self));
+   pv = self->pv;
+
+   if (pv->max_total_message_size != max_total_message_size) {
+       pv->max_total_message_size = max_total_message_size;
+       g_object_notify (G_OBJECT (self), "max-total-message-size");
+   }
+}
+
+ /**
+  * soup_websocket_connection_get_keepalive_interval:
+  * @self: the WebSocket
+diff --git a/libsoup/soup-websocket-connection.h b/libsoup/soup-websocket-connection.h
+index f82d723..d2a60e9 100644
+--- a/libsoup/soup-websocket-connection.h
+++ b/libsoup/soup-websocket-connection.h
+@@ -136,6 +136,13 @@ SOUP_AVAILABLE_IN_2_58
+ void                soup_websocket_connection_set_keepalive_interval (SoupWebsocketConnection *self,
+                                                                       guint                    interval);
+ 
+SOUP_AVAILABLE_IN_2_72
+guint64             soup_websocket_connection_get_max_total_message_size    (SoupWebsocketConnection *self);
+
+SOUP_AVAILABLE_IN_2_72
+void                soup_websocket_connection_set_max_total_message_size    (SoupWebsocketConnection *self,
+                                                                             guint64                  max_total_message_size);
+
+ G_END_DECLS
+ 
+ #endif /* __SOUP_WEBSOCKET_CONNECTION_H__ */
+-- 
+2.34.1
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32049-2.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32049-2.patch
new file mode 100644
index 0000000000..f9c894aaec
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32049-2.patch
@@ -0,0 +1,131 @@
+From 0bfc66f1082f5d47df99b6fc03f742ef7fa1051e Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 5 Feb 2026 17:19:51 +0800
+Subject: [PATCH] Set message size limit in SoupServer rather than 
+ SoupWebsocketConnection
+We're not sure about the compatibility implications of having a default
+size limit for clients.
+Also not sure whether the server limit is actually set appropriately,
+but there is probably very little server usage of
+SoupWebsocketConnection in the wild, so it's not so likely to break
+things.
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/2df34d9544cabdbfdedd3b36f098cf69233b1df7]
+CVE: CVE-2025-32049
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-server.c               | 24 +++++++++++++++++++-----
+ libsoup/soup-websocket-connection.c | 23 ++++++++++++++++-------
+ 2 files changed, 35 insertions(+), 12 deletions(-)
+diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
+index 63875f3..a3f8597 100644
+--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
+@@ -216,6 +216,16 @@ enum {
+ 
+ G_DEFINE_TYPE_WITH_PRIVATE (SoupServer, soup_server, G_TYPE_OBJECT)
+ 
+/* SoupWebsocketConnection by default limits only maximum packet size. But a
+ * message may consist of multiple packets, so SoupServer additionally restricts
+ * total message size to mitigate denial of service attacks on the server.
+ * SoupWebsocketConnection does not do this by default because I don't know
+ * whether that would or would not cause compatibility problems for websites.
+ *
+ * This size is in bytes and it is arbitrary.
+ */
+#define MAX_TOTAL_MESSAGE_SIZE_DEFAULT   128 * 1024
+
+ static SoupClientContext *soup_client_context_ref (SoupClientContext *client);
+ static void soup_client_context_unref (SoupClientContext *client);
+ 
+@@ -1445,11 +1455,15 @@ complete_websocket_upgrade (SoupMessage *msg, gpointer user_data)
+ 
+        soup_client_context_ref (client);
+        stream = soup_client_context_steal_connection (client);
+-       conn = soup_websocket_connection_new_with_extensions (stream, uri,
+-                                                             SOUP_WEBSOCKET_CONNECTION_SERVER,
+-                                                             soup_message_headers_get_one (msg->request_headers, "Origin"),
+-                                                             soup_message_headers_get_one (msg->response_headers, "Sec-WebSocket-Protocol"),
+-                                                             handler->websocket_extensions);
+       conn = SOUP_WEBSOCKET_CONNECTION (g_object_new (SOUP_TYPE_WEBSOCKET_CONNECTION,
+                                                         "io-stream", stream,
+                                                         "uri", uri,
+                                                         "connection-type", SOUP_WEBSOCKET_CONNECTION_SERVER,
+                                                         "origin", soup_message_headers_get_one (msg->request_headers, "Origin"),
+                                                         "protocol", soup_message_headers_get_one (msg->response_headers, "Sec-WebSocket-Protocol"),
+                                                         "extensions", handler->websocket_extensions,
+                                                         "max-total-message-size", (guint64)MAX_TOTAL_MESSAGE_SIZE_DEFAULT,
+                                 NULL));
+        handler->websocket_extensions = NULL;
+        g_object_unref (stream);
+        soup_client_context_unref (client);
+diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c
+index 3dad477..e7fa9b7 100644
+--- a/libsoup/soup-websocket-connection.c
+++ b/libsoup/soup-websocket-connection.c
+@@ -154,7 +154,6 @@ struct _SoupWebsocketConnectionPrivate {
+ };
+ 
+ #define MAX_INCOMING_PAYLOAD_SIZE_DEFAULT   128 * 1024
+-#define MAX_TOTAL_MESSAGE_SIZE_DEFAULT   128 * 1024
+ #define READ_BUFFER_SIZE 1024
+ #define MASK_LENGTH 4
+ 
+@@ -1615,8 +1614,9 @@ soup_websocket_connection_class_init (SoupWebsocketConnectionClass *klass)
+        /**
+         * SoupWebsocketConnection:max-incoming-payload-size:
+         *
+-        * The maximum payload size for incoming packets the protocol expects
+-        * or 0 to not limit it.
+        * The maximum payload size for incoming packets, or 0 to not limit it.
+        * Each message may consist of multiple packets, so also refer to
+        * [property@WebSocketConnection:max-total-message-size].
+         *
+         * Since: 2.56
+         */
+@@ -1668,9 +1668,18 @@ soup_websocket_connection_class_init (SoupWebsocketConnectionClass *klass)
+        /**
+         * SoupWebsocketConnection:max-total-message-size:
+         *
+-        * The total message size for incoming packets.
+        * The maximum size for incoming messages.
+        * Set to a value to limit the total message size, or 0 to not
+        * limit it.
+         *
+-        * The protocol expects or 0 to not limit it.
+        * [method@Server.add_websocket_handler] will set this to a nonzero
+        * default value to mitigate denial of service attacks. Clients must
+        * choose their own default if they need to mitigate denial of service
+        * attacks. You also need to set your own default if creating your own
+        * server SoupWebsocketConnection without using SoupServer.
+        *
+        * Each message may consist of multiple packets, so also refer to
+        *[property@WebSocketConnection:max-incoming-payload-size].
+         *
+         */
+        g_object_class_install_property (gobject_class, PROP_MAX_TOTAL_MESSAGE_SIZE,
+@@ -1679,7 +1688,7 @@ soup_websocket_connection_class_init (SoupWebsocketConnectionClass *klass)
+                                                             "Max total message size ",
+                                                             0,
+                                                             G_MAXUINT64,
+-                                                            MAX_TOTAL_MESSAGE_SIZE_DEFAULT,
+                                                            0,
+                                                             G_PARAM_READWRITE |
+                                                             G_PARAM_CONSTRUCT |
+                                                             G_PARAM_STATIC_STRINGS));
+@@ -2210,7 +2219,7 @@ soup_websocket_connection_get_max_total_message_size (SoupWebsocketConnection *s
+ {
+    SoupWebsocketConnectionPrivate *pv;
+ 
+-   g_return_val_if_fail (SOUP_IS_WEBSOCKET_CONNECTION (self), MAX_TOTAL_MESSAGE_SIZE_DEFAULT);
+   g_return_val_if_fail (SOUP_IS_WEBSOCKET_CONNECTION (self), 0);
+    pv = self->pv;
+ 
+    return pv->max_total_message_size;
+-- 
+2.34.1
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1467.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1467.patch
new file mode 100644
index 0000000000..a1a130ee3a
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1467.patch
@@ -0,0 +1,151 @@
+From b4f1dcb89a552fc03bfd0e65830b4f76fdc4a232 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Tue, 21 Apr 2026 17:10:37 +0800
+Subject: [PATCH] Fix CVE-2026-1467
+CVE: CVE-2026-1467
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/6dfe506618d2d5856618e5c0f85bd93386dc8012]
+The original backport patch targets libsoup3. This patch has been
+adapted accordingly for libsoup2, refer the openSUSE patch, see [1]
+[1] https://www.suse.com/security/cve/CVE-2026-1467.html
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-auth.c    |  2 +-
+ libsoup/soup-message.c |  5 +++-
+ libsoup/soup-uri.c     | 60 ++++++++++++++++++++++++++++++++++++++++++
+ libsoup/soup-uri.h     |  2 ++
+ 4 files changed, 67 insertions(+), 2 deletions(-)
+diff --git a/libsoup/soup-auth.c b/libsoup/soup-auth.c
+index 1896aab..e205fe3 100644
+--- a/libsoup/soup-auth.c
+++ b/libsoup/soup-auth.c
+@@ -535,7 +535,7 @@ GSList *
+ soup_auth_get_protection_space (SoupAuth *auth, SoupURI *source_uri)
+ {
+        g_return_val_if_fail (SOUP_IS_AUTH (auth), NULL);
+-       g_return_val_if_fail (source_uri != NULL, NULL);
+       g_return_val_if_fail (soup_uri_is_valid (source_uri), NULL);
+ 
+        return SOUP_AUTH_GET_CLASS (auth)->get_protection_space (auth, source_uri);
+ }
+diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c
+index da32b42..cc4f22b 100644
+--- a/libsoup/soup-message.c
+++ b/libsoup/soup-message.c
+@@ -1044,7 +1044,7 @@ soup_message_new (const char *method, const char *uri_string)
+        uri = soup_uri_new (uri_string);
+        if (!uri)
+                return NULL;
+-       if (!uri->host) {
+       if (!soup_uri_is_valid (uri)) {
+                soup_uri_free (uri);
+                return NULL;
+        }
+@@ -1066,6 +1066,8 @@ soup_message_new (const char *method, const char *uri_string)
+ SoupMessage *
+ soup_message_new_from_uri (const char *method, SoupURI *uri)
+ {
+       g_return_val_if_fail (soup_uri_is_valid (uri), NULL);
+
+        return g_object_new (SOUP_TYPE_MESSAGE,
+                             SOUP_MESSAGE_METHOD, method,
+                             SOUP_MESSAGE_URI, uri,
+@@ -1676,6 +1678,7 @@ soup_message_set_uri (SoupMessage *msg, SoupURI *uri)
+        SoupMessagePrivate *priv;
+ 
+        g_return_if_fail (SOUP_IS_MESSAGE (msg));
+       g_return_if_fail (soup_uri_is_valid (uri));
+        priv = soup_message_get_instance_private (msg);
+ 
+        if (priv->uri)
+diff --git a/libsoup/soup-uri.c b/libsoup/soup-uri.c
+index bdb7a17..d781ff1 100644
+--- a/libsoup/soup-uri.c
+++ b/libsoup/soup-uri.c
+@@ -1342,6 +1342,66 @@ soup_uri_host_equal (gconstpointer v1, gconstpointer v2)
+        return g_ascii_strcasecmp (one->host, two->host) == 0;
+ }
+ 
+static gboolean
+is_valid_character_for_host (char c)
+{
+        static const char forbidden_chars[] = { '\t', '\n', '\r', ' ', '#', '/', ':', '<', '>', '?', '@', '[', '\\', ']', '^', '|' };
+        int i;
+
+        for (i = 0; i < G_N_ELEMENTS (forbidden_chars); ++i) {
+                if (c == forbidden_chars[i])
+                        return FALSE;
+        }
+
+        return TRUE;
+}
+
+static gboolean
+is_host_valid (const char* host)
+{
+        int i;
+        gboolean is_valid;
+        char *ascii_host = NULL;
+
+        if (!host || !host[0])
+                return FALSE;
+
+        if (g_hostname_is_non_ascii (host)) {
+                ascii_host = g_hostname_to_ascii (host);
+                if (!ascii_host)
+                  return FALSE;
+
+                host = ascii_host;
+        }
+
+        if ((g_ascii_isdigit (host[0]) || strchr (host, ':')) && g_hostname_is_ip_address (host)) {
+                g_free (ascii_host);
+                return TRUE;
+        }
+        is_valid = TRUE;
+        for (i = 0; host[i] && is_valid; i++)
+                is_valid = is_valid_character_for_host (host[i]);
+
+        g_free (ascii_host);
+
+        return is_valid;
+}
+
+gboolean
+soup_uri_is_valid (SoupURI *uri)
+{
+        if (!uri)
+                return FALSE;
+
+        if (!is_host_valid (soup_uri_get_host (uri)))
+                return FALSE;
+
+        /* FIXME: validate other URI components? */
+
+        return TRUE;
+}
+
+
+ gboolean
+ soup_uri_is_http (SoupURI *uri, char **aliases)
+ {
+diff --git a/libsoup/soup-uri.h b/libsoup/soup-uri.h
+index 8015e4f..64099c3 100644
+--- a/libsoup/soup-uri.h
+++ b/libsoup/soup-uri.h
+@@ -133,6 +133,8 @@ guint       soup_uri_host_hash             (gconstpointer key);
+ SOUP_AVAILABLE_IN_2_28
+ gboolean    soup_uri_host_equal            (gconstpointer v1,
+                                            gconstpointer v2);
+SOUP_AVAILABLE_IN_2_68
+gboolean     soup_uri_is_valid             (SoupURI       *uri);
+ 
+ #define   SOUP_URI_IS_VALID(uri)       ((uri) && (uri)->scheme && (uri)->path)
+ #define   SOUP_URI_VALID_FOR_HTTP(uri) ((uri) && ((uri)->scheme == SOUP_URI_SCHEME_HTTP || (uri)->scheme == SOUP_URI_SCHEME_HTTPS) && (uri)->host && (uri)->path)
+-- 
+2.34.1
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1539.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1539.patch
new file mode 100644
index 0000000000..c6b813a98f
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1539.patch
@@ -0,0 +1,31 @@
+From 285faea567e1e2a95226201175dbf745a64a2439 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 20 Mar 2026 15:04:22 +0800
+Subject: [PATCH 4/4] Also remove Proxy-Authorization header on cross origin
+ redirect
+Closes #489
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/98c1285d9d78662c38bf14b4a128af01ccfdb446]
+CVE: CVE-2026-1539
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-session.c | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
+index cc0d04c..0361856 100644
+--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
+@@ -1190,6 +1190,7 @@ soup_session_redirect_message (SoupSession *session, SoupMessage *msg)
+        /* Strip all credentials on cross-origin redirect. */
+        if (!soup_uri_host_equal (soup_message_get_uri (msg), new_uri)) {
+                soup_message_headers_remove (msg->request_headers, "Authorization");
+               soup_message_headers_remove (msg->request_headers, "Proxy-Authorization");
+                soup_message_set_auth (msg, NULL);
+        }
+ 
+-- 
+2.34.1
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1760.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1760.patch
new file mode 100644
index 0000000000..a5547132a2
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1760.patch
@@ -0,0 +1,153 @@
+From 0fca37e0fce479284e62091ffb9b7d6caff1c7e4 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <cgarcia@igalia.com>
+Date: Thu, 29 Jan 2026 16:43:28 +0100
+Subject: [PATCH] server: close the connection after responsing a request
+ containing Content-Length and Transfer-Encoding
+Closes #475
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/6224df5a471e9040a99dd3dc2e91817a701b1bf6]
+CVE: CVE-2026-1760
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-message-headers.c   | 86 +++++++++++++++-----------------
+ libsoup/soup-message-server-io.c |  8 +++
+ 2 files changed, 49 insertions(+), 45 deletions(-)
+diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
+index 535cf14..06d9600 100644
+--- a/libsoup/soup-message-headers.c
+++ b/libsoup/soup-message-headers.c
+@@ -666,38 +666,13 @@ clear_special_headers (SoupMessageHeaders *hdrs)
+ static void
+ transfer_encoding_setter (SoupMessageHeaders *hdrs, const char *value)
+ {
+-       if (value) {
+-               /* "identity" is a wrong value according to RFC errata 408,
+-                * and RFC 7230 does not list it as valid transfer-coding.
+-                * Nevertheless, the obsolete RFC 2616 stated "identity"
+-                * as valid, so we can't handle it as unrecognized here
+-                * for compatibility reasons.
+-                */
+-               if (g_ascii_strcasecmp (value, "chunked") == 0)
+-                       hdrs->encoding = SOUP_ENCODING_CHUNKED;
+-               else if (g_ascii_strcasecmp (value, "identity") != 0)
+-                       hdrs->encoding = SOUP_ENCODING_UNRECOGNIZED;
+-       } else
+-               hdrs->encoding = -1;
+       hdrs->encoding = -1;
+ }
+ 
+ static void
+ content_length_setter (SoupMessageHeaders *hdrs, const char *value)
+ {
+-       /* Transfer-Encoding trumps Content-Length */
+-       if (hdrs->encoding == SOUP_ENCODING_CHUNKED)
+-               return;
+-
+-       if (value) {
+-               char *end;
+-
+-               hdrs->content_length = g_ascii_strtoull (value, &end, 10);
+-               if (*end)
+-                       hdrs->encoding = SOUP_ENCODING_UNRECOGNIZED;
+-               else
+-                       hdrs->encoding = SOUP_ENCODING_CONTENT_LENGTH;
+-       } else
+-               hdrs->encoding = -1;
+       hdrs->encoding = -1;
+ }
+ 
+ /**
+@@ -730,29 +705,50 @@ SoupEncoding
+ soup_message_headers_get_encoding (SoupMessageHeaders *hdrs)
+ {
+        const char *header;
+       const char *content_length;
+       const char *transfer_encoding;
+ 
+        if (hdrs->encoding != -1)
+                return hdrs->encoding;
+ 
+-       /* If Transfer-Encoding was set, hdrs->encoding would already
+-        * be set. So we don't need to check that possibility.
+-        */
+-       header = soup_message_headers_get_one (hdrs, "Content-Length");
+-       if (header) {
+-               content_length_setter (hdrs, header);
+-               if (hdrs->encoding != -1)
+-                       return hdrs->encoding;
+-       }
+                       /* Transfer-Encoding is checked first because it overrides the Content-Length */
+                       transfer_encoding = soup_message_headers_get_one (hdrs, "Transfer-Encoding");
+                       if (transfer_encoding) {
+                                       /* "identity" is a wrong value according to RFC errata 408,
+                                        * and RFC 7230 does not list it as valid transfer-coding.
+                                        * Nevertheless, the obsolete RFC 2616 stated "identity"
+                                        * as valid, so we can't handle it as unrecognized here
+                                        * for compatibility reasons.
+                                        */
+                                       if (g_ascii_strcasecmp (transfer_encoding, "chunked") == 0)
+                                                       hdrs->encoding = SOUP_ENCODING_CHUNKED;
+                                       else if (g_ascii_strcasecmp (transfer_encoding, "identity") != 0)
+                                                       hdrs->encoding = SOUP_ENCODING_UNRECOGNIZED;
+                       } else {
+                                       content_length = soup_message_headers_get_one (hdrs, "Content-Length");
+                                       if (content_length) {
+                                                       char *end;
+
+                                                       hdrs->content_length = g_ascii_strtoull (content_length, &end, 10);
+                                                       if (*end)
+                                                                       hdrs->encoding = SOUP_ENCODING_UNRECOGNIZED;
+                                                       else
+                                                                       hdrs->encoding = SOUP_ENCODING_CONTENT_LENGTH;
+                                       }
+                       }
+
+                       if (hdrs->encoding == -1) {
+                                       /* Per RFC 2616 4.4, a response body that doesn't indicate its
+                                        * encoding otherwise is terminated by connection close, and a
+                                        * request that doesn't indicate otherwise has no body. Note
+                                        * that SoupMessage calls soup_message_headers_set_encoding()
+                                        * to override the response body default for our own
+                                        * server-side messages.
+                                        */
+                                       hdrs->encoding = (hdrs->type == SOUP_MESSAGE_HEADERS_RESPONSE) ?
+                                                       SOUP_ENCODING_EOF : SOUP_ENCODING_NONE;
+                       }
+ 
+-       /* Per RFC 2616 4.4, a response body that doesn't indicate its
+-        * encoding otherwise is terminated by connection close, and a
+-        * request that doesn't indicate otherwise has no body. Note
+-        * that SoupMessage calls soup_message_headers_set_encoding()
+-        * to override the response body default for our own
+-        * server-side messages.
+-        */
+-       hdrs->encoding = (hdrs->type == SOUP_MESSAGE_HEADERS_RESPONSE) ?
+-               SOUP_ENCODING_EOF : SOUP_ENCODING_NONE;
+        return hdrs->encoding;
+ }
+ 
+diff --git a/libsoup/soup-message-server-io.c b/libsoup/soup-message-server-io.c
+index 71e943b..df5eafc 100644
+--- a/libsoup/soup-message-server-io.c
+++ b/libsoup/soup-message-server-io.c
+@@ -80,6 +80,14 @@ parse_request_headers (SoupMessage *msg, char *headers, guint headers_len,
+                        return SOUP_STATUS_BAD_REQUEST;
+        }
+ 
+       /* A server MAY reject a request that contains both Content-Length and
+        * Transfer-Encoding or process such a request in accordance with the
+        * Transfer-Encoding alone. Regardless, the server MUST close the connection
+        * after responding to such a request to avoid the potential attacks
+        */
+       if (*encoding == SOUP_ENCODING_CHUNKED && soup_message_headers_get_one (msg->request_headers, "Content-Length"))
+                       soup_message_headers_replace (msg->request_headers, "Connection", "close");
+
+        /* Generate correct context for request */
+        req_host = soup_message_headers_get_one (msg->request_headers, "Host");
+        if (req_host && strchr (req_host, '/')) {
+-- 
+2.34.1
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1761.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1761.patch
new file mode 100644
index 0000000000..573e3e1dd0
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1761.patch
@@ -0,0 +1,36 @@
+From 07757b7feacfc660c6c463ff2b773c13bc42d2c9 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 19 Mar 2026 17:21:32 +0800
+Subject: [PATCH 3/4] multipart: check length of bytes read
+ soup_filter_input_stream_read_until()
+We do make sure the read length is smaller than the buffer length when
+the boundary is not found, but we should do the same when the boundary
+is found.
+Spotted in #YWH-PGM9867-149
+Closes #493
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/cfa9d90d1a5c274233554a264c56551c13d6a6f0]
+CVE: CVE-2026-1761
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-filter-input-stream.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/libsoup/soup-filter-input-stream.c b/libsoup/soup-filter-input-stream.c
+index 2c30bf9..c34510b 100644
+--- a/libsoup/soup-filter-input-stream.c
+++ b/libsoup/soup-filter-input-stream.c
+@@ -272,6 +272,6 @@ soup_filter_input_stream_read_until (SoupFilterInputStream  *fstream,
+        if (eof && !*got_boundary)
+                read_length = MIN (fstream->priv->buf->len, length);
+        else
+-               read_length = p - buf;
+               read_length = MIN ((gsize)(p - buf), length);
+        return read_from_buf (fstream, buffer, read_length);
+ }
+-- 
+2.34.1
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1801.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1801.patch
new file mode 100644
index 0000000000..5f445f7354
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-1801.patch
@@ -0,0 +1,126 @@
+From f9c933e258e9ef2f221cca6395f8092a1c4b93dd Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 19 Mar 2026 17:10:36 +0800
+Subject: [PATCH 2/4] Fix CVE-2026-1801
+This patch merges 3 upstream patches
+Chery-pick the first two patches to make the context is the same as the
+third patch that fix CVE-2026-1801
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/commit/1e32b5e123aa1689505472bdbfcbd897eac41977,
+https://gitlab.gnome.org/GNOME/libsoup/-/commit/8a2e15c88512ae4517d2c2c887d39299725b22da,
+https://gitlab.gnome.org/GNOME/libsoup/-/commit/b9a1c0663ff8ab6e79715db4b35b54f560416ddd]
+CVE: CVE-2026-1801
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-body-input-stream.c | 66 ++++++++++++++++++++------------
+ 1 file changed, 41 insertions(+), 25 deletions(-)
+diff --git a/libsoup/soup-body-input-stream.c b/libsoup/soup-body-input-stream.c
+index 6b95884..25d9312 100644
+--- a/libsoup/soup-body-input-stream.c
+++ b/libsoup/soup-body-input-stream.c
+@@ -159,15 +159,18 @@ soup_body_input_stream_read_chunked (SoupBodyInputStream  *bistream,
+ again:
+        switch (bistream->priv->chunked_state) {
+        case SOUP_BODY_INPUT_STREAM_STATE_CHUNK_SIZE:
+-               nread = soup_filter_input_stream_read_line (
+-                       fstream, metabuf, sizeof (metabuf), blocking,
+-                       &got_line, cancellable, error);
+-               if (nread <= 0)
+               nread = soup_filter_input_stream_read_until (
+                               fstream, metabuf, sizeof (metabuf),
+                               "\r\n", 2, blocking, TRUE,
+                               &got_line, cancellable, error);
+               if (nread < 0)
+                        return nread;
+-               if (!got_line) {
+-                       g_set_error_literal (error, G_IO_ERROR,
+-                                            G_IO_ERROR_PARTIAL_INPUT,
+-                                            _("Connection terminated unexpectedly"));
+               if (nread == 0 || !got_line) {
+                       if (error && *error == NULL) {
+                               g_set_error_literal (error, G_IO_ERROR,
+                                                                       G_IO_ERROR_PARTIAL_INPUT,
+                                                                       ("Connection terminated unexpectedly"));
+                       }
+                        return -1;
+                }
+ 
+@@ -180,9 +183,9 @@ again:
+ 
+        case SOUP_BODY_INPUT_STREAM_STATE_CHUNK:
+                nread = soup_body_input_stream_read_raw (
+-                       bistream, buffer,
+-                       MIN (count, bistream->priv->read_length),
+-                       blocking, cancellable, error);
+                               bistream, buffer,
+                               MIN (count, bistream->priv->read_length),
+                               blocking, cancellable, error);
+                if (nread > 0) {
+                        bistream->priv->read_length -= nread;
+                        if (bistream->priv->read_length == 0)
+@@ -191,16 +194,19 @@ again:
+                return nread;
+ 
+        case SOUP_BODY_INPUT_STREAM_STATE_CHUNK_END:
+-               nread = soup_filter_input_stream_read_line (
+-                       SOUP_FILTER_INPUT_STREAM (bistream->priv->base_stream),
+-                       metabuf, sizeof (metabuf), blocking,
+-                       &got_line, cancellable, error);
+-               if (nread <= 0)
+               nread = soup_filter_input_stream_read_until (
+                               SOUP_FILTER_INPUT_STREAM (bistream->priv->base_stream),
+                               metabuf, sizeof (metabuf),
+                               "\r\n", 2, blocking, TRUE,
+                               &got_line, cancellable, error);
+               if (nread < 0)
+                        return nread;
+-               if (!got_line) {
+-                       g_set_error_literal (error, G_IO_ERROR,
+-                                            G_IO_ERROR_PARTIAL_INPUT,
+-                                            _("Connection terminated unexpectedly"));
+               if (nread == 0 || !got_line) {
+                       if (error && *error == NULL) {
+                               g_set_error_literal (error, G_IO_ERROR,
+                               G_IO_ERROR_PARTIAL_INPUT,
+                               _("Connection terminated unexpectedly"));
+                       }
+                        return -1;
+                }
+ 
+@@ -208,13 +214,23 @@ again:
+                break;
+ 
+        case SOUP_BODY_INPUT_STREAM_STATE_TRAILERS:
+-               nread = soup_filter_input_stream_read_line (
+-                       fstream, buffer, count, blocking,
+-                       &got_line, cancellable, error);
+-               if (nread <= 0)
+               nread = soup_filter_input_stream_read_until (
+                               fstream, metabuf, sizeof (metabuf),
+                               "\r\n", 2, blocking, TRUE,
+                               &got_line, cancellable, error);
+               if (nread < 0)
+                        return nread;
+ 
+-               if (strncmp (buffer, "\r\n", nread) || strncmp (buffer, "\n", nread)) {
+               if (nread == 0) {
+                       if (error && *error == NULL) {
+                               g_set_error_literal (error, G_IO_ERROR,
+                               G_IO_ERROR_PARTIAL_INPUT,
+                               _("Connection terminated unexpectedly"));
+                       }
+                       return -1;
+               }
+
+               if (nread == 2 && strncmp (metabuf, "\r\n", nread) == 0) {
+                        bistream->priv->chunked_state = SOUP_BODY_INPUT_STREAM_STATE_DONE;
+                        bistream->priv->eof = TRUE;
+                }
+-- 
+2.34.1
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-2369.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-2369.patch
new file mode 100644
index 0000000000..814672caca
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-2369.patch
@@ -0,0 +1,33 @@
+From 5c4e65fd99ff4e3ae76c7985c5e160bb07ea0f92 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Wed, 25 Mar 2026 11:24:36 +0800
+Subject: [PATCH] sniffer: Handle potential underflow
+Closes #498
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/b91bbd7d7888c85b17a8b33173caa806dff51681]
+CVE: CVE-2026-2369
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-content-sniffer.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
+index 3edc568..b091bca 100644
+--- a/libsoup/soup-content-sniffer.c
+++ b/libsoup/soup-content-sniffer.c
+@@ -504,6 +504,10 @@ sniff_unknown (SoupContentSniffer *sniffer, SoupBuffer *buffer,
+                if (!sniff_scriptable && type_row->scriptable)
+                        continue;
+ 
+               /* Ensure we have data to sniff - prevents underflow in resource_length - 1 */
+               if (resource_length == 0)
+                       continue;
+
+                if (type_row->has_ws) {
+                        guint index_stream = 0;
+                        guint index_pattern = 0;
+-- 
+2.34.1
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-2443.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-2443.patch
new file mode 100644
index 0000000000..99d42acb1e
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2026-2443.patch
@@ -0,0 +1,135 @@
+From 7bb3115a296154e3f465900ea5c984a493385a7f Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@gnome.org>
+Date: Fri, 19 Dec 2025 23:49:05 +0000
+Subject: [PATCH] Fix CVE-2026-2443
+Upstream-Status: Backport [
+c1796442 soup-message-headers: Rework Range response statuses to match Apache
+191ef313 soup-message-headers: Fix rejection of Range headers with trailing garbage
+be677bea soup-message-headers: Fix parsing of invalid Range suffix lengths
+2bbfdfe8 soup-message-headers: Reject ranges where end is before start
+739bf7cb soup-message-headers: Reject invalid Range ends longer than the content
+]
+CVE: CVE-2026-2443
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-message-headers.c | 62 ++++++++++++++++++++++++----------
+ 1 file changed, 44 insertions(+), 18 deletions(-)
+diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
+index bb20bbb..535cf14 100644
+--- a/libsoup/soup-message-headers.c
+++ b/libsoup/soup-message-headers.c
+@@ -943,10 +943,16 @@ sort_ranges (gconstpointer a, gconstpointer b)
+ }
+ 
+ /* like soup_message_headers_get_ranges(), except it returns:
+- *   SOUP_STATUS_OK if there is no Range or it should be ignored.
+- *   SOUP_STATUS_PARTIAL_CONTENT if there is at least one satisfiable range.
+- *   SOUP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE if @check_satisfiable
+- *     is %TRUE and the request is not satisfiable given @total_length.
+ *  - SOUP_STATUS_OK if there is no Range or it should be ignored due to being
+ *    entirely invalid.
+ *  - SOUP_STATUS_PARTIAL_CONTENT if there is at least one satisfiable range.
+ *  - SOUP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE if @check_satisfiable
+ *     is %TRUE, the Range is valid, but no part of the request is satisfiable
+ *     given @total_length.
+ *
+ * @ranges and @length are only set if SOUP_STATUS_PARTIAL_CONTENT is returned.
+ *
+ * See https://httpwg.org/specs/rfc9110.html#field.range
+  */
+ guint
+ soup_message_headers_get_ranges_internal (SoupMessageHeaders  *hdrs,
+@@ -960,22 +966,28 @@ soup_message_headers_get_ranges_internal (SoupMessageHeaders  *hdrs,
+        GArray *array;
+        char *spec, *end;
+        guint status = SOUP_STATUS_OK;
+       gboolean is_all_valid = TRUE;
+ 
+        if (!range || strncmp (range, "bytes", 5) != 0)
+-               return status;
+               return SOUP_STATUS_OK;  /* invalid header or unknown range unit */
+ 
+        range += 5;
+        while (g_ascii_isspace (*range))
+                range++;
+        if (*range++ != '=')
+-               return status;
+               return SOUP_STATUS_OK;  /* invalid header */
+        while (g_ascii_isspace (*range))
+                range++;
+ 
+        range_list = soup_header_parse_list (range);
+        if (!range_list)
+-               return status;
+               return SOUP_STATUS_OK;  /* invalid list */
+ 
+       /* Loop through the ranges and modify the status accordingly. Default to
+        * status 200 (OK, ignoring the ranges). Switch to status 206 (Partial
+        * Content) if there is at least one partially valid range. Switch to
+        * status 416 (Range Not Satisfiable) if there are no partially valid
+        * ranges at all. */
+        array = g_array_new (FALSE, FALSE, sizeof (SoupRange));
+        for (r = range_list; r; r = r->next) {
+                SoupRange cur;
+@@ -988,30 +1000,44 @@ soup_message_headers_get_ranges_internal (SoupMessageHeaders  *hdrs,
+                        cur.start = g_ascii_strtoull (spec, &end, 10);
+                        if (*end == '-')
+                                end++;
+-                       if (*end) {
+                       if (*end)
+                                cur.end = g_ascii_strtoull (end, &end, 10);
+-                               if (cur.end < cur.start) {
+-                                       status = SOUP_STATUS_OK;
+-                                       break;
+-                               }
+-                       } else
+                       else
+                                cur.end = total_length - 1;
+                }
+
+                if (*end) {
+-                       status = SOUP_STATUS_OK;
+-                       break;
+-               } else if (check_satisfiable && cur.start >= total_length) {
+-                       if (status == SOUP_STATUS_OK)
+-                               status = SOUP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE;
+                       /* Junk after the range */
+                       is_all_valid = FALSE;
+                       continue;
+               }
+
+               if (cur.end < cur.start) {
+                       is_all_valid = FALSE;
+                       continue;
+               }
+
+               g_assert (cur.start >= 0);
+               if (cur.end >= total_length)
+                       cur.end = total_length - 1;
+
+               if (cur.start >= total_length) {
+                       /* Range is valid, but unsatisfiable */
+                        continue;
+                }
+ 
+               /* We have at least one (at least partially) satisfiable range */
+                g_array_append_val (array, cur);
+                status = SOUP_STATUS_PARTIAL_CONTENT;
+        }
+        soup_header_free_list (range_list);
+ 
+        if (status != SOUP_STATUS_PARTIAL_CONTENT) {
+               g_assert (status == SOUP_STATUS_OK);
+
+               if (is_all_valid && check_satisfiable)
+                       status = SOUP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE;
+
+                g_array_free (array, TRUE);
+                return status;
+        }
+-- 
+2.34.1
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
index 68ec576d9b..e588e60cd5 100644
--- a/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
@@ -40,6 +40,16 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
           file://CVE-2025-4948.patch \
           file://CVE-2025-4969.patch \
           file://CVE-2025-4945.patch \
+           file://CVE-2025-14523.patch \
+           file://CVE-2025-32049-1.patch \
+           file://CVE-2025-32049-2.patch \
+           file://CVE-2026-2443.patch \
+           file://CVE-2026-1801.patch \
+           file://CVE-2026-1761.patch \
+           file://CVE-2026-1539.patch \
+           file://CVE-2026-2369.patch \
+           file://CVE-2026-1760.patch \
+           file://CVE-2026-1467.patch \
 "
 SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"
diff --git a/meta-oe/recipes-support/libtar/files/0001-compat-convert-K-R-function-definitions-to-ANSI-C-pr.patch b/meta-oe/recipes-support/libtar/files/0001-compat-convert-K-R-function-definitions-to-ANSI-C-pr.patch
new file mode 100644
index 0000000000..4585c586b4
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0001-compat-convert-K-R-function-definitions-to-ANSI-C-pr.patch
@@ -0,0 +1,62 @@
+From 5ea04d70221a18cbd711a9d570c81ef0b9be6765 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Fri, 10 Apr 2026 18:41:04 -0700
+Subject: [PATCH] compat: convert K&R function definitions to ANSI C prototypes
+Replace old-style K&R parameter declarations with modern ANSI C
+function prototypes in basename.c, dirname.c, and strmode.c.
+Required for compatibility with clang 22 under -std=gnu23, which
+no longer supports K&R-style function definitions.
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ compat/basename.c | 3 +--
+ compat/dirname.c  | 3 +--
+ compat/strmode.c  | 4 +---
+ 3 files changed, 3 insertions(+), 7 deletions(-)
+diff --git a/compat/basename.c b/compat/basename.c
+index 2ac1e13..7b0384a 100644
+--- a/compat/basename.c
+++ b/compat/basename.c
+@@ -36,8 +36,7 @@ static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp
+ #include <sys/param.h>
+ 
+ char *
+-openbsd_basename(path)
+-       const char *path;
+openbsd_basename(const char *path)
+ {
+        static char bname[MAXPATHLEN];
+        register const char *endp, *startp;
+diff --git a/compat/dirname.c b/compat/dirname.c
+index 986db4a..6c1231d 100644
+--- a/compat/dirname.c
+++ b/compat/dirname.c
+@@ -36,8 +36,7 @@ static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $
+ #include <sys/param.h>
+ 
+ char *
+-openbsd_dirname(path)
+-       const char *path;
+openbsd_dirname (const char *path)
+ {
+        static char bname[MAXPATHLEN];
+        register const char *endp;
+diff --git a/compat/strmode.c b/compat/strmode.c
+index 5e7f15e..2ffab61 100644
+--- a/compat/strmode.c
+++ b/compat/strmode.c
+@@ -40,9 +40,7 @@ static char *rcsid = "$OpenBSD: strmode.c,v 1.3 1997/06/13 13:57:20 deraadt Exp
+ #include <string.h>
+ 
+ void
+-strmode(mode, p)
+-       register mode_t mode;
+-       register char *p;
+strmode (register mode_t mode, register char *p)
+ {
+         /* print type */
+        switch (mode & S_IFMT) {
diff --git a/meta-oe/recipes-support/libtar/libtar_1.2.20.bb b/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
index a17509d2e5..39d410064e 100644
--- a/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
+++ b/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
@@ -20,6 +20,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz \
           file://CVE-2021-33643-CVE-2021-33644.patch \
           file://CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch \
           file://CVE-2013-4420.patch \
+           file://0001-compat-convert-K-R-function-definitions-to-ANSI-C-pr.patch \
           "
 S = "${UNPACKDIR}/${BPN}"
diff --git a/meta-oe/recipes-support/libvarlink/libvarlink/0001-transport-tool-use-const-for-strchr-return-pointers.patch b/meta-oe/recipes-support/libvarlink/libvarlink/0001-transport-tool-use-const-for-strchr-return-pointers.patch
new file mode 100644
index 0000000000..348dc88838
--- /dev/null
+++ b/meta-oe/recipes-support/libvarlink/libvarlink/0001-transport-tool-use-const-for-strchr-return-pointers.patch
@@ -0,0 +1,96 @@
+From 27e4f4504b3c60356b9507e926aae2b82ba47275 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Wed, 15 Apr 2026 11:10:01 -0700
+Subject: [PATCH] transport,tool: use const for strchr return pointers
+Fixes errors seen after c23 implemented in glibc
+lib/transport-device.c:13:14: error: assigning to 'char *' from 'const char *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
+   13 |         parm = strchr(address, ';');
+      |              ^ ~~~~~~~~~~~~~~~~~~~~
+1 error generated.
+Upstream-Status: Submitted [https://github.com/varlink/libvarlink/pull/85]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ lib/transport-device.c | 2 +-
+ lib/transport-tcp.c    | 4 ++--
+ lib/transport-unix.c   | 2 +-
+ tool/command-format.c  | 2 +-
+ tool/command-info.c    | 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+diff --git a/lib/transport-device.c b/lib/transport-device.c
+index 0b8cec5..205eac4 100644
+--- a/lib/transport-device.c
+++ b/lib/transport-device.c
+@@ -7,7 +7,7 @@
+ #include <fcntl.h>
+ static int strip_parameters(const char *address, char **devicep) {
+-        char *parm;
+        const char *parm;
+         _cleanup_(freep) char *device = NULL;
+         parm = strchr(address, ';');
+diff --git a/lib/transport-tcp.c b/lib/transport-tcp.c
+index 92a0e7b..fff2379 100644
+--- a/lib/transport-tcp.c
+++ b/lib/transport-tcp.c
+@@ -10,7 +10,7 @@
+ #include <sys/socket.h>
+ static int strip_parameters(const char *address, char **hostp) {
+-        char *parm;
+        const char *parm;
+         _cleanup_(freep) char *host = NULL;
+         parm = strchr(address, ';');
+@@ -34,7 +34,7 @@ static void freeaddrinfop(struct addrinfo **ai) {
+ static int resolve_addrinfo(const char *address, struct addrinfo **resultp) {
+         _cleanup_(freep) char *host = NULL;
+         char *endptr;
+-        char *port;
+        const char *port;
+         struct addrinfo hints = {
+                 .ai_family = AF_UNSPEC,
+                 .ai_socktype = SOCK_STREAM,
+diff --git a/lib/transport-unix.c b/lib/transport-unix.c
+index 5dc3853..2414b29 100644
+--- a/lib/transport-unix.c
+++ b/lib/transport-unix.c
+@@ -10,7 +10,7 @@
+ #include <unistd.h>
+ static int strip_parameters(const char *address, char **pathp) {
+-        char *parm;
+        const char *parm;
+         _cleanup_(freep) char *path = NULL;
+         parm = strchr(address, ';');
+diff --git a/tool/command-format.c b/tool/command-format.c
+index 6932bc4..0f5ef8c 100644
+--- a/tool/command-format.c
+++ b/tool/command-format.c
+@@ -155,7 +155,7 @@ static long format_run(Cli *UNUSED(cli), int argc, char **argv) {
+ static long format_complete(Cli *cli, int argc, char **UNUSED(argv), const char *current) {
+         _cleanup_(freep) char *prefix = NULL;
+         DIR *dir;
+-        char *p;
+        const char *p;
+         if (argc != 1)
+                 return 0;
+diff --git a/tool/command-info.c b/tool/command-info.c
+index 571b6fd..9d252f7 100644
+--- a/tool/command-info.c
+++ b/tool/command-info.c
+@@ -137,7 +137,7 @@ static long info_run(Cli *cli, int argc, char **argv) {
+ static long info_complete(Cli *UNUSED(cli), int argc, char **UNUSED(argv), const char *current) {
+         _cleanup_(freep) char *prefix = NULL;
+         DIR *dir;
+-        char *p;
+        const char *p;
+         if (argc != 1)
+                 return 0;
diff --git a/meta-oe/recipes-support/libvarlink/libvarlink_24.0.1.bb b/meta-oe/recipes-support/libvarlink/libvarlink_24.0.1.bb
new file mode 100644
index 0000000000..1d1419a878
--- /dev/null
+++ b/meta-oe/recipes-support/libvarlink/libvarlink_24.0.1.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Varlink C library and command line tool"
+HOMEPAGE = "https://varlink.org/"
+DESCRIPTION = "Varlink is an interface description format and protocol that aims \
+to make services accessible to both humans and machines in the simplest feasible way."
+SECION = "devel"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+SRC_URI = "git://github.com/varlink/libvarlink.git;protocol=https;branch=master;tag=v${PV} \
+           file://0001-transport-tool-use-const-for-strchr-return-pointers.patch \
+          "
+SRCREV = "2ad4ec7ca62e148dbf0ad98646ec68c2e7e8a88e"
+inherit meson bash-completion lib_package
+do_install:append() {
+    # vim integration is not needed
+    rm -rf ${D}${datadir}/vim
+}
diff --git a/meta-oe/recipes-support/log4c/log4c/0001-sd-malloc-convert-K-R-function-declarations-to-ANSI-.patch b/meta-oe/recipes-support/log4c/log4c/0001-sd-malloc-convert-K-R-function-declarations-to-ANSI-.patch
new file mode 100644
index 0000000000..fae1a2d0c2
--- /dev/null
+++ b/meta-oe/recipes-support/log4c/log4c/0001-sd-malloc-convert-K-R-function-declarations-to-ANSI-.patch
@@ -0,0 +1,92 @@
+From b0ecadec662a8e35b017e16e92c5b1a04ed72598 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Sat, 11 Apr 2026 00:24:17 -0700
+Subject: [PATCH] sd/malloc: convert K&R function declarations to ANSI C
+ prototypes
+Replace old-style K&R parameter declarations with modern ANSI C
+(C89/C90) function prototypes across all functions in malloc.c.
+Also remove trailing whitespace in fixup_null_alloc().
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ src/sd/malloc.c | 23 ++++++++---------------
+ 1 file changed, 8 insertions(+), 15 deletions(-)
+diff --git a/src/sd/malloc.c b/src/sd/malloc.c
+index 7d241ad..43dd460 100644
+--- a/src/sd/malloc.c
+++ b/src/sd/malloc.c
+@@ -41,8 +41,7 @@ typedef void (*sd_malloc_handler_t)();
+ static sd_malloc_handler_t handler  = NULL;
+ 
+ static void *
+-fixup_null_alloc (n)
+-    size_t n;
+fixup_null_alloc (size_t n)
+ {
+     void* p = 0;
+ 
+@@ -62,8 +61,8 @@ fixup_null_alloc (n)
+            allocated = (char *) sbrk (0) - (char *) &environ;
+        sd_error("\nCannot allocate %lu bytes after allocating %lu bytes\n",
+                 (unsigned long) n, (unsigned long) allocated);
+-       
+-       if (handler) 
+
+       if (handler)
+            handler();
+        else {
+            sd_error("\n\tMemory exhausted !! Aborting.\n");
+@@ -75,8 +74,7 @@ fixup_null_alloc (n)
+ }
+ 
+ sd_malloc_handler_t
+-sd_malloc_set_handler(a_handler)
+-    sd_malloc_handler_t a_handler;
+sd_malloc_set_handler(sd_malloc_handler_t a_handler)
+ {
+     sd_malloc_handler_t previous = handler;
+ 
+@@ -87,8 +85,7 @@ sd_malloc_set_handler(a_handler)
+ /* Allocate N bytes of memory dynamically, with error checking.  */
+ 
+ void *
+-sd_malloc (n)
+-    size_t n;
+sd_malloc (size_t n)
+ {
+     void *p;
+ 
+@@ -101,8 +98,7 @@ sd_malloc (n)
+ /* Allocate memory for N elements of S bytes, with error checking.  */
+ 
+ void *
+-sd_calloc (n, s)
+-    size_t n, s;
+sd_calloc (size_t n, size_t s)
+ {
+     void *p;
+ 
+@@ -117,9 +113,7 @@ sd_calloc (n, s)
+    If P is NULL, run sd_malloc.  */
+ 
+ void *
+-sd_realloc (p, n)
+-    void *p;
+-    size_t n;
+sd_realloc (void *p, size_t n)
+ {
+     if (p == 0)
+        return sd_malloc (n);
+@@ -132,8 +126,7 @@ sd_realloc (p, n)
+ /* Return a newly allocated copy of STRING.  */
+ 
+ char *
+-sd_strdup (string)
+-     const char *string;
+sd_strdup (const char *string)
+ {
+   return strcpy (sd_malloc (strlen (string) + 1), string);
+ }
diff --git a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
index a0bd40b03a..eca800dc5e 100644
--- a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
+++ b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
           file://fix_configure_with-expat.patch \
           file://0001-Use-the-API-properly-in-the-example-format-security-.patch \
+           file://0001-sd-malloc-convert-K-R-function-declarations-to-ANSI-.patch \
          "
 SRC_URI[sha256sum] = "5991020192f52cc40fa852fbf6bbf5bd5db5d5d00aa9905c67f6f0eadeed48ea"
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb
index bfb75718f2..0c572d1bd3 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb
@@ -110,6 +110,7 @@ PACKAGES =+ "${PN}-libs"
 FILES:${PN}-libs = "${base_libdir}/lib*.so.* \
                    ${base_libdir}/multipath/lib*.so*"
 RDEPENDS:${PN} += "${PN}-libs bash libgcc"
+RRECOMMENDS:${PN} = "kernel-module-dm-multipath"
 PROVIDES += "device-mapper-multipath"
 RPROVIDES:${PN} += "device-mapper-multipath"
diff --git a/meta-oe/recipes-support/nano/nano_8.7.1.bb b/meta-oe/recipes-support/nano/nano_9.0.bb
index e62529ff9b..06bb7a63ce 100644
--- a/meta-oe/recipes-support/nano/nano_8.7.1.bb
+++ b/meta-oe/recipes-support/nano/nano_9.0.bb
@@ -13,7 +13,7 @@ RDEPENDS:${PN} = "ncurses-terminfo-base"
 PV_MAJOR = "${@d.getVar('PV').split('.')[0]}"
 SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz"
-SRC_URI[sha256sum] = "76f0dcb248f2e2f1251d4ecd20fd30fb400a360a3a37c6c340e0a52c2d1cdedf"
+SRC_URI[sha256sum] = "9f384374b496110a25b73ad5a5febb384783c6e3188b37063f677ac908013fde"
 UPSTREAM_CHECK_URI = "${GNU_MIRROR}/nano"
diff --git a/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch b/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch
deleted file mode 100644
index 73c9d06667..0000000000
--- a/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From c4351058da555e1e6a2b4b15d913baee80f55865 Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <wangmy@fujitsu.com>
-Date: Thu, 27 Jun 2024 06:27:18 +0000
-Subject: Fix incompatible pointer type error with gcc option 
- -Wincompatible-pointer-types
-| ../../../openct-0.6.20/src/ifd/ifdhandler.c: In function 'ifdhandler_run':
-| ../../../openct-0.6.20/src/ifd/ifdhandler.c:239:52: error: passing argument 2 of 'ifd_get_eventfd' from incompatible pointer type [-Wincompatible-pointer-types]
-|   239 |                 sock->fd = ifd_get_eventfd(reader, &sock->events);
-|       |                                                    ^~~~~~~~~~~~~
-|       |                                                    |
-|       |                                                    int *
-| In file included from ../../../openct-0.6.20/src/ifd/internal.h:17,
-|                  from ../../../openct-0.6.20/src/ifd/ifdhandler.c:7:
-| ../../../openct-0.6.20/src/include/openct/ifd.h:182:65: note: expected 'short int *' but argument is of type 'int *'
-|   182 | extern int                      ifd_get_eventfd(ifd_reader_t *, short *);
-|       |                                                                 ^~~~~~~
-| ../../../openct-0.6.20/src/ifd/process.c: In function 'do_memory_write':
-| ../../../openct-0.6.20/src/ifd/process.c:461:61: error: passing argument 4 of 'ct_tlv_get_opaque' from incompatible pointer type [-Wincompatible-pointer-types]
-|   461 |             || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len))
-|       |                                                             ^~~~~~~~~
-|       |                                                             |
-|       |                                                             unsigned int *
-| In file included from ../../../openct-0.6.20/src/ifd/process.c:20:
-| ../../../openct-0.6.20/src/include/openct/tlv.h:40:62: note: expected 'size_t *' {aka 'long unsigned int *'} but argument is of type 'unsigned int *'
-|    40 |                                 ifd_tag_t, unsigned char **, size_t *);
-Upstream-Status: Submitted
-Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
- src/ifd/ifdhandler.c | 2 +-
- src/ifd/process.c    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/src/ifd/ifdhandler.c b/src/ifd/ifdhandler.c
-index 12686c9..ebd1b53 100644
--- a/src/ifd/ifdhandler.c
-+++ b/src/ifd/ifdhandler.c
-@@ -236,7 +236,7 @@ static void ifdhandler_run(ifd_reader_t * reader)
-                sock->fd = -1;
-        }
-        else {
-               sock->fd = ifd_get_eventfd(reader, &sock->events);
-+               sock->fd = ifd_get_eventfd(reader, (short int *)&sock->events);
-        }
-        if (sock->fd == -1) {
-                ifd_debug(1, "events inactive for reader %s", reader->name);
-diff --git a/src/ifd/process.c b/src/ifd/process.c
-index 4563bdf..7088a76 100644
--- a/src/ifd/process.c
-+++ b/src/ifd/process.c
-@@ -458,7 +458,7 @@ static int do_memory_write(ifd_reader_t * reader, int unit,
-                return IFD_ERROR_INVALID_SLOT;
- 
-        if (ct_tlv_get_int(args, CT_TAG_ADDRESS, &address) == 0
-           || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len))
-+           || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, (size_t *)&data_len))
-                return IFD_ERROR_MISSING_ARG;
- 
-        rc = ifd_card_write_memory(reader, unit, address, data, data_len);
-- 
-2.34.1
diff --git a/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch b/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch
deleted file mode 100644
index 9bd3d18d6e..0000000000
--- a/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 146b5116140d719e4e9ae19748c0b6dee7d82f96 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 22 May 2023 22:01:28 -0700
-Subject: [PATCH] m4: Just emit the first line of compiler version
-Avoids emitting buildpaths into comments
-Fixes
-WARNING: openct-0.6.20-r0 do_package_qa: QA Issue: File /usr/include/openct/types.h in package openct-dev contains reference to TMPDIR [buildpaths]
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- m4/ac_create_stdint_h.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/m4/ac_create_stdint_h.m4 b/m4/ac_create_stdint_h.m4
-index 66de704..4b7223a 100644
--- a/m4/ac_create_stdint_h.m4
-+++ b/m4/ac_create_stdint_h.m4
-@@ -110,7 +110,7 @@ echo "#define" $_ac_stdint_h "1" >>$ac_stdint_h
- echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint_h
- echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint_h
- if test "$GCC" = "yes" ; then
-  echo "/* generated using a gnu compiler version" `$CC --version` "*/" \
-+  echo "/* generated using a gnu compiler version" `$CC --version|head -1` "*/" \
-   >>$ac_stdint_h
- else
-   echo "/* generated using $CC */" >>$ac_stdint_h
-- 
-2.40.1
diff --git a/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch b/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch
deleted file mode 100644
index e2401bb31b..0000000000
--- a/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e0d3e0bb1e38ff851696a7d8826e651d364ad8ce Mon Sep 17 00:00:00 2001
-From: Li xin <lixin.fnst@cn.fujitsu.com>
-Date: Fri, 5 Dec 2014 02:00:57 +0900
-Subject: [PATCH 1/2] etc/openct.udev.in: disablePROGRAM
-Bug fix: https://bugzilla.redhat.com/show_bug.cgi?id=287871
-Upstream-Status: Pending
-Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
---
- etc/openct.udev.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/etc/openct.udev.in b/etc/openct.udev.in
-index d11d0e1..48083c9 100644
--- a/etc/openct.udev.in
-+++ b/etc/openct.udev.in
-@@ -22,7 +22,8 @@ ACTION!="add", GOTO="openct_usb_rules_end"
- # 2010-01-06 removed, as latest udev doesn't know WAIT_FOR_ATTR any more.
- 
- # sleep for 100ms - the wait_for_sysfs might not be enough
-PROGRAM="/bin/sleep 0.1"
-+# Disabled in this package - see https://bugzilla.redhat.com/287871
-+# PROGRAM="/bin/sleep 0.1"
- 
- # ccid
- ATTR{bInterfaceClass}=="0b", ATTR{bInterfaceSubClass}=="00", ATTR{bInterfaceProtocol}=="00", ATTRS{idVendor}=="?*"  RUN+="@udevdir@/openct_usb /dev/$parent"
-- 
-1.8.4.2
diff --git a/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch b/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch
deleted file mode 100644
index 22eda729fb..0000000000
--- a/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d93985a137b553b2723235d03bda341dab14064f Mon Sep 17 00:00:00 2001
-From: Li xin <lixin.fnst@cn.fujitsu.com>
-Date: Fri, 5 Dec 2014 02:04:03 +0900
-Subject: [PATCH 2/2] etc/openct_usb.in: modify UDEVINFO
-this patch is from Fedora
-Upstream-Status: Pending
-Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
---
- etc/openct_usb.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/etc/openct_usb.in b/etc/openct_usb.in
-index 32f91aa..917467d 100644
--- a/etc/openct_usb.in
-+++ b/etc/openct_usb.in
-@@ -15,10 +15,10 @@ if [ -z "$DEVNAME" ]; then
-        # Guess udev info interface.
-        # Newer udev uses udevadm
-        #
-       if which udevinfo > /dev/null 2>&1; then
-               UDEVINFO="udevinfo"
-       else
-+       if which udevadm > /dev/null 2>&1; then
-                UDEVINFO="udevadm info"
-+       else
-+               UDEVINFO="udevinfo"
-        fi
-        DEVNAME=/dev/$($UDEVINFO --query=name --path=$(dirname $DEVPATH))
- fi
-- 
-1.8.4.2
diff --git a/meta-oe/recipes-support/openct/openct/openct.init b/meta-oe/recipes-support/openct/openct/openct.init
deleted file mode 100644
index c6896095e3..0000000000
--- a/meta-oe/recipes-support/openct/openct/openct.init
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-#
-# openct       This shell script takes care of starting and stopping OpenCT.
-#
-# chkconfig:   2345 24 89
-# description: OpenCT is a middleware framework for smart card terminals.
-#
-# processname: ifdhandler
-# config:      /etc/openct.conf
-### BEGIN INIT INFO
-# Provides: openct
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Should-Start: $syslog $network
-# Should-Stop: $syslog $network
-# Short-Description: Middleware framework for smart card terminals
-# Description: This starts/stops the OpenCT middleware framework support
-#              for smart card terminals.
-### END INIT INFO
-. /etc/init.d/functions
-exec="/usr/sbin/openct-control"
-prog=openct
-proc=ifdhandler
-OPENCT_OPTIONS=
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-lockfile=/var/lock/subsys/$prog
-start() {
-    retval=0
-    if ! status $proc >/dev/null 2>&1 ; then
-        action $"Initializing OpenCT smart card terminals: " \
-            $exec $OPENCT_OPTIONS init
-        retval=$?
-        [ $retval -eq 0 ] && touch $lockfile
-    fi
-    return $retval
-}
-stop() {
-    if status $proc >/dev/null 2>&1 ; then
-        action $"Stopping OpenCT smart card terminals: " \
-            $exec $OPENCT_OPTIONS shutdown
-    fi
-    retval=$?
-    if [ $retval -eq 0 ] ; then
-        rm -f /var/run/openct/status
-        rm -f $lockfile
-    fi
-    return $retval
-}
-restart() {
-    stop
-    start
-}
-oct_status() {
-    status $proc
-    retval=$?
-    if [ -e /var/run/openct/status ] ; then
-        $exec $OPENCT_OPTIONS status
-        [ -e /var/run/openct/status ] && \
-            echo $"Waiting for reader attach/detach events..."
-    fi
-    return $retval
-}
-case "$1" in
-    start|stop|restart)
-        $1
-        ;;
-    reload|force-reload)
-        restart
-        ;;
-    status)
-        oct_status
-        ;;
-    try-restart|condrestart)
-        [ ! -f $lockfile ] || restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
-        exit 2
-esac
diff --git a/meta-oe/recipes-support/openct/openct/openct.service b/meta-oe/recipes-support/openct/openct/openct.service
deleted file mode 100644
index 57de8c0a88..0000000000
--- a/meta-oe/recipes-support/openct/openct/openct.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Openct Middleware framework for smart card terminals
-After=syslog.target network.target
-[Service]
-EnvironmentFile=-/etc/sysconfig/openct
-ExecStart=/usr/sbin/openct-control $OPENCT_OPTIONS init 
-ExecStop=/usr/sbin/openct-control $OPENCT_OPTIONS shutdown
-RemainAfterExit=yes
-KillMode=mixed
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-oe/recipes-support/openct/openct/openct.sysconfig b/meta-oe/recipes-support/openct/openct/openct.sysconfig
deleted file mode 100644
index ffc270790f..0000000000
--- a/meta-oe/recipes-support/openct/openct/openct.sysconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-#                                                                    -*- sh -*-
-# Extra options to pass to openct-control.
-# Consult "/usr/sbin/openct-control -h" for available options.
-#
-OPENCT_OPTIONS=""
diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb
deleted file mode 100644
index c7b0d0d56d..0000000000
--- a/meta-oe/recipes-support/openct/openct_0.6.20.bb
+++ /dev/null
@@ -1,91 +0,0 @@
-SUMMARY = "Middleware framework for smart card terminals"
-HOMEPAGE = "https://github.com/OpenSC/openct/wiki"
-DESCRIPTION = " \
-OpenCT implements drivers for several smart card readers. \
-It comes as driver in ifdhandler format for PC/SC-Lite, \
-as CT-API driver, or as a small and lean middleware, \
-so applications can use it with minimal overhead. \
-OpenCT also has a primitive mechanism to export smart card \
-readers to remote machines via TCP/IP."
-DEPENDS += "libtool pcsc-lite libusb-compat"
-SRC_URI = " \
-    https://downloads.sourceforge.net/project/opensc/${BPN}/${BPN}-${PV}.tar.gz \
-    file://etc-openct.udev.in-disablePROGRAM.patch \
-    file://etc-openct_usb.in-modify-UDEVINFO.patch \
-    file://0001-m4-Just-emit-the-first-line-of-compiler-version.patch \
-    file://openct.init \
-    file://openct.sysconfig \
-    file://openct.service \
-    file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \
-"
-SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d181a68"
-UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/opensc/files/openct/"
-LICENSE = "LGPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
-inherit systemd
-SYSTEMD_SERVICE:${PN} += "openct.service "
-SYSTEMD_AUTO_ENABLE = "enable"
-EXTRA_OECONF = " \
-    --disable-static \
-    --enable-usb \
-    --enable-pcsc \
-    --enable-doc \
-    --enable-api-doc \
-    --with-udev=${nonarch_libdir}/udev \
-    --with-bundle=${libdir}/pcsc/drivers \
-"
-inherit autotools pkgconfig
-FILES:${PN} += " \
-    ${libdir}/ctapi \
-    ${nonarch_libdir}/udev \
-    ${libdir}/openct-ifd.so \
-    ${libdir}/pcsc \
-"
-FILES:${PN}-dbg += " \
-    ${libdir}/ctapi/.debug \
-    ${libdir}/pcsc/drivers/openct-ifd.bundle/Contents/Linux/.debug \
-"
-INSANE_SKIP:${PN} += "dev-deps"
-do_install[cleandirs] += "${D}"
-do_install () {
-    install -d ${D}${sysconfdir}
-    # fix up hardcoded paths
-    sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \
-        ${UNPACKDIR}/openct.service ${UNPACKDIR}/openct.init
-    oe_runmake install DESTDIR=${D}
-    install -dm 755 ${D}${libdir}/ctapi/
-    mv ${D}${libdir}/libopenctapi.so ${D}${libdir}/ctapi/
-    install -Dpm 644 etc/openct.udev ${D}${nonarch_libdir}/udev/rules.d/60-openct.rules
-    install -pm 644 etc/openct.conf ${D}${sysconfdir}/openct.conf
-    install -Dpm 755 ${UNPACKDIR}/openct.init ${D}${sysconfdir}/init.d/openct
-    install -Dpm 644 ${UNPACKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct
-    install -d ${D}${systemd_unitdir}/system
-    install -m 644 ${UNPACKDIR}/openct.service ${D}${systemd_unitdir}/system
-    so=$(find ${D} -name \*.so | sed "s|^${D}||")
-    sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf
-    install -Dpm 644 etc/reader.conf ${D}${sysconfdir}/reader.conf.d/openct.conf
-}
-BBCLASSEXTEND = "native"
-# http://errors.yoctoproject.org/Errors/Details/766890/
-# openct-0.6.20/src/ifd/ifdhandler.c:239:52: error: passing argument 2 of 'ifd_get_eventfd' from incompatible pointer type [-Wincompatible-pointer-types]
-# openct-0.6.20/src/ifd/process.c:461:61: error: passing argument 4 of 'ct_tlv_get_opaque' from incompatible pointer type [-Wincompatible-pointer-types]
-CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-support/opensc/opensc_0.26.1.bb b/meta-oe/recipes-support/opensc/opensc_0.27.1.bb
index 78258c965a..91e738e0a0 100644
--- a/meta-oe/recipes-support/opensc/opensc_0.26.1.bb
+++ b/meta-oe/recipes-support/opensc/opensc_0.27.1.bb
@@ -11,8 +11,8 @@ LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7"
 DEPENDS = "openssl"
-SRCREV = "043343d2df7b09d1938bc3dc313d86a96be457cc"
+SRCREV = "19868984dc4dc697af6a86d65ab32a1f19a43ea4"
-SRC_URI = "git://github.com/OpenSC/OpenSC;branch=0.26.1;protocol=https"
+SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https"
 CVE_STATUS[CVE-2024-8443] = "fixed-version: this is fixed since 0.26.0"
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb
index 85c521df87..af44864fa9 100644
--- a/meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb
@@ -50,6 +50,7 @@ EXTRA_OECONF = " \
    --disable-farstream \
    --disable-vv \
 "
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 # CONFIG_ARGS is used to display build info. Replace full paths by reproducible
 # variables ($S, $WORKDIR)
diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.1.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.2.bb
index 015c2287ef..1bdb4445e5 100644
--- a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.1.bb
+++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.2.bb
@@ -15,7 +15,7 @@ DEPENDS = "\
    p11-kit \
 "
-SRCREV = "acb7086e44849d019956233348046c4f07c0670b"
+SRCREV = "c7a5c8b62a0ff012b16574f01651254ef7e664ee"
 SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https"
diff --git a/meta-oe/recipes-support/poco/poco/0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch b/meta-oe/recipes-support/poco/poco/0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch
new file mode 100644
index 0000000000..293321bfa8
--- /dev/null
+++ b/meta-oe/recipes-support/poco/poco/0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch
@@ -0,0 +1,35 @@
+From dce2cc2886a9097971856e69737cc5c05c9239ea Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Wed, 8 Apr 2026 10:54:25 +0200
+Subject: [PATCH] quill: use soft rdtsc fallback on 32-bit PowerPC
+Quill's rdtsc helper already avoids __rdtsc() on ARM and PPC64, but
+32-bit PowerPC was not included in that guard. On powerpc targets this
+falls through to the x86-specific intrinsic and fails with:
+  error: '__rdtsc' was not declared in this scope
+Treat common 32-bit PowerPC compiler define the same way as PPC64 and
+use the existing steady_clock-based fallback.
+Upstream-Status: Submitted [https://github.com/odygrd/quill/pull/911]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ dependencies/quill/include/quill/core/Rdtsc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/dependencies/quill/include/quill/core/Rdtsc.h b/dependencies/quill/include/quill/core/Rdtsc.h
+index 3d0ae9f26..67f26cb89 100644
+--- a/dependencies/quill/include/quill/core/Rdtsc.h
+++ b/dependencies/quill/include/quill/core/Rdtsc.h
+@@ -95,7 +95,7 @@ QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept
+   __asm__ volatile("stck %0" : "=Q"(tsc) : : "cc");
+   return tsc;
+ }
+-#elif (defined(_M_ARM) || defined(_M_ARM64) || defined(__PPC64__))
+#elif (defined(_M_ARM) || defined(_M_ARM64) || defined(__PPC64__) || defined(__PPC__))
+ QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept
+ {
+   // soft failover
+-- 
+2.47.2
diff --git a/meta-oe/recipes-support/poco/poco_1.15.1.bb b/meta-oe/recipes-support/poco/poco_1.15.2.bb
index 7dd87606ef..5a873a1d85 100644
--- a/meta-oe/recipes-support/poco/poco_1.15.1.bb
+++ b/meta-oe/recipes-support/poco/poco_1.15.2.bb
@@ -11,9 +11,10 @@ DEPENDS = "libpcre2 utf8proc zlib"
 SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-${PV};protocol=https;tag=poco-${PV}-release \
           file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \
           file://0002-DataTest-disable-testSQLChannel-test.patch \
+           file://0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch \
           file://run-ptest \
           "
-SRCREV = "a1aacbba1bda4301db01bb1a2c2ab80677756b90"
+SRCREV = "afbb1ab68f29eec7079e2fdfa04b3efdbec6529d"
 UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)"
@@ -23,7 +24,7 @@ inherit cmake ptest
 # By default the most commonly used poco components are built
 # Foundation is built anyway and doesn't need to be listed explicitly
 # these don't have dependencies outside oe-core
-PACKAGECONFIG ??= "XML JSON PDF Util Net NetSSL Crypto JWT Data DataPostgreSQL DataSQLite DNSSDAvahi Zip Encodings Prometheus"
+PACKAGECONFIG ??= "XML JSON PDF Util Net NetSSL Crypto JWT Data DataPostgreSQL DataSQLite DNSSDAvahi Zip Encodings Prometheus FastLogger"
 # MongoDB does not build for all architectures yet keep in sync with COMPATIBLE_HOST list in mongodb recipe
 # and mongodb needs meta-python enabled as well
 PACKAGECONFIG:remove:riscv32 = "MongoDB"
@@ -48,6 +49,7 @@ PACKAGECONFIG[DNSSDAvahi] = "-DENABLE_DNSSD=ON -DENABLE_DNSSD_AVAHI=ON,-DENABLE_
 PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF"
 PACKAGECONFIG[Encodings] = "-DENABLE_ENCODINGS=ON,-DENABLE_ENCODINGS=OFF"
 PACKAGECONFIG[Prometheus] = "-DENABLE_PROMETHEUS=ON,-DENABLE_PROMETHEUS=OFF"
+PACKAGECONFIG[FastLogger] = "-DENABLE_FASTLOGGER=ON,-DENABLE_FASTLOGGER=OFF"
 # Additional components not build by default,
 # they might have dependencies not included in oe-core
@@ -74,11 +76,6 @@ EXTRA_OECMAKE:append:class-native = " -DPOCO_UNBUNDLED=OFF"
 # do not use rpath
 EXTRA_OECMAKE:append = " -DCMAKE_SKIP_RPATH=ON"
-LDFLAGS:append:riscv32 = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}"
-LDFLAGS:append:mips = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}"
-LDFLAGS:append:powerpc = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}"
-LDFLAGS:append:x86 = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}"
 python populate_packages:prepend () {
    poco_libdir = d.expand('${libdir}')
    pn = d.getVar("PN")
diff --git a/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd/0001-Fix-const-correctness-for-pointer-variables-to-refer.patch b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd/0001-Fix-const-correctness-for-pointer-variables-to-refer.patch
new file mode 100644
index 0000000000..190baff606
--- /dev/null
+++ b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd/0001-Fix-const-correctness-for-pointer-variables-to-refer.patch
@@ -0,0 +1,60 @@
+From 515e23b37ad1400bfb73797771c4f0fd78655328 Mon Sep 17 00:00:00 2001
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Wed, 15 Apr 2026 10:52:05 -0700
+Subject: [PATCH] Fix const-correctness for pointer variables to referred
+ strings
+Mark pointer variables 'e' as 'const char *' in
+config_parse_netlog_remote_address,file_in_same_dir, and
+socket_address_parse, since they point to memory they do not
+own or modify.
+Upstream-Status: Submitted [https://github.com/systemd/systemd-netlogd/pull/148]
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+ src/netlog/netlog-conf.c | 2 +-
+ src/share/path-util.c    | 3 ++-
+ src/share/socket-util.c  | 3 ++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+diff --git a/src/netlog/netlog-conf.c b/src/netlog/netlog-conf.c
+index a4cf0da..59bdd23 100644
+--- a/src/netlog/netlog-conf.c
+++ b/src/netlog/netlog-conf.c
+@@ -22,7 +22,7 @@ int config_parse_netlog_remote_address(const char *unit,
+                                        void *data,
+                                        void *userdata) {
+         Manager *m = userdata;
+-        char *e;
+        const char *e;
+         int r;
+         assert(filename);
+diff --git a/src/share/path-util.c b/src/share/path-util.c
+index dda7ec6..ad6f24a 100644
+--- a/src/share/path-util.c
+++ b/src/share/path-util.c
+@@ -327,7 +327,8 @@ bool path_is_safe(const char *p) {
+ }
+ char *file_in_same_dir(const char *path, const char *filename) {
+-        char *e, *ret;
+        const char *e;
+        char *ret;
+         size_t k;
+         assert(path);
+diff --git a/src/share/socket-util.c b/src/share/socket-util.c
+index ae33338..5a6284b 100644
+--- a/src/share/socket-util.c
+++ b/src/share/socket-util.c
+@@ -33,7 +33,8 @@
+ #include "util.h"
+ int socket_address_parse(SocketAddress *a, const char *s) {
+-        char *e, *n;
+        const char *e;
+        char *n;
+         unsigned u;
+         int r;
diff --git a/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.5.bb
index 019098fdf7..c52940ec70 100644
--- a/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb
+++ b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.5.bb
@@ -3,8 +3,10 @@ SUMMARY = "Forwards messages from the journal to other hosts over the network us
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI = "git://github.com/systemd/systemd-netlogd.git;protocol=https;branch=main"
+SRC_URI = "git://github.com/systemd/systemd-netlogd.git;protocol=https;branch=main;tag=v${PV} \
-SRCREV = "b03cc3b1a75048c7cf19467d8918a4b7320767e6"
+           file://0001-Fix-const-correctness-for-pointer-variables-to-refer.patch \
+                  "
+SRCREV = "20534091417686d1185acb3f29e93944d8663c4b"
 inherit meson systemd pkgconfig useradd features_check
diff --git a/meta-oe/recipes-support/tbb/tbb_2022.3.0.bb b/meta-oe/recipes-support/tbb/tbb_2022.3.0.bb
index 01115e7e4d..440b6e0f46 100644
--- a/meta-oe/recipes-support/tbb/tbb_2022.3.0.bb
+++ b/meta-oe/recipes-support/tbb/tbb_2022.3.0.bb
@@ -17,6 +17,7 @@ SRCREV = "f1862f38f83568d96e814e469ab61f88336cc595"
 SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \
          "
+LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-support/upower/upower_1.91.1.bb b/meta-oe/recipes-support/upower/upower_1.91.2.bb
index d4107a959a..d6505974e9 100644
--- a/meta-oe/recipes-support/upower/upower_1.91.1.bb
+++ b/meta-oe/recipes-support/upower/upower_1.91.2.bb
@@ -13,7 +13,7 @@ DEPENDS = " \
 "
 SRC_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/archive/v${PV}/${BPN}-v${PV}.tar.bz2"
-SRC_URI[sha256sum] = "d568638d670a63a1886335b7b136f4888cb38a3b28f3f4bcdeaffcca0b0f6df8"
+SRC_URI[sha256sum] = "f07f19b78a43a5053973d95a2fe96a12ede270b8db232b2e2c4ac4186fb42539"
 S = "${UNPACKDIR}/${BPN}-v${PV}"
 UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/tags"
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.50.5.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.50.6.bb
index e6007a6667..c3f736568f 100644
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.50.5.bb
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.50.6.bb
@@ -22,7 +22,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
           file://fix-ftbfs-riscv64.patch \
           file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \
           "
-SRC_URI[sha256sum] = "8737631bac3e9c7ad3e5208f9370e076c09d9c45b39980021ce54edadcc6f94f"
+SRC_URI[sha256sum] = "2b281abf8894ffc6172152e5660b75eeeedbe1cc43d6783d09dc79f7c865bb42"
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
@@ -31,7 +31,7 @@ S = "${UNPACKDIR}/webkitgtk-${PV}"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "opengl"
-CVE_PRODUCT = "webkitgtk webkitgtk\+"
+CVE_PRODUCT = "webkitgtk webkitgtk+"
 DEPENDS += " \
          ruby-native \
diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch
deleted file mode 100644
index 5ae21b5989..0000000000
--- a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy/99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 99f9b9f68664166badfdfaa7e69efcedf750f1e3 Mon Sep 17 00:00:00 2001
-From: Brahmajit Das <listout@listout.xyz>
-Date: Wed, 4 Mar 2026 06:27:54 +0530
-Subject: [PATCH] dbus-proxy: fix build with glibc >= 2.43
-memchr() returns const void * when passed const input, but the result
-was assigned to guchar *. This triggers
-Wincompatible-pointer-types-discards-qualifiers when building with
-clang and -Werror.
-Make the pointer const to preserve const correctness.
-Closes: https://github.com/flatpak/xdg-dbus-proxy/issues/70
-Signed-off-by: Brahmajit Das <listout@listout.xyz>
-Upstream-Status: Backport [https://github.com/flatpak/xdg-dbus-proxy/commit/99f9b9f68664166badfdfaa7e69efcedf750f1e3]
---
- dbus-proxy.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/dbus-proxy.c b/dbus-proxy.c
-index 53d5c01..b32df34 100644
--- a/dbus-proxy.c
-+++ b/dbus-proxy.c
-@@ -133,7 +133,7 @@ add_args (GBytes    *bytes,
- {
-   gsize data_len, remainder_len;
-   const guchar *data = g_bytes_get_data (bytes, &data_len);
-  guchar *s;
-+  const guchar *s;
-   const guchar *remainder;
- 
-   remainder = data;
diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.7.bb
index 617d29bd84..a8e0a651ad 100644
--- a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb
+++ b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.7.bb
@@ -12,12 +12,13 @@ DEPENDS = " \
 inherit meson pkgconfig ptest-gnome
 SRC_URI = " \
-    git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main \
+    git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main;tag=${PV} \
-    file://99f9b9f68664166badfdfaa7e69efcedf750f1e3.patch \
    file://run-ptest \
    "
-SRCREV = "1c1989e56f94b9eb3b7567f8a6e8a0aa16cba496"
+SRCREV = "6a170fa77e3cbecb48f9dd2478fe5c0a119eb467"
+CVE_STATUS[CVE-2026-34080] = "fixed-version: fixed in 0.1.7"
 PACKAGECONFIG = "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
 PACKAGECONFIG[tests] = "-Dtests=true -Dinstalled_tests=true,-Dtests=false -Dinstalled_tests=false"
diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.20.3.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.20.4.bb
index e0aca558fd..bb48b59dd8 100644
--- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.20.3.bb
+++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.20.4.bb
@@ -27,11 +27,17 @@ RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS} fuse3-utils"
 inherit meson pkgconfig python3native features_check
 SRC_URI = " \
-        git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=xdg-desktop-portal-1.20 \
+        git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=xdg-desktop-portal-1.20;name=main;tag=${PV} \
+        git://gitlab.gnome.org/GNOME/libglnx.git;protocol=https;branch=master;name=libglnx;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/subprojects/libglnx \
        file://0001-meson.build-add-a-hack-for-crosscompile.patch \
 "
-SRCREV = "23a76c392170dbbd26230f85ef56c3a57e52b857"
+SRCREV_main = "f5aec228c9eb0c9a70eadd6424d92c0ca8a78247"
+# this revision comes from subprojects/libglnx.wrap file of the main source repo
+SRCREV_libglnx = "ccea836b799256420788c463a638ded0636b1632"
+SRCREV_FORMAT = "main"
 FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1"
@@ -47,3 +53,5 @@ do_write_config:append() {
 bwrap = '${bindir}/bwrap'
 EOF
 }
+CVE_STATUS[CVE-2026-40354] = "fixed-version: fixed in 1.20.4"
diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.19.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.20.bb
index 2550d4cd59..3d122981ca 100644
--- a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.19.bb
+++ b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.20.bb
@@ -3,11 +3,11 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRC_URI = "http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "e92deb929c10d4b29329397af8a2585101247f7e6177ac6f1d28e82130ed8c19"
+SRC_URI[sha256sum] = "b8e34286278f4fef3e1bfe9685c395ccc0eb50c14d3a2fb4953dd00fbfd3af39"
-inherit autotools gettext pkgconfig
+inherit meson gettext pkgconfig
-EXTRA_OECONF = "--disable-documentation"
+EXTRA_OEMESON = "-Ddocs=false"
 CONFFILES:${PN} += " \
    ${sysconfdir}/xdg/user-dirs.conf \
diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.10.5.bb b/meta-oe/recipes-support/xrdp/xrdp_0.10.6.bb
index 8d7c5807f2..152b37cb37 100644
--- a/meta-oe/recipes-support/xrdp/xrdp_0.10.5.bb
+++ b/meta-oe/recipes-support/xrdp/xrdp_0.10.6.bb
@@ -17,7 +17,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN
           file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \
           file://0001-mark-count-with-unused-attribute.patch \
           "
-SRC_URI[sha256sum] = "9abc96d164de4b1c40e2f3f537d0593d052a640cf3388978c133715ea69fb123"
+SRC_URI[sha256sum] = "dfc21d5d603b642cf583987b36706b685bf05fd3aaaaacefb8f57c5f4a448677"
 UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases"
 UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
@@ -127,3 +127,12 @@ pkg_postinst:${PN}() {
                fi
        fi
 }
+CVE_STATUS[CVE-2026-32105] = "fixed-version: fixed in 0.10.6"
+CVE_STATUS[CVE-2026-32107] = "fixed-version: fixed in 0.10.6"
+CVE_STATUS[CVE-2026-32623] = "fixed-version: fixed in 0.10.6"
+CVE_STATUS[CVE-2026-32624] = "fixed-version: fixed in 0.10.6"
+CVE_STATUS[CVE-2026-33145] = "fixed-version: fixed in 0.10.6"
+CVE_STATUS[CVE-2026-33516] = "fixed-version: fixed in 0.10.6"
+CVE_STATUS[CVE-2026-33689] = "fixed-version: fixed in 0.10.6"
+CVE_STATUS[CVE-2026-35512] = "fixed-version: fixed in 0.10.6"
diff --git a/meta-oe/recipes-test/catch2/catch2_3.13.0.bb b/meta-oe/recipes-test/catch2/catch2_3.14.0.bb
index c5d85ba302..2aba52e7ae 100644
--- a/meta-oe/recipes-test/catch2/catch2_3.13.0.bb
+++ b/meta-oe/recipes-test/catch2/catch2_3.14.0.bb
@@ -5,7 +5,7 @@ LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https;tag=v${PV}"
-SRCREV = "29c9844f688acb27c87338c39cd186ebfe41aa19"
+SRCREV = "b670de4fe12ac7c5e858b7de3a14fb4bd18c760e"
 inherit cmake python3native
diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index 2ff88e6264..65f23cfe9e 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -300,7 +300,7 @@ RDEPENDS:packagegroup-meta-python3 = "\
    python3-py-ubjson \
    python3-pyalsaaudio \
    python3-pyasn1-modules \
-    python3-pyatspi \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data ${GTK2DISTROFEATURES}", "python3-pyatspi", "", d)} \
    python3-pyaudio \
    python3-pybind11 \
    python3-pybind11-json \
diff --git a/meta-python/recipes-devtools/python/python3-aiofiles_24.1.0.bb b/meta-python/recipes-devtools/python/python3-aiofiles_25.1.0.bb
index 1e9ebdf97d..26cc9e81f3 100644
--- a/meta-python/recipes-devtools/python/python3-aiofiles_24.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-aiofiles_25.1.0.bb
@@ -4,12 +4,16 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
-SRC_URI[sha256sum] = "22a075c9e5a3810f0c2e48f3008c94d68c65d763b9b03857924c99e57355166c"
+SRC_URI[sha256sum] = "a8d728f0a29de45dc521f18f07297428d56992a742f0cd2701ba86e44d23d5b2"
 PYPI_PACKAGE = "aiofiles"
 inherit pypi python_hatchling
+DEPENDS += "\
+    python3-hatch-vcs-native \
+"
 RDEPENDS:${PN} = "\
    python3-asyncio \
 "
diff --git a/meta-python/recipes-devtools/python/python3-aiohttp_3.13.4.bb b/meta-python/recipes-devtools/python/python3-aiohttp_3.13.5.bb
index 7416b87347..f3a0fbf557 100644
--- a/meta-python/recipes-devtools/python/python3-aiohttp_3.13.4.bb
+++ b/meta-python/recipes-devtools/python/python3-aiohttp_3.13.5.bb
@@ -4,9 +4,14 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=748073912af33aa59430d3702aa32d41"
-SRC_URI[sha256sum] = "d97a6d09c66087890c2ab5d49069e1e570583f7ac0314ecf98294c1b6aaebd38"
+SRC_URI[sha256sum] = "9d98cc980ecc96be6eb4c1994ce35d28d8b1f5e5208a23b421187d1209dbb7d1"
 CVE_PRODUCT = "aiohttp"
+CVE_STATUS_GROUPS = "CVE_AIOHTTP_FIX_3_13_4"
+CVE_AIOHTTP_FIX_3_13_4[status] = "fixed-version: fixed in 3.13.4"
+CVE_AIOHTTP_FIX_3_13_4 = "CVE-2026-22815 CVE-2026-34513 CVE-2026-34514 \
+CVE-2026-34515 CVE-2026-34516 CVE-2026-34517 CVE-2026-34518 CVE-2026-34519 \
+CVE-2026-34520 CVE-2026-34525"
 inherit python_setuptools_build_meta pypi 
diff --git a/meta-python/recipes-devtools/python/python3-asyncinotify_4.4.0.bb b/meta-python/recipes-devtools/python/python3-asyncinotify_4.4.2.bb
index 115e88cedf..bdda38734d 100644
--- a/meta-python/recipes-devtools/python/python3-asyncinotify_4.4.0.bb
+++ b/meta-python/recipes-devtools/python/python3-asyncinotify_4.4.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://gitlab.com/Taywee/asyncinotify"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f75d2927d3c1ed2414ef72048f5ad640"
-SRC_URI[sha256sum] = "438bdc0715f4f959e6e0af70e76cea198b4e28e5933c7cbf1e9987b50394afb3"
+SRC_URI[sha256sum] = "52ad97aa5332dd78592ab9c64171f2953447d98f9170b9bd440c5d19b17d0416"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-bitarray_3.8.0.bb b/meta-python/recipes-devtools/python/python3-bitarray_3.8.1.bb
index 4cacd79522..6ef0f4202a 100644
--- a/meta-python/recipes-devtools/python/python3-bitarray_3.8.0.bb
+++ b/meta-python/recipes-devtools/python/python3-bitarray_3.8.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray"
 LICENSE = "PSF-2.0"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=6abe80c028e4ee53045a33ae807c64fd"
-SRC_URI[sha256sum] = "3eae38daffd77c9621ae80c16932eea3fb3a4af141fb7cc724d4ad93eff9210d"
+SRC_URI[sha256sum] = "f90bb3c680804ec9630bcf8c0965e54b4de84d33b17d7da57c87c30f0c64c6f5"
 inherit python_setuptools_build_meta pypi
diff --git a/meta-python/recipes-devtools/python/python3-charset-normalizer/0001-pyprojects-Bump-setuptools-check-to-be-82.x.patch b/meta-python/recipes-devtools/python/python3-charset-normalizer/0001-pyprojects-Bump-setuptools-check-to-be-82.x.patch
deleted file mode 100644
index 571333e44e..0000000000
--- a/meta-python/recipes-devtools/python/python3-charset-normalizer/0001-pyprojects-Bump-setuptools-check-to-be-82.x.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 17bc1de2c08f9303886d654572b1ba64259a8a68 Mon Sep 17 00:00:00 2001
-From: Khem Raj <khem.raj@oss.qualcomm.com>
-Date: Fri, 20 Mar 2026 15:06:51 -0700
-Subject: [PATCH] pyprojects: Bump setuptools check to be <= 82.x
-This ensures build with 82.0.1 goes on
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
- pyproject.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/pyproject.toml b/pyproject.toml
-index ea1c514..bbc83b7 100644
--- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,5 +1,5 @@
- [build-system]
-requires = ["setuptools>=68,<=82.0.0"]
-+requires = ["setuptools>=68,<=83.0.0"]
- build-backend = "backend"
- backend-path = ["_mypyc_hook"]
- 
diff --git a/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.6.bb b/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.7.bb
index e6056a3512..b9dffb21e4 100644
--- a/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.6.bb
+++ b/meta-python/recipes-devtools/python/python3-charset-normalizer_3.4.7.bb
@@ -3,9 +3,7 @@ HOMEPAGE = "https://github.com/ousret/charset_normalizer"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=48178f3fc1374ad7e830412f812bde05"
-SRC_URI += "file://0001-pyprojects-Bump-setuptools-check-to-be-82.x.patch"
+SRC_URI[sha256sum] = "ae89db9e5f98a11a4bf50407d4363e7b09b31e55bc117b4f7d80aab97ba009e5"
-SRC_URI[sha256sum] = "1ae6b62897110aa7c79ea2f5dd38d1abca6db663687c0b1ad9aed6f6bae3d9d6"
 DEPENDS += "python3-setuptools-scm-native python3-mypy-native"
diff --git a/meta-python/recipes-devtools/python/python3-ckzg/python-ckzg-0001-Let-override-CC.patch b/meta-python/recipes-devtools/python/python3-ckzg/python-ckzg-0001-Let-override-CC.patch
deleted file mode 100644
index c58089cc15..0000000000
--- a/meta-python/recipes-devtools/python/python3-ckzg/python-ckzg-0001-Let-override-CC.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 6 Nov 2024 16:35:23 +0300
-Subject: [PATCH] Let override CC
-Upstream-Status: Pending
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-diff --git a/src/Makefile b/src/Makefile
-index b733a11..c688005 100644
--- a/src/Makefile
-+++ b/src/Makefile
-@@ -79,7 +79,7 @@ ifeq ($(PLATFORM),Windows)
-        CFLAGS += -D_CRT_SECURE_NO_WARNINGS
-        CFLAGS += -Wno-missing-braces -Wno-format
- else
-       CC = clang
-+       CC ?= clang
-        CFLAGS += -fPIC
-        CFLAGS += -Wmissing-braces -Wformat=2
- endif
diff --git a/meta-python/recipes-devtools/python/python3-ckzg/python-ckzg-0002-Disable-Werror.patch b/meta-python/recipes-devtools/python/python3-ckzg/python-ckzg-0002-Disable-Werror.patch
deleted file mode 100644
index 9b0baa358a..0000000000
--- a/meta-python/recipes-devtools/python/python3-ckzg/python-ckzg-0002-Disable-Werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: rpm-build <rpm-build>
-Date: Tue, 26 Nov 2024 11:13:18 +0100
-Subject: [PATCH] Disable Werror
-Upstream-Status: Pending
-Signed-off-by: rpm-build <rpm-build>
-diff --git a/src/Makefile b/src/Makefile
-index c688005..01b7a80 100644
--- a/src/Makefile
-+++ b/src/Makefile
-@@ -20,7 +20,7 @@ ifeq ($(PLATFORM),Darwin)
- endif
- 
- # The base compiler flags. More can be added on command line.
-CFLAGS += -I. -I../inc -O2 -Werror
-+CFLAGS += -I. -I../inc
- # Enable a bunch of optional warnings.
- CFLAGS += \
-        -pedantic \
-@@ -81,7 +81,7 @@ ifeq ($(PLATFORM),Windows)
- else
-        CC ?= clang
-        CFLAGS += -fPIC
-       CFLAGS += -Wmissing-braces -Wformat=2
-+       CFLAGS += -Wmissing-braces
- endif
- 
- # Settings for blst.
diff --git a/meta-python/recipes-devtools/python/python3-ckzg_2.1.1.bb b/meta-python/recipes-devtools/python/python3-ckzg_2.1.7.bb
index 5a6196bf75..b01bd2d78d 100644
--- a/meta-python/recipes-devtools/python/python3-ckzg_2.1.1.bb
+++ b/meta-python/recipes-devtools/python/python3-ckzg_2.1.7.bb
@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 SRC_URI += " \
        file://blst-0001-Support-64-bit-limbs-on-no-asm-platforms.patch \
-        file://python-ckzg-0001-Let-override-CC.patch \
-        file://python-ckzg-0002-Disable-Werror.patch \
 "
-SRC_URI[sha256sum] = "d6b306b7ec93a24e4346aa53d07f7f75053bc0afc7398e35fa649e5f9d48fcc4"
+SRC_URI[sha256sum] = "a0c61c5fd573af0267bcb435ef0f499911289ceb05e863480779ea284a3bb928"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-cmake_4.3.0.bb b/meta-python/recipes-devtools/python/python3-cmake_4.3.1.bb
index b9eb56891d..5787b73d98 100644
--- a/meta-python/recipes-devtools/python/python3-cmake_4.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-cmake_4.3.1.bb
@@ -11,7 +11,7 @@ PYPI_PACKAGE = "cmake"
 PYPI_ARCHIVE_NAME_PREFIX = "pypi-"
 inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "b25ef14e4ebc16219eeb199da2199fc526c011f9973e02e7c21c69bfd46ed752"
+SRC_URI[sha256sum] = "6fe523413cdd2568a19a6ec297b8f869a95a3f8edaf0dd73731b81412216e00e"
 SRC_URI += " \
        file://CMakeLists.txt \
diff --git a/meta-python/recipes-devtools/python/python3-configargparse_1.7.3.bb b/meta-python/recipes-devtools/python/python3-configargparse_1.7.5.bb
index 6715abab3a..49df56d75b 100644
--- a/meta-python/recipes-devtools/python/python3-configargparse_1.7.3.bb
+++ b/meta-python/recipes-devtools/python/python3-configargparse_1.7.5.bb
@@ -3,12 +3,14 @@ HOMEPAGE = "https://github.com/bw2/ConfigArgParse"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943"
-SRC_URI[sha256sum] = "76dd1a51145fb7ca82621ee08cd38ec0c6316fe27a38b9137b75667d1116399e"
+SRC_URI[sha256sum] = "e3f9a7bb6be34d66b2e3c4a2f58e3045f8dfae47b0dc039f87bcfaa0f193fb0f"
 PYPI_PACKAGE = "configargparse"
 UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
+DEPENDS += "python3-setuptools-scm-native"
 PACKAGECONFIG ?= "yaml"
 PACKAGECONFIG[yaml] = ",,,python3-pyyaml"
diff --git a/meta-python/recipes-devtools/python/python3-croniter_6.0.0.bb b/meta-python/recipes-devtools/python/python3-croniter_6.2.2.bb
index 201074e1e3..d217161d7d 100644
--- a/meta-python/recipes-devtools/python/python3-croniter_6.0.0.bb
+++ b/meta-python/recipes-devtools/python/python3-croniter_6.2.2.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b8ee59850b882cbf623188489ea748e2"
 PYPI_PACKAGE = "croniter"
-SRC_URI[sha256sum] = "37c504b313956114a983ece2c2b07790b1f1094fe9d81cc94739214748255577"
+SRC_URI[sha256sum] = "ba60832a5ec8e12e51b8691c3309a113d1cf6526bdf1a48150ce8ec7a532d0ab"
-inherit pypi setuptools3
+inherit pypi python_hatchling
 RDEPENDS:${PN} += " \
        python3-dateutil \
diff --git a/meta-python/recipes-devtools/python/python3-cucumber-tag-expressions_6.2.0.bb b/meta-python/recipes-devtools/python/python3-cucumber-tag-expressions_9.1.0.bb
index 6ddc489f8a..add7031f1e 100644
--- a/meta-python/recipes-devtools/python/python3-cucumber-tag-expressions_6.2.0.bb
+++ b/meta-python/recipes-devtools/python/python3-cucumber-tag-expressions_9.1.0.bb
@@ -2,9 +2,9 @@ SUMMARY = "Cucumber tag expression parser"
 DESCRIPTION = "Provides a tag-expression parser and evaluation logic for cucumber/behave"
 HOMEPAGE = "https://github.com/cucumber/tag-expressions"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489"
+LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=134f1026f0de92fd30e71976590a2868"
-SRC_URI[sha256sum] = "b60aa2cdbf9ac43e28d9b0e4fd49edf9f09d5d941257d2912f5228f9d166c023"
+SRC_URI[sha256sum] = "d960383d5885300ebcbcb14e41657946fde2a59d5c0f485eb291bc6a0e228acc"
 inherit pypi python_setuptools_build_meta
@@ -12,4 +12,5 @@ PYPI_PACKAGE = "cucumber_tag_expressions"
 DEPENDS += "\
    python3-setuptools-scm-native \
+    python3-uv-build-native \
 "
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.12.bb b/meta-python/recipes-devtools/python/python3-django_5.2.13.bb
index 13166d4c53..fcf50e939d 100644
--- a/meta-python/recipes-devtools/python/python3-django_5.2.12.bb
+++ b/meta-python/recipes-devtools/python/python3-django_5.2.13.bb
@@ -2,4 +2,4 @@ require python3-django.inc
 inherit python_setuptools_build_meta
 SRC_URI += "file://0001-fix-test_msgfmt_error_including_non_ascii-test.patch"
-SRC_URI[sha256sum] = "6b809af7165c73eff5ce1c87fdae75d4da6520d6667f86401ecf55b681eb1eeb"
+SRC_URI[sha256sum] = "a31589db5188d074c63f0945c3888fad104627dfcc236fb2b97f71f89da33bc4"
diff --git a/meta-python/recipes-devtools/python/python3-django_6.0.3.bb b/meta-python/recipes-devtools/python/python3-django_6.0.4.bb
index b3aec8870a..378b760f2c 100644
--- a/meta-python/recipes-devtools/python/python3-django_6.0.3.bb
+++ b/meta-python/recipes-devtools/python/python3-django_6.0.4.bb
@@ -1,7 +1,7 @@
 require python3-django.inc
 inherit python_setuptools_build_meta
-SRC_URI[sha256sum] = "90be765ee756af8a6cbd6693e56452404b5ad15294f4d5e40c0a55a0f4870fe1"
+SRC_URI[sha256sum] = "8cfa2572b3f2768b2e84983cf3c4811877a01edb64e817986ec5d60751c113ac"
 # Set DEFAULT_PREFERENCE so that the LTS version of django is built by
 # default. To build the 6.x branch,
diff --git a/meta-python/recipes-devtools/python/python3-djangorestframework_3.16.1.bb b/meta-python/recipes-devtools/python/python3-djangorestframework_3.17.1.bb
index bcd079f328..42edd15156 100644
--- a/meta-python/recipes-devtools/python/python3-djangorestframework_3.16.1.bb
+++ b/meta-python/recipes-devtools/python/python3-djangorestframework_3.17.1.bb
@@ -5,11 +5,11 @@ HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1"
-SRC_URI[sha256sum] = "166809528b1aced0a17dc66c24492af18049f2c9420dbd0be29422029cfc3ff7"
+SRC_URI[sha256sum] = "a6def5f447fe78ff853bff1d47a3c59bf38f5434b031780b351b0c73a62db1a5"
 PYPI_PACKAGE = "djangorestframework"
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
 RDEPENDS:${PN} += "\
    python3-django \
diff --git a/meta-python/recipes-devtools/python/python3-eventlet_0.40.4.bb b/meta-python/recipes-devtools/python/python3-eventlet_0.41.0.bb
index 213460dc70..3c27caf968 100644
--- a/meta-python/recipes-devtools/python/python3-eventlet_0.40.4.bb
+++ b/meta-python/recipes-devtools/python/python3-eventlet_0.41.0.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778"
 SRC_URI += "file://d19ad6cc086684ee74db250f5fd35227c98e678a.patch"
-SRC_URI[sha256sum] = "69bef712b1be18b4930df6f0c495d2a882bf7b63aa111e7b6eeff461cfcaf26f"
+SRC_URI[sha256sum] = "35df85f0ccd3e73effb6fd9f1ceae46b500b966c7da1817289c323a307bd397b"
 CVE_PRODUCT = "eventlet"
diff --git a/meta-python/recipes-devtools/python/python3-faker_40.12.0.bb b/meta-python/recipes-devtools/python/python3-faker_40.13.0.bb
index 2f3ec72c02..97f0e6e8f6 100644
--- a/meta-python/recipes-devtools/python/python3-faker_40.12.0.bb
+++ b/meta-python/recipes-devtools/python/python3-faker_40.13.0.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/joke2k/faker"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=53360c4126f7d03b63cb79b0dab9e9e1"
-SRC_URI[sha256sum] = "58b5a9054c367bd5fb2e948634105364cc570e78a98a8e5161a74691c45f158f"
+SRC_URI[sha256sum] = "a0751c84c3abac17327d7bb4c98e8afe70ebf7821e01dd7d0b15cd8856415525"
 inherit pypi setuptools3 ptest-python-pytest
diff --git a/meta-python/recipes-devtools/python/python3-fastapi_0.135.2.bb b/meta-python/recipes-devtools/python/python3-fastapi_0.135.3.bb
index a8ace95347..a4bdb19bbf 100644
--- a/meta-python/recipes-devtools/python/python3-fastapi_0.135.2.bb
+++ b/meta-python/recipes-devtools/python/python3-fastapi_0.135.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://fastapi.tiangolo.com/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=95792ff3fe8e11aa49ceb247e66e4810"
-SRC_URI[sha256sum] = "88a832095359755527b7f63bb4c6bc9edb8329a026189eed83d6c1afcf419d56"
+SRC_URI[sha256sum] = "bd6d7caf1a2bdd8d676843cdcd2287729572a1ef524fc4d65c17ae002a1be654"
 SRC_URI += "file://run-ptest"
diff --git a/meta-python/recipes-devtools/python/python3-gevent_25.9.1.bb b/meta-python/recipes-devtools/python/python3-gevent_26.4.0.bb
index 51861f24c7..c29b55d25d 100644
--- a/meta-python/recipes-devtools/python/python3-gevent_25.9.1.bb
+++ b/meta-python/recipes-devtools/python/python3-gevent_26.4.0.bb
@@ -15,7 +15,7 @@ RDEPENDS:${PN} = "python3-greenlet \
 SRC_URI += "file://0001-_setuputils.py-Do-not-add-sys_inc_dir.patch"
-SRC_URI[sha256sum] = "adf9cd552de44a4e6754c51ff2e78d9193b7fa6eab123db9578a210e657235dd"
+SRC_URI[sha256sum] = "288d03addfccf0d1c67268358b6759b04392bf3bc35d26f3d9a45c82899c292d"
 CVE_PRODUCT = "gevent"
diff --git a/meta-python/recipes-devtools/python/python3-git-pw_2.7.1.bb b/meta-python/recipes-devtools/python/python3-git-pw_2.8.0.bb
index 6308732f49..4cb8621ad8 100644
--- a/meta-python/recipes-devtools/python/python3-git-pw_2.7.1.bb
+++ b/meta-python/recipes-devtools/python/python3-git-pw_2.8.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/getpatchwork/git-pw"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=26e1a171d943c64f00c51f90c256b9d4"
-SRC_URI[sha256sum] = "f69c57aafd13d21d6fa604dff680c4f9113a8f31bf3f65dd663bad0e1839b0e1"
+SRC_URI[sha256sum] = "212743923badb38b9da658b0df0b9f3770997684a9e787d489eed5d103e96100"
 PYPI_PACKAGE = "git_pw"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-google-auth-oauthlib_1.3.0.bb b/meta-python/recipes-devtools/python/python3-google-auth-oauthlib_1.3.1.bb
index 0eed90090c..7f9435d475 100644
--- a/meta-python/recipes-devtools/python/python3-google-auth-oauthlib_1.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-google-auth-oauthlib_1.3.1.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI += "file://0001-python3-google-auth-oauthlib-Skip-failing-3PI-creden.patch"
-SRC_URI[sha256sum] = "cd39e807ac7229d6b8b9c1e297321d36fcc8a9e4857dff4301870985df51a528"
+SRC_URI[sha256sum] = "14c22c7b3dd3d06dbe44264144409039465effdd1eef94f7ce3710e486cc4bfa"
 inherit pypi setuptools3 ptest
 PYPI_PACKAGE = "google_auth_oauthlib"
diff --git a/meta-python/recipes-devtools/python/python3-google-auth_2.48.0.bb b/meta-python/recipes-devtools/python/python3-google-auth_2.49.2.bb
index 4e48c62861..fc6df70f45 100644
--- a/meta-python/recipes-devtools/python/python3-google-auth_2.48.0.bb
+++ b/meta-python/recipes-devtools/python/python3-google-auth_2.49.2.bb
@@ -9,7 +9,7 @@ SRC_URI += " \
        file://0001-python3-google-auth-Skip-mTLS-tests-in-ptest-environ.patch \
        file://run-ptest \
 "
-SRC_URI[sha256sum] = "4f7e706b0cd3208a3d940a19a822c37a476ddba5450156c3e6624a71f7c841ce"
+SRC_URI[sha256sum] = "c1ae38500e73065dcae57355adb6278cf8b5c8e391994ae9cbadbcb9631ab409"
 PYPI_PACKAGE = "google_auth"
 UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
diff --git a/meta-python/recipes-devtools/python/python3-gpiod_2.4.1.bb b/meta-python/recipes-devtools/python/python3-gpiod_2.4.2.bb
index 61a3fb929e..87765c2482 100644
--- a/meta-python/recipes-devtools/python/python3-gpiod_2.4.1.bb
+++ b/meta-python/recipes-devtools/python/python3-gpiod_2.4.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4b54a1fd55a448865a0b32d41598759d"
 SRC_URI += "file://run-ptest"
-SRC_URI[sha256sum] = "d29a1e8b2a065f7ed82f00a96009bc1486fc705bb2ad25820a8ae962ec6d7688"
+SRC_URI[sha256sum] = "602aae17ff365bb8e2a30ce65c6bbf2d8e7a7e64bf016e82e4fd4c730ef69ab7"
 inherit python_setuptools_build_meta python_pep517 ptest pypi
diff --git a/meta-python/recipes-devtools/python/python3-greenlet_3.3.2.bb b/meta-python/recipes-devtools/python/python3-greenlet_3.4.0.bb
index 21d6d620cb..728c2b7940 100644
--- a/meta-python/recipes-devtools/python/python3-greenlet_3.3.2.bb
+++ b/meta-python/recipes-devtools/python/python3-greenlet_3.4.0.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT & PSF-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \
                    file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a"
-SRC_URI[sha256sum] = "2eaf067fc6d886931c7962e8c6bede15d2f01965560f3359b27c80bde2d151f2"
+SRC_URI[sha256sum] = "f50a96b64dafd6169e595a5c56c9146ef80333e67d4476a65a9c55f400fc22ff"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.78.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.78.0.bb
index 6ac6a72d25..d9ec337427 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio_1.78.0.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio_1.78.0.bb
@@ -50,3 +50,4 @@ BBCLASSEXTEND = "native nativesdk"
 CCACHE_DISABLE = "1"
 CVE_PRODUCT += "grpc:grpc"
+CVE_STATUS[CVE-2026-33186] = "cpe-incorrect: the vulnerabilty affects only the go implementation"
diff --git a/meta-python/recipes-devtools/python/python3-huey_2.6.0.bb b/meta-python/recipes-devtools/python/python3-huey_3.0.0.bb
index 2821262153..f07383ed45 100644
--- a/meta-python/recipes-devtools/python/python3-huey_2.6.0.bb
+++ b/meta-python/recipes-devtools/python/python3-huey_3.0.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4"
 PYPI_PACKAGE = "huey"
-SRC_URI[sha256sum] = "8d11f8688999d65266af1425b831f6e3773e99415027177b8734b0ffd5e251f6"
+SRC_URI[sha256sum] = "0cfc83617b90132b0d375a3a3726aa7263cd461e7ae12af79b3a94e2630afaf5"
 RDEPENDS:${PN} += " \
        python3-datetime \
diff --git a/meta-python/recipes-devtools/python/python3-icecream_2.1.10.bb b/meta-python/recipes-devtools/python/python3-icecream_2.2.0.bb
index 68728caf9b..e307311834 100644
--- a/meta-python/recipes-devtools/python/python3-icecream_2.1.10.bb
+++ b/meta-python/recipes-devtools/python/python3-icecream_2.2.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gruns/icecream"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eca5ce1610d64ed40920efdce85ff8d1"
-SRC_URI[sha256sum] = "15900126ba7dbe1f83819583cbe5ff79a2943224600878d89307e4633b32e528"
+SRC_URI[sha256sum] = "9d7f244187f00a13f4ac77d176990e187e9c279d6cac4f7548e338291ad97343"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-icu_2.16.2.bb b/meta-python/recipes-devtools/python/python3-icu_2.16.2.bb
index bfc37c2763..ca7cca4457 100644
--- a/meta-python/recipes-devtools/python/python3-icu_2.16.2.bb
+++ b/meta-python/recipes-devtools/python/python3-icu_2.16.2.bb
@@ -18,3 +18,5 @@ inherit pkgconfig pypi python_setuptools_build_meta
 # it's lowercase pyicu instead of ${PYPI_PACKAGE} in this version
 S = "${UNPACKDIR}/pyicu-${PV}"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-imgtool_2.3.0.bb b/meta-python/recipes-devtools/python/python3-imgtool_2.4.0.bb
index ed647143cc..6b88fc0535 100644
--- a/meta-python/recipes-devtools/python/python3-imgtool_2.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-imgtool_2.4.0.bb
@@ -3,7 +3,7 @@ SUMMARY = "MCUboot's image signing and key management tool"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://imgtool/main.py;beginline=3;endline=18;md5=0645fb61e2f961a110302fbfdb227446"
-SRC_URI[sha256sum] = "fff72e4e793ac0ec02a493c19548715ccc0a2358afaeeaa10b49ccc2e0bd1295"
+SRC_URI[sha256sum] = "ef2db1d9e3f62b9bc9425a8e86c4ea7212c164f0a16e923d55250f0d8743342e"
 inherit pypi setuptools3
diff --git a/meta-python/recipes-devtools/python/python3-inline-snapshot_0.32.5.bb b/meta-python/recipes-devtools/python/python3-inline-snapshot_0.32.6.bb
index 32b8d15249..1bcd3a457f 100644
--- a/meta-python/recipes-devtools/python/python3-inline-snapshot_0.32.5.bb
+++ b/meta-python/recipes-devtools/python/python3-inline-snapshot_0.32.6.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7a35eb90dfdf03953dd2074d0fdba1d4"
 DEPENDS = "python3-hatchling-native"
-SRC_URI[sha256sum] = "5025074eab5c82a88504975e2655beeb5e96fd57ed2d9ebb38538473748f2065"
+SRC_URI[sha256sum] = "224a96eeb86c4b2831d274239d3468dc0b7819264f608f595b2f9d01f79a6e38"
 inherit pypi python_hatchling
diff --git a/meta-python/recipes-devtools/python/python3-legacy-cgi_2.6.2.bb b/meta-python/recipes-devtools/python/python3-legacy-cgi_2.6.4.bb
index 2b2840ae14..85328ed951 100644
--- a/meta-python/recipes-devtools/python/python3-legacy-cgi_2.6.2.bb
+++ b/meta-python/recipes-devtools/python/python3-legacy-cgi_2.6.4.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4b8801e752a2c70ac41a5f9aa243f766"
 PYPI_PACKAGE = "legacy_cgi"
-inherit python_poetry_core pypi
+inherit python_poetry_core pypi python_hatchling
 SRC_URI += "\
    file://0001-cgi.py-fixup-interpreter-according-to-OE.patch \
@@ -15,8 +15,13 @@ DEPENDS += "\
    ${PYTHON_PN}-setuptools-scm-native \
 "
+# Add this function to solve package QA Issue
+do_install:append() {
+        rm ${D}${PYTHON_SITEPACKAGES_DIR}/.pc -rf
+}
 #RDEPENDS:${PN} = "python3-core"
 BBCLASSEXTEND = "native nativesdk"
-SRC_URI[sha256sum] = "9952471ceb304043b104c22d00b4f333cac27a6abe446d8a528fc437cf13c85f"
+SRC_URI[sha256sum] = "abb9dfc7835772f7c9317977c63253fd22a7484b5c9bbcdca60a29dcce97c577"
diff --git a/meta-python/recipes-devtools/python/python3-marshmallow_4.2.3.bb b/meta-python/recipes-devtools/python/python3-marshmallow_4.3.0.bb
index d41ec8f6de..169726e527 100644
--- a/meta-python/recipes-devtools/python/python3-marshmallow_4.2.3.bb
+++ b/meta-python/recipes-devtools/python/python3-marshmallow_4.3.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "\
                    file://LICENSE;md5=27586b20700d7544c06933afe56f7df4 \
                    file://docs/license.rst;md5=13da439ad060419fb7cf364523017cfb"
-SRC_URI[sha256sum] = "3e3fef6b3603721a25a723b8caedfa488369bddaf9bc03b40b9442c90aebd22b"
+SRC_URI[sha256sum] = "fb43c53b3fe240b8f6af37223d6ef1636f927ad9bea8ab323afad95dff090880"
 CVE_PRODUCT = "marshmallow"
diff --git a/meta-python/recipes-devtools/python/python3-moteus_0.3.99.bb b/meta-python/recipes-devtools/python/python3-moteus_0.3.100.bb
index 3de7f6a0ec..fe12809d78 100644
--- a/meta-python/recipes-devtools/python/python3-moteus_0.3.99.bb
+++ b/meta-python/recipes-devtools/python/python3-moteus_0.3.100.bb
@@ -1,11 +1,11 @@
 SUMMARY = "moteus brushless controller library and tools"
 HOMEPAGE = "https://github.com/mjbots/moteus"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=9;md5=24025d3c660abfc62a83f0e709a45e76"
+LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=c2d9643b4523fdf462545aeb1356ad23"
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "30d3cafa6b23692536102f52d9a7d919f2775fa75bdee087f98782c7e3c88805"
+SRC_URI[sha256sum] = "cab1bdcffc18b83ebb52066b1bffe6de7c1354b163b3bd63e430b4fa04fbc6b9"
 S = "${UNPACKDIR}/moteus-${PV}"
diff --git a/meta-python/recipes-devtools/python/python3-orjson-crates.inc b/meta-python/recipes-devtools/python/python3-orjson-crates.inc
index 5e3aa8592b..3feff8d77d 100644
--- a/meta-python/recipes-devtools/python/python3-orjson-crates.inc
+++ b/meta-python/recipes-devtools/python/python3-orjson-crates.inc
@@ -2,87 +2,75 @@
 # from Cargo.lock
 SRC_URI += " \
-    crate://crates.io/associative-cache/2.0.0 \
+    crate://crates.io/associative-cache/3.0.0 \
    crate://crates.io/bytecount/0.6.9 \
-    crate://crates.io/bytes/1.11.0 \
+    crate://crates.io/bytes/1.11.1 \
-    crate://crates.io/cc/1.2.55 \
+    crate://crates.io/cc/1.2.58 \
    crate://crates.io/cfg-if/1.0.4 \
-    crate://crates.io/crunchy/0.2.4 \
    crate://crates.io/encoding_rs/0.8.35 \
    crate://crates.io/find-msvc-tools/0.1.9 \
    crate://crates.io/gimli/0.32.3 \
-    crate://crates.io/half/2.7.1 \
+    crate://crates.io/itoa/1.0.18 \
-    crate://crates.io/itoa/1.0.17 \
    crate://crates.io/itoap/1.0.1 \
-    crate://crates.io/jiff/0.2.18 \
+    crate://crates.io/jiff/0.2.23 \
-    crate://crates.io/jiff-static/0.2.18 \
+    crate://crates.io/jiff-static/0.2.23 \
-    crate://crates.io/libc/0.2.180 \
+    crate://crates.io/libc/0.2.183 \
-    crate://crates.io/memchr/2.7.6 \
+    crate://crates.io/memchr/2.8.0 \
    crate://crates.io/no-panic/0.1.36 \
-    crate://crates.io/once_cell/1.21.3 \
+    crate://crates.io/once_cell/1.21.4 \
    crate://crates.io/portable-atomic/1.13.1 \
-    crate://crates.io/portable-atomic-util/0.2.5 \
+    crate://crates.io/portable-atomic-util/0.2.6 \
    crate://crates.io/proc-macro2/1.0.106 \
-    crate://crates.io/pyo3-build-config/0.28.0 \
+    crate://crates.io/pyo3-build-config/0.28.2 \
-    crate://crates.io/pyo3-ffi/0.28.0 \
+    crate://crates.io/pyo3-ffi/0.28.2 \
-    crate://crates.io/quote/1.0.44 \
+    crate://crates.io/quote/1.0.45 \
    crate://crates.io/serde/1.0.228 \
    crate://crates.io/serde_core/1.0.228 \
    crate://crates.io/serde_derive/1.0.228 \
    crate://crates.io/serde_json/1.0.149 \
    crate://crates.io/shlex/1.3.0 \
    crate://crates.io/simdutf8/0.1.5 \
-    crate://crates.io/smallvec/1.15.1 \
+    crate://crates.io/syn/2.0.117 \
-    crate://crates.io/syn/2.0.114 \
+    crate://crates.io/target-lexicon/0.13.5 \
-    crate://crates.io/target-lexicon/0.13.4 \
+    crate://crates.io/unicode-ident/1.0.24 \
-    crate://crates.io/unicode-ident/1.0.22 \
    crate://crates.io/unwinding/0.2.8 \
-    crate://crates.io/uuid/1.20.0 \
    crate://crates.io/version_check/0.9.5 \
    crate://crates.io/xxhash-rust/0.8.15 \
-    crate://crates.io/zerocopy/0.8.37 \
+    crate://crates.io/zmij/1.0.21 \
-    crate://crates.io/zerocopy-derive/0.8.37 \
-    crate://crates.io/zmij/1.0.19 \
 "
-SRC_URI[associative-cache-2.0.0.sha256sum] = "b993cd767a2bc7307dd87622311ca22c44329cc7a21366206bfa0896827b2bad"
+SRC_URI[associative-cache-3.0.0.sha256sum] = "6104bd6fd778b62f638add0dd848dca9887cf016a343d15a21d27fb8a3965b98"
 SRC_URI[bytecount-0.6.9.sha256sum] = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"
-SRC_URI[bytes-1.11.0.sha256sum] = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
+SRC_URI[bytes-1.11.1.sha256sum] = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
-SRC_URI[cc-1.2.55.sha256sum] = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29"
+SRC_URI[cc-1.2.58.sha256sum] = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1"
 SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
-SRC_URI[crunchy-0.2.4.sha256sum] = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 SRC_URI[encoding_rs-0.8.35.sha256sum] = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 SRC_URI[find-msvc-tools-0.1.9.sha256sum] = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 SRC_URI[gimli-0.32.3.sha256sum] = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
-SRC_URI[half-2.7.1.sha256sum] = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+SRC_URI[itoa-1.0.18.sha256sum] = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
-SRC_URI[itoa-1.0.17.sha256sum] = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 SRC_URI[itoap-1.0.1.sha256sum] = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8"
-SRC_URI[jiff-0.2.18.sha256sum] = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50"
+SRC_URI[jiff-0.2.23.sha256sum] = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359"
-SRC_URI[jiff-static-0.2.18.sha256sum] = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78"
+SRC_URI[jiff-static-0.2.23.sha256sum] = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4"
-SRC_URI[libc-0.2.180.sha256sum] = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
+SRC_URI[libc-0.2.183.sha256sum] = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
-SRC_URI[memchr-2.7.6.sha256sum] = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+SRC_URI[memchr-2.8.0.sha256sum] = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 SRC_URI[no-panic-0.1.36.sha256sum] = "f967505aabc8af5752d098c34146544a43684817cdba8f9725b292530cabbf53"
-SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+SRC_URI[once_cell-1.21.4.sha256sum] = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 SRC_URI[portable-atomic-1.13.1.sha256sum] = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
-SRC_URI[portable-atomic-util-0.2.5.sha256sum] = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5"
+SRC_URI[portable-atomic-util-0.2.6.sha256sum] = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3"
 SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
-SRC_URI[pyo3-build-config-0.28.0.sha256sum] = "972720a441c91fd9c49f212a1d2d74c6e3803b231ebc8d66c51efbd7ccab11c8"
+SRC_URI[pyo3-build-config-0.28.2.sha256sum] = "8bf94ee265674bf76c09fa430b0e99c26e319c945d96ca0d5a8215f31bf81cf7"
-SRC_URI[pyo3-ffi-0.28.0.sha256sum] = "5994456d9dab8934d600d3867571b6410f24fbd6002570ad56356733eb54859b"
+SRC_URI[pyo3-ffi-0.28.2.sha256sum] = "491aa5fc66d8059dd44a75f4580a2962c1862a1c2945359db36f6c2818b748dc"
-SRC_URI[quote-1.0.44.sha256sum] = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
+SRC_URI[quote-1.0.45.sha256sum] = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 SRC_URI[serde_json-1.0.149.sha256sum] = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 SRC_URI[simdutf8-0.1.5.sha256sum] = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
-SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+SRC_URI[syn-2.0.117.sha256sum] = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
-SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
+SRC_URI[target-lexicon-0.13.5.sha256sum] = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
-SRC_URI[target-lexicon-0.13.4.sha256sum] = "b1dd07eb858a2067e2f3c7155d54e929265c264e6f37efe3ee7a8d1b5a1dd0ba"
+SRC_URI[unicode-ident-1.0.24.sha256sum] = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
-SRC_URI[unicode-ident-1.0.22.sha256sum] = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 SRC_URI[unwinding-0.2.8.sha256sum] = "60612c845ef41699f39dc8c5391f252942c0a88b7d15da672eff0d14101bbd6d"
-SRC_URI[uuid-1.20.0.sha256sum] = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
 SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 SRC_URI[xxhash-rust-0.8.15.sha256sum] = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
-SRC_URI[zerocopy-0.8.37.sha256sum] = "7456cf00f0685ad319c5b1693f291a650eaf345e941d082fc4e03df8a03996ac"
+SRC_URI[zmij-1.0.21.sha256sum] = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
-SRC_URI[zerocopy-derive-0.8.37.sha256sum] = "1328722bbf2115db7e19d69ebcc15e795719e2d66b60827c6a69a117365e37a0"
-SRC_URI[zmij-1.0.19.sha256sum] = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"
diff --git a/meta-python/recipes-devtools/python/python3-orjson_3.11.7.bb b/meta-python/recipes-devtools/python/python3-orjson_3.11.8.bb
index 63e2e089e1..22a0205af3 100644
--- a/meta-python/recipes-devtools/python/python3-orjson_3.11.7.bb
+++ b/meta-python/recipes-devtools/python/python3-orjson_3.11.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/orjson/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d"
-SRCREV = "ec2b066cae79ae4a90ed126ac5723335dd99e408"
+SRCREV = "5cbb3d0398a2f42de51210270286fecd798c5d78"
 PYPI_SRC_URI = "git://github.com/ijl/orjson;protocol=https;branch=master;tag=${PV};destsuffix=orjson-${PV}"
 CVE_PRODUCT = "orjson"
diff --git a/meta-python/recipes-devtools/python/python3-pandas_3.0.1.bb b/meta-python/recipes-devtools/python/python3-pandas_3.0.2.bb
index a25b367130..62affc5f45 100644
--- a/meta-python/recipes-devtools/python/python3-pandas_3.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pandas_3.0.2.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e98642e1210ade884e5254ab18d55b7d"
 SRC_URI:append:class-target = " file://0001-BLD-add-option-to-specify-numpy-header-location.patch "
-SRC_URI[sha256sum] = "4186a699674af418f655dbd420ed87f50d56b4cd6603784279d9eef6627823c8"
+SRC_URI[sha256sum] = "f4753e73e34c8d83221ba58f232433fca2748be8b18dbca02d242ed153945043"
 CVE_PRODUCT = "pandas"
diff --git a/meta-python/recipes-devtools/python/python3-pillow_12.1.1.bb b/meta-python/recipes-devtools/python/python3-pillow_12.2.0.bb
index 2b3660fc56..f3fcb2d3c1 100644
--- a/meta-python/recipes-devtools/python/python3-pillow_12.1.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pillow_12.2.0.bb
@@ -3,12 +3,12 @@ Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \
 Contributors."
 HOMEPAGE = "https://pillow.readthedocs.io"
 LICENSE = "MIT-CMU"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a1b708da743e3fc0e5c35e92daac0bf8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a6f0ac3777cfc96ded1b825e32ae7c99"
-SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=12.1.x;protocol=https;tag=${PV} \
+SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=main;protocol=https;tag=${PV} \
           file://0001-support-cross-compiling.patch \
           "
-SRCREV = "5158d98c807e719c5938aa3886913ef0ea6814e9"
+SRCREV = "3c41c095064200a02672d89cc5ff629eaf4b0d4f"
 inherit python_setuptools_build_meta ptest-python-pytest
diff --git a/meta-python/recipes-devtools/python/python3-platformdirs_4.9.4.bb b/meta-python/recipes-devtools/python/python3-platformdirs_4.9.6.bb
index df0e3597b7..6ca4a09bde 100644
--- a/meta-python/recipes-devtools/python/python3-platformdirs_4.9.4.bb
+++ b/meta-python/recipes-devtools/python/python3-platformdirs_4.9.6.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/platformdirs/platformdirs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a"
-SRC_URI[sha256sum] = "1ec356301b7dc906d83f371c8f487070e99d3ccf9e501686456394622a01a934"
+SRC_URI[sha256sum] = "3bfa75b0ad0db84096ae777218481852c0ebc6c727b3168c1b9e0118e458cf0a"
 inherit pypi python_hatchling ptest-python-pytest
diff --git a/meta-python/recipes-devtools/python/python3-protobuf_6.33.6.bb b/meta-python/recipes-devtools/python/python3-protobuf_6.33.6.bb
index bbc713442b..0595ec2a47 100644
--- a/meta-python/recipes-devtools/python/python3-protobuf_6.33.6.bb
+++ b/meta-python/recipes-devtools/python/python3-protobuf_6.33.6.bb
@@ -14,6 +14,7 @@ SRC_URI[sha256sum] = "a6768d25248312c297558af96a9f9c929e8c4cee0659cb07e780731095
 CVE_PRODUCT += "google:protobuf protobuf:protobuf google-protobuf protobuf-python"
 CVE_STATUS[CVE-2026-0994] = "fixed-version: it is fixed in 6.33.5"
+CVE_STATUS[CVE-2026-6409] = "cpe-incorrect: the vulnerability affects only the php library"
 # http://errors.yoctoproject.org/Errors/Details/184715/
 # Can't find required file: ../src/google/protobuf/descriptor.proto
diff --git a/meta-python/recipes-devtools/python/python3-pyais_2.20.1.bb b/meta-python/recipes-devtools/python/python3-pyais_3.0.0.bb
index 6ee62a6a32..a8b8777821 100644
--- a/meta-python/recipes-devtools/python/python3-pyais_2.20.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pyais_3.0.0.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "https://github.com/M0r13n/pyais"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=79d9e278b76e3e5b3358cd70b328173c"
-SRC_URI = "git://github.com/M0r13n/pyais;protocol=https;branch=master;tag=v${PV}"
+SRC_URI = "git://github.com/M0r13n/pyais;protocol=https;branch=main;tag=v${PV}"
-SRCREV = "6cec67eb8e48c2254bd7bc31415f8df60ecb11ce"
+SRCREV = "a88659ae381487e547fde3c18ab45cfe572b1094"
 inherit python_setuptools_build_meta ptest-python-pytest
diff --git a/meta-python/recipes-devtools/python/python3-pyatspi_2.46.1.bb b/meta-python/recipes-devtools/python/python3-pyatspi_2.58.2.bb
index cb9b61bd66..404ff19a72 100644
--- a/meta-python/recipes-devtools/python/python3-pyatspi_2.46.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pyatspi_2.58.2.bb
@@ -7,16 +7,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=db29218e6ba3794c56df7d4987dc7e4d \
                    file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS = "python3-dbus-native glib-2.0 dbus-glib libxml2 atk gtk+ python3-pygobject"
-SRC_URI = "git://github.com/GNOME/pyatspi2.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/GNOME/pyatspi2.git;protocol=https;branch=master;tag=${PV}"
-SRCREV = "8c69016b38d0e4caaf4c986938ea3410fb7351b6"
+SRCREV = "f2fb289a9d2e4dac65fca8db0f4d3d65607a0cf2"
 # Same restriction as gtk+
-inherit features_check setuptools3
+inherit features_check
 ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
-inherit pkgconfig autotools python3native
+inherit pkgconfig python_setuptools_build_meta python_mesonpy
+DEPENDS += "python3-pygobject-native"
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/pyatspi/*"
diff --git a/meta-python/recipes-devtools/python/python3-pymodbus_3.12.1.bb b/meta-python/recipes-devtools/python/python3-pymodbus_3.13.0.bb
index 7ba7ee78cd..c59e8870b7 100644
--- a/meta-python/recipes-devtools/python/python3-pymodbus_3.12.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pymodbus_3.13.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/riptideio/pymodbus/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=12a490c6cffa2e76a6df8aa1fa29e183"
-SRC_URI[sha256sum] = "bcb483381747b3e3aec2c8e01d5df885e5ea43f85b7145dc1907af06aca93a2c"
+SRC_URI[sha256sum] = "da4c87afe772787620594c564cd8aa8a4c58ff9786382aba9550fe0ce8879f32"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-pyroute2_0.9.5.bb b/meta-python/recipes-devtools/python/python3-pyroute2_0.9.5.bb
index 8005d1275b..d5c95cf546 100644
--- a/meta-python/recipes-devtools/python/python3-pyroute2_0.9.5.bb
+++ b/meta-python/recipes-devtools/python/python3-pyroute2_0.9.5.bb
@@ -19,6 +19,7 @@ RDEPENDS:${PN} += " \
    python3-pkgutil \
    python3-pprint \
    python3-shell \
+    python3-unittest \
    python3-unixadmin \
 "
diff --git a/meta-python/recipes-devtools/python/python3-pytest-codspeed_3.0.0.bb b/meta-python/recipes-devtools/python/python3-pytest-codspeed_4.3.0.bb
index 0789e9f548..3fc2715102 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-codspeed_3.0.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pytest-codspeed_4.3.0.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "https://codspeed.io/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2856cbe664e8843cd4fd4c1d1d85c2c3"
-DEPENDS = "python3-hatchling-native"
+DEPENDS = "python3-cffi-native"
-SRC_URI[sha256sum] = "c5b80100ea32dd44079bb2db298288763eb8fe859eafa1650a8711bd2c32fd06"
+SRC_URI[sha256sum] = "5230d9d65f39063a313ed1820df775166227ec5c20a1122968f85653d5efee48"
 inherit pypi python_hatchling
diff --git a/meta-python/recipes-devtools/python/python3-pytest-httpx_0.36.0.bb b/meta-python/recipes-devtools/python/python3-pytest-httpx_0.36.2.bb
index 1cdf3d3d23..ac1a53d224 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-httpx_0.36.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pytest-httpx_0.36.2.bb
@@ -1,10 +1,10 @@
 SUMMARY = "Send responses to httpx."
 HOMEPAGE = "https://github.com/Colin-b/pytest_httpx"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8dcb0d82b1d402b6be745fc78dde254b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b6746540997ba13df3f30783db069bc"
 RECIPE_MAINTAINER = "Tom Geelen <t.f.g.geelen@gmail.com>"
-SRC_URI[sha256sum] = "9edb66a5fd4388ce3c343189bc67e7e1cb50b07c2e3fc83b97d511975e8a831b"
+SRC_URI[sha256sum] = "05a56527484f7f4e8c856419ea379b8dc359c36801c4992fdb330f294c690356"
 inherit pypi python_setuptools_build_meta ptest-python-pytest
diff --git a/meta-python/recipes-devtools/python/python3-pytest-runner/0001-Not-use-functions-from-pkg_resources-any-more.patch b/meta-python/recipes-devtools/python/python3-pytest-runner/0001-Not-use-functions-from-pkg_resources-any-more.patch
new file mode 100644
index 0000000000..20c1c121fb
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-runner/0001-Not-use-functions-from-pkg_resources-any-more.patch
@@ -0,0 +1,77 @@
+From 81b0218e390e36aa2c3d1bdaa124d8af175e9cbb Mon Sep 17 00:00:00 2001
+From: Li Zhou <li.zhou@windriver.com>
+Date: Thu, 2 Apr 2026 15:44:18 +0800
+Subject: [PATCH] Not use functions from pkg_resources any more
+The python3 setuptools 82 dropped pkg_resources module by now.
+To avoid the failure "No module named 'pkg_resources'", replace the
+functions from this module with other functions from modules
+packaging and importlib.metadata.
+Upstream-Status: Inactive-Upstream [lastcommit: 2023]
+Signed-off-by: Li Zhou <li.zhou@windriver.com>
+---
+ ptr/__init__.py | 23 +++++++++++++----------
+ 1 file changed, 13 insertions(+), 10 deletions(-)
+diff --git a/ptr/__init__.py b/ptr/__init__.py
+index 41192fa..5186059 100644
+--- a/ptr/__init__.py
+++ b/ptr/__init__.py
+@@ -10,10 +10,12 @@ import operator as _operator
+ import itertools as _itertools
+ import warnings as _warnings
+ 
+-import pkg_resources
+ import setuptools.command.test as orig
+ from setuptools import Distribution
+ 
+from importlib.metadata import version
+from packaging.version import Version
+from packaging.markers import Marker, InvalidMarker
+ 
+ @_contextlib.contextmanager
+ def _save_argv(repl=None):
+@@ -121,7 +123,8 @@ class PyTest(orig.test):
+         instead of declaring the dependency in the package
+         metadata, assert the requirement at run time.
+         """
+-        pkg_resources.require('setuptools>=27.3')
+        if Version(version('setuptools')) < Version('27.3'):
+            raise RuntimeError("setuptools >= 27.3 is required")
+ 
+     def finalize_options(self):
+         if self.addopts:
+@@ -133,11 +136,12 @@ class PyTest(orig.test):
+         Given an environment marker, return True if the marker is valid
+         and matches this environment.
+         """
+-        return (
+-            not marker
+-            or not pkg_resources.invalid_marker(marker)
+-            and pkg_resources.evaluate_marker(marker)
+-        )
+        if not marker:
+            return True
+        try:
+            return Marker(marker).evaluate()
+        except InvalidMarker:
+            return False
+ 
+     def install_dists(self, dist):
+         """
+@@ -175,9 +179,8 @@ class PyTest(orig.test):
+             "please upgrade to setuptools 30.4 or later or pin to "
+             "pytest-runner < 5."
+         )
+-        ver_str = pkg_resources.get_distribution('setuptools').version
+-        ver = pkg_resources.parse_version(ver_str)
+-        if ver < pkg_resources.parse_version('30.4'):
+        ver = Version(version('setuptools'))
+        if ver < Version('30.4'):
+             _warnings.warn(msg)
+ 
+     def run(self):
+-- 
+2.34.1
diff --git a/meta-python/recipes-devtools/python/python3-pytest-runner_6.0.1.bb b/meta-python/recipes-devtools/python/python3-pytest-runner_6.0.1.bb
index e5e5e048bd..dd3a8d0234 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-runner_6.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pytest-runner_6.0.1.bb
@@ -5,6 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6"
 SRC_URI[sha256sum] = "70d4739585a7008f37bf4933c013fdb327b8878a5a69fcbb3316c88882f0f49b"
+SRC_URI += " \
+           file://0001-Not-use-functions-from-pkg_resources-any-more.patch \
+           "
 inherit pypi python_setuptools_build_meta
 DEPENDS += " \
diff --git a/meta-python/recipes-devtools/python/python3-python-multipart_0.0.22.bb b/meta-python/recipes-devtools/python/python3-python-multipart_0.0.26.bb
index b54fe5d309..46046dc050 100644
--- a/meta-python/recipes-devtools/python/python3-python-multipart_0.0.22.bb
+++ b/meta-python/recipes-devtools/python/python3-python-multipart_0.0.26.bb
@@ -1,8 +1,8 @@
 SUMMARY = "A streaming multipart parser for Python"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3d98f0d58b28321924a89ab60c82410e"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI[sha256sum] = "7340bef99a7e0032613f56dc36027b959fd3b30a787ed62d310e951f7c3a3a58"
+SRC_URI[sha256sum] = "08fadc45918cd615e26846437f50c5d6d23304da32c341f289a617127b081f17"
 inherit pypi python_hatchling ptest-python-pytest
diff --git a/meta-python/recipes-devtools/python/python3-regex_2026.3.32.bb b/meta-python/recipes-devtools/python/python3-regex_2026.4.4.bb
index a2091df806..3d4d7a3e99 100644
--- a/meta-python/recipes-devtools/python/python3-regex_2026.3.32.bb
+++ b/meta-python/recipes-devtools/python/python3-regex_2026.4.4.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069"
 inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "f1574566457161678297a116fa5d1556c5a4159d64c5ff7c760e7c564bf66f16"
+SRC_URI[sha256sum] = "e08270659717f6973523ce3afbafa53515c4dc5dcad637dc215b6fd50f689423"
 RDEPENDS:${PN} += " \
        python3-stringold \
diff --git a/meta-python/recipes-devtools/python/python3-sentry-sdk_2.56.0.bb b/meta-python/recipes-devtools/python/python3-sentry-sdk_2.57.0.bb
index 4833feac20..94fc007b84 100644
--- a/meta-python/recipes-devtools/python/python3-sentry-sdk_2.56.0.bb
+++ b/meta-python/recipes-devtools/python/python3-sentry-sdk_2.57.0.bb
@@ -15,7 +15,7 @@ RDEPENDS:${PN} += "\
        python3-datetime \
 "
-SRC_URI[sha256sum] = "fdab72030b69625665b2eeb9738bdde748ad254e8073085a0ce95382678e8168"
+SRC_URI[sha256sum] = "4be8d1e71c32fb27f79c577a337ac8912137bba4bcbc64a4ec1da4d6d8dc5199"
 PYPI_PACKAGE = "sentry_sdk"
diff --git a/meta-python/recipes-devtools/python/python3-setuptools-git-versioning_2.1.0.bb b/meta-python/recipes-devtools/python/python3-setuptools-git-versioning_3.0.1.bb
index 8206e8513d..561f1d06c6 100644
--- a/meta-python/recipes-devtools/python/python3-setuptools-git-versioning_2.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-setuptools-git-versioning_3.0.1.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "https://setuptools-git-versioning.readthedocs.io"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=92e79e3a844e66731724600f3ac9c0d8"
-SRC_URI[sha256sum] = "6aef5b8bb1cfb953b6b343d27cbfc561d96cf2a2ee23c2e0dd3591042a059921"
+SRC_URI[sha256sum] = "c8a599bacf163b5d215552b5701faf5480ffc4d65426a5711a010b802e1590eb"
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[python-version-smaller-3-dot-11] = ",,,python3-tomli"
diff --git a/meta-python/recipes-devtools/python/python3-smbus2_0.6.0.bb b/meta-python/recipes-devtools/python/python3-smbus2_0.6.1.bb
index 33613d9abe..1b9a879234 100644
--- a/meta-python/recipes-devtools/python/python3-smbus2_0.6.0.bb
+++ b/meta-python/recipes-devtools/python/python3-smbus2_0.6.1.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2a3eca2de44816126b3c6f33811a9fba"
 inherit pypi setuptools3
-SRC_URI[sha256sum] = "9b5ff1e998e114730f9dfe0c4babbef06c92468cfb61eaa684e30f225661b95b"
+SRC_URI[sha256sum] = "2b043372abf8f6029a632c3aab36b641c5d5872b1cbad599fc68e17ac4fd90a5"
 CLEANBROKEN = "1"
diff --git a/meta-python/recipes-devtools/python/python3-snagboot_2.6.bb b/meta-python/recipes-devtools/python/python3-snagboot_2.6.1.bb
index 16cc5c7882..74e6df64a9 100644
--- a/meta-python/recipes-devtools/python/python3-snagboot_2.6.bb
+++ b/meta-python/recipes-devtools/python/python3-snagboot_2.6.1.bb
@@ -3,7 +3,7 @@ SUMMARY = "Snagboot intends to be an open-source replacement vendor-specific too
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI[sha256sum] = "8451ff4cb96f8a4dc7aca06cee8a54db900e93b4e0e946205e0856b7a4cf4632"
+SRC_URI[sha256sum] = "9800562936d21972a212e8e7c6f0f79eff8faf7f1bfb534675875bd06666f28c"
 inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-soundcard_0.4.5.bb b/meta-python/recipes-devtools/python/python3-soundcard_0.4.6.bb
index 5116892dad..17308a8965 100644
--- a/meta-python/recipes-devtools/python/python3-soundcard_0.4.5.bb
+++ b/meta-python/recipes-devtools/python/python3-soundcard_0.4.6.bb
@@ -6,7 +6,7 @@ SECTION = "devel/python"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e39df1540c06c17ca310ce87c36b042c"
-SRC_URI[sha256sum] = "07272ba927e32cafdf634e4a1ca53b9a3218321a60c7d2e08f54b832a56946aa"
+SRC_URI[sha256sum] = "9b46d64a26f97cd7d88bcfc385c97c069f97c5ec3404e4e7c23771598a8cf47b"
 inherit pypi setuptools3 features_check
diff --git a/meta-python/recipes-devtools/python/python3-soupsieve_2.8.2.bb b/meta-python/recipes-devtools/python/python3-soupsieve_2.8.3.bb
index 63b5d3b2e7..11a2b5e103 100644
--- a/meta-python/recipes-devtools/python/python3-soupsieve_2.8.2.bb
+++ b/meta-python/recipes-devtools/python/python3-soupsieve_2.8.3.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/facelessuser/soupsieve"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=74851a2f1e5c07496dcb452af6a6bf54"
-SRC_URI[sha256sum] = "78a66b0fdee2ab40b7199dc3e747ee6c6e231899feeaae0b9b98a353afd48fd8"
+SRC_URI[sha256sum] = "3267f1eeea4251fb42728b6dfb746edc9acaffc4a45b27e19450b676586e8349"
 inherit pypi python_hatchling ptest-python-pytest
diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.48.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.49.bb
index 6681792f01..ecc9099e30 100644
--- a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.48.bb
+++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.49.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.sqlalchemy.org/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=53a9111717b305b0fae0d704a24925c3"
-SRC_URI[sha256sum] = "5ca74f37f3369b45e1f6b7b06afb182af1fd5dde009e4ffd831830d98cbe5fe7"
+SRC_URI[sha256sum] = "d15950a57a210e36dd4cec1aac22787e2a4d57ba9318233e2ef8b2daf9ff2d5f"
 inherit pypi python_setuptools_build_meta cython
diff --git a/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb b/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb
index a83adffcd2..2cf7742a90 100644
--- a/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb
+++ b/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb
@@ -14,8 +14,4 @@ SRC_URI += "\
    file://0001-Drop-the-deprecated-pkg_resources.patch \
 "
-RDEPENDS:${PN} += "\
-    python3-setuptools \
-    "
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-tox_4.49.0.bb b/meta-python/recipes-devtools/python/python3-tox_4.52.1.bb
index f07694cb79..dbac6deed8 100644
--- a/meta-python/recipes-devtools/python/python3-tox_4.49.0.bb
+++ b/meta-python/recipes-devtools/python/python3-tox_4.52.1.bb
@@ -6,13 +6,14 @@ HOMEPAGE = "https://tox.readthedocs.org/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7"
-SRC_URI[sha256sum] = "2e01f09ae1226749466cbcd8c514fe988ffc8c76b5d523c7f9b745d1711a6e71"
+SRC_URI[sha256sum] = "297e71ea0ae4ef3acc45cb5fdf080b74537e6ecb5eea7d4646fa7322ca10473e"
 BBCLASSEXTEND = "native nativesdk"
 inherit pypi python_hatchling
 DEPENDS += "\
    python3-hatch-vcs-native \
+    python3-docutils-native \
 "
 RDEPENDS:${PN} += "\
diff --git a/meta-python/recipes-devtools/python/python3-types-psutil_7.2.2.20260130.bb b/meta-python/recipes-devtools/python/python3-types-psutil_7.2.2.20260408.bb
index 78e96b3122..88fff6c83d 100644
--- a/meta-python/recipes-devtools/python/python3-types-psutil_7.2.2.20260130.bb
+++ b/meta-python/recipes-devtools/python/python3-types-psutil_7.2.2.20260408.bb
@@ -8,7 +8,7 @@ UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
 inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "15b0ab69c52841cf9ce3c383e8480c620a4d13d6a8e22b16978ebddac5590950"
+SRC_URI[sha256sum] = "e8053450685965b8cd52afb62569073d00ea9967ae78bb45dff5f606847f97f2"
 BBCLASSEXTEND = "native"
diff --git a/meta-python/recipes-devtools/python/python3-tzdata_2025.3.bb b/meta-python/recipes-devtools/python/python3-tzdata_2026.1.bb
index 1c313ea223..9a66460e76 100644
--- a/meta-python/recipes-devtools/python/python3-tzdata_2025.3.bb
+++ b/meta-python/recipes-devtools/python/python3-tzdata_2026.1.bb
@@ -4,7 +4,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fca9fd5c15a28eb874ba38577a585d48 \
                    file://licenses/LICENSE_APACHE;md5=86d3f3a95c324c9479bd8986968f4327"
-SRC_URI[sha256sum] = "de39c2ca5dc7b0344f2eba86f49d614019d29f060fc4ebc8a417896a620b56a7"
+SRC_URI[sha256sum] = "67658a1903c75917309e753fdc349ac0efd8c27db7a0cb406a25be4840f87f98"
 inherit pypi python_setuptools_build_meta ptest-python-pytest
diff --git a/meta-python/recipes-devtools/python/python3-uvicorn_0.42.0.bb b/meta-python/recipes-devtools/python/python3-uvicorn_0.44.0.bb
index f14ba46dc6..ce92c96d8d 100644
--- a/meta-python/recipes-devtools/python/python3-uvicorn_0.42.0.bb
+++ b/meta-python/recipes-devtools/python/python3-uvicorn_0.44.0.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5c778842f66a649636561c423c0eec2e"
 RECIPE_MAINTAINER = "Tom Geelen <t.f.g.geelen@gmail.com>"
-SRC_URI[sha256sum] = "9b1f190ce15a2dd22e7758651d9b6d12df09a13d51ba5bf4fc33c383a48e1775"
+SRC_URI[sha256sum] = "6c942071b68f07e178264b9152f1f16dfac5da85880c4ce06366a96d70d4f31e"
 SRC_URI += "file://0001-ptest-disable-failing-tests.patch"
diff --git a/meta-python/recipes-devtools/python/python3-virtualenv_21.2.0.bb b/meta-python/recipes-devtools/python/python3-virtualenv_21.2.1.bb
index dda29c549d..3ff03e43c7 100644
--- a/meta-python/recipes-devtools/python/python3-virtualenv_21.2.0.bb
+++ b/meta-python/recipes-devtools/python/python3-virtualenv_21.2.1.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/pypa/virtualenv"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0ce089158cf60a8ab6abb452b6405538"
-SRC_URI[sha256sum] = "1720dc3a62ef5b443092e3f499228599045d7fea4c79199770499df8becf9098"
+SRC_URI[sha256sum] = "b66ffe81301766c0d5e2208fc3576652c59d44e7b731fc5f5ed701c9b537fa78"
 BBCLASSEXTEND = "native nativesdk"
 inherit pypi python_hatchling
diff --git a/meta-python/recipes-devtools/python/python3-werkzeug_3.1.7.bb b/meta-python/recipes-devtools/python/python3-werkzeug_3.1.8.bb
index 29ef2db10a..4e1be5cb2f 100644
--- a/meta-python/recipes-devtools/python/python3-werkzeug_3.1.7.bb
+++ b/meta-python/recipes-devtools/python/python3-werkzeug_3.1.8.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "https://werkzeug.palletsprojects.com"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dc88300786f1c214c1e9827a5229462"
-SRC_URI[sha256sum] = "fb8c01fe6ab13b9b7cdb46892b99b1d66754e1d7ab8e542e865ec13f526b5351"
+SRC_URI[sha256sum] = "9bad61a4268dac112f1c5cd4630a56ede601b6ed420300677a869083d70a4c44"
 CVE_PRODUCT = "werkzeug"
diff --git a/meta-python/recipes-devtools/python/python3-yappi/0001-test_functionality-convert-line-endings-to-Unix.patch b/meta-python/recipes-devtools/python/python3-yappi/0001-test_functionality-convert-line-endings-to-Unix.patch
deleted file mode 100644
index 70d4607c29..0000000000
--- a/meta-python/recipes-devtools/python/python3-yappi/0001-test_functionality-convert-line-endings-to-Unix.patch
+++ /dev/null
@@ -1,3845 +0,0 @@
-From 0136ca731cba8b056b3f2ff0e7df3953b94f1e87 Mon Sep 17 00:00:00 2001
-From: Tim Orling <tim.orling@konsulko.com>
-Date: Sun, 24 Dec 2023 09:41:57 -0800
-Subject: [PATCH 1/2] test_functionality: convert line endings to Unix
-Convert the Windows line endings with dos2unix to be like the
-other files in tests/*
-Upstream-Status: Submitted [https://github.com/sumerc/yappi/pull/164]
-Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
- tests/test_functionality.py | 3822 +++++++++++++++++------------------
- 1 file changed, 1911 insertions(+), 1911 deletions(-)
-diff --git a/tests/test_functionality.py b/tests/test_functionality.py
-index 0e99c47..38bbe67 100644
--- a/tests/test_functionality.py
-+++ b/tests/test_functionality.py
-@@ -1,1911 +1,1911 @@
-import os
-import sys
-import time
-import threading
-import unittest
-import yappi
-import _yappi
-import utils
-import multiprocessing
-import subprocess
-
-_counter = 0
-
-
-class BasicUsage(utils.YappiUnitTestCase):
-
-    def test_callback_function_int_return_overflow(self):
-        # this test is just here to check if any errors are generated, as the err
-        # is printed in C side, I did not include it here. THere are ways to test
-        # this deterministically, I did not bother
-        import ctypes
-
-        def _unsigned_overflow_margin():
-            return 2**(ctypes.sizeof(ctypes.c_void_p) * 8) - 1
-
-        def foo():
-            pass
-
-        #with utils.captured_output() as (out, err):
-        yappi.set_context_id_callback(_unsigned_overflow_margin)
-        yappi.set_tag_callback(_unsigned_overflow_margin)
-        yappi.start()
-        foo()
-
-    def test_issue60(self):
-
-        def foo():
-            buf = bytearray()
-            buf += b't' * 200
-            view = memoryview(buf)[10:]
-            view = view.tobytes()
-            del buf[:10]  # this throws exception
-            return view
-
-        yappi.start(builtins=True)
-        foo()
-        self.assertTrue(
-            len(
-                yappi.get_func_stats(
-                    filter_callback=lambda x: yappi.
-                    func_matches(x, [memoryview.tobytes])
-                )
-            ) > 0
-        )
-        yappi.stop()
-
-    def test_issue54(self):
-
-        def _tag_cbk():
-            global _counter
-            _counter += 1
-            return _counter
-
-        def a():
-            pass
-
-        def b():
-            pass
-
-        yappi.set_tag_callback(_tag_cbk)
-        yappi.start()
-        a()
-        a()
-        a()
-        yappi.stop()
-        stats = yappi.get_func_stats()
-        self.assertEqual(stats.pop().ncall, 3)  # aggregated if no tag is given
-        stats = yappi.get_func_stats(tag=1)
-
-        for i in range(1, 3):
-            stats = yappi.get_func_stats(tag=i)
-            stats = yappi.get_func_stats(
-                tag=i, filter_callback=lambda x: yappi.func_matches(x, [a])
-            )
-
-            stat = stats.pop()
-            self.assertEqual(stat.ncall, 1)
-
-        yappi.set_tag_callback(None)
-        yappi.clear_stats()
-        yappi.start()
-        b()
-        b()
-        stats = yappi.get_func_stats()
-        self.assertEqual(len(stats), 1)
-        stat = stats.pop()
-        self.assertEqual(stat.ncall, 2)
-
-    def test_filter(self):
-
-        def a():
-            pass
-
-        def b():
-            a()
-
-        def c():
-            b()
-
-        _TCOUNT = 5
-
-        ts = []
-        yappi.start()
-        for i in range(_TCOUNT):
-            t = threading.Thread(target=c)
-            t.start()
-            ts.append(t)
-
-        for t in ts:
-            t.join()
-
-        yappi.stop()
-
-        ctx_ids = []
-        for tstat in yappi.get_thread_stats():
-            if tstat.name == '_MainThread':
-                main_ctx_id = tstat.id
-            else:
-                ctx_ids.append(tstat.id)
-
-        fstats = yappi.get_func_stats(filter={"ctx_id": 9})
-        self.assertTrue(fstats.empty())
-        fstats = yappi.get_func_stats(
-            filter={
-                "ctx_id": main_ctx_id,
-                "name": "c"
-            }
-        )  # main thread
-        self.assertTrue(fstats.empty())
-
-        for i in ctx_ids:
-            fstats = yappi.get_func_stats(
-                filter={
-                    "ctx_id": i,
-                    "name": "a",
-                    "ncall": 1
-                }
-            )
-            self.assertEqual(fstats.pop().ncall, 1)
-            fstats = yappi.get_func_stats(filter={"ctx_id": i, "name": "b"})
-            self.assertEqual(fstats.pop().ncall, 1)
-            fstats = yappi.get_func_stats(filter={"ctx_id": i, "name": "c"})
-            self.assertEqual(fstats.pop().ncall, 1)
-
-        yappi.clear_stats()
-        yappi.start(builtins=True)
-        time.sleep(0.1)
-        yappi.stop()
-        fstats = yappi.get_func_stats(filter={"module": "time"})
-        self.assertEqual(len(fstats), 1)
-
-        # invalid filters`
-        self.assertRaises(
-            Exception, yappi.get_func_stats, filter={'tag': "sss"}
-        )
-        self.assertRaises(
-            Exception, yappi.get_func_stats, filter={'ctx_id': "None"}
-        )
-
-    def test_filter_callback(self):
-
-        def a():
-            time.sleep(0.1)
-
-        def b():
-            a()
-
-        def c():
-            pass
-
-        def d():
-            pass
-
-        yappi.set_clock_type("wall")
-        yappi.start(builtins=True)
-        a()
-        b()
-        c()
-        d()
-        stats = yappi.get_func_stats(
-            filter_callback=lambda x: yappi.func_matches(x, [a, b])
-        )
-        #stats.print_all()
-        r1 = '''
-        tests/test_functionality.py:98 a      2      0.000000  0.200350  0.100175
-        tests/test_functionality.py:101 b     1      0.000000  0.120000  0.100197
-        '''
-        self.assert_traces_almost_equal(r1, stats)
-        self.assertEqual(len(stats), 2)
-        stats = yappi.get_func_stats(
-            filter_callback=lambda x: yappi.
-            module_matches(x, [sys.modules[__name__]])
-        )
-        r1 = '''
-        tests/test_functionality.py:98 a      2      0.000000  0.230130  0.115065
-        tests/test_functionality.py:101 b     1      0.000000  0.120000  0.109011
-        tests/test_functionality.py:104 c     1      0.000000  0.000002  0.000002
-        tests/test_functionality.py:107 d     1      0.000000  0.000001  0.000001
-        '''
-        self.assert_traces_almost_equal(r1, stats)
-        self.assertEqual(len(stats), 4)
-
-        stats = yappi.get_func_stats(
-            filter_callback=lambda x: yappi.func_matches(x, [time.sleep])
-        )
-        self.assertEqual(len(stats), 1)
-        r1 = '''
-        time.sleep                            2      0.206804  0.220000  0.103402
-        '''
-        self.assert_traces_almost_equal(r1, stats)
-
-    def test_print_formatting(self):
-
-        def a():
-            pass
-
-        def b():
-            a()
-
-        func_cols = {
-            1: ("name", 48),
-            0: ("ncall", 5),
-            2: ("tsub", 8),
-        }
-        thread_cols = {
-            1: ("name", 48),
-            0: ("ttot", 8),
-        }
-
-        yappi.start()
-        a()
-        b()
-        yappi.stop()
-        fs = yappi.get_func_stats()
-        cs = fs[1].children
-        ts = yappi.get_thread_stats()
-        #fs.print_all(out=sys.stderr, columns={1:("name", 70), })
-        #cs.print_all(out=sys.stderr, columns=func_cols)
-        #ts.print_all(out=sys.stderr, columns=thread_cols)
-        #cs.print_all(out=sys.stderr, columns={})
-
-        self.assertRaises(
-            yappi.YappiError, fs.print_all, columns={1: ("namee", 9)}
-        )
-        self.assertRaises(
-            yappi.YappiError, cs.print_all, columns={1: ("dd", 0)}
-        )
-        self.assertRaises(
-            yappi.YappiError, ts.print_all, columns={1: ("tidd", 0)}
-        )
-
-    def test_get_clock(self):
-        yappi.set_clock_type('cpu')
-        self.assertEqual('cpu', yappi.get_clock_type())
-        clock_info = yappi.get_clock_info()
-        self.assertTrue('api' in clock_info)
-        self.assertTrue('resolution' in clock_info)
-
-        yappi.set_clock_type('wall')
-        self.assertEqual('wall', yappi.get_clock_type())
-
-        t0 = yappi.get_clock_time()
-        time.sleep(0.1)
-        duration = yappi.get_clock_time() - t0
-        self.assertTrue(0.05 < duration < 0.3)
-
-    def test_profile_decorator(self):
-
-        def aggregate(func, stats):
-            fname = f"tests/{func.__name__}.profile"
-            try:
-                stats.add(fname)
-            except OSError:
-                pass
-            stats.save(fname)
-            raise Exception("messing around")
-
-        @yappi.profile(return_callback=aggregate)
-        def a(x, y):
-            if x + y == 25:
-                raise Exception("")
-            return x + y
-
-        def b():
-            pass
-
-        try:
-            os.remove(
-                "tests/a.profile"
-            )  # remove the one from prev test, if available
-        except:
-            pass
-
-        # global profile is on to mess things up
-        yappi.start()
-        b()
-
-        # assert functionality and call function at same time
-        try:
-            self.assertEqual(a(1, 2), 3)
-        except:
-            pass
-        try:
-            self.assertEqual(a(2, 5), 7)
-        except:
-            pass
-        try:
-            a(4, 21)
-        except:
-            pass
-        stats = yappi.get_func_stats().add("tests/a.profile")
-        fsa = utils.find_stat_by_name(stats, 'a')
-        self.assertEqual(fsa.ncall, 3)
-        self.assertEqual(len(stats), 1)  # b() should be cleared out.
-
-        @yappi.profile(return_callback=aggregate)
-        def count_down_rec(n):
-            if n == 0:
-                return
-            count_down_rec(n - 1)
-
-        try:
-            os.remove(
-                "tests/count_down_rec.profile"
-            )  # remove the one from prev test, if available
-        except:
-            pass
-
-        try:
-            count_down_rec(4)
-        except:
-            pass
-        try:
-            count_down_rec(3)
-        except:
-            pass
-
-        stats = yappi.YFuncStats("tests/count_down_rec.profile")
-        fsrec = utils.find_stat_by_name(stats, 'count_down_rec')
-        self.assertEqual(fsrec.ncall, 9)
-        self.assertEqual(fsrec.nactualcall, 2)
-
-    def test_strip_dirs(self):
-
-        def a():
-            pass
-
-        stats = utils.run_and_get_func_stats(a, )
-        stats.strip_dirs()
-        fsa = utils.find_stat_by_name(stats, "a")
-        self.assertEqual(fsa.module, os.path.basename(fsa.module))
-
-    @unittest.skipIf(os.name == "nt", "do not run on Windows")
-    def test_run_as_script(self):
-        import re
-        p = subprocess.Popen(
-            ['yappi', os.path.join('./tests', 'run_as_script.py')],
-            stdout=subprocess.PIPE
-        )
-        out, err = p.communicate()
-        self.assertEqual(p.returncode, 0)
-        func_stats, thread_stats = re.split(
-            b'name\\s+id\\s+tid\\s+ttot\\s+scnt\\s*\n', out
-        )
-        self.assertTrue(b'FancyThread' in thread_stats)
-
-    def test_yappi_overhead(self):
-        LOOP_COUNT = 100000
-
-        def a():
-            pass
-
-        def b():
-            for i in range(LOOP_COUNT):
-                a()
-
-        t0 = time.time()
-        yappi.start()
-        b()
-        yappi.stop()
-        time_with_yappi = time.time() - t0
-        t0 = time.time()
-        b()
-        time_without_yappi = time.time() - t0
-        if time_without_yappi == 0:
-            time_without_yappi = 0.000001
-
-        # in latest v0.82, I calculated this as close to "7.0" in my machine.
-        # however, %83 of this overhead is coming from tickcount(). The other %17
-        # seems to have been evenly distributed to the internal bookkeeping
-        # structures/algorithms which seems acceptable. Note that our test only
-        # tests one function being profiled at-a-time in a short interval.
-        # profiling high number of functions in a small time
-        # is a different beast, (which is pretty unlikely in most applications)
-        # So as a conclusion: I cannot see any optimization window for Yappi that
-        # is worth implementing as we will only optimize %17 of the time.
-        sys.stderr.write("\r\nYappi puts %0.1f times overhead to the profiled application in average.\r\n" % \
-            (time_with_yappi / time_without_yappi))
-
-    def test_clear_stats_while_running(self):
-
-        def a():
-            pass
-
-        yappi.start()
-        a()
-        yappi.clear_stats()
-        a()
-        stats = yappi.get_func_stats()
-        fsa = utils.find_stat_by_name(stats, 'a')
-        self.assertEqual(fsa.ncall, 1)
-
-    def test_generator(self):
-
-        def _gen(n):
-            while (n > 0):
-                yield n
-                n -= 1
-
-        yappi.start()
-        for x in _gen(5):
-            pass
-        self.assertTrue(
-            yappi.convert2pstats(yappi.get_func_stats()) is not None
-        )
-
-    def test_slice_child_stats_and_strip_dirs(self):
-
-        def b():
-            for i in range(10000000):
-                pass
-
-        def a():
-            b()
-
-        yappi.start(builtins=True)
-        a()
-        stats = yappi.get_func_stats()
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        self.assertTrue(fsa.children[0:1] is not None)
-        prev_afullname = fsa.full_name
-        prev_bchildfullname = fsa.children[fsb].full_name
-        stats.strip_dirs()
-        self.assertTrue(len(prev_afullname) > len(fsa.full_name))
-        self.assertTrue(
-            len(prev_bchildfullname) > len(fsa.children[fsb].full_name)
-        )
-
-    def test_children_stat_functions(self):
-        _timings = {"a_1": 5, "b_1": 3, "c_1": 1}
-        _yappi._set_test_timings(_timings)
-
-        def b():
-            pass
-
-        def c():
-            pass
-
-        def a():
-            b()
-            c()
-
-        yappi.start()
-        a()
-        b()  # non-child call
-        c()  # non-child call
-        stats = yappi.get_func_stats()
-        fsa = utils.find_stat_by_name(stats, 'a')
-        childs_of_a = fsa.children.get().sort("tavg", "desc")
-        prev_item = None
-        for item in childs_of_a:
-            if prev_item:
-                self.assertTrue(prev_item.tavg > item.tavg)
-            prev_item = item
-        childs_of_a.sort("name", "desc")
-        prev_item = None
-        for item in childs_of_a:
-            if prev_item:
-                self.assertTrue(prev_item.name > item.name)
-            prev_item = item
-        childs_of_a.clear()
-        self.assertTrue(childs_of_a.empty())
-
-    def test_no_stats_different_clock_type_load(self):
-
-        def a():
-            pass
-
-        yappi.start()
-        a()
-        yappi.stop()
-        yappi.get_func_stats().save("tests/ystats1.ys")
-        yappi.clear_stats()
-        yappi.set_clock_type("WALL")
-        yappi.start()
-        yappi.stop()
-        stats = yappi.get_func_stats().add("tests/ystats1.ys")
-        fsa = utils.find_stat_by_name(stats, 'a')
-        self.assertTrue(fsa is not None)
-
-    def test_subsequent_profile(self):
-        _timings = {"a_1": 1, "b_1": 1}
-        _yappi._set_test_timings(_timings)
-
-        def a():
-            pass
-
-        def b():
-            pass
-
-        yappi.start()
-        a()
-        yappi.stop()
-        yappi.start()
-        b()
-        yappi.stop()
-        stats = yappi.get_func_stats()
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        self.assertTrue(fsa is not None)
-        self.assertTrue(fsb is not None)
-        self.assertEqual(fsa.ttot, 1)
-        self.assertEqual(fsb.ttot, 1)
-
-    def test_lambda(self):
-        f = lambda: time.sleep(0.3)
-        yappi.set_clock_type("wall")
-        yappi.start()
-        f()
-        stats = yappi.get_func_stats()
-        fsa = utils.find_stat_by_name(stats, '<lambda>')
-        self.assertTrue(fsa.ttot > 0.1)
-
-    def test_module_stress(self):
-        self.assertEqual(yappi.is_running(), False)
-
-        yappi.start()
-        yappi.clear_stats()
-        self.assertRaises(_yappi.error, yappi.set_clock_type, "wall")
-
-        yappi.stop()
-        yappi.clear_stats()
-        yappi.set_clock_type("cpu")
-        self.assertRaises(yappi.YappiError, yappi.set_clock_type, "dummy")
-        self.assertEqual(yappi.is_running(), False)
-        yappi.clear_stats()
-        yappi.clear_stats()
-
-    def test_stat_sorting(self):
-        _timings = {"a_1": 13, "b_1": 10, "a_2": 6, "b_2": 1}
-        _yappi._set_test_timings(_timings)
-
-        self._ncall = 1
-
-        def a():
-            b()
-
-        def b():
-            if self._ncall == 2:
-                return
-            self._ncall += 1
-            a()
-
-        stats = utils.run_and_get_func_stats(a)
-        stats = stats.sort("totaltime", "desc")
-        prev_stat = None
-        for stat in stats:
-            if prev_stat:
-                self.assertTrue(prev_stat.ttot >= stat.ttot)
-            prev_stat = stat
-        stats = stats.sort("totaltime", "asc")
-        prev_stat = None
-        for stat in stats:
-            if prev_stat:
-                self.assertTrue(prev_stat.ttot <= stat.ttot)
-            prev_stat = stat
-        stats = stats.sort("avgtime", "asc")
-        prev_stat = None
-        for stat in stats:
-            if prev_stat:
-                self.assertTrue(prev_stat.tavg <= stat.tavg)
-            prev_stat = stat
-        stats = stats.sort("name", "asc")
-        prev_stat = None
-        for stat in stats:
-            if prev_stat:
-                self.assertTrue(prev_stat.name <= stat.name)
-            prev_stat = stat
-        stats = stats.sort("subtime", "asc")
-        prev_stat = None
-        for stat in stats:
-            if prev_stat:
-                self.assertTrue(prev_stat.tsub <= stat.tsub)
-            prev_stat = stat
-
-        self.assertRaises(
-            yappi.YappiError, stats.sort, "invalid_func_sorttype_arg"
-        )
-        self.assertRaises(
-            yappi.YappiError, stats.sort, "totaltime",
-            "invalid_func_sortorder_arg"
-        )
-
-    def test_start_flags(self):
-        self.assertEqual(_yappi._get_start_flags(), None)
-        yappi.start()
-
-        def a():
-            pass
-
-        a()
-        self.assertEqual(_yappi._get_start_flags()["profile_builtins"], 0)
-        self.assertEqual(_yappi._get_start_flags()["profile_multicontext"], 1)
-        self.assertEqual(len(yappi.get_thread_stats()), 1)
-
-    def test_builtin_profiling(self):
-
-        def a():
-            time.sleep(0.4)  # is a builtin function
-
-        yappi.set_clock_type('wall')
-
-        yappi.start(builtins=True)
-        a()
-        stats = yappi.get_func_stats()
-        fsa = utils.find_stat_by_name(stats, 'sleep')
-        self.assertTrue(fsa is not None)
-        self.assertTrue(fsa.ttot > 0.3)
-        yappi.stop()
-        yappi.clear_stats()
-
-        def a():
-            pass
-
-        yappi.start()
-        t = threading.Thread(target=a)
-        t.start()
-        t.join()
-        stats = yappi.get_func_stats()
-
-    def test_singlethread_profiling(self):
-        yappi.set_clock_type('wall')
-
-        def a():
-            time.sleep(0.2)
-
-        class Worker1(threading.Thread):
-
-            def a(self):
-                time.sleep(0.3)
-
-            def run(self):
-                self.a()
-
-        yappi.start(profile_threads=False)
-
-        c = Worker1()
-        c.start()
-        c.join()
-        a()
-        stats = yappi.get_func_stats()
-        fsa1 = utils.find_stat_by_name(stats, 'Worker1.a')
-        fsa2 = utils.find_stat_by_name(stats, 'a')
-        self.assertTrue(fsa1 is None)
-        self.assertTrue(fsa2 is not None)
-        self.assertTrue(fsa2.ttot > 0.1)
-
-    def test_run(self):
-
-        def profiled():
-            pass
-
-        yappi.clear_stats()
-        try:
-            with yappi.run():
-                profiled()
-            stats = yappi.get_func_stats()
-        finally:
-            yappi.clear_stats()
-
-        self.assertIsNotNone(utils.find_stat_by_name(stats, 'profiled'))
-
-    def test_run_recursive(self):
-
-        def profiled():
-            pass
-
-        def not_profiled():
-            pass
-
-        yappi.clear_stats()
-        try:
-            with yappi.run():
-                with yappi.run():
-                    profiled()
-                # Profiling stopped here
-                not_profiled()
-            stats = yappi.get_func_stats()
-        finally:
-            yappi.clear_stats()
-
-        self.assertIsNotNone(utils.find_stat_by_name(stats, 'profiled'))
-        self.assertIsNone(utils.find_stat_by_name(stats, 'not_profiled'))
-
-
-class StatSaveScenarios(utils.YappiUnitTestCase):
-
-    def test_pstats_conversion(self):
-
-        def pstat_id(fs):
-            return (fs.module, fs.lineno, fs.name)
-
-        def a():
-            d()
-
-        def b():
-            d()
-
-        def c():
-            pass
-
-        def d():
-            pass
-
-        _timings = {"a_1": 12, "b_1": 7, "c_1": 5, "d_1": 2}
-        _yappi._set_test_timings(_timings)
-        stats = utils.run_and_get_func_stats(a, )
-        stats.strip_dirs()
-        stats.save("tests/a1.pstats", type="pstat")
-        fsa_pid = pstat_id(utils.find_stat_by_name(stats, "a"))
-        fsd_pid = pstat_id(utils.find_stat_by_name(stats, "d"))
-        yappi.clear_stats()
-        _yappi._set_test_timings(_timings)
-        stats = utils.run_and_get_func_stats(a, )
-        stats.strip_dirs()
-        stats.save("tests/a2.pstats", type="pstat")
-        yappi.clear_stats()
-        _yappi._set_test_timings(_timings)
-        stats = utils.run_and_get_func_stats(b, )
-        stats.strip_dirs()
-        stats.save("tests/b1.pstats", type="pstat")
-        fsb_pid = pstat_id(utils.find_stat_by_name(stats, "b"))
-        yappi.clear_stats()
-        _yappi._set_test_timings(_timings)
-        stats = utils.run_and_get_func_stats(c, )
-        stats.strip_dirs()
-        stats.save("tests/c1.pstats", type="pstat")
-        fsc_pid = pstat_id(utils.find_stat_by_name(stats, "c"))
-
-        # merge saved stats and check pstats values are correct
-        import pstats
-        p = pstats.Stats(
-            'tests/a1.pstats', 'tests/a2.pstats', 'tests/b1.pstats',
-            'tests/c1.pstats'
-        )
-        p.strip_dirs()
-        # ct = ttot, tt = tsub
-        (cc, nc, tt, ct, callers) = p.stats[fsa_pid]
-        self.assertEqual(cc, nc, 2)
-        self.assertEqual(tt, 20)
-        self.assertEqual(ct, 24)
-        (cc, nc, tt, ct, callers) = p.stats[fsd_pid]
-        self.assertEqual(cc, nc, 3)
-        self.assertEqual(tt, 6)
-        self.assertEqual(ct, 6)
-        self.assertEqual(len(callers), 2)
-        (cc, nc, tt, ct) = callers[fsa_pid]
-        self.assertEqual(cc, nc, 2)
-        self.assertEqual(tt, 4)
-        self.assertEqual(ct, 4)
-        (cc, nc, tt, ct) = callers[fsb_pid]
-        self.assertEqual(cc, nc, 1)
-        self.assertEqual(tt, 2)
-        self.assertEqual(ct, 2)
-
-    def test_merge_stats(self):
-        _timings = {
-            "a_1": 15,
-            "b_1": 14,
-            "c_1": 12,
-            "d_1": 10,
-            "e_1": 9,
-            "f_1": 7,
-            "g_1": 6,
-            "h_1": 5,
-            "i_1": 1
-        }
-        _yappi._set_test_timings(_timings)
-
-        def a():
-            b()
-
-        def b():
-            c()
-
-        def c():
-            d()
-
-        def d():
-            e()
-
-        def e():
-            f()
-
-        def f():
-            g()
-
-        def g():
-            h()
-
-        def h():
-            i()
-
-        def i():
-            pass
-
-        yappi.start()
-        a()
-        a()
-        yappi.stop()
-        stats = yappi.get_func_stats()
-        self.assertRaises(
-            NotImplementedError, stats.save, "", "INVALID_SAVE_TYPE"
-        )
-        stats.save("tests/ystats2.ys")
-        yappi.clear_stats()
-        _yappi._set_test_timings(_timings)
-        yappi.start()
-        a()
-        stats = yappi.get_func_stats().add("tests/ystats2.ys")
-        fsa = utils.find_stat_by_name(stats, "a")
-        fsb = utils.find_stat_by_name(stats, "b")
-        fsc = utils.find_stat_by_name(stats, "c")
-        fsd = utils.find_stat_by_name(stats, "d")
-        fse = utils.find_stat_by_name(stats, "e")
-        fsf = utils.find_stat_by_name(stats, "f")
-        fsg = utils.find_stat_by_name(stats, "g")
-        fsh = utils.find_stat_by_name(stats, "h")
-        fsi = utils.find_stat_by_name(stats, "i")
-        self.assertEqual(fsa.ttot, 45)
-        self.assertEqual(fsa.ncall, 3)
-        self.assertEqual(fsa.nactualcall, 3)
-        self.assertEqual(fsa.tsub, 3)
-        self.assertEqual(fsa.children[fsb].ttot, fsb.ttot)
-        self.assertEqual(fsa.children[fsb].tsub, fsb.tsub)
-        self.assertEqual(fsb.children[fsc].ttot, fsc.ttot)
-        self.assertEqual(fsb.children[fsc].tsub, fsc.tsub)
-        self.assertEqual(fsc.tsub, 6)
-        self.assertEqual(fsc.children[fsd].ttot, fsd.ttot)
-        self.assertEqual(fsc.children[fsd].tsub, fsd.tsub)
-        self.assertEqual(fsd.children[fse].ttot, fse.ttot)
-        self.assertEqual(fsd.children[fse].tsub, fse.tsub)
-        self.assertEqual(fse.children[fsf].ttot, fsf.ttot)
-        self.assertEqual(fse.children[fsf].tsub, fsf.tsub)
-        self.assertEqual(fsf.children[fsg].ttot, fsg.ttot)
-        self.assertEqual(fsf.children[fsg].tsub, fsg.tsub)
-        self.assertEqual(fsg.ttot, 18)
-        self.assertEqual(fsg.tsub, 3)
-        self.assertEqual(fsg.children[fsh].ttot, fsh.ttot)
-        self.assertEqual(fsg.children[fsh].tsub, fsh.tsub)
-        self.assertEqual(fsh.ttot, 15)
-        self.assertEqual(fsh.tsub, 12)
-        self.assertEqual(fsh.tavg, 5)
-        self.assertEqual(fsh.children[fsi].ttot, fsi.ttot)
-        self.assertEqual(fsh.children[fsi].tsub, fsi.tsub)
-        #stats.debug_print()
-
-    def test_merge_multithreaded_stats(self):
-        import _yappi
-        timings = {"a_1": 2, "b_1": 1}
-        _yappi._set_test_timings(timings)
-
-        def a():
-            pass
-
-        def b():
-            pass
-
-        yappi.start()
-        t = threading.Thread(target=a)
-        t.start()
-        t.join()
-        t = threading.Thread(target=b)
-        t.start()
-        t.join()
-        yappi.get_func_stats().save("tests/ystats1.ys")
-        yappi.clear_stats()
-        _yappi._set_test_timings(timings)
-        self.assertEqual(len(yappi.get_func_stats()), 0)
-        self.assertEqual(len(yappi.get_thread_stats()), 1)
-        t = threading.Thread(target=a)
-        t.start()
-        t.join()
-
-        self.assertEqual(_yappi._get_start_flags()["profile_builtins"], 0)
-        self.assertEqual(_yappi._get_start_flags()["profile_multicontext"], 1)
-        yappi.get_func_stats().save("tests/ystats2.ys")
-
-        stats = yappi.YFuncStats([
-            "tests/ystats1.ys",
-            "tests/ystats2.ys",
-        ])
-        fsa = utils.find_stat_by_name(stats, "a")
-        fsb = utils.find_stat_by_name(stats, "b")
-        self.assertEqual(fsa.ncall, 2)
-        self.assertEqual(fsb.ncall, 1)
-        self.assertEqual(fsa.tsub, fsa.ttot, 4)
-        self.assertEqual(fsb.tsub, fsb.ttot, 1)
-
-    def test_merge_load_different_clock_types(self):
-        yappi.start(builtins=True)
-
-        def a():
-            b()
-
-        def b():
-            c()
-
-        def c():
-            pass
-
-        t = threading.Thread(target=a)
-        t.start()
-        t.join()
-        yappi.get_func_stats().sort("name", "asc").save("tests/ystats1.ys")
-        yappi.stop()
-        yappi.clear_stats()
-        yappi.start(builtins=False)
-        t = threading.Thread(target=a)
-        t.start()
-        t.join()
-        yappi.get_func_stats().save("tests/ystats2.ys")
-        yappi.stop()
-        self.assertRaises(_yappi.error, yappi.set_clock_type, "wall")
-        yappi.clear_stats()
-        yappi.set_clock_type("wall")
-        yappi.start()
-        t = threading.Thread(target=a)
-        t.start()
-        t.join()
-        yappi.get_func_stats().save("tests/ystats3.ys")
-        self.assertRaises(
-            yappi.YappiError,
-            yappi.YFuncStats().add("tests/ystats1.ys").add, "tests/ystats3.ys"
-        )
-        stats = yappi.YFuncStats(["tests/ystats1.ys",
-                                  "tests/ystats2.ys"]).sort("name")
-        fsa = utils.find_stat_by_name(stats, "a")
-        fsb = utils.find_stat_by_name(stats, "b")
-        fsc = utils.find_stat_by_name(stats, "c")
-        self.assertEqual(fsa.ncall, 2)
-        self.assertEqual(fsa.ncall, fsb.ncall, fsc.ncall)
-
-    def test_merge_aabab_aabbc(self):
-        _timings = {
-            "a_1": 15,
-            "a_2": 14,
-            "b_1": 12,
-            "a_3": 10,
-            "b_2": 9,
-            "c_1": 4
-        }
-        _yappi._set_test_timings(_timings)
-
-        def a():
-            if self._ncall == 1:
-                self._ncall += 1
-                a()
-            elif self._ncall == 5:
-                self._ncall += 1
-                a()
-            else:
-                b()
-
-        def b():
-            if self._ncall == 2:
-                self._ncall += 1
-                a()
-            elif self._ncall == 6:
-                self._ncall += 1
-                b()
-            elif self._ncall == 7:
-                c()
-            else:
-                return
-
-        def c():
-            pass
-
-        self._ncall = 1
-        stats = utils.run_and_get_func_stats(a, )
-        stats.save("tests/ystats1.ys")
-        yappi.clear_stats()
-        _yappi._set_test_timings(_timings)
-        #stats.print_all()
-
-        self._ncall = 5
-        stats = utils.run_and_get_func_stats(a, )
-        stats.save("tests/ystats2.ys")
-
-        #stats.print_all()
-
-        def a():  # same name but another function(code object)
-            pass
-
-        yappi.start()
-        a()
-        stats = yappi.get_func_stats().add(
-            ["tests/ystats1.ys", "tests/ystats2.ys"]
-        )
-        #stats.print_all()
-        self.assertEqual(len(stats), 4)
-
-        fsa = None
-        for stat in stats:
-            if stat.name == "a" and stat.ttot == 45:
-                fsa = stat
-                break
-        self.assertTrue(fsa is not None)
-
-        self.assertEqual(fsa.ncall, 7)
-        self.assertEqual(fsa.nactualcall, 3)
-        self.assertEqual(fsa.ttot, 45)
-        self.assertEqual(fsa.tsub, 10)
-        fsb = utils.find_stat_by_name(stats, "b")
-        fsc = utils.find_stat_by_name(stats, "c")
-        self.assertEqual(fsb.ncall, 6)
-        self.assertEqual(fsb.nactualcall, 3)
-        self.assertEqual(fsb.ttot, 36)
-        self.assertEqual(fsb.tsub, 27)
-        self.assertEqual(fsb.tavg, 6)
-        self.assertEqual(fsc.ttot, 8)
-        self.assertEqual(fsc.tsub, 8)
-        self.assertEqual(fsc.tavg, 4)
-        self.assertEqual(fsc.nactualcall, fsc.ncall, 2)
-
-
-class MultithreadedScenarios(utils.YappiUnitTestCase):
-
-    def test_issue_32(self):
-        '''
-        Start yappi from different thread and we get Internal Error(15) as 
-        the current_ctx_id() called while enumerating the threads in start() 
-        and as it does not swap to the enumerated ThreadState* the THreadState_GetDict()
-        returns wrong object and thus sets an invalid id for the _ctx structure.
-
-        When this issue happens multiple Threads have same tid as the internal ts_ptr
-        will be same for different contexts. So, let's see if that happens
-        '''
-
-        def foo():
-            time.sleep(0.2)
-
-        def bar():
-            time.sleep(0.1)
-
-        def thread_func():
-            yappi.set_clock_type("wall")
-            yappi.start()
-
-            bar()
-
-        t = threading.Thread(target=thread_func)
-        t.start()
-        t.join()
-
-        foo()
-
-        yappi.stop()
-
-        thread_ids = set()
-        for tstat in yappi.get_thread_stats():
-            self.assertTrue(tstat.tid not in thread_ids)
-            thread_ids.add(tstat.tid)
-
-    def test_subsequent_profile(self):
-        WORKER_COUNT = 5
-
-        def a():
-            pass
-
-        def b():
-            pass
-
-        def c():
-            pass
-
-        _timings = {
-            "a_1": 3,
-            "b_1": 2,
-            "c_1": 1,
-        }
-
-        yappi.start()
-
-        def g():
-            pass
-
-        g()
-        yappi.stop()
-        yappi.clear_stats()
-        _yappi._set_test_timings(_timings)
-        yappi.start()
-
-        _dummy = []
-        for i in range(WORKER_COUNT):
-            t = threading.Thread(target=a)
-            t.start()
-            t.join()
-        for i in range(WORKER_COUNT):
-            t = threading.Thread(target=b)
-            t.start()
-            _dummy.append(t)
-            t.join()
-        for i in range(WORKER_COUNT):
-            t = threading.Thread(target=a)
-            t.start()
-            t.join()
-        for i in range(WORKER_COUNT):
-            t = threading.Thread(target=c)
-            t.start()
-            t.join()
-        yappi.stop()
-        yappi.start()
-
-        def f():
-            pass
-
-        f()
-        stats = yappi.get_func_stats()
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        fsc = utils.find_stat_by_name(stats, 'c')
-        self.assertEqual(fsa.ncall, 10)
-        self.assertEqual(fsb.ncall, 5)
-        self.assertEqual(fsc.ncall, 5)
-        self.assertEqual(fsa.ttot, fsa.tsub, 30)
-        self.assertEqual(fsb.ttot, fsb.tsub, 10)
-        self.assertEqual(fsc.ttot, fsc.tsub, 5)
-
-        # MACOSx optimizes by only creating one worker thread
-        self.assertTrue(len(yappi.get_thread_stats()) >= 2)
-
-    def test_basic(self):
-        yappi.set_clock_type('wall')
-
-        def dummy():
-            pass
-
-        def a():
-            time.sleep(0.2)
-
-        class Worker1(threading.Thread):
-
-            def a(self):
-                time.sleep(0.3)
-
-            def run(self):
-                self.a()
-
-        yappi.start(builtins=False, profile_threads=True)
-
-        c = Worker1()
-        c.start()
-        c.join()
-        a()
-        stats = yappi.get_func_stats()
-        fsa1 = utils.find_stat_by_name(stats, 'Worker1.a')
-        fsa2 = utils.find_stat_by_name(stats, 'a')
-        self.assertTrue(fsa1 is not None)
-        self.assertTrue(fsa2 is not None)
-        self.assertTrue(fsa1.ttot > 0.2)
-        self.assertTrue(fsa2.ttot > 0.1)
-        tstats = yappi.get_thread_stats()
-        self.assertEqual(len(tstats), 2)
-        tsa = utils.find_stat_by_name(tstats, 'Worker1')
-        tsm = utils.find_stat_by_name(tstats, '_MainThread')
-        dummy()  # call dummy to force ctx name to be retrieved again.
-        self.assertTrue(tsa is not None)
-        # TODO: I put dummy() to fix below, remove the comments after a while.
-        self.assertTrue( # FIX: I see this fails sometimes?
-            tsm is not None,
-            f"Could not find \"_MainThread\". Found: {', '.join(utils.get_stat_names(tstats))}")
-
-    def test_ctx_stats(self):
-        from threading import Thread
-        DUMMY_WORKER_COUNT = 5
-        yappi.start()
-
-        class DummyThread(Thread):
-            pass
-
-        def dummy():
-            pass
-
-        def dummy_worker():
-            pass
-
-        for i in range(DUMMY_WORKER_COUNT):
-            t = DummyThread(target=dummy_worker)
-            t.start()
-            t.join()
-        yappi.stop()
-        stats = yappi.get_thread_stats()
-        tsa = utils.find_stat_by_name(stats, "DummyThread")
-        self.assertTrue(tsa is not None)
-        yappi.clear_stats()
-        time.sleep(1.0)
-        _timings = {
-            "a_1": 6,
-            "b_1": 5,
-            "c_1": 3,
-            "d_1": 1,
-            "a_2": 4,
-            "b_2": 3,
-            "c_2": 2,
-            "d_2": 1
-        }
-        _yappi._set_test_timings(_timings)
-
-        class Thread1(Thread):
-            pass
-
-        class Thread2(Thread):
-            pass
-
-        def a():
-            b()
-
-        def b():
-            c()
-
-        def c():
-            d()
-
-        def d():
-            time.sleep(0.6)
-
-        yappi.set_clock_type("wall")
-        yappi.start()
-        t1 = Thread1(target=a)
-        t1.start()
-        t2 = Thread2(target=a)
-        t2.start()
-        t1.join()
-        t2.join()
-        stats = yappi.get_thread_stats()
-
-        # the fist clear_stats clears the context table?
-        tsa = utils.find_stat_by_name(stats, "DummyThread")
-        self.assertTrue(tsa is None)
-
-        tst1 = utils.find_stat_by_name(stats, "Thread1")
-        tst2 = utils.find_stat_by_name(stats, "Thread2")
-        tsmain = utils.find_stat_by_name(stats, "_MainThread")
-        dummy()  # call dummy to force ctx name to be retrieved again.
-        self.assertTrue(len(stats) == 3)
-        self.assertTrue(tst1 is not None)
-        self.assertTrue(tst2 is not None)
-        # TODO: I put dummy() to fix below, remove the comments after a while.
-        self.assertTrue( # FIX: I see this fails sometimes
-            tsmain is not None,
-            f"Could not find \"_MainThread\". Found: {', '.join(utils.get_stat_names(stats))}")
-        self.assertTrue(1.0 > tst2.ttot >= 0.5)
-        self.assertTrue(1.0 > tst1.ttot >= 0.5)
-
-        # test sorting of the ctx stats
-        stats = stats.sort("totaltime", "desc")
-        prev_stat = None
-        for stat in stats:
-            if prev_stat:
-                self.assertTrue(prev_stat.ttot >= stat.ttot)
-            prev_stat = stat
-        stats = stats.sort("totaltime", "asc")
-        prev_stat = None
-        for stat in stats:
-            if prev_stat:
-                self.assertTrue(prev_stat.ttot <= stat.ttot)
-            prev_stat = stat
-        stats = stats.sort("schedcount", "desc")
-        prev_stat = None
-        for stat in stats:
-            if prev_stat:
-                self.assertTrue(prev_stat.sched_count >= stat.sched_count)
-            prev_stat = stat
-        stats = stats.sort("name", "desc")
-        prev_stat = None
-        for stat in stats:
-            if prev_stat:
-                self.assertTrue(prev_stat.name.lower() >= stat.name.lower())
-            prev_stat = stat
-        self.assertRaises(
-            yappi.YappiError, stats.sort, "invalid_thread_sorttype_arg"
-        )
-        self.assertRaises(
-            yappi.YappiError, stats.sort, "invalid_thread_sortorder_arg"
-        )
-
-    def test_ctx_stats_cpu(self):
-
-        def get_thread_name():
-            try:
-                return threading.current_thread().name
-            except AttributeError:
-                return "Anonymous"
-
-        def burn_cpu(sec):
-            t0 = yappi.get_clock_time()
-            elapsed = 0
-            while (elapsed < sec):
-                for _ in range(1000):
-                    pass
-                elapsed = yappi.get_clock_time() - t0
-
-        def test():
-
-            ts = []
-            for i in (0.01, 0.05, 0.1):
-                t = threading.Thread(target=burn_cpu, args=(i, ))
-                t.name = f"burn_cpu-{str(i)}"
-                t.start()
-                ts.append(t)
-            for t in ts:
-                t.join()
-
-        yappi.set_clock_type("cpu")
-        yappi.set_context_name_callback(get_thread_name)
-
-        yappi.start()
-
-        test()
-
-        yappi.stop()
-
-        tstats = yappi.get_thread_stats()
-        r1 = '''
-        burn_cpu-0.1      3      123145356058624  0.100105  8
-        burn_cpu-0.05     2      123145361313792  0.050149  8
-        burn_cpu-0.01     1      123145356058624  0.010127  2
-        MainThread        0      4321620864       0.001632  6
-        '''
-        self.assert_ctx_stats_almost_equal(r1, tstats)
-
-    def test_producer_consumer_with_queues(self):
-        # we currently just stress yappi, no functionality test is done here.
-        yappi.start()
-        from queue import Queue
-        from threading import Thread
-        WORKER_THREAD_COUNT = 50
-        WORK_ITEM_COUNT = 2000
-
-        def worker():
-            while True:
-                item = q.get()
-                # do the work with item
-                q.task_done()
-
-        q = Queue()
-        for i in range(WORKER_THREAD_COUNT):
-            t = Thread(target=worker)
-            t.daemon = True
-            t.start()
-
-        for item in range(WORK_ITEM_COUNT):
-            q.put(item)
-        q.join()  # block until all tasks are done
-        #yappi.get_func_stats().sort("callcount").print_all()
-        yappi.stop()
-
-    def test_temporary_lock_waiting(self):
-        yappi.start()
-        _lock = threading.Lock()
-
-        def worker():
-            _lock.acquire()
-            try:
-                time.sleep(1.0)
-            finally:
-                _lock.release()
-
-        t1 = threading.Thread(target=worker)
-        t2 = threading.Thread(target=worker)
-        t1.start()
-        t2.start()
-        t1.join()
-        t2.join()
-        #yappi.get_func_stats().sort("callcount").print_all()
-        yappi.stop()
-
-    @unittest.skipIf(os.name != "posix", "requires Posix compliant OS")
-    def test_signals_with_blocking_calls(self):
-        import signal, os, time
-
-        # just to verify if signal is handled correctly and stats/yappi are not corrupted.
-        def handler(signum, frame):
-            raise Exception("Signal handler executed!")
-
-        yappi.start()
-        signal.signal(signal.SIGALRM, handler)
-        signal.alarm(1)
-        self.assertRaises(Exception, time.sleep, 2)
-        stats = yappi.get_func_stats()
-        fsh = utils.find_stat_by_name(stats, "handler")
-        self.assertTrue(fsh is not None)
-
-    def test_concurrent_futures(self):
-        yappi.start()
-        from concurrent.futures import ThreadPoolExecutor
-        with ThreadPoolExecutor(max_workers=5) as executor:
-            f = executor.submit(pow, 5, 2)
-            self.assertEqual(f.result(), 25)
-        time.sleep(1.0)
-        yappi.stop()
-
-    def test_barrier(self):
-        yappi.start()
-        b = threading.Barrier(2, timeout=1)
-
-        def worker():
-            try:
-                b.wait()
-            except threading.BrokenBarrierError:
-                pass
-            except Exception:
-                raise Exception("BrokenBarrierError not raised")
-
-        t1 = threading.Thread(target=worker)
-        t1.start()
-        #b.wait()
-        t1.join()
-        yappi.stop()
-
-
-class NonRecursiveFunctions(utils.YappiUnitTestCase):
-
-    def test_abcd(self):
-        _timings = {"a_1": 6, "b_1": 5, "c_1": 3, "d_1": 1}
-        _yappi._set_test_timings(_timings)
-
-        def a():
-            b()
-
-        def b():
-            c()
-
-        def c():
-            d()
-
-        def d():
-            pass
-
-        stats = utils.run_and_get_func_stats(a)
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        fsc = utils.find_stat_by_name(stats, 'c')
-        fsd = utils.find_stat_by_name(stats, 'd')
-        cfsab = fsa.children[fsb]
-        cfsbc = fsb.children[fsc]
-        cfscd = fsc.children[fsd]
-
-        self.assertEqual(fsa.ttot, 6)
-        self.assertEqual(fsa.tsub, 1)
-        self.assertEqual(fsb.ttot, 5)
-        self.assertEqual(fsb.tsub, 2)
-        self.assertEqual(fsc.ttot, 3)
-        self.assertEqual(fsc.tsub, 2)
-        self.assertEqual(fsd.ttot, 1)
-        self.assertEqual(fsd.tsub, 1)
-        self.assertEqual(cfsab.ttot, 5)
-        self.assertEqual(cfsab.tsub, 2)
-        self.assertEqual(cfsbc.ttot, 3)
-        self.assertEqual(cfsbc.tsub, 2)
-        self.assertEqual(cfscd.ttot, 1)
-        self.assertEqual(cfscd.tsub, 1)
-
-    def test_stop_in_middle(self):
-        _timings = {"a_1": 6, "b_1": 4}
-        _yappi._set_test_timings(_timings)
-
-        def a():
-            b()
-            yappi.stop()
-
-        def b():
-            time.sleep(0.2)
-
-        yappi.start()
-        a()
-        stats = yappi.get_func_stats()
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-
-        self.assertEqual(fsa.ncall, 1)
-        self.assertEqual(fsa.nactualcall, 0)
-        self.assertEqual(fsa.ttot, 0)  # no call_leave called
-        self.assertEqual(fsa.tsub, 0)  # no call_leave called
-        self.assertEqual(fsb.ttot, 4)
-
-
-class RecursiveFunctions(utils.YappiUnitTestCase):
-
-    def test_fibonacci(self):
-
-        def fib(n):
-            if n > 1:
-                return fib(n - 1) + fib(n - 2)
-            else:
-                return n
-
-        stats = utils.run_and_get_func_stats(fib, 22)
-        fs = utils.find_stat_by_name(stats, 'fib')
-        self.assertEqual(fs.ncall, 57313)
-        self.assertEqual(fs.ttot, fs.tsub)
-
-    def test_abcadc(self):
-        _timings = {
-            "a_1": 20,
-            "b_1": 19,
-            "c_1": 17,
-            "a_2": 13,
-            "d_1": 12,
-            "c_2": 10,
-            "a_3": 5
-        }
-        _yappi._set_test_timings(_timings)
-
-        def a(n):
-            if n == 3:
-                return
-            if n == 1 + 1:
-                d(n)
-            else:
-                b(n)
-
-        def b(n):
-            c(n)
-
-        def c(n):
-            a(n + 1)
-
-        def d(n):
-            c(n)
-
-        stats = utils.run_and_get_func_stats(a, 1)
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        fsc = utils.find_stat_by_name(stats, 'c')
-        fsd = utils.find_stat_by_name(stats, 'd')
-        self.assertEqual(fsa.ncall, 3)
-        self.assertEqual(fsa.nactualcall, 1)
-        self.assertEqual(fsa.ttot, 20)
-        self.assertEqual(fsa.tsub, 7)
-        self.assertEqual(fsb.ttot, 19)
-        self.assertEqual(fsb.tsub, 2)
-        self.assertEqual(fsc.ttot, 17)
-        self.assertEqual(fsc.tsub, 9)
-        self.assertEqual(fsd.ttot, 12)
-        self.assertEqual(fsd.tsub, 2)
-        cfsca = fsc.children[fsa]
-        self.assertEqual(cfsca.nactualcall, 0)
-        self.assertEqual(cfsca.ncall, 2)
-        self.assertEqual(cfsca.ttot, 13)
-        self.assertEqual(cfsca.tsub, 6)
-
-    def test_aaaa(self):
-        _timings = {"d_1": 9, "d_2": 7, "d_3": 3, "d_4": 2}
-        _yappi._set_test_timings(_timings)
-
-        def d(n):
-            if n == 3:
-                return
-            d(n + 1)
-
-        stats = utils.run_and_get_func_stats(d, 0)
-        fsd = utils.find_stat_by_name(stats, 'd')
-        self.assertEqual(fsd.ncall, 4)
-        self.assertEqual(fsd.nactualcall, 1)
-        self.assertEqual(fsd.ttot, 9)
-        self.assertEqual(fsd.tsub, 9)
-        cfsdd = fsd.children[fsd]
-        self.assertEqual(cfsdd.ttot, 7)
-        self.assertEqual(cfsdd.tsub, 7)
-        self.assertEqual(cfsdd.ncall, 3)
-        self.assertEqual(cfsdd.nactualcall, 0)
-
-    def test_abcabc(self):
-        _timings = {
-            "a_1": 20,
-            "b_1": 19,
-            "c_1": 17,
-            "a_2": 13,
-            "b_2": 11,
-            "c_2": 9,
-            "a_3": 6
-        }
-        _yappi._set_test_timings(_timings)
-
-        def a(n):
-            if n == 3:
-                return
-            else:
-                b(n)
-
-        def b(n):
-            c(n)
-
-        def c(n):
-            a(n + 1)
-
-        stats = utils.run_and_get_func_stats(a, 1)
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        fsc = utils.find_stat_by_name(stats, 'c')
-        self.assertEqual(fsa.ncall, 3)
-        self.assertEqual(fsa.nactualcall, 1)
-        self.assertEqual(fsa.ttot, 20)
-        self.assertEqual(fsa.tsub, 9)
-        self.assertEqual(fsb.ttot, 19)
-        self.assertEqual(fsb.tsub, 4)
-        self.assertEqual(fsc.ttot, 17)
-        self.assertEqual(fsc.tsub, 7)
-        cfsab = fsa.children[fsb]
-        cfsbc = fsb.children[fsc]
-        cfsca = fsc.children[fsa]
-        self.assertEqual(cfsab.ttot, 19)
-        self.assertEqual(cfsab.tsub, 4)
-        self.assertEqual(cfsbc.ttot, 17)
-        self.assertEqual(cfsbc.tsub, 7)
-        self.assertEqual(cfsca.ttot, 13)
-        self.assertEqual(cfsca.tsub, 8)
-
-    def test_abcbca(self):
-        _timings = {"a_1": 10, "b_1": 9, "c_1": 7, "b_2": 4, "c_2": 2, "a_2": 1}
-        _yappi._set_test_timings(_timings)
-        self._ncall = 1
-
-        def a():
-            if self._ncall == 1:
-                b()
-            else:
-                return
-
-        def b():
-            c()
-
-        def c():
-            if self._ncall == 1:
-                self._ncall += 1
-                b()
-            else:
-                a()
-
-        stats = utils.run_and_get_func_stats(a)
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        fsc = utils.find_stat_by_name(stats, 'c')
-        cfsab = fsa.children[fsb]
-        cfsbc = fsb.children[fsc]
-        cfsca = fsc.children[fsa]
-        self.assertEqual(fsa.ttot, 10)
-        self.assertEqual(fsa.tsub, 2)
-        self.assertEqual(fsb.ttot, 9)
-        self.assertEqual(fsb.tsub, 4)
-        self.assertEqual(fsc.ttot, 7)
-        self.assertEqual(fsc.tsub, 4)
-        self.assertEqual(cfsab.ttot, 9)
-        self.assertEqual(cfsab.tsub, 2)
-        self.assertEqual(cfsbc.ttot, 7)
-        self.assertEqual(cfsbc.tsub, 4)
-        self.assertEqual(cfsca.ttot, 1)
-        self.assertEqual(cfsca.tsub, 1)
-        self.assertEqual(cfsca.ncall, 1)
-        self.assertEqual(cfsca.nactualcall, 0)
-
-    def test_aabccb(self):
-        _timings = {
-            "a_1": 13,
-            "a_2": 11,
-            "b_1": 9,
-            "c_1": 5,
-            "c_2": 3,
-            "b_2": 1
-        }
-        _yappi._set_test_timings(_timings)
-        self._ncall = 1
-
-        def a():
-            if self._ncall == 1:
-                self._ncall += 1
-                a()
-            else:
-                b()
-
-        def b():
-            if self._ncall == 3:
-                return
-            else:
-                c()
-
-        def c():
-            if self._ncall == 2:
-                self._ncall += 1
-                c()
-            else:
-                b()
-
-        stats = utils.run_and_get_func_stats(a)
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        fsc = utils.find_stat_by_name(stats, 'c')
-        cfsaa = fsa.children[fsa.index]
-        cfsab = fsa.children[fsb]
-        cfsbc = fsb.children[fsc.full_name]
-        cfscc = fsc.children[fsc]
-        cfscb = fsc.children[fsb]
-        self.assertEqual(fsb.ttot, 9)
-        self.assertEqual(fsb.tsub, 5)
-        self.assertEqual(cfsbc.ttot, 5)
-        self.assertEqual(cfsbc.tsub, 2)
-        self.assertEqual(fsa.ttot, 13)
-        self.assertEqual(fsa.tsub, 4)
-        self.assertEqual(cfsab.ttot, 9)
-        self.assertEqual(cfsab.tsub, 4)
-        self.assertEqual(cfsaa.ttot, 11)
-        self.assertEqual(cfsaa.tsub, 2)
-        self.assertEqual(fsc.ttot, 5)
-        self.assertEqual(fsc.tsub, 4)
-
-    def test_abaa(self):
-        _timings = {"a_1": 13, "b_1": 10, "a_2": 9, "a_3": 5}
-        _yappi._set_test_timings(_timings)
-
-        self._ncall = 1
-
-        def a():
-            if self._ncall == 1:
-                b()
-            elif self._ncall == 2:
-                self._ncall += 1
-                a()
-            else:
-                return
-
-        def b():
-            self._ncall += 1
-            a()
-
-        stats = utils.run_and_get_func_stats(a)
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        cfsaa = fsa.children[fsa]
-        cfsba = fsb.children[fsa]
-        self.assertEqual(fsb.ttot, 10)
-        self.assertEqual(fsb.tsub, 1)
-        self.assertEqual(fsa.ttot, 13)
-        self.assertEqual(fsa.tsub, 12)
-        self.assertEqual(cfsaa.ttot, 5)
-        self.assertEqual(cfsaa.tsub, 5)
-        self.assertEqual(cfsba.ttot, 9)
-        self.assertEqual(cfsba.tsub, 4)
-
-    def test_aabb(self):
-        _timings = {"a_1": 13, "a_2": 10, "b_1": 9, "b_2": 5}
-        _yappi._set_test_timings(_timings)
-
-        self._ncall = 1
-
-        def a():
-            if self._ncall == 1:
-                self._ncall += 1
-                a()
-            elif self._ncall == 2:
-                b()
-            else:
-                return
-
-        def b():
-            if self._ncall == 2:
-                self._ncall += 1
-                b()
-            else:
-                return
-
-        stats = utils.run_and_get_func_stats(a)
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        cfsaa = fsa.children[fsa]
-        cfsab = fsa.children[fsb]
-        cfsbb = fsb.children[fsb]
-        self.assertEqual(fsa.ttot, 13)
-        self.assertEqual(fsa.tsub, 4)
-        self.assertEqual(fsb.ttot, 9)
-        self.assertEqual(fsb.tsub, 9)
-        self.assertEqual(cfsaa.ttot, 10)
-        self.assertEqual(cfsaa.tsub, 1)
-        self.assertEqual(cfsab.ttot, 9)
-        self.assertEqual(cfsab.tsub, 4)
-        self.assertEqual(cfsbb.ttot, 5)
-        self.assertEqual(cfsbb.tsub, 5)
-
-    def test_abbb(self):
-        _timings = {"a_1": 13, "b_1": 10, "b_2": 6, "b_3": 1}
-        _yappi._set_test_timings(_timings)
-
-        self._ncall = 1
-
-        def a():
-            if self._ncall == 1:
-                b()
-
-        def b():
-            if self._ncall == 3:
-                return
-            self._ncall += 1
-            b()
-
-        stats = utils.run_and_get_func_stats(a)
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        cfsab = fsa.children[fsb]
-        cfsbb = fsb.children[fsb]
-        self.assertEqual(fsa.ttot, 13)
-        self.assertEqual(fsa.tsub, 3)
-        self.assertEqual(fsb.ttot, 10)
-        self.assertEqual(fsb.tsub, 10)
-        self.assertEqual(fsb.ncall, 3)
-        self.assertEqual(fsb.nactualcall, 1)
-        self.assertEqual(cfsab.ttot, 10)
-        self.assertEqual(cfsab.tsub, 4)
-        self.assertEqual(cfsbb.ttot, 6)
-        self.assertEqual(cfsbb.tsub, 6)
-        self.assertEqual(cfsbb.nactualcall, 0)
-        self.assertEqual(cfsbb.ncall, 2)
-
-    def test_aaab(self):
-        _timings = {"a_1": 13, "a_2": 10, "a_3": 6, "b_1": 1}
-        _yappi._set_test_timings(_timings)
-
-        self._ncall = 1
-
-        def a():
-            if self._ncall == 3:
-                b()
-                return
-            self._ncall += 1
-            a()
-
-        def b():
-            return
-
-        stats = utils.run_and_get_func_stats(a)
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        cfsaa = fsa.children[fsa]
-        cfsab = fsa.children[fsb]
-        self.assertEqual(fsa.ttot, 13)
-        self.assertEqual(fsa.tsub, 12)
-        self.assertEqual(fsb.ttot, 1)
-        self.assertEqual(fsb.tsub, 1)
-        self.assertEqual(cfsaa.ttot, 10)
-        self.assertEqual(cfsaa.tsub, 9)
-        self.assertEqual(cfsab.ttot, 1)
-        self.assertEqual(cfsab.tsub, 1)
-
-    def test_abab(self):
-        _timings = {"a_1": 13, "b_1": 10, "a_2": 6, "b_2": 1}
-        _yappi._set_test_timings(_timings)
-
-        self._ncall = 1
-
-        def a():
-            b()
-
-        def b():
-            if self._ncall == 2:
-                return
-            self._ncall += 1
-            a()
-
-        stats = utils.run_and_get_func_stats(a)
-        fsa = utils.find_stat_by_name(stats, 'a')
-        fsb = utils.find_stat_by_name(stats, 'b')
-        cfsab = fsa.children[fsb]
-        cfsba = fsb.children[fsa]
-        self.assertEqual(fsa.ttot, 13)
-        self.assertEqual(fsa.tsub, 8)
-        self.assertEqual(fsb.ttot, 10)
-        self.assertEqual(fsb.tsub, 5)
-        self.assertEqual(cfsab.ttot, 10)
-        self.assertEqual(cfsab.tsub, 5)
-        self.assertEqual(cfsab.ncall, 2)
-        self.assertEqual(cfsab.nactualcall, 1)
-        self.assertEqual(cfsba.ttot, 6)
-        self.assertEqual(cfsba.tsub, 5)
-
-
-if __name__ == '__main__':
-    #     import sys;sys.argv = ['', 'BasicUsage.test_run_as_script']
-    #     import sys;sys.argv = ['', 'MultithreadedScenarios.test_subsequent_profile']
-    unittest.main()
-+import os
-+import sys
-+import time
-+import threading
-+import unittest
-+import yappi
-+import _yappi
-+import utils
-+import multiprocessing
-+import subprocess
-+
-+_counter = 0
-+
-+
-+class BasicUsage(utils.YappiUnitTestCase):
-+
-+    def test_callback_function_int_return_overflow(self):
-+        # this test is just here to check if any errors are generated, as the err
-+        # is printed in C side, I did not include it here. THere are ways to test
-+        # this deterministically, I did not bother
-+        import ctypes
-+
-+        def _unsigned_overflow_margin():
-+            return 2**(ctypes.sizeof(ctypes.c_void_p) * 8) - 1
-+
-+        def foo():
-+            pass
-+
-+        #with utils.captured_output() as (out, err):
-+        yappi.set_context_id_callback(_unsigned_overflow_margin)
-+        yappi.set_tag_callback(_unsigned_overflow_margin)
-+        yappi.start()
-+        foo()
-+
-+    def test_issue60(self):
-+
-+        def foo():
-+            buf = bytearray()
-+            buf += b't' * 200
-+            view = memoryview(buf)[10:]
-+            view = view.tobytes()
-+            del buf[:10]  # this throws exception
-+            return view
-+
-+        yappi.start(builtins=True)
-+        foo()
-+        self.assertTrue(
-+            len(
-+                yappi.get_func_stats(
-+                    filter_callback=lambda x: yappi.
-+                    func_matches(x, [memoryview.tobytes])
-+                )
-+            ) > 0
-+        )
-+        yappi.stop()
-+
-+    def test_issue54(self):
-+
-+        def _tag_cbk():
-+            global _counter
-+            _counter += 1
-+            return _counter
-+
-+        def a():
-+            pass
-+
-+        def b():
-+            pass
-+
-+        yappi.set_tag_callback(_tag_cbk)
-+        yappi.start()
-+        a()
-+        a()
-+        a()
-+        yappi.stop()
-+        stats = yappi.get_func_stats()
-+        self.assertEqual(stats.pop().ncall, 3)  # aggregated if no tag is given
-+        stats = yappi.get_func_stats(tag=1)
-+
-+        for i in range(1, 3):
-+            stats = yappi.get_func_stats(tag=i)
-+            stats = yappi.get_func_stats(
-+                tag=i, filter_callback=lambda x: yappi.func_matches(x, [a])
-+            )
-+
-+            stat = stats.pop()
-+            self.assertEqual(stat.ncall, 1)
-+
-+        yappi.set_tag_callback(None)
-+        yappi.clear_stats()
-+        yappi.start()
-+        b()
-+        b()
-+        stats = yappi.get_func_stats()
-+        self.assertEqual(len(stats), 1)
-+        stat = stats.pop()
-+        self.assertEqual(stat.ncall, 2)
-+
-+    def test_filter(self):
-+
-+        def a():
-+            pass
-+
-+        def b():
-+            a()
-+
-+        def c():
-+            b()
-+
-+        _TCOUNT = 5
-+
-+        ts = []
-+        yappi.start()
-+        for i in range(_TCOUNT):
-+            t = threading.Thread(target=c)
-+            t.start()
-+            ts.append(t)
-+
-+        for t in ts:
-+            t.join()
-+
-+        yappi.stop()
-+
-+        ctx_ids = []
-+        for tstat in yappi.get_thread_stats():
-+            if tstat.name == '_MainThread':
-+                main_ctx_id = tstat.id
-+            else:
-+                ctx_ids.append(tstat.id)
-+
-+        fstats = yappi.get_func_stats(filter={"ctx_id": 9})
-+        self.assertTrue(fstats.empty())
-+        fstats = yappi.get_func_stats(
-+            filter={
-+                "ctx_id": main_ctx_id,
-+                "name": "c"
-+            }
-+        )  # main thread
-+        self.assertTrue(fstats.empty())
-+
-+        for i in ctx_ids:
-+            fstats = yappi.get_func_stats(
-+                filter={
-+                    "ctx_id": i,
-+                    "name": "a",
-+                    "ncall": 1
-+                }
-+            )
-+            self.assertEqual(fstats.pop().ncall, 1)
-+            fstats = yappi.get_func_stats(filter={"ctx_id": i, "name": "b"})
-+            self.assertEqual(fstats.pop().ncall, 1)
-+            fstats = yappi.get_func_stats(filter={"ctx_id": i, "name": "c"})
-+            self.assertEqual(fstats.pop().ncall, 1)
-+
-+        yappi.clear_stats()
-+        yappi.start(builtins=True)
-+        time.sleep(0.1)
-+        yappi.stop()
-+        fstats = yappi.get_func_stats(filter={"module": "time"})
-+        self.assertEqual(len(fstats), 1)
-+
-+        # invalid filters`
-+        self.assertRaises(
-+            Exception, yappi.get_func_stats, filter={'tag': "sss"}
-+        )
-+        self.assertRaises(
-+            Exception, yappi.get_func_stats, filter={'ctx_id': "None"}
-+        )
-+
-+    def test_filter_callback(self):
-+
-+        def a():
-+            time.sleep(0.1)
-+
-+        def b():
-+            a()
-+
-+        def c():
-+            pass
-+
-+        def d():
-+            pass
-+
-+        yappi.set_clock_type("wall")
-+        yappi.start(builtins=True)
-+        a()
-+        b()
-+        c()
-+        d()
-+        stats = yappi.get_func_stats(
-+            filter_callback=lambda x: yappi.func_matches(x, [a, b])
-+        )
-+        #stats.print_all()
-+        r1 = '''
-+        tests/test_functionality.py:98 a      2      0.000000  0.200350  0.100175
-+        tests/test_functionality.py:101 b     1      0.000000  0.120000  0.100197
-+        '''
-+        self.assert_traces_almost_equal(r1, stats)
-+        self.assertEqual(len(stats), 2)
-+        stats = yappi.get_func_stats(
-+            filter_callback=lambda x: yappi.
-+            module_matches(x, [sys.modules[__name__]])
-+        )
-+        r1 = '''
-+        tests/test_functionality.py:98 a      2      0.000000  0.230130  0.115065
-+        tests/test_functionality.py:101 b     1      0.000000  0.120000  0.109011
-+        tests/test_functionality.py:104 c     1      0.000000  0.000002  0.000002
-+        tests/test_functionality.py:107 d     1      0.000000  0.000001  0.000001
-+        '''
-+        self.assert_traces_almost_equal(r1, stats)
-+        self.assertEqual(len(stats), 4)
-+
-+        stats = yappi.get_func_stats(
-+            filter_callback=lambda x: yappi.func_matches(x, [time.sleep])
-+        )
-+        self.assertEqual(len(stats), 1)
-+        r1 = '''
-+        time.sleep                            2      0.206804  0.220000  0.103402
-+        '''
-+        self.assert_traces_almost_equal(r1, stats)
-+
-+    def test_print_formatting(self):
-+
-+        def a():
-+            pass
-+
-+        def b():
-+            a()
-+
-+        func_cols = {
-+            1: ("name", 48),
-+            0: ("ncall", 5),
-+            2: ("tsub", 8),
-+        }
-+        thread_cols = {
-+            1: ("name", 48),
-+            0: ("ttot", 8),
-+        }
-+
-+        yappi.start()
-+        a()
-+        b()
-+        yappi.stop()
-+        fs = yappi.get_func_stats()
-+        cs = fs[1].children
-+        ts = yappi.get_thread_stats()
-+        #fs.print_all(out=sys.stderr, columns={1:("name", 70), })
-+        #cs.print_all(out=sys.stderr, columns=func_cols)
-+        #ts.print_all(out=sys.stderr, columns=thread_cols)
-+        #cs.print_all(out=sys.stderr, columns={})
-+
-+        self.assertRaises(
-+            yappi.YappiError, fs.print_all, columns={1: ("namee", 9)}
-+        )
-+        self.assertRaises(
-+            yappi.YappiError, cs.print_all, columns={1: ("dd", 0)}
-+        )
-+        self.assertRaises(
-+            yappi.YappiError, ts.print_all, columns={1: ("tidd", 0)}
-+        )
-+
-+    def test_get_clock(self):
-+        yappi.set_clock_type('cpu')
-+        self.assertEqual('cpu', yappi.get_clock_type())
-+        clock_info = yappi.get_clock_info()
-+        self.assertTrue('api' in clock_info)
-+        self.assertTrue('resolution' in clock_info)
-+
-+        yappi.set_clock_type('wall')
-+        self.assertEqual('wall', yappi.get_clock_type())
-+
-+        t0 = yappi.get_clock_time()
-+        time.sleep(0.1)
-+        duration = yappi.get_clock_time() - t0
-+        self.assertTrue(0.05 < duration < 0.3)
-+
-+    def test_profile_decorator(self):
-+
-+        def aggregate(func, stats):
-+            fname = f"tests/{func.__name__}.profile"
-+            try:
-+                stats.add(fname)
-+            except OSError:
-+                pass
-+            stats.save(fname)
-+            raise Exception("messing around")
-+
-+        @yappi.profile(return_callback=aggregate)
-+        def a(x, y):
-+            if x + y == 25:
-+                raise Exception("")
-+            return x + y
-+
-+        def b():
-+            pass
-+
-+        try:
-+            os.remove(
-+                "tests/a.profile"
-+            )  # remove the one from prev test, if available
-+        except:
-+            pass
-+
-+        # global profile is on to mess things up
-+        yappi.start()
-+        b()
-+
-+        # assert functionality and call function at same time
-+        try:
-+            self.assertEqual(a(1, 2), 3)
-+        except:
-+            pass
-+        try:
-+            self.assertEqual(a(2, 5), 7)
-+        except:
-+            pass
-+        try:
-+            a(4, 21)
-+        except:
-+            pass
-+        stats = yappi.get_func_stats().add("tests/a.profile")
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        self.assertEqual(fsa.ncall, 3)
-+        self.assertEqual(len(stats), 1)  # b() should be cleared out.
-+
-+        @yappi.profile(return_callback=aggregate)
-+        def count_down_rec(n):
-+            if n == 0:
-+                return
-+            count_down_rec(n - 1)
-+
-+        try:
-+            os.remove(
-+                "tests/count_down_rec.profile"
-+            )  # remove the one from prev test, if available
-+        except:
-+            pass
-+
-+        try:
-+            count_down_rec(4)
-+        except:
-+            pass
-+        try:
-+            count_down_rec(3)
-+        except:
-+            pass
-+
-+        stats = yappi.YFuncStats("tests/count_down_rec.profile")
-+        fsrec = utils.find_stat_by_name(stats, 'count_down_rec')
-+        self.assertEqual(fsrec.ncall, 9)
-+        self.assertEqual(fsrec.nactualcall, 2)
-+
-+    def test_strip_dirs(self):
-+
-+        def a():
-+            pass
-+
-+        stats = utils.run_and_get_func_stats(a, )
-+        stats.strip_dirs()
-+        fsa = utils.find_stat_by_name(stats, "a")
-+        self.assertEqual(fsa.module, os.path.basename(fsa.module))
-+
-+    @unittest.skipIf(os.name == "nt", "do not run on Windows")
-+    def test_run_as_script(self):
-+        import re
-+        p = subprocess.Popen(
-+            ['yappi', os.path.join('./tests', 'run_as_script.py')],
-+            stdout=subprocess.PIPE
-+        )
-+        out, err = p.communicate()
-+        self.assertEqual(p.returncode, 0)
-+        func_stats, thread_stats = re.split(
-+            b'name\\s+id\\s+tid\\s+ttot\\s+scnt\\s*\n', out
-+        )
-+        self.assertTrue(b'FancyThread' in thread_stats)
-+
-+    def test_yappi_overhead(self):
-+        LOOP_COUNT = 100000
-+
-+        def a():
-+            pass
-+
-+        def b():
-+            for i in range(LOOP_COUNT):
-+                a()
-+
-+        t0 = time.time()
-+        yappi.start()
-+        b()
-+        yappi.stop()
-+        time_with_yappi = time.time() - t0
-+        t0 = time.time()
-+        b()
-+        time_without_yappi = time.time() - t0
-+        if time_without_yappi == 0:
-+            time_without_yappi = 0.000001
-+
-+        # in latest v0.82, I calculated this as close to "7.0" in my machine.
-+        # however, %83 of this overhead is coming from tickcount(). The other %17
-+        # seems to have been evenly distributed to the internal bookkeeping
-+        # structures/algorithms which seems acceptable. Note that our test only
-+        # tests one function being profiled at-a-time in a short interval.
-+        # profiling high number of functions in a small time
-+        # is a different beast, (which is pretty unlikely in most applications)
-+        # So as a conclusion: I cannot see any optimization window for Yappi that
-+        # is worth implementing as we will only optimize %17 of the time.
-+        sys.stderr.write("\r\nYappi puts %0.1f times overhead to the profiled application in average.\r\n" % \
-+            (time_with_yappi / time_without_yappi))
-+
-+    def test_clear_stats_while_running(self):
-+
-+        def a():
-+            pass
-+
-+        yappi.start()
-+        a()
-+        yappi.clear_stats()
-+        a()
-+        stats = yappi.get_func_stats()
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        self.assertEqual(fsa.ncall, 1)
-+
-+    def test_generator(self):
-+
-+        def _gen(n):
-+            while (n > 0):
-+                yield n
-+                n -= 1
-+
-+        yappi.start()
-+        for x in _gen(5):
-+            pass
-+        self.assertTrue(
-+            yappi.convert2pstats(yappi.get_func_stats()) is not None
-+        )
-+
-+    def test_slice_child_stats_and_strip_dirs(self):
-+
-+        def b():
-+            for i in range(10000000):
-+                pass
-+
-+        def a():
-+            b()
-+
-+        yappi.start(builtins=True)
-+        a()
-+        stats = yappi.get_func_stats()
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        self.assertTrue(fsa.children[0:1] is not None)
-+        prev_afullname = fsa.full_name
-+        prev_bchildfullname = fsa.children[fsb].full_name
-+        stats.strip_dirs()
-+        self.assertTrue(len(prev_afullname) > len(fsa.full_name))
-+        self.assertTrue(
-+            len(prev_bchildfullname) > len(fsa.children[fsb].full_name)
-+        )
-+
-+    def test_children_stat_functions(self):
-+        _timings = {"a_1": 5, "b_1": 3, "c_1": 1}
-+        _yappi._set_test_timings(_timings)
-+
-+        def b():
-+            pass
-+
-+        def c():
-+            pass
-+
-+        def a():
-+            b()
-+            c()
-+
-+        yappi.start()
-+        a()
-+        b()  # non-child call
-+        c()  # non-child call
-+        stats = yappi.get_func_stats()
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        childs_of_a = fsa.children.get().sort("tavg", "desc")
-+        prev_item = None
-+        for item in childs_of_a:
-+            if prev_item:
-+                self.assertTrue(prev_item.tavg > item.tavg)
-+            prev_item = item
-+        childs_of_a.sort("name", "desc")
-+        prev_item = None
-+        for item in childs_of_a:
-+            if prev_item:
-+                self.assertTrue(prev_item.name > item.name)
-+            prev_item = item
-+        childs_of_a.clear()
-+        self.assertTrue(childs_of_a.empty())
-+
-+    def test_no_stats_different_clock_type_load(self):
-+
-+        def a():
-+            pass
-+
-+        yappi.start()
-+        a()
-+        yappi.stop()
-+        yappi.get_func_stats().save("tests/ystats1.ys")
-+        yappi.clear_stats()
-+        yappi.set_clock_type("WALL")
-+        yappi.start()
-+        yappi.stop()
-+        stats = yappi.get_func_stats().add("tests/ystats1.ys")
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        self.assertTrue(fsa is not None)
-+
-+    def test_subsequent_profile(self):
-+        _timings = {"a_1": 1, "b_1": 1}
-+        _yappi._set_test_timings(_timings)
-+
-+        def a():
-+            pass
-+
-+        def b():
-+            pass
-+
-+        yappi.start()
-+        a()
-+        yappi.stop()
-+        yappi.start()
-+        b()
-+        yappi.stop()
-+        stats = yappi.get_func_stats()
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        self.assertTrue(fsa is not None)
-+        self.assertTrue(fsb is not None)
-+        self.assertEqual(fsa.ttot, 1)
-+        self.assertEqual(fsb.ttot, 1)
-+
-+    def test_lambda(self):
-+        f = lambda: time.sleep(0.3)
-+        yappi.set_clock_type("wall")
-+        yappi.start()
-+        f()
-+        stats = yappi.get_func_stats()
-+        fsa = utils.find_stat_by_name(stats, '<lambda>')
-+        self.assertTrue(fsa.ttot > 0.1)
-+
-+    def test_module_stress(self):
-+        self.assertEqual(yappi.is_running(), False)
-+
-+        yappi.start()
-+        yappi.clear_stats()
-+        self.assertRaises(_yappi.error, yappi.set_clock_type, "wall")
-+
-+        yappi.stop()
-+        yappi.clear_stats()
-+        yappi.set_clock_type("cpu")
-+        self.assertRaises(yappi.YappiError, yappi.set_clock_type, "dummy")
-+        self.assertEqual(yappi.is_running(), False)
-+        yappi.clear_stats()
-+        yappi.clear_stats()
-+
-+    def test_stat_sorting(self):
-+        _timings = {"a_1": 13, "b_1": 10, "a_2": 6, "b_2": 1}
-+        _yappi._set_test_timings(_timings)
-+
-+        self._ncall = 1
-+
-+        def a():
-+            b()
-+
-+        def b():
-+            if self._ncall == 2:
-+                return
-+            self._ncall += 1
-+            a()
-+
-+        stats = utils.run_and_get_func_stats(a)
-+        stats = stats.sort("totaltime", "desc")
-+        prev_stat = None
-+        for stat in stats:
-+            if prev_stat:
-+                self.assertTrue(prev_stat.ttot >= stat.ttot)
-+            prev_stat = stat
-+        stats = stats.sort("totaltime", "asc")
-+        prev_stat = None
-+        for stat in stats:
-+            if prev_stat:
-+                self.assertTrue(prev_stat.ttot <= stat.ttot)
-+            prev_stat = stat
-+        stats = stats.sort("avgtime", "asc")
-+        prev_stat = None
-+        for stat in stats:
-+            if prev_stat:
-+                self.assertTrue(prev_stat.tavg <= stat.tavg)
-+            prev_stat = stat
-+        stats = stats.sort("name", "asc")
-+        prev_stat = None
-+        for stat in stats:
-+            if prev_stat:
-+                self.assertTrue(prev_stat.name <= stat.name)
-+            prev_stat = stat
-+        stats = stats.sort("subtime", "asc")
-+        prev_stat = None
-+        for stat in stats:
-+            if prev_stat:
-+                self.assertTrue(prev_stat.tsub <= stat.tsub)
-+            prev_stat = stat
-+
-+        self.assertRaises(
-+            yappi.YappiError, stats.sort, "invalid_func_sorttype_arg"
-+        )
-+        self.assertRaises(
-+            yappi.YappiError, stats.sort, "totaltime",
-+            "invalid_func_sortorder_arg"
-+        )
-+
-+    def test_start_flags(self):
-+        self.assertEqual(_yappi._get_start_flags(), None)
-+        yappi.start()
-+
-+        def a():
-+            pass
-+
-+        a()
-+        self.assertEqual(_yappi._get_start_flags()["profile_builtins"], 0)
-+        self.assertEqual(_yappi._get_start_flags()["profile_multicontext"], 1)
-+        self.assertEqual(len(yappi.get_thread_stats()), 1)
-+
-+    def test_builtin_profiling(self):
-+
-+        def a():
-+            time.sleep(0.4)  # is a builtin function
-+
-+        yappi.set_clock_type('wall')
-+
-+        yappi.start(builtins=True)
-+        a()
-+        stats = yappi.get_func_stats()
-+        fsa = utils.find_stat_by_name(stats, 'sleep')
-+        self.assertTrue(fsa is not None)
-+        self.assertTrue(fsa.ttot > 0.3)
-+        yappi.stop()
-+        yappi.clear_stats()
-+
-+        def a():
-+            pass
-+
-+        yappi.start()
-+        t = threading.Thread(target=a)
-+        t.start()
-+        t.join()
-+        stats = yappi.get_func_stats()
-+
-+    def test_singlethread_profiling(self):
-+        yappi.set_clock_type('wall')
-+
-+        def a():
-+            time.sleep(0.2)
-+
-+        class Worker1(threading.Thread):
-+
-+            def a(self):
-+                time.sleep(0.3)
-+
-+            def run(self):
-+                self.a()
-+
-+        yappi.start(profile_threads=False)
-+
-+        c = Worker1()
-+        c.start()
-+        c.join()
-+        a()
-+        stats = yappi.get_func_stats()
-+        fsa1 = utils.find_stat_by_name(stats, 'Worker1.a')
-+        fsa2 = utils.find_stat_by_name(stats, 'a')
-+        self.assertTrue(fsa1 is None)
-+        self.assertTrue(fsa2 is not None)
-+        self.assertTrue(fsa2.ttot > 0.1)
-+
-+    def test_run(self):
-+
-+        def profiled():
-+            pass
-+
-+        yappi.clear_stats()
-+        try:
-+            with yappi.run():
-+                profiled()
-+            stats = yappi.get_func_stats()
-+        finally:
-+            yappi.clear_stats()
-+
-+        self.assertIsNotNone(utils.find_stat_by_name(stats, 'profiled'))
-+
-+    def test_run_recursive(self):
-+
-+        def profiled():
-+            pass
-+
-+        def not_profiled():
-+            pass
-+
-+        yappi.clear_stats()
-+        try:
-+            with yappi.run():
-+                with yappi.run():
-+                    profiled()
-+                # Profiling stopped here
-+                not_profiled()
-+            stats = yappi.get_func_stats()
-+        finally:
-+            yappi.clear_stats()
-+
-+        self.assertIsNotNone(utils.find_stat_by_name(stats, 'profiled'))
-+        self.assertIsNone(utils.find_stat_by_name(stats, 'not_profiled'))
-+
-+
-+class StatSaveScenarios(utils.YappiUnitTestCase):
-+
-+    def test_pstats_conversion(self):
-+
-+        def pstat_id(fs):
-+            return (fs.module, fs.lineno, fs.name)
-+
-+        def a():
-+            d()
-+
-+        def b():
-+            d()
-+
-+        def c():
-+            pass
-+
-+        def d():
-+            pass
-+
-+        _timings = {"a_1": 12, "b_1": 7, "c_1": 5, "d_1": 2}
-+        _yappi._set_test_timings(_timings)
-+        stats = utils.run_and_get_func_stats(a, )
-+        stats.strip_dirs()
-+        stats.save("tests/a1.pstats", type="pstat")
-+        fsa_pid = pstat_id(utils.find_stat_by_name(stats, "a"))
-+        fsd_pid = pstat_id(utils.find_stat_by_name(stats, "d"))
-+        yappi.clear_stats()
-+        _yappi._set_test_timings(_timings)
-+        stats = utils.run_and_get_func_stats(a, )
-+        stats.strip_dirs()
-+        stats.save("tests/a2.pstats", type="pstat")
-+        yappi.clear_stats()
-+        _yappi._set_test_timings(_timings)
-+        stats = utils.run_and_get_func_stats(b, )
-+        stats.strip_dirs()
-+        stats.save("tests/b1.pstats", type="pstat")
-+        fsb_pid = pstat_id(utils.find_stat_by_name(stats, "b"))
-+        yappi.clear_stats()
-+        _yappi._set_test_timings(_timings)
-+        stats = utils.run_and_get_func_stats(c, )
-+        stats.strip_dirs()
-+        stats.save("tests/c1.pstats", type="pstat")
-+        fsc_pid = pstat_id(utils.find_stat_by_name(stats, "c"))
-+
-+        # merge saved stats and check pstats values are correct
-+        import pstats
-+        p = pstats.Stats(
-+            'tests/a1.pstats', 'tests/a2.pstats', 'tests/b1.pstats',
-+            'tests/c1.pstats'
-+        )
-+        p.strip_dirs()
-+        # ct = ttot, tt = tsub
-+        (cc, nc, tt, ct, callers) = p.stats[fsa_pid]
-+        self.assertEqual(cc, nc, 2)
-+        self.assertEqual(tt, 20)
-+        self.assertEqual(ct, 24)
-+        (cc, nc, tt, ct, callers) = p.stats[fsd_pid]
-+        self.assertEqual(cc, nc, 3)
-+        self.assertEqual(tt, 6)
-+        self.assertEqual(ct, 6)
-+        self.assertEqual(len(callers), 2)
-+        (cc, nc, tt, ct) = callers[fsa_pid]
-+        self.assertEqual(cc, nc, 2)
-+        self.assertEqual(tt, 4)
-+        self.assertEqual(ct, 4)
-+        (cc, nc, tt, ct) = callers[fsb_pid]
-+        self.assertEqual(cc, nc, 1)
-+        self.assertEqual(tt, 2)
-+        self.assertEqual(ct, 2)
-+
-+    def test_merge_stats(self):
-+        _timings = {
-+            "a_1": 15,
-+            "b_1": 14,
-+            "c_1": 12,
-+            "d_1": 10,
-+            "e_1": 9,
-+            "f_1": 7,
-+            "g_1": 6,
-+            "h_1": 5,
-+            "i_1": 1
-+        }
-+        _yappi._set_test_timings(_timings)
-+
-+        def a():
-+            b()
-+
-+        def b():
-+            c()
-+
-+        def c():
-+            d()
-+
-+        def d():
-+            e()
-+
-+        def e():
-+            f()
-+
-+        def f():
-+            g()
-+
-+        def g():
-+            h()
-+
-+        def h():
-+            i()
-+
-+        def i():
-+            pass
-+
-+        yappi.start()
-+        a()
-+        a()
-+        yappi.stop()
-+        stats = yappi.get_func_stats()
-+        self.assertRaises(
-+            NotImplementedError, stats.save, "", "INVALID_SAVE_TYPE"
-+        )
-+        stats.save("tests/ystats2.ys")
-+        yappi.clear_stats()
-+        _yappi._set_test_timings(_timings)
-+        yappi.start()
-+        a()
-+        stats = yappi.get_func_stats().add("tests/ystats2.ys")
-+        fsa = utils.find_stat_by_name(stats, "a")
-+        fsb = utils.find_stat_by_name(stats, "b")
-+        fsc = utils.find_stat_by_name(stats, "c")
-+        fsd = utils.find_stat_by_name(stats, "d")
-+        fse = utils.find_stat_by_name(stats, "e")
-+        fsf = utils.find_stat_by_name(stats, "f")
-+        fsg = utils.find_stat_by_name(stats, "g")
-+        fsh = utils.find_stat_by_name(stats, "h")
-+        fsi = utils.find_stat_by_name(stats, "i")
-+        self.assertEqual(fsa.ttot, 45)
-+        self.assertEqual(fsa.ncall, 3)
-+        self.assertEqual(fsa.nactualcall, 3)
-+        self.assertEqual(fsa.tsub, 3)
-+        self.assertEqual(fsa.children[fsb].ttot, fsb.ttot)
-+        self.assertEqual(fsa.children[fsb].tsub, fsb.tsub)
-+        self.assertEqual(fsb.children[fsc].ttot, fsc.ttot)
-+        self.assertEqual(fsb.children[fsc].tsub, fsc.tsub)
-+        self.assertEqual(fsc.tsub, 6)
-+        self.assertEqual(fsc.children[fsd].ttot, fsd.ttot)
-+        self.assertEqual(fsc.children[fsd].tsub, fsd.tsub)
-+        self.assertEqual(fsd.children[fse].ttot, fse.ttot)
-+        self.assertEqual(fsd.children[fse].tsub, fse.tsub)
-+        self.assertEqual(fse.children[fsf].ttot, fsf.ttot)
-+        self.assertEqual(fse.children[fsf].tsub, fsf.tsub)
-+        self.assertEqual(fsf.children[fsg].ttot, fsg.ttot)
-+        self.assertEqual(fsf.children[fsg].tsub, fsg.tsub)
-+        self.assertEqual(fsg.ttot, 18)
-+        self.assertEqual(fsg.tsub, 3)
-+        self.assertEqual(fsg.children[fsh].ttot, fsh.ttot)
-+        self.assertEqual(fsg.children[fsh].tsub, fsh.tsub)
-+        self.assertEqual(fsh.ttot, 15)
-+        self.assertEqual(fsh.tsub, 12)
-+        self.assertEqual(fsh.tavg, 5)
-+        self.assertEqual(fsh.children[fsi].ttot, fsi.ttot)
-+        self.assertEqual(fsh.children[fsi].tsub, fsi.tsub)
-+        #stats.debug_print()
-+
-+    def test_merge_multithreaded_stats(self):
-+        import _yappi
-+        timings = {"a_1": 2, "b_1": 1}
-+        _yappi._set_test_timings(timings)
-+
-+        def a():
-+            pass
-+
-+        def b():
-+            pass
-+
-+        yappi.start()
-+        t = threading.Thread(target=a)
-+        t.start()
-+        t.join()
-+        t = threading.Thread(target=b)
-+        t.start()
-+        t.join()
-+        yappi.get_func_stats().save("tests/ystats1.ys")
-+        yappi.clear_stats()
-+        _yappi._set_test_timings(timings)
-+        self.assertEqual(len(yappi.get_func_stats()), 0)
-+        self.assertEqual(len(yappi.get_thread_stats()), 1)
-+        t = threading.Thread(target=a)
-+        t.start()
-+        t.join()
-+
-+        self.assertEqual(_yappi._get_start_flags()["profile_builtins"], 0)
-+        self.assertEqual(_yappi._get_start_flags()["profile_multicontext"], 1)
-+        yappi.get_func_stats().save("tests/ystats2.ys")
-+
-+        stats = yappi.YFuncStats([
-+            "tests/ystats1.ys",
-+            "tests/ystats2.ys",
-+        ])
-+        fsa = utils.find_stat_by_name(stats, "a")
-+        fsb = utils.find_stat_by_name(stats, "b")
-+        self.assertEqual(fsa.ncall, 2)
-+        self.assertEqual(fsb.ncall, 1)
-+        self.assertEqual(fsa.tsub, fsa.ttot, 4)
-+        self.assertEqual(fsb.tsub, fsb.ttot, 1)
-+
-+    def test_merge_load_different_clock_types(self):
-+        yappi.start(builtins=True)
-+
-+        def a():
-+            b()
-+
-+        def b():
-+            c()
-+
-+        def c():
-+            pass
-+
-+        t = threading.Thread(target=a)
-+        t.start()
-+        t.join()
-+        yappi.get_func_stats().sort("name", "asc").save("tests/ystats1.ys")
-+        yappi.stop()
-+        yappi.clear_stats()
-+        yappi.start(builtins=False)
-+        t = threading.Thread(target=a)
-+        t.start()
-+        t.join()
-+        yappi.get_func_stats().save("tests/ystats2.ys")
-+        yappi.stop()
-+        self.assertRaises(_yappi.error, yappi.set_clock_type, "wall")
-+        yappi.clear_stats()
-+        yappi.set_clock_type("wall")
-+        yappi.start()
-+        t = threading.Thread(target=a)
-+        t.start()
-+        t.join()
-+        yappi.get_func_stats().save("tests/ystats3.ys")
-+        self.assertRaises(
-+            yappi.YappiError,
-+            yappi.YFuncStats().add("tests/ystats1.ys").add, "tests/ystats3.ys"
-+        )
-+        stats = yappi.YFuncStats(["tests/ystats1.ys",
-+                                  "tests/ystats2.ys"]).sort("name")
-+        fsa = utils.find_stat_by_name(stats, "a")
-+        fsb = utils.find_stat_by_name(stats, "b")
-+        fsc = utils.find_stat_by_name(stats, "c")
-+        self.assertEqual(fsa.ncall, 2)
-+        self.assertEqual(fsa.ncall, fsb.ncall, fsc.ncall)
-+
-+    def test_merge_aabab_aabbc(self):
-+        _timings = {
-+            "a_1": 15,
-+            "a_2": 14,
-+            "b_1": 12,
-+            "a_3": 10,
-+            "b_2": 9,
-+            "c_1": 4
-+        }
-+        _yappi._set_test_timings(_timings)
-+
-+        def a():
-+            if self._ncall == 1:
-+                self._ncall += 1
-+                a()
-+            elif self._ncall == 5:
-+                self._ncall += 1
-+                a()
-+            else:
-+                b()
-+
-+        def b():
-+            if self._ncall == 2:
-+                self._ncall += 1
-+                a()
-+            elif self._ncall == 6:
-+                self._ncall += 1
-+                b()
-+            elif self._ncall == 7:
-+                c()
-+            else:
-+                return
-+
-+        def c():
-+            pass
-+
-+        self._ncall = 1
-+        stats = utils.run_and_get_func_stats(a, )
-+        stats.save("tests/ystats1.ys")
-+        yappi.clear_stats()
-+        _yappi._set_test_timings(_timings)
-+        #stats.print_all()
-+
-+        self._ncall = 5
-+        stats = utils.run_and_get_func_stats(a, )
-+        stats.save("tests/ystats2.ys")
-+
-+        #stats.print_all()
-+
-+        def a():  # same name but another function(code object)
-+            pass
-+
-+        yappi.start()
-+        a()
-+        stats = yappi.get_func_stats().add(
-+            ["tests/ystats1.ys", "tests/ystats2.ys"]
-+        )
-+        #stats.print_all()
-+        self.assertEqual(len(stats), 4)
-+
-+        fsa = None
-+        for stat in stats:
-+            if stat.name == "a" and stat.ttot == 45:
-+                fsa = stat
-+                break
-+        self.assertTrue(fsa is not None)
-+
-+        self.assertEqual(fsa.ncall, 7)
-+        self.assertEqual(fsa.nactualcall, 3)
-+        self.assertEqual(fsa.ttot, 45)
-+        self.assertEqual(fsa.tsub, 10)
-+        fsb = utils.find_stat_by_name(stats, "b")
-+        fsc = utils.find_stat_by_name(stats, "c")
-+        self.assertEqual(fsb.ncall, 6)
-+        self.assertEqual(fsb.nactualcall, 3)
-+        self.assertEqual(fsb.ttot, 36)
-+        self.assertEqual(fsb.tsub, 27)
-+        self.assertEqual(fsb.tavg, 6)
-+        self.assertEqual(fsc.ttot, 8)
-+        self.assertEqual(fsc.tsub, 8)
-+        self.assertEqual(fsc.tavg, 4)
-+        self.assertEqual(fsc.nactualcall, fsc.ncall, 2)
-+
-+
-+class MultithreadedScenarios(utils.YappiUnitTestCase):
-+
-+    def test_issue_32(self):
-+        '''
-+        Start yappi from different thread and we get Internal Error(15) as 
-+        the current_ctx_id() called while enumerating the threads in start() 
-+        and as it does not swap to the enumerated ThreadState* the THreadState_GetDict()
-+        returns wrong object and thus sets an invalid id for the _ctx structure.
-+
-+        When this issue happens multiple Threads have same tid as the internal ts_ptr
-+        will be same for different contexts. So, let's see if that happens
-+        '''
-+
-+        def foo():
-+            time.sleep(0.2)
-+
-+        def bar():
-+            time.sleep(0.1)
-+
-+        def thread_func():
-+            yappi.set_clock_type("wall")
-+            yappi.start()
-+
-+            bar()
-+
-+        t = threading.Thread(target=thread_func)
-+        t.start()
-+        t.join()
-+
-+        foo()
-+
-+        yappi.stop()
-+
-+        thread_ids = set()
-+        for tstat in yappi.get_thread_stats():
-+            self.assertTrue(tstat.tid not in thread_ids)
-+            thread_ids.add(tstat.tid)
-+
-+    def test_subsequent_profile(self):
-+        WORKER_COUNT = 5
-+
-+        def a():
-+            pass
-+
-+        def b():
-+            pass
-+
-+        def c():
-+            pass
-+
-+        _timings = {
-+            "a_1": 3,
-+            "b_1": 2,
-+            "c_1": 1,
-+        }
-+
-+        yappi.start()
-+
-+        def g():
-+            pass
-+
-+        g()
-+        yappi.stop()
-+        yappi.clear_stats()
-+        _yappi._set_test_timings(_timings)
-+        yappi.start()
-+
-+        _dummy = []
-+        for i in range(WORKER_COUNT):
-+            t = threading.Thread(target=a)
-+            t.start()
-+            t.join()
-+        for i in range(WORKER_COUNT):
-+            t = threading.Thread(target=b)
-+            t.start()
-+            _dummy.append(t)
-+            t.join()
-+        for i in range(WORKER_COUNT):
-+            t = threading.Thread(target=a)
-+            t.start()
-+            t.join()
-+        for i in range(WORKER_COUNT):
-+            t = threading.Thread(target=c)
-+            t.start()
-+            t.join()
-+        yappi.stop()
-+        yappi.start()
-+
-+        def f():
-+            pass
-+
-+        f()
-+        stats = yappi.get_func_stats()
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        fsc = utils.find_stat_by_name(stats, 'c')
-+        self.assertEqual(fsa.ncall, 10)
-+        self.assertEqual(fsb.ncall, 5)
-+        self.assertEqual(fsc.ncall, 5)
-+        self.assertEqual(fsa.ttot, fsa.tsub, 30)
-+        self.assertEqual(fsb.ttot, fsb.tsub, 10)
-+        self.assertEqual(fsc.ttot, fsc.tsub, 5)
-+
-+        # MACOSx optimizes by only creating one worker thread
-+        self.assertTrue(len(yappi.get_thread_stats()) >= 2)
-+
-+    def test_basic(self):
-+        yappi.set_clock_type('wall')
-+
-+        def dummy():
-+            pass
-+
-+        def a():
-+            time.sleep(0.2)
-+
-+        class Worker1(threading.Thread):
-+
-+            def a(self):
-+                time.sleep(0.3)
-+
-+            def run(self):
-+                self.a()
-+
-+        yappi.start(builtins=False, profile_threads=True)
-+
-+        c = Worker1()
-+        c.start()
-+        c.join()
-+        a()
-+        stats = yappi.get_func_stats()
-+        fsa1 = utils.find_stat_by_name(stats, 'Worker1.a')
-+        fsa2 = utils.find_stat_by_name(stats, 'a')
-+        self.assertTrue(fsa1 is not None)
-+        self.assertTrue(fsa2 is not None)
-+        self.assertTrue(fsa1.ttot > 0.2)
-+        self.assertTrue(fsa2.ttot > 0.1)
-+        tstats = yappi.get_thread_stats()
-+        self.assertEqual(len(tstats), 2)
-+        tsa = utils.find_stat_by_name(tstats, 'Worker1')
-+        tsm = utils.find_stat_by_name(tstats, '_MainThread')
-+        dummy()  # call dummy to force ctx name to be retrieved again.
-+        self.assertTrue(tsa is not None)
-+        # TODO: I put dummy() to fix below, remove the comments after a while.
-+        self.assertTrue( # FIX: I see this fails sometimes?
-+            tsm is not None,
-+            f"Could not find \"_MainThread\". Found: {', '.join(utils.get_stat_names(tstats))}")
-+
-+    def test_ctx_stats(self):
-+        from threading import Thread
-+        DUMMY_WORKER_COUNT = 5
-+        yappi.start()
-+
-+        class DummyThread(Thread):
-+            pass
-+
-+        def dummy():
-+            pass
-+
-+        def dummy_worker():
-+            pass
-+
-+        for i in range(DUMMY_WORKER_COUNT):
-+            t = DummyThread(target=dummy_worker)
-+            t.start()
-+            t.join()
-+        yappi.stop()
-+        stats = yappi.get_thread_stats()
-+        tsa = utils.find_stat_by_name(stats, "DummyThread")
-+        self.assertTrue(tsa is not None)
-+        yappi.clear_stats()
-+        time.sleep(1.0)
-+        _timings = {
-+            "a_1": 6,
-+            "b_1": 5,
-+            "c_1": 3,
-+            "d_1": 1,
-+            "a_2": 4,
-+            "b_2": 3,
-+            "c_2": 2,
-+            "d_2": 1
-+        }
-+        _yappi._set_test_timings(_timings)
-+
-+        class Thread1(Thread):
-+            pass
-+
-+        class Thread2(Thread):
-+            pass
-+
-+        def a():
-+            b()
-+
-+        def b():
-+            c()
-+
-+        def c():
-+            d()
-+
-+        def d():
-+            time.sleep(0.6)
-+
-+        yappi.set_clock_type("wall")
-+        yappi.start()
-+        t1 = Thread1(target=a)
-+        t1.start()
-+        t2 = Thread2(target=a)
-+        t2.start()
-+        t1.join()
-+        t2.join()
-+        stats = yappi.get_thread_stats()
-+
-+        # the fist clear_stats clears the context table?
-+        tsa = utils.find_stat_by_name(stats, "DummyThread")
-+        self.assertTrue(tsa is None)
-+
-+        tst1 = utils.find_stat_by_name(stats, "Thread1")
-+        tst2 = utils.find_stat_by_name(stats, "Thread2")
-+        tsmain = utils.find_stat_by_name(stats, "_MainThread")
-+        dummy()  # call dummy to force ctx name to be retrieved again.
-+        self.assertTrue(len(stats) == 3)
-+        self.assertTrue(tst1 is not None)
-+        self.assertTrue(tst2 is not None)
-+        # TODO: I put dummy() to fix below, remove the comments after a while.
-+        self.assertTrue( # FIX: I see this fails sometimes
-+            tsmain is not None,
-+            f"Could not find \"_MainThread\". Found: {', '.join(utils.get_stat_names(stats))}")
-+        self.assertTrue(1.0 > tst2.ttot >= 0.5)
-+        self.assertTrue(1.0 > tst1.ttot >= 0.5)
-+
-+        # test sorting of the ctx stats
-+        stats = stats.sort("totaltime", "desc")
-+        prev_stat = None
-+        for stat in stats:
-+            if prev_stat:
-+                self.assertTrue(prev_stat.ttot >= stat.ttot)
-+            prev_stat = stat
-+        stats = stats.sort("totaltime", "asc")
-+        prev_stat = None
-+        for stat in stats:
-+            if prev_stat:
-+                self.assertTrue(prev_stat.ttot <= stat.ttot)
-+            prev_stat = stat
-+        stats = stats.sort("schedcount", "desc")
-+        prev_stat = None
-+        for stat in stats:
-+            if prev_stat:
-+                self.assertTrue(prev_stat.sched_count >= stat.sched_count)
-+            prev_stat = stat
-+        stats = stats.sort("name", "desc")
-+        prev_stat = None
-+        for stat in stats:
-+            if prev_stat:
-+                self.assertTrue(prev_stat.name.lower() >= stat.name.lower())
-+            prev_stat = stat
-+        self.assertRaises(
-+            yappi.YappiError, stats.sort, "invalid_thread_sorttype_arg"
-+        )
-+        self.assertRaises(
-+            yappi.YappiError, stats.sort, "invalid_thread_sortorder_arg"
-+        )
-+
-+    def test_ctx_stats_cpu(self):
-+
-+        def get_thread_name():
-+            try:
-+                return threading.current_thread().name
-+            except AttributeError:
-+                return "Anonymous"
-+
-+        def burn_cpu(sec):
-+            t0 = yappi.get_clock_time()
-+            elapsed = 0
-+            while (elapsed < sec):
-+                for _ in range(1000):
-+                    pass
-+                elapsed = yappi.get_clock_time() - t0
-+
-+        def test():
-+
-+            ts = []
-+            for i in (0.01, 0.05, 0.1):
-+                t = threading.Thread(target=burn_cpu, args=(i, ))
-+                t.name = f"burn_cpu-{str(i)}"
-+                t.start()
-+                ts.append(t)
-+            for t in ts:
-+                t.join()
-+
-+        yappi.set_clock_type("cpu")
-+        yappi.set_context_name_callback(get_thread_name)
-+
-+        yappi.start()
-+
-+        test()
-+
-+        yappi.stop()
-+
-+        tstats = yappi.get_thread_stats()
-+        r1 = '''
-+        burn_cpu-0.1      3      123145356058624  0.100105  8
-+        burn_cpu-0.05     2      123145361313792  0.050149  8
-+        burn_cpu-0.01     1      123145356058624  0.010127  2
-+        MainThread        0      4321620864       0.001632  6
-+        '''
-+        self.assert_ctx_stats_almost_equal(r1, tstats)
-+
-+    def test_producer_consumer_with_queues(self):
-+        # we currently just stress yappi, no functionality test is done here.
-+        yappi.start()
-+        from queue import Queue
-+        from threading import Thread
-+        WORKER_THREAD_COUNT = 50
-+        WORK_ITEM_COUNT = 2000
-+
-+        def worker():
-+            while True:
-+                item = q.get()
-+                # do the work with item
-+                q.task_done()
-+
-+        q = Queue()
-+        for i in range(WORKER_THREAD_COUNT):
-+            t = Thread(target=worker)
-+            t.daemon = True
-+            t.start()
-+
-+        for item in range(WORK_ITEM_COUNT):
-+            q.put(item)
-+        q.join()  # block until all tasks are done
-+        #yappi.get_func_stats().sort("callcount").print_all()
-+        yappi.stop()
-+
-+    def test_temporary_lock_waiting(self):
-+        yappi.start()
-+        _lock = threading.Lock()
-+
-+        def worker():
-+            _lock.acquire()
-+            try:
-+                time.sleep(1.0)
-+            finally:
-+                _lock.release()
-+
-+        t1 = threading.Thread(target=worker)
-+        t2 = threading.Thread(target=worker)
-+        t1.start()
-+        t2.start()
-+        t1.join()
-+        t2.join()
-+        #yappi.get_func_stats().sort("callcount").print_all()
-+        yappi.stop()
-+
-+    @unittest.skipIf(os.name != "posix", "requires Posix compliant OS")
-+    def test_signals_with_blocking_calls(self):
-+        import signal, os, time
-+
-+        # just to verify if signal is handled correctly and stats/yappi are not corrupted.
-+        def handler(signum, frame):
-+            raise Exception("Signal handler executed!")
-+
-+        yappi.start()
-+        signal.signal(signal.SIGALRM, handler)
-+        signal.alarm(1)
-+        self.assertRaises(Exception, time.sleep, 2)
-+        stats = yappi.get_func_stats()
-+        fsh = utils.find_stat_by_name(stats, "handler")
-+        self.assertTrue(fsh is not None)
-+
-+    def test_concurrent_futures(self):
-+        yappi.start()
-+        from concurrent.futures import ThreadPoolExecutor
-+        with ThreadPoolExecutor(max_workers=5) as executor:
-+            f = executor.submit(pow, 5, 2)
-+            self.assertEqual(f.result(), 25)
-+        time.sleep(1.0)
-+        yappi.stop()
-+
-+    def test_barrier(self):
-+        yappi.start()
-+        b = threading.Barrier(2, timeout=1)
-+
-+        def worker():
-+            try:
-+                b.wait()
-+            except threading.BrokenBarrierError:
-+                pass
-+            except Exception:
-+                raise Exception("BrokenBarrierError not raised")
-+
-+        t1 = threading.Thread(target=worker)
-+        t1.start()
-+        #b.wait()
-+        t1.join()
-+        yappi.stop()
-+
-+
-+class NonRecursiveFunctions(utils.YappiUnitTestCase):
-+
-+    def test_abcd(self):
-+        _timings = {"a_1": 6, "b_1": 5, "c_1": 3, "d_1": 1}
-+        _yappi._set_test_timings(_timings)
-+
-+        def a():
-+            b()
-+
-+        def b():
-+            c()
-+
-+        def c():
-+            d()
-+
-+        def d():
-+            pass
-+
-+        stats = utils.run_and_get_func_stats(a)
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        fsc = utils.find_stat_by_name(stats, 'c')
-+        fsd = utils.find_stat_by_name(stats, 'd')
-+        cfsab = fsa.children[fsb]
-+        cfsbc = fsb.children[fsc]
-+        cfscd = fsc.children[fsd]
-+
-+        self.assertEqual(fsa.ttot, 6)
-+        self.assertEqual(fsa.tsub, 1)
-+        self.assertEqual(fsb.ttot, 5)
-+        self.assertEqual(fsb.tsub, 2)
-+        self.assertEqual(fsc.ttot, 3)
-+        self.assertEqual(fsc.tsub, 2)
-+        self.assertEqual(fsd.ttot, 1)
-+        self.assertEqual(fsd.tsub, 1)
-+        self.assertEqual(cfsab.ttot, 5)
-+        self.assertEqual(cfsab.tsub, 2)
-+        self.assertEqual(cfsbc.ttot, 3)
-+        self.assertEqual(cfsbc.tsub, 2)
-+        self.assertEqual(cfscd.ttot, 1)
-+        self.assertEqual(cfscd.tsub, 1)
-+
-+    def test_stop_in_middle(self):
-+        _timings = {"a_1": 6, "b_1": 4}
-+        _yappi._set_test_timings(_timings)
-+
-+        def a():
-+            b()
-+            yappi.stop()
-+
-+        def b():
-+            time.sleep(0.2)
-+
-+        yappi.start()
-+        a()
-+        stats = yappi.get_func_stats()
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+
-+        self.assertEqual(fsa.ncall, 1)
-+        self.assertEqual(fsa.nactualcall, 0)
-+        self.assertEqual(fsa.ttot, 0)  # no call_leave called
-+        self.assertEqual(fsa.tsub, 0)  # no call_leave called
-+        self.assertEqual(fsb.ttot, 4)
-+
-+
-+class RecursiveFunctions(utils.YappiUnitTestCase):
-+
-+    def test_fibonacci(self):
-+
-+        def fib(n):
-+            if n > 1:
-+                return fib(n - 1) + fib(n - 2)
-+            else:
-+                return n
-+
-+        stats = utils.run_and_get_func_stats(fib, 22)
-+        fs = utils.find_stat_by_name(stats, 'fib')
-+        self.assertEqual(fs.ncall, 57313)
-+        self.assertEqual(fs.ttot, fs.tsub)
-+
-+    def test_abcadc(self):
-+        _timings = {
-+            "a_1": 20,
-+            "b_1": 19,
-+            "c_1": 17,
-+            "a_2": 13,
-+            "d_1": 12,
-+            "c_2": 10,
-+            "a_3": 5
-+        }
-+        _yappi._set_test_timings(_timings)
-+
-+        def a(n):
-+            if n == 3:
-+                return
-+            if n == 1 + 1:
-+                d(n)
-+            else:
-+                b(n)
-+
-+        def b(n):
-+            c(n)
-+
-+        def c(n):
-+            a(n + 1)
-+
-+        def d(n):
-+            c(n)
-+
-+        stats = utils.run_and_get_func_stats(a, 1)
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        fsc = utils.find_stat_by_name(stats, 'c')
-+        fsd = utils.find_stat_by_name(stats, 'd')
-+        self.assertEqual(fsa.ncall, 3)
-+        self.assertEqual(fsa.nactualcall, 1)
-+        self.assertEqual(fsa.ttot, 20)
-+        self.assertEqual(fsa.tsub, 7)
-+        self.assertEqual(fsb.ttot, 19)
-+        self.assertEqual(fsb.tsub, 2)
-+        self.assertEqual(fsc.ttot, 17)
-+        self.assertEqual(fsc.tsub, 9)
-+        self.assertEqual(fsd.ttot, 12)
-+        self.assertEqual(fsd.tsub, 2)
-+        cfsca = fsc.children[fsa]
-+        self.assertEqual(cfsca.nactualcall, 0)
-+        self.assertEqual(cfsca.ncall, 2)
-+        self.assertEqual(cfsca.ttot, 13)
-+        self.assertEqual(cfsca.tsub, 6)
-+
-+    def test_aaaa(self):
-+        _timings = {"d_1": 9, "d_2": 7, "d_3": 3, "d_4": 2}
-+        _yappi._set_test_timings(_timings)
-+
-+        def d(n):
-+            if n == 3:
-+                return
-+            d(n + 1)
-+
-+        stats = utils.run_and_get_func_stats(d, 0)
-+        fsd = utils.find_stat_by_name(stats, 'd')
-+        self.assertEqual(fsd.ncall, 4)
-+        self.assertEqual(fsd.nactualcall, 1)
-+        self.assertEqual(fsd.ttot, 9)
-+        self.assertEqual(fsd.tsub, 9)
-+        cfsdd = fsd.children[fsd]
-+        self.assertEqual(cfsdd.ttot, 7)
-+        self.assertEqual(cfsdd.tsub, 7)
-+        self.assertEqual(cfsdd.ncall, 3)
-+        self.assertEqual(cfsdd.nactualcall, 0)
-+
-+    def test_abcabc(self):
-+        _timings = {
-+            "a_1": 20,
-+            "b_1": 19,
-+            "c_1": 17,
-+            "a_2": 13,
-+            "b_2": 11,
-+            "c_2": 9,
-+            "a_3": 6
-+        }
-+        _yappi._set_test_timings(_timings)
-+
-+        def a(n):
-+            if n == 3:
-+                return
-+            else:
-+                b(n)
-+
-+        def b(n):
-+            c(n)
-+
-+        def c(n):
-+            a(n + 1)
-+
-+        stats = utils.run_and_get_func_stats(a, 1)
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        fsc = utils.find_stat_by_name(stats, 'c')
-+        self.assertEqual(fsa.ncall, 3)
-+        self.assertEqual(fsa.nactualcall, 1)
-+        self.assertEqual(fsa.ttot, 20)
-+        self.assertEqual(fsa.tsub, 9)
-+        self.assertEqual(fsb.ttot, 19)
-+        self.assertEqual(fsb.tsub, 4)
-+        self.assertEqual(fsc.ttot, 17)
-+        self.assertEqual(fsc.tsub, 7)
-+        cfsab = fsa.children[fsb]
-+        cfsbc = fsb.children[fsc]
-+        cfsca = fsc.children[fsa]
-+        self.assertEqual(cfsab.ttot, 19)
-+        self.assertEqual(cfsab.tsub, 4)
-+        self.assertEqual(cfsbc.ttot, 17)
-+        self.assertEqual(cfsbc.tsub, 7)
-+        self.assertEqual(cfsca.ttot, 13)
-+        self.assertEqual(cfsca.tsub, 8)
-+
-+    def test_abcbca(self):
-+        _timings = {"a_1": 10, "b_1": 9, "c_1": 7, "b_2": 4, "c_2": 2, "a_2": 1}
-+        _yappi._set_test_timings(_timings)
-+        self._ncall = 1
-+
-+        def a():
-+            if self._ncall == 1:
-+                b()
-+            else:
-+                return
-+
-+        def b():
-+            c()
-+
-+        def c():
-+            if self._ncall == 1:
-+                self._ncall += 1
-+                b()
-+            else:
-+                a()
-+
-+        stats = utils.run_and_get_func_stats(a)
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        fsc = utils.find_stat_by_name(stats, 'c')
-+        cfsab = fsa.children[fsb]
-+        cfsbc = fsb.children[fsc]
-+        cfsca = fsc.children[fsa]
-+        self.assertEqual(fsa.ttot, 10)
-+        self.assertEqual(fsa.tsub, 2)
-+        self.assertEqual(fsb.ttot, 9)
-+        self.assertEqual(fsb.tsub, 4)
-+        self.assertEqual(fsc.ttot, 7)
-+        self.assertEqual(fsc.tsub, 4)
-+        self.assertEqual(cfsab.ttot, 9)
-+        self.assertEqual(cfsab.tsub, 2)
-+        self.assertEqual(cfsbc.ttot, 7)
-+        self.assertEqual(cfsbc.tsub, 4)
-+        self.assertEqual(cfsca.ttot, 1)
-+        self.assertEqual(cfsca.tsub, 1)
-+        self.assertEqual(cfsca.ncall, 1)
-+        self.assertEqual(cfsca.nactualcall, 0)
-+
-+    def test_aabccb(self):
-+        _timings = {
-+            "a_1": 13,
-+            "a_2": 11,
-+            "b_1": 9,
-+            "c_1": 5,
-+            "c_2": 3,
-+            "b_2": 1
-+        }
-+        _yappi._set_test_timings(_timings)
-+        self._ncall = 1
-+
-+        def a():
-+            if self._ncall == 1:
-+                self._ncall += 1
-+                a()
-+            else:
-+                b()
-+
-+        def b():
-+            if self._ncall == 3:
-+                return
-+            else:
-+                c()
-+
-+        def c():
-+            if self._ncall == 2:
-+                self._ncall += 1
-+                c()
-+            else:
-+                b()
-+
-+        stats = utils.run_and_get_func_stats(a)
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        fsc = utils.find_stat_by_name(stats, 'c')
-+        cfsaa = fsa.children[fsa.index]
-+        cfsab = fsa.children[fsb]
-+        cfsbc = fsb.children[fsc.full_name]
-+        cfscc = fsc.children[fsc]
-+        cfscb = fsc.children[fsb]
-+        self.assertEqual(fsb.ttot, 9)
-+        self.assertEqual(fsb.tsub, 5)
-+        self.assertEqual(cfsbc.ttot, 5)
-+        self.assertEqual(cfsbc.tsub, 2)
-+        self.assertEqual(fsa.ttot, 13)
-+        self.assertEqual(fsa.tsub, 4)
-+        self.assertEqual(cfsab.ttot, 9)
-+        self.assertEqual(cfsab.tsub, 4)
-+        self.assertEqual(cfsaa.ttot, 11)
-+        self.assertEqual(cfsaa.tsub, 2)
-+        self.assertEqual(fsc.ttot, 5)
-+        self.assertEqual(fsc.tsub, 4)
-+
-+    def test_abaa(self):
-+        _timings = {"a_1": 13, "b_1": 10, "a_2": 9, "a_3": 5}
-+        _yappi._set_test_timings(_timings)
-+
-+        self._ncall = 1
-+
-+        def a():
-+            if self._ncall == 1:
-+                b()
-+            elif self._ncall == 2:
-+                self._ncall += 1
-+                a()
-+            else:
-+                return
-+
-+        def b():
-+            self._ncall += 1
-+            a()
-+
-+        stats = utils.run_and_get_func_stats(a)
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        cfsaa = fsa.children[fsa]
-+        cfsba = fsb.children[fsa]
-+        self.assertEqual(fsb.ttot, 10)
-+        self.assertEqual(fsb.tsub, 1)
-+        self.assertEqual(fsa.ttot, 13)
-+        self.assertEqual(fsa.tsub, 12)
-+        self.assertEqual(cfsaa.ttot, 5)
-+        self.assertEqual(cfsaa.tsub, 5)
-+        self.assertEqual(cfsba.ttot, 9)
-+        self.assertEqual(cfsba.tsub, 4)
-+
-+    def test_aabb(self):
-+        _timings = {"a_1": 13, "a_2": 10, "b_1": 9, "b_2": 5}
-+        _yappi._set_test_timings(_timings)
-+
-+        self._ncall = 1
-+
-+        def a():
-+            if self._ncall == 1:
-+                self._ncall += 1
-+                a()
-+            elif self._ncall == 2:
-+                b()
-+            else:
-+                return
-+
-+        def b():
-+            if self._ncall == 2:
-+                self._ncall += 1
-+                b()
-+            else:
-+                return
-+
-+        stats = utils.run_and_get_func_stats(a)
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        cfsaa = fsa.children[fsa]
-+        cfsab = fsa.children[fsb]
-+        cfsbb = fsb.children[fsb]
-+        self.assertEqual(fsa.ttot, 13)
-+        self.assertEqual(fsa.tsub, 4)
-+        self.assertEqual(fsb.ttot, 9)
-+        self.assertEqual(fsb.tsub, 9)
-+        self.assertEqual(cfsaa.ttot, 10)
-+        self.assertEqual(cfsaa.tsub, 1)
-+        self.assertEqual(cfsab.ttot, 9)
-+        self.assertEqual(cfsab.tsub, 4)
-+        self.assertEqual(cfsbb.ttot, 5)
-+        self.assertEqual(cfsbb.tsub, 5)
-+
-+    def test_abbb(self):
-+        _timings = {"a_1": 13, "b_1": 10, "b_2": 6, "b_3": 1}
-+        _yappi._set_test_timings(_timings)
-+
-+        self._ncall = 1
-+
-+        def a():
-+            if self._ncall == 1:
-+                b()
-+
-+        def b():
-+            if self._ncall == 3:
-+                return
-+            self._ncall += 1
-+            b()
-+
-+        stats = utils.run_and_get_func_stats(a)
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        cfsab = fsa.children[fsb]
-+        cfsbb = fsb.children[fsb]
-+        self.assertEqual(fsa.ttot, 13)
-+        self.assertEqual(fsa.tsub, 3)
-+        self.assertEqual(fsb.ttot, 10)
-+        self.assertEqual(fsb.tsub, 10)
-+        self.assertEqual(fsb.ncall, 3)
-+        self.assertEqual(fsb.nactualcall, 1)
-+        self.assertEqual(cfsab.ttot, 10)
-+        self.assertEqual(cfsab.tsub, 4)
-+        self.assertEqual(cfsbb.ttot, 6)
-+        self.assertEqual(cfsbb.tsub, 6)
-+        self.assertEqual(cfsbb.nactualcall, 0)
-+        self.assertEqual(cfsbb.ncall, 2)
-+
-+    def test_aaab(self):
-+        _timings = {"a_1": 13, "a_2": 10, "a_3": 6, "b_1": 1}
-+        _yappi._set_test_timings(_timings)
-+
-+        self._ncall = 1
-+
-+        def a():
-+            if self._ncall == 3:
-+                b()
-+                return
-+            self._ncall += 1
-+            a()
-+
-+        def b():
-+            return
-+
-+        stats = utils.run_and_get_func_stats(a)
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        cfsaa = fsa.children[fsa]
-+        cfsab = fsa.children[fsb]
-+        self.assertEqual(fsa.ttot, 13)
-+        self.assertEqual(fsa.tsub, 12)
-+        self.assertEqual(fsb.ttot, 1)
-+        self.assertEqual(fsb.tsub, 1)
-+        self.assertEqual(cfsaa.ttot, 10)
-+        self.assertEqual(cfsaa.tsub, 9)
-+        self.assertEqual(cfsab.ttot, 1)
-+        self.assertEqual(cfsab.tsub, 1)
-+
-+    def test_abab(self):
-+        _timings = {"a_1": 13, "b_1": 10, "a_2": 6, "b_2": 1}
-+        _yappi._set_test_timings(_timings)
-+
-+        self._ncall = 1
-+
-+        def a():
-+            b()
-+
-+        def b():
-+            if self._ncall == 2:
-+                return
-+            self._ncall += 1
-+            a()
-+
-+        stats = utils.run_and_get_func_stats(a)
-+        fsa = utils.find_stat_by_name(stats, 'a')
-+        fsb = utils.find_stat_by_name(stats, 'b')
-+        cfsab = fsa.children[fsb]
-+        cfsba = fsb.children[fsa]
-+        self.assertEqual(fsa.ttot, 13)
-+        self.assertEqual(fsa.tsub, 8)
-+        self.assertEqual(fsb.ttot, 10)
-+        self.assertEqual(fsb.tsub, 5)
-+        self.assertEqual(cfsab.ttot, 10)
-+        self.assertEqual(cfsab.tsub, 5)
-+        self.assertEqual(cfsab.ncall, 2)
-+        self.assertEqual(cfsab.nactualcall, 1)
-+        self.assertEqual(cfsba.ttot, 6)
-+        self.assertEqual(cfsba.tsub, 5)
-+
-+
-+if __name__ == '__main__':
-+    #     import sys;sys.argv = ['', 'BasicUsage.test_run_as_script']
-+    #     import sys;sys.argv = ['', 'MultithreadedScenarios.test_subsequent_profile']
-+    unittest.main()
-- 
-2.34.1
diff --git a/meta-python/recipes-devtools/python/python3-yappi_1.7.3.bb b/meta-python/recipes-devtools/python/python3-yappi_1.7.6.bb
index 3e735f7124..fefed051ab 100644
--- a/meta-python/recipes-devtools/python/python3-yappi_1.7.3.bb
+++ b/meta-python/recipes-devtools/python/python3-yappi_1.7.6.bb
@@ -4,10 +4,9 @@ HOMEPAGE = "https://github.com/sumerc/yappi"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=71c208c9a4fd864385eb69ad4caa3bee"
-SRC_URI[sha256sum] = "bef71ad0595b600261668dcb1e18b935a7117a724c04d7be60d9d246e32d0928"
+SRC_URI[sha256sum] = "c94281936af77c00c6ac2306a0e7f85a67e354d717120df85fcc5dfb9243d4dd"
 SRC_URI += " \
-           file://0001-test_functionality-convert-line-endings-to-Unix.patch \
           file://0002-Fix-import-of-tests.utils-to-enable-pytest.patch \
           "
diff --git a/meta-python/recipes-devtools/python/python3-zopeinterface_8.2.bb b/meta-python/recipes-devtools/python/python3-zopeinterface_8.3.bb
index 690c2d26aa..2dc586a3ab 100644
--- a/meta-python/recipes-devtools/python/python3-zopeinterface_8.2.bb
+++ b/meta-python/recipes-devtools/python/python3-zopeinterface_8.3.bb
@@ -6,7 +6,7 @@ PYPI_PACKAGE = "zope_interface"
 UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
 inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "afb20c371a601d261b4f6edb53c3c418c249db1a9717b0baafc9a9bb39ba1224"
+SRC_URI[sha256sum] = "e1a9de7d0b5b5c249a73b91aebf4598ce05e334303af6aa94865893283e9ff10"
 PACKAGES =. "${PN}-test "
 RPROVIDES:${PN} += "zope-interfaces"
diff --git a/meta-python/recipes-devtools/python3-mlcommons-loadgen/files/source-date-epoch.patch b/meta-python/recipes-devtools/python3-mlcommons-loadgen/files/source-date-epoch.patch
index 32e529d483..3eac44e738 100644
--- a/meta-python/recipes-devtools/python3-mlcommons-loadgen/files/source-date-epoch.patch
+++ b/meta-python/recipes-devtools/python3-mlcommons-loadgen/files/source-date-epoch.patch
@@ -1,6 +1,6 @@
-From dd7925397b84c2a327cd4594edba9f7ca5acef61 Mon Sep 17 00:00:00 2001
+From 99dfd88de60dd55bd3b5e7c0516b3882a8e56698 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
+From: Liu Yiding <liuyd.fnst@fujitsu.com>
-Date: Fri, 26 Sep 2025 14:02:23 +0800
+Date: Wed, 15 Apr 2026 06:09:37 +0000
 Subject: [PATCH] Honor the SOURCE_DATE_EPOCH variable
 Implement the SOURCE_DATE_EPOCH specification[1] for reproducible
@@ -12,30 +12,33 @@ current time.
 Upstream-Status: Submitted [https://github.com/mlcommons/inference/pull/2345]
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+Update for 6.0.14
+Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
 ---
 version_generator.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 diff --git a/version_generator.py b/version_generator.py
-index 2e75243..5202da9 100644
+index b88ae8e..b083eec 100644
 --- a/version_generator.py
 +++ b/version_generator.py
-@@ -110,8 +110,13 @@ def generate_loadgen_version_definitions(cc_filename, loadgen_root):
+@@ -113,8 +113,13 @@ def generate_loadgen_version_definitions(cc_filename, loadgen_root):
-     # Write the version into the function definition
+         # Write the version into the function definition
-     ofile.write(func_def("Version", f"\"{version_contents}\""))
+         ofile.write(func_def("Version", f"\"{version_contents}\""))
- 
-    date_time_now_local = datetime.datetime.now().isoformat()
-    date_time_now_utc = datetime.datetime.utcnow().isoformat()
-+    if os.environ.get('SOURCE_DATE_EPOCH', False):
-+        source_date_epoch = int(os.environ['SOURCE_DATE_EPOCH'])
-+        date_time_now_local = datetime.datetime.fromtimestamp(source_date_epoch).isoformat()
-+        date_time_now_utc = datetime.datetime.fromtimestamp(source_date_epoch, tz=datetime.timezone.utc).isoformat()
-+    else:
-+        date_time_now_local = datetime.datetime.now().isoformat()
-+        date_time_now_utc = datetime.datetime.utcnow().isoformat()
-     ofile.write(func_def("BuildDateLocal", '"' + date_time_now_local + '"'))
-     ofile.write(func_def("BuildDateUtc", '"' + date_time_now_utc + '"'))
 
+-        date_time_now_local = datetime.datetime.now().isoformat()
+-        date_time_now_utc = datetime.datetime.utcnow().isoformat()
+        if os.environ.get('SOURCE_DATE_EPOCH', False):
+            source_date_epoch = int(os.environ['SOURCE_DATE_EPOCH'])
+            date_time_now_local = datetime.datetime.fromtimestamp(source_date_epoch).isoformat()
+            date_time_now_utc = datetime.datetime.fromtimestamp(source_date_epoch, tz=datetime.timezone.utc).isoformat()
+        else:
+            date_time_now_local = datetime.datetime.now().isoformat()
+            date_time_now_utc = datetime.datetime.utcnow().isoformat()
+         ofile.write(
+             func_def(
+                 "BuildDateLocal",
 -- 
-2.34.1
+2.43.0
diff --git a/meta-python/recipes-devtools/python3-mlcommons-loadgen/python3-mlcommons-loadgen_5.1.2.bb b/meta-python/recipes-devtools/python3-mlcommons-loadgen/python3-mlcommons-loadgen_6.0.14.bb
index 79687290f5..3299f25080 100644
--- a/meta-python/recipes-devtools/python3-mlcommons-loadgen/python3-mlcommons-loadgen_5.1.2.bb
+++ b/meta-python/recipes-devtools/python3-mlcommons-loadgen/python3-mlcommons-loadgen_6.0.14.bb
@@ -21,7 +21,7 @@ SRC_URI += " \
 PYPI_PACKAGE = "mlcommons_loadgen"
 UPSTREAM_CHECK_PYPI_PACKAGE = "mlcommons_loadgen"
-SRC_URI[sha256sum] = "cd686a6223c978d1056e38a417e4807bfa21c855189f7882d24c8313174bca74"
+SRC_URI[sha256sum] = "9a56e361b4614938acdb6a601cc9c57ce551809f831023401bbac6dd7eb00970"
 # Because the pyproject.toml contains invalid requirements.
 INSANE_SKIP += "pep517-backend"
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch
deleted file mode 100644
index d3ab8f8526..0000000000
--- a/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6a85945c060154581f5a129a6a946258bf9333c4 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Mon, 8 May 2017 03:54:12 -0400
-Subject: [PATCH 08/11] use oe variable to replace hardcoded dir
-Upstream-Status: Pending
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Rebase for python3-blivet 3.4.0.
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
- setup.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/setup.py b/setup.py
-index e6bb3f3..700085b 100644
--- a/setup.py
-+++ b/setup.py
-@@ -73,10 +73,10 @@ class blivet_sdist(sdist):
- 
- 
- data_files = [
-    ('/etc/dbus-1/system.d', ['dbus/blivet.conf']),
-    ('/usr/share/dbus-1/system-services', ['dbus/com.redhat.Blivet0.service']),
-    ('/usr/libexec', ['dbus/blivetd']),
-    ('/usr/lib/systemd/system', ['dbus/blivet.service'])
-+    (os.environ.get('sysconfdir')+'/dbus-1/system.d', ['dbus/blivet.conf']),
-+    (os.environ.get('datadir')+'/dbus-1/system-services', ['dbus/com.redhat.Blivet0.service']),
-+    (os.environ.get('libexecdir'), ['dbus/blivetd']),
-+    (os.environ.get('systemd_system_unitdir'), ['dbus/blivet.service'])
- ]
- 
- 
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.13.2.bb
index bf492b3d57..a159979b73 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.13.2.bb
@@ -11,23 +11,34 @@ SRC_URI += "\
           file://0005-fix-incorrect-timeout-while-system-time-changed.patch \
           file://0006-tweak-btrfs-packages.patch \
           file://0007-invoking-mount-with-infinite-timeout.patch \
-           file://0008-use-oe-variable-to-replace-hardcoded-dir.patch \
           file://0009-invoking-fsck-with-infinite-timeout.patch \
           file://0010-invoking-mkfs-with-infinite-timeout.patch \
           file://0011-invoking-dd-with-infinite-timeout.patch \
 "
-SRC_URI[sha256sum] = "54775ba212d1574b1b0750ce147f0d3cf3b5d73aaf040d172283edb57db4ba15"
+SRC_URI[sha256sum] = "6d8374d05eeab513b2a26cf01267e853df7b31e13ad1a1ba7d73a856190d0518"
 inherit pypi features_check systemd setuptools3_legacy
 REQUIRED_DISTRO_FEATURES = "systemd"
-RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \
+RDEPENDS:${PN} += "python3-dasbus python3-pygobject python3-pykickstart python3-pyudev \
                   parted python3-pyparted multipath-tools \
                   lsof cryptsetup libblockdev libblockdev-bin \
                   libbytesize \
+                   util-linux \
 "
+do_install:append() {
+    install -d ${D}${sysconfdir}/dbus-1/system.d
+    install -m 644 ${S}/dbus/blivet.conf ${D}${sysconfdir}/dbus-1/system.d/blivet.conf
+    install -d ${D}${datadir}/dbus-1/system-services
+    install -m 644 ${S}/dbus/com.redhat.Blivet0.service ${D}${datadir}/dbus-1/system-services/com.redhat.Blivet0.service
+    install -d ${D}${libexecdir}
+    install -m 755 ${S}/dbus/blivetd ${D}${libexecdir}/blivetd
+    install -d ${D}${systemd_system_unitdir}
+    install -m 644 ${S}/dbus/blivet.service ${D}${systemd_system_unitdir}/blivet.service
+}
 FILES:${PN} += " \
    ${datadir}/dbus-1/system-services \
 "
diff --git a/meta-python/recipes-extended/python-pytesseract/pytesseract_0.3.13.bb b/meta-python/recipes-extended/python-pytesseract/pytesseract_0.3.13.bb
index 0d8cfcb408..034568251b 100644
--- a/meta-python/recipes-extended/python-pytesseract/pytesseract_0.3.13.bb
+++ b/meta-python/recipes-extended/python-pytesseract/pytesseract_0.3.13.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/madmaze/pytesseract"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-SRC_URI[md5sum] = "73f9645e59b437f064d05882b95832ce"
+SRC_URI[sha256sum] = "4bf5f880c99406f52a3cfc2633e42d9dc67615e69d8a509d74867d3baddb5db9"
 RDEPENDS:${PN}:append = " python3-packaging tesseract"
diff --git a/meta-python/recipes-extended/python-rich/python3-rich_14.3.3.bb b/meta-python/recipes-extended/python-rich/python3-rich_15.0.0.bb
index a2af61840f..2ab3b2fdbc 100644
--- a/meta-python/recipes-extended/python-rich/python3-rich_14.3.3.bb
+++ b/meta-python/recipes-extended/python-rich/python3-rich_15.0.0.bb
@@ -8,7 +8,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303"
-SRC_URI[sha256sum] = "b8daa0b9e4eef54dd8cf7c86c03713f53241884e814f4e2f5fb342fe520f639b"
+SRC_URI[sha256sum] = "edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36"
 inherit pypi python_poetry_core
diff --git a/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.32.1.bb b/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.32.2.bb
index bc9b414848..7684b1dccc 100644
--- a/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.32.1.bb
+++ b/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.32.2.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://github.com/swagger-api/swagger-ui;branch=master;protocol=https;tag=v${PV}"
-SRCREV = "d361f5b3570b8ade67fb1c02cf7a676fcb441479"
+SRCREV = "d02a2df106961d8cb6bceb6b4b3aa8d9f6faaf4a"
 CVE_STATUS[CVE-2016-1000229] = "fixed-version: fixed since 2.2.1"
diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_12.0.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_12.1.bb
index d6fa250cb9..8299e58263 100644
--- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_12.0.bb
+++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_12.1.bb
@@ -11,7 +11,7 @@ SRC_URI = "https://hiawatha.leisink.net/files/download/hiawatha-${PV}.tar.gz \
           file://hiawatha.service \
          "
-SRC_URI[sha256sum] = "57b61a6d2640e72601d5ba0a063d6f1639613b910287871216f7ea06c75bfb96"
+SRC_URI[sha256sum] = "e93e5964e69d98061d366fa4a0ec7b5d33d3e92e6c02efa8b291a79c646006b1"
 INITSCRIPT_NAME = "hiawatha"
 INITSCRIPT_PARAMS = "defaults 70"
diff --git a/meta-webserver/recipes-httpd/monkey/files/0001-server-http-fix-malformed-request-crash-paths.patch b/meta-webserver/recipes-httpd/monkey/files/0001-server-http-fix-malformed-request-crash-paths.patch
new file mode 100644
index 0000000000..b57d7ac219
--- /dev/null
+++ b/meta-webserver/recipes-httpd/monkey/files/0001-server-http-fix-malformed-request-crash-paths.patch
@@ -0,0 +1,160 @@
+From 839620179e2b4e5982c53d8956d92e690d82960c Mon Sep 17 00:00:00 2001
+From: Eduardo Silva <eduardo@chronosphere.io>
+Date: Thu, 9 Apr 2026 12:11:52 -0600
+Subject: [PATCH] server: http: fix malformed request crash paths
+Fix the reproducible malformed-request crash paths in the HTTP
+request lifecycle.
+Handle missing Host data in directory redirects, reject malformed
+range delimiters before substring parsing, and avoid reusing invalid
+request state while advancing pipelined requests.
+Verified by rebuilding with cmake --build build and replaying the
+reported crash-inducing request fixtures against build/bin/monkey.
+Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
+This patch is part of https://github.com/monkey/monkey/pull/434,
+containing assorted CVE fixes.
+Upstream-Status: Backport [https://github.com/monkey/monkey/commit/1570f41231888ae8c7fbd719704e2486a952e45d]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ mk_core/mk_memory.c | 10 ++++++++++
+ mk_server/mk_http.c | 46 +++++++++++++++++++++++++++++++++++++++++----
+ 2 files changed, 52 insertions(+), 4 deletions(-)
+diff --git a/mk_core/mk_memory.c b/mk_core/mk_memory.c
+index c4073e23..008f7ac6 100644
+--- a/mk_core/mk_memory.c
+++ b/mk_core/mk_memory.c
+@@ -52,6 +52,16 @@ char *mk_ptr_to_buf(mk_ptr_t p)
+ {
+     char *buf;
+ 
+    if (!p.data || p.len == 0) {
+        buf = mk_mem_alloc(1);
+        if (!buf) {
+            return NULL;
+        }
+
+        buf[0] = '\0';
+        return buf;
+    }
+
+     buf = mk_mem_alloc(p.len + 1);
+     if (!buf) return NULL;
+ 
+diff --git a/mk_server/mk_http.c b/mk_server/mk_http.c
+index ad12a74a..f2f12554 100644
+--- a/mk_server/mk_http.c
+++ b/mk_server/mk_http.c
+@@ -457,6 +457,10 @@ static int mk_http_range_parse(struct mk_http_request *sr)
+     if ((sep_pos = mk_string_char_search(sr->range.data, '-', sr->range.len)) < 0)
+         return -1;
+ 
+    if (sep_pos < eq_pos) {
+        return -1;
+    }
+
+     len = sr->range.len;
+     sh = &sr->headers;
+ 
+@@ -476,10 +480,16 @@ static int mk_http_range_parse(struct mk_http_request *sr)
+     /* =yyy-xxx */
+     if ((eq_pos + 1 != sep_pos) && (len > sep_pos + 1)) {
+         buffer = mk_string_copy_substr(sr->range.data, eq_pos + 1, sep_pos);
+        if (!buffer) {
+            return -1;
+        }
+         sh->ranges[0] = (unsigned long) atol(buffer);
+         mk_mem_free(buffer);
+ 
+         buffer = mk_string_copy_substr(sr->range.data, sep_pos + 1, len);
+        if (!buffer) {
+            return -1;
+        }
+         sh->ranges[1] = (unsigned long) atol(buffer);
+         mk_mem_free(buffer);
+ 
+@@ -493,6 +503,9 @@ static int mk_http_range_parse(struct mk_http_request *sr)
+     /* =yyy- */
+     if ((eq_pos + 1 != sep_pos) && (len == sep_pos + 1)) {
+         buffer = mk_string_copy_substr(sr->range.data, eq_pos + 1, len);
+        if (!buffer) {
+            return -1;
+        }
+         sr->headers.ranges[0] = (unsigned long) atol(buffer);
+         mk_mem_free(buffer);
+ 
+@@ -522,7 +535,16 @@ static int mk_http_directory_redirect_check(struct mk_http_session *cs,
+         return 0;
+     }
+ 
+    if (!sr->host.data || sr->host.len <= 0) {
+        mk_http_error(MK_CLIENT_BAD_REQUEST, cs, sr, server);
+        return -1;
+    }
+
+     host = mk_ptr_to_buf(sr->host);
+    if (!host) {
+        mk_http_error(MK_CLIENT_BAD_REQUEST, cs, sr, server);
+        return -1;
+    }
+ 
+     /*
+      * Add ending slash to the location string
+@@ -588,6 +610,9 @@ static inline char *mk_http_index_lookup(mk_ptr_t *path_base,
+     }
+ 
+     off = path_base->len;
+    if ((size_t) off >= buf_size) {
+        return NULL;
+    }
+     memcpy(buf, path_base->data, off);
+ 
+     mk_list_foreach(head, server->index_files) {
+@@ -1138,15 +1163,27 @@ int mk_http_request_end(struct mk_http_session *cs, struct mk_server *server)
+     ret = mk_http_parser_more(&cs->parser, cs->body_length);
+     if (ret == MK_TRUE) {
+         /* Our pipeline request limit is the same that our keepalive limit */
+        if (cs->parser.i < 0 ||
+            (unsigned int) (cs->parser.i + 1) >= cs->body_length) {
+            goto shutdown;
+        }
+
+         cs->counter_connections++;
+         len = (cs->body_length - cs->parser.i) -1;
+        if (len <= 0) {
+            goto shutdown;
+        }
+         memmove(cs->body,
+                 cs->body + cs->parser.i + 1,
+                 len);
+         cs->body_length = len;
+ 
+         /* Prepare for next one */
+-        sr = mk_list_entry_first(&cs->request_list, struct mk_http_request, _head);
+        if (mk_list_is_empty(&cs->request_list) == 0) {
+            cs->close_now = MK_TRUE;
+            goto shutdown;
+        }
+        sr = &cs->sr_fixed;
+         mk_http_request_free(sr, server);
+         mk_http_request_init(cs, sr, server);
+         mk_http_parser_init(&cs->parser);
+@@ -1626,9 +1663,10 @@ int mk_http_sched_done(struct mk_sched_conn *conn,
+     struct mk_http_request *sr;
+ 
+     session = mk_http_session_get(conn);
+-    sr = mk_list_entry_first(&session->request_list,
+-                             struct mk_http_request, _head);
+-    mk_plugin_stage_run_40(session, sr, server);
+    if (mk_list_is_empty(&session->request_list) != 0) {
+        sr = &session->sr_fixed;
+        mk_plugin_stage_run_40(session, sr, server);
+    }
+ 
+     return mk_http_request_end(session, server);
+ }
diff --git a/meta-webserver/recipes-httpd/monkey/files/0002-server-scheduler-guard-protocol-close-callback.patch b/meta-webserver/recipes-httpd/monkey/files/0002-server-scheduler-guard-protocol-close-callback.patch
new file mode 100644
index 0000000000..c731db0919
--- /dev/null
+++ b/meta-webserver/recipes-httpd/monkey/files/0002-server-scheduler-guard-protocol-close-callback.patch
@@ -0,0 +1,51 @@
+From 82fb537e74e9b801d196b76efaf735ee50cd86c6 Mon Sep 17 00:00:00 2001
+From: Eduardo Silva <eduardo@chronosphere.io>
+Date: Thu, 9 Apr 2026 12:43:31 -0600
+Subject: [PATCH] server: scheduler: guard protocol close callback
+Avoid calling a null cb_close handler from the scheduler close
+and timeout paths.
+This fixes the HTTP/2 upgrade case where the protocol handler can be
+switched to mk_http2_handler even though that handler does not
+implement cb_close.
+Verified by rebuilding with cmake --build build.
+Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
+This patch is part of https://github.com/monkey/monkey/pull/434, 
+containing assorted CVE fixes.
+Upstream-Status: Backport [https://github.com/monkey/monkey/commit/fc1d68fb38044df08cb43c7d9af0f68714388efc]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ mk_server/mk_scheduler.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+diff --git a/mk_server/mk_scheduler.c b/mk_server/mk_scheduler.c
+index a680d3cd..3cf0ba40 100644
+--- a/mk_server/mk_scheduler.c
+++ b/mk_server/mk_scheduler.c
+@@ -598,8 +598,10 @@ int mk_sched_check_timeouts(struct mk_sched_worker *sched,
+             MK_TRACE("Scheduler, closing fd %i due TIMEOUT",
+                      conn->event.fd);
+             MK_LT_SCHED(conn->event.fd, "TIMEOUT_CONN_PENDING");
+-            conn->protocol->cb_close(conn, sched, MK_SCHED_CONN_TIMEOUT,
+-                                     server);
+            if (conn->protocol->cb_close) {
+                conn->protocol->cb_close(conn, sched, MK_SCHED_CONN_TIMEOUT,
+                                         server);
+            }
+             mk_sched_drop_connection(conn, sched, server);
+         }
+     }
+@@ -749,7 +751,7 @@ int mk_sched_event_close(struct mk_sched_conn *conn,
+     MK_TRACE("[FD %i] Connection Handler, closed", conn->event.fd);
+     mk_event_del(sched->loop, &conn->event);
+ 
+-    if (type != MK_EP_SOCKET_DONE) {
+    if (type != MK_EP_SOCKET_DONE && conn->protocol->cb_close) {
+         conn->protocol->cb_close(conn, sched, type, server);
+     }
+     /*
diff --git a/meta-webserver/recipes-httpd/monkey/files/0003-server-parser-harden-boundary-checks.patch b/meta-webserver/recipes-httpd/monkey/files/0003-server-parser-harden-boundary-checks.patch
new file mode 100644
index 0000000000..1e56893c65
--- /dev/null
+++ b/meta-webserver/recipes-httpd/monkey/files/0003-server-parser-harden-boundary-checks.patch
@@ -0,0 +1,108 @@
+From b9f24a2968fa62de4a6ecf070fa0389ce10e7729 Mon Sep 17 00:00:00 2001
+From: Eduardo Silva <eduardo@chronosphere.io>
+Date: Thu, 9 Apr 2026 12:11:57 -0600
+Subject: [PATCH] server: parser: harden boundary checks
+Tighten parser and helper validation around explicit lengths and
+buffer boundaries.
+Require exact header literal matches, validate chunk length tokens,
+and guard helper routines that previously trusted inconsistent
+pointer or length state.
+Verified by rebuilding with cmake --build build and replaying the
+reported malformed request fixtures against build/bin/monkey.
+Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
+This patch is part of https://github.com/monkey/monkey/pull/434, 
+containing assorted CVE fixes.
+Upstream-Status: Backport [https://github.com/monkey/monkey/commit/ffe0d0ed1b074ea6f3965c37bb754e9f19130a82]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ include/monkey/mk_http_parser.h |  6 +++++-
+ mk_server/mk_http_parser.c      | 13 +++++++++++++
+ mk_server/mk_mimetype.c         |  7 ++++++-
+ mk_server/mk_user.c             |  2 +-
+ 4 files changed, 25 insertions(+), 3 deletions(-)
+diff --git a/include/monkey/mk_http_parser.h b/include/monkey/mk_http_parser.h
+index 9e3b365e..465ea0e4 100644
+--- a/include/monkey/mk_http_parser.h
+++ b/include/monkey/mk_http_parser.h
+@@ -389,7 +389,11 @@ int mk_http_parser_chunked_decode_buf(struct mk_http_parser *p,
+ 
+ static inline int mk_http_parser_more(struct mk_http_parser *p, int len)
+ {
+-    if (abs(len - p->i) - 1 > 0) {
+    if (len <= 0 || p->i < 0) {
+        return MK_FALSE;
+    }
+
+    if ((p->i + 1) < len) {
+         return MK_TRUE;
+     }
+ 
+diff --git a/mk_server/mk_http_parser.c b/mk_server/mk_http_parser.c
+index 9413528a..3c831f29 100644
+--- a/mk_server/mk_http_parser.c
+++ b/mk_server/mk_http_parser.c
+@@ -173,6 +173,16 @@ static inline void request_set(mk_ptr_t *ptr, struct mk_http_parser *p, char *bu
+ static inline int header_cmp(const char *expected, char *value, int len)
+ {
+     int i = 0;
+    size_t expected_len;
+
+    if (len < 0) {
+        return -1;
+    }
+
+    expected_len = strlen(expected);
+    if ((size_t) len != expected_len) {
+        return -1;
+    }
+ 
+     if (len >= 8) {
+         if (expected[0] != tolower(value[0])) return -1;
+@@ -535,6 +545,9 @@ parse_more:
+         (errno != 0)) {
+         return MK_HTTP_PARSER_ERROR;
+     }
+    if (ptr == tmp || *ptr != '\0') {
+        return MK_HTTP_PARSER_ERROR;
+    }
+ 
+     if (chunk_len < 0) {
+         return MK_HTTP_PARSER_ERROR;
+diff --git a/mk_server/mk_mimetype.c b/mk_server/mk_mimetype.c
+index b86b4ef1..5462ea5c 100644
+--- a/mk_server/mk_mimetype.c
+++ b/mk_server/mk_mimetype.c
+@@ -197,7 +197,12 @@ struct mk_mimetype *mk_mimetype_find(struct mk_server *server, mk_ptr_t *filenam
+ {
+     int j, len;
+ 
+-    j = len = filename->len;
+    if (!filename->data || filename->len <= 0) {
+        return NULL;
+    }
+
+    len = filename->len;
+    j = len - 1;
+ 
+     /* looking for extension */
+     while (j >= 0 && filename->data[j] != '.') {
+diff --git a/mk_server/mk_user.c b/mk_server/mk_user.c
+index 7200ff08..716331ac 100644
+--- a/mk_server/mk_user.c
+++ b/mk_server/mk_user.c
+@@ -46,7 +46,7 @@ int mk_user_init(struct mk_http_session *cs, struct mk_http_request *sr,
+     }
+ 
+     limit = mk_string_char_search(sr->uri_processed.data + offset, '/',
+-                                  sr->uri_processed.len);
+                                  sr->uri_processed.len - offset);
+ 
+     if (limit == -1) {
+         limit = (sr->uri_processed.len) - offset;
diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.8.4.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.8.7.bb
index 126a2a6fa5..a9bea8f767 100644
--- a/meta-webserver/recipes-httpd/monkey/monkey_1.8.4.bb
+++ b/meta-webserver/recipes-httpd/monkey/monkey_1.8.7.bb
@@ -7,13 +7,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 SECTION = "net"
-SRC_URI = "git://github.com/monkey/monkey;branch=master;protocol=https \
+SRC_URI = "git://github.com/monkey/monkey;branch=master;protocol=https;tag=v${PV} \
           file://0001-fastcgi-Use-value-instead-of-address-of-sin6_port.patch \
           file://0001-include-Fix-location-of-mk_core.h-etal.patch \
           file://monkey.service \
-           file://monkey.init"
+           file://monkey.init \
+           file://0001-server-http-fix-malformed-request-crash-paths.patch \
+           file://0002-server-scheduler-guard-protocol-close-callback.patch \
+           file://0003-server-parser-harden-boundary-checks.patch \
+           "
-SRCREV = "94af273244369e1a8426d0d1f6376475aff90db9"
+SRCREV = "0fd3bbd657c6d6339315709ef068493c572b973c"
 UPSTREAM_CHECK_COMMITS = "1"
@@ -51,6 +55,10 @@ do_install:append() {
    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
        install -Dm 644 ${UNPACKDIR}/monkey.service ${D}/${systemd_unitdir}/system/monkey.service
    fi
+    # QA Issue: monkey installs files in /var/volatile, but it is expected to be empty [empty-dirs]
+    # these folders are supposed to be recreated at runtime
+    find ${D}/var -type d -empty -delete
 }
 INITSCRIPT_NAME = "monkey"
diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
index 9459670344..33543071ba 100644
--- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
+++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
@@ -19,6 +19,8 @@ UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz"
 inherit autotools update-rc.d systemd update-alternatives
+CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE:${PN}-doc = "htpasswd.1"
 ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1"
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_2.621.bb b/meta-webserver/recipes-webadmin/webmin/webmin_2.630.bb
index bb5ac1c755..6a627e1f0e 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_2.621.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_2.630.bb
@@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
           file://mysql-config-fix.patch \
           file://webmin.service \
            "
-SRC_URI[sha256sum] = "88381e8bcdd4733b215c114ca2158dc044892ea68dc0da4d235d88d2b1db4bb8"
+SRC_URI[sha256sum] = "47e25daeefeb98598f4b3f3d99e5093fe618b96eb1b952e938ba6356806be20c"
 UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html"
 UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz"
diff --git a/meta-xfce/classes/thunar-plugin.bbclass b/meta-xfce/classes/thunar-plugin.bbclass
index 82a1be6347..f38996d26e 100644
--- a/meta-xfce/classes/thunar-plugin.bbclass
+++ b/meta-xfce/classes/thunar-plugin.bbclass
@@ -1,6 +1,4 @@
-inherit xfce features_check
+inherit xfce
-REQUIRED_DISTRO_FEATURES = "x11"
 DEPENDS += "thunar"
diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb
index 2033eb082f..b95bfc170c 100644
--- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb
+++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 XFCE_COMPRESS_TYPE = "xz"
 XFCEBASEBUILDCLASS = "meson"
-DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3"
+DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3 libpam systemd"
 inherit xfce-app
diff --git a/meta-xfce/recipes-multimedia/parole/files/0001-Makefile.am-fix-compile-failure.patch b/meta-xfce/recipes-multimedia/parole/files/0001-Makefile.am-fix-compile-failure.patch
new file mode 100644
index 0000000000..f84f6e5388
--- /dev/null
+++ b/meta-xfce/recipes-multimedia/parole/files/0001-Makefile.am-fix-compile-failure.patch
@@ -0,0 +1,31 @@
+From 34ff86795396c320a9e19641d9d226190b7fdfc6 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Sun, 12 Apr 2026 19:30:23 +0800
+Subject: [PATCH] Makefile.am: fix compile failure
+Fix build failure:
+/build/tmp/work/x86-64-v3-poky-linux/parole/4.18.2/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-ld: parole-conf.o: undefined reference to symbol 'xfce_rc_close'
+/build/tmp/work/x86-64-v3-poky-linux/parole/4.18.2/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-ld: /build/tmp/work/x86-64-v3-poky-linux/parole/4.18.2/recipe-sysroot/usr/lib/libxfce4util.so.7: error adding symbols: DSO missing from command line
+Upstream-Status: Submitted [https://gitlab.xfce.org/apps/parole/-/issues/146]
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ src/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 920b708..244c14c 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -90,6 +90,7 @@ parole_LDADD =                                                        \
+        $(GMODULE_LIBS)                         \
+        $(DBUS_GLIB_LIBS)                       \
+        $(LIBXFCE4UI_LIBS)                     \
+       $(LIBXFCE4UTIL_LIBS)                \
+        $(XFCONF_LIBS)                     \
+        $(GST_VIDEO_LIBS)                       \
+        $(TAGLIBC_LIBS)                         \
+-- 
+2.34.1
diff --git a/meta-xfce/recipes-multimedia/parole/parole_4.18.2.bb b/meta-xfce/recipes-multimedia/parole/parole_4.18.2.bb
index 7787196fdd..1d2c858a2d 100644
--- a/meta-xfce/recipes-multimedia/parole/parole_4.18.2.bb
+++ b/meta-xfce/recipes-multimedia/parole/parole_4.18.2.bb
@@ -11,11 +11,12 @@ DEPENDS += " \
    libxfce4util \
    libxfce4ui \
    xfconf \
-    \
    gstreamer1.0-plugins-base \
    taglib \
 "
+SRC_URI += "file://0001-Makefile.am-fix-compile-failure.patch"
 SRC_URI[sha256sum] = "6625288b760d38a15c295051ecf66c556fcad21dd1516d6d661c2a582421ee0e"
 RDEPENDS:${PN} += "gstreamer1.0-plugins-good"
diff --git a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb
index 4f823c67b5..2fa76351a4 100644
--- a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb
+++ b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb
@@ -7,7 +7,7 @@ XFCE_COMPRESS_TYPE = "xz"
 inherit xfce-panel-plugin features_check
-REQUIRED_DISTRO_FEATURES = "pulseaudio ${@bb.utils.contains_any('DISTRO_FEATURES', 'opengl vulkan', 'x11', '', d)}"
+REQUIRED_DISTRO_FEATURES = "pulseaudio"
 DEPENDS += "dbus-glib pulseaudio"
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.21.7.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.21.7.bb
index e672eae540..9c86da48e6 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.21.7.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.21.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://docs.xfce.org/xfce/libxfce4ui/start"
 SECTION = "x11/libs"
 LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db"
-DEPENDS = "intltool-native perl-native gtk+3 libxfce4util xfce4-dev-tools xfconf"
+DEPENDS = "intltool-native perl-native gtk+3 libxfce4util xfce4-dev-tools xfconf gdk-pixbuf"
 XFCE_COMPRESS_TYPE = "xz"
 XFCEBASEBUILDCLASS = "meson"
@@ -26,7 +26,6 @@ SRC_URI[sha256sum] = "a72a7af39cf183819bcfb61b1747d425261e966ccb172b2fc28f1494f5
 EXTRA_OEMESON = "-Dvala=disabled -Dvendor-info=${DISTRO}"
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
-       ${@bb.utils.contains('DISTRO_FEATURES', 'x11','x11', "", d)} \
+PACKAGECONFIG[x11] = "-Dsession-management=enabled -Dstartup-notification=enabled,-Dsession-management=disabled -Dstartup-notification=disabled,libepoxy libice libsm startup-notification"
-"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled, -Dwayland=disabled,"
-PACKAGECONFIG[x11] = "-Dstartup-notification=enabled,-Dstartup-notification=disabled,libepoxy libice libsm startup-notification"
diff --git a/meta-xfce/recipes-xfce/thunar/files/0001-Properly-guard-gdkx.h-include.patch b/meta-xfce/recipes-xfce/thunar/files/0001-Properly-guard-gdkx.h-include.patch
new file mode 100644
index 0000000000..9d4afc7167
--- /dev/null
+++ b/meta-xfce/recipes-xfce/thunar/files/0001-Properly-guard-gdkx.h-include.patch
@@ -0,0 +1,37 @@
+From dd7fbf4540891053a4083228aac2485e6c469199 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
+Date: Sat, 11 Apr 2026 18:07:05 +0200
+Subject: [PATCH] Properly guard gdkx.h include
+Fixes: #1820
+Upstream-Status: Backport [https://gitlab.xfce.org/xfce/thunar/-/commit/201f8ca0c3bc7b5e651201526fc3006a130718eb]
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ thunar/thunar-session-client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/thunar/thunar-session-client.c b/thunar/thunar-session-client.c
+index c36719c..2832818 100644
+--- a/thunar/thunar-session-client.c
+++ b/thunar/thunar-session-client.c
+@@ -30,6 +30,7 @@
+ 
+ #ifdef ENABLE_LIBSM
+ #include <X11/SM/SMlib.h>
+#include <gdk/gdkx.h>
+ #endif
+ 
+ #include "thunar/thunar-application.h"
+@@ -38,7 +39,6 @@
+ #include "thunar/thunar-private.h"
+ #include "thunar/thunar-session-client.h"
+ 
+-#include <gdk/gdkx.h>
+ #include <glib/gstdio.h>
+ 
+ 
+-- 
+2.34.1
diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.21.5.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.21.5.bb
index 32d4c39aa5..d8e9edfc25 100644
--- a/meta-xfce/recipes-xfce/thunar/thunar_4.21.5.bb
+++ b/meta-xfce/recipes-xfce/thunar/thunar_4.21.5.bb
@@ -9,15 +9,15 @@ XFCE_COMPRESS_TYPE = "xz"
 XFCEBASEBUILDCLASS = "meson"
 GTKDOC_MESON_OPTION = "gtk-doc"
-inherit xfce gobject-introspection features_check mime-xdg perlnative gtk-doc
+inherit xfce gobject-introspection mime-xdg perlnative gtk-doc
-REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI[sha256sum] = "eddbd4bab29c73718734e0bfcf650ceea8b4fcc8cb2cbb0b24fe22b286a2be00"
+SRC_URI += "file://0001-Properly-guard-gdkx.h-include.patch"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 PACKAGECONFIG[pcre] = "-Dpcre2=enabled,-Dpcre2=disabled,libpcre2"
-PACKAGECONFIG[x11] = "-Dx11=enabled -Dsession-management=enabled,-Dx11=disabled,libsm startup-notification"
+PACKAGECONFIG[x11] = "-Dx11=enabled -Dsession-management=enabled,-Dx11=disabled,libsm startup-notification virtual/libx11"
 FILES:${PN} += " \
    ${libdir}/thunarx-3/* \
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb
index b3cf4b2559..00c9352dec 100644
--- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb
+++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.21.1.bb
@@ -3,9 +3,7 @@ HOMEPAGE = "https://docs.xfce.org/xfce/xfce4-panel/start"
 SECTION = "x11"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee"
-DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxfce4windowing libxml2 \
+DEPENDS = "garcon exo cairo libxml2 vala-native gtk+3 libxfce4windowing"
-           libwnck3 vala-native \
-           "
 XFCE_COMPRESS_TYPE = "xz"
 XFCEBASEBUILDCLASS = "meson"
@@ -13,8 +11,6 @@ GTKDOC_MESON_OPTION = "gtk-doc"
 inherit xfce gtk-doc gobject-introspection features_check mime-xdg
-REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI += " \
    file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \
    file://0002-use-lxdm-to-replace-dm-tool.patch \
@@ -24,6 +20,12 @@ SRC_URI[sha256sum] = "c940dae515bef4af08a126011d2fd873ce99e815157ba8cef5332195bb
 EXTRA_OEMESON += "-Dvala=disabled"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
+PACKAGECONFIG[x11] = "-Dx11=enabled, -Dx11=disabled, virtual/libx11 libwnck3 libxext"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled, -Dwayland=disabled, wayland wayland-native wayland-protocols"
 python populate_packages:prepend() {
    plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/')
    plugin_name = d.expand('${PN}-plugin-%s')
diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb
index d16a9e6446..5cd0213951 100644
--- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb
+++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.20.1.bb
@@ -13,6 +13,7 @@ DEPENDS = " \
    libxfce4ui \
    libxfce4util \
    libxfce4windowing \
+    libyaml \
    thunar \
    xfconf \
 "