291 files changed, 3872 insertions, 3704 deletions

diff --git a/meta-networking/SECURITY.md b/meta-networking/SECURITY.md
new file mode 100644
index 0000000000..1530103230
--- /dev/null
+++ b/meta-networking/SECURITY.md
@@ -0,0 +1,20 @@
+How to Report a Potential Vulnerability?
+========================================
+
+If you would like to report a public issue (for example, one with a released
+CVE number), please report it to the mailing list:
+
+  https://lists.openembedded.org/g/openembedded-devel
+
+If you are dealing with a not-yet released or urgent issue, please send a
+message to one of the maintainers listed in the README.  Include as many
+details as possible:
+  - the layer or software module affected
+  - the recipe and its version
+  - any example code, if available
+
+Branches maintained with security fixes
+---------------------------------------
+
+See https://wiki.yoctoproject.org/wiki/Releases for the list of current
+releases.  We only accept patches for the LTS releases and the master branch.
diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass
index 79acacc989..cb78ce6b0d 100644
--- a/meta-networking/classes/waf-samba.bbclass
+++ b/meta-networking/classes/waf-samba.bbclass
@@ -113,7 +113,7 @@ do_configure() {
 
 do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+"
 do_compile () {
-    python3 ./buildtools/bin/waf ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}
+    $PYTHON ./buildtools/bin/waf ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}
 }
 
 do_install() {
diff --git a/meta-networking/conf/include/non-repro-meta-networking.inc b/meta-networking/conf/include/non-repro-meta-networking.inc
deleted file mode 100755
index 0564e1ced8..0000000000
--- a/meta-networking/conf/include/non-repro-meta-networking.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-# List of known non-reproducible package of the meta-networking layer
-# Please keep this list sorted
-KNOWN_NON_REPRO_META_NETWORKING = " \
-    blueman \
-    blueman-dbg \
-    blueman-src \
-    civetweb-dev \
-    dhcp-relay-staticdev \
-    ettercap-src \
-    fetchmail \
-    fetchmail-dbg \
-    freediameter \
-    freediameter-src \
-    freeradius \
-    htpdate-doc \
-    keepalived \
-    keepalived-dbg \
-    libbearssl-staticdev \
-    libfko3 \
-    libfko-client \
-    libfko-daemon \
-    libfko-dbg \
-    libmosquitto1 \
-    libowfat-staticdev \
-    libruli-staticdev \
-    libsamba-util0 \
-    mosquitto \
-    mosquitto-dbg \
-    ncftp \
-    ncftp-dbg \
-    ncftp-src \
-    ndisc6-dbg \
-    ndisc6-misc \
-    ndisc6-ndisc6 \
-    ndisc6-rdisc6 \
-    ndisc6-rdnssd \
-    ndisc6-rltraceroute6 \
-    netsniff-ng-doc \
-    ntpsec-src \
-    openl2tp \
-    openl2tp-dbg \
-    ot-br-posix \
-    ot-br-posix-dbg \
-    postfix-cfg \
-    proftpd \
-    proftpd-dbg \
-    proftpd-dev \
-    rdist \
-    rdist-dbg \
-    rp-pppoe \
-    samba-dbg \
-    tayga \
-    tayga-dbg \
-    udpcast-doc \
-    unbound-doc \
-    wolfssl \
-    wolfssl-dbg \
-    znc \
-    znc-doc \
-"
diff --git a/meta-networking/conf/include/ptest-packagelists-meta-networking.inc b/meta-networking/conf/include/ptest-packagelists-meta-networking.inc
index 7ec6f9063d..7f7519ff84 100644
--- a/meta-networking/conf/include/ptest-packagelists-meta-networking.inc
+++ b/meta-networking/conf/include/ptest-packagelists-meta-networking.inc
@@ -9,29 +9,43 @@
 PTESTS_FAST_META_NETWORKING = "\
     freediameter \
     geoip \
+    geoip-perl \
     libcoap \
     libldb \
     libnftnl \
     libtalloc \
     libtdb \
+    libtevent \
     lldpd \
     mbedtls \
     openhpi \
+    openl2tp \
     squid \
     tcpdump \
+    wolfssl \
 "
+PTESTS_FAST_META_NETWORKING:remove:libc-musl = "\
+    libtalloc \
+    libtevent \
+    libtdb \
+    openhpi \
+    "
 
 # firewalld currently hangs forever so disable it for now
 #    firewalld
 PTESTS_SLOW_META_NETWORKING = "\
-    net-snmp \
+    openvpn \
 "
 
 PTESTS_PROBLEMS_META_NETWORKING = "\
-    geoip-perl \
-    libtevent \
     lksctp-tools \
+    net-snmp \
     nftables \
-    openl2tp \
     python3-scapy \
 "
+PTESTS_PROBLEMS_META_NETWORKING:append:libc-musl = "\
+    libtalloc \
+    libtevent \
+    libtdb \
+    openhpi \
+    "
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
index a9ba4abade..58126a575f 100644
--- a/meta-networking/conf/layer.conf
+++ b/meta-networking/conf/layer.conf
@@ -15,7 +15,7 @@ LAYERVERSION_networking-layer = "1"
 
 LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer"
 
-LAYERSERIES_COMPAT_networking-layer = "styhead"
+LAYERSERIES_COMPAT_networking-layer = "walnascar whinlatter"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
@@ -27,3 +27,44 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
 BBFILES_DYNAMIC += " \
     meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \
 "
+
+# List of known non-reproducible package of the meta-networking layer
+# Please keep this list sorted
+OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += " \
+    babeld \
+    babeld-dbg \
+    dhcp-relay-staticdev \
+    ettercap-src \
+    freediameter \
+    freeradius \
+    htpdate-doc \
+    libbearssl-staticdev \
+    libmosquitto1 \
+    libowfat-staticdev \
+    libruli-staticdev \
+    mosquitto \
+    ncftp \
+    ncp \
+    ncp-dbg \
+    ndisc6-dbg \
+    ndisc6-misc \
+    ndisc6-ndisc6 \
+    ndisc6-rdisc6 \
+    ndisc6-rdnssd \
+    ndisc6-rltraceroute6 \
+    netsniff-ng-doc \
+    ntopng \
+    ntopng-dbg \
+    ntpsec-src \
+    openl2tp \
+    opensaf \
+    phytool \
+    phytool-dbg \
+    postfix-cfg \
+    rp-pppoe \
+    traceroute \
+    traceroute-dbg \
+    udpcast-doc \
+    unbound-doc \
+    znc \
+"
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_2.2.1.bb
index 12cc6645b5..0c670a2caa 100644
--- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb
+++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_2.2.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "\
     file://firewalld.init \
     file://run-ptest \
 "
-SRC_URI[sha256sum] = "aba0d8ce9617b906ea4866bf0bdfb2c2d5312f53b8e9e8e9e4d49bf330da5b5e"
+SRC_URI[sha256sum] = "5215ba30236ee1e3df2c2292465a9ff605b9c445dcab2e37da4961cb27c7f36e"
 
 # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4
 DEPENDS = "intltool-native glib-2.0-native nftables"
@@ -159,10 +159,10 @@ do_install:append() {
     # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools.
     if [ ${PN} != "${BPN}-native" ]; then
         sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \
-            ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml
+            ${D}${bindir}/* ${D}${sbindir}/*
     fi
     sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \
-        ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml
+        ${D}${bindir}/* ${D}${sbindir}/*
 
     # This file contains Red Hat-isms. Modules get loaded without it.
     rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf
@@ -274,6 +274,7 @@ FILES:${PN} += "\
     ${datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml \
 "
 RDEPENDS:${PN} += "\
+    bash \
     python3-firewall \
     iptables \
     python3-core \
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb b/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb
index bff16b4412..ac23182009 100644
--- a/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb
+++ b/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://github.com/OpenPrinting/system-config-printer.git;protocol=https;branch=master"
 
 SRCREV = "895d3dec50c93bfd4f142bac9bfcc13051bf84cb"
-S = "${WORKDIR}/git"
 
 inherit autotools gettext pkgconfig python3native features_check
 
@@ -26,19 +25,14 @@ do_install:append() {
     cp -rf ${B}/cupshelpers.egg-info ${D}${PYTHON_SITEPACKAGES_DIR}
     cp -rf ${B}/cupshelpers ${D}${PYTHON_SITEPACKAGES_DIR}
     rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/*.egg
-    for f in __init__.cpython-311.pyc cupshelpers.cpython-311.pyc \
-        config.cpython-311.pyc ppds.cpython-311.pyc \
-        installdriver.cpython-311.pyc openprinting.cpython-311.pyc \
-        xmldriverprefs.cpython-311.pyc; do
-        rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/cupshelpers/__pycache__/$f
-    done
+    rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/cupshelpers/__pycache__
 }
 
 FILES:${PN} += "${libdir} ${datadir}"
 
 RDEPENDS:${PN} = " \
     cups \
-    dbus-x11 \
+    ${VIRTUAL-RUNTIME_dbus} \
     gtk+3 \
     libnotify \
     python3-core \
diff --git a/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb b/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb
index c5dcccbac5..2f15abbcfd 100644
--- a/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb
+++ b/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb
@@ -8,7 +8,6 @@ SRCREV = "8e88e3590a19006362ea8b8dfdc18bb88b3cb3b5"
 
 SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6"
diff --git a/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb b/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb
index de7e2d3e01..cddb5e89bd 100644
--- a/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb
+++ b/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb
@@ -11,19 +11,19 @@ SRC_URI[sha256sum] = "5fc3cee3361ca1615af862364c480593171d0c54ec156de79fc421e31a
 
 RDEPENDS:${PN} = "ssh"
 
-CFLAGS:prepend = "-I${WORKDIR}/build "
+CFLAGS:prepend = "-I${B} "
 
 inherit autotools
 
-EXTRA_OECONF="--with-ssh=/usr/bin/ssh"
+EXTRA_OECONF = "--with-ssh=/usr/bin/ssh"
 
 do_compile:append() {
-        cp ${WORKDIR}/autossh-${PV}/CHANGES ${WORKDIR}/build
-        cp ${WORKDIR}/autossh-${PV}/README ${WORKDIR}/build
-        cp ${WORKDIR}/autossh-${PV}/autossh.host ${WORKDIR}/build
-        cp ${WORKDIR}/autossh-${PV}/rscreen ${WORKDIR}/build
-        cp ${WORKDIR}/autossh-${PV}/autossh.1 ${WORKDIR}/build
-        cp ${WORKDIR}/autossh-${PV}/autossh.spec ${WORKDIR}/build
+        cp ${S}/CHANGES ${B}/
+        cp ${S}/README ${B}/
+        cp ${S}/autossh.host ${B}/
+        cp ${S}/rscreen ${B}/
+        cp ${S}/autossh.1 ${B}/
+        cp ${S}/autossh.spec ${B}/
 }
 
 do_install:append() {
diff --git a/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb b/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb
index 39569e9d06..17ef3c99cb 100644
--- a/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb
+++ b/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb
@@ -40,7 +40,6 @@ EXTRA_OEMAKE += 'CC="${CC}" CFLAGS="${CFLAGS}" LDDLL="${CCLD} ${LDFLAGS}" LD="${
                  ${@ "STATICLIB=no" if d.getVar('DISABLE_STATIC') != "" else "" } \
 '
 
-S = "${WORKDIR}/git"
 
 do_install() {
         install -d ${D}/${bindir} ${D}/${libdir} ${D}/${includedir}
diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch
deleted file mode 100644
index 6e48b70243..0000000000
--- a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4947abc5ede2dc356f011b7c45f6760c9c2ce9f1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 14 Aug 2024 21:26:24 -0700
-Subject: [PATCH] meson: Do not emit absolute path when S != B
-
-build systems like OE build outside sourcetree in such cases it works
-ok but cython resolves the input file to absolute path and that gets
-emitted into genetate _blueman.c as module name, renders the build
-non-reproducible, wish cython had a better way to handle this but there
-is not, therefore tweak the meson build rule to account for specifying
-workdir to cython which will search the inputs correctly, and use
-meson's build_root to emit the output into build dir. This ensures that
-it becomes independent of source or build directories and cython does
-not generate the absolute paths into generate C code.
-
-See cython discussion on [1]
-
-[1] https://github.com/cython/cython/issues/5949
-
-Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/2461] 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- module/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/module/meson.build b/module/meson.build
-index 096ad7c8..fddef547 100644
---- a/module/meson.build
-+++ b/module/meson.build
-@@ -4,7 +4,7 @@ blueman_c = custom_target(
-     'blueman_c',
-     output: '_blueman.c',
-     input: '_blueman.pyx',
--    command: [cython, '--output-file', '@OUTPUT@', '@INPUT@'])
-+    command: [cython, '-w', meson.source_root(), '--output-file', join_paths(meson.build_root(), '@OUTPUT@'), join_paths(meson.build_root(), '@INPUT@')])
- 
- sources = [
-     blueman_c,
diff --git a/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb b/meta-networking/recipes-connectivity/blueman/blueman_2.4.4.bb
index e7f0987e0f..4a2e3a3ba0 100644
--- a/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb
+++ b/meta-networking/recipes-connectivity/blueman/blueman_2.4.4.bb
@@ -2,16 +2,14 @@ DESCRIPTION = "Blueman is a GTK+ Bluetooth Manager"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native"
+DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject"
 
-inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache features_check python3targetconfig
+inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache features_check python3targetconfig cython
 
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 
-SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-4-stable \
-           file://0001-meson-DO-not-emit-absolute-path-when-S-B.patch"
-S = "${WORKDIR}/git"
-SRCREV = "7bcf919ad6ac0ee9a8c66b18b0ca98af877d4c8f"
+SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-4-stable"
+SRCREV = "bdacba8afe53066bc3a338997e26fee416af2261"
 
 EXTRA_OEMESON = "-Druntime_deps_check=false \
     -Dsystemdsystemunitdir=${systemd_system_unitdir} \
diff --git a/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb b/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb
index 5b784d9a04..e1f01de8a0 100644
--- a/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb
+++ b/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/IanHarvey/bluepy.git;protocol=https;branch=master \
            file://0001-bluepy-Fix-username-issue-with-tarballs.patch \
           "
 
-S = "${WORKDIR}/git"
 
 inherit setuptools3 pkgconfig
 
diff --git a/meta-networking/recipes-connectivity/bluez-tools/bluez-tools_git.bb b/meta-networking/recipes-connectivity/bluez-tools/bluez-tools_git.bb
index 22005632c2..ab9cebaf38 100644
--- a/meta-networking/recipes-connectivity/bluez-tools/bluez-tools_git.bb
+++ b/meta-networking/recipes-connectivity/bluez-tools/bluez-tools_git.bb
@@ -17,7 +17,6 @@ SRC_URI = "\
 "
 SRCREV = "f65321736475429316f07ee94ec0deac8e46ec4a"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.1.0.bb b/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.1.0.bb
index dfa7437ba8..835f33055a 100644
--- a/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.1.0.bb
+++ b/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.1.0.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 inherit cmake
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "lksctp-tools"
 PACKAGECONFIG[lksctp-tools] = "-DSCTP_SUPPORT=true, -DSCTP_SUPPORT=false, lksctp-tools"
diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb
index f5a699d5be..06d78b9328 100644
--- a/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb
+++ b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/civetweb/civetweb.git;branch=master;protocol=https \
            file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \
            "
 
-S = "${WORKDIR}/git"
 
 # civetweb supports building with make or cmake (although cmake lacks few features)
 inherit cmake
@@ -23,26 +22,30 @@ EXTRA_OECMAKE = " \
     -DCIVETWEB_ENABLE_LUA=OFF \
     -DCIVETWEB_ENABLE_ASAN=OFF \
     -DCIVETWEB_BUILD_TESTING=OFF \
-    -DCIVETWEB_SSL_OPENSSL_API_3_0=ON \
 "
 
 # Building with ninja fails on missing third_party/lib/libcheck.a (which
 # should come from external CMake project)
 OECMAKE_GENERATOR = "Unix Makefiles"
 
-PACKAGECONFIG ??= "caching ipv6 server ssl websockets"
+PACKAGECONFIG ??= "caching ipv6 server ssl websockets cpp"
 PACKAGECONFIG[caching] = "-DCIVETWEB_DISABLE_CACHING=OFF,-DCIVETWEB_DISABLE_CACHING=ON,"
 PACKAGECONFIG[cgi] = "-DCIVETWEB_DISABLE_CGI=OFF,-DCIVETWEB_DISABLE_CGI=ON,"
 PACKAGECONFIG[cpp] = "-DCIVETWEB_ENABLE_CXX=ON,-DCIVETWEB_ENABLE_CXX=OFF,"
 PACKAGECONFIG[debug] = "-DCIVETWEB_ENABLE_MEMORY_DEBUGGING=ON,-DCIVETWEB_ENABLE_MEMORY_DEBUGGING=OFF,"
 PACKAGECONFIG[ipv6] = "-DCIVETWEB_ENABLE_IPV6=ON,-DCIVETWEB_ENABLE_IPV6=OFF,"
 PACKAGECONFIG[server] = "-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=ON -DCIVETWEB_INSTALL_EXECUTABLE=ON,-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF -DCIVETWEB_INSTALL_EXECUTABLE=OFF,"
-PACKAGECONFIG[ssl] = "-DCIVETWEB_ENABLE_SSL=ON -DCIVETWEB_SSL_OPENSSL_API_1_1=OFF -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF,-DCIVETWEB_ENABLE_SSL=OFF,openssl (=1.0.2%),"
+PACKAGECONFIG[ssl] = "-DCIVETWEB_ENABLE_SSL=ON -DCIVETWEB_SSL_OPENSSL_API_1_1=OFF -DCIVETWEB_SSL_OPENSSL_API_3_0=ON -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF,-DCIVETWEB_ENABLE_SSL=OFF,openssl (=1.0.2%),"
 PACKAGECONFIG[websockets] = "-DCIVETWEB_ENABLE_WEBSOCKETS=ON,-DCIVETWEB_ENABLE_WEBSOCKETS=OFF,"
 
 do_install:append() {
-    sed -i -e 's|${RECIPE_SYSROOT_NATIVE}||g' \
-        -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/civetweb/civetweb-targets.cmake
+    sed -i -e 's|${RECIPE_SYSROOT_NATIVE}|\$\{CMAKE_SYSROOT\}|g' \
+        -e 's|${RECIPE_SYSROOT}|\$\{CMAKE_SYSROOT\}|g' ${D}${libdir}/cmake/civetweb/civetweb-targets.cmake
+}
+
+do_install:append:class-target() {
+    sed -i '/list(APPEND _cmake_import_check_files_for_civetweb::server "\${_IMPORT_PREFIX}\/bin\/civetweb" )/d' \
+        ${D}${libdir}/cmake/civetweb/civetweb-targets-noconfig.cmake
 }
 
 BBCLASSEXTEND = "native"
diff --git a/meta-networking/recipes-connectivity/daq/libdaq_3.0.16.bb b/meta-networking/recipes-connectivity/daq/libdaq_3.0.19.bb
index 7834d75552..23a439a989 100644
--- a/meta-networking/recipes-connectivity/daq/libdaq_3.0.16.bb
+++ b/meta-networking/recipes-connectivity/daq/libdaq_3.0.19.bb
@@ -12,8 +12,7 @@ inherit autotools pkgconfig
 SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master \
            file://0001-example-Use-lm-for-the-fst-module.patch"
 
-SRCREV = "2ffe084d4d4ccf4ebc5c23ef119aa1ae223ce2ae"
+SRCREV = "434f205cbd45de0961cc42e541b5bf54569e912a"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${libdir}/daq/*.so"
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 e458321e6e..8a33feec21 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
@@ -24,7 +24,7 @@ SRC_URI[sha256sum] = "0ac416bb55997ca8632174fd10737fd61cdb8dba2752160a335775bc21
 UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
 
-S = "${WORKDIR}/dhcp-4.4.3-P1"
+S = "${UNPACKDIR}/dhcp-4.4.3-P1"
 
 inherit autotools-brokensep systemd pkgconfig
 
diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb
index cc36fbd4f0..1dff38f0d5 100644
--- a/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb
+++ b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/tomaszmrugalski/dibbler;branch=master;protocol=https
            "
 PV = "1.0.1+1.0.2RC1+git${SRCREV}"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "debug bind-reuse resolvconf dns-update"
 
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch b/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch
index e1228c2ebe..3e83b4d04c 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch
@@ -1,4 +1,4 @@
-From 3be3b9a1345942d1578ec73efa9b2e3c41bd67c5 Mon Sep 17 00:00:00 2001
+From 1e43b309183f2cca627d1995908aeb9bb0b5bf97 Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Fri, 21 Jan 2022 13:22:24 +0800
 Subject: [PATCH] Add autogen.sh
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch b/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch
index c57ee93c33..801ff90ac9 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0002-Enable-and-change-user-and-group-of-freeradius-serve.patch
@@ -1,4 +1,4 @@
-From 2a74c10836c0d2d19248ca40d113936f4a56b039 Mon Sep 17 00:00:00 2001
+From 77e9dbe0d0d175deead427793192ffb4ffad2825 Mon Sep 17 00:00:00 2001
 From: "Roy.Li" <rongqing.li@windriver.com>
 Date: Sun, 8 Jan 2023 22:47:11 +0800
 Subject: [PATCH] Enable and change user and group of freeradius server to
@@ -13,10 +13,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
-index 154b50d610..4594d6d2d2 100644
+index 376892e151..63c49a224c 100644
 --- a/raddb/radiusd.conf.in
 +++ b/raddb/radiusd.conf.in
-@@ -557,8 +557,8 @@ security {
+@@ -562,8 +562,8 @@ security {
         #  member.  This can allow for some finer-grained access
         #  controls.
         #
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch b/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch
index 3635412d3b..33a77233d1 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch
@@ -1,4 +1,4 @@
-From ba1390a80662ff2ab7bfda978cde7df9a871f6ae Mon Sep 17 00:00:00 2001
+From 0a9e26096b1e93f9202f83ecf7302cfcf138b7cf Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Tue, 24 Jul 2018 15:03:39 +0800
 Subject: [PATCH] configure.ac: allow cross-compilation
@@ -18,7 +18,6 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 Rebased for 3.2.3
 Signed-off-by: Randy MacLeod <randy.macleod@windriver.com>
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-
 ---
  src/modules/rlm_krb5/configure.ac | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
@@ -37,3 +36,6 @@ index 9ee6379ea4..1dad481da8 100644
         fi
  else
         krb5threadsafe=""
+-- 
+2.25.1
+
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch b/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch
index 479e1ba76f..41d8ff3ce8 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0004-Fix-libtool-detection.patch
@@ -1,4 +1,4 @@
-From 5ba3d140842268cbbdd983266efecb1fba5bdd59 Mon Sep 17 00:00:00 2001
+From 864316403192a3e93a2b1f37de479437964eb7f3 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 22 Aug 2019 10:45:46 +0800
 Subject: [PATCH] Fix libtool detection
@@ -20,10 +20,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 36 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index ad8bc8cdda..ef8fced680 100644
+index 6f29206646..c0d6ea99ca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -321,6 +321,42 @@ dnl #  See if we have Git.
+@@ -319,6 +319,42 @@ dnl #  See if we have Git.
  dnl #
  AC_CHECK_PROG(GIT, git, yes, no)
  
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch b/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch
index 8ef3c4bdf9..168fc78162 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0005-configure.ac-add-option-for-libcap.patch
@@ -1,4 +1,4 @@
-From 9548dc5e1a6c835cd4f387ba384d8f3f14c3fc8b Mon Sep 17 00:00:00 2001
+From f655b4b6a89ae3bb183c659e61cc78539c2c4e81 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 22 Aug 2019 10:50:21 +0800
 Subject: [PATCH] configure.ac: add option for libcap
@@ -12,10 +12,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 27 insertions(+), 9 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index ef8fced680..263098f7fd 100644
+index c0d6ea99ca..64aa9e4293 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1161,6 +1161,22 @@ fi
+@@ -1209,6 +1209,22 @@ fi
  dnl Set by FR_SMART_CHECKLIB
  LIBS="${old_LIBS}"
  
@@ -38,7 +38,7 @@ index ef8fced680..263098f7fd 100644
  dnl Check for cap
  dnl extra argument: --with-cap-lib-dir=DIR
  cap_lib_dir=
-@@ -1194,15 +1210,17 @@ AC_ARG_WITH(cap-include-dir,
+@@ -1242,15 +1258,17 @@ AC_ARG_WITH(cap-include-dir,
        ;;
    esac])
  
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch b/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch
index 510136da1f..e036549827 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch
@@ -1,4 +1,4 @@
-From 8fe25b30b6fbb3170705f4468eb4c92eef3a968f Mon Sep 17 00:00:00 2001
+From d8631a433abf7336b065ecfaa5161e408ea47255 Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Mon, 4 Jan 2016 01:44:04 -0500
 Subject: [PATCH] Avoid searching host dirs
@@ -14,15 +14,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 Rebased for 3.2.3
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 ---
- m4/fr_smart_check_include.m4                                |    2 +-
- m4/fr_smart_check_lib.m4                                    |   22 ----------------------
- src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac        |    4 ++--
- src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac   |    4 ++--
- src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac      |    4 ++--
- src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac      |    6 +++---
- src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac     |    2 +-
- src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac |    4 ++--
- src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac   |    4 ++--
+ m4/fr_smart_check_include.m4                  |  2 +-
+ m4/fr_smart_check_lib.m4                      | 22 -------------------
+ .../rlm_sql/drivers/rlm_sql_db2/configure.ac  |  4 ++--
+ .../drivers/rlm_sql_firebird/configure.ac     |  4 ++--
+ .../drivers/rlm_sql_iodbc/configure.ac        |  4 ++--
+ .../drivers/rlm_sql_mysql/configure.ac        |  6 ++---
+ .../drivers/rlm_sql_oracle/configure.ac       |  2 +-
+ .../drivers/rlm_sql_postgresql/configure.ac   |  4 ++--
+ .../drivers/rlm_sql_unixodbc/configure.ac     |  4 ++--
  9 files changed, 15 insertions(+), 37 deletions(-)
 
 diff --git a/m4/fr_smart_check_include.m4 b/m4/fr_smart_check_include.m4
@@ -38,6 +38,39 @@ index e7d4443f9c..2b69704f98 100644
  
  dnl #  Our local versions
  _smart_try_dir=
+diff --git a/m4/fr_smart_check_lib.m4 b/m4/fr_smart_check_lib.m4
+index 16ac5b3c5e..0f5e9fc6d6 100644
+--- a/m4/fr_smart_check_lib.m4
++++ b/m4/fr_smart_check_lib.m4
+@@ -64,28 +64,6 @@ if test "x$smart_lib" = "x"; then
+   LIBS="$old_LIBS"
+ fi
+ 
+-dnl #
+-dnl #  Try to guess possible locations.
+-dnl #
+-if test "x$smart_lib" = "x"; then
+-  for try in /usr/local/lib /opt/lib; do
+-    AC_MSG_CHECKING([for $2 in -l$1 in $try])
+-    LIBS="-l$1 $old_LIBS"
+-    CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS"
+-    AC_TRY_LINK([extern char $2();],
+-               [$2()],
+-               [
+-                 smart_lib="-l$1"
+-                 smart_ldflags="-L$try -Wl,-rpath,$try"
+-                 AC_MSG_RESULT(yes)
+-                 break
+-               ],
+-               [AC_MSG_RESULT(no)])
+-  done
+-  LIBS="$old_LIBS"
+-  CPPFLAGS="$old_CPPFLAGS"
+-fi
+-
+ dnl #
+ dnl #  Found it, set the appropriate variable.
+ dnl #
 diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
 index 0d94ee9bf6..6108e62054 100644
 --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
@@ -146,7 +179,7 @@ index f31b7d2c5a..67bbf66df5 100644
  if test "x$ORACLE_HOME" != "x"; then
         smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include"
 diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
-index 46587e4099..b41c51bda7 100644
+index 6b1c9e964e..1937d81134 100644
 --- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
 +++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
 @@ -43,7 +43,7 @@ AC_ARG_WITH(rlm-sql-postgresql-include-dir,
@@ -158,7 +191,7 @@ index 46587e4099..b41c51bda7 100644
  FR_SMART_CHECK_INCLUDE(libpq-fe.h)
  if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then
         FR_MODULE_FAIL([libpq-fe.h])
-@@ -95,7 +95,7 @@ else
+@@ -110,7 +110,7 @@ else
                 ])
  fi
  
@@ -188,36 +221,6 @@ index 3bdfae6032..ce68c312c6 100644
  FR_SMART_CHECK_INCLUDE(sql.h)
  if test "x$ac_cv_header_sql_h" != xyes; then
         FR_MODULE_FAIL([sql.h])
-diff --git a/m4/fr_smart_check_lib.m4 b/m4/fr_smart_check_lib.m4
-index 16ac5b3c5e..0f5e9fc6d6 100644
---- a/m4/fr_smart_check_lib.m4
-+++ b/m4/fr_smart_check_lib.m4
-@@ -64,28 +64,6 @@ if test "x$smart_lib" = "x"; then
-   LIBS="$old_LIBS"
- fi
- 
--dnl #
--dnl #  Try to guess possible locations.
--dnl #
--if test "x$smart_lib" = "x"; then
--  for try in /usr/local/lib /opt/lib; do
--    AC_MSG_CHECKING([for $2 in -l$1 in $try])
--    LIBS="-l$1 $old_LIBS"
--    CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS"
--    AC_TRY_LINK([extern char $2();],
--               [$2()],
--               [
--                 smart_lib="-l$1"
--                 smart_ldflags="-L$try -Wl,-rpath,$try"
--                 AC_MSG_RESULT(yes)
--                 break
--               ],
--               [AC_MSG_RESULT(no)])
--  done
--  LIBS="$old_LIBS"
--  CPPFLAGS="$old_CPPFLAGS"
--fi
--
- dnl #
- dnl #  Found it, set the appropriate variable.
- dnl #
+-- 
+2.25.1
+
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch b/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch
index 78259d7d74..4d8400c87f 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch
@@ -1,4 +1,4 @@
-From e4ff7a2a9834e2589bc7bdda4b74f5bc962b15e6 Mon Sep 17 00:00:00 2001
+From 0aab0817acf2179d99c516d7933c80c411855eb7 Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Wed, 27 Jan 2016 05:07:19 -0500
 Subject: [PATCH] rlm_python: add PY_INC_DIR in search dir
@@ -28,3 +28,6 @@ index c79c327064..5f4d274990 100644
         FR_SMART_CHECK_INCLUDE(Python.h)
         CFLAGS=$old_CFLAGS
  
+-- 
+2.25.1
+
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch b/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch
index 559b857b63..f469e85b91 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0008-libtool-do-not-use-jlibtool.patch
@@ -1,4 +1,4 @@
-From d0fa5b259c2dc942d0a43a9cf1bfc32f40c184f9 Mon Sep 17 00:00:00 2001
+From c47048a68eec6838c87e5cde5fddc7e7500b7742 Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Thu, 7 Jan 2016 22:37:30 -0800
 Subject: [PATCH] libtool: do not use jlibtool
@@ -12,26 +12,25 @@ Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---
- Make.inc.in        |  4 ++--
+ Make.inc.in        |  3 ++-
  scripts/boiler.mk  |  2 ++
  scripts/install.mk | 14 +++++++-------
- scripts/libtool.mk | 22 ++++++++++++++++------
- 4 files changed, 27 insertions(+), 15 deletions(-)
+ scripts/libtool.mk | 22 +++++++++++++++-------
+ 4 files changed, 26 insertions(+), 15 deletions(-)
 
 diff --git a/Make.inc.in b/Make.inc.in
-index 05f82776ff..e78f3fe9dc 100644
+index 6d5cc1c343..7944aa7143 100644
 --- a/Make.inc.in
 +++ b/Make.inc.in
-@@ -57,7 +57,7 @@ CPPFLAGS      = @CPPFLAGS@
+@@ -57,6 +57,7 @@ CPPFLAGS      = @CPPFLAGS@
  LIBPREFIX      = @LIBPREFIX@
  EXEEXT         = @EXEEXT@
  
--LIBTOOL                = JLIBTOOL
 +LIBTOOL                = @LIBTOOL@
  ACLOCAL                = @ACLOCAL@
  AUTOCONF       = @AUTOCONF@
  AUTOHEADER     = @AUTOHEADER@
-@@ -168,7 +168,7 @@ ANALYZE.c       := @clang_path@
+@@ -168,7 +169,7 @@ ANALYZE.c       := @clang_path@
  #
  ifeq "$(USE_SHARED_LIBS)" "yes"
         TESTBINDIR = ./$(BUILD_DIR)/bin/local
@@ -41,10 +40,10 @@ index 05f82776ff..e78f3fe9dc 100644
         TESTBINDIR = ./$(BUILD_DIR)/bin
         TESTBIN    = ./$(BUILD_DIR)/bin
 diff --git a/scripts/boiler.mk b/scripts/boiler.mk
-index 2ce0c18f34..567cc0f22f 100644
+index 9d70104747..a882e5ce2b 100644
 --- a/scripts/boiler.mk
 +++ b/scripts/boiler.mk
-@@ -272,6 +272,7 @@ define COMPILE_C_CMDS
+@@ -271,6 +271,7 @@ define COMPILE_C_CMDS
         $(Q)$(ECHO) CC $<
         $(Q)$(strip ${COMPILE.c} -o $@ -c -MD ${CPPFLAGS} ${CFLAGS} ${SRC_CFLAGS} ${INCDIRS} \
             $(addprefix -I, ${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} $<)
@@ -52,7 +51,7 @@ index 2ce0c18f34..567cc0f22f 100644
  endef
  else
  #
-@@ -287,6 +288,7 @@ define COMPILE_C_CMDS
+@@ -286,6 +287,7 @@ define COMPILE_C_CMDS
         $(Q)cppcheck --enable=style -q ${CHECKFLAGS} $(filter -isystem%,${SRC_CFLAGS}) \
              $(filter -I%,${SRC_CFLAGS}) $(filter -D%,${SRC_CFLAGS}) ${INCDIRS} \
              $(addprefix -I,${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} --suppress=variableScope --suppress=invalidscanf $<
@@ -116,21 +115,28 @@ index 916411563b..e38c1ed697 100644
  
  
 diff --git a/scripts/libtool.mk b/scripts/libtool.mk
-index 381127ec2d..e83d7e6ad7 100644
+index 64c2fe0804..05ed2292f0 100644
 --- a/scripts/libtool.mk
 +++ b/scripts/libtool.mk
-@@ -60,7 +60,9 @@ ifeq "${LIBTOOL}" "JLIBTOOL"
-     # Tell GNU Make to use this value, rather than anything specified
-     # on the command line.
-     override LIBTOOL := ${JLIBTOOL}
--endif    # else we're not using jlibtool
-+else    # else we're not using jlibtool
-+    all install: ${LIBTOOL}
-+endif
+@@ -33,7 +33,7 @@ JLIBTOOL := ${BUILD_DIR}/make/jlibtool
+ 
+ # Add a rule to build jlibtool BEFORE any other targets.  This
+ # means that we can use it to build the later targets.
+-all install: ${JLIBTOOL}
++all install: ${LIBTOOL}
+ 
+ # Note that we need to use a compilation rule that does NOT
+ # include referencing ${LIBTOOL}, as we don't have a jlibtool
+@@ -51,7 +51,7 @@ jlibtool_clean:
+ 
+ # Tell GNU Make to use this value, rather than anything specified
+ # on the command line.
+-override LIBTOOL := ${JLIBTOOL}
++#override LIBTOOL := ${JLIBTOOL}
  
  # When using libtool, it produces a '.libs' directory.  Ensure that it
  # is removed on "make clean", too.
-@@ -74,11 +76,19 @@ clean: .libs_clean
+@@ -65,11 +65,19 @@ clean: .libs_clean
  # Re-define compilers and linkers
  #
  OBJ_EXT = lo
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch b/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch
index 9386675e46..a28a1e84e9 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0009-Fix-quoting-for-BUILD_WITH.patch
@@ -1,4 +1,4 @@
-From 3e701d6274924adaed568e22af2362aa5af1f055 Mon Sep 17 00:00:00 2001
+From 33ef5c4e285796c5f208b2b091d4b75e0849f282 Mon Sep 17 00:00:00 2001
 From: Peter Seebach <peter.seebach@windriver.com>
 Date: Sun, 8 Jan 2023 23:01:28 +0800
 Subject: [PATCH] Fix quoting for BUILD_WITH
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
index 051b66af8f..cae27ad3a4 100644
--- 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
@@ -1,4 +1,4 @@
-From 30ce5ccd62446349d432ff65d3fe8d46872423c8 Mon Sep 17 00:00:00 2001
+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
@@ -22,10 +22,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/src/include/threads.h b/src/include/threads.h
-index e36d81dac0..2bcb6aadcb 100644
+index f2aea776d6..1c4e526797 100644
 --- a/src/include/threads.h
 +++ b/src/include/threads.h
-@@ -89,7 +89,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\
+@@ -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>
@@ -34,7 +34,7 @@ index e36d81dac0..2bcb6aadcb 100644
  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;\
-@@ -100,17 +100,17 @@ static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\
+@@ -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);\
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch b/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch
index efa5c53c9f..d05ed00605 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch
@@ -1,4 +1,4 @@
-From f0e764826e3a85488047f7f4e94ebf91460d2c12 Mon Sep 17 00:00:00 2001
+From f742496305018629be88eaac14cc6e1fa80d7594 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 16 Jun 2017 20:10:49 -0700
 Subject: [PATCH] rlm_mschap: Use includedir instead of hardcoding /usr/include
@@ -26,3 +26,6 @@ index 953336f475..77a18af55d 100644
  FR_SMART_CHECK_INCLUDE(wbclient.h, [#include <stdint.h>
                                 #include <stdbool.h>])
  if test "x$ac_cv_header_wbclient_h" != "xyes"; then
+-- 
+2.25.1
+
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch b/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch
index cbac989284..8f7457fdbb 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch
@@ -1,4 +1,4 @@
-From 0f9f18fc330fe88080be13e43f300fbf7ba4a85a Mon Sep 17 00:00:00 2001
+From de2b9e3b8f9ad8b8ac3e7e820b8b831e91c2dd71 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Mon, 13 Jul 2020 07:01:45 +0000
 Subject: [PATCH] raddb/certs/Makefile: fix the existed certificate error
@@ -29,7 +29,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile
-index c9fbc9e864..d064fe252d 100644
+index 34948bd924..cae939668e 100644
 --- a/raddb/certs/Makefile
 +++ b/raddb/certs/Makefile
 @@ -92,7 +92,7 @@ server.csr server.key: server.cnf
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch b/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch
index 287e47adcc..cf05efef30 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0013-raddb-certs-Makefile-fix-the-occasional-verification.patch
@@ -1,4 +1,4 @@
-From bb1cb2ffc7a31c0a2bb2de51ef82d304b0a107c3 Mon Sep 17 00:00:00 2001
+From 38cbab566143b9e002ee24a1f08a52ec74186eca Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Wed, 5 Aug 2020 07:23:11 +0000
 Subject: [PATCH] raddb/certs/Makefile: fix the occasional verification failure
@@ -29,7 +29,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  1 file changed, 15 insertions(+), 15 deletions(-)
 
 diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile
-index d064fe252d..86f4547804 100644
+index cae939668e..52ae65755f 100644
 --- a/raddb/certs/Makefile
 +++ b/raddb/certs/Makefile
 @@ -59,7 +59,7 @@ passwords.mk: server.cnf ca.cnf client.cnf inner-server.cnf
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch b/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch
index 17eadc7e59..86ca471536 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0014-Workaround-error-with-autoconf-2.7.patch
@@ -1,4 +1,4 @@
-From c591da4a361496eec93625cf8c4f89bddfedaca7 Mon Sep 17 00:00:00 2001
+From 9fed86858d8d2045f3de77405059d786bb2d50ac Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Sun, 7 Feb 2021 16:02:36 +0800
 Subject: [PATCH] Workaround error with autoconf 2.7
@@ -19,12 +19,12 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 263098f7fd..fc296832d8 100644
+index 64aa9e4293..0861514ef7 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -878,14 +878,6 @@ fi
+@@ -926,14 +926,6 @@ if test "x$WITH_RADLAST" != "xyes"; then
+ fi
  
- AC_PATH_PROG(RUSERS, rusers, /usr/bin/rusers)
  
 -dnl #
 -dnl #  FIXME This is truly gross.
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch b/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch
index d1d0111607..b664a9e3f3 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0015-bootstrap-check-commands-of-openssl-exist.patch
@@ -1,4 +1,4 @@
-From 78494ea005bd38324953b05176d6eb2c3f55af2c Mon Sep 17 00:00:00 2001
+From e8802c019085c743dc691e9329f05f7e559d1fa5 Mon Sep 17 00:00:00 2001
 From: Kai Kang <kai.kang@windriver.com>
 Date: Sun, 8 Jan 2023 23:21:24 +0800
 Subject: [PATCH] bootstrap: check commands of openssl exist
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch b/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch
index 2d67fdef05..8917457ec2 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0016-version.c-don-t-print-build-flags.patch
@@ -1,4 +1,4 @@
-From cbbb62ddda5c189c225f96bf6b599b3b3e8c8252 Mon Sep 17 00:00:00 2001
+From 99ea83d998d3b8957830afa15cec42ba265b67ca Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Wed, 3 Aug 2022 16:44:29 +0800
 Subject: [PATCH] version.c: don't print build flags
@@ -13,10 +13,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  1 file changed, 13 deletions(-)
 
 diff --git a/src/main/version.c b/src/main/version.c
-index f1f1e87810..3ffcbb25a0 100644
+index 44a6edc699..a0e6f26911 100644
 --- a/src/main/version.c
 +++ b/src/main/version.c
-@@ -589,19 +589,6 @@ void version_print(void)
+@@ -614,19 +614,6 @@ void version_print(void)
                 DEBUG2("  unknown");
  #endif
  
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch b/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch
index f5c399e584..e9511a6165 100644
--- a/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch
+++ b/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch
@@ -1,4 +1,4 @@
-From 40abff4062d0521cf2b2a8a4660a3d2933f86f9d Mon Sep 17 00:00:00 2001
+From f48b2887ef2ecff333a5d00551e108fc283c2ba5 Mon Sep 17 00:00:00 2001
 From: Robert Yang <liezhi.yang@windriver.com>
 Date: Mon, 1 Apr 2024 09:09:07 +0000
 Subject: [PATCH] Add acinclude.m4 to include required macros
@@ -57,5 +57,5 @@ index 0000000000..690efc3258
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 +   (exit $ac_status); }])
 -- 
-2.35.5
+2.25.1
 
diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.5.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.7.bb
index ec68c1d920..fea4d858ed 100644
--- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.5.bb
+++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.7.bb
@@ -39,7 +39,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0
 
 raddbdir = "${sysconfdir}/${MLPREFIX}raddb"
 
-SRCREV = "a7acce80f5ba2271d9aeb737a4a91a5bf8317f31"
+SRCREV = "694a97dddbdd26423504afe7c530e8e1502b7354"
 
 UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)"
 
@@ -48,7 +48,6 @@ CVE_STATUS[CVE-2011-4966] = "fixed-version: The CPE in the NVD database doesn't
 
 PARALLEL_MAKE = ""
 
-S = "${WORKDIR}/git"
 
 LDFLAGS:append:powerpc = " -latomic"
 LDFLAGS:append:mipsarch = " -latomic"
diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb
index bf3e18dce7..927916f985 100644
--- a/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb
+++ b/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb
@@ -12,8 +12,6 @@ SRC_URI[sha256sum] = "8a07cbf4df09b107fe3fc41d133ee2f6cea6ef4c33ccf06c8448ad058c
 
 inherit autotools gettext pkgconfig
 
-acpaths = "-I ./m4"
-
 EXTRA_OECONF += "--with-modules --disable-rpath"
 
 PACKAGECONFIG ??= "openssl zlib gnutls readline expat"
@@ -27,5 +25,4 @@ do_install:append() {
         rm -rf ${D}${libdir}/charset.alias
 }
 FILES:${PN} += "${datadir}/icons/hicolor"
-FILES:${PN}-dbg += "${libdir}/lftp/${PV}/.debug"
 RDEPENDS:${PN} = "perl bash readline"
diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.18.0.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.18.0.bb
index 75aaf521c4..f79121b142 100644
--- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.18.0.bb
+++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.18.0.bb
@@ -10,7 +10,6 @@ SRCREV = "3dfbe889b1f65077efe579da34fc1d6819fcb7f3"
 
 UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit autotools multilib_script pkgconfig
 
diff --git a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb
index 0e1f50164a..cfded66e41 100644
--- a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb
+++ b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb
@@ -20,7 +20,6 @@ SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https
            file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig python3-dir python3native siteinfo
 
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.9.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.10.bb
index abb5ad2442..950c1ff52d 100644
--- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.9.bb
+++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.10.bb
@@ -22,8 +22,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
 
 SECTION = "libs"
 
-S = "${WORKDIR}/git"
-SRCREV = "5e146adef63b326b04282252639bebc2730939c6"
+SRCREV = "2fc8413bfcb51354c8e679141b17b3f1a5942561"
 SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-2.28 \
            file://run-ptest \
           "
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.3.1.bb
index 62c3add2a5..0b64d661c4 100644
--- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb
+++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.3.1.bb
@@ -22,14 +22,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
 
 SECTION = "libs"
 
-S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-3.6 \
-        git://github.com/Mbed-TLS/mbedtls-framework.git;protocol=https;branch=main;destsuffix=git/framework;name=framework \
-        file://run-ptest"
-
-SRCREV = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3"
-SRCREV_framework = "94599c0e3b5036e086446a51a3f79640f70f22f6"
-SRCREV_FORMAT .= "_framework"
+SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=main;tag=v${PV} \
+           file://run-ptest \
+           "
+
+SRCREV = "6fb5120fde4ab889bea402f5ab230c720b0a3b9a"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb
index 1c2f030f83..b7ba37f290 100644
--- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb
+++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb
@@ -7,27 +7,31 @@ SECTION = "networking"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a1ed15843ce66639bcf9f109cf247870"
 
-inherit autotools gettext pkgconfig systemd
+inherit gettext pkgconfig systemd
 
-DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack"
+DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack openssl"
 
 SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;downloadfilename=${BP}.tar.gz \
            file://miniupnpd.service \
            file://0001-Add-OpenEmbedded-cross-compile-case.patch \
            "
-SRC_URI[md5sum] = "340789edd49c113afe37834cc901a1e8"
 SRC_URI[sha256sum] = "218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00d2206d"
 
-IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}"
+UPSTREAM_CHECK_URI = "https://miniupnp.tuxfamily.org/files/"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\.tar"
 
-do_configure:prepend() {
-   echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+PACKAGECONFIG[ipv6] = "--ipv6"
+
+EXTRA_OEMAKE = "-f Makefile.linux"
+
+do_configure() {
+    echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded
+    CONFIG_OPTIONS="--leasefile --vendorcfg ${PACKAGECONFIG_CONFARGS}" oe_runmake --always-make config.h
 }
 
 do_compile() {
-    cd ${S}
-    CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux config.h
-    CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux
+    oe_runmake
 }
 
 do_install() {
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
deleted file mode 100644
index 627638ec89..0000000000
--- a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1571]
-From 3fe5468f1bdca1bff1d18cf43c9e338f41aa9e32 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Date: Wed, 22 Jan 2020 12:39:49 +0100
-Subject: [PATCH] Add dynamic symbols linking with cmake too
-
-Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
----
- lib/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -94,6 +94,8 @@
-        OUTPUT_NAME mosquitto
-        VERSION ${VERSION}
-        SOVERSION 1
-+       LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linker.version
-+       LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/linker.version"
- )
- 
- install(TARGETS libmosquitto
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
deleted file mode 100644
index 7374cbd26f..0000000000
--- a/meta-networking/recipes-connectivity/mosquitto/files/2894.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Joachim Zobel <jz-2017@heute-morgen.de>
-Date: Wed, 13 Sep 2023 09:55:34 +0200
-Subject: [PATCH] Link correctly with shared websockets library if needed see:
- https://github.com/eclipse/mosquitto/pull/2751
-
-Patch contributed by Joachim Zobel <jz-2017@heute-morgen.de> and  Daniel Engberg <daniel.engberg.lists@pyret.net>
----
-Upstream-Status: Pending
-
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9380a04..dce8313 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS)
-                        link_directories(${mosquitto_SOURCE_DIR})
-                endif (WIN32)
-        else (STATIC_WEBSOCKETS)
--               set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
-+               set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
-        endif (STATIC_WEBSOCKETS)
- endif (WITH_WEBSOCKETS)
- 
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.20.bb
index 4ef0654102..75aaf7cf38 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.20.bb
@@ -16,12 +16,10 @@ DEPENDS = "uthash cjson"
 
 SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
            file://mosquitto.init \
-           file://1571.patch \
-           file://2894.patch \
            file://2895.patch \
 "
 
-SRC_URI[sha256sum] = "d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a"
+SRC_URI[sha256sum] = "ebd07d89d2a446a7f74100ad51272e4a8bf300b61634a7812e19f068f2759de8"
 
 inherit systemd update-rc.d useradd cmake pkgconfig
 
diff --git a/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb b/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb
index c250ea8779..8dce6c5c4a 100644
--- a/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb
+++ b/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb
@@ -12,7 +12,6 @@ SECTION = "libs/networking"
 SRC_URI = "git://github.com/nanomsg/nanomsg.git;protocol=https;branch=master"
 SRCREV = "fc3f684a80151a3319446fc96083a9ff384ee4fe"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb b/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb
index a6556249b7..8d681f495e 100644
--- a/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb
+++ b/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb
@@ -5,10 +5,9 @@ SECTION = "libs/networking"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41e579bb4326c21c774f8e51e41d8a3"
 
-SRC_URI = "git://github.com/nanomsg/nng.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/nanomsg/nng.git;branch=main;protocol=https"
 SRCREV = "85fbe7f9e4642b554d0d97f2e3ff2aa12978691a"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb b/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb
index b52154025b..aac26966f1 100644
--- a/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb
+++ b/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb
@@ -9,6 +9,5 @@ PV = "1.3.0"
 
 SRC_URI = "git://github.com/cwzx/nngpp;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb
index 48f50abaf1..026aea7777 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb
@@ -16,7 +16,7 @@ SRC_URI = " \
 "
 SRC_URI[sha256sum] = "b055e26349b516b23585798ab3ef57b436b014800e92a8ac732cfc8e76c5dafa"
 
-S = "${WORKDIR}/NetworkManager-fortisslvpn-${PV}"
+S = "${UNPACKDIR}/NetworkManager-fortisslvpn-${PV}"
 
 # meta-gnome in layers is required using gnome:
 PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret,"
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openconnect_1.2.8.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openconnect_1.2.8.bb
index ee19afbd11..6369d8d0ef 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openconnect_1.2.8.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openconnect_1.2.8.bb
@@ -13,7 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/NetworkManager-openconnect/${@gnome_verdir("${PV}")}/
 
 SRC_URI[sha256sum] = "5dedaa785d82d8e239ddd082bfac5250c691e964464be1807b6827263633cdcc"
 
-S = "${WORKDIR}/NetworkManager-openconnect-${PV}"
+S = "${UNPACKDIR}/NetworkManager-openconnect-${PV}"
 
 # meta-gnome in layers is required using gnome:
 PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 gcr3 libnma libsecret,"
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.12.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.12.0.bb
index 2d2055ba65..9859d01463 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.12.0.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.12.0.bb
@@ -15,7 +15,7 @@ SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld',
 
 SRC_URI[sha256sum] = "903fd4c0aebd2aa7ac70c9d8c2bed8df922655d22d764514403566ae89b7e886"
 
-S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
+S = "${UNPACKDIR}/NetworkManager-openvpn-${PV}"
 
 # meta-gnome in layers is required using gnome:
 PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret"
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch
deleted file mode 100644
index 8e246efe01..0000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 34d7a6c9919a73c2e716835000944c17438b2ca1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 7 Jun 2024 14:03:15 -0700
-Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid
- function
-
-When building on musl systems ( with out systemd ), and using LLD linker
-from LLVM project we fail to link with undefined symbols.
-
-This symbol is in sd_id128.c but its disabled, so let disable the functions
-which need this function.
-
-| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific
-| >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202)
-| >>>               libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a
-| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation)
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1966]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c   | 2 ++
- .../src/libsystemd-network/sd-dhcp6-client.c                   | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
-index e664a4a..7ba5020 100644
---- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
-+++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
-@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) {
-         return 0;
- }
- 
-+#if 0
- int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
-         sd_id128_t machine_id;
-         int r;
-@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
-         duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id);
-         return 0;
- }
-+#endif
- 
- int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) {
-         _cleanup_free_ char *p = NULL, *x = NULL;
-diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
-index 7c20116..08c1e96 100644
---- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
-+++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
-@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) {
-         return 0;
- }
- 
-+#if 0
- int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
-         int r;
- 
-@@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
- 
-         return 0;
- }
--
-+#endif
- int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) {
-         int r;
- 
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.10.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.52.0.bb
index a9b9233b7e..b8c6a936ad 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.10.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.52.0.bb
@@ -25,33 +25,33 @@ DEPENDS = " \
     intltool-native \
     libxslt-native \
     libnl \
+    libnvme \
     udev \
     util-linux \
+    util-linux-libuuid \
     libndp \
     curl \
     dbus \
 "
 DEPENDS:append:class-target = " bash-completion"
 
-inherit gnomebase gettext update-rc.d systemd gobject-introspection gtk-doc update-alternatives upstream-version-is-even
+inherit meson gettext update-rc.d systemd gobject-introspection update-alternatives upstream-version-is-even pkgconfig
 
 SRC_URI = " \
-    ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
+    git://github.com/NetworkManager/NetworkManager.git;protocol=https;branch=main;tag=${PV} \
     file://${BPN}.initd \
     file://enable-dhcpcd.conf \
     file://enable-iwd.conf \
-    file://0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch \
 "
 SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}"
 
-SRC_URI[sha256sum] = "5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613"
+SRCREV = "995a28fa1ccc54ad22e794294c3c6783cc3f30ed"
 
-S = "${WORKDIR}/NetworkManager-${PV}"
 
 # ['auto', 'symlink', 'file', 'netconfig', 'resolvconf']
 NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto"
 
-# ['dhcpcanon', 'dhclient', 'dhcpcd', 'internal', 'nettools']
+# ['dhclient', 'dhcpcd', 'internal', 'nettools']
 NETWORKMANAGER_DHCP_DEFAULT ??= "internal"
 
 # The default gets detected based on whether /usr/sbin/nft or /usr/sbin/iptables is installed, with nftables preferred.
@@ -61,13 +61,11 @@ NETWORKMANAGER_FIREWALL_DEFAULT ??= "nftables"
 EXTRA_OEMESON = "\
     -Difcfg_rh=false \
     -Dtests=yes \
-    -Dnmtui=true \
     -Dudev_dir=${nonarch_base_libdir}/udev \
     -Dlibpsl=false \
     -Dqt=false \
     -Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT} \
     -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \
-    -Ddhcpcanon=false \
     -Diptables=${sbindir}/iptables \
     -Dnft=${sbindir}/nft \
 "
@@ -78,18 +76,13 @@ EXTRA_OEMESON = "\
 CFLAGS:append:libc-musl = " \
     -DRTLD_DEEPBIND=0 \
 "
-do_configure:prepend() {
-    cp -f ${STAGING_LIBDIR}/girepository-1.0/GLib*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/
-    cp -f ${STAGING_LIBDIR}/girepository-1.0/GObject*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/
-    cp -f ${STAGING_LIBDIR}/girepository-1.0/Gio*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/
-    cp -f ${STAGING_LIBDIR}/girepository-1.0/GModule*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/
-}
 
-PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \
+PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit ppp', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES_BACKFILL_CONSIDERED', 'gobject-introspection-data', '', 'vala', d)} \
 "
 
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)}
diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect_9.12.bb b/meta-networking/recipes-connectivity/openconnect/openconnect_9.12.bb
index 7d0e5f2052..e1027747b6 100644
--- a/meta-networking/recipes-connectivity/openconnect/openconnect_9.12.bb
+++ b/meta-networking/recipes-connectivity/openconnect/openconnect_9.12.bb
@@ -21,7 +21,6 @@ PACKAGECONFIG[libproxy]  = "--with-libproxy,--without-libproxy,libproxy,"
 # not config defaults
 PACKAGECONFIG[pcsc-lite] = "--with-libpcsclite,--without-libpcsclite,pcsc-lite,"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig bash-completion
 
diff --git a/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.1.bb b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.23.1.bb
index b69a7e2355..9823d772a3 100644
--- a/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.1.bb
+++ b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.23.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3d575262a651a6f1a17210ce41bf907d"
 
 SRC_URI = "git://github.com/adrienverge/openfortivpn.git;protocol=https;branch=master"
-SRCREV = "388fa98f639ef91733461de50b06dd57f1ffb099"
+SRCREV = "a011b5c916075bd240db6a03c02eac95baf09ad8"
 
 DEPENDS = "openssl"
 
@@ -12,7 +12,6 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf --enable-resolvconf,--with-resolvconf=DISABLED,,"
 PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir,,"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig systemd
 
diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch
new file mode 100644
index 0000000000..108ed76b30
--- /dev/null
+++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch
@@ -0,0 +1,27 @@
+From 502aa4ab4bbc790fb2999ff2b5f10dabd7085190 Mon Sep 17 00:00:00 2001
+From: "deepan.shivap" <deepan.shivap@lge.com>
+Date: Mon, 2 Dec 2024 23:12:17 +0900
+Subject: [PATCH] Musl build fix
+
+usage of getaddrinfo_a creates dependency on libanl, which is  specific
+to glibc.
+
+Upstream-Status: Pending
+Signed-off-by: deepan.shivap <deepan.shivap@lge.com>
+---
+ src/posix/platform/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/posix/platform/CMakeLists.txt b/src/posix/platform/CMakeLists.txt
+index b4ac241f5..7b2028e45 100644
+--- a/src/posix/platform/CMakeLists.txt
++++ b/src/posix/platform/CMakeLists.txt
+@@ -175,7 +175,7 @@ target_link_libraries(openthread-posix
+ )
+ 
+ option(OT_TARGET_OPENWRT "enable openthread posix for OpenWRT" OFF)
+-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT)
++if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT AND NOT OT_TARGET_MUSL)
+     target_compile_definitions(ot-posix-config
+         INTERFACE "OPENTHREAD_POSIX_CONFIG_NAT64_AIL_PREFIX_ENABLE=1"
+     )
diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/musl-fixes.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/musl-fixes.patch
deleted file mode 100644
index 279a60741f..0000000000
--- a/meta-networking/recipes-connectivity/openthread/ot-br-posix/musl-fixes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Musl fixes, which should be applied upstream too
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/src/dbus/common/types.hpp
-+++ b/src/dbus/common/types.hpp
-@@ -715,7 +715,7 @@ struct TrelInfo
-     };
- 
-     bool               mEnabled;      ///< Whether TREL is enabled.
--    u_int16_t          mNumTrelPeers; ///< The number of TREL peers.
-+    uint16_t          mNumTrelPeers; ///< The number of TREL peers.
-     TrelPacketCounters mTrelCounters; ///< The TREL counters.
- };
- 
---- a/third_party/openthread/repo/src/posix/platform/CMakeLists.txt
-+++ b/third_party/openthread/repo/src/posix/platform/CMakeLists.txt
-@@ -172,7 +172,7 @@ target_link_libraries(openthread-posix
- )
- 
- option(OT_TARGET_OPENWRT "enable openthread posix for OpenWRT" OFF)
--if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT)
-+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT AND NOT OT_TARGET_MUSL)
-     target_compile_definitions(ot-posix-config
-         INTERFACE "OPENTHREAD_POSIX_CONFIG_NAT64_AIL_PREFIX_ENABLE=1"
-     )
diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb
index ec930de275..576c316ec3 100644
--- a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb
+++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb
@@ -5,30 +5,29 @@ SUMMARY = "OpenThread Border Router"
 SECTION = "net"
 LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=87109e44b2fda96a8991f27684a7349c \
-                    file://third_party/Simple-web-server/repo/LICENSE;md5=091ac9fd29d87ad1ae5bf765d95278b0 \
                     file://third_party/cJSON/repo/LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0 \
+                    file://third_party/cpp-httplib/repo/LICENSE;md5=1321bdf796c67e3a8ab8e352dd81474b \
                     file://third_party/http-parser/repo/LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778 \
                     file://third_party/openthread/repo/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \
                     "
 DEPENDS = "autoconf-archive dbus readline avahi jsoncpp boost libnetfilter-queue protobuf protobuf-native"
-SRCREV = "a35cc682305bb2201c314472adf06a4960536750"
+SRCREV = "fe5855332e8f804944d737c65b75cf9a89c35e77"
 PV = "0.3.0+git"
 
 SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \
            file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \
            file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \
            file://default-cxx-std.patch \
-           file://musl-fixes.patch \
+           file://0001-Musl-build-fix.patch;patchdir=third_party/openthread/repo \
            "
 
-S = "${WORKDIR}/git"
 SYSTEMD_SERVICE:${PN} = "otbr-agent.service"
 
 inherit pkgconfig cmake systemd
-# openthread/repo/src/cli/cli.cpp:1786:18: fatal error: variable 'i' set but not used [-Wunused-but-set-variable]
-#    for (uint8_t i = 0;; i++)
-CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare -Wno-error=unused-but-set-variable"
 
+# Use -std=c++20 for fixing
+# recipe-sysroot/usr/include/c++/15.1.0/ciso646:46:4: error: #warning "<ciso646> is deprecated in C++17, use <version> to detect implementation-specific macros" [-Werror=cpp]
+CXXFLAGS += "-std=c++20 -Wno-error=attributes"
 LDFLAGS:append:riscv32 = " -latomic"
 
 EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \
@@ -67,7 +66,3 @@ RCONFLICTS:${PN} = "ot-daemon"
 
 FILES:${PN} += "${systemd_unitdir}/*"
 FILES:${PN} += "${datadir}/*"
-
-# http://errors.yoctoproject.org/Errors/Details/766903/
-# git/third_party/openthread/repo/src/core/border_router/routing_manager.hpp:615:11: error: 'ot::BorderRouter::RoutingManager::DiscoveredPrefixTable' declared with greater visibility than the type of its field 'ot::BorderRouter::RoutingManager::DiscoveredPrefixTable::mEntryTimer' [-Werror=attributes]
-CXXFLAGS += "-Wno-error=attributes"
diff --git a/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb b/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb
index 4456835410..009a6ef88c 100644
--- a/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb
+++ b/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb
@@ -14,7 +14,6 @@ PV = "0.1+git"
 SRC_URI = "git://github.com/openthread/openthread.git;protocol=https;branch=main \
            "
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-networking/recipes-connectivity/openthread/wpantund_git.bb b/meta-networking/recipes-connectivity/openthread/wpantund_git.bb
index 6a84897426..9c64872917 100644
--- a/meta-networking/recipes-connectivity/openthread/wpantund_git.bb
+++ b/meta-networking/recipes-connectivity/openthread/wpantund_git.bb
@@ -19,7 +19,6 @@ SRC_URI = "gitsm://github.com/openthread/wpantund.git;protocol=https;branch=mast
            file://basename.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig perlnative autotools
 
diff --git a/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb b/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb
index 67e7c1c615..5c9e0c8643 100644
--- a/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb
+++ b/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "The rdate utility retrieves the date and time from \
   time of the machine that you queried. \
 "
 
-HOMEPAGE= "https://www.aelius.com/njh/rdate/"
+HOMEPAGE = "https://www.aelius.com/njh/rdate/"
 SECTION = "Applications/System"
 
 LICENSE = "GPL-2.0-only"
diff --git a/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb b/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb
index e6d99431be..2fb5ced2bb 100644
--- a/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb
+++ b/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb
@@ -36,9 +36,13 @@ UPSTREAM_CHECK_REGEX = "/rdist/(?P<pver>\d+(\.\d+)+)"
 
 DEPENDS = "bison-native"
 
-inherit autotools-brokensep
+CFLAGS += "-std=gnu17"
 
 EXTRA_OEMAKE = "CPPFLAGS='${CFLAGS}' BIN_GROUP=root MAN_GROUP=root RDIST_MODE=755 RDISTD_MODE=755 MAN_MODE=644"
 
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
+}
+
 # http://errors.yoctoproject.org/Errors/Details/186972/
 COMPATIBLE_HOST:libc-musl = 'null'
diff --git a/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-networking/recipes-connectivity/relayd/relayd_git.bb
index 871df69909..17745da806 100644
--- a/meta-networking/recipes-connectivity/relayd/relayd_git.bb
+++ b/meta-networking/recipes-connectivity/relayd/relayd_git.bb
@@ -12,7 +12,6 @@ PV = "0.0.1+git"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb b/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb
index 9239bd81c2..841f7d5cf8 100644
--- a/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb
+++ b/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb
@@ -12,7 +12,7 @@ SRC_URI = "https://github.com/Stiffstream/restinio/releases/download/v.${PV}/${B
 SRC_URI[md5sum] = "37a4310e98912030a74bdd4ed789f33c"
 SRC_URI[sha256sum] = "b35d696e6fafd4563ca708fcecf9d0cf6705c846d417b5000f5252e0188848e7"
 
-S = "${WORKDIR}/${BP}/dev"
+S = "${UNPACKDIR}/${BP}/dev"
 
 inherit cmake
 
diff --git a/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch b/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch
new file mode 100644
index 0000000000..e07e86e887
--- /dev/null
+++ b/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch
@@ -0,0 +1,70 @@
+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.8.bb b/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb
index 09d5608df0..0213d131e5 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb
@@ -12,7 +12,7 @@ ${SAMBA_MIRROR}    http://mirror.internode.on.net/pub/samba \n \
 ${SAMBA_MIRROR}    http://www.mirrorservice.org/sites/ftp.samba.org \n \
 "
 
-export PYTHONHASHSEED="1"
+export PYTHONHASHSEED = "1"
 
 SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
            file://smb.conf \
@@ -24,6 +24,7 @@ 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 \
            "
 
 SRC_URI:append:libc-musl = " \
@@ -69,7 +70,7 @@ SYSTEMD_AUTO_ENABLE:${PN}-ad-dc = "disable"
 
 #cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
 #to cross Popen
-export WAF_NO_PREFORK="yes"
+export WAF_NO_PREFORK = "yes"
 
 # Use krb5. Build active domain controller.
 #
@@ -95,16 +96,16 @@ PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd"
 PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,python3-markdown python3-dnspython,"
 PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5,"
 
-SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2"
-SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4"
-SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4"
-SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}"
+SAMBA4_IDMAP_MODULES = "idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2"
+SAMBA4_PDB_MODULES = "pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4"
+SAMBA4_AUTH_MODULES = "auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4"
+SAMBA4_MODULES = "${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}"
 
 # These libraries are supposed to replace others supplied by packages, but decorate the names of
 # .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,NONE"
 
 EXTRA_OECONF += "--enable-fhs \
                  --with-piddir=/run \
@@ -125,7 +126,7 @@ EXTRA_OECONF += "--enable-fhs \
                  --pythondir=${PYTHON_SITEPACKAGES_DIR} \
                 "
 
-LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+LDFLAGS += "-Wl,-z,relro,-z,now"
 
 do_configure:append() {
     cd ${S}/pidl/
@@ -353,4 +354,10 @@ RDEPENDS:${PN}-test = "\
     ${PN}-testsuite \
     "
 
+pkg_postinst:${PN}-common() {
+    if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
+        ${sysconfdir}/init.d/populate-volatile.sh update
+    fi
+}
+
 ALLOW_EMPTY:${PN}-test = "1"
diff --git a/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb b/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb
index 4e3c157713..faaf393529 100644
--- a/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb
+++ b/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb
@@ -15,8 +15,8 @@ SRC_URI[sha256sum] = "21b1e2e1cb0e288b0ec8fcfd9fed449914e0f8e6fc273706bd5b3d4f6a
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 DEPENDS = "virtual/kernel"
 
-EXTRA_OEMAKE="CROSS_COMPILE=${TARGET_PREFIX} CC='${CC} ${LDFLAGS}' \
-              KERNEL_DIR=${STAGING_KERNEL_DIR} "
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC='${CC} ${LDFLAGS}' \
+                KERNEL_DIR=${STAGING_KERNEL_DIR} "
 
 do_compile:prepend () {
     oe_runmake clean
diff --git a/meta-networking/recipes-connectivity/snort/snort/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-connectivity/snort/snort/0001-Fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..c221172cc8
--- /dev/null
+++ b/meta-networking/recipes-connectivity/snort/snort/0001-Fix-build-with-gcc-15.patch
@@ -0,0 +1,110 @@
+From cc3724348c8e6371351e4370f158d17f28838e3b Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Sat, 26 Apr 2025 11:40:45 +0200
+Subject: [PATCH] Fix build with gcc-15
+
+* fixes:
+  http://errors.yoctoproject.org/Errors/Details/852983/
+
+../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp_PDF.c:1062:13: error: conflicting types for 'File_Decomp_PDF'; have 'fd_status_t(struct fd_session_s *)' {aka 'enum fd_status(struct fd_session_s *)'}
+ 1062 | fd_status_t File_Decomp_PDF( fd_session_p_t SessionPtr )
+      |             ^~~~~~~~~~~~~~~
+In file included from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/include/file_decomp.h:59,
+                 from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp_PDF.c:31:
+../../../../../snort-2.9.20/src/preprocessors/HttpInspect/include/file_decomp_PDF.h:83:13: note: previous declaration of 'File_Decomp_PDF' with type 'fd_status_t(void)' {aka 'enum fd_status(void)'}
+   83 | fd_status_t File_Decomp_PDF();
+      |             ^~~~~~~~~~~~~~~
+make[5]: *** [Makefile:374: file_decomp_PDF.o] Error 1
+make[5]: *** Waiting for unfinished jobs....
+../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp.c: In function 'Process_Decompression':
+../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp.c:245:24: error: too many arguments to function 'File_Decomp_PDF'; expected 0, have 1
+  245 |             Ret_Code = File_Decomp_PDF( SessionPtr );
+      |                        ^~~~~~~~~~~~~~~  ~~~~~~~~~~
+In file included from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/include/file_decomp.h:59,
+                 from ../../../../../snort-2.9.20/src/preprocessors/HttpInspect/files/file_decomp.c:34:
+../../../../../snort-2.9.20/src/preprocessors/HttpInspect/include/file_decomp_PDF.h:83:13: note: declared here
+   83 | fd_status_t File_Decomp_PDF();
+      |             ^~~~~~~~~~~~~~~
+
+  http://errors.yoctoproject.org/Errors/Details/852992/
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_InitGlobal':
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:348:25: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+  348 |         size_t memcap = DCE2_GetReloadSafeMemcap(dce2_config);
+      |                         ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_ReloadGlobal':
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1291:25: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+ 1291 |         size_t memcap = DCE2_GetReloadSafeMemcap(dce2_swap_config);
+      |                         ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_ReloadVerify':
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1436:35: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+ 1436 |     uint32_t current_memcap     = DCE2_GetReloadSafeMemcap(dce2_config);
+      |                                   ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1437:35: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+ 1437 |     uint32_t new_memcap         = DCE2_GetReloadSafeMemcap(dce2_swap_config);
+      |                                   ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: In function 'DCE2_ReloadSwap':
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1535:26: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+ 1535 |         current_memcap = DCE2_GetReloadSafeMemcap(dce2_config);
+      |                          ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1538:26: error: too many arguments to function 'DCE2_GetReloadSafeMemcap'; expected 0, have 1
+ 1538 |         swap_memcap    = DCE2_GetReloadSafeMemcap(dce2_swap_config);
+      |                          ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: declared here
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c: At top level:
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:1673:17: error: conflicting types for 'DCE2_GetReloadSafeMemcap'; have 'uint32_t(tSfPolicyUserContext *)' {aka 'unsigned int(tSfPolicyUserContext *)'}
+ 1673 | static uint32_t DCE2_GetReloadSafeMemcap(tSfPolicyUserContextId pConfig)
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+../../../../snort-2.9.20/src/dynamic-preprocessors/dcerpc2/spp_dce2.c:163:17: note: previous declaration of 'DCE2_GetReloadSafeMemcap' with type 'uint32_t(void)' {aka 'unsigned int(void)'}
+  163 | static uint32_t DCE2_GetReloadSafeMemcap();
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Backport [resolved in snort3 https://github.com/snort3/snort3/commit/c3cc27355ac302bd24ee3e9d613166898ec2be64]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ src/dynamic-preprocessors/dcerpc2/spp_dce2.c            | 2 +-
+ src/preprocessors/HttpInspect/include/file_decomp_PDF.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/dynamic-preprocessors/dcerpc2/spp_dce2.c b/src/dynamic-preprocessors/dcerpc2/spp_dce2.c
+index 7fd78ee..150645f 100644
+--- a/src/dynamic-preprocessors/dcerpc2/spp_dce2.c
++++ b/src/dynamic-preprocessors/dcerpc2/spp_dce2.c
+@@ -160,7 +160,7 @@ static void DCE2_ReloadSwapFree(void *);
+ static void DCE2_AddPortsToPaf(struct _SnortConfig *, DCE2_Config *, tSfPolicyId);
+ static void DCE2_ScAddPortsToPaf(struct _SnortConfig *, void *);
+ static uint32_t max(uint32_t a, uint32_t b);
+-static uint32_t DCE2_GetReloadSafeMemcap();
++static uint32_t DCE2_GetReloadSafeMemcap(tSfPolicyUserContextId pConfig);
+ 
+ static bool dce2_file_cache_is_enabled = false;
+ static bool dce2_file_cache_was_enabled = false;
+diff --git a/src/preprocessors/HttpInspect/include/file_decomp_PDF.h b/src/preprocessors/HttpInspect/include/file_decomp_PDF.h
+index 8d39185..0e624f7 100644
+--- a/src/preprocessors/HttpInspect/include/file_decomp_PDF.h
++++ b/src/preprocessors/HttpInspect/include/file_decomp_PDF.h
+@@ -80,6 +80,6 @@ fd_status_t File_Decomp_Init_PDF( fd_session_p_t SessionPtr );
+ 
+ fd_status_t File_Decomp_End_PDF( fd_session_p_t SessionPtr );
+ 
+-fd_status_t File_Decomp_PDF();
++fd_status_t File_Decomp_PDF( fd_session_p_t SessionPtr );
+ 
+ #endif /* FILE_DECOMP_PDF_H */
diff --git a/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..f9cade5256
--- /dev/null
+++ b/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-with-gcc-15.patch
@@ -0,0 +1,79 @@
+From 2bfb46b11d35f2fc5f3926376651cc936c6eab13 Mon Sep 17 00:00:00 2001
+From: Nguyen Dat Tho <tho3.nguyen@lge.com>
+Date: Mon, 31 Mar 2025 15:59:51 +0900
+Subject: [PATCH] Fix build with gcc-15
+
+Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
+
+Upstream-Status: Submitted <https://github.com/snort3/snort3/pull/408>
+---
+ tools/snort2lua/config_states/config_ignore_ports.cc     | 1 +
+ tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc | 1 +
+ tools/snort2lua/preprocessor_states/pps_frag3_engine.cc  | 1 +
+ tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc   | 1 +
+ tools/snort2lua/rule_states/rule_gid_sid.cc              | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/tools/snort2lua/config_states/config_ignore_ports.cc b/tools/snort2lua/config_states/config_ignore_ports.cc
+index 4ddfebb5d..ec180a558 100644
+--- a/tools/snort2lua/config_states/config_ignore_ports.cc
++++ b/tools/snort2lua/config_states/config_ignore_ports.cc
+@@ -21,6 +21,7 @@
+ #include <vector>
+ #include <string>
+ #include <stdexcept>
++#include <cstdint>
+ 
+ #include "conversion_state.h"
+ #include "helpers/converter.h"
+diff --git a/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc b/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc
+index 2a41decb8..79e98dd2b 100644
+--- a/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc
++++ b/tools/snort2lua/preprocessor_states/pps_dcerpc_server.cc
+@@ -25,6 +25,7 @@
+ 
+ #include <algorithm>
+ #include <cstring>
++#include <cstdint>
+ 
+ namespace preprocessors
+ {
+diff --git a/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc b/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
+index d5c1fcf4d..c0309cc6f 100644
+--- a/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
++++ b/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
+@@ -19,6 +19,7 @@
+ 
+ #include <sstream>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "conversion_state.h"
+ #include "helpers/converter.h"
+diff --git a/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc b/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc
+index 1e97a58ad..3df35340e 100644
+--- a/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc
++++ b/tools/snort2lua/preprocessor_states/pps_stream5_tcp.cc
+@@ -20,6 +20,7 @@
+ #include <sstream>
+ #include <vector>
+ #include <string>
++#include <cstdint>
+ 
+ #include "conversion_state.h"
+ #include "helpers/s2l_util.h"
+diff --git a/tools/snort2lua/rule_states/rule_gid_sid.cc b/tools/snort2lua/rule_states/rule_gid_sid.cc
+index 7f2b84ae4..d3215b655 100644
+--- a/tools/snort2lua/rule_states/rule_gid_sid.cc
++++ b/tools/snort2lua/rule_states/rule_gid_sid.cc
+@@ -27,6 +27,7 @@
+ 
+ #include <sstream>
+ #include <unordered_map>
++#include <cstdint>
+ 
+ #include "conversion_state.h"
+ #include "helpers/converter.h"
+-- 
+2.34.1
+
diff --git a/meta-networking/recipes-connectivity/snort/snort3_3.3.4.0.bb b/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb
index 0f3d0e986f..e9169a050f 100644
--- a/meta-networking/recipes-connectivity/snort/snort3_3.3.4.0.bb
+++ b/meta-networking/recipes-connectivity/snort/snort3_3.7.1.0.bb
@@ -9,11 +9,11 @@ DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind l
 
 SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \
            file://0001-cmake-Check-for-HP-libunwind.patch \
-           file://0001-cmake-Pass-noline-flag-to-flex.patch"
+           file://0001-cmake-Pass-noline-flag-to-flex.patch \
+           file://0001-Fix-build-with-gcc-15.patch"
 
-SRCREV = "5598e8dd87829cb1bbb478a7b6d4f6fb8b5dabfe"
+SRCREV = "6a11279883a8584e06ad9ab2df162c639961cd61"
 
-S = "${WORKDIR}/git"
 
 PACKAGES =+ "${PN}-scripts"
 
diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb
index 9bc14fc56f..7f1b779cc4 100644
--- a/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb
+++ b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb
@@ -15,6 +15,7 @@ SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \
     file://fix-host-contamination-when-enable-static-daq.patch \
     file://disable-run-test-program-while-cross-compiling.patch \
     file://configure.in-disable-tirpc-checking-for-fedora.patch \
+    file://0001-Fix-build-with-gcc-15.patch \
 "
 SRC_URI[sha256sum] = "29400e13f53b1831e0b8b10ec1224a1cbaa6dc1533a5322a20dd80bb84b4981c"
 
diff --git a/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb b/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb
index b478692e39..845c3cf53c 100644
--- a/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb
+++ b/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "3b8f0a1bf0d3642764e5f646e1f3bbc8b1eeec474a77392d9aeb486884
 UPSTREAM_CHECK_URI = "http://vlan.sourcearchive.com/"
 UPSTREAM_CHECK_REGEX = "/(?P<pver>\d+(\.\d+)+)/"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 inherit update-alternatives
 
diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
index 5876b58273..5d9d2634a0 100644
--- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
+++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
@@ -29,7 +29,6 @@ PACKAGECONFIG[openssl] = ",,openssl"
 
 PACKAGES =+ "${PN}-script"
 
-S = "${WORKDIR}/git"
 
 inherit perlnative pkgconfig
 
diff --git a/meta-networking/recipes-connectivity/wolfssl/files/0001-wolfssl-wolfcrypt-logging.h-and-wolfcrypt-src-loggin.patch b/meta-networking/recipes-connectivity/wolfssl/files/0001-wolfssl-wolfcrypt-logging.h-and-wolfcrypt-src-loggin.patch
new file mode 100644
index 0000000000..f4f149c7e8
--- /dev/null
+++ b/meta-networking/recipes-connectivity/wolfssl/files/0001-wolfssl-wolfcrypt-logging.h-and-wolfcrypt-src-loggin.patch
@@ -0,0 +1,791 @@
+From 04975ac158e6d33875c2855f74792efb2258bb93 Mon Sep 17 00:00:00 2001
+From: Daniel Pouzzner <douzzer@wolfssl.com>
+Date: Tue, 13 May 2025 20:30:48 -0500
+Subject: [PATCH] wolfssl/wolfcrypt/logging.h and wolfcrypt/src/logging.c: add 
+  WOLFSSL_DEBUG_PRINTF() macro adapted from wolfssl_log(), refactor  
+ wolfssl_log() to use it, and move printf setup includes/prototypes from  
+ logging.c to logging.h;
+
+src/ssl_load.c: add source_name arg and WOLFSSL_DEBUG_CERTIFICATE_LOADS clauses
+  to ProcessBuffer() and ProcessChainBuffer(), and pass reasonable values from
+  callers;
+
+remove expired "Baltimore CyberTrust Root" from certs/external/ca_collection.pem
+  and certs/external/baltimore-cybertrust-root.pem.
+
+Upstream-Status: Backport [https://github.com/wolfSSL/wolfssl/commit/55460a52619626f614e86d528b9a60445562eb34]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ certs/external/baltimore-cybertrust-root.pem |  21 ---
+ certs/external/ca_collection.pem             |  77 ----------
+ src/ssl_load.c                               | 111 +++++++++++----
+ wolfcrypt/src/error.c                        |   4 +-
+ wolfcrypt/src/logging.c                      | 142 ++-----------------
+ wolfssl/internal.h                           |   3 +-
+ wolfssl/wolfcrypt/logging.h                  |  93 +++++++++++-
+ 7 files changed, 190 insertions(+), 261 deletions(-)
+ delete mode 100644 certs/external/baltimore-cybertrust-root.pem
+
+diff --git a/certs/external/baltimore-cybertrust-root.pem b/certs/external/baltimore-cybertrust-root.pem
+deleted file mode 100644
+index 519028c63..000000000
+--- a/certs/external/baltimore-cybertrust-root.pem
++++ /dev/null
+@@ -1,21 +0,0 @@
+------BEGIN CERTIFICATE-----
+-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
+-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
+-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
+-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
+-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
+-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
+-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
+-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
+-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
+-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
+-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
+-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
+-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
+-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
+-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
+-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
+-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
+-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
+-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+------END CERTIFICATE-----
+diff --git a/certs/external/ca_collection.pem b/certs/external/ca_collection.pem
+index ddfdf9cee..c76d6c605 100644
+--- a/certs/external/ca_collection.pem
++++ b/certs/external/ca_collection.pem
+@@ -1,80 +1,3 @@
+-Certificate:
+-    Data:
+-        Version: 3 (0x2)
+-        Serial Number: 33554617 (0x20000b9)
+-        Signature Algorithm: sha1WithRSAEncryption
+-        Issuer: C = IE, O = Baltimore, OU = CyberTrust, CN = Baltimore CyberTrust Root
+-        Validity
+-            Not Before: May 12 18:46:00 2000 GMT
+-            Not After : May 12 23:59:00 2025 GMT
+-        Subject: C = IE, O = Baltimore, OU = CyberTrust, CN = Baltimore CyberTrust Root
+-        Subject Public Key Info:
+-            Public Key Algorithm: rsaEncryption
+-                RSA Public-Key: (2048 bit)
+-                Modulus:
+-                    00:a3:04:bb:22:ab:98:3d:57:e8:26:72:9a:b5:79:
+-                    d4:29:e2:e1:e8:95:80:b1:b0:e3:5b:8e:2b:29:9a:
+-                    64:df:a1:5d:ed:b0:09:05:6d:db:28:2e:ce:62:a2:
+-                    62:fe:b4:88:da:12:eb:38:eb:21:9d:c0:41:2b:01:
+-                    52:7b:88:77:d3:1c:8f:c7:ba:b9:88:b5:6a:09:e7:
+-                    73:e8:11:40:a7:d1:cc:ca:62:8d:2d:e5:8f:0b:a6:
+-                    50:d2:a8:50:c3:28:ea:f5:ab:25:87:8a:9a:96:1c:
+-                    a9:67:b8:3f:0c:d5:f7:f9:52:13:2f:c2:1b:d5:70:
+-                    70:f0:8f:c0:12:ca:06:cb:9a:e1:d9:ca:33:7a:77:
+-                    d6:f8:ec:b9:f1:68:44:42:48:13:d2:c0:c2:a4:ae:
+-                    5e:60:fe:b6:a6:05:fc:b4:dd:07:59:02:d4:59:18:
+-                    98:63:f5:a5:63:e0:90:0c:7d:5d:b2:06:7a:f3:85:
+-                    ea:eb:d4:03:ae:5e:84:3e:5f:ff:15:ed:69:bc:f9:
+-                    39:36:72:75:cf:77:52:4d:f3:c9:90:2c:b9:3d:e5:
+-                    c9:23:53:3f:1f:24:98:21:5c:07:99:29:bd:c6:3a:
+-                    ec:e7:6e:86:3a:6b:97:74:63:33:bd:68:18:31:f0:
+-                    78:8d:76:bf:fc:9e:8e:5d:2a:86:a7:4d:90:dc:27:
+-                    1a:39
+-                Exponent: 65537 (0x10001)
+-        X509v3 extensions:
+-            X509v3 Subject Key Identifier: 
+-                E5:9D:59:30:82:47:58:CC:AC:FA:08:54:36:86:7B:3A:B5:04:4D:F0
+-            X509v3 Basic Constraints: critical
+-                CA:TRUE, pathlen:3
+-            X509v3 Key Usage: critical
+-                Certificate Sign, CRL Sign
+-    Signature Algorithm: sha1WithRSAEncryption
+-         85:0c:5d:8e:e4:6f:51:68:42:05:a0:dd:bb:4f:27:25:84:03:
+-         bd:f7:64:fd:2d:d7:30:e3:a4:10:17:eb:da:29:29:b6:79:3f:
+-         76:f6:19:13:23:b8:10:0a:f9:58:a4:d4:61:70:bd:04:61:6a:
+-         12:8a:17:d5:0a:bd:c5:bc:30:7c:d6:e9:0c:25:8d:86:40:4f:
+-         ec:cc:a3:7e:38:c6:37:11:4f:ed:dd:68:31:8e:4c:d2:b3:01:
+-         74:ee:be:75:5e:07:48:1a:7f:70:ff:16:5c:84:c0:79:85:b8:
+-         05:fd:7f:be:65:11:a3:0f:c0:02:b4:f8:52:37:39:04:d5:a9:
+-         31:7a:18:bf:a0:2a:f4:12:99:f7:a3:45:82:e3:3c:5e:f5:9d:
+-         9e:b5:c8:9e:7c:2e:c8:a4:9e:4e:08:14:4b:6d:fd:70:6d:6b:
+-         1a:63:bd:64:e6:1f:b7:ce:f0:f2:9f:2e:bb:1b:b7:f2:50:88:
+-         73:92:c2:e2:e3:16:8d:9a:32:02:ab:8e:18:dd:e9:10:11:ee:
+-         7e:35:ab:90:af:3e:30:94:7a:d0:33:3d:a7:65:0f:f5:fc:8e:
+-         9e:62:cf:47:44:2c:01:5d:bb:1d:b5:32:d2:47:d2:38:2e:d0:
+-         fe:81:dc:32:6a:1e:b5:ee:3c:d5:fc:e7:81:1d:19:c3:24:42:
+-         ea:63:39:a9
+------BEGIN CERTIFICATE-----
+-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
+-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
+-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
+-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
+-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
+-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
+-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
+-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
+-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
+-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
+-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
+-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
+-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
+-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
+-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
+-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
+-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
+-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
+-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+------END CERTIFICATE-----
+ Certificate:
+     Data:
+         Version: 3 (0x2)
+diff --git a/src/ssl_load.c b/src/ssl_load.c
+index 24c8af1be..d803b4093 100644
+--- a/src/ssl_load.c
++++ b/src/ssl_load.c
+@@ -2352,11 +2352,13 @@ static int ProcessBufferResetSuites(WOLFSSL_CTX* ctx, WOLFSSL* ssl, int type)
+  * @param [out]     used       Number of bytes consumed.
+  * @param [in[      userChain  Whether this certificate is for user's chain.
+  * @param [in]      verify     How to verify certificate.
++ * @param [in]      source_name Associated filename or other source ID.
+  * @return  1 on success.
+  * @return  Less than 1 on failure.
+  */
+ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, long sz,
+-    int format, int type, WOLFSSL* ssl, long* used, int userChain, int verify)
++    int format, int type, WOLFSSL* ssl, long* used, int userChain, int verify,
++    const char *source_name)
+ {
+     DerBuffer*    der = NULL;
+     int           ret = 0;
+@@ -2367,6 +2369,11 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, long sz,
+     EncryptedInfo  info[1];
+ #endif
+     int           algId = 0;
++#ifdef WOLFSSL_DEBUG_CERTIFICATE_LOADS
++    long usedAtStart = used ? *used : 0L;
++#else
++    (void)source_name;
++#endif
+ 
+     WOLFSSL_ENTER("ProcessBuffer");
+ 
+@@ -2444,6 +2451,22 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, long sz,
+                 CLEAR_ASN_NO_PEM_HEADER_ERROR(pemErr);
+                 ret = 0;
+             }
++#ifdef WOLFSSL_DEBUG_CERTIFICATE_LOADS
++            if (ret < 0) {
++#ifdef NO_ERROR_STRINGS
++                WOLFSSL_DEBUG_PRINTF(
++                    "ERROR: ProcessUserChain: certificate from %s at offset %ld"
++                    " rejected with code %d\n",
++                    source_name, usedAtStart, ret);
++#else
++                WOLFSSL_DEBUG_PRINTF(
++                    "ERROR: ProcessUserChain: certificate from %s at offset %ld"
++                    " rejected with code %d: %s\n",
++                    source_name, usedAtStart, ret,
++                    wolfSSL_ERR_reason_error_string(ret));
++#endif
++            }
++#endif /* WOLFSSL_DEBUG_CERTIFICATE_LOADS */
+         }
+ 
+     #ifdef WOLFSSL_SMALL_STACK
+@@ -2455,6 +2478,22 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff, long sz,
+             /* Process the different types of certificates. */
+             ret = ProcessBufferCertTypes(ctx, ssl, buff, sz, der, format, type,
+                 verify);
++#ifdef WOLFSSL_DEBUG_CERTIFICATE_LOADS
++            if (ret < 0) {
++#ifdef NO_ERROR_STRINGS
++                WOLFSSL_DEBUG_PRINTF(
++                    "ERROR: ProcessBufferCertTypes: certificate from %s at"
++                    " offset %ld rejected with code %d\n",
++                    source_name, usedAtStart, ret);
++#else
++                WOLFSSL_DEBUG_PRINTF(
++                    "ERROR: ProcessBufferCertTypes: certificate from %s at"
++                    " offset %ld rejected with code %d: %s\n",
++                    source_name, usedAtStart, ret,
++                    wolfSSL_ERR_reason_error_string(ret));
++#endif
++            }
++#endif /* WOLFSSL_DEBUG_CERTIFICATE_LOADS */
+         }
+         else {
+             FreeDer(&der);
+@@ -2515,12 +2554,14 @@ static int ProcessChainBufferCRL(WOLFSSL_CTX* ctx, const unsigned char* buff,
+  * @param [in]      sz      Size of data in buffer.
+  * @param [in]      type    Type of data.
+  * @param [in]      verify  How to verify certificate.
++ * @param [in]      source_name   Associated filename or other source ID.
+  * @return  1 on success.
+  * @return  0 on failure.
+  * @return  MEMORY_E when dynamic memory allocation fails.
+  */
+ static int ProcessChainBuffer(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
+-    const unsigned char* buff, long sz, int type, int verify)
++    const unsigned char* buff, long sz, int type, int verify,
++    const char *source_name)
+ {
+     int  ret    = 0;
+     long used   = 0;
+@@ -2529,11 +2570,11 @@ static int ProcessChainBuffer(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
+     WOLFSSL_MSG("Processing CA PEM file");
+     /* Keep processing file while no errors and data to parse. */
+     while ((ret >= 0) && (used < sz)) {
+-        long consumed = 0;
++        long consumed = used;
+ 
+         /* Process the buffer. */
+         ret = ProcessBuffer(ctx, buff + used, sz - used, WOLFSSL_FILETYPE_PEM,
+-            type, ssl, &consumed, 0, verify);
++            type, ssl, &consumed, 0, verify, source_name);
+         /* Memory allocation failure is fatal. */
+         if (ret == WC_NO_ERR_TRACE(MEMORY_E)) {
+             gotOne = 0;
+@@ -2665,6 +2706,12 @@ int ProcessFile(WOLFSSL_CTX* ctx, const char* fname, int format, int type,
+         {
+             /* Not a header that we support. */
+             WOLFSSL_MSG("Failed to detect certificate type");
++#ifdef WOLFSSL_DEBUG_CERTIFICATE_LOADS
++            WOLFSSL_DEBUG_PRINTF(
++                "ERROR: ProcessFile: Failed to detect certificate type"
++                " of \"%s\"\n",
++                fname);
++#endif
+             ret = WOLFSSL_BAD_CERTTYPE;
+         }
+     }
+@@ -2673,7 +2720,7 @@ int ProcessFile(WOLFSSL_CTX* ctx, const char* fname, int format, int type,
+         if (((type == CA_TYPE) || (type == TRUSTED_PEER_TYPE)) &&
+                 (format == WOLFSSL_FILETYPE_PEM)) {
+             ret = ProcessChainBuffer(ctx, ssl, content.buffer, sz, type,
+-                verify);
++                verify, fname);
+         }
+ #ifdef HAVE_CRL
+         else if (type == CRL_TYPE) {
+@@ -2690,18 +2737,18 @@ int ProcessFile(WOLFSSL_CTX* ctx, const char* fname, int format, int type,
+             long consumed = 0;
+ 
+             ret = ProcessBuffer(ctx, content.buffer, sz, format, type, ssl,
+-                &consumed, userChain, verify);
++                &consumed, userChain, verify, fname);
+             if ((ret == 1) && (consumed < sz)) {
+                 ret = ProcessBuffer(ctx, content.buffer + consumed,
+                     sz - consumed, format, ALT_PRIVATEKEY_TYPE, ssl, NULL, 0,
+-                    verify);
++                    verify, fname);
+             }
+         }
+ #endif
+         else {
+             /* Load all other certificate types. */
+             ret = ProcessBuffer(ctx, content.buffer, sz, format, type, ssl,
+-                NULL, userChain, verify);
++                NULL, userChain, verify, fname);
+         }
+     }
+ 
+@@ -3030,7 +3077,8 @@ static int LoadSystemCaCertsWindows(WOLFSSL_CTX* ctx, byte* loaded)
+                     if (ProcessBuffer(ctx, certCtx->pbCertEncoded,
+                           certCtx->cbCertEncoded, WOLFSSL_FILETYPE_ASN1,
+                           CA_TYPE, NULL, NULL, 0,
+-                          GET_VERIFY_SETTING_CTX(ctx)) == 1) {
++                          GET_VERIFY_SETTING_CTX(ctx),
++                          storeNames[i]) == 1) {
+                         /*
+                          * Set "loaded" as long as we've loaded one CA
+                          * cert.
+@@ -3105,7 +3153,8 @@ static int LoadSystemCaCertsMac(WOLFSSL_CTX* ctx, byte* loaded)
+                     if (ProcessBuffer(ctx, CFDataGetBytePtr(der),
+                           CFDataGetLength(der), WOLFSSL_FILETYPE_ASN1,
+                           CA_TYPE, NULL, NULL, 0,
+-                          GET_VERIFY_SETTING_CTX(ctx)) == 1) {
++                          GET_VERIFY_SETTING_CTX(ctx),
++                          "MacOSX trustDomains") == 1) {
+                         /*
+                          * Set "loaded" as long as we've loaded one CA
+                          * cert.
+@@ -3644,7 +3693,8 @@ int wolfSSL_use_certificate(WOLFSSL* ssl, WOLFSSL_X509* x509)
+         /* Get DER encoded certificate data from X509 object. */
+         ret = ProcessBuffer(NULL, x509->derCert->buffer, x509->derCert->length,
+             WOLFSSL_FILETYPE_ASN1, CERT_TYPE, ssl, &idx, 0,
+-            GET_VERIFY_SETTING_SSL(ssl));
++            GET_VERIFY_SETTING_SSL(ssl),
++            "x509 buffer");
+     }
+ 
+     /* Return 1 on success or 0 on failure. */
+@@ -3676,7 +3726,8 @@ int wolfSSL_use_certificate_ASN1(WOLFSSL* ssl, const unsigned char* der,
+         long idx = 0;
+ 
+         ret = ProcessBuffer(NULL, der, derSz, WOLFSSL_FILETYPE_ASN1, CERT_TYPE,
+-            ssl, &idx, 0, GET_VERIFY_SETTING_SSL(ssl));
++            ssl, &idx, 0, GET_VERIFY_SETTING_SSL(ssl),
++            "asn1 buffer");
+     }
+ 
+     /* Return 1 on success or 0 on failure. */
+@@ -3884,12 +3935,13 @@ int wolfSSL_CTX_load_verify_buffer_ex(WOLFSSL_CTX* ctx, const unsigned char* in,
+ 
+     /* When PEM, treat as certificate chain of CA certificates. */
+     if (format == WOLFSSL_FILETYPE_PEM) {
+-        ret = ProcessChainBuffer(ctx, NULL, in, sz, CA_TYPE, verify);
++        ret = ProcessChainBuffer(ctx, NULL, in, sz, CA_TYPE, verify,
++                                 "PEM buffer");
+     }
+     /* When DER, load the CA certificate. */
+     else {
+         ret = ProcessBuffer(ctx, in, sz, format, CA_TYPE, NULL, NULL,
+-            userChain, verify);
++            userChain, verify, "buffer");
+     }
+ #if defined(WOLFSSL_TRUST_PEER_CERT) && defined(OPENSSL_COMPATIBLE_DEFAULTS)
+     if (ret == 1) {
+@@ -3973,12 +4025,12 @@ int wolfSSL_CTX_trust_peer_buffer(WOLFSSL_CTX* ctx, const unsigned char* in,
+         /* When PEM, treat as certificate chain of trusted peer certificates. */
+         if (format == WOLFSSL_FILETYPE_PEM) {
+             ret = ProcessChainBuffer(ctx, NULL, in, sz, TRUSTED_PEER_TYPE,
+-                verify);
++                verify, "peer");
+         }
+         /* When DER, load the trusted peer certificate. */
+         else {
+             ret = ProcessBuffer(ctx, in, sz, format, TRUSTED_PEER_TYPE, NULL,
+-                NULL, 0, verify);
++                NULL, 0, verify, "peer");
+         }
+     }
+ 
+@@ -4004,7 +4056,7 @@ int wolfSSL_CTX_use_certificate_buffer(WOLFSSL_CTX* ctx,
+ 
+     WOLFSSL_ENTER("wolfSSL_CTX_use_certificate_buffer");
+     ret = ProcessBuffer(ctx, in, sz, format, CERT_TYPE, NULL, NULL, 0,
+-        GET_VERIFY_SETTING_CTX(ctx));
++        GET_VERIFY_SETTING_CTX(ctx), "buffer");
+     WOLFSSL_LEAVE("wolfSSL_CTX_use_certificate_buffer", ret);
+ 
+     return ret;
+@@ -4030,7 +4082,7 @@ int wolfSSL_CTX_use_PrivateKey_buffer(WOLFSSL_CTX* ctx, const unsigned char* in,
+     WOLFSSL_ENTER("wolfSSL_CTX_use_PrivateKey_buffer");
+ 
+     ret = ProcessBuffer(ctx, in, sz, format, PRIVATEKEY_TYPE, NULL, &consumed,
+-        0, GET_VERIFY_SETTING_CTX(ctx));
++        0, GET_VERIFY_SETTING_CTX(ctx), "key buffer");
+ #ifdef WOLFSSL_DUAL_ALG_CERTS
+     if ((ret == 1) && (consumed < sz)) {
+         /* When support for dual algorithm certificates is enabled, the
+@@ -4038,7 +4090,8 @@ int wolfSSL_CTX_use_PrivateKey_buffer(WOLFSSL_CTX* ctx, const unsigned char* in,
+          * private key. Hence, we have to parse both of them.
+          */
+         ret = ProcessBuffer(ctx, in + consumed, sz - consumed, format,
+-            ALT_PRIVATEKEY_TYPE, NULL, NULL, 0, GET_VERIFY_SETTING_CTX(ctx));
++            ALT_PRIVATEKEY_TYPE, NULL, NULL, 0, GET_VERIFY_SETTING_CTX(ctx),
++            "key buffer");
+     }
+ #endif
+ 
+@@ -4056,7 +4109,7 @@ int wolfSSL_CTX_use_AltPrivateKey_buffer(WOLFSSL_CTX* ctx,
+ 
+     WOLFSSL_ENTER("wolfSSL_CTX_use_AltPrivateKey_buffer");
+     ret = ProcessBuffer(ctx, in, sz, format, ALT_PRIVATEKEY_TYPE, NULL,
+-        NULL, 0, GET_VERIFY_SETTING_CTX(ctx));
++        NULL, 0, GET_VERIFY_SETTING_CTX(ctx), "alt key buffer");
+     WOLFSSL_LEAVE("wolfSSL_CTX_use_AltPrivateKey_buffer", ret);
+ 
+     return ret;
+@@ -4271,7 +4324,8 @@ static int wolfSSL_CTX_use_certificate_ex(WOLFSSL_CTX* ctx,
+     }
+ 
+     ret = ProcessBuffer(ctx, certData, certDataLen, certFormat,
+-        CERT_TYPE, NULL, NULL, 0, GET_VERIFY_SETTING_CTX(ctx));
++        CERT_TYPE, NULL, NULL, 0, GET_VERIFY_SETTING_CTX(ctx),
++        label ? label : "cert buffer");
+ 
+ exit:
+     XFREE(certData, ctx->heap, DYNAMIC_TYPE_CERT);
+@@ -4333,7 +4387,7 @@ int wolfSSL_CTX_use_certificate_chain_buffer_format(WOLFSSL_CTX* ctx,
+ {
+     WOLFSSL_ENTER("wolfSSL_CTX_use_certificate_chain_buffer_format");
+     return ProcessBuffer(ctx, in, sz, format, CERT_TYPE, NULL, NULL, 1,
+-        GET_VERIFY_SETTING_CTX(ctx));
++        GET_VERIFY_SETTING_CTX(ctx), "cert chain buffer");
+ }
+ 
+ /* Load a PEM encoded certificate chain in a buffer into SSL context.
+@@ -4376,7 +4430,7 @@ int wolfSSL_use_certificate_buffer(WOLFSSL* ssl, const unsigned char* in,
+     }
+     else {
+         ret = ProcessBuffer(ssl->ctx, in, sz, format, CERT_TYPE, ssl, NULL, 0,
+-            GET_VERIFY_SETTING_SSL(ssl));
++            GET_VERIFY_SETTING_SSL(ssl), "cert buffer");
+     }
+ 
+     return ret;
+@@ -4407,7 +4461,7 @@ int wolfSSL_use_PrivateKey_buffer(WOLFSSL* ssl, const unsigned char* in,
+     }
+     else {
+         ret = ProcessBuffer(ssl->ctx, in, sz, format, PRIVATEKEY_TYPE, ssl,
+-            &consumed, 0, GET_VERIFY_SETTING_SSL(ssl));
++            &consumed, 0, GET_VERIFY_SETTING_SSL(ssl), "key buffer");
+     #ifdef WOLFSSL_DUAL_ALG_CERTS
+         if ((ret == 1) && (consumed < sz)) {
+             /* When support for dual algorithm certificates is enabled, the
+@@ -4415,7 +4469,8 @@ int wolfSSL_use_PrivateKey_buffer(WOLFSSL* ssl, const unsigned char* in,
+              * private key. Hence, we have to parse both of them.
+              */
+             ret = ProcessBuffer(ssl->ctx, in + consumed, sz - consumed, format,
+-                ALT_PRIVATEKEY_TYPE, ssl, NULL, 0, GET_VERIFY_SETTING_SSL(ssl));
++                ALT_PRIVATEKEY_TYPE, ssl, NULL, 0, GET_VERIFY_SETTING_SSL(ssl),
++                "key buffer");
+         }
+     #endif
+     }
+@@ -4431,7 +4486,7 @@ int wolfSSL_use_AltPrivateKey_buffer(WOLFSSL* ssl, const unsigned char* in,
+ 
+     WOLFSSL_ENTER("wolfSSL_use_AltPrivateKey_buffer");
+     ret = ProcessBuffer(ssl->ctx, in, sz, format, ALT_PRIVATEKEY_TYPE, ssl,
+-        NULL, 0, GET_VERIFY_SETTING_SSL(ssl));
++        NULL, 0, GET_VERIFY_SETTING_SSL(ssl), "alt key buffer");
+     WOLFSSL_LEAVE("wolfSSL_use_AltPrivateKey_buffer", ret);
+ 
+     return ret;
+@@ -4669,7 +4724,7 @@ int wolfSSL_use_certificate_chain_buffer_format(WOLFSSL* ssl,
+     }
+     else {
+         ret = ProcessBuffer(ssl->ctx, in, sz, format, CERT_TYPE, ssl, NULL, 1,
+-            GET_VERIFY_SETTING_SSL(ssl));
++            GET_VERIFY_SETTING_SSL(ssl), "cert chain buffer");
+     }
+ 
+     return ret;
+@@ -4826,7 +4881,7 @@ long wolfSSL_CTX_add_extra_chain_cert(WOLFSSL_CTX* ctx, WOLFSSL_X509* x509)
+ 
+         /* Process buffer makes first certificate the leaf. */
+         ret = ProcessBuffer(ctx, der, derSz, WOLFSSL_FILETYPE_ASN1, CERT_TYPE,
+-            NULL, NULL, 1, GET_VERIFY_SETTING_CTX(ctx));
++            NULL, NULL, 1, GET_VERIFY_SETTING_CTX(ctx), "extra chain buffer");
+         if (ret != 1) {
+             ret = 0;
+         }
+diff --git a/wolfcrypt/src/error.c b/wolfcrypt/src/error.c
+index af5ba36b4..9ec9484d4 100644
+--- a/wolfcrypt/src/error.c
++++ b/wolfcrypt/src/error.c
+@@ -182,10 +182,10 @@ const char* wc_GetErrorString(int error)
+         return "ASN date error, bad size";
+ 
+     case ASN_BEFORE_DATE_E :
+-        return "ASN date error, current date before";
++        return "ASN date error, current date is before start of validity";
+ 
+     case ASN_AFTER_DATE_E :
+-        return "ASN date error, current date after";
++        return "ASN date error, current date is after expiration";
+ 
+     case ASN_SIG_OID_E :
+         return "ASN signature error, mismatched oid";
+diff --git a/wolfcrypt/src/logging.c b/wolfcrypt/src/logging.c
+index 29b9221df..b80fc3a56 100644
+--- a/wolfcrypt/src/logging.c
++++ b/wolfcrypt/src/logging.c
+@@ -230,42 +230,6 @@ void WOLFSSL_TIME(int count)
+ 
+ #ifdef DEBUG_WOLFSSL
+ 
+-#if defined(ARDUINO)
+-    /* see Arduino wolfssl.h for wolfSSL_Arduino_Serial_Print */
+-#elif defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
+-    /* see wc_port.h for fio.h and nio.h includes */
+-#elif defined(WOLFSSL_SGX)
+-    /* Declare sprintf for ocall */
+-    int sprintf(char* buf, const char *fmt, ...);
+-#elif defined(WOLFSSL_DEOS)
+-#elif defined(MICRIUM)
+-    #if (BSP_SER_COMM_EN  == DEF_ENABLED)
+-        #include <bsp_ser.h>
+-    #endif
+-#elif defined(WOLFSSL_USER_LOG)
+-    /* user includes their own headers */
+-#elif defined(WOLFSSL_ESPIDF)
+-    #include "esp_types.h"
+-    #include "esp_log.h"
+-#elif defined(WOLFSSL_TELIT_M2MB)
+-    #include <stdio.h>
+-    #include "m2m_log.h"
+-#elif defined(WOLFSSL_ANDROID_DEBUG)
+-    #include <android/log.h>
+-#elif defined(WOLFSSL_XILINX)
+-    #include "xil_printf.h"
+-#elif defined(WOLFSSL_LINUXKM)
+-    /* the requisite linux/kernel.h is included in wc_port.h, with incompatible warnings masked out. */
+-#elif defined(FUSION_RTOS)
+-    #include <fclstdio.h>
+-    #define fprintf FCL_FPRINTF
+-#else
+-    #include <stdio.h>  /* for default printf stuff */
+-#endif
+-
+-#if defined(THREADX) && !defined(THREADX_NO_DC_PRINTF)
+-    int dc_log_printf(char*, ...);
+-#endif
+ 
+ #ifdef HAVE_STACK_SIZE_VERBOSE
+ #include <wolfssl/wolfcrypt/mem_track.h>
+@@ -281,106 +245,30 @@ static void wolfssl_log(const int logLevel, const char* const file_name,
+     else {
+ #if defined(WOLFSSL_USER_LOG)
+         WOLFSSL_USER_LOG(logMessage);
+-#elif defined(ARDUINO)
+-        wolfSSL_Arduino_Serial_Print(logMessage);
+-#elif defined(WOLFSSL_LOG_PRINTF)
+-        if (file_name != NULL)
+-            printf("[%s L %d] %s\n", file_name, line_number, logMessage);
+-        else
+-            printf("%s\n", logMessage);
+-#elif defined(THREADX) && !defined(THREADX_NO_DC_PRINTF)
+-        if (file_name != NULL)
+-            dc_log_printf("[%s L %d] %s\n", file_name, line_number, logMessage);
+-        else
+-            dc_log_printf("%s\n", logMessage);
+-#elif defined(WOLFSSL_DEOS)
+-        if (file_name != NULL)
+-            printf("[%s L %d] %s\r\n", file_name, line_number, logMessage);
+-        else
+-            printf("%s\r\n", logMessage);
+-#elif defined(MICRIUM)
+-        if (file_name != NULL)
+-            BSP_Ser_Printf("[%s L %d] %s\r\n",
+-                           file_name, line_number, logMessage);
+-        else
+-            BSP_Ser_Printf("%s\r\n", logMessage);
+-#elif defined(WOLFSSL_MDK_ARM)
+-        fflush(stdout) ;
+-        if (file_name != NULL)
+-            printf("[%s L %d] %s\n", file_name, line_number, logMessage);
+-        else
+-            printf("%s\n", logMessage);
+-        fflush(stdout) ;
+-#elif defined(WOLFSSL_UTASKER)
+-        fnDebugMsg((char*)logMessage);
+-        fnDebugMsg("\r\n");
+-#elif defined(MQX_USE_IO_OLD)
+-        if (file_name != NULL)
+-            fprintf(_mqxio_stderr, "[%s L %d] %s\n",
+-                    file_name, line_number, logMessage);
+-        else
+-            fprintf(_mqxio_stderr, "%s\n", logMessage);
+-#elif defined(WOLFSSL_APACHE_MYNEWT)
+-        if (file_name != NULL)
+-            LOG_DEBUG(&mynewt_log, LOG_MODULE_DEFAULT, "[%s L %d] %s\n",
+-                      file_name, line_number, logMessage);
+-        else
+-            LOG_DEBUG(&mynewt_log, LOG_MODULE_DEFAULT, "%s\n", logMessage);
+-#elif defined(WOLFSSL_ESPIDF)
+-        if (file_name != NULL)
+-            ESP_LOGI("wolfssl", "[%s L %d] %s",
+-                     file_name, line_number, logMessage);
+-        else
+-            ESP_LOGI("wolfssl", "%s", logMessage);
+-#elif defined(WOLFSSL_ZEPHYR)
+-        if (file_name != NULL)
+-            printk("[%s L %d] %s\n", file_name, line_number, logMessage);
+-        else
+-            printk("%s\n", logMessage);
+-#elif defined(WOLFSSL_TELIT_M2MB)
+-        if (file_name != NULL)
+-            M2M_LOG_INFO("[%s L %d] %s\n", file_name, line_number, logMessage);
+-        else
+-            M2M_LOG_INFO("%s\n", logMessage);
+-#elif defined(WOLFSSL_ANDROID_DEBUG)
+-        if (file_name != NULL)
+-            __android_log_print(ANDROID_LOG_VERBOSE, "[wolfSSL]", "[%s L %d] %s",
+-                                file_name, line_number, logMessage);
+-        else
+-            __android_log_print(ANDROID_LOG_VERBOSE, "[wolfSSL]", "%s",
+-                                logMessage);
+-#elif defined(WOLFSSL_XILINX)
+-        if (file_name != NULL)
+-            xil_printf("[%s L %d] %s\r\n", file_name, line_number, logMessage);
+-        else
+-            xil_printf("%s\r\n", logMessage);
+-#elif defined(WOLFSSL_LINUXKM)
+-        if (file_name != NULL)
+-            printk("[%s L %d] %s\n", file_name, line_number, logMessage);
+-        else
+-            printk("%s\n", logMessage);
+-#elif defined(WOLFSSL_RENESAS_RA6M4)
+-        if (file_name != NULL)
+-            myprintf("[%s L %d] %s\n", file_name, line_number, logMessage);
+-        else
+-            myprintf("%s\n", logMessage);
+-#elif defined(STACK_SIZE_CHECKPOINT_MSG) && \
+-      defined(HAVE_STACK_SIZE_VERBOSE) && defined(HAVE_STACK_SIZE_VERBOSE_LOG)
+-        STACK_SIZE_CHECKPOINT_MSG(logMessage);
+-#else
++#elif defined(WOLFSSL_DEBUG_PRINTF)
+         if (log_prefix != NULL) {
+             if (file_name != NULL)
+-                fprintf(stderr, "[%s]: [%s L %d] %s\n",
++                WOLFSSL_DEBUG_PRINTF("[%s]: [%s L %d] %s\n",
+                         log_prefix, file_name, line_number, logMessage);
+             else
+-                fprintf(stderr, "[%s]: %s\n", log_prefix, logMessage);
++                WOLFSSL_DEBUG_PRINTF("[%s]: %s\n", log_prefix, logMessage);
+         } else {
+             if (file_name != NULL)
+-                fprintf(stderr, "[%s L %d] %s\n",
++                WOLFSSL_DEBUG_PRINTF("[%s L %d] %s\n",
+                         file_name, line_number, logMessage);
+             else
+-                fprintf(stderr, "%s\n", logMessage);
++                WOLFSSL_DEBUG_PRINTF("%s\n", logMessage);
+         }
++#elif defined(ARDUINO)
++        wolfSSL_Arduino_Serial_Print(logMessage);
++#elif defined(WOLFSSL_UTASKER)
++        fnDebugMsg((char*)logMessage);
++        fnDebugMsg("\r\n");
++#elif defined(STACK_SIZE_CHECKPOINT_MSG) && \
++      defined(HAVE_STACK_SIZE_VERBOSE) && defined(HAVE_STACK_SIZE_VERBOSE_LOG)
++        STACK_SIZE_CHECKPOINT_MSG(logMessage);
++#else
++    #error No log method defined.
+ #endif
+     }
+ }
+diff --git a/wolfssl/internal.h b/wolfssl/internal.h
+index 9cdbdb697..dd191fb1a 100644
+--- a/wolfssl/internal.h
++++ b/wolfssl/internal.h
+@@ -6389,7 +6389,8 @@ WOLFSSL_TEST_VIS   void wolfSSL_ResourceFree(WOLFSSL* ssl);   /* Micrium uses */
+ 
+     WOLFSSL_LOCAL int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff,
+                                     long sz, int format, int type, WOLFSSL* ssl,
+-                                    long* used, int userChain, int verify);
++                                    long* used, int userChain, int verify,
++                                    const char *source_name);
+     WOLFSSL_LOCAL int ProcessFile(WOLFSSL_CTX* ctx, const char* fname, int format,
+                                  int type, WOLFSSL* ssl, int userChain,
+                                 WOLFSSL_CRL* crl, int verify);
+diff --git a/wolfssl/wolfcrypt/logging.h b/wolfssl/wolfcrypt/logging.h
+index 49de70147..8b3cf0fd8 100644
+--- a/wolfssl/wolfcrypt/logging.h
++++ b/wolfssl/wolfcrypt/logging.h
+@@ -89,11 +89,6 @@ enum wc_FuncNum {
+ };
+ #endif
+ 
+-#if defined(ARDUINO)
+-/* implemented in Arduino wolfssl.h */
+-extern WOLFSSL_API int wolfSSL_Arduino_Serial_Print(const char* const s);
+-#endif /* ARDUINO */
+-
+ typedef void (*wolfSSL_Logging_cb)(const int logLevel,
+                                    const char *const logMessage);
+ 
+@@ -157,6 +152,10 @@ WOLFSSL_API void wolfSSL_SetLoggingPrefix(const char* prefix);
+     #define WOLFSSL_TIME(n)  WC_DO_NOTHING
+ #endif
+ 
++#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_DEBUG_CERTIFICATE_LOADS)
++    #define WOLFSSL_DEBUG_CERTIFICATE_LOADS
++#endif
++
+ #if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_DEBUG_ERRORS_ONLY)
+     #if defined(_WIN32)
+         #if defined(INTIME_RTOS)
+@@ -268,6 +267,90 @@ WOLFSSL_API void wolfSSL_SetLoggingPrefix(const char* prefix);
+     extern WOLFSSL_API THREAD_LS_T void *StackSizeCheck_stackOffsetPointer;
+ #endif
+ 
++/* Port-specific includes and printf methods: */
++
++#if defined(ARDUINO)
++    /* implemented in Arduino wolfssl.h */
++    extern WOLFSSL_API int wolfSSL_Arduino_Serial_Print(const char* const s);
++#elif defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
++    /* see wc_port.h for fio.h and nio.h includes */
++#elif defined(WOLFSSL_SGX)
++    /* Declare sprintf for ocall */
++    int sprintf(char* buf, const char *fmt, ...);
++#elif defined(WOLFSSL_DEOS)
++#elif defined(MICRIUM)
++    #if (BSP_SER_COMM_EN  == DEF_ENABLED)
++        #include <bsp_ser.h>
++    #endif
++#elif defined(WOLFSSL_USER_LOG)
++    /* user includes their own headers */
++#elif defined(WOLFSSL_ESPIDF)
++    #include "esp_types.h"
++    #include "esp_log.h"
++#elif defined(WOLFSSL_TELIT_M2MB)
++    #include <stdio.h>
++    #include "m2m_log.h"
++#elif defined(WOLFSSL_ANDROID_DEBUG)
++    #include <android/log.h>
++#elif defined(WOLFSSL_XILINX)
++    #include "xil_printf.h"
++#elif defined(WOLFSSL_LINUXKM)
++    /* the requisite linux/kernel.h is included in linuxkm_wc_port.h, with
++     * incompatible warnings masked out.
++     */
++#elif defined(FUSION_RTOS)
++    #include <fclstdio.h>
++    #define fprintf FCL_FPRINTF
++#else
++    #include <stdio.h>  /* for default printf stuff */
++#endif
++
++#if defined(THREADX) && !defined(THREADX_NO_DC_PRINTF)
++    int dc_log_printf(char*, ...);
++#endif
++
++#ifdef WOLFSSL_DEBUG_PRINTF
++    /* user-supplied definition */
++#elif defined(ARDUINO)
++    /* ARDUINO only has print and sprintf, no printf. */
++#elif defined(WOLFSSL_LOG_PRINTF) || defined(WOLFSSL_DEOS)
++    #define WOLFSSL_DEBUG_PRINTF(...) printf(__VA_ARGS__)
++#elif defined(THREADX) && !defined(THREADX_NO_DC_PRINTF)
++    #define WOLFSSL_DEBUG_PRINTF(...) dc_log_printf(__VA_ARGS__)
++#elif defined(MICRIUM)
++    #define WOLFSSL_DEBUG_PRINTF(...) BSP_Ser_Printf(__VA_ARGS__)
++#elif defined(WOLFSSL_MDK_ARM)
++    #define WOLFSSL_DEBUG_PRINTF(...) do { \
++            fflush(stdout);                \
++            printf(__VA_ARGS__);           \
++            fflush(stdout);                \
++        } while (0)
++#elif defined(WOLFSSL_UTASKER)
++    /* WOLFSSL_UTASKER only has fnDebugMsg and related primitives, no printf. */
++#elif defined(MQX_USE_IO_OLD)
++    #define WOLFSSL_DEBUG_PRINTF(...) fprintf(_mqxio_stderr, __VAR_ARGS)
++#elif defined(WOLFSSL_APACHE_MYNEWT)
++    #define WOLFSSL_DEBUG_PRINTF(...) LOG_DEBUG(&mynewt_log, \
++        LOG_MODULE_DEFAULT, __VA_ARGS__)
++#elif defined(WOLFSSL_ESPIDF)
++    #define WOLFSSL_DEBUG_PRINTF(...) ESP_LOGI("wolfssl", __VA_ARGS__)
++#elif defined(WOLFSSL_ZEPHYR)
++    #define WOLFSSL_DEBUG_PRINTF(...) printk(__VA_ARGS__)
++#elif defined(WOLFSSL_TELIT_M2MB)
++    #define WOLFSSL_DEBUG_PRINTF(...) M2M_LOG_INFO(__VA_ARGS__)
++#elif defined(WOLFSSL_ANDROID_DEBUG)
++    #define WOLFSSL_DEBUG_PRINTF(...) __android_log_print(ANDROID_LOG_VERBOSE, \
++                                                    "[wolfSSL]", __VA_ARGS__)
++#elif defined(WOLFSSL_XILINX)
++    #define WOLFSSL_DEBUG_PRINTF(...) xil_printf(__VA_ARGS__)
++#elif defined(WOLFSSL_LINUXKM)
++    #define WOLFSSL_DEBUG_PRINTF(...) printk(__VA_ARGS__)
++#elif defined(WOLFSSL_RENESAS_RA6M4)
++    #define WOLFSSL_DEBUG_PRINTF(...) myprintf(__VA_ARGS__)
++#else
++    #define WOLFSSL_DEBUG_PRINTF(...) fprintf(stderr, __VA_ARGS__)
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/meta-networking/recipes-connectivity/wolfssl/files/run-ptest b/meta-networking/recipes-connectivity/wolfssl/files/run-ptest
new file mode 100644
index 0000000000..fd260d441a
--- /dev/null
+++ b/meta-networking/recipes-connectivity/wolfssl/files/run-ptest
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+echo "############ Running Wolfssl Ptest ##########"
+
+log_file=ptest.log
+temp_dir=$(mktemp -d /tmp/wolfss_temp.XXXXXX)
+echo "Wolfssl ptest logs are stored in ${temp_dir}/${log_file}"
+
+./test/unit.test > "$temp_dir/$log_file" 2>&1  
+
+ret=$?
+
+echo "Test script returned: $ret"
+
+MAGIC_SENTENCE=$(grep "unit_test: Success for all configured tests." $temp_dir/$log_file)
+
+if [ -n "$MAGIC_SENTENCE" ]; then
+    echo "$MAGIC_SENTENCE"
+    echo "PASS: Wolfssl"
+else
+    echo "#### Issue with at least one test !####"
+    echo "FAIL: Wolfssl"
+fi
+NUM_FAILS=$(grep -c "Failed" $temp_dir/$log_file)
+
+exit $ret
diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.2.bb b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.2.bb
deleted file mode 100644
index 009434d96a..0000000000
--- a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.2.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "wolfSSL Lightweight Embedded SSL/TLS Library"
-DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \
-               in C and optimized for embedded and RTOS environments. It can \
-               be up to 20 times smaller than OpenSSL while still supporting \
-               a full TLS client and server, up to TLS 1.3"
-HOMEPAGE = "https://www.wolfssl.com/products/wolfssl"
-BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues"
-SECTION = "libs"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-PROVIDES += "cyassl"
-RPROVIDES:${PN} = "cyassl"
-
-SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master"
-SRCREV = "00e42151ca061463ba6a95adb2290f678cbca472"
-
-S = "${WORKDIR}/git"
-
-inherit autotools
-
-PACKAGECONFIG ?= "reproducible-build"
-
-PACKAGECONFIG[reproducible-build] = "--enable-reproducible-build,--disable-reproducible-build,"
-BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.8.0.bb b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.8.0.bb
new file mode 100644
index 0000000000..af591cfd7a
--- /dev/null
+++ b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.8.0.bb
@@ -0,0 +1,49 @@
+SUMMARY = "wolfSSL Lightweight Embedded SSL/TLS Library"
+DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \
+               in C and optimized for embedded and RTOS environments. It can \
+               be up to 20 times smaller than OpenSSL while still supporting \
+               a full TLS client and server, up to TLS 1.3"
+HOMEPAGE = "https://www.wolfssl.com/products/wolfssl"
+BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues"
+SECTION = "libs"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+PROVIDES += "cyassl"
+RPROVIDES:${PN} = "cyassl"
+
+SRC_URI = " \
+    git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master \
+    file://0001-wolfssl-wolfcrypt-logging.h-and-wolfcrypt-src-loggin.patch \
+    file://run-ptest \
+"
+
+SRCREV = "b077c81eb635392e694ccedbab8b644297ec0285"
+
+
+inherit autotools ptest
+
+EXTRA_OECONF += "--enable-certreq --enable-dtls --enable-opensslextra --enable-certext --enable-certgen"
+
+PACKAGECONFIG ?= "reproducible-build"
+
+PACKAGECONFIG[reproducible-build] = "--enable-reproducible-build,--disable-reproducible-build,"
+BBCLASSEXTEND += "native nativesdk"
+
+CFLAGS += '-fPIC -DCERT_REL_PREFIX=\\"./\\"'
+
+RDEPENDS:${PN}-ptest += " bash"
+
+do_install_ptest() {
+    # Prevent QA Error "package contains reference to TMPDIR [buildpaths]" for unit.test script
+    # Replace the occurences of ${B}/src with '${PTEST_PATH}'
+    sed -i 's|${B}/src|${PTEST_PATH}|g' ${B}/tests/unit.test
+
+    install -d ${D}${PTEST_PATH}/test
+
+    # create an empty folder examples, needed in wolfssl's tests/api.c to "Test loading path with no files"
+    install -d ${D}${PTEST_PATH}/examples
+    cp -rf ${B}/tests/. ${D}${PTEST_PATH}/test
+    cp -rf ${S}/certs  ${D}${PTEST_PATH}
+    cp -rf ${S}/tests  ${D}${PTEST_PATH}
+}
diff --git a/meta-networking/recipes-core/images/meta-networking-image-ptest-all.bb b/meta-networking/recipes-core/images/meta-networking-image-ptest-all.bb
index 6d96d4a876..ed58063414 100644
--- a/meta-networking/recipes-core/images/meta-networking-image-ptest-all.bb
+++ b/meta-networking/recipes-core/images/meta-networking-image-ptest-all.bb
@@ -9,7 +9,7 @@ REQUIRED_DISTRO_FEATURES = "ptest"
 require conf/include/ptest-packagelists-meta-networking.inc
 
 # Include the full set of ptests
-PTESTS_META_NETWORKING = "${PTESTS_FAST_META_NETWORKING} ${PTESTS_SLOW_META_NETWORKING} ${PTESTS_PROBLEMS_META_NETWORKING}"
+PTESTS_META_NETWORKING = "${PTESTS_FAST_META_NETWORKING} ${PTESTS_SLOW_META_NETWORKING}"
 
 do_testimage[noexec] = "1"
 do_testimage[depends] = "${@' '.join(['meta-networking-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_NETWORKING').split()])}"
diff --git a/meta-networking/recipes-core/images/meta-networking-image-ptest.bb b/meta-networking/recipes-core/images/meta-networking-image-ptest.bb
index 295da982ec..b6238d6100 100644
--- a/meta-networking/recipes-core/images/meta-networking-image-ptest.bb
+++ b/meta-networking/recipes-core/images/meta-networking-image-ptest.bb
@@ -20,6 +20,7 @@ BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_NETWO
 # box) and explicitly add up to 1500MB.
 IMAGE_OVERHEAD_FACTOR = "1.0"
 IMAGE_ROOTFS_EXTRA_SPACE = "324288"
+IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-wolfssl = "714288" 
 # If a particular ptest needs more space, it can be customized:
 #IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-<pn> = "1024288"
 
diff --git a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb
index 41b7cf0878..eca004302b 100644
--- a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb
+++ b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://git.code.sf.net/p/atftp/code;branch=master;protocol=https \
            file://atftpd.service \
 "
 
-S = "${WORKDIR}/git"
 
 inherit autotools update-rc.d systemd
 
diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb
index 90e7814a0f..ede4491309 100644
--- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb
+++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb
@@ -83,7 +83,7 @@ FILES:${PN}-test = "/opt/${BPN}"
 # needs tcl to run tests
 RDEPENDS:${PN}-test += "tcl ${BPN}"
 
-PPPD_VERSION="${@get_ppp_version(d)}"
+PPPD_VERSION = "${@get_ppp_version(d)}"
 
 def get_ppp_version(d):
     import re
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.10.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.11.bb
index 6a272775f6..db4a4313a4 100644
--- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.10.bb
+++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.11.bb
@@ -12,7 +12,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCREV = "d0f04ae4b9bf0bc0be55fbda5f235afdfbf5dd19"
+SRCREV = "4b3e853ab468a95d8a035efa8fc4298a6c6318a3"
 
 SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \
            file://0001-Makefile-Do-not-set-Werror.patch \
@@ -23,7 +23,6 @@ SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \
            file://iscsi-initiator-targets.service \
            file://set_initiatorname \
            "
-S = "${WORKDIR}/git"
 
 inherit update-rc.d systemd autotools pkgconfig
 
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch
index 1f9f8b30b1..e44e2035c2 100644
--- a/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch
+++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch
@@ -13,12 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  configure.ac | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index fae16f1..677b94a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -904,8 +904,7 @@ if test "$enable_hardening" != no; then
-          "-Wp,-D_FORTIFY_SOURCE=2" \
+@@ -1013,8 +1013,7 @@ if test "$enable_hardening" != no; then
+          "-Wp,-D_FORTIFY_SOURCE=$FORTIFY_SOURCE" \
           "-fexceptions" \
           "-fstack-protector-strong" \
 -         "--param=ssp-buffer-size=4" \
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch b/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch
new file mode 100644
index 0000000000..f6a38668ee
--- /dev/null
+++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch
@@ -0,0 +1,34 @@
+From f129c588f7c8a66e595d8ae96a43d585018e79cd Mon Sep 17 00:00:00 2001
+From: Quentin Armitage <quentin@armitage.org.uk>
+Date: Thu, 7 Nov 2024 11:09:43 +0000
+Subject: [PATCH] vrrp: Don't include <linux/if_ether.h> if not needed
+
+The musl headers do not allow including both <linux/if_ether.h> and
+<net/ethernet.h> since they both define struct ethhdr.
+
+It is likely that we do not need to include <linux/if_ether.h> at all
+since with both glibc and musl including  <net/ethernet.h> is sufficient,
+but removing <linux/if_ether.h> is for another day.
+
+Upstream-Status: Backport [https://github.com/acassen/keepalived/commit/f129c588f7c8a66e595d8ae96a43d585018e79cd]
+Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
+---
+ keepalived/vrrp/vrrp.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
+index 96b2c4c8..4b06e387 100644
+--- a/keepalived/vrrp/vrrp.c
++++ b/keepalived/vrrp/vrrp.c
+@@ -40,8 +40,10 @@
+ #include <netinet/ip6.h>
+ #include <stdint.h>
+ #include <net/if_arp.h>
+-#include <linux/if_ether.h>
+ #include <net/ethernet.h>
++#if !defined ETH_HLEN || !defined ETH_ZLEN
++#include <linux/if_ether.h>            /* This may not be needed at all - try removing and see if any issues raised */
++#endif
+ #ifdef _NETWORK_TIMESTAMP_
+ #include <linux/net_tstamp.h>
+ #endif
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb b/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb
index c4d59d3caa..6fb4886b96 100644
--- a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb
+++ b/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb
@@ -12,18 +12,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \
            file://0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch \
+           file://0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch \
            "
-SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6"
+SRC_URI[sha256sum] = "77f4a22e5a23fa8e49b8916acdfb584c864e72905a2f1de2a7f62ed40a896160"
 UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases"
 
 DEPENDS = "libnfnetlink openssl"
 
 inherit autotools pkgconfig systemd
 
-PACKAGECONFIG ??= "libnl snmp \
+PACKAGECONFIG ??= "libnl snmp reproducible \
     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 "
 PACKAGECONFIG[libnl] = "--enable-libnl,--disable-libnl,libnl"
+PACKAGECONFIG[reproducible] = "--enable-reproducible-build,,"
 PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
 PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--with-init=SYSV,systemd"
 
@@ -44,6 +46,9 @@ do_install:append() {
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -D -m 0644 ${B}/${BPN}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service
     fi
+    if [ -n "${@bb.utils.filter('PACKAGECONFIG', 'reproducible', d)}" ]; then
+        sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${D}${sysconfdir}/keepalived/keepalived.config-opts
+    fi
 }
 
 PACKAGE_BEFORE_PN = "${PN}-samples"
diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.19.bb
index 4deab153c4..f4c030f7ce 100644
--- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb
+++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.19.bb
@@ -12,7 +12,7 @@ SRC_URI = "\
     file://run-ptest \
     "
 
-SRC_URI[sha256sum] = "4b320675d608901a4a0d4feff8f96bb846d4913d914b0cf75b7d0ae80490f2f7"
+SRC_URI[sha256sum] = "f87df3163d5e5138da901d055b384009785d1eb50fdb17a2343910fcf30a997f"
 
 inherit autotools update-rc.d useradd systemd pkgconfig bash-completion github-releases ptest
 
diff --git a/meta-networking/recipes-daemons/ncftp/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch b/meta-networking/recipes-daemons/ncftp/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch
new file mode 100644
index 0000000000..9b8a0c778b
--- /dev/null
+++ b/meta-networking/recipes-daemons/ncftp/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch
@@ -0,0 +1,20 @@
+fix select arg detection
+
+Reference:
+ https://bugs.gentoo.org/921487
+
+Upstream-Status: Inappropriate [unresponsive contact email address]
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/autoconf_local/aclocal.m4
++++ b/autoconf_local/aclocal.m4
+@@ -4196,7 +4196,7 @@ AC_MSG_CHECKING([types of arguments for
+ #include <sys/select.h>
+ #endif
+ #include <sys/socket.h>        /* MG: always incl */
+-extern select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl
++extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl
+         [ac_not_found=no ; break 3],ac_not_found=yes)
+       done
+      done
diff --git a/meta-networking/recipes-daemons/ncftp/ncftp/0002-ncftp-3.2.7-fix-clang.patch b/meta-networking/recipes-daemons/ncftp/ncftp/0002-ncftp-3.2.7-fix-clang.patch
new file mode 100644
index 0000000000..a8de816e62
--- /dev/null
+++ b/meta-networking/recipes-daemons/ncftp/ncftp/0002-ncftp-3.2.7-fix-clang.patch
@@ -0,0 +1,73 @@
+Fix compilation with clang-16
+
+aclocal.m4 contains code that no longer compiles: missing headers and missing
+return types.
+
+Reference:
+ https://gitweb.gentoo.org/repo/gentoo.git/tree/net-ftp/ncftp/files/ncftp-3.2.7-fix-clang.patch
+
+Upstream-Status: Inappropriate [unresponsive contact email address]
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/autoconf_local/aclocal.m4
++++ b/autoconf_local/aclocal.m4
+@@ -3057,6 +3057,7 @@ AC_TRY_LINK([
+ #include <sys/uio.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include <string.h>
+ ],[
+ struct sockaddr_un uaddr;
+ 
+@@ -3285,6 +3286,7 @@ AC_TRY_LINK([
+ #ifdef HAVE_RESOLV_H
+ #      include <resolv.h>
+ #endif
++#include <string.h>
+ ],[
+        /* function-body */
+        int len;
+@@ -3363,6 +3365,7 @@ else
+ #include <stdio.h>
+ #include <stdlib.h>
+                 
++                       int
+                        main(int argc, char **argv)
+                        {
+                                /* Note:  don't actually call readline,
+@@ -5144,6 +5147,7 @@ do
+ #ifdef HAVE_STDLIB_H
+ #      include <stdlib.h>
+ #endif
++#include <string.h>
+ 
+ #ifdef HAVE_NCURSES_H
+ #      define NCURSES_OPAQUE 0
+@@ -5175,6 +5179,7 @@ do
+ #endif
+ 
+  
++int
+ main(int argc, char **argv)
+ {
+        /* Note:  don't actually call curses, since it may block;
+@@ -6509,7 +6514,6 @@ char *malloc();
+ #endif
+ #endif                 /* MG */
+ 
+-int
+ int  main(void)
+ {
+        char *data, *data2, *data3;
+@@ -6606,8 +6610,9 @@ else
+        AC_CACHE_CHECK(whether setvbuf arguments are reversed,
+          ac_cv_func_setvbuf_reversed,
+        [AC_TRY_RUN([#include <stdio.h>
++       $include <stdlib.h>
+        /* If setvbuf has the reversed format, exit 0. */
+-       main () {
++       int main (void) {
+          /* This call has the arguments reversed.
+             A reversed system may check and see that the address of main
+             is not _IOLBF, _IONBF, or _IOFBF, and return nonzero.  */
diff --git a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb
index de111cac05..6b62e135d6 100644
--- a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb
+++ b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb
@@ -9,9 +9,12 @@ SRC_URI = "https://www.ncftp.com/public_ftp/ncftp/${BP}-src.tar.xz \
            file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \
            file://unistd.patch \
            file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \
+           file://0001-ncftp-3.2.7-fix-gcc14.patch \
+           file://0002-ncftp-3.2.7-fix-clang.patch \
            "
 SRC_URI[sha256sum] = "d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8"
 
+# Doesn't use automake
 inherit autotools-brokensep pkgconfig
 
 CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall"
@@ -19,8 +22,8 @@ CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,,"
 
+EXTRA_AUTORECONF += "--exclude=aclocal -I ${S}/autoconf_local"
 EXTRA_OECONF = "--disable-precomp --disable-universal ac_cv_path_TAR=tar"
-ACLOCALEXTRAPATH:append = " -I ${S}/autoconf_local"
 
 do_install () {
     install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
diff --git a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb
index 7f06e0ebf3..e7db8a948b 100644
--- a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb
+++ b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb
@@ -14,7 +14,6 @@ REQUIRED_DISTRO_FEATURES = "systemd gobject-introspection-data"
 SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2"
 SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1"
 
-S = "${WORKDIR}/git"
 
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE:${PN} = "networkd-dispatcher.service"
diff --git a/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb
index ac13d7a196..d1e08cd073 100644
--- a/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb
+++ b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb
@@ -66,6 +66,7 @@ PACKAGECONFIG[sysfs] = "--enable-sysfs,--disable-sysfs,sysfsutils,"
 PACKAGECONFIG[libgcrypt] = "--enable-encryption,--disable-encryption,libgcrypt,"
 PACKAGECONFIG[non32bit] = "--enable-non32bit-int,--disable-non32bit-int,,"
 PACKAGECONFIG[snmp-bc] = "--enable-snmp_bc,--disable-snmp_bc"
+PACKAGECONFIG[ov-rest] = "--enable-ov_rest,--disable-ov_rest,curl rabbitmq-c json-c"
 
 export DISTRO
 
diff --git a/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch
index 8c9c13b1c4..785fe87452 100644
--- a/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch
+++ b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch
@@ -1,4 +1,4 @@
-From 9000ee4d8bb5c5e0bcc588e9bec86eb56f4285e1 Mon Sep 17 00:00:00 2001
+From e4197bc1f431fd7e555a31e6f7f1e020b4ec8f4c Mon Sep 17 00:00:00 2001
 From: Li xin <lixin.fnst@cn.fujitsu.com>
 Date: Fri, 19 Jun 2015 16:45:54 +0900
 Subject: [PATCH] Fix makedefs
@@ -19,10 +19,10 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
  1 file changed, 11 insertions(+), 16 deletions(-)
 
 diff --git a/makedefs b/makedefs
-index 3448c1e..78e0717 100644
+index a740e41..28fb128 100644
 --- a/makedefs
 +++ b/makedefs
-@@ -197,9 +197,6 @@ echo "# pie=$pie"
+@@ -230,9 +230,6 @@ echo "# pie=$pie"
  
  # Defaults for most sane systems
  
@@ -32,7 +32,7 @@ index 3448c1e..78e0717 100644
  ARFL=rv
  
  # Ugly function to make our error message more visible among the
-@@ -492,12 +489,12 @@ case "$SYSTEM.$RELEASE" in
+@@ -563,12 +560,12 @@ case "$SYSTEM.$RELEASE" in
                 case "$CCARGS" in
                  *-DNO_DB*) ;;
                  *-DHAS_DB*) ;;
@@ -48,7 +48,7 @@ index 3448c1e..78e0717 100644
                     else
                         # No, we're not going to try db1 db2 db3 etc.
                         # On a properly installed system, Postfix builds
-@@ -506,12 +503,12 @@ case "$SYSTEM.$RELEASE" in
+@@ -577,12 +574,12 @@ case "$SYSTEM.$RELEASE" in
                         echo "Install the appropriate db*-devel package first." 1>&2
                         exit 1
                     fi
@@ -63,7 +63,7 @@ index 3448c1e..78e0717 100644
                     do
                         test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
                             SYSLIBS="$SYSLIBS -l$name"
-@@ -531,7 +528,7 @@ case "$SYSTEM.$RELEASE" in
+@@ -602,7 +599,7 @@ case "$SYSTEM.$RELEASE" in
                        if [ `expr "X$CCARGS" : "X.*-DNO_EPOLL"` -gt 0 ]
                        then
                            :
@@ -72,7 +72,7 @@ index 3448c1e..78e0717 100644
                        then
                            echo CCARGS="$CCARGS -DNO_EPOLL"
                        else
-@@ -555,8 +552,6 @@ int     main(int argc, char **argv)
+@@ -626,8 +623,6 @@ int     main(int argc, char **argv)
  }
  EOF
                            ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1
@@ -81,7 +81,7 @@ index 3448c1e..78e0717 100644
                            rm -f makedefs.test makedefs.test.[co]
                        fi;;
                 esac
-@@ -572,12 +567,12 @@ EOF
+@@ -644,12 +639,12 @@ EOF
                 case "$CCARGS" in
                  *-DNO_DB*) ;;
                  *-DHAS_DB*) ;;
@@ -97,7 +97,7 @@ index 3448c1e..78e0717 100644
                     else
                         # On a properly installed system, Postfix builds
                         # by including <db.h> and by linking with -ldb
-@@ -585,12 +580,12 @@ EOF
+@@ -657,12 +652,12 @@ EOF
                         echo "Install the appropriate db*-devel package first." 1>&2
                         exit 1
                     fi
@@ -113,5 +113,5 @@ index 3448c1e..78e0717 100644
                         test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
                             SYSLIBS="$SYSLIBS -l$name"
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch
index 28199ccdd2..d46efb95cb 100644
--- a/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch
+++ b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch
@@ -1,4 +1,4 @@
-From cb69ffda0c2cbde6acdc8b01c8d5ff78d81a84fc Mon Sep 17 00:00:00 2001
+From 953719878466c55572294f42e85127bda5d34999 Mon Sep 17 00:00:00 2001
 From: Li xin <lixin.fnst@cn.fujitsu.com>
 Date: Fri, 19 Jun 2015 17:14:58 +0900
 Subject: [PATCH] Change fixed postconf to a variable for cross-compiling
@@ -12,7 +12,7 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
  2 files changed, 11 insertions(+), 9 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 65e7911..40295be 100644
+index a37f89f..17cb64b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -22,7 +22,7 @@ META  = meta/main.cf.proto meta/master.cf.proto meta/postfix-files \
@@ -25,10 +25,10 @@ index 65e7911..40295be 100644
  default: update
  
 diff --git a/postfix-install b/postfix-install
-index e498cd3..8049f43 100644
+index 563ee27..00d4651 100644
 --- a/postfix-install
 +++ b/postfix-install
-@@ -244,8 +244,8 @@ test -z "$non_interactive" -a ! -t 0 && {
+@@ -249,8 +249,8 @@ test -z "$non_interactive" -a ! -t 0 && {
      exit 1
  }
  
@@ -39,7 +39,7 @@ index e498cd3..8049f43 100644
      exit 1
  }
  
-@@ -266,7 +266,7 @@ do
+@@ -271,7 +271,7 @@ do
      case "$junk" in
      *MAIL_VERSION*) 
         case "$mail_version" in
@@ -48,7 +48,7 @@ index e498cd3..8049f43 100644
         esac
         val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1
         case "$val" in
-@@ -454,7 +454,7 @@ template files main.cf.proto and master.cf.proto."
+@@ -459,7 +459,7 @@ template files main.cf.proto and master.cf.proto."
  
  : ${install_root=/}
  : ${tempdir=`pwd`}
@@ -57,16 +57,16 @@ index e498cd3..8049f43 100644
  
  # Find out the location of installed configuration files.
  
-@@ -520,7 +520,7 @@ test -f $CONFIG_DIRECTORY/main.cf && {
+@@ -525,7 +525,7 @@ test -f $CONFIG_DIRECTORY/main.cf && {
         case "$junk" in
         "") eval unset $name;;
         esac
--       eval : \${$name=\`bin/postconf -c $CONFIG_DIRECTORY -hx $name\`} ||
-+       eval : \${$name=\`$POSTCONF -c $CONFIG_DIRECTORY -hx $name\`} ||
+-       eval : \${$name=\`bin/postconf -qc $CONFIG_DIRECTORY -hx $name\`} ||
++       eval : \${$name=\`$POSTCONF -qc $CONFIG_DIRECTORY -hx $name\`} ||
             exit 1
      done
  }
-@@ -533,7 +533,7 @@ do
+@@ -538,7 +538,7 @@ do
      case "$junk" in
      "") eval unset $name;;
      esac
@@ -75,7 +75,7 @@ index e498cd3..8049f43 100644
  done
  
  # Override settings manually.
-@@ -670,6 +670,8 @@ README_DIRECTORY=$install_root$readme_directory
+@@ -675,6 +675,8 @@ README_DIRECTORY=$install_root$readme_directory
  SHLIB_DIRECTORY=$install_root$shlib_directory
  META_DIRECTORY=$install_root$meta_directory
  
@@ -84,7 +84,7 @@ index e498cd3..8049f43 100644
  # Avoid repeated tests for existence of these; default permissions suffice.
  
  test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1
-@@ -841,7 +843,7 @@ IFS="$BACKUP_IFS"
+@@ -846,7 +848,7 @@ IFS="$BACKUP_IFS"
  # the wrong place when Postfix is being upgraded.
  
  case "$mail_version" in
@@ -93,15 +93,15 @@ index e498cd3..8049f43 100644
  esac
  
  # Undo MAIL_VERSION expansion at the end of a parameter value. If
-@@ -861,7 +863,7 @@ do
+@@ -866,7 +868,7 @@ do
      esac
  done
  
--bin/postconf -c $CONFIG_DIRECTORY -e \
-+"$POSTCONF" -c $CONFIG_DIRECTORY -e \
+-bin/postconf -qc $CONFIG_DIRECTORY -e \
++"$POSTCONF" -qc $CONFIG_DIRECTORY -e \
      "daemon_directory = $daemon_directory" \
      "data_directory = $data_directory" \
      "command_directory = $command_directory" \
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch
index 1545f21637..6f8e3e84da 100644
--- a/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch
+++ b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch
@@ -1,22 +1,22 @@
-From 995bddd9563b1aecca2369f2f9c675f88bdc0053 Mon Sep 17 00:00:00 2001
+From a8ec63a71361ccd3f6d2959c4c87b7824282b291 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 26 Aug 2017 10:29:37 -0700
 Subject: [PATCH] makedefs: Use native compiler to build makedefs.test
 
 Its a binary used during build
 
+Upstream-Status: Inappropriate [embedded specific]
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
-Upstream-Status: Pending
-
  makedefs | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/makedefs b/makedefs
-index 78e0717..3299eba 100644
+index 28fb128..313b401 100644
 --- a/makedefs
 +++ b/makedefs
-@@ -551,7 +551,7 @@ int     main(int argc, char **argv)
+@@ -622,7 +622,7 @@ int     main(int argc, char **argv)
      exit(0);
  }
  EOF
@@ -25,7 +25,7 @@ index 78e0717..3299eba 100644
                            rm -f makedefs.test makedefs.test.[co]
                        fi;;
                 esac
-@@ -787,7 +787,7 @@ int     main(int argc, char **argv)
+@@ -865,7 +865,7 @@ int     main(int argc, char **argv)
      exit(0);
  }
  EOF
@@ -34,7 +34,7 @@ index 78e0717..3299eba 100644
                    ./makedefs.test 2>/dev/null ||
                         CCARGS="$CCARGS -DNO_SIGSETJMP"
                    rm -f makedefs.test makedefs.test.[co]
-@@ -823,7 +823,7 @@ int main(int argc, char **argv)
+@@ -903,7 +903,7 @@ int main(int argc, char **argv)
                                   &error) != 14);
  }
  EOF
@@ -43,7 +43,7 @@ index 78e0717..3299eba 100644
                         $icu_ldflags >/dev/null 2>&1
                     if ./makedefs.test 2>/dev/null ; then
                         CCARGS="$CCARGS $icu_cppflags"
-@@ -938,7 +938,7 @@ int     main(void)
+@@ -1024,7 +1024,7 @@ int     main(void)
      exit(ferror(stdout) ? 1 : 0);
  }
  EOF
@@ -52,7 +52,7 @@ index 78e0717..3299eba 100644
      ./makedefs.test || exit 1
      rm -f makedefs.test makedefs.test.[co]
  }
-@@ -1094,7 +1094,7 @@ int     main(void)
+@@ -1180,7 +1180,7 @@ int     main(void)
      exit(ferror(stdout) ? 1 : 0);
  }
  EOF
@@ -62,5 +62,5 @@ index 78e0717..3299eba 100644
         rm -f makedefs.test makedefs.test.[co]
         eval ${parm_name}=\""\$parm_val"\"
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch
index a38e783309..0660ee098e 100644
--- a/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch
+++ b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch
@@ -1,4 +1,4 @@
-From afef4a9391e6bb1a6c3e73d370f240577ed8b0dd Mon Sep 17 00:00:00 2001
+From 404150f53bb49af987d7338a808f47fdbd50ba7f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 16 Jan 2022 11:21:54 +0800
 Subject: [PATCH] Fix icu config
@@ -10,18 +10,18 @@ corrupted in any case its just adding -I/usr/include
 to the CCARGS which we loose nothing if its not
 entertained.
 
+Upstream-Status: Inappropriate [embedded specific]
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
-Upstream-Status: Pending
-
  makedefs | 1 -
  1 file changed, 1 deletion(-)
 
 diff --git a/makedefs b/makedefs
-index 3299eba..2a76f20 100644
+index 313b401..e5db212 100644
 --- a/makedefs
 +++ b/makedefs
-@@ -826,7 +826,6 @@ EOF
+@@ -906,7 +906,6 @@ EOF
                     ${BUILD_CC-gcc} -o makedefs.test makedefs.test.c $icu_cppflags \
                         $icu_ldflags >/dev/null 2>&1
                     if ./makedefs.test 2>/dev/null ; then
@@ -30,5 +30,5 @@ index 3299eba..2a76f20 100644
                     else
                         CCARGS="$CCARGS -DNO_EAI"
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch b/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch
index b425cf8432..1571aa844d 100644
--- a/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch
+++ b/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch
@@ -1,4 +1,4 @@
-From 545d4a79b50caa5698622c0c1905ae154197a16f Mon Sep 17 00:00:00 2001
+From 25e7d1a9bc64f39666eb0e2b9b175773615e28d2 Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Fri, 12 Oct 2018 12:38:02 +0800
 Subject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default
@@ -14,10 +14,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 2 insertions(+), 20 deletions(-)
 
 diff --git a/makedefs b/makedefs
-index 2a76f20..9d5db9f 100644
+index e5db212..b00049b 100644
 --- a/makedefs
 +++ b/makedefs
-@@ -506,16 +506,7 @@ case "$SYSTEM.$RELEASE" in
+@@ -577,16 +577,7 @@ case "$SYSTEM.$RELEASE" in
                     SYSLIBS="$SYSLIBS -ldb"
                     ;;
                 esac
@@ -35,7 +35,7 @@ index 2a76f20..9d5db9f 100644
                 # Kernel 2.4 added IPv6
                 case "$RELEASE" in
                 2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";;
-@@ -583,16 +574,7 @@ EOF
+@@ -655,16 +646,7 @@ EOF
                     SYSLIBS="$SYSLIBS -ldb"
                     ;;
                 esac
@@ -54,5 +54,5 @@ index 2a76f20..9d5db9f 100644
                 : ${SHLIB_SUFFIX=.so}
                 : ${SHLIB_CFLAGS=-fPIC}
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-networking/recipes-daemons/postfix/files/0006-postfix-add-preliminary-setting.patch b/meta-networking/recipes-daemons/postfix/files/0006-postfix-add-preliminary-setting.patch
new file mode 100644
index 0000000000..62b3cf0c05
--- /dev/null
+++ b/meta-networking/recipes-daemons/postfix/files/0006-postfix-add-preliminary-setting.patch
@@ -0,0 +1,31 @@
+From a5863e19d298789328e11057c469636aa8775847 Mon Sep 17 00:00:00 2001
+From: Jinfeng Wang <jinfeng.wang.cn@windriver.com>
+Date: Wed, 2 Jul 2025 10:55:53 +0800
+Subject: [PATCH] postfix: add preliminary setting
+
+post-install call postconf commands to modify main.cf. When multiple
+parameters to postconf, the order of those parameters in main.cf is random.
+Then it will reproduce random results in rootfs file(sample-main.cf). To
+fix this, add preliminary setting in main.cf.
+
+Upstream-Status: Inappropriate [this is the use of post-install,
+upstream is not affected]
+
+Signed-off-by: Jinfeng Wang <jinfeng.wang.cn@windriver.com>
+---
+ conf/main.cf | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/conf/main.cf b/conf/main.cf
+index 1d2c8c2..50398ba 100644
+--- a/conf/main.cf
++++ b/conf/main.cf
+@@ -683,3 +683,5 @@ sample_directory =
+ #
+ readme_directory =
+ inet_protocols = ipv4
++shlib_directory =
++meta_directory =
+-- 
+2.34.1
+
diff --git a/meta-networking/recipes-daemons/postfix/files/main.cf b/meta-networking/recipes-daemons/postfix/files/main.cf
index 22c57485d7..e9f80af15d 100644
--- a/meta-networking/recipes-daemons/postfix/files/main.cf
+++ b/meta-networking/recipes-daemons/postfix/files/main.cf
@@ -1,4 +1,4 @@
-compatibility_level = 3.6
+compatibility_level = 3.10
 smtputf8_enable = no
 
 # Configure your domain and accounts
diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb b/meta-networking/recipes-daemons/postfix/postfix_3.10.1.bb
index d48e9145f8..444bee0668 100644
--- a/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb
+++ b/meta-networking/recipes-daemons/postfix/postfix_3.10.1.bb
@@ -4,7 +4,7 @@ IBM research as an alternative to the widely-used Sendmail program. \
 Postfix attempts to be fast, easy to administer, and secure. The outsidei \
 has a definite Sendmail-ish flavor, but the inside is completely different."
 
-HOMEPAGE= "http://www.postfix.org"
+HOMEPAGE = "http://www.postfix.org"
 SECTION = "mail"
 DEPENDS = "db icu libpcre libnsl2 m4-native openssl postfix-native \
     ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \
@@ -26,13 +26,14 @@ SRC_URI = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P
            file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \
            file://0004-Fix-icu-config.patch \
            file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \
+           file://0006-postfix-add-preliminary-setting.patch \
            "
 
-SRC_URI[sha256sum] = "4b6e17c826cc438cc3016a9c0a55ea7e77c6cbafba7dd57241d81b690b0e9774"
+SRC_URI[sha256sum] = "75868db7a8ed252cd3a14c13a3ce383ddd42563160c02027d061202ee36799bf"
 
-UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.8(\.\d+)+).tar.gz"
+UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.10(\.\d+)+).tar.gz"
 
-S = "${WORKDIR}/postfix-${PV}"
+S = "${UNPACKDIR}/postfix-${PV}"
 
 CLEANBROKEN = "1"
 
@@ -87,6 +88,10 @@ export POSTCONF = "${STAGING_DIR_NATIVE}${sbindir_native}/postconf"
 # ignore the OPTS="CC=$CC" in Makefile it will not use the CC=$CC $CCARGS
 EXTRA_OEMAKE += "OPT= DEBUG= OPTS= "
 
+# use gnu17 for now as recommended in:
+# https://marc.info/?l=postfix-users&m=173542420611213
+CFLAGS += "-std=gnu17"
+
 do_compile () {
     unset CFLAGS CPPFLAGS CXXFLAGS
     local native_build
@@ -135,20 +140,25 @@ do_install () {
     rm -rf ${D}${localstatedir}/spool/postfix
     mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf
     install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/
-    install -d ${D}${sysconfdir}/init.d
     install -m 644 ${UNPACKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf
     sed -i 's#@LIBEXECDIR@#${libexecdir}#' ${D}${sysconfdir}/postfix/main.cf
 
     install -m 755 ${UNPACKDIR}/check_hostname.sh ${D}${sbindir}/
 
-    install -m 755 ${UNPACKDIR}/postfix ${D}${sysconfdir}/init.d/postfix
     install -m 644 ${UNPACKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient
 
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${UNPACKDIR}/postfix.service ${D}${systemd_unitdir}/system
-    sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service
-    sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service
-    sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/init.d
+        install -m 755 ${UNPACKDIR}/postfix ${D}${sysconfdir}/init.d/postfix
+    fi
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${UNPACKDIR}/postfix.service ${D}${systemd_unitdir}/system
+        sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service
+        sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service
+        sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service
+    fi
 
     install -m 0755 ${UNPACKDIR}/aliasesdb ${D}${libexecdir}/postfix
 
diff --git a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
index 8126b3619a..2b01d3a682 100644
--- a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
+++ b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
@@ -30,7 +30,7 @@ diff --git a/Makefile.in b/Makefile.in
 index 9434cbd..13f2e16 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -123,7 +123,6 @@ check: proftpd$(EXEEXT)
+@@ -129,7 +129,6 @@ check: proftpd$(EXEEXT)
  $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8:
         @if [ ! -d $@ ]; then \
                 mkdir -p $@; \
@@ -38,18 +38,18 @@ index 9434cbd..13f2e16 100644
                 chmod 0755 $@; \
         fi
  
-@@ -133,7 +132,6 @@ install-proftpd: proftpd$(EXEEXT) $(DESTDIR)$(includedir) $(DESTDIR)$(localstate
+@@ -139,7 +138,6 @@ install-proftpd: $(DESTDIR)$(includedir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(
                 rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
         fi
-        ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd
+        ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd
 -       -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd
  
  install-libs: $(DESTDIR)$(libdir)/proftpd
         cd lib/ && $(MAKE) install
-@@ -170,11 +168,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
-        $(INSTALL_SBIN) $(top_builddir)/ftpshut  $(DESTDIR)$(sbindir)/ftpshut
-        $(INSTALL_BIN)  $(top_builddir)/ftptop   $(DESTDIR)$(bindir)/ftptop
-        $(INSTALL_BIN)  $(top_builddir)/ftpwho   $(DESTDIR)$(bindir)/ftpwho
+@@ -177,11 +175,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
+        $(INSTALL_SBIN) $(top_builddir)/ftpshut  $(DESTDIR)$(sbindir)/ftpshut
+        $(INSTALL_BIN)  $(top_builddir)/ftptop   $(DESTDIR)$(bindir)/ftptop
+        $(INSTALL_BIN)  $(top_builddir)/ftpwho   $(DESTDIR)$(bindir)/ftpwho
 -       $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs
 +       $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs
  
@@ -64,7 +64,7 @@ diff --git a/configure b/configure
 index 0a51670..69fa130 100755
 --- a/configure
 +++ b/configure
-@@ -25116,7 +25116,7 @@ _ACEOF
+@@ -25683,7 +25683,7 @@ _ACEOF
  
  
  cat >>confdefs.h <<_ACEOF
@@ -73,7 +73,7 @@ index 0a51670..69fa130 100755
  _ACEOF
  
  
-@@ -25126,7 +25126,7 @@ _ACEOF
+@@ -25693,7 +25693,7 @@ _ACEOF
  
  
  cat >>confdefs.h <<_ACEOF
@@ -86,7 +86,7 @@ diff --git a/configure.in b/configure.in
 index 50561de..93cad3f 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -4059,8 +4059,8 @@ locale_dir="`eval echo ${locale_dir}`"
+@@ -4248,8 +4248,8 @@ locale_dir="`eval echo ${locale_dir}`"
  AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory])
  
  AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory])
diff --git a/meta-networking/recipes-daemons/proftpd/files/contrib.patch b/meta-networking/recipes-daemons/proftpd/files/contrib.patch
index 96c237d386..53f7b89556 100644
--- a/meta-networking/recipes-daemons/proftpd/files/contrib.patch
+++ b/meta-networking/recipes-daemons/proftpd/files/contrib.patch
@@ -14,15 +14,15 @@ diff --git a/Makefile.in b/Makefile.in
 index 9434cbd..8da7d1f 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -163,7 +163,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir)
+@@ -170,7 +170,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir)
         test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ && $(MAKE) install)
  
  install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
 -       cd contrib/ && $(MAKE) install-utils
 +       cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils
-        $(INSTALL_BIN)  $(top_builddir)/ftpcount $(DESTDIR)$(bindir)/ftpcount
-        $(INSTALL_BIN)  $(top_builddir)/ftpdctl  $(DESTDIR)$(bindir)/ftpdctl
-        $(INSTALL_SBIN) $(top_builddir)/ftpscrub $(DESTDIR)$(sbindir)/ftpscrub
+        $(INSTALL_BIN)  $(top_builddir)/ftpcount $(DESTDIR)$(bindir)/ftpcount
+        $(INSTALL_BIN)  $(top_builddir)/ftpdctl  $(DESTDIR)$(bindir)/ftpdctl
+        $(INSTALL_SBIN) $(top_builddir)/ftpscrub $(DESTDIR)$(sbindir)/ftpscrub
 diff --git a/contrib/Makefile.in b/contrib/Makefile.in
 index d1a31af..65d2abc 100644
 --- a/contrib/Makefile.in
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb
index 33480bff2c..65dd2f9561 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb
@@ -4,10 +4,10 @@ HOMEPAGE = "http://www.proftpd.org"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
 
-SRCREV = "0a7ea9b0ba9fcdf368374a226370d08f10397d99"
-BRANCH = "1.3.8"
+SRCREV = "ae25959adb05ae1d6ebfa1f36bf778c9c34e9410"
+BRANCH = "${PV}"
 
-SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \
+SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https;tag=v${PV} \
            file://basic.conf.patch \
            file://proftpd-basic.init \
            file://default \
@@ -17,10 +17,15 @@ SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https
            file://proftpd.service \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep useradd update-rc.d systemd multilib_script
 
+# patch releases have character after version
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+\w?))"
+CVE_VERSION_SUFFIX = "alphabetical"
+
+CVE_STATUS[CVE-2001-0027] = "fixed-version: version 1.2.0rc3 removed affected module"
+
 EXTRA_OECONF += "--enable-largefile INSTALL=install"
 
 PACKAGECONFIG ??= "shadow \
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb
index f2c300855c..be0652dfbd 100644
--- a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb
+++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb
@@ -34,7 +34,7 @@ SRC_URI[sha256sum] = "0dbf54dd2c178bd9fe62481d2c37513ee36636d8bf137cfdad96891490
 
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ptpd/files/releases"
 
-S = "${WORKDIR}/ptpd-${PV}"
+S = "${UNPACKDIR}/ptpd-${PV}"
 
 EXTRA_OEMAKE = ""
 
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
index 32d714f6f4..90244cf096 100644
--- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
+++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
@@ -1,4 +1,4 @@
-From 79fd22c0def26eba130db98e312bb00fec32ac0a Mon Sep 17 00:00:00 2001
+From ed60c2ad3a7ed9762fcb6a304c7f60544606baef Mon Sep 17 00:00:00 2001
 From: Tudor Florea <tudor.florea@enea.com>
 Date: Tue, 4 Aug 2015 03:07:01 +0200
 Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is
@@ -10,16 +10,15 @@ Upstream-Status: Inappropriate [config]
 
 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
 Signed-off-by: Tudor Florea <tudor.florea@enea.com>
-
 ---
  configure.ac | 2 --
  1 file changed, 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 695ce68..0f28b55 100644
+index e578b2b..3874124 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -414,8 +414,6 @@ AC_ARG_WITH(minimal,
+@@ -415,8 +415,6 @@ AC_ARG_WITH(minimal,
      AC_DEFINE(NO_FTP_USERS)
      AC_DEFINE(WITHOUT_ASCII)    
      AC_DEFINE(BORING_MODE)
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.52.bb
index 6f03f73db5..c5c9c87c7f 100644
--- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb
+++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.52.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and
 HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd"
 SECTION = "net"
 LICENSE = "0BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=194bc994ad6bbd4ff5a021082fe52156"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5138d4a8a877b32de6a78cf7e9e99c25"
 
 DEPENDS = "libcap virtual/crypt"
 
@@ -11,9 +11,11 @@ SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.t
            file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \
            file://nostrip.patch \
 "
-SRC_URI[sha256sum] = "4160f66b76615eea2397eac4ea3f0a146b7928207b79bc4cc2f99ad7b7bd9513"
+SRC_URI[sha256sum] = "1126f3a95856d08889ff89703cb1aa9ec9924d939d154e96904c920f05dc3c74"
 
 inherit autotools
 
-PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \
-                           ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium"
+EXTRA_AUTORECONF += "-I m4"
+
+PACKAGECONFIG[libsodium] = "ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \
+                            ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium"
diff --git a/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch b/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch
deleted file mode 100644
index 57338d4713..0000000000
--- a/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 15f439c555289f900eb33111b010bf1266f97edb Mon Sep 17 00:00:00 2001
-From: Jonathan Davies <jpds@protonmail.com>
-Date: Thu, 25 Nov 2021 15:29:18 +0000
-Subject: [PATCH] Reverts the include.h change in
- 46883f8a1a02fe42040dd8e48aec0ed871545d4d
-
-Closes: #158
-
-Upstream-Status: Backport [https://github.com/radvd-project/radvd/commit/06689f8c06f44c7e87f7ff1d814428f88375b53f]
-Signed-off-by: Jonathan Davies <jpds@protonmail.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- includes.h | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/includes.h b/includes.h
-index ef30b10..c528c86 100644
---- a/includes.h
-+++ b/includes.h
-@@ -76,12 +76,7 @@
- #include <sys/sysctl.h>
- #endif
- 
--#if !defined(__GLIBC__) && defined(linux)
--#include <linux/if.h>
--#define IF_NAMESIZE IFNAMSIZ
--#else
- #include <net/if.h>
--#endif
- 
- #ifdef HAVE_NET_IF_DL_H
- #include <net/if_dl.h>
diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.init b/meta-networking/recipes-daemons/radvd/files/radvd.init
index 8b26317ee6..8b26317ee6 100755..100644
--- a/meta-networking/recipes-daemons/radvd/files/radvd.init
+++ b/meta-networking/recipes-daemons/radvd/files/radvd.init
diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.service b/meta-networking/recipes-daemons/radvd/files/radvd.service
index e60798a6b3..9230543c48 100644
--- a/meta-networking/recipes-daemons/radvd/files/radvd.service
+++ b/meta-networking/recipes-daemons/radvd/files/radvd.service
@@ -4,8 +4,11 @@ After=network.target
 ConditionPathExists=@SYSCONFDIR@/radvd.conf
 
 [Service]
-EnvironmentFile=-@SYSCONFDIR@/default/radvd
-ExecStart=@SBINDIR@/radvd -n $OPTIONS
+Type=forking
+EnvironmentFile=@SYSCONFDIR@/default/radvd
+ExecStart=@SBINDIR@/radvd $OPTIONS
+PIDFile=/run/radvd.pid
+ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb b/meta-networking/recipes-daemons/radvd/radvd_2.20.bb
index a8a116cbe5..e2d606823b 100644
--- a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb
+++ b/meta-networking/recipes-daemons/radvd/radvd_2.20.bb
@@ -8,7 +8,7 @@ addresses and some other parameters. They also can \
 choose a default router based on these advertisements."
 HOMEPAGE = "http://www.litech.org/radvd/"
 SECTION = "net"
-DEPENDS = "flex-native bison-native libdaemon "
+DEPENDS = "flex-native bison-native libdaemon libbsd"
 
 # License is BSD-Style (with advertising clause) but also has an additional 0th clause
 LICENSE = "radvd"
@@ -20,9 +20,8 @@ SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \
            file://volatiles.03_radvd \
            file://radvd.default \
            file://radvd.conf \
-           file://0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch \
            "
-SRC_URI[sha256sum] = "c36470706fec3a9e6bed394ffea08acaff5dac647848d26b96bb9b9c65d58da0"
+SRC_URI[sha256sum] = "af37c5a81d59f3bdc00d83056606ffa1810d4550beed6caa4f81181246494220"
 
 inherit autotools useradd pkgconfig systemd
 
@@ -30,34 +29,37 @@ SYSTEMD_SERVICE:${PN} = "radvd.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
 do_install:append () {
-    install -m 0755 -d ${D}${sysconfdir}/init.d \
-                       ${D}${sysconfdir}/default/volatiles \
-                       ${D}${docdir}/radvd
-    # Install init script and volatiles
-    install -m 0755 ${UNPACKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd
-    sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd
-    sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd
-    sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd
-    sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd
+    install -m 0755 -d ${D}${sysconfdir}/default
+    install -m 0644 ${UNPACKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf
+    install -m 0644 ${UNPACKDIR}/radvd.default ${D}${sysconfdir}/default/radvd
 
-    install -m 0644 ${UNPACKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+        install -m 0755 -d ${D}${sysconfdir}/init.d \
+            ${D}${sysconfdir}/default/volatiles
 
-    # Install systemd service files
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${UNPACKDIR}/radvd.service ${D}${systemd_unitdir}/system
-    sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \
-           -e 's#@SBINDIR@#${sbindir}#g' \
-           -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service
+        install -m 0755 ${UNPACKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd
+        sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd
+        sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd
+        sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd
+        sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd
 
-    # Install default environment file
-    install -m 0644 ${UNPACKDIR}/radvd.default ${D}${sysconfdir}/default/radvd
+        install -m 0644 ${UNPACKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd
+    fi
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -m 0755 -d ${D}${systemd_unitdir}/system
+
+        install -m 0644 ${UNPACKDIR}/radvd.service ${D}${systemd_unitdir}/system
+        sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \
+            -e 's#@SBINDIR@#${sbindir}#g' \
+            ${D}${systemd_unitdir}/system/radvd.service
+    fi
 
     # Documentation
+    install -m 0755 -d ${D}${docdir}/radvd
     for i in radvd.conf.example README; do \
         install -m 0644 ${S}/$i ${D}${docdir}/radvd; \
     done
-
-    install -m 0644 ${UNPACKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf
 }
 
 USERADD_PACKAGES = "${PN}"
diff --git a/meta-networking/recipes-daemons/squid/files/0001-libltdl-remove-reference-to-nonexisting-directory.patch b/meta-networking/recipes-daemons/squid/files/0001-libltdl-remove-reference-to-nonexisting-directory.patch
new file mode 100644
index 0000000000..9babcfb24d
--- /dev/null
+++ b/meta-networking/recipes-daemons/squid/files/0001-libltdl-remove-reference-to-nonexisting-directory.patch
@@ -0,0 +1,55 @@
+From a6638a007a42917fea4b03e5c30d9b7208c634c4 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Thu, 7 Nov 2024 22:04:40 +0100
+Subject: [PATCH] libltdl: remove reference to nonexisting directory
+
+Commit [1] removed directory libltdl/m4 from release tarball by merging
+all those files into libltdl/aclocal.m4, however makefiles still
+reference it causing following error in do_configure:
+
+| autoreconf: Entering directory 'libltdl'
+| autoreconf: configure.ac: not using Gettext
+| autoreconf: running: aclocal --system-acdir=WORKDIR/recipe-sysroot/usr/share/aclocal/ -I WORKDIR/squid-6.12/acinclude/ -I WORKDIR/recipe-sysroot-native/usr/share/aclocal/ --force -I m4
+| aclocal: error: couldn't open directory 'm4': No such file or directory
+| autoreconf: error: aclocal failed with exit status: 1
+
+Remove these invalid references.
+
+[1] https://github.com/squid-cache/squid/commit/b4addc2262e5bee37543f8d1ab9dd98337bafba3
+
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+Upstream-Status: Inappropriate [upstream ticket https://lists.squid-cache.org/pipermail/squid-users/2024-November/027244.html]
+---
+ libltdl/Makefile.am | 2 +-
+ libltdl/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
+index aad98e2..8a9539b 100644
+--- a/libltdl/Makefile.am
++++ b/libltdl/Makefile.am
+@@ -29,7 +29,7 @@
+ ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #####
+ 
+-ACLOCAL_AMFLAGS = -I m4
++ACLOCAL_AMFLAGS =
+ AUTOMAKE_OPTIONS = foreign
+ AM_CPPFLAGS =
+ AM_LDFLAGS =
+diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in
+index 9929557..c77df2e 100644
+--- a/libltdl/Makefile.in
++++ b/libltdl/Makefile.in
+@@ -448,7 +448,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-ACLOCAL_AMFLAGS = -I m4
++ACLOCAL_AMFLAGS =
+ AUTOMAKE_OPTIONS = foreign
+ 
+ # -I$(srcdir) is needed for user that built libltdl with a sub-Automake
+-- 
+2.30.2
+
diff --git a/meta-networking/recipes-daemons/squid/squid_6.10.bb b/meta-networking/recipes-daemons/squid/squid_6.12.bb
index 984209ad21..87144fb049 100644
--- a/meta-networking/recipes-daemons/squid/squid_6.10.bb
+++ b/meta-networking/recipes-daemons/squid/squid_6.12.bb
@@ -19,13 +19,14 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://run-ptest \
            file://volatiles.03_squid \
            file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \
+           file://0001-libltdl-remove-reference-to-nonexisting-directory.patch \
            file://squid.nm \
            "
 
-SRC_URI[sha256sum] = "0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7"
+SRC_URI[sha256sum] = "f3df3abb2603a513266f24a5d4699a9f0d76b9f554d1848b67f9c51cd3b3cb50"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \
+                    file://errors/COPYRIGHT;md5=6fbb6a2adc362e206da7b4f42846cdec \
                     "
 DEPENDS = "libtool"
 
@@ -47,7 +48,6 @@ PACKAGECONFIG ??= "auth url-rewrite-helpers \
 PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking,"
-PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2"
 PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl"
 PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl"
 PACKAGECONFIG[url-rewrite-helpers] = "--enable-url-rewrite-helpers,--disable-url-rewrite-helpers,"
@@ -66,14 +66,16 @@ BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}"
 EXTRA_OECONF += "--with-default-user=squid \
                  --sysconfdir=${sysconfdir}/${BPN} \
                  --with-logdir=${localstatedir}/log/${BPN} \
-                 'PERL=${USRBINPATH}/env perl'"
+                 'PERL=${USRBINPATH}/env perl' \
+                 --disable-esi \
+"
 
 # Workaround a build failure when using a native compiler that need -std=c++17
 # with a cross-compiler that doesn't.
 # Upstream issue closed as invalid : https://bugs.squid-cache.org/show_bug.cgi?id=5376
 BUILD_CXXFLAGS += "-std=c++17"
 
-export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
+export BUILDCXXFLAGS = "${BUILD_CXXFLAGS}"
 
 TESTDIR = "test-suite"
 
diff --git a/meta-networking/recipes-daemons/vblade/vblade_25.bb b/meta-networking/recipes-daemons/vblade/vblade_25.bb
index 7f20e927c6..f73e72442b 100644
--- a/meta-networking/recipes-daemons/vblade/vblade_25.bb
+++ b/meta-networking/recipes-daemons/vblade/vblade_25.bb
@@ -16,11 +16,10 @@ SRC_URI = "git://github.com/OpenAoE/vblade;branch=master;protocol=https \
            file://volatiles.99_vblade \
           "
 
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://github.com/OpenAoE/vblade/archive/"
 
-inherit autotools-brokensep update-rc.d systemd
+inherit update-rc.d systemd
 
 do_install() {
     install -D -m 0755 ${S}/vblade ${D}/${sbindir}/vblade
diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb
index 4a843bd800..9b2be6236b 100644
--- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb
+++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb
@@ -39,12 +39,12 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}"
 PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}"
 WRAPLIB = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '-lwrap', '', d)}"
-NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}"
+NOPAM_SRC = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}"
 
 inherit update-rc.d useradd systemd
 
 CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf"
-LDFLAGS:append =" -lcrypt -lcap"
+LDFLAGS:append = " -lcrypt -lcap"
 CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
diff --git a/meta-networking/recipes-devtools/libcoap/libcoap/CVE-2024-0962.patch b/meta-networking/recipes-devtools/libcoap/libcoap/CVE-2024-0962.patch
deleted file mode 100644
index add52483b7..0000000000
--- a/meta-networking/recipes-devtools/libcoap/libcoap/CVE-2024-0962.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bf6a303883bde40cf96b960c8574cddd89e71701 Mon Sep 17 00:00:00 2001
-From: Jon Shallow <supjps-libcoap@jpshallow.com>
-Date: Thu, 25 Jan 2024 18:03:17 +0000
-Subject: [PATCH] coap_oscore.c: Fix parsing OSCORE configuration information
-
-A vulnerability was found in obgm libcoap 4.3.4. It has been rated as critical.
-Affected by this issue is the function get_split_entry of the file src/coap_oscore.c of the component Configuration File Handler.
-The manipulation leads to stack-based buffer overflow.
-
-CVE: CVE-2024-0962
-
-Upstream-Status: Backport [https://github.com/obgm/libcoap/pull/1311]
-
-Signed-off-by: alperak <alperyasinak1@gmail.com>
----
- src/coap_oscore.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/coap_oscore.c b/src/coap_oscore.c
-index 83f785c92..e0fb22947 100644
---- a/src/coap_oscore.c
-+++ b/src/coap_oscore.c
-@@ -1678,11 +1678,12 @@ get_split_entry(const char **start,
-                 oscore_value_t *value) {
-   const char *begin = *start;
-   const char *end;
-+  const char *kend;
-   const char *split;
-   size_t i;
-
- retry:
--  end = memchr(begin, '\n', size);
-+  kend = end = memchr(begin, '\n', size);
-   if (end == NULL)
-     return 0;
-
-@@ -1693,7 +1694,7 @@ get_split_entry(const char **start,
-
-   if (begin[0] == '#' || (end - begin) == 0) {
-     /* Skip comment / blank line */
--    size -= end - begin + 1;
-+    size -= kend - begin + 1;
-     begin = *start;
-     goto retry;
-   }
diff --git a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5.bb
index 2f5d192a77..a4e5f5ca46 100644
--- a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb
+++ b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.5.bb
@@ -2,18 +2,16 @@ SUMMARY = "A C implementation of the Constrained Application Protocol"
 DESCRIPTION = "libcoap implements a lightweight application-protocol for \
 devices that are constrained their resources such as computing power, \
 RF range, memory, bandwith, or network packet sizes."
-HOMEPAGE ="https://libcoap.net/"
+HOMEPAGE = "https://libcoap.net/"
 
 LICENSE = "BSD-2-Clause & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1978dbc41673ab1c20e64b287c8317bc"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9aa68c0f6785376aa8ec7f4f1aa6ae3c"
 
 SRC_URI = "git://github.com/obgm/libcoap.git;branch=main;protocol=https \
            file://run-ptest \
-           file://CVE-2024-0962.patch \
            "
-SRCREV = "5fd2f89ef068214130e5d60b7087ef48711fa615"
+SRCREV = "7cf7465b784baded4de183290c547d582becfd28"
 
-S = "${WORKDIR}/git"
 
 inherit autotools manpages pkgconfig ptest
 
@@ -24,13 +22,14 @@ PACKAGECONFIG ?= "\
     ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
 "
 PACKAGECONFIG[async] = "--enable-async,--disable-async"
-PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls,,,openssl mbedtls"
+PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls,,,openssl mbedtls wolfssl"
 PACKAGECONFIG[manpages] = "--enable-documentation --enable-doxygen --enable-manpages,--disable-documentation,asciidoc-native doxygen-native graphviz-native"
-PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls,,,gnutls openssl"
-PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,,,gnutls mbedtls"
+PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls,,,gnutls openssl wolfssl"
+PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,,,gnutls mbedtls wolfssl"
 PACKAGECONFIG[small-stack] = "--enable-small-stack,--disable-small-stack"
 PACKAGECONFIG[tcp] = "--enable-tcp,--disable-tcp"
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,cunit"
+PACKAGECONFIG[wolfssl] = "--with-wolfssl,--without-wolfssl,wolfssl,,,gnutls mbedtls openssl"
 
 EXTRA_OECONF = "\
     --with-epoll --enable-add-default-names \
@@ -43,7 +42,7 @@ python () {
         d.setVar('DISABLE_STATIC', '')
 }
 
-export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog"
+export SGML_CATALOG_FILES = "file://${STAGING_ETCDIR_NATIVE}/xml/catalog"
 
 do_compile:prepend() {
     oe_runmake update-map-file
diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.6.0.bb
index d57cb977e4..fdef5473ef 100644
--- a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb
+++ b/meta-networking/recipes-devtools/python/python3-scapy_2.6.0.bb
@@ -16,15 +16,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 # If you want ptest support, use the git repo
 # UTscapy does not exist in the pypi pkg
 #
-SRCREV = "0474c37bf1d147c969173d52ab3ac76d2404d981"
+SRCREV = "f7a64114b35fd8ee63ce07290f8a2dffd52b215f"
 SRC_URI = "git://github.com/secdev/scapy.git;branch=master;protocol=https \
            file://run-ptest"
 
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-inherit setuptools3 ptest
+inherit python_setuptools_build_meta ptest
 
 do_install:append() {
         mv ${D}${bindir}/scapy ${D}${bindir}/scapy3
diff --git a/meta-networking/recipes-extended/corosync/corosync/CVE-2025-30472.patch b/meta-networking/recipes-extended/corosync/corosync/CVE-2025-30472.patch
new file mode 100644
index 0000000000..9b36dbe3fb
--- /dev/null
+++ b/meta-networking/recipes-extended/corosync/corosync/CVE-2025-30472.patch
@@ -0,0 +1,69 @@
+From 7839990f9cdf34e55435ed90109e82709032466a Mon Sep 17 00:00:00 2001
+From: Jan Friesse <jfriesse@redhat.com>
+Date: Mon, 24 Mar 2025 12:05:08 +0100
+Subject: [PATCH] totemsrp: Check size of orf_token msg
+
+orf_token message is stored into preallocated array on endian convert
+so carefully crafted malicious message can lead to crash of corosync.
+
+Solution is to check message size beforehand.
+
+Signed-off-by: Jan Friesse <jfriesse@redhat.com>
+Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
+
+CVE: CVE-2025-30472
+Upstream-Status: Backport [https://github.com/corosync/corosync/commits/7839990f9cdf34e55435ed90109e82709032466a]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ exec/totemsrp.c | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/exec/totemsrp.c b/exec/totemsrp.c
+index 962d0e2a..364528ce 100644
+--- a/exec/totemsrp.c
++++ b/exec/totemsrp.c
+@@ -3679,12 +3679,20 @@ static int check_orf_token_sanity(
+        const struct totemsrp_instance *instance,
+        const void *msg,
+        size_t msg_len,
++       size_t max_msg_len,
+        int endian_conversion_needed)
+ {
+        int rtr_entries;
+        const struct orf_token *token = (const struct orf_token *)msg;
+        size_t required_len;
+ 
++       if (msg_len > max_msg_len) {
++               log_printf (instance->totemsrp_log_level_security,
++                   "Received orf_token message is too long...  ignoring.");
++
++               return (-1);
++       }
++
+        if (msg_len < sizeof(struct orf_token)) {
+                log_printf (instance->totemsrp_log_level_security,
+                    "Received orf_token message is too short...  ignoring.");
+@@ -3698,6 +3706,13 @@ static int check_orf_token_sanity(
+                rtr_entries = token->rtr_list_entries;
+        }
+ 
++       if (rtr_entries > RETRANSMIT_ENTRIES_MAX) {
++               log_printf (instance->totemsrp_log_level_security,
++                   "Received orf_token message rtr_entries is corrupted...  ignoring.");
++
++               return (-1);
++       }
++
+        required_len = sizeof(struct orf_token) + rtr_entries * sizeof(struct rtr_item);
+        if (msg_len < required_len) {
+                log_printf (instance->totemsrp_log_level_security,
+@@ -3868,7 +3883,8 @@ static int message_handler_orf_token (
+            "Time since last token %0.4f ms", tv_diff / (float)QB_TIME_NS_IN_MSEC);
+ #endif
+ 
+-       if (check_orf_token_sanity(instance, msg, msg_len, endian_conversion_needed) == -1) {
++       if (check_orf_token_sanity(instance, msg, msg_len, sizeof(token_storage),
++           endian_conversion_needed) == -1) {
+                return (0);
+        }
+ 
diff --git a/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb b/meta-networking/recipes-extended/corosync/corosync_3.1.9.bb
index cbbbbc70cd..1699701c9d 100644
--- a/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb
+++ b/meta-networking/recipes-extended/corosync/corosync_3.1.9.bb
@@ -5,16 +5,17 @@ HOMEPAGE = "http://corosync.github.io/corosync/"
 
 SECTION = "base"
 
-inherit autotools pkgconfig systemd
+inherit autotools pkgconfig systemd github-releases
 
-SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
+SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \
            file://corosync.conf \
+           file://CVE-2025-30472.patch \
           "
-SRC_URI[sha256sum] = "ca6ed32b4d7f33ed614afce8760fe58d0de92c68b575d4969ebacd892f3d1e27"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.(?!99)\d+(\.\d+)+)"
+SRC_URI[sha256sum] = "203354bbddee1a97b3c50a076eae89c635f406dd674ccaefc94bb9092acd9535"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d9c2cca5d3448c43e52a399ad611658a"
 
 DEPENDS = "groff-native nss libqb kronosnet"
 
@@ -34,11 +35,6 @@ PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_un
 EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash ap_cv_cc_pie=no"
 EXTRA_OEMAKE = "tmpfilesdir_DATA="
 
-#do_configure:prepend() {
-#    ( cd ${S}
-#    ${S}/autogen.sh )
-#}
-
 do_install:append() {
     install -D -m 0644 ${UNPACKDIR}/corosync.conf ${D}${sysconfdir}/corosync/corosync.conf.example
     install -d ${D}${sysconfdir}/sysconfig/
@@ -59,5 +55,6 @@ do_install:append() {
 
 RDEPENDS:${PN} += "bash ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}"
 
+FILES:${PN} += "${datadir}/dbus-1"
 FILES:${PN}-dbg += "${libexecdir}/lcrso/.debug"
 FILES:${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt"
diff --git a/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb b/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb
index 93d293493c..b7966d7f12 100644
--- a/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb
+++ b/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb
@@ -21,7 +21,7 @@ UPSTREAM_CHECK_REGEX = "dlm-(?P<pver>\d+(\.\d+)+)"
 LICENSE = "LGPL-2.0-or-later & GPL-2.0-only & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d"
 
-S = "${WORKDIR}/dlm-dlm-${PV}"
+S = "${UNPACKDIR}/dlm-dlm-${PV}"
 
 DEPENDS += "corosync"
 
diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb
index cbd5e7a0fd..06b2fa4d2d 100644
--- a/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb
+++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb
@@ -20,7 +20,6 @@ UPSTREAM_CHECK_URI = "https://github.com/kronosnet/kronosnet/releases"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/git"
 
 # libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare]
 # for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
diff --git a/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb b/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb
index e816b79e87..a110d556a3 100644
--- a/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb
+++ b/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb
@@ -17,7 +17,6 @@ SRC_URI += "file://tgtd.init \
             file://tgtd \
 "
 
-S = "${WORKDIR}/git"
 
 CONFFILES:${PN} += "${sysconfdir}/tgt/targets.conf"
 
diff --git a/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.2.bb b/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.2.bb
index 940454c3ac..20ba132fd0 100644
--- a/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.2.bb
+++ b/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.2.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://gpl_license.txt;md5=11c7b65c4a4acb9d5175f7e9bf99c403"
 SRCREV = "c8dfd85b9e8e453e279525f30c1e3184c092f036"
 SRC_URI = "git://github.com/arno-iptables-firewall/aif;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit systemd
 
diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
index 2133600f77..0b39c23deb 100644
--- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
+++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/ebtables-legacy-save
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 EBTABLES="/usr/sbin/ebtables-legacy"
 
@@ -11,7 +11,7 @@ cnt=""
 
 for table_name in $(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//); do
     table=$($EBTABLES -t $table_name -L $cnt)
-    [ $? -eq 0 ] || { echo "$table"; exit -1; }
+    [ $? -eq 0 ] || { echo "$table"; exit 1; }
 
     chain=""
     rules=""
@@ -20,24 +20,23 @@ for table_name in $(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/eb
 
         case "$line" in 
             Bridge\ table:\ *)
-                echo "*${line:14}"
+                echo "*${line#Bridge table: }"
                 ;;
             Bridge\ chain:\ *)
-                chain="${line:14}"
+                chain="${line#Bridge chain: }"
                 chain="${chain%%,*}"
                 policy="${line##*policy: }"
                 echo ":$chain $policy"
                 ;;
             *)
-                if [ "$cnt" = "--Lc" ]; then
-                    line=${line/, pcnt \=/ -c}
-                    line=${line/-- bcnt \=/}
-                fi
-                rules="$rules-A $chain $line\n"
+                [ "$cnt" != "--Lc" ] ||
+                    line=$(echo "$line" | sed -e 's/, pcnt =/-c/' -e 's/ -- bcnt =//')
+                rules="$rules-A $chain $line
+"
                 ;;
         esac
     done <<EOF
 $table
 EOF
-    echo -e $rules
+    echo "$rules"
 done
diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
index 8918936e14..be8c49854e 100644
--- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
+++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb
@@ -6,8 +6,6 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e"
 SECTION = "net"
 
-RDEPENDS:${PN} += "bash"
-
 RRECOMMENDS:${PN} += "kernel-module-ebtables \
     "
 
diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch
deleted file mode 100644
index a02940af3d..0000000000
--- a/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001
-From: Robert Marko <robimarko@gmail.com>
-Date: Thu, 24 Feb 2022 15:01:11 +0100
-Subject: [PATCH] conntrack: fix build with kernel 5.15 and musl
-
-Currently, with kernel 5.15 headers and musl building is failing with
-redefinition errors due to a conflict between the kernel and musl headers.
-
-Musl is able to suppres the conflicting kernel header definitions if they
-are included after the standard libc ones, however since ICMP definitions
-were moved into a separate internal header to avoid duplication this has
-stopped working and is breaking the builds.
-
-It seems that the issue is that <netinet/in.h> which contains the UAPI
-suppression defines is included in the internal.h header and not in the
-proto.h which actually includes the kernel ICMP headers and thus UAPI
-supression defines are not present.
-
-Solve this by moving the <netinet/in.h> include before the ICMP kernel
-includes in the proto.h
-
-Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file")
-Signed-off-by: Robert Marko <robimarko@gmail.com>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-
-Upstream-Status: Backport
-[https://git.netfilter.org/libnetfilter_conntrack/commit/?id=21ee35dde73aec5eba35290587d479218c6dd824]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- include/internal/internal.h | 1 -
- include/internal/proto.h    | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/internal/internal.h b/include/internal/internal.h
-index 2ef8a90..7cd7c44 100644
---- a/include/internal/internal.h
-+++ b/include/internal/internal.h
-@@ -14,7 +14,6 @@
- #include <arpa/inet.h>
- #include <time.h>
- #include <errno.h>
--#include <netinet/in.h>
- 
- #include <libnfnetlink/libnfnetlink.h>
- #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-diff --git a/include/internal/proto.h b/include/internal/proto.h
-index 40e7bfe..60a5f4e 100644
---- a/include/internal/proto.h
-+++ b/include/internal/proto.h
-@@ -2,6 +2,7 @@
- #define _NFCT_PROTO_H_
- 
- #include <stdint.h>
-+#include <netinet/in.h>
- #include <linux/icmp.h>
- #include <linux/icmpv6.h>
- 
--- 
-2.25.1
-
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb
index d92c676fa9..880d962eb3 100644
--- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb
@@ -12,6 +12,6 @@ SRC_URI = "http://ftp.netfilter.org/pub/libnetfilter_acct/libnetfilter_acct-1.0.
 SRC_URI[md5sum] = "814b2972b2f5c740ff87510bc109168b"
 SRC_URI[sha256sum] = "4250ceef3efe2034f4ac05906c3ee427db31b9b0a2df41b2744f4bf79a959a1a"
 
-S = "${WORKDIR}/libnetfilter_acct-${PV}"
+S = "${UNPACKDIR}/libnetfilter_acct-${PV}"
 
 inherit autotools pkgconfig
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.9.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.0.bb
index abec84b256..08d3ab691c 100644
--- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.9.bb
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.0.bb
@@ -6,13 +6,11 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 DEPENDS = "libnfnetlink libmnl"
 
-SRC_URI = "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.bz2 \
-           file://0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch \
+SRC_URI = "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.xz \
           "
 
-SRC_URI[md5sum] = "596c722733cdf30f24d4418f34f999d9"
-SRC_URI[sha256sum] = "67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8"
+SRC_URI[sha256sum] = "67edcb4eb826c2f8dc98af08dabff68f3b3d0fe6fb7d9d0ac1ee7ecce0fe694e"
 
-S = "${WORKDIR}/libnetfilter_conntrack-${PV}"
+S = "${UNPACKDIR}/libnetfilter_conntrack-${PV}"
 
 inherit autotools pkgconfig
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb
index ebb0eb2329..9a0d6cabbd 100644
--- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.1.bb
@@ -12,6 +12,6 @@ SRC_URI = "https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnet
 SRC_URI[md5sum] = "e59279645fe65d40dd7dfc82a797ca5b"
 SRC_URI[sha256sum] = "14073d5487233897355d3ff04ddc1c8d03cc5ba8d2356236aa88161a9f2dc912"
 
-S = "${WORKDIR}/libnetfilter_cthelper-${PV}"
+S = "${UNPACKDIR}/libnetfilter_cthelper-${PV}"
 
 inherit autotools pkgconfig
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.1.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.1.bb
index 5349e6e4b8..46576f4d32 100644
--- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.1.bb
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.1.bb
@@ -11,6 +11,6 @@ SRC_URI = "https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libne
 SRC_URI[md5sum] = "ac64b55952b79cb9910db95ce8883940"
 SRC_URI[sha256sum] = "0b59da2f3204e1c80cb85d1f6d72285fc07b01a2f5678abf5dccfbbefd650325"
 
-S = "${WORKDIR}/libnetfilter_cttimeout-${PV}"
+S = "${UNPACKDIR}/libnetfilter_cttimeout-${PV}"
 
 inherit autotools pkgconfig
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.2.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.2.bb
index 699b096ae8..a6e6b9b153 100644
--- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.2.bb
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.2.bb
@@ -9,6 +9,5 @@ SRCREV = "b0e4be94c0b8f68d4e912402b93a130063c34e17"
 
 SRC_URI = "git://git.netfilter.org/libnetfilter_log;branch=master"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb
index 301dd86cf3..ccaa80f5ff 100644
--- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb
@@ -11,7 +11,6 @@ SRCREV = "2ff321690b8dafeca99ee8e9cafac71e36f292b9"
 SRC_URI = "git://git.netfilter.org/libnetfilter_queue;branch=master \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.7.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.9.bb
index b465209389..abcebceab8 100644
--- a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.7.bb
+++ b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.9.bb
@@ -3,13 +3,12 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26"
 SECTION = "libs"
 
-SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \
+SRC_URI = "git://git.netfilter.org/libnftnl;branch=master;tag=${BP} \
            file://0001-configure.ac-Add-serial-tests.patch \
            file://run-ptest \
            "
-SRCREV = "116e95aa7b6358c917de8c69f6f173874030b46b"
+SRCREV = "17190762f33f78090f5ff99a436c4cb866ac3ccd"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig ptest
 
diff --git a/meta-networking/recipes-filter/nftables/nftables_1.1.0.bb b/meta-networking/recipes-filter/nftables/nftables_1.1.3.bb
index 98e7a85a47..09da57a372 100644
--- a/meta-networking/recipes-filter/nftables/nftables_1.1.0.bb
+++ b/meta-networking/recipes-filter/nftables/nftables_1.1.3.bb
@@ -14,7 +14,7 @@ DEPENDS = "libmnl libnftnl bison-native \
 SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \
            file://run-ptest \
           "
-SRC_URI[sha256sum] = "ef3373294886c5b607ee7be82c56a25bc04e75f802f8e8adcd55aac91eb0aa24"
+SRC_URI[sha256sum] = "9c8a64b59c90b0825e540a9b8fcb9d2d942c636f81ba50199f068fde44f34ed8"
 
 inherit autotools manpages pkgconfig ptest
 
@@ -33,6 +33,9 @@ EXTRA_OECONF = " \
 
 PEP517_SOURCE_PATH = "${S}/py"
 
+# xtables will need it on musl see iptables
+CFLAGS:append:libc-musl = " -D__UAPI_DEF_ETHHDR=0"
+
 inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python_setuptools_build_meta', '', d)}
 
 PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', '${PN}-python', '', d)}"
diff --git a/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb b/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb
index 635fa6a408..febcf5147c 100644
--- a/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb
+++ b/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb
@@ -17,7 +17,6 @@ SRC_URI = "git://git.netfilter.org/ulogd2;branch=master \
 "
 SRCREV = "79aa980f2df9dda0c097e8f883a62f414b9e5138"
 
-S = "${WORKDIR}/git"
 
 inherit autotools manpages pkgconfig systemd update-rc.d
 
diff --git a/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch b/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch
deleted file mode 100644
index 4a33dd7204..0000000000
--- a/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From dc6b11f4cc6035b4701e1d7f7c91b2f45757e7a2 Mon Sep 17 00:00:00 2001
-From: Alejandro Enedino Hernandez Samaniego
- <alejandro@enedino.org>
-Date: Wed, 26 Feb 2020 13:55:16 -0800
-Subject: [PATCH] use pkg-config for gcrypt instead
-
-Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
-
-Upstream-Status: Inappropriate [oe-specific]
-
----
- cmake/FindGCRYPT.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: weechat-2.7.1/cmake/FindGCRYPT.cmake
-===================================================================
---- weechat-2.7.1.orig/cmake/FindGCRYPT.cmake
-+++ weechat-2.7.1/cmake/FindGCRYPT.cmake
-@@ -27,15 +27,15 @@
- #  GCRYPT_LDFLAGS = ldflags to use to compile
- #
- 
--find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config)
-+find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES pkg-config)
- 
- set(GCRYPT_LDFLAGS)
- set(GCRYPT_CFLAGS)
- 
- if(LIBGCRYPT_CONFIG_EXECUTABLE)
- 
--  execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
--  execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
-+  execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
-+  execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
-
-   if(NOT DEFINED ${GCRYPT_CFLAGS})
-     set(GCRYPT_CFLAGS " ")
diff --git a/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb b/meta-networking/recipes-irc/weechat/weechat_4.6.0.bb
index d13764e4c7..da79c59ba5 100644
--- a/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb
+++ b/meta-networking/recipes-irc/weechat/weechat_4.6.0.bb
@@ -4,13 +4,11 @@ SECTION = "net"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 
-DEPENDS = "openssl zlib icu libgcrypt gnutls curl aspell zstd"
+DEPENDS = "zlib libgcrypt gnutls curl aspell zstd cjson gettext-native"
 
-SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz \
-           file://0001-use-pkg-config-for-gcrypt-instead.patch \
-           "
+SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "ae5f4979b5ada0339b84e741d5f7e481ee91e3fecd40a09907b64751829eb6f6"
+SRC_URI[sha256sum] = "2681fc662996fead9d66a26d81740088e4284cf4e6dfe6b834f3b98fc703597f"
 
 inherit cmake pkgconfig
 
diff --git a/meta-networking/recipes-irc/znc/znc_1.8.2.bb b/meta-networking/recipes-irc/znc/znc_1.8.2.bb
index 68dd0702f7..7356115d53 100644
--- a/meta-networking/recipes-irc/znc/znc_1.8.2.bb
+++ b/meta-networking/recipes-irc/znc/znc_1.8.2.bb
@@ -1,21 +1,14 @@
 SUMMARY = "ZNC, an advanced IRC bouncer"
 SECTION = "net"
-LICENSE = "GPL-2.0-only"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 DEPENDS = "openssl zlib icu"
 
-SRC_URI = "git://github.com/znc/znc.git;name=znc;branch=master;protocol=https \
-           git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket;branch=master;protocol=https \
-          "
-SRCREV_znc = "bf253640d33d03331310778e001fb6f5aba2989e"
-SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4"
+SRC_URI = "gitsm://github.com/znc/znc.git;branch=master;protocol=https"
 
-# This constructs a composite revision based on multiple SRCREV's.
-#
-SRCREV_FORMAT = "znc_Csocket"
+SRCREV = "bf253640d33d03331310778e001fb6f5aba2989e"
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep pkgconfig
 
diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb b/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20250521.bb
index 8def54ece6..8fb86bc31e 100644
--- a/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb
+++ b/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20250521.bb
@@ -1,7 +1,7 @@
 require wireguard.inc
 
-SRCREV = "3ba6527130c502144e7388b900138bca6260f4e8"
-SRC_URI = "git://git.zx2c4.com/wireguard-tools;branch=master"
+SRCREV = "e2ecaaa739144997ccff89d6ad6ec81698ea6ced"
+SRC_URI = "git://github.com/WireGuard/wireguard-tools.git;branch=master;protocol=https"
 
 inherit bash-completion systemd pkgconfig
 
diff --git a/meta-networking/recipes-kernel/wireguard/wireguard.inc b/meta-networking/recipes-kernel/wireguard/wireguard.inc
index 6fac24e3bd..9afe009bea 100644
--- a/meta-networking/recipes-kernel/wireguard/wireguard.inc
+++ b/meta-networking/recipes-kernel/wireguard/wireguard.inc
@@ -1,5 +1,5 @@
 SUMMARY = "WireGuard is an extremely simple yet fast and modern VPN"
-DESCRIPTION="WireGuard is a secure network tunnel, operating at layer 3, \
+DESCRIPTION = "WireGuard is a secure network tunnel, operating at layer 3, \
 implemented as a kernel virtual network interface for Linux, which aims to \
 replace both IPsec for most use cases, as well as popular user space and/or \
 TLS-based solutions like OpenVPN, while being more secure, more performant, \
@@ -10,4 +10,4 @@ LICENSE = "GPL-2.0-only"
 
 LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/${BP}/src"
diff --git a/meta-networking/recipes-protocols/babeld/babeld_1.13.1.bb b/meta-networking/recipes-protocols/babeld/babeld_1.13.1.bb
index a799ad197e..cc69f1448a 100644
--- a/meta-networking/recipes-protocols/babeld/babeld_1.13.1.bb
+++ b/meta-networking/recipes-protocols/babeld/babeld_1.13.1.bb
@@ -17,7 +17,6 @@ SRCREV = "3d61ea1e843e2c5f9706c74d1adad4e1d24d44b9"
 
 UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'"
 
diff --git a/meta-networking/recipes-protocols/freediameter/files/0001-fixes-for-gcc-15.patch b/meta-networking/recipes-protocols/freediameter/files/0001-fixes-for-gcc-15.patch
new file mode 100644
index 0000000000..41aeec4ee0
--- /dev/null
+++ b/meta-networking/recipes-protocols/freediameter/files/0001-fixes-for-gcc-15.patch
@@ -0,0 +1,69 @@
+From a54f10082f819dadfa6931166e71edffadb565dd Mon Sep 17 00:00:00 2001
+From: Victor Seva <vseva@debian.org>
+Date: Sun, 23 Feb 2025 13:38:48 +0100
+Subject: [PATCH] fixes for gcc-15
+
+fixes #72
+
+Upstream-Status: Backport [https://github.com/freeDiameter/freeDiameter/commit/a54f10082f819dadfa6931166e71edffadb565dd]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ libfdcore/sctp.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/libfdcore/sctp.c b/libfdcore/sctp.c
+index 95e822e..a4a7f40 100644
+--- a/libfdcore/sctp.c
++++ b/libfdcore/sctp.c
+@@ -532,29 +532,29 @@ static int fd_setsockopt_prebind(int sk)
+        /* SCTP_EXPLICIT_EOR: we assume implicit EOR in freeDiameter, so let's ensure this is known by the stack */
+        #ifdef SCTP_EXPLICIT_EOR
+        {
+-               int bool;
++               int _bool;
+                
+                if (TRACE_BOOL(ANNOYING)) {
+                        sz = sizeof(bool);
+                        /* Read socket defaults */
+-                       CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &bool, &sz)  );
+-                       if (sz != sizeof(bool))
++                       CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &_bool, &sz)  );
++                       if (sz != sizeof(_bool))
+                        {
+-                               TRACE_DEBUG(INFO, "Invalid size of socket option: %d / %d", sz, (socklen_t)sizeof(bool));
++                               TRACE_DEBUG(INFO, "Invalid size of socket option: %d / %d", sz, (socklen_t)sizeof(_bool));
+                                return ENOTSUP;
+                        }
+-                       fd_log_debug( "Def SCTP_EXPLICIT_EOR value : %s", bool ? "true" : "false");
++                       fd_log_debug( "Def SCTP_EXPLICIT_EOR value : %s", _bool ? "true" : "false");
+                }
+ 
+-               bool = 0;
++               _bool = 0;
+                
+                /* Set the option to the socket */
+-               CHECK_SYS(  setsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &bool, sizeof(bool))  );
++               CHECK_SYS(  setsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &_bool, sizeof(_bool))  );
+                
+                if (TRACE_BOOL(ANNOYING)) {
+                        /* Check new values */
+-                       CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &bool, &sz)  );
+-                       fd_log_debug( "New SCTP_EXPLICIT_EOR value : %s", bool ? "true" : "false");
++                       CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &_bool, &sz)  );
++                       fd_log_debug( "New SCTP_EXPLICIT_EOR value : %s", _bool ? "true" : "false");
+                }
+        }
+        #else /* SCTP_EXPLICIT_EOR */
+@@ -619,10 +619,10 @@ static int fd_setsockopt_prebind(int sk)
+        
+        #ifdef SCTP_RECVRCVINFO /* Replaces SCTP_SNDRCV */
+        {
+-               int bool = 1;
++               int _bool = 1;
+                
+                /* Set the option to the socket */
+-               CHECK_SYS(  setsockopt(sk, IPPROTO_SCTP, SCTP_RECVRCVINFO, &bool, sizeof(bool))  );
++               CHECK_SYS(  setsockopt(sk, IPPROTO_SCTP, SCTP_RECVRCVINFO, &_bool, sizeof(_bool))  );
+                
+        }
+        #else /* SCTP_RECVRCVINFO */
diff --git a/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb
index cf50a92afb..89b2572c04 100644
--- a/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb
+++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb
@@ -24,9 +24,9 @@ SRC_URI = "git://github.com/freeDiameter/freeDiameter;protocol=https;branch=mast
     file://install_test.patch \
     file://0001-tests-use-EXTENSIONS_DIR.patch \
     file://0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch \
+    file://0001-fixes-for-gcc-15.patch \
     "
 
-S = "${WORKDIR}/git"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=868c059b6147748b1d621e500feeac4f"
@@ -65,7 +65,7 @@ EXTRA_OECMAKE = " \
 
 # -DALL_EXTENSIONS=ON will enable all
 
-FD_KEY ?="${BPN}.key"
+FD_KEY ?= "${BPN}.key"
 FD_PEM ?= "${BPN}.pem"
 FD_CA ?= "${BPN}.pem"
 FD_DH_PEM ?= "${BPN}-dh.pem"
diff --git a/meta-networking/recipes-protocols/frr/frr_10.1.1.bb b/meta-networking/recipes-protocols/frr/frr_10.3.bb
index 237b52592b..f0f3f34ab3 100644
--- a/meta-networking/recipes-protocols/frr/frr_10.1.1.bb
+++ b/meta-networking/recipes-protocols/frr/frr_10.3.bb
@@ -10,17 +10,16 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a
                     file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c"
 
 
-SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.1 \
+SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.3 \
            file://frr.pam \
            "
 
-SRCREV = "dbf8dac1cea2b1235746e2d966a8ded9cffd5dc3"
+SRCREV = "85cf1ed576deed121751e16a64970f8a652a9e1e"
 
 UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$"
 
 CVE_PRODUCT = "frrouting"
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep python3native pkgconfig useradd systemd
 
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch
deleted file mode 100644
index 68a395d69e..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 1fefe289d0c907392382eb2fa2f1f0ecac02f85d Mon Sep 17 00:00:00 2001
-From: Nate Karstens <nate.karstens@garmin.com>
-Date: Wed, 28 Jun 2017 17:30:00 -0500
-Subject: [PATCH] Create subroutine for cleaning recent interfaces
-
-Moves functionality for cleaning the list of recent
-interfaces into its own subroutine.
-
-Upstream-Status: Submitted [dts@apple.com]
-
-Signed-off-by: Nate Karstens <nate.karstens@garmin.com>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- mDNSPosix/mDNSPosix.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
-index 3b761d04e3c4..5aa220cf694e 100644
---- a/mDNSPosix/mDNSPosix.c
-+++ b/mDNSPosix/mDNSPosix.c
-@@ -1322,6 +1322,19 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, mDNSIPPort port, int interf
-     return err;
- }
- 
-+// Clean up any interfaces that have been hanging around on the RecentInterfaces list for more than a minute
-+mDNSlocal void CleanRecentInterfaces(void)
-+{
-+    PosixNetworkInterface **ri = &gRecentInterfaces;
-+    const mDNSs32 utc = mDNSPlatformUTC();
-+    while (*ri)
-+    {
-+        PosixNetworkInterface *pi = *ri;
-+        if (utc - pi->LastSeen < 60) ri = (PosixNetworkInterface **)&pi->coreIntf.next;
-+        else { *ri = (PosixNetworkInterface *)pi->coreIntf.next; mdns_free(pi); }
-+    }
-+}
-+
- // Creates a PosixNetworkInterface for the interface whose IP address is
- // intfAddr and whose name is intfName and registers it with mDNS core.
- mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask,
-@@ -1559,16 +1572,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m)
- 
-     // Clean up.
-     if (intfList != NULL) freeifaddrs(intfList);
--
--    // Clean up any interfaces that have been hanging around on the RecentInterfaces list for more than a minute
--    PosixNetworkInterface **ri = &gRecentInterfaces;
--    const mDNSs32 utc = mDNSPlatformUTC();
--    while (*ri)
--    {
--        PosixNetworkInterface *pi = *ri;
--        if (utc - pi->LastSeen < 60) ri = (PosixNetworkInterface **)&pi->coreIntf.next;
--        else { *ri = (PosixNetworkInterface *)pi->coreIntf.next; mdns_free(pi); }
--    }
-+    CleanRecentInterfaces();
- 
-     return err;
- }
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch
deleted file mode 100644
index abf82b1e02..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2db1f5bc941e4b4cd1721e361a47cfe288b07a76 Mon Sep 17 00:00:00 2001
-From: Alex Kiernan <alex.kiernan@gmail.com>
-Date: Thu, 1 Feb 2024 14:07:03 +0000
-Subject: [PATCH] Fix SIGSEGV during DumpStateLog()
-
-DumpStateLog() calls LogMsgWithLevelv() with category == NULL, avoid
-crashing in this case.
-
-Upstream-Status: Inactive-Upstream [Upstream does not take patches]
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- mDNSShared/mDNSDebug.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mDNSShared/mDNSDebug.c b/mDNSShared/mDNSDebug.c
-index 7a4ca19eff6d..d449dde320f6 100644
---- a/mDNSShared/mDNSDebug.c
-+++ b/mDNSShared/mDNSDebug.c
-@@ -71,7 +71,7 @@ mDNSlocal void LogMsgWithLevelv(os_log_t category, os_log_type_t level, const ch
- mDNSlocal void LogMsgWithLevelv(const char *category, mDNSLogLevel_t level, const char *format, va_list args)
- {
-     // Do not print the logs if the log category is MDNS_LOG_CATEGORY_DISABLED.
--    if (strcmp(category, MDNS_LOG_CATEGORY_DISABLED) == 0)
-+    if (category && strcmp(category, MDNS_LOG_CATEGORY_DISABLED) == 0)
-     {
-         return;
-     }
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..af33d5444c
--- /dev/null
+++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch
@@ -0,0 +1,34 @@
+From c84f185f29d0839b97177aecb0a78b9717947973 Mon Sep 17 00:00:00 2001
+From: Nguyen Dat Tho <tho3.nguyen@lge.com>
+Date: Wed, 9 Apr 2025 13:05:24 +0900
+Subject: [PATCH] Fix build with gcc-15
+
+To fix error:
+In file included from ../mDNSCore/mDNS.c:76:
+../mDNSShared/CommonServices.h:856:13: error: 'bool' cannot be defined via 'typedef'
+  856 | typedef int bool;
+      |             ^~~~
+../mDNSShared/CommonServices.h:856:13: note: 'bool' is a keyword with '-std=c23' onwards
+../mDNSShared/CommonServices.h:856:1: warning: useless type name in empty declaration
+
+Upstream-Status: Pending (An owner of this repository has limited the ability to open a pull request to users that are collaborators on this repository.)
+
+Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
+---
+ mDNSShared/CommonServices.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/mDNSShared/CommonServices.h b/mDNSShared/CommonServices.h
+index 7efb077f3b04..f0f3a8b3157e 100644
+--- a/mDNSShared/CommonServices.h
++++ b/mDNSShared/CommonServices.h
+@@ -192,6 +192,9 @@ extern "C" {
+ 
+     #include    <stdint.h>
+     #include    <arpa/inet.h>
++#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
++    #include    <stdbool.h>
++#endif
+ 
+ #elif ( TARGET_OS_SOLARIS )
+ 
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch
deleted file mode 100644
index 7ec5996013..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c67102307f25c5f4d238c736e90519e56a76ae79 Mon Sep 17 00:00:00 2001
-From: Stefan Agner <stefan@agner.ch>
-Date: Fri, 23 Jun 2023 10:10:00 +0200
-Subject: [PATCH] Handle interface without `ifa_addr`
-
-It seems that certain interface types may have `ifa_addr` set to null.
-Handle this case gracefully.
-
-Upstream-Status: Submitted [https://github.com/apple-oss-distributions/mDNSResponder/pull/2/commits/11b410d4d683c90e693c40315997bb3e8ec90e9a]
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- mDNSPosix/mDNSPosix.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
-index 0c9dd2582660..c3ead26799e6 100644
---- a/mDNSPosix/mDNSPosix.c
-+++ b/mDNSPosix/mDNSPosix.c
-@@ -1895,6 +1895,7 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context)
-            continue;
- 
-         if ((ifa_loop4 == NULL) &&
-+            ((*ifi)->ifa_addr != NULL) &&
-             ((*ifi)->ifa_addr->sa_family == AF_INET) &&
-             ((*ifi)->ifa_flags & IFF_UP) &&
-             ((*ifi)->ifa_flags & IFF_LOOPBACK))
-@@ -1903,7 +1904,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context)
-             continue;
-         }
- 
--        if (     (((*ifi)->ifa_addr->sa_family == AF_INET)
-+        if (     ((*ifi)->ifa_addr != NULL) &&
-+                 (((*ifi)->ifa_addr->sa_family == AF_INET)
- #if HAVE_IPV6
-                   || ((*ifi)->ifa_addr->sa_family == AF_INET6)
- #endif
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Use-secure_getenv-on-Linux.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Use-secure_getenv-on-Linux.patch
new file mode 100644
index 0000000000..242aa7f7d8
--- /dev/null
+++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Use-secure_getenv-on-Linux.patch
@@ -0,0 +1,30 @@
+From 1bf3be6cd775635aed95689f97a13fa6a037c741 Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <alex.kiernan@gmail.com>
+Date: Tue, 27 May 2025 13:33:30 +0100
+Subject: [PATCH] Use secure_getenv on Linux
+
+Upstream-Status: Inactive-Upstream [Upstream does not take patches]
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+---
+ mDNSShared/dnssd_clientstub.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/mDNSShared/dnssd_clientstub.c b/mDNSShared/dnssd_clientstub.c
+index 6667276ee33a..e7b51813664e 100644
+--- a/mDNSShared/dnssd_clientstub.c
++++ b/mDNSShared/dnssd_clientstub.c
+@@ -801,10 +801,14 @@ static DNSServiceErrorType ConnectToServer(DNSServiceRef *ref, DNSServiceFlags f
+         #endif
+         #ifndef USE_TCP_LOOPBACK
+         char* uds_serverpath = NULL;
++#ifdef TARGET_OS_LINUX
++        uds_serverpath = secure_getenv(MDNS_UDS_SERVERPATH_ENVVAR);
++#else
+         if (!issetugid())
+         {
+             uds_serverpath = getenv(MDNS_UDS_SERVERPATH_ENVVAR);
+         }
++#endif
+         if (uds_serverpath == NULL)
+             uds_serverpath = MDNS_UDS_SERVERPATH;
+         else if (strlen(uds_serverpath) >= MAX_CTLPATH)
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch
index 0dc36ae1d4..651879ea86 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch
@@ -1,4 +1,4 @@
-From a5fe20fa00088683136a09a4da3c36d9b20fe1b9 Mon Sep 17 00:00:00 2001
+From cdbc28c668dd627906f833f9a8e32ac53b0b0139 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 4 Nov 2021 07:31:32 -0700
 Subject: [PATCH] dns-sd: Include missing headers
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch
deleted file mode 100644
index 5ce7eb1015..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d265ac9346d3dcbcf1187134318baafcfa75c054 Mon Sep 17 00:00:00 2001
-From: Nate Karstens <nate.karstens@garmin.com>
-Date: Wed, 28 Jun 2017 17:30:00 -0500
-Subject: [PATCH] Create subroutine for tearing down an interface
-
-Creates a subroutine for tearing down an interface.
-
-Upstream-Status: Submitted [dts@apple.com]
-
-Signed-off-by: Nate Karstens <nate.karstens@garmin.com>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- mDNSPosix/mDNSPosix.c | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
-index 5aa220cf694e..a6041b04a21e 100644
---- a/mDNSPosix/mDNSPosix.c
-+++ b/mDNSPosix/mDNSPosix.c
-@@ -1043,6 +1043,19 @@ mDNSlocal void FreePosixNetworkInterface(PosixNetworkInterface *intf)
-     gRecentInterfaces = intf;
- }
- 
-+mDNSlocal void TearDownInterface(mDNS *const m, PosixNetworkInterface *intf)
-+{
-+    mDNS_DeregisterInterface(m, &intf->coreIntf, NormalActivation);
-+    if (gMDNSPlatformPosixVerboseLevel > 0) fprintf(stderr, "Deregistered interface %s\n", intf->intfName);
-+    FreePosixNetworkInterface(intf);
-+
-+    num_registered_interfaces--;
-+    if (num_registered_interfaces == 0) {
-+        num_pkts_accepted = 0;
-+        num_pkts_rejected = 0;
-+    }
-+}
-+
- // Grab the first interface, deregister it, free it, and repeat until done.
- mDNSlocal void ClearInterfaceList(mDNS *const m)
- {
-@@ -1051,13 +1064,10 @@ mDNSlocal void ClearInterfaceList(mDNS *const m)
-     while (m->HostInterfaces)
-     {
-         PosixNetworkInterface *intf = (PosixNetworkInterface*)(m->HostInterfaces);
--        mDNS_DeregisterInterface(m, &intf->coreIntf, NormalActivation);
--        if (gMDNSPlatformPosixVerboseLevel > 0) fprintf(stderr, "Deregistered interface %s\n", intf->intfName);
--        FreePosixNetworkInterface(intf);
-+        TearDownInterface(m, intf);
-     }
--    num_registered_interfaces = 0;
--    num_pkts_accepted = 0;
--    num_pkts_rejected = 0;
-+
-+    assert(num_registered_interfaces == 0);
- }
- 
- mDNSlocal int SetupIPv6Socket(int fd)
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch
index 86b659f8a1..abe8178f63 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch
@@ -1,4 +1,4 @@
-From dfa9e2c494d1a834f5bdfe4dc24e8329dd8720eb Mon Sep 17 00:00:00 2001
+From dcc1f39a0918cdebf53ac7c105b3d33df960ed14 Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Mon, 5 Dec 2022 15:14:12 +0000
 Subject: [PATCH] make: Set libdns_sd.so soname correctly
@@ -10,7 +10,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile
-index 041706523139..c877c8bb19e6 100755
+index e05ba10b4340..7c510317f1b6 100755
 --- a/mDNSPosix/Makefile
 +++ b/mDNSPosix/Makefile
 @@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
@@ -21,4 +21,4 @@ index 041706523139..c877c8bb19e6 100755
 +       $(LD) $(SOOPTS) $(LINKOPTS) -Wl,-soname,libdns_sd.$(LDSUFFIX).1 -o $@ $+
         $(STRIP) $@
  
- Clients: setup libdns_sd ../Clients/build/dns-sd
+ Clients: setup ../Clients/build/dns-sd
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch b/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch
deleted file mode 100644
index 59871eb66a..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 5f58e5671cd6dbd4cb49bd30fb606d430b626361 Mon Sep 17 00:00:00 2001
-From: Nate Karstens <nate.karstens@garmin.com>
-Date: Wed, 28 Jun 2017 17:30:00 -0500
-Subject: [PATCH] Track interface socket family
-
-Tracks the socket family associated with the interface.
-
-Upstream-Status: Submitted [dts@apple.com]
-
-Signed-off-by: Nate Karstens <nate.karstens@garmin.com>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- mDNSPosix/mDNSPosix.c | 1 +
- mDNSPosix/mDNSPosix.h | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
-index a6041b04a21e..15bbecee04a4 100644
---- a/mDNSPosix/mDNSPosix.c
-+++ b/mDNSPosix/mDNSPosix.c
-@@ -1415,6 +1415,7 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct
-         // Set up the extra fields in PosixNetworkInterface.
-         assert(intf->intfName != NULL);         // intf->intfName already set up above
-         intf->index                = intfIndex;
-+        intf->sa_family            = intfAddr->sa_family;
-         intf->multicastSocket4     = -1;
- #if HAVE_IPV6
-         intf->multicastSocket6     = -1;
-diff --git a/mDNSPosix/mDNSPosix.h b/mDNSPosix/mDNSPosix.h
-index 9675591b0434..dd7864cd0d5e 100644
---- a/mDNSPosix/mDNSPosix.h
-+++ b/mDNSPosix/mDNSPosix.h
-@@ -19,6 +19,7 @@
- #define __mDNSPlatformPosix_h
- 
- #include <signal.h>
-+#include <sys/socket.h>
- #include <sys/time.h>
- 
- #ifdef  __cplusplus
-@@ -40,6 +41,7 @@ struct PosixNetworkInterface
-     char *                  intfName;
-     PosixNetworkInterface * aliasIntf;
-     int index;
-+    sa_family_t sa_family;
-     int multicastSocket4;
- #if HAVE_IPV6
-     int multicastSocket6;
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch
deleted file mode 100644
index bf2b85c2ab..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 935033dd40772240c9bcc6b9610d78eb3753bfaf Mon Sep 17 00:00:00 2001
-From: Nate Karstens <nate.karstens@garmin.com>
-Date: Tue, 1 Aug 2017 17:06:01 -0500
-Subject: [PATCH] Indicate loopback interface to mDNS core
-
-Tells the mDNS core if an interface is a loopback interface,
-similar to AddInterfaceToList() in the MacOS implementation.
-
-Upstream-Status: Submitted [dts@apple.com]
-
-Signed-off-by: Nate Karstens <nate.karstens@garmin.com>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- mDNSPosix/mDNSPosix.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
-index 15bbecee04a4..f4c31a07d587 100644
---- a/mDNSPosix/mDNSPosix.c
-+++ b/mDNSPosix/mDNSPosix.c
-@@ -1348,7 +1348,7 @@ mDNSlocal void CleanRecentInterfaces(void)
- // Creates a PosixNetworkInterface for the interface whose IP address is
- // intfAddr and whose name is intfName and registers it with mDNS core.
- mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask,
--    const mDNSu8 *intfHaddr, mDNSu16 intfHlen, const char *intfName, int intfIndex)
-+    const mDNSu8 *intfHaddr, mDNSu16 intfHlen, const char *intfName, int intfIndex, int intfFlags)
- {
-     int err = 0;
-     PosixNetworkInterface *intf;
-@@ -1411,6 +1411,7 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct
- 
-         intf->coreIntf.Advertise = m->AdvertiseLocalAddresses;
-         intf->coreIntf.McastTxRx = mDNStrue;
-+        intf->coreIntf.Loopback = ((intfFlags & IFF_LOOPBACK) != 0) ? mDNStrue : mDNSfalse;
- 
-         // Set up the extra fields in PosixNetworkInterface.
-         assert(intf->intfName != NULL);         // intf->intfName already set up above
-@@ -1561,7 +1562,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m)
-                     }
- #endif
-                     if (SetupOneInterface(m, i->ifa_addr, i->ifa_netmask,
--                                          hwaddr, hwaddr_len, i->ifa_name, ifIndex) == 0)
-+                                          hwaddr, hwaddr_len, i->ifa_name, ifIndex, i->ifa_flags) == 0)
-                     {
-                         if (i->ifa_addr->sa_family == AF_INET)
-                             foundav4 = mDNStrue;
-@@ -1578,7 +1579,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m)
-         // if ((m->HostInterfaces == NULL) && (firstLoopback != NULL))
-         if (!foundav4 && firstLoopback)
-             (void) SetupOneInterface(m, firstLoopback->ifa_addr, firstLoopback->ifa_netmask,
--                NULL, 0, firstLoopback->ifa_name, firstLoopbackIndex);
-+                NULL, 0, firstLoopback->ifa_name, firstLoopbackIndex, firstLoopback->ifa_flags);
-     }
- 
-     // Clean up.
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch
index 8d1915de8c..af27a89f4c 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch
@@ -1,4 +1,4 @@
-From f871ac42165c29f763785aa0199dfc76f1731f4d Mon Sep 17 00:00:00 2001
+From f7ee12c1f8e85b9d2fe4023b6539c8051dc710c3 Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Mon, 5 Dec 2022 15:14:26 +0000
 Subject: [PATCH] make: Separate TLS targets from libraries
@@ -13,7 +13,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile
-index c877c8bb19e6..3a5897c4dbee 100755
+index 7c510317f1b6..8dd5984020ee 100755
 --- a/mDNSPosix/Makefile
 +++ b/mDNSPosix/Makefile
 @@ -112,9 +112,11 @@ ifeq ($(findstring linux,$(os)),linux)
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch
deleted file mode 100644
index ebdfe8c783..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From 47118760466b74939cec9f5233062236a12bb3f4 Mon Sep 17 00:00:00 2001
-From: Nate Karstens <nate.karstens@garmin.com>
-Date: Thu, 13 Jul 2017 09:00:00 -0500
-Subject: [PATCH] Use list for changed interfaces
-
-Uses a linked list to store the index of changed network interfaces
-instead of a bitfield. This allows for network interfaces with an
-index greater than 31 (an index of 36 was seen on Android).
-
-Upstream-Status: Submitted [dts@apple.com]
-
-Signed-off-by: Nate Karstens <nate.karstens@garmin.com>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- mDNSPosix/mDNSPosix.c | 58 ++++++++++++++++++++++++++++++++-----------
- 1 file changed, 43 insertions(+), 15 deletions(-)
-
-diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
-index f4c31a07d587..6b2fe76d4b66 100644
---- a/mDNSPosix/mDNSPosix.c
-+++ b/mDNSPosix/mDNSPosix.c
-@@ -74,6 +74,14 @@ struct IfChangeRec
- };
- typedef struct IfChangeRec IfChangeRec;
- 
-+// Used to build a list of network interface indices
-+struct NetworkInterfaceIndex
-+{
-+    int if_index;
-+    struct NetworkInterfaceIndex *Next;
-+};
-+typedef struct NetworkInterfaceIndex NetworkInterfaceIndex;
-+
- // Note that static data is initialized to zero in (modern) C.
- static PosixEventSource *gEventSources;             // linked list of PosixEventSource's
- static sigset_t gEventSignalSet;                // Signals which event loop listens for
-@@ -1621,6 +1629,23 @@ mDNSlocal mStatus OpenIfNotifySocket(int *pFD)
-     return err;
- }
- 
-+mDNSlocal void AddInterfaceIndexToList(GenLinkedList *list, int if_index)
-+{
-+    NetworkInterfaceIndex *item;
-+
-+    for (item = (NetworkInterfaceIndex*)list->Head; item != NULL; item = item->Next)
-+    {
-+        if (if_index == item->if_index) return;
-+    }
-+
-+    item = mdns_malloc(sizeof *item);
-+    if (item == NULL) return;
-+
-+    item->if_index = if_index;
-+    item->Next = NULL;
-+    AddToTail(list, item);
-+}
-+
- #if MDNS_DEBUGMSGS
- mDNSlocal void      PrintNetLinkMsg(const struct nlmsghdr *pNLMsg)
- {
-@@ -1648,14 +1673,13 @@ mDNSlocal void      PrintNetLinkMsg(const struct nlmsghdr *pNLMsg)
- }
- #endif
- 
--mDNSlocal mDNSu32       ProcessRoutingNotification(int sd)
-+mDNSlocal void          ProcessRoutingNotification(int sd, GenLinkedList *changedInterfaces)
- // Read through the messages on sd and if any indicate that any interface records should
- // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0.
- {
-     ssize_t readCount;
-     char buff[4096];
-     struct nlmsghdr         *pNLMsg = (struct nlmsghdr*) buff;
--    mDNSu32 result = 0;
- 
-     // The structure here is more complex than it really ought to be because,
-     // unfortunately, there's no good way to size a buffer in advance large
-@@ -1691,9 +1715,9 @@ mDNSlocal mDNSu32       ProcessRoutingNotification(int sd)
- 
-         // Process the NetLink message
-         if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK)
--            result |= 1 << ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index;
-+            AddInterfaceIndexToList(changedInterfaces, ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index);
-         else if (pNLMsg->nlmsg_type == RTM_DELADDR || pNLMsg->nlmsg_type == RTM_NEWADDR)
--            result |= 1 << ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index;
-+            AddInterfaceIndexToList(changedInterfaces, ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index);
- 
-         // Advance pNLMsg to the next message in the buffer
-         if ((pNLMsg->nlmsg_flags & NLM_F_MULTI) != 0 && pNLMsg->nlmsg_type != NLMSG_DONE)
-@@ -1704,8 +1728,6 @@ mDNSlocal mDNSu32       ProcessRoutingNotification(int sd)
-         else
-             break;  // all done!
-     }
--
--    return result;
- }
- 
- #else // USES_NETLINK
-@@ -1737,14 +1759,13 @@ mDNSlocal void      PrintRoutingSocketMsg(const struct ifa_msghdr *pRSMsg)
- }
- #endif
- 
--mDNSlocal mDNSu32       ProcessRoutingNotification(int sd)
-+mDNSlocal void          ProcessRoutingNotification(int sd, GenLinkedList *changedInterfaces)
- // Read through the messages on sd and if any indicate that any interface records should
- // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0.
- {
-     ssize_t readCount;
-     char buff[4096];
-     struct ifa_msghdr       *pRSMsg = (struct ifa_msghdr*) buff;
--    mDNSu32 result = 0;
- 
-     readCount = read(sd, buff, sizeof buff);
-     if (readCount < (ssize_t) sizeof(struct ifa_msghdr))
-@@ -1759,12 +1780,10 @@ mDNSlocal mDNSu32       ProcessRoutingNotification(int sd)
-         pRSMsg->ifam_type == RTM_IFINFO)
-     {
-         if (pRSMsg->ifam_type == RTM_IFINFO)
--            result |= 1 << ((struct if_msghdr*) pRSMsg)->ifm_index;
-+            AddInterfaceIndexToList(changedInterfaces, ((struct if_msghdr*) pRSMsg)->ifm_index);
-         else
--            result |= 1 << pRSMsg->ifam_index;
-+            AddInterfaceIndexToList(changedInterfaces, pRSMsg->ifam_index);
-     }
--
--    return result;
- }
- 
- #endif // USES_NETLINK
-@@ -1774,7 +1793,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context)
- {
-     IfChangeRec     *pChgRec = (IfChangeRec*) context;
-     fd_set readFDs;
--    mDNSu32 changedInterfaces = 0;
-+    GenLinkedList changedInterfaces;
-+    NetworkInterfaceIndex *changedInterface;
-     struct timeval zeroTimeout = { 0, 0 };
- 
-     (void)fd; // Unused
-@@ -1782,17 +1802,25 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context)
-     FD_ZERO(&readFDs);
-     FD_SET(pChgRec->NotifySD, &readFDs);
- 
-+    InitLinkedList(&changedInterfaces, offsetof(NetworkInterfaceIndex, Next));
-+
-     do
-     {
--        changedInterfaces |= ProcessRoutingNotification(pChgRec->NotifySD);
-+        ProcessRoutingNotification(pChgRec->NotifySD, &changedInterfaces);
-     }
-     while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout));
- 
-     // Currently we rebuild the entire interface list whenever any interface change is
-     // detected. If this ever proves to be a performance issue in a multi-homed
-     // configuration, more care should be paid to changedInterfaces.
--    if (changedInterfaces)
-+    if (changedInterfaces.Head != NULL)
-         mDNSPlatformPosixRefreshInterfaceList(pChgRec->mDNS);
-+
-+    while ((changedInterface = (NetworkInterfaceIndex*)changedInterfaces.Head) != NULL)
-+    {
-+        RemoveFromList(&changedInterfaces, changedInterface);
-+        mdns_free(changedInterface);
-+    }
- }
- 
- // Register with either a Routing Socket or RtNetLink to listen for interface changes.
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch
index 3c46d599c1..7d8f04c902 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch
@@ -1,4 +1,4 @@
-From 0b3953dfdeef8dc9b8a23820659feee9e15b5bad Mon Sep 17 00:00:00 2001
+From e79f75487e32f87677519ec40c021b1623395bde Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Mon, 5 Dec 2022 22:49:49 +0000
 Subject: [PATCH] mDNSCore: Fix broken debug parameter
@@ -10,10 +10,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c
-index d4519a7f62aa..3090edb2ac5d 100644
+index ad9eaa37a82a..fc51e1ad9bd4 100644
 --- a/mDNSCore/mDNS.c
 +++ b/mDNSCore/mDNS.c
-@@ -10253,7 +10253,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage *
+@@ -11046,7 +11046,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage *
  #else
                              const DNSServRef dnsserv = qptr->qDNSServer;
  #endif
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch
deleted file mode 100644
index be63471e64..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From 105514b75df6d7abd052ec64d8106f5c07cc4782 Mon Sep 17 00:00:00 2001
-From: Nate Karstens <nate.karstens@garmin.com>
-Date: Mon, 24 Jul 2017 09:38:55 -0500
-Subject: [PATCH] Handle noisy netlink sockets
-
-The POSIX implementation currently clears all network interfaces
-when netlink indicates that there has been a change. This causes
-the following problems:
-
-  1) Applications are informed that all of the services they are
-     tracking have been removed.
-  2) Increases network load because the client must re-query for
-     all records it is interested in.
-
-This changes netlink notification handling by:
-
-  1) Always comparing with the latest interface list returned
-     by the OS.
-  2) Confirming that the interface has been changed in a way
-     that we care about.
-
-Upstream-Status: Submitted [dts@apple.com]
-
-Signed-off-by: Nate Karstens <nate.karstens@garmin.com>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- mDNSPosix/mDNSPosix.c | 182 +++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 172 insertions(+), 10 deletions(-)
-
-diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
-index 6b2fe76d4b66..ecd5741d038d 100644
---- a/mDNSPosix/mDNSPosix.c
-+++ b/mDNSPosix/mDNSPosix.c
-@@ -1788,14 +1788,43 @@ mDNSlocal void          ProcessRoutingNotification(int sd, GenLinkedList *change
- 
- #endif // USES_NETLINK
- 
-+// Test whether the given PosixNetworkInterface matches the given struct ifaddrs
-+mDNSlocal mDNSBool InterfacesMatch(PosixNetworkInterface *intf, struct ifaddrs *ifi)
-+{
-+    mDNSBool match = mDNSfalse;
-+    mDNSAddr ip, mask;
-+    unsigned int if_index;
-+
-+    if_index = if_nametoindex(ifi->ifa_name);
-+    if (if_index == 0)
-+        return mDNSfalse;
-+
-+    if((intf->index == if_index) &&
-+       (intf->sa_family == ifi->ifa_addr->sa_family) &&
-+       (strcmp(intf->coreIntf.ifname, ifi->ifa_name) == 0))
-+        {
-+        SockAddrTomDNSAddr(ifi->ifa_addr,    &ip,   NULL);
-+        SockAddrTomDNSAddr(ifi->ifa_netmask, &mask, NULL);
-+
-+        match = mDNSSameAddress(&intf->coreIntf.ip, &ip) &&
-+                mDNSSameAddress(&intf->coreIntf.mask, &mask);
-+        }
-+
-+    return match;
-+}
-+
- // Called when data appears on interface change notification socket
- mDNSlocal void InterfaceChangeCallback(int fd, void *context)
- {
-     IfChangeRec     *pChgRec = (IfChangeRec*) context;
-+    mDNS            *m = pChgRec->mDNS;
-     fd_set readFDs;
-     GenLinkedList changedInterfaces;
-     NetworkInterfaceIndex *changedInterface;
-     struct timeval zeroTimeout = { 0, 0 };
-+    struct ifaddrs *ifa_list, **ifi, *ifa_loop4 = NULL;
-+    PosixNetworkInterface *intf, *intfNext;
-+    mDNSBool found, foundav4;
- 
-     (void)fd; // Unused
- 
-@@ -1810,12 +1839,149 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context)
-     }
-     while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout));
- 
--    // Currently we rebuild the entire interface list whenever any interface change is
--    // detected. If this ever proves to be a performance issue in a multi-homed
--    // configuration, more care should be paid to changedInterfaces.
--    if (changedInterfaces.Head != NULL)
--        mDNSPlatformPosixRefreshInterfaceList(pChgRec->mDNS);
-+    CleanRecentInterfaces();
-+
-+    if (changedInterfaces.Head == NULL) goto cleanup;
-+
-+    if (getifaddrs(&ifa_list) < 0) goto cleanup;
-+
-+    for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = intfNext)
-+    {
-+        intfNext = (PosixNetworkInterface*)(intf->coreIntf.next);
-+
-+        // Loopback interface(s) are handled later
-+        if (intf->coreIntf.Loopback) continue;
-+
-+        found = mDNSfalse;
-+        for (ifi = &ifa_list; *ifi != NULL; ifi = &(*ifi)->ifa_next)
-+        {
-+            if (InterfacesMatch(intf, *ifi))
-+            {
-+                found = mDNStrue;
-+                break;
-+            }
-+        }
-+
-+        // Removes changed and old interfaces from m->HostInterfaces
-+        if (!found) TearDownInterface(m, intf);
-+    }
-+
-+    // Add new and changed interfaces in ifa_list
-+    // Save off loopback interface in case it is needed later
-+    for (ifi = &ifa_list; *ifi != NULL; ifi = &(*ifi)->ifa_next)
-+    {
-+        found = mDNSfalse;
-+        for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = intfNext)
-+        {
-+            intfNext = (PosixNetworkInterface*)(intf->coreIntf.next);
-+
-+            // Loopback interface(s) are handled later
-+            if (intf->coreIntf.Loopback) continue;
-+
-+            if (InterfacesMatch(intf, *ifi))
-+            {
-+                found = mDNStrue;
-+                break;
-+            }
-+
-+            // Removes changed and old interfaces from m->HostInterfaces
-+        }
-+        if (found)
-+           continue;
-+
-+        if ((ifa_loop4 == NULL) &&
-+            ((*ifi)->ifa_addr->sa_family == AF_INET) &&
-+            ((*ifi)->ifa_flags & IFF_UP) &&
-+            ((*ifi)->ifa_flags & IFF_LOOPBACK))
-+        {
-+            ifa_loop4 = *ifi;
-+            continue;
-+        }
-+
-+        if (     (((*ifi)->ifa_addr->sa_family == AF_INET)
-+#if HAVE_IPV6
-+                  || ((*ifi)->ifa_addr->sa_family == AF_INET6)
-+#endif
-+                  ) && ((*ifi)->ifa_flags & IFF_UP)
-+                    && !((*ifi)->ifa_flags & IFF_POINTOPOINT)
-+                    && !((*ifi)->ifa_flags & IFF_LOOPBACK))
-+        {
-+            struct ifaddrs *i = *ifi;
-+
-+#define ethernet_addr_len 6
-+            uint8_t hwaddr[ethernet_addr_len];
-+            int hwaddr_len = 0;
-+
-+#if defined(TARGET_OS_LINUX) && TARGET_OS_LINUX
-+            struct ifreq ifr;
-+            int sockfd = socket(AF_INET6, SOCK_DGRAM, 0);
-+            if (sockfd >= 0)
-+            {
-+                /* Add hardware address */
-+                memcpy(ifr.ifr_name, i->ifa_name, IFNAMSIZ);
-+                if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) != -1)
-+                {
-+                    if (ifr.ifr_hwaddr.sa_family == ARPHRD_ETHER)
-+                    {
-+                        memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, ethernet_addr_len);
-+                        hwaddr_len = ethernet_addr_len;
-+                    }
-+                }
-+                close(sockfd);
-+            }
-+            else
-+            {
-+                memset(hwaddr, 0, sizeof(hwaddr));
-+            }
-+#endif // TARGET_OS_LINUX
-+            SetupOneInterface(m, i->ifa_addr, i->ifa_netmask,
-+                              hwaddr, hwaddr_len, i->ifa_name, if_nametoindex(i->ifa_name), i->ifa_flags);
-+        }
-+    }
-+
-+    // Determine if there is at least one non-loopback IPv4 interface. This is to work around issues
-+    // with multicast loopback on IPv6 interfaces -- see corresponding logic in SetupInterfaceList().
-+    foundav4 = mDNSfalse;
-+    for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = (PosixNetworkInterface*)(intf->coreIntf.next))
-+    {
-+        if (intf->sa_family == AF_INET && !intf->coreIntf.Loopback)
-+        {
-+            foundav4 = mDNStrue;
-+            break;
-+        }
-+    }
-+
-+    if (foundav4)
-+    {
-+        for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = intfNext)
-+        {
-+            intfNext = (PosixNetworkInterface*)(intf->coreIntf.next);
-+            if (intf->coreIntf.Loopback) TearDownInterface(m, intf);
-+        }
-+    }
-+    else
-+    {
-+        found = mDNSfalse;
-+
-+        for (intf = (PosixNetworkInterface*)(m->HostInterfaces); intf != NULL; intf = (PosixNetworkInterface*)(intf->coreIntf.next))
-+        {
-+            if (intf->coreIntf.Loopback)
-+            {
-+                found = mDNStrue;
-+                break;
-+            }
-+        }
-+
-+        if (!found && (ifa_loop4 != NULL))
-+        {
-+            SetupOneInterface(m, ifa_loop4->ifa_addr, ifa_loop4->ifa_netmask,
-+                              NULL, 0, ifa_loop4->ifa_name, if_nametoindex(ifa_loop4->ifa_name), ifa_loop4->ifa_flags);
-+        }
-+    }
-+
-+    if (ifa_list != NULL) freeifaddrs(ifa_list);
- 
-+cleanup:
-     while ((changedInterface = (NetworkInterfaceIndex*)changedInterfaces.Head) != NULL)
-     {
-         RemoveFromList(&changedInterfaces, changedInterface);
-@@ -1947,15 +2113,11 @@ mDNSexport void mDNSPlatformClose(mDNS *const m)
- #endif
- }
- 
--// This is used internally by InterfaceChangeCallback.
--// It's also exported so that the Standalone Responder (mDNSResponderPosix)
-+// This is exported so that the Standalone Responder (mDNSResponderPosix)
- // can call it in response to a SIGHUP (mainly for debugging purposes).
- mDNSexport mStatus mDNSPlatformPosixRefreshInterfaceList(mDNS *const m)
- {
-     int err;
--    // This is a pretty heavyweight way to process interface changes --
--    // destroying the entire interface list and then making fresh one from scratch.
--    // We should make it like the OS X version, which leaves unchanged interfaces alone.
-     ClearInterfaceList(m);
-     err = SetupInterfaceList(m);
-     return PosixErrorToStatus(err);
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch
index ffa3fa3827..5f8f428302 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch
@@ -1,4 +1,4 @@
-From 626ccae85aab5b0902a8e3c05d9f0e3fbbe4fcd2 Mon Sep 17 00:00:00 2001
+From a1c982808ebfb71ba7e0f16040013b7127a6e2ab Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Tue, 6 Dec 2022 13:28:31 +0000
 Subject: [PATCH] make: Add top-level Makefile
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch b/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch
deleted file mode 100644
index 276f879df2..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3715b3f4a0ba2d2cb05e5ba617b523c759c88d4b Mon Sep 17 00:00:00 2001
-From: Nate Karstens <nate.karstens@garmin.com>
-Date: Wed, 9 Aug 2017 09:16:58 -0500
-Subject: [PATCH] Mark deleted interfaces as being changed
-
-Netlink notification handling ignores messages for deleted links,
-RTM_DELLINK. It does handle RTM_GETLINK. According to libnl docu-
-mentation (http://www.infradead.org/~tgr/libnl/doc/route.html)
-RTM_DELLINK can be sent by the kernel, but RTM_GETLINK cannot.
-There was likely a mixup in the original implementation, so this
-change replaces handling for RTM_GETLINK with RTM_DELLINK.
-
-Testing and Verification Instructions:
-  1. Use ip-link to add and remove a VLAN interface and verify
-     that mDNSResponder handles the deleted link.
-
-Upstream-Status: Submitted [dts@apple.com]
-
-Signed-off-by: Nate Karstens <nate.karstens@garmin.com>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- mDNSPosix/mDNSPosix.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
-index ecd5741d038d..776531dbc8e8 100644
---- a/mDNSPosix/mDNSPosix.c
-+++ b/mDNSPosix/mDNSPosix.c
-@@ -1714,7 +1714,7 @@ mDNSlocal void          ProcessRoutingNotification(int sd, GenLinkedList *change
- #endif
- 
-         // Process the NetLink message
--        if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK)
-+        if (pNLMsg->nlmsg_type == RTM_DELLINK || pNLMsg->nlmsg_type == RTM_NEWLINK)
-             AddInterfaceIndexToList(changedInterfaces, ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index);
-         else if (pNLMsg->nlmsg_type == RTM_DELADDR || pNLMsg->nlmsg_type == RTM_NEWADDR)
-             AddInterfaceIndexToList(changedInterfaces, ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index);
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch b/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch
deleted file mode 100644
index f3c7f62d3f..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 4e6621eee389e1cbb558fe268e02d5153a1d8f2d Mon Sep 17 00:00:00 2001
-From: Nate Karstens <nate.karstens@garmin.com>
-Date: Thu, 10 Aug 2017 08:27:32 -0500
-Subject: [PATCH] Handle errors from socket calls
-
-Adds handling for socket() or read() returning a
-negative value (indicating an error has occurred).
-
-Upstream-Status: Submitted [dts@apple.com]
-
-Signed-off-by: Nate Karstens <nate.karstens@garmin.com>
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- mDNSPosix/mDNSPosix.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c
-index 776531dbc8e8..0c9dd2582660 100644
---- a/mDNSPosix/mDNSPosix.c
-+++ b/mDNSPosix/mDNSPosix.c
-@@ -1677,7 +1677,7 @@ mDNSlocal void          ProcessRoutingNotification(int sd, GenLinkedList *change
- // Read through the messages on sd and if any indicate that any interface records should
- // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0.
- {
--    ssize_t readCount;
-+    ssize_t readVal, readCount;
-     char buff[4096];
-     struct nlmsghdr         *pNLMsg = (struct nlmsghdr*) buff;
- 
-@@ -1686,7 +1686,10 @@ mDNSlocal void          ProcessRoutingNotification(int sd, GenLinkedList *change
-     // enough to hold all pending data and so avoid message fragmentation.
-     // (Note that FIONREAD is not supported on AF_NETLINK.)
- 
--    readCount = read(sd, buff, sizeof buff);
-+    readVal = read(sd, buff, sizeof buff);
-+    if (readVal < 0) return;
-+    readCount = readVal;
-+
-     while (1)
-     {
-         // Make sure we've got an entire nlmsghdr in the buffer, and payload, too.
-@@ -1702,7 +1705,9 @@ mDNSlocal void          ProcessRoutingNotification(int sd, GenLinkedList *change
-                 pNLMsg = (struct nlmsghdr*) buff;
- 
-                 // read more data
--                readCount += read(sd, buff + readCount, sizeof buff - readCount);
-+                readVal = read(sd, buff + readCount, sizeof buff - readCount);
-+                if (readVal < 0) return;
-+                readCount += readVal;
-                 continue;                   // spin around and revalidate with new readCount
-             }
-             else
-@@ -2017,6 +2022,7 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanReceiveUnicast(void)
-     int err;
-     int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-     struct sockaddr_in s5353;
-+    if (s < 0) return mDNSfalse;
-     s5353.sin_family      = AF_INET;
-     s5353.sin_port        = MulticastDNSPort.NotAnInteger;
-     s5353.sin_addr.s_addr = 0;
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
index 818017037c..e8785b1aa7 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
@@ -1,4 +1,4 @@
-From 05cb409ce213f35798c02faf2032d4846a84b48e Mon Sep 17 00:00:00 2001
+From 8e32fb0876a073c23ab73047a2e0f6d011b3660c Mon Sep 17 00:00:00 2001
 From: Beniamin Sandu <beniaminsandu@gmail.com>
 Date: Thu, 15 Jun 2023 17:02:58 +0000
 Subject: [PATCH] remove unneeded headers
@@ -7,8 +7,7 @@ From a quick look, these seem to not be needed and having them
 breaks the build with mbedtls 3.x. Without them it builds fine
 on both 2.x and 3.x versions.
 
-Upstream-Status: Pending
-
+Upstream-Status: Inactive-Upstream [Upstream does not take patches]
 Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
 ---
  mDNSPosix/mbedtls.c | 2 --
diff --git a/meta-networking/recipes-protocols/mdns/mdns_2200.140.11.bb b/meta-networking/recipes-protocols/mdns/mdns_2600.120.12.bb
index e6ea707197..f7c8f17800 100644
--- a/meta-networking/recipes-protocols/mdns/mdns_2200.140.11.bb
+++ b/meta-networking/recipes-protocols/mdns/mdns_2600.120.12.bb
@@ -6,26 +6,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=31c50371921e0fb731003bbc665f29bf"
 
 DEPENDS:append:libc-musl = " musl-nscd"
 
-SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=rel/mDNSResponder-2200 \
+SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=${BRANCH};tag=mDNSResponder-${PV} \
            file://0001-dns-sd-Include-missing-headers.patch \
            file://0002-make-Set-libdns_sd.so-soname-correctly.patch \
            file://0004-make-Separate-TLS-targets-from-libraries.patch \
            file://0005-mDNSCore-Fix-broken-debug-parameter.patch \
            file://0006-make-Add-top-level-Makefile.patch \
-           file://0001-Create-subroutine-for-cleaning-recent-interfaces.patch \
-           file://0002-Create-subroutine-for-tearing-down-an-interface.patch \
-           file://0003-Track-interface-socket-family.patch \
-           file://0004-Indicate-loopback-interface-to-mDNS-core.patch \
-           file://0005-Use-list-for-changed-interfaces.patch \
-           file://0006-Handle-noisy-netlink-sockets.patch \
-           file://0007-Mark-deleted-interfaces-as-being-changed.patch \
-           file://0008-Handle-errors-from-socket-calls.patch \
            file://0009-remove-unneeded-headers.patch \
+           file://0001-Fix-build-with-gcc-15.patch \
+           file://0001-Use-secure_getenv-on-Linux.patch \
            file://mdns.service \
-           file://0001-Handle-interface-without-ifa_addr.patch \
-           file://0001-Fix-SIGSEGV-during-DumpStateLog.patch \
            "
-SRCREV = "12e84b9089e577e0c0a9f48c4b922d7349fcc5a4"
+BRANCH = "rel/mDNSResponder-2600"
+SRCREV = "3a0deda2995d98243dae379bcec10e57928c15e8"
 
 # We install a stub Makefile in the top directory so that the various checks
 # in base.bbclass pass their tests for a Makefile, this ensures (that amongst
@@ -34,7 +27,6 @@ SRCREV = "12e84b9089e577e0c0a9f48c4b922d7349fcc5a4"
 #
 # We can't use the approach of setting ${S} to mDNSPosix as we need
 # DEBUG_PREFIX_MAP to cover files which come from the Clients directory too.
-S = "${WORKDIR}/git"
 
 inherit github-releases manpages systemd update-rc.d
 
@@ -109,7 +101,7 @@ do_install () {
         install mdnsd.sh ${D}${INIT_D_DIR}/mdns
 }
 
-pkg_postinst:${PN} () {
+pkg_postinst:${PN}-libnss-mdns () {
         if [ -r $D${sysconfdir}/nsswitch.conf ]; then
                 sed -e '/^hosts:/s/\s*\<mdns\>//' \
                         -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 mdns\3\4\5/' \
@@ -117,7 +109,7 @@ pkg_postinst:${PN} () {
         fi
 }
 
-pkg_prerm:${PN} () {
+pkg_prerm:${PN}-libnss-mdns () {
         if [ -r $D${sysconfdir}/nsswitch.conf ]; then
                 sed -e '/^hosts:/s/\s*\<mdns\>//' \
                         -e '/^hosts:/s/\s*mdns//' \
@@ -128,7 +120,12 @@ pkg_prerm:${PN} () {
 SYSTEMD_SERVICE:${PN} = "mdns.service"
 INITSCRIPT_NAME = "mdns"
 
+PACKAGE_BEFORE_PN = "${PN}-libnss-mdns"
+
+RRECOMMENDS:${PN}:append:libc-glibc = " ${PN}-libnss-mdns"
+
 FILES_SOLIBSDEV = "${libdir}/libdns_sd.so"
-FILES:${PN} += "${libdir}/libnss_mdns-0.2.so"
+FILES:${PN}-libnss-mdns = "${sysconfdir}/nss_mdns.conf ${libdir}/libnss_mdns*.so*"
+RPROVIDES:${PN}-libnss-mdns = "libnss-mdns"
 
-RPROVIDES:${PN} += "libdns_sd.so"
+RPROVIDES:${PN} += "libdns-sd"
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.9.4-kernel-6.7.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.9.4-kernel-6.7.patch
new file mode 100644
index 0000000000..3f978d5f80
--- /dev/null
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.9.4-kernel-6.7.patch
@@ -0,0 +1,123 @@
+From f5ae6baf0018abda9dedc368fe6d52c0d7a8ab8f Mon Sep 17 00:00:00 2001
+From: Philippe Troin <phil+github-commits@fifi.org>
+Date: Sat, 3 Feb 2024 10:30:30 -0800
+Subject: [PATCH] Add Linux 6.7 compatibility parsing /proc/net/snmp
+
+Linux 6.7 adds a new OutTransmits field to Ip in /proc/net/snmp.
+This breaks the hard-coded assumptions about the Ip line length.
+Add compatibility to parse Linux 6.7 Ip header while keep support
+for previous versions.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ .../ip-mib/data_access/systemstats_linux.c    | 46 +++++++++++++++----
+ 1 file changed, 37 insertions(+), 9 deletions(-)
+
+diff --git a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c
+index 49e0a34d5c..f04e828a94 100644
+--- a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c
++++ b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c
+@@ -36,7 +36,7 @@ netsnmp_access_systemstats_arch_init(void)
+ }
+ 
+ /*
+-  /proc/net/snmp
++  /proc/net/snmp - Linux 6.6 and lower
+ 
+   Ip: Forwarding DefaultTTL InReceives InHdrErrors InAddrErrors ForwDatagrams InUnknownProtos InDiscards InDelivers OutRequests OutDiscards OutNoRoutes ReasmTimeout ReasmReqds ReasmOKs ReasmFails FragOKs FragFails FragCreates
+   Ip: 2 64 7083534 0 0 0 0 0 6860233 6548963 0 0 1 286623 63322 1 259920 0 0
+@@ -49,6 +49,26 @@ netsnmp_access_systemstats_arch_init(void)
+   
+   Udp: InDatagrams NoPorts InErrors OutDatagrams
+   Udp: 1491094 122 0 1466178
++*
++  /proc/net/snmp - Linux 6.7 and higher
++
++  Ip: Forwarding DefaultTTL InReceives InHdrErrors InAddrErrors ForwDatagrams InUnknownProtos InDiscards InDelivers OutRequests OutDiscards OutNoRoutes ReasmTimeout ReasmReqds ReasmOKs ReasmFails FragOKs FragFails FragCreates OutTransmits
++  Ip: 1 64 50859058 496 0 37470604 0 0 20472980 7515791 1756 0 0 7264 3632 0 3548 0 7096 44961424
++
++  Icmp: InMsgs InErrors InCsumErrors InDestUnreachs InTimeExcds InParmProbs InSrcQuenchs InRedirects InEchos InEchoReps InTimestamps InTimestampReps InAddrMasks InAddrMaskReps OutMsgs OutErrors OutRateLimitGlobal OutRateLimitHost OutDestUnreachs OutTimeExcds OutParmProbs OutSrcQuenchs OutRedirects OutEchos OutEchoReps OutTimestamps OutTimestampReps OutAddrMasks OutAddrMaskReps
++  Icmp: 114447 2655 0 17589 0 0 0 0 66905 29953 0 0 0 0 143956 0 0 572 16610 484 0 0 0 59957 66905 0 0 0 0
++
++  IcmpMsg: InType0 InType3 InType8 OutType0 OutType3 OutType8 OutType11
++  IcmpMsg: 29953 17589 66905 66905 16610 59957 484
++
++  Tcp: RtoAlgorithm RtoMin RtoMax MaxConn ActiveOpens PassiveOpens AttemptFails EstabResets CurrEstab InSegs OutSegs RetransSegs InErrs OutRsts InCsumErrors
++  Tcp: 1 200 120000 -1 17744 13525 307 3783 6 18093137 9277788 3499 8 7442 0
++
++  Udp: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors InCsumErrors IgnoredMulti MemErrors
++  Udp: 2257832 1422 0 2252835 0 0 0 84 0
++
++  UdpLite: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors InCsumErrors IgnoredMulti MemErrors
++  UdpLite: 0 0 0 0 0 0 0 0 0
+ */
+ 
+ 
+@@ -101,10 +121,10 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags)
+     FILE           *devin;
+     char            line[1024];
+     netsnmp_systemstats_entry *entry = NULL;
+-    int             scan_count;
++    int             scan_count, expected_scan_count;
+     char           *stats, *start = line;
+     int             len;
+-    unsigned long long scan_vals[19];
++    unsigned long long scan_vals[20];
+ 
+     DEBUGMSGTL(("access:systemstats:container:arch", "load v4 (flags %x)\n",
+                 load_flags));
+@@ -126,10 +146,17 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags)
+      */
+     NETSNMP_IGNORE_RESULT(fgets(line, sizeof(line), devin));
+     len = strlen(line);
+-    if (224 != len) {
++    switch (len) {
++    case 224:
++       expected_scan_count = 19;
++       break;
++    case 237:
++       expected_scan_count = 20;
++       break;
++    default:
+         fclose(devin);
+         snmp_log(LOG_ERR, "systemstats_linux: unexpected header length in /proc/net/snmp."
+-                 " %d != 224\n", len);
++                 " %d not in { 224, 237 } \n", len);
+         return -4;
+     }
+ 
+@@ -178,20 +205,20 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags)
+         memset(scan_vals, 0x0, sizeof(scan_vals));
+         scan_count = sscanf(stats,
+                             "%llu %llu %llu %llu %llu %llu %llu %llu %llu %llu"
+-                            "%llu %llu %llu %llu %llu %llu %llu %llu %llu",
++                            "%llu %llu %llu %llu %llu %llu %llu %llu %llu %llu",
+                             &scan_vals[0],&scan_vals[1],&scan_vals[2],
+                             &scan_vals[3],&scan_vals[4],&scan_vals[5],
+                             &scan_vals[6],&scan_vals[7],&scan_vals[8],
+                             &scan_vals[9],&scan_vals[10],&scan_vals[11],
+                             &scan_vals[12],&scan_vals[13],&scan_vals[14],
+                             &scan_vals[15],&scan_vals[16],&scan_vals[17],
+-                            &scan_vals[18]);
++                            &scan_vals[18],&scan_vals[19]);
+         DEBUGMSGTL(("access:systemstats", "  read %d values\n", scan_count));
+ 
+-        if(scan_count != 19) {
++        if(scan_count != expected_scan_count) {
+             snmp_log(LOG_ERR,
+                      "error scanning systemstats data (expected %d, got %d)\n",
+-                     19, scan_count);
++                     expected_scan_count, scan_count);
+             netsnmp_access_systemstats_entry_free(entry);
+             return -4;
+         }
+@@ -223,6 +250,7 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags)
+         entry->stats.HCOutFragFails.high = scan_vals[17] >> 32;
+         entry->stats.HCOutFragCreates.low = scan_vals[18] & 0xffffffff;
+         entry->stats.HCOutFragCreates.high = scan_vals[18] >> 32;
++        /* entry->stats. = scan_vals[19]; / * OutTransmits */
+ 
+         entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCINRECEIVES] = 1;
+         entry->stats.columnAvail[IPSYSTEMSTATSTABLE_INHDRERRORS] = 1;
+
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/netsnmp-swinst-crash.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/netsnmp-swinst-crash.patch
new file mode 100644
index 0000000000..109a0600a6
--- /dev/null
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/netsnmp-swinst-crash.patch
@@ -0,0 +1,17 @@
+Fix crash in swinst
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/agent/mibgroup/host/data_access/swinst_pkginfo.c
++++ b/agent/mibgroup/host/data_access/swinst_pkginfo.c
+@@ -210,7 +210,9 @@ netsnmp_swinst_arch_load( netsnmp_contai
+            memcpy( entry->swDate, cp, date_len );
+            entry->swDate_len = date_len;
+        }
+-       closedir( d );
++       if (d != NULL)
++               closedir( d );
++
+ #ifdef HAVE_LIBPKG
+     }
+ #endif
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb
index 989ec54132..6a62304a1c 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb
@@ -28,12 +28,16 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
            file://0011-ac_add_search_path.m4-keep-consistent-between-32bit-.patch \
            file://0012-Fix-configuration-of-NETSNMP_FD_MASK_TYPE.patch \
            file://0001-Android-Fix-the-build.patch \
+           file://netsnmp-swinst-crash.patch \
+           file://net-snmp-5.9.4-kernel-6.7.patch \
           "
 SRC_URI[sha256sum] = "8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/"
 UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/"
 
+CVE_PRODUCT = "net-snmp:net-snmp"
+
 inherit autotools-brokensep update-rc.d siteinfo systemd pkgconfig perlnative ptest multilib_script multilib_header
 
 EXTRA_OEMAKE = "INSTALL_PREFIX=${D} OTHERLDFLAGS='${LDFLAGS}' HOST_CPPFLAGS='${BUILD_CPPFLAGS}'"
@@ -53,6 +57,8 @@ PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable
 PACKAGECONFIG[smux] = ""
 PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd"
 
+SYSCONTACT_DISTRO ?= "no-contact-set@example.com"
+
 EXTRA_OECONF = " \
     --enable-shared \
     --disable-manuals \
@@ -61,6 +67,7 @@ EXTRA_OECONF = " \
     --with-persistent-directory=${localstatedir}/lib/net-snmp \
     --with-endianness=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
     --with-mib-modules='${MIB_MODULES}' \
+    --with-sys-contact='${SYSCONTACT_DISTRO}' \
 "
 
 MIB_MODULES = ""
@@ -266,12 +273,12 @@ RDEPENDS:${PN}-server-snmpd += "net-snmp-mibs"
 RDEPENDS:${PN}-server-snmptrapd += "net-snmp-server-snmpd ${PN}-lib-trapd"
 RDEPENDS:${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd"
 RDEPENDS:${PN}-client += "net-snmp-mibs net-snmp-libs"
-RDEPENDS:${PN}-libs += "libpci \
-                        ${PN}-lib-netsnmp \
+RDEPENDS:${PN}-libs += "${PN}-lib-netsnmp \
                         ${PN}-lib-agent \
                         ${PN}-lib-helpers \
                         ${PN}-lib-mibs \
 "
+RDEPENDS:${PN}-libs:append:class-target = " libpci"
 RDEPENDS:${PN}-ptest += "perl \
                          perl-module-test \
                          perl-module-file-basename \
diff --git a/meta-networking/recipes-protocols/opcua/open62541_1.3.8.bb b/meta-networking/recipes-protocols/opcua/open62541_1.3.15.bb
index 19a50aee3a..b7f5112197 100644
--- a/meta-networking/recipes-protocols/opcua/open62541_1.3.8.bb
+++ b/meta-networking/recipes-protocols/opcua/open62541_1.3.15.bb
@@ -8,35 +8,40 @@ LIC_FILES_CHKSUM = "\
 "
 
 SRCREV_FORMAT = "opcua_mdnsd_ua-nodeset_mqtt-c"
-SRCREV_opcua = "086b1557d6f49e8a82c999054a7da77d080cd54e"
-SRCREV_mdnsd = "3151afe5899dba5125dffa9f4cf3ae1fe2edc0f0"
+SRCREV_opcua = "3eed1a6d5c5b207c531b2d35ed88aa0a4a4541e5"
+SRCREV_mdnsd = "488d24fb9d427aec77df180268f0291eeee7fb8b"
 SRCREV_ua-nodeset = "f71b3f411d5cb16097c3ae0c744f67ad45535ffb"
 SRCREV_mqtt-c = "f69ce1e7fd54f3b1834c9c9137ce0ec5d703cb4d"
 
 SRC_URI = " \
     git://github.com/open62541/open62541.git;name=opcua;branch=1.3;protocol=https \
-    git://github.com/Pro/mdnsd.git;name=mdnsd;protocol=https;branch=master;destsuffix=git/deps/mdnsd \
-    git://github.com/OPCFoundation/UA-Nodeset;name=ua-nodeset;protocol=https;branch=v1.04;destsuffix=git/deps/ua-nodeset \
-    git://github.com/LiamBindle/MQTT-C.git;name=mqtt-c;protocol=https;branch=master;destsuffix=git/deps/mqtt-c \
+    git://github.com/Pro/mdnsd.git;name=mdnsd;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mdnsd \
+    git://github.com/OPCFoundation/UA-Nodeset;name=ua-nodeset;protocol=https;branch=v1.04;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/ua-nodeset \
+    git://github.com/LiamBindle/MQTT-C.git;name=mqtt-c;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mqtt-c \
     file://0001-fix-build-do-not-install-git-files.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit cmake python3native
 
 EXTRA_OECMAKE += "\
     -DBUILD_SHARED_LIBS=ON \
-    -DUA_NAMESPACE_ZERO=FULL \
     -DUA_LOGLEVEL=600 \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 "
 
-PACKAGECONFIG ?= "encryption-mbedtls pubsub pubsub-eth subscriptions subscriptions-events"
-PACKAGECONFIG[amalgamation] = "-DUA_ENABLE_AMALGAMATION=ON, -DUA_ENABLE_AMALGAMATION=OFF"
+FILES:${PN} = "${libdir}/lib*${SOLIBS}"
+
+# The tools package contains scripts to generate certificates and OPC UA schema definitions + nodeset descriptions.
+PACKAGES += "${PN}-tools"
+FILES:${PN}-tools = "${datadir}/${BPN}/tools/*"
+
+PACKAGECONFIG ?= "encryption-mbedtls pubsub pubsub-eth subscriptions subscriptions-events namespace-full"
 PACKAGECONFIG[encryption-mbedtls] = "-DUA_ENABLE_ENCRYPTION=MBEDTLS, , mbedtls, , , encryption-openssl"
 PACKAGECONFIG[encryption-openssl] = "-DUA_ENABLE_ENCRYPTION=OPENSSL, , openssl, , , encryption-mbedtls"
 PACKAGECONFIG[multithreading] = "-DUA_MULTITHREADING=100, -DUA_MULTITHREADING=0"
+PACKAGECONFIG[namespace-full] = "-DUA_NAMESPACE_ZERO=FULL, , , , , namespace-reduced"
+PACKAGECONFIG[namespace-reduced] = "-DUA_NAMESPACE_ZERO=REDUCED, , , , , namespace-full"
 PACKAGECONFIG[pubsub] = "-DUA_ENABLE_PUBSUB=ON, -DUA_ENABLE_PUBSUB=OFF"
 PACKAGECONFIG[pubsub-eth] = "-DUA_ENABLE_PUBSUB_ETH_UADP=ON, -DUA_ENABLE_PUBSUB_ETH_UADP=OFF"
 PACKAGECONFIG[subscriptions] = "-DUA_ENABLE_SUBSCRIPTIONS=ON, -DUA_ENABLE_SUBSCRIPTIONS=OFF"
@@ -51,3 +56,6 @@ do_configure:prepend:toolchain-clang:riscv32() {
     sed -i -e 's/set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)/set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)/' ${S}/CMakeLists.txt
 }
 
+do_install:append(){
+    sed -i 's|${RECIPE_SYSROOT}|\$\{CMAKE_SYSROOT\}|g' ${D}${libdir}/cmake/open62541/open62541Targets.cmake
+}
diff --git a/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-networking/recipes-protocols/openflow/openflow_git.bb
index 0061565f90..1588245f8a 100644
--- a/meta-networking/recipes-protocols/openflow/openflow_git.bb
+++ b/meta-networking/recipes-protocols/openflow/openflow_git.bb
@@ -37,7 +37,6 @@ EXTRA_OECONF += " \
                 "
 DEPENDS:append:libc-musl = " libexecinfo"
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep pkgconfig
 
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest b/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
index 01c9c7b447..a40b6c4228 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
@@ -30,13 +30,11 @@ else
 fi
 
 #read -p "Please input the network interface you use to test(such as eth0, em1 etc):" ETH_TEST
-echo "Please input the network interface you use to test(such as eth0, em1 etc):"
-read ETH_TEST > /dev/null
-
+ETH_TEST=`ip route get 8.8.8.8 | awk -- '{print $5}'`
 if [ x"$ETH_TEST" = x ]; then
     exit_cus "The network interface cannot be null" 1
 fi
-ifconfig | grep $ETH_TEST > /dev/null || exit_cus "The network interface you provide is invalid" 1
+ip a | grep $ETH_TEST > /dev/null || exit_cus "The network interface you provide is invalid" 1
 
 # check openl2tp related kernel config
 zcat /proc/config.gz | grep CONFIG_L2TP=y > /dev/null || exit_cus "Failed to check CONFIG_L2TP=y, skip the tests." 1
@@ -63,8 +61,7 @@ if [ x"$ETH_TEST" = x ]; then
 fi
 
 sed -i 's/eth2/'\"$ETH_TEST\"'/g' ${OPENL2TP_DIR}/ptest/test_procs.tcl
-test_ip="`ifconfig $ETH_TEST | grep 'inet ' | sed 's/^.*inet addr://g' | \
-    sed 's/ *Mask.*$//g'|sed 's/ *Bcast.*$//g'`"
+test_ip="`ip addr show $ETH_TEST | grep 'inet ' | grep -v '127.0.0.1' | awk '{print $2}' | cut -d '/' -f1`"
 sed -i 's/192.168.0.1/'"$test_ip"'/g' ${OPENL2TP_DIR}/ptest/tunnel.test
 
 # load module l2tp_ppp
@@ -73,7 +70,7 @@ lsmod | grep l2tp_ppp > /dev/null || exit_cus "FAIL: Load module l2tp_ppp" 2
 
 # start openl2tpd
 ps aux | grep openl2tpd | grep -v grep > /dev/null && killall openl2tpd > /dev/null
-ppp_path=`rpm -ql openl2tp | grep ppp_null.so`
+ppp_path=`find / -name ppp_null.so`
 echo "test it here"
 /usr/sbin/openl2tpd -d all -D -f -p ${ppp_path} &  > /dev/null
 
@@ -95,3 +92,4 @@ else
 fi
 
 restore_file
+ps aux | grep openl2tpd | grep -v grep > /dev/null && killall openl2tpd > /dev/null
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
index f64c7340d1..4e5b45891d 100644
--- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
+++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
@@ -41,14 +41,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \
 SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0"
 SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f"
 
-inherit autotools-brokensep pkgconfig systemd ptest
+inherit pkgconfig systemd ptest
 
 SYSTEMD_SERVICE:${PN} = "openl2tpd.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
 DEPENDS += "libtirpc"
 CPPFLAGS += "-I${STAGING_INCDIR}/tirpc"
-CFLAGS += "-I${STAGING_INCDIR}/tirpc"
+CFLAGS += "-I${STAGING_INCDIR}/tirpc -std=gnu17"
 LDFLAGS += "-ltirpc"
 
 PARALLEL_MAKE = ""
@@ -67,7 +67,9 @@ do_compile:prepend() {
         ${S}/Makefile
 }
 
-do_install:append () {
+do_install () {
+    oe_runmake 'DESTDIR=${D}' install
+
     install -d ${D}${sysconfdir}/init.d
     install -d ${D}${sysconfdir}/default
     install -m 0755 ${S}/etc/rc.d/init.d/openl2tpd ${D}${sysconfdir}/init.d/openl2tpd
@@ -94,3 +96,4 @@ do_install_ptest () {
 }
 
 RDEPENDS:${PN} = "ppp ppp-l2tp bash"
+RDEPENDS:${PN}-ptest += "rpcbind kernel-module-l2tp-ppp procps-ps tcl"
diff --git a/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb b/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb
index 010cd5af84..ad72b5cdde 100644
--- a/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb
+++ b/meta-networking/recipes-protocols/openlldp/openlldp_1.1.1.bb
@@ -5,7 +5,6 @@ HOMEPAGE = "http://open-lldp.org/start"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8c2bc283e65df398ced5f5b747e78162"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools
 inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}
diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb
index cabe18ef8a..a19b313cc3 100644
--- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb
+++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb
@@ -18,7 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \
 SRC_URI[md5sum] = "8d25341352fdae5ad5b36b9f18254908"
 SRC_URI[sha256sum] = "82492db8e487ce73b182ee7f444251d20c44f5c26d6e96c553ec7093aefb5af4"
 
-S = "${WORKDIR}/pptp-${PV}"
+S = "${UNPACKDIR}/pptp-${PV}"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb
index c8e1767114..42e9c4260f 100644
--- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb
+++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581"
 
 
-SRC_URI = "https://dianne.skoll.ca/projects/rp-pppoe/download/OLD/rp-pppoe-${PV}.tar.gz \
+SRC_URI = "https://downloads.uls.co.za/rp-pppoe/rp-pppoe-${PV}.tar.gz \
            file://top-autoconf.patch \
            file://configure_in_cross.patch \
            file://update-config.patch \
diff --git a/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb b/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb
index 8099fa5c6e..2cbb025049 100644
--- a/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb
+++ b/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb
@@ -21,7 +21,7 @@ inherit autotools-brokensep
 LIBS:append:libc-musl = " -lssp_nonshared"
 LIBS:append:libc-glibc = " -lc_nonshared"
 
-S = "${WORKDIR}/tsocks-1.8"
+S = "${UNPACKDIR}/tsocks-1.8"
 
 FILES:${PN} = "${libdir}/* ${bindir}/tsocks"
 FILES:${PN}-dev = ""
diff --git a/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb b/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb
index 3769d5cab0..8f21620584 100644
--- a/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb
+++ b/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb
@@ -6,7 +6,6 @@ SRCREV = "848eca82f92273af9a79687a90343a2ebcf3481d"
 SRC_URI = "git://github.com/sctplab/usrsctp;protocol=https;branch=master \
           "
 
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch
deleted file mode 100644
index c69a395f10..0000000000
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch
+++ /dev/null
@@ -1,969 +0,0 @@
-From 7acb528db20c08d90f72fa317b8e1ccf4d270cdc Mon Sep 17 00:00:00 2001
-From: Matthew Russell <matthew.g.russell@gmail.com>
-Date: Wed, 10 Apr 2024 06:23:27 -0400
-Subject: [PATCH 1/2] Update to C++17 (#560)
-
-* Upgrading to C++17
-
-* Code Quality: Address compiler warnings
-
-- Fixing narrowing issues
-- Removing useless copies
-- Removing unused lines
-- unused-lambda-capture
-- Removes unused variables
-- Fix some casts (modernize c-style, or simply remove useless casts)
-- Explicitly deleting unused endpoint_impl copy and move constructors
-- Removing redundant std::bind
-- Improving const correctness
-- Moving thread init to constructor body
-- Moved check_routing_credentials_ inside vsomeip security section where it's used
-- Using =default destructor instead of empty destructor
-
-Thread init:
-Moving the initialization of these threads into the constructor body to
-ensure that they do not start with an incomplete "this".  As they
-capture this, it is possible that if the new thread begins before the
-object is fully constructed, the new thread might operate on
-uninitialized members of "this".
-
-* Attempting to fix syntax error on MSVC
-
-* Adjusting PR to conform to Covesa style
-
-* Using curly brace initialization
-
-* Using static_cast to narrow its_device.size() to a socklen_t
-
-* Avoided double integer promotion
-
-Upstream-Status: Backport [https://github.com/COVESA/vsomeip/pull/560]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Android.bp                                    |  2 +-
- CMakeLists.txt                                | 11 ++-
- examples/hello_world/hello_world_service.hpp  | 12 +--
- .../configuration/include/internal.hpp.in     |  6 +-
- .../include/internal_android.hpp              | 10 +--
- .../configuration/src/configuration_impl.cpp  | 13 ++--
- .../endpoints/include/endpoint_impl.hpp       |  3 +
- .../local_server_endpoint_impl_receive_op.hpp |  4 +-
- .../local_uds_client_endpoint_impl.hpp        |  2 +-
- .../local_uds_server_endpoint_impl.hpp        |  2 +-
- .../udp_server_endpoint_impl_receive_op.hpp   |  2 +-
- .../endpoints/src/endpoint_manager_base.cpp   |  2 +-
- .../src/local_uds_client_endpoint_impl.cpp    |  5 --
- .../src/local_uds_server_endpoint_impl.cpp    |  6 --
- .../src/tcp_client_endpoint_impl.cpp          |  2 +-
- .../src/tcp_server_endpoint_impl.cpp          | 14 ++--
- .../src/udp_client_endpoint_impl.cpp          |  2 +-
- .../src/udp_server_endpoint_impl.cpp          |  4 +-
- .../message/include/message_base_impl.hpp     |  2 -
- implementation/message/src/deserializer.cpp   |  4 +-
- .../plugin/src/plugin_manager_impl.cpp        |  2 +-
- .../routing/src/routing_manager_base.cpp      | 10 +--
- .../runtime/include/application_impl.hpp      |  4 +-
- .../runtime/src/application_impl.cpp          |  7 +-
- implementation/security/src/policy.cpp        |  4 +-
- implementation/security/src/security.cpp      |  1 +
- .../src/service_discovery_impl.cpp            | 34 +++++----
- interface/vsomeip/constants.hpp               | 74 +++++++++----------
- .../application_tests/application_test.cpp    |  1 +
- tools/vsomeip_ctrl.cpp                        |  9 ++-
- 30 files changed, 129 insertions(+), 125 deletions(-)
-
-diff --git a/Android.bp b/Android.bp
-index c6caa4de..f314f22b 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -30,9 +30,9 @@ libvsomeip_sd_srcs = [
- 
- cc_defaults {
-     name: "vsomeip_defaults",
-+    cpp_std: "c++17",
- 
-     cppflags: [
--        "-std=c++14",
-         "-fexceptions",
-         "-Wno-non-virtual-dtor",
-         "-Wno-unused-const-variable",
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ab399a69..3d947055 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -64,6 +64,8 @@ if(NOT CMAKE_BUILD_TYPE)
-   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
- endif()
- 
-+set(CMAKE_CXX_STANDARD 17)
-+
- # OS
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-     set(DL_LIBRARY "dl")
-@@ -248,13 +250,13 @@ if (MSVC)
-     # add_definitions(-DVSOMEIP_DLL_COMPILATION) now it is controlled per target
-     SET(BOOST_WINDOWS_VERSION "0x600" CACHE STRING "Set the same Version as the Version with which Boost was built, otherwise there will be errors. (normaly 0x600 is for Windows 7 and 0x501 is for Windows XP)")
-     # Disable warning C4250 since it warns that the compiler is correctly following the C++ Standard. It's a "We-Are-Doing-Things-By-The-Book" notice, not a real warning.
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_ASIO_DISABLE_IOCP /EHsc /std:c++14 /wd4250")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_ASIO_DISABLE_IOCP /EHsc /wd4250")
-     set(USE_RT "")
-     link_directories(${Boost_LIBRARY_DIR_DEBUG})
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX")
-     set(USE_RT "")
- else()
--    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OS_CXX_FLAGS} -g ${OPTIMIZE} -std=c++14 ${NO_DEPRECATED} ${EXPORTSYMBOLS}")
-+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OS_CXX_FLAGS} -g ${OPTIMIZE} ${NO_DEPRECATED} ${EXPORTSYMBOLS}")
-     set(USE_RT "rt")
- endif()
- 
-@@ -268,6 +270,7 @@ list(SORT ${VSOMEIP_NAME}-cfg_SRC)
- if (VSOMEIP_ENABLE_MULTIPLE_ROUTING_MANAGERS EQUAL 0)
-     add_library(${VSOMEIP_NAME}-cfg SHARED ${${VSOMEIP_NAME}-cfg_SRC})
-     set_target_properties (${VSOMEIP_NAME}-cfg PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION})
-+    target_compile_features(${VSOMEIP_NAME}-cfg PRIVATE cxx_std_17)
-     if (MSVC)
-         set_target_properties(${VSOMEIP_NAME}-cfg PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN")
-     endif()
-@@ -302,6 +305,7 @@ list(SORT ${VSOMEIP_NAME}_SRC)
- 
- add_library(${VSOMEIP_NAME} SHARED ${${VSOMEIP_NAME}_SRC})
- set_target_properties (${VSOMEIP_NAME} PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION})
-+target_compile_features(${VSOMEIP_NAME} PRIVATE cxx_std_17)
- if (MSVC)
-     set_target_properties(${VSOMEIP_NAME} PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION")
- else ()
-@@ -331,6 +335,7 @@ file(GLOB ${VSOMEIP_NAME}-sd_SRC
- list(SORT ${VSOMEIP_NAME}-sd_SRC)
- 
- add_library(${VSOMEIP_NAME}-sd SHARED ${${VSOMEIP_NAME}-sd_SRC})
-+target_compile_features(${VSOMEIP_NAME}-sd PRIVATE cxx_std_17)
- set_target_properties (${VSOMEIP_NAME}-sd PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION})
- if (MSVC)
-     set_target_properties(${VSOMEIP_NAME}-sd PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN")
-@@ -348,6 +353,7 @@ file(GLOB_RECURSE ${VSOMEIP_NAME}-e2e_SRC
- list(SORT ${VSOMEIP_NAME}-e2e_SRC)
- 
- add_library(${VSOMEIP_NAME}-e2e SHARED ${${VSOMEIP_NAME}-e2e_SRC})
-+target_compile_features(${VSOMEIP_NAME}-e2e PRIVATE cxx_std_17)
- set_target_properties (${VSOMEIP_NAME}-e2e PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION})
- if (MSVC)
-     set_target_properties(${VSOMEIP_NAME}-e2e PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN")
-@@ -375,6 +381,7 @@ file(GLOB_RECURSE ${VSOMEIP_COMPAT_NAME}_SRC
- list(SORT ${VSOMEIP_COMPAT_NAME}_SRC)
- 
- add_library(${VSOMEIP_COMPAT_NAME} SHARED ${${VSOMEIP_COMPAT_NAME}_SRC})
-+target_compile_features(${VSOMEIP_COMPAT_NAME} PRIVATE cxx_std_17)
- set_target_properties (${VSOMEIP_COMPAT_NAME} PROPERTIES VERSION ${VSOMEIP_COMPAT_VERSION} SOVERSION ${VSOMEIP_COMPAT_MAJOR_VERSION})
- if (MSVC)
-     set_target_properties(${VSOMEIP_COMPAT_NAME} PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN")
-diff --git a/examples/hello_world/hello_world_service.hpp b/examples/hello_world/hello_world_service.hpp
-index 7ac3b1e7..b04cacea 100644
---- a/examples/hello_world/hello_world_service.hpp
-+++ b/examples/hello_world/hello_world_service.hpp
-@@ -11,12 +11,12 @@
- #if defined ANDROID || defined __ANDROID__
- #include "android/log.h"
- #define LOG_TAG "hello_world_service"
--#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n"), (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__)
--#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n"), (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__)
-+#define LOG_INF(...) std::fprintf(stdout, __VA_ARGS__), std::fprintf(stdout, "\n"), (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__)
-+#define LOG_ERR(...) std::fprintf(stderr, __VA_ARGS__), std::fprintf(stderr, "\n"), (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__)
- #else
- #include <cstdio>
--#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n")
--#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n")
-+#define LOG_INF(...) std::fprintf(stdout, __VA_ARGS__), std::fprintf(stdout, "\n")
-+#define LOG_ERR(...) std::fprintf(stderr, __VA_ARGS__), std::fprintf(stderr, "\n")
- #endif
- 
- static vsomeip::service_t service_id = 0x1111;
-@@ -32,9 +32,9 @@ public:
-     hello_world_service() :
-                     rtm_(vsomeip::runtime::get()),
-                     app_(rtm_->create_application()),
--                    stop_(false),
--                    stop_thread_(std::bind(&hello_world_service::stop, this))
-+                    stop_(false)
-     {
-+        stop_thread_ = std::thread{&hello_world_service::stop, this};
-     }
- 
-     ~hello_world_service()
-diff --git a/implementation/configuration/include/internal.hpp.in b/implementation/configuration/include/internal.hpp.in
-index 72c8d503..eff4efad 100644
---- a/implementation/configuration/include/internal.hpp.in
-+++ b/implementation/configuration/include/internal.hpp.in
-@@ -141,14 +141,14 @@ typedef enum {
-     IS_SUBSCRIBING
- } subscription_state_e;
- 
--const std::uint32_t MESSAGE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)();
-+inline constexpr std::uint32_t MESSAGE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)();
- 
--const std::uint32_t QUEUE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)();
-+inline constexpr std::uint32_t QUEUE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)();
- 
- #define VSOMEIP_DEFAULT_NPDU_DEBOUNCING_NANO         2 * 1000 * 1000
- #define VSOMEIP_DEFAULT_NPDU_MAXIMUM_RETENTION_NANO  5 * 1000 * 1000
- 
--const std::uint32_t MAX_RECONNECTS_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)();
-+inline constexpr std::uint32_t MAX_RECONNECTS_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)();
- 
- const std::uint32_t ANY_UID = 0xFFFFFFFF;
- const std::uint32_t ANY_GID = 0xFFFFFFFF;
-diff --git a/implementation/configuration/include/internal_android.hpp b/implementation/configuration/include/internal_android.hpp
-index f5425722..8757a85a 100644
---- a/implementation/configuration/include/internal_android.hpp
-+++ b/implementation/configuration/include/internal_android.hpp
-@@ -128,17 +128,17 @@ typedef enum {
-     IS_SUBSCRIBING
- } subscription_state_e;
- 
--const std::uint32_t MESSAGE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max();
-+inline constexpr std::uint32_t MESSAGE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max();
- 
--const std::uint32_t QUEUE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max();
-+inline constexpr std::uint32_t QUEUE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max();
- 
- #define VSOMEIP_DEFAULT_NPDU_DEBOUNCING_NANO         2 * 1000 * 1000
- #define VSOMEIP_DEFAULT_NPDU_MAXIMUM_RETENTION_NANO  5 * 1000 * 1000
- 
--const std::uint32_t MAX_RECONNECTS_UNLIMITED = std::numeric_limits<std::uint32_t>::max();
-+inline constexpr std::uint32_t MAX_RECONNECTS_UNLIMITED = std::numeric_limits<std::uint32_t>::max();
- 
--const std::uint32_t ANY_UID = 0xFFFFFFFF;
--const std::uint32_t ANY_GID = 0xFFFFFFFF;
-+inline constexpr std::uint32_t ANY_UID = 0xFFFFFFFF;
-+inline constexpr std::uint32_t ANY_GID = 0xFFFFFFFF;
- 
- enum class port_type_e {
-     PT_OPTIONAL,
-diff --git a/implementation/configuration/src/configuration_impl.cpp b/implementation/configuration/src/configuration_impl.cpp
-index ca1bd1dc..380b2906 100644
---- a/implementation/configuration/src/configuration_impl.cpp
-+++ b/implementation/configuration/src/configuration_impl.cpp
-@@ -333,7 +333,7 @@ bool configuration_impl::load(const std::string &_name) {
- 
-     // Tell, if reading of configuration file(s) failed.
-     // (This may file if the logger configuration is incomplete/missing).
--    for (auto f : its_failed)
-+    for (const auto& f : its_failed)
-         VSOMEIP_WARNING << "Reading of configuration file \""
-             << f << "\" failed. Configuration may be incomplete.";
- 
-@@ -342,7 +342,7 @@ bool configuration_impl::load(const std::string &_name) {
- 
-     std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();
- 
--    for (auto i : its_input) {
-+    for (const auto& i : its_input) {
-         if (utility::is_file(i))
-             VSOMEIP_INFO << "Using configuration file: \"" << i << "\".";
- 
-@@ -561,7 +561,7 @@ bool configuration_impl::load_data(const std::vector<configuration_element> &_el
- 
-         if (is_logging_loaded_) {
-             logger::logger_impl::init(shared_from_this());
--            for (auto w : its_warnings)
-+            for (const auto& w : its_warnings)
-                 VSOMEIP_WARNING << w;
-         }
-     }
-@@ -3255,7 +3255,7 @@ void configuration_impl::trim(std::string &_s) {
-         std::find_if(
-             _s.begin(),
-             _s.end(),
--            [](unsigned char ch) { return !std::isspace(ch); }
-+            [](const auto ch) { return !std::isspace(ch); }
-         )
-     );
- 
-@@ -3263,8 +3263,9 @@ void configuration_impl::trim(std::string &_s) {
-         std::find_if(
-             _s.rbegin(),
-             _s.rend(),
--            [](unsigned char ch) { return !std::isspace(ch); }).base(),
--            _s.end()
-+            [](const auto ch) { return !std::isspace(ch); }
-+        ).base(),
-+        _s.end()
-     );
- }
- 
-diff --git a/implementation/endpoints/include/endpoint_impl.hpp b/implementation/endpoints/include/endpoint_impl.hpp
-index 9d2b303c..685eba4e 100644
---- a/implementation/endpoints/include/endpoint_impl.hpp
-+++ b/implementation/endpoints/include/endpoint_impl.hpp
-@@ -34,6 +34,9 @@ public:
-                   std::uint32_t _max_message_size,
-                   configuration::endpoint_queue_limit_t _queue_limit,
-                   const std::shared_ptr<configuration>& _configuration);
-+    endpoint_impl(endpoint_impl<Protocol> const&) = delete;
-+    endpoint_impl(endpoint_impl<Protocol> const&&) = delete;
-+
-     virtual ~endpoint_impl();
- 
-     void enable_magic_cookies();
-diff --git a/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp b/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp
-index 53f4769a..b1d8991d 100644
---- a/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp
-+++ b/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp
-@@ -25,8 +25,8 @@ struct storage :
- {
-     socket_type_t &socket_;
-     receive_handler_t handler_;
--    byte_t *buffer_;
--    std::size_t length_;
-+    byte_t *buffer_ = nullptr;
-+    size_t length_;
-     uid_t uid_;
-     gid_t gid_;
-     size_t bytes_;
-diff --git a/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp b/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp
-index d7eede3f..e1e1aaa2 100644
---- a/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp
-+++ b/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp
-@@ -25,7 +25,7 @@ public:
-                                    const endpoint_type& _remote,
-                                    boost::asio::io_context &_io,
-                                    const std::shared_ptr<configuration>& _configuration);
--    virtual ~local_uds_client_endpoint_impl();
-+    virtual ~local_uds_client_endpoint_impl() = default;
- 
-     void start();
-     void stop();
-diff --git a/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp b/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp
-index 1e78822d..a4ed2eb5 100644
---- a/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp
-+++ b/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp
-@@ -50,7 +50,7 @@ public:
-             const std::shared_ptr<configuration>& _configuration,
-             bool _is_routing_endpoint);
- 
--    virtual ~local_uds_server_endpoint_impl();
-+    virtual ~local_uds_server_endpoint_impl() = default;
- 
-     void start();
-     void stop();
-diff --git a/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp b/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp
-index 1e4f0fe0..35638cd7 100644
---- a/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp
-+++ b/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp
-@@ -35,7 +35,7 @@ struct storage :
-     socket_type_t &socket_;
-     endpoint_type_t &sender_;
-     receive_handler_t handler_;
--    byte_t *buffer_;
-+    byte_t *buffer_ = nullptr;
-     size_t length_;
-     std::uint8_t multicast_id_;
-     bool is_v4_;
-diff --git a/implementation/endpoints/src/endpoint_manager_base.cpp b/implementation/endpoints/src/endpoint_manager_base.cpp
-index 9dff9785..4e484454 100644
---- a/implementation/endpoints/src/endpoint_manager_base.cpp
-+++ b/implementation/endpoints/src/endpoint_manager_base.cpp
-@@ -38,7 +38,7 @@ std::shared_ptr<endpoint> endpoint_manager_base::create_local(client_t _client)
-     return create_local_unlocked(_client);
- }
- 
--void endpoint_manager_base::remove_local(client_t _client) {
-+void endpoint_manager_base::remove_local(const client_t _client) {
-     std::shared_ptr<endpoint> its_endpoint(find_local(_client));
-     if (its_endpoint) {
-         its_endpoint->register_error_handler(nullptr);
-diff --git a/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp b/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp
-index 0b7e261c..56c621db 100644
---- a/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp
-+++ b/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp
-@@ -40,12 +40,7 @@ local_uds_client_endpoint_impl::local_uds_client_endpoint_impl(
-     is_supporting_magic_cookies_ = false;
- }
- 
--local_uds_client_endpoint_impl::~local_uds_client_endpoint_impl() {
--
--}
--
- bool local_uds_client_endpoint_impl::is_local() const {
--
-     return true;
- }
- 
-diff --git a/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp b/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp
-index 948fe925..33876c56 100644
---- a/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp
-+++ b/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp
-@@ -104,17 +104,11 @@ local_uds_server_endpoint_impl::local_uds_server_endpoint_impl(
- #endif
- }
- 
--local_uds_server_endpoint_impl::~local_uds_server_endpoint_impl() {
--
--}
--
- bool local_uds_server_endpoint_impl::is_local() const {
--
-     return true;
- }
- 
- void local_uds_server_endpoint_impl::start() {
--
-     std::lock_guard<std::mutex> its_lock(acceptor_mutex_);
-     if (acceptor_.is_open()) {
-         connection::ptr new_connection = connection::create(
-diff --git a/implementation/endpoints/src/tcp_client_endpoint_impl.cpp b/implementation/endpoints/src/tcp_client_endpoint_impl.cpp
-index f42d93d4..e6755157 100644
---- a/implementation/endpoints/src/tcp_client_endpoint_impl.cpp
-+++ b/implementation/endpoints/src/tcp_client_endpoint_impl.cpp
-@@ -178,7 +178,7 @@ void tcp_client_endpoint_impl::connect() {
-         std::string its_device(configuration_->get_device());
-         if (its_device != "") {
-             if (setsockopt(socket_->native_handle(),
--                    SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) {
-+                    SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) {
-                 VSOMEIP_WARNING << "TCP Client: Could not bind to device \"" << its_device << "\"";
-             }
-         }
-diff --git a/implementation/endpoints/src/tcp_server_endpoint_impl.cpp b/implementation/endpoints/src/tcp_server_endpoint_impl.cpp
-index f83252ae..5aef72be 100644
---- a/implementation/endpoints/src/tcp_server_endpoint_impl.cpp
-+++ b/implementation/endpoints/src/tcp_server_endpoint_impl.cpp
-@@ -55,7 +55,7 @@ tcp_server_endpoint_impl::tcp_server_endpoint_impl(
-     std::string its_device(configuration_->get_device());
-     if (its_device != "") {
-         if (setsockopt(acceptor_.native_handle(),
--                SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) {
-+                SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) {
-             VSOMEIP_WARNING << "TCP Server: Could not bind to device \"" << its_device << "\"";
-         }
-     }
-@@ -295,8 +295,8 @@ void tcp_server_endpoint_impl::accept_cbk(const connection::ptr& _connection,
-         auto its_ep = std::dynamic_pointer_cast<tcp_server_endpoint_impl>(
-                 shared_from_this());
-         its_timer->async_wait([its_timer, its_ep]
--                               (const boost::system::error_code& _error) {
--            if (!_error) {
-+                               (const boost::system::error_code& _error_inner) {
-+            if (!_error_inner) {
-                 its_ep->start();
-             }
-         });
-@@ -853,12 +853,12 @@ void tcp_server_endpoint_impl::connection::handle_recv_buffer_exception(
-             << std::setfill('0') << std::hex;
- 
-     for (std::size_t i = 0; i < recv_buffer_size_ && i < 16; i++) {
--        its_message << std::setw(2) << (int) (recv_buffer_[i]) << " ";
-+        its_message << std::setw(2) << static_cast<int>(recv_buffer_[i]) << " ";
-     }
- 
-     its_message << " Last 16 Bytes captured: ";
-     for (int i = 15; recv_buffer_size_ > 15 && i >= 0; i--) {
--        its_message << std::setw(2) <<  (int) (recv_buffer_[static_cast<size_t>(i)]) << " ";
-+        its_message << std::setw(2) <<  static_cast<int>(recv_buffer_[static_cast<size_t>(i)]) << " ";
-     }
-     VSOMEIP_ERROR << its_message.str();
-     recv_buffer_.clear();
-@@ -954,7 +954,7 @@ void tcp_server_endpoint_impl::print_status() {
-     std::lock_guard<std::mutex> its_lock(mutex_);
-     connections_t its_connections;
-     {
--        std::lock_guard<std::mutex> its_lock(connections_mutex_);
-+        std::lock_guard<std::mutex> its_lock_inner(connections_mutex_);
-         its_connections = connections_;
-     }
- 
-@@ -1027,7 +1027,7 @@ void tcp_server_endpoint_impl::connection::wait_until_sent(const boost::system::
-         }
-     }
-     {
--        std::lock_guard<std::mutex> its_lock(its_server->connections_mutex_);
-+        std::lock_guard<std::mutex> its_lock_inner(its_server->connections_mutex_);
-         stop();
-     }
-     its_server->remove_connection(this);
-diff --git a/implementation/endpoints/src/udp_client_endpoint_impl.cpp b/implementation/endpoints/src/udp_client_endpoint_impl.cpp
-index d6952228..f52b2354 100644
---- a/implementation/endpoints/src/udp_client_endpoint_impl.cpp
-+++ b/implementation/endpoints/src/udp_client_endpoint_impl.cpp
-@@ -67,7 +67,7 @@ void udp_client_endpoint_impl::connect() {
-                     << get_address_port_remote();
-         }
-         socket_->set_option(boost::asio::socket_base::receive_buffer_size(
--                udp_receive_buffer_size_), its_error);
-+                static_cast<int>(udp_receive_buffer_size_)), its_error);
-         if (its_error) {
-             VSOMEIP_WARNING << "udp_client_endpoint_impl::connect: couldn't set "
-                     << "SO_RCVBUF: " << its_error.message()
-diff --git a/implementation/endpoints/src/udp_server_endpoint_impl.cpp b/implementation/endpoints/src/udp_server_endpoint_impl.cpp
-index 48e35c5d..587fb94c 100644
---- a/implementation/endpoints/src/udp_server_endpoint_impl.cpp
-+++ b/implementation/endpoints/src/udp_server_endpoint_impl.cpp
-@@ -72,7 +72,7 @@ udp_server_endpoint_impl::udp_server_endpoint_impl(
-     std::string its_device(configuration_->get_device());
-     if (its_device != "") {
-         if (setsockopt(unicast_socket_.native_handle(),
--                SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) {
-+                SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) {
-             VSOMEIP_WARNING << "UDP Server: Could not bind to device \"" << its_device << "\"";
-         }
-     }
-@@ -108,7 +108,7 @@ udp_server_endpoint_impl::udp_server_endpoint_impl(
-     const int its_udp_recv_buffer_size =
-             configuration_->get_udp_receive_buffer_size();
-     unicast_socket_.set_option(boost::asio::socket_base::receive_buffer_size(
--            its_udp_recv_buffer_size), ec);
-+            static_cast<int>(its_udp_recv_buffer_size)), ec);
- 
-     if (ec) {
-         VSOMEIP_WARNING << "udp_server_endpoint_impl: couldn't set "
-diff --git a/implementation/message/include/message_base_impl.hpp b/implementation/message/include/message_base_impl.hpp
-index acad2e89..2c953e98 100644
---- a/implementation/message/include/message_base_impl.hpp
-+++ b/implementation/message/include/message_base_impl.hpp
-@@ -6,8 +6,6 @@
- #ifndef VSOMEIP_V3_MESSAGE_BASE_IMPL_HPP
- #define VSOMEIP_V3_MESSAGE_BASE_IMPL_HPP
- 
--#include <boost/thread.hpp>
--
- #include <vsomeip/export.hpp>
- #include <vsomeip/message.hpp>
- 
-diff --git a/implementation/message/src/deserializer.cpp b/implementation/message/src/deserializer.cpp
-index 3c4eddfa..bfa723d3 100644
---- a/implementation/message/src/deserializer.cpp
-+++ b/implementation/message/src/deserializer.cpp
-@@ -115,8 +115,8 @@ bool deserializer::deserialize(std::string &_target, std::size_t _length) {
-     if (_length > remaining_ || _length > _target.capacity()) {
-         return false;
-     }
--    _target.assign(position_, position_ + long(_length));
--    position_ += long(_length);
-+    _target.assign(position_, position_ + static_cast<std::vector<byte_t>::difference_type>(_length));
-+    position_ += static_cast<std::vector<byte_t>::difference_type>(_length);
-     remaining_ -= _length;
- 
-     return true;
-diff --git a/implementation/plugin/src/plugin_manager_impl.cpp b/implementation/plugin/src/plugin_manager_impl.cpp
-index bea96d01..23b7b892 100644
---- a/implementation/plugin/src/plugin_manager_impl.cpp
-+++ b/implementation/plugin/src/plugin_manager_impl.cpp
-@@ -164,7 +164,7 @@ bool plugin_manager_impl::unload_plugin(plugin_type_e _type) {
-         }
-     } else {
-         VSOMEIP_ERROR << "plugin_manager_impl::unload_plugin didn't find plugin"
--                << " type:" << (int)_type;
-+                << " type:" << static_cast<int>(_type);
-         return false;
-     }
-     return plugins_.erase(_type);
-diff --git a/implementation/routing/src/routing_manager_base.cpp b/implementation/routing/src/routing_manager_base.cpp
-index dde6b260..047e6566 100644
---- a/implementation/routing/src/routing_manager_base.cpp
-+++ b/implementation/routing/src/routing_manager_base.cpp
-@@ -1184,8 +1184,8 @@ void routing_manager_base::remove_local(client_t _client,
-         std::lock_guard<std::mutex> its_lock(local_services_mutex_);
-         // Finally remove all services that are implemented by the client.
-         std::set<std::pair<service_t, instance_t>> its_services;
--        for (auto& s : local_services_) {
--            for (auto& i : s.second) {
-+        for (const auto& s : local_services_) {
-+            for (const auto& i : s.second) {
-                 if (std::get<2>(i.second) == _client) {
-                     its_services.insert({ s.first, i.first });
-                     host_->on_availability(s.first, i.first, availability_state_e::AS_UNAVAILABLE,
-@@ -1202,9 +1202,9 @@ void routing_manager_base::remove_local(client_t _client,
- 
-         // remove disconnected client from offer service history
-         std::set<std::tuple<service_t, instance_t, client_t>> its_clients;
--        for (auto& s : local_services_history_) {
--            for (auto& i : s.second) {
--                for (auto& c : i.second) {
-+        for (const auto& s : local_services_history_) {
-+            for (const auto& i : s.second) {
-+                for (const auto& c : i.second) {
-                     if (c == _client) {
-                         its_clients.insert(std::make_tuple(s.first, i.first, c));
-                     }
-diff --git a/implementation/runtime/include/application_impl.hpp b/implementation/runtime/include/application_impl.hpp
-index 67187a87..c647b531 100644
---- a/implementation/runtime/include/application_impl.hpp
-+++ b/implementation/runtime/include/application_impl.hpp
-@@ -309,7 +309,7 @@ private:
-     std::shared_ptr<sync_handler> get_next_handler();
-     void reschedule_availability_handler(const std::shared_ptr<sync_handler> &_handler);
-     bool has_active_dispatcher();
--    bool is_active_dispatcher(const std::thread::id &_id);
-+    bool is_active_dispatcher(const std::thread::id &_id) const;
-     void remove_elapsed_dispatchers();
- 
-     void shutdown();
-@@ -436,7 +436,7 @@ private:
-     // Dispatcher threads that are running
-     std::set<std::thread::id> running_dispatchers_;
-     // Mutex to protect access to dispatchers_ & elapsed_dispatchers_
--    std::mutex dispatcher_mutex_;
-+    mutable std::mutex dispatcher_mutex_;
- 
-     // Condition to wakeup the dispatcher thread
-     mutable std::condition_variable dispatcher_condition_;
-diff --git a/implementation/runtime/src/application_impl.cpp b/implementation/runtime/src/application_impl.cpp
-index aba906b7..db880b42 100644
---- a/implementation/runtime/src/application_impl.cpp
-+++ b/implementation/runtime/src/application_impl.cpp
-@@ -426,7 +426,8 @@ void application_impl::start() {
-             std::lock_guard<std::mutex> its_lock(dispatcher_mutex_);
-             is_dispatching_ = true;
-             auto its_main_dispatcher = std::make_shared<std::thread>(
--                    std::bind(&application_impl::main_dispatch, shared_from_this()));
-+                    &application_impl::main_dispatch, shared_from_this()
-+            );
-             dispatchers_[its_main_dispatcher->get_id()] = its_main_dispatcher;
-         }
- 
-@@ -1792,7 +1793,7 @@ void application_impl::main_dispatch() {
-             }
-         } else {
-             std::shared_ptr<sync_handler> its_handler;
--            while (is_dispatching_  && is_active_dispatcher(its_id)
-+            while (is_dispatching_ && is_active_dispatcher(its_id)
-                    && (its_handler = get_next_handler())) {
-                 its_lock.unlock();
-                 invoke_handler(its_handler);
-@@ -2048,7 +2049,7 @@ bool application_impl::has_active_dispatcher() {
-     return false;
- }
- 
--bool application_impl::is_active_dispatcher(const std::thread::id &_id) {
-+bool application_impl::is_active_dispatcher(const std::thread::id &_id) const {
-     while (is_dispatching_) {
-         if (dispatcher_mutex_.try_lock()) {
-             for (const auto &d : dispatchers_) {
-diff --git a/implementation/security/src/policy.cpp b/implementation/security/src/policy.cpp
-index 36341223..da0bbd86 100644
---- a/implementation/security/src/policy.cpp
-+++ b/implementation/security/src/policy.cpp
-@@ -175,7 +175,7 @@ policy::deserialize_ids(const byte_t * &_data, uint32_t &_size,
-         if (its_result == false)
-             return false;
- 
--        for (const auto i : its_instances)
-+        for (const auto& i : its_instances)
-             its_ids += std::make_pair(i, its_methods);
- 
-         its_array_length -= (its_current_size - _size);
-@@ -379,7 +379,7 @@ policy::serialize_interval_set(
-     uint32_t its_interval_set_size(0);
-     serialize_u32(its_interval_set_size, _data);
- 
--    for (const auto i : _intervals)
-+    for (const auto& i : _intervals)
-         serialize_interval(i, _data);
- 
-     its_interval_set_size = static_cast<uint32_t>(_data.size()
-diff --git a/implementation/security/src/security.cpp b/implementation/security/src/security.cpp
-index a3b6ab3f..19ff73da 100644
---- a/implementation/security/src/security.cpp
-+++ b/implementation/security/src/security.cpp
-@@ -14,6 +14,7 @@
- #include "../../plugin/include/plugin_manager.hpp"
- 
- #include <array>
-+#include <iomanip>
- #include <tuple>
- 
- #ifndef _WIN32
-diff --git a/implementation/service_discovery/src/service_discovery_impl.cpp b/implementation/service_discovery/src/service_discovery_impl.cpp
-index de6e8467..c3880457 100644
---- a/implementation/service_discovery/src/service_discovery_impl.cpp
-+++ b/implementation/service_discovery/src/service_discovery_impl.cpp
-@@ -5,8 +5,10 @@
- 
- #include <vsomeip/constants.hpp>
- 
--#include <random>
-+#include <chrono>
-+#include <iomanip>
- #include <forward_list>
-+#include <random>
- #include <thread>
- 
- #include <vsomeip/internal/logger.hpp>
-@@ -869,7 +871,7 @@ service_discovery_impl::create_eventgroup_entry(
-                 << std::setw(4) << _service << "."
-                 << std::setw(4) << _instance << "."
-                 << std::setw(4) << _eventgroup << "] "
--                << (uint16_t) _reliability_type;
-+                << static_cast<uint16_t>(_reliability_type);
-         return its_data;
-     }
-     std::shared_ptr<eventgroupentry_impl> its_entry, its_other;
-@@ -1074,7 +1076,7 @@ service_discovery_impl::insert_subscription_ack(
-     // Selective
-     if (_clients.size() > 1 || (*(_clients.begin())) != 0) {
-         auto its_selective_option = std::make_shared<selective_option_impl>();
--        (void)its_selective_option->set_clients(_clients);
-+        static_cast<void>(its_selective_option->set_clients(_clients));
- 
-         its_data.options_.push_back(its_selective_option);
-     }
-@@ -1136,7 +1138,7 @@ service_discovery_impl::on_message(
-         static bool must_start_last_msg_received_timer(true);
-         boost::system::error_code ec;
- 
--        std::lock_guard<std::mutex> its_lock(last_msg_received_timer_mutex_);
-+        std::lock_guard<std::mutex> its_lock_inner(last_msg_received_timer_mutex_);
-         if (0 < last_msg_received_timer_.cancel(ec) || must_start_last_msg_received_timer) {
-             must_start_last_msg_received_timer = false;
-             last_msg_received_timer_.expires_from_now(
-@@ -1272,7 +1274,7 @@ service_discovery_impl::on_message(
-         }
- 
-         {
--            std::unique_lock<std::recursive_mutex> its_lock(its_acknowledgement->get_lock());
-+            std::unique_lock<std::recursive_mutex> its_lock_inner(its_acknowledgement->get_lock());
-             its_acknowledgement->complete();
-             // TODO: Check the following logic...
-             if (its_acknowledgement->has_subscription()) {
-@@ -1543,7 +1545,7 @@ service_discovery_impl::process_offerservice_serviceentry(
-                                     << std::setw(4) << _instance << "."
-                                     << std::setw(4) << eg << "]"
-                                     << " using reliability type:  "
--                                    << std::setw(4) << (uint16_t) offer_type;
-+                                    << std::setw(4) << static_cast<uint16_t>(offer_type);
-                         its_info->set_reliability(offer_type);
-                     }
-                 }
-@@ -1947,7 +1949,7 @@ service_discovery_impl::process_eventgroupentry(
-                     << ": SOME/IP length field in SubscribeEventGroup message header: ["
-                     << std::dec << _entry->get_owning_message()->get_someip_length()
-                     << "] bytes, is shorter than length of deserialized message: ["
--                    << (uint32_t) _entry->get_owning_message()->get_length() << "] bytes. "
-+                    << static_cast<uint32_t>(_entry->get_owning_message()->get_length()) << "] bytes. "
-                     << its_sender.to_string(ec) << " session: "
-                     << std::hex << std::setw(4) << std::setfill('0') << its_session;
-             return;
-@@ -2238,7 +2240,7 @@ service_discovery_impl::process_eventgroupentry(
-                 boost::system::error_code ec;
-                 VSOMEIP_WARNING << __func__
-                     << ": Unsupported eventgroup option ["
--                    << std::hex << (int)its_option->get_type() << "] "
-+                    << std::hex << static_cast<int>(its_option->get_type()) << "] "
-                     << its_sender.to_string(ec) << " session: "
-                     << std::hex << std::setw(4) << std::setfill('0') << its_session;
-                 if (its_ttl > 0) {
-@@ -2332,7 +2334,7 @@ service_discovery_impl::handle_eventgroup_subscription(
-                 << std::setw(4) << _instance << "."
-                 << std::setw(4) << _eventgroup << "]"
-                 << " not valid: Event configuration ("
--                << (std::uint32_t)_info->get_reliability()
-+                << static_cast<std::uint32_t>(_info->get_reliability())
-                 << ") does not match the provided endpoint options: "
-                 << _first_address.to_string(ec) << ":" << std::dec << _first_port << " "
-                 << _second_address.to_string(ec) << ":" << _second_port;
-@@ -2355,14 +2357,14 @@ service_discovery_impl::handle_eventgroup_subscription(
-         boost::system::error_code ec;
-         // TODO: Add session id
-         VSOMEIP_ERROR << __func__
--                << ": Requested major version:[" << (uint32_t) _major
-+                << ": Requested major version:[" << static_cast<uint32_t>(_major)
-                 << "] in subscription to service: ["
-                 << std::hex << std::setfill('0')
-                 << std::setw(4) << _service << "."
-                 << std::setw(4) << _instance << "."
-                 << std::setw(4) << _eventgroup << "]"
-                 << " does not match with services major version:["
--                << (uint32_t) _info->get_major() << "] subscriber: "
-+                << static_cast<uint32_t>(_info->get_major()) << "] subscriber: "
-                 << _first_address.to_string(ec) << ":" << std::dec << _first_port;
-         if (_ttl > 0) {
-             insert_subscription_ack(_acknowledgement, its_info, 0, nullptr, _clients);
-@@ -3107,8 +3109,8 @@ service_discovery_impl::move_offers_into_main_phase(
-     const auto its_timer = repetition_phase_timers_.find(_timer);
-     if (its_timer != repetition_phase_timers_.end()) {
-         for (const auto& its_service : its_timer->second) {
--            for (const auto& instance : its_service.second) {
--                instance.second->set_is_in_mainphase(true);
-+            for (const auto& its_instance : its_service.second) {
-+                its_instance.second->set_is_in_mainphase(true);
-             }
-         }
-         repetition_phase_timers_.erase(_timer);
-@@ -3125,7 +3127,7 @@ service_discovery_impl::stop_offer_service(
-     bool stop_offer_required(false);
-     // Delete from initial phase offers
-     {
--        std::lock_guard<std::mutex> its_lock(collected_offers_mutex_);
-+        std::lock_guard<std::mutex> its_lock_inner(collected_offers_mutex_);
-         if (collected_offers_.size()) {
-             auto its_service_it = collected_offers_.find(its_service);
-             if (its_service_it != collected_offers_.end()) {
-@@ -3147,7 +3149,7 @@ service_discovery_impl::stop_offer_service(
- 
-     // Delete from repetition phase offers
-     {
--        std::lock_guard<std::mutex> its_lock(repetition_phase_timers_mutex_);
-+        std::lock_guard<std::mutex> its_lock_inner(repetition_phase_timers_mutex_);
-         for (auto rpt = repetition_phase_timers_.begin();
-                 rpt != repetition_phase_timers_.end();) {
-             auto its_service_it = rpt->second.find(its_service);
-@@ -3866,7 +3868,7 @@ reliability_type_e service_discovery_impl::get_eventgroup_reliability(
-                         << std::setw(4) << _instance << "."
-                         << std::setw(4) << _eventgroup << "]"
-                         << " using reliability type:  "
--                        << std::setw(4) << (uint16_t) its_reliability;
-+                        << std::setw(4) << static_cast<uint16_t>(its_reliability);
-             its_info->set_reliability(its_reliability);
-         }
-     } else {
-diff --git a/interface/vsomeip/constants.hpp b/interface/vsomeip/constants.hpp
-index 2b040c5e..2519b57f 100644
---- a/interface/vsomeip/constants.hpp
-+++ b/interface/vsomeip/constants.hpp
-@@ -13,54 +13,54 @@
- 
- namespace vsomeip_v3 {
- 
--const major_version_t DEFAULT_MAJOR = 0x00;
--const minor_version_t DEFAULT_MINOR = 0x00000000;
--const ttl_t DEFAULT_TTL = 0xFFFFFF; // "until next reboot"
-+inline constexpr major_version_t DEFAULT_MAJOR = 0x00;
-+inline constexpr minor_version_t DEFAULT_MINOR = 0x00000000;
-+inline constexpr ttl_t DEFAULT_TTL = 0xFFFFFF; // "until next reboot"
- 
- const std::string DEFAULT_MULTICAST = "224.0.0.0";
--const uint16_t DEFAULT_PORT = 30500;
--const uint16_t ILLEGAL_PORT = 0xFFFF;
--const uint16_t ANY_PORT = 0;
--
--const uint16_t NO_TRACE_FILTER_EXPRESSION = 0x0000;
--
--const service_t ANY_SERVICE = 0xFFFF;
--const instance_t ANY_INSTANCE = 0xFFFF;
--const eventgroup_t ANY_EVENTGROUP = 0xFFFF;
--const method_t ANY_METHOD = 0xFFFF;
--const major_version_t ANY_MAJOR = 0xFF;
--const minor_version_t ANY_MINOR = 0xFFFFFFFF;
--
--const eventgroup_t DEFAULT_EVENTGROUP = 0x0001;
--
--const client_t ILLEGAL_CLIENT = 0x0000;
--const method_t INVALID_METHOD = 0x0000;
--
--const byte_t MAGIC_COOKIE_CLIENT_MESSAGE = 0x00;
--const byte_t MAGIC_COOKIE_SERVICE_MESSAGE = 0x80;
--const length_t MAGIC_COOKIE_SIZE = 0x00000008;
--const request_t MAGIC_COOKIE_REQUEST = 0xDEADBEEF;
--const client_t MAGIC_COOKIE_CLIENT = 0xDEAD;
--const protocol_version_t MAGIC_COOKIE_PROTOCOL_VERSION = 0x01;
--const interface_version_t MAGIC_COOKIE_INTERFACE_VERSION = 0x01;
--const message_type_e MAGIC_COOKIE_CLIENT_MESSAGE_TYPE =
-+inline constexpr uint16_t DEFAULT_PORT = 30500;
-+inline constexpr uint16_t ILLEGAL_PORT = 0xFFFF;
-+inline constexpr uint16_t ANY_PORT = 0;
-+
-+inline constexpr uint16_t NO_TRACE_FILTER_EXPRESSION = 0x0000;
-+
-+inline constexpr service_t ANY_SERVICE = 0xFFFF;
-+inline constexpr instance_t ANY_INSTANCE = 0xFFFF;
-+inline constexpr eventgroup_t ANY_EVENTGROUP = 0xFFFF;
-+inline constexpr method_t ANY_METHOD = 0xFFFF;
-+inline constexpr major_version_t ANY_MAJOR = 0xFF;
-+inline constexpr minor_version_t ANY_MINOR = 0xFFFFFFFF;
-+
-+inline constexpr eventgroup_t DEFAULT_EVENTGROUP = 0x0001;
-+
-+inline constexpr client_t ILLEGAL_CLIENT = 0x0000;
-+inline constexpr method_t INVALID_METHOD = 0x0000;
-+
-+inline constexpr byte_t MAGIC_COOKIE_CLIENT_MESSAGE = 0x00;
-+inline constexpr byte_t MAGIC_COOKIE_SERVICE_MESSAGE = 0x80;
-+inline constexpr length_t MAGIC_COOKIE_SIZE = 0x00000008;
-+inline constexpr request_t MAGIC_COOKIE_REQUEST = 0xDEADBEEF;
-+inline constexpr client_t MAGIC_COOKIE_CLIENT = 0xDEAD;
-+inline constexpr protocol_version_t MAGIC_COOKIE_PROTOCOL_VERSION = 0x01;
-+inline constexpr interface_version_t MAGIC_COOKIE_INTERFACE_VERSION = 0x01;
-+inline constexpr message_type_e MAGIC_COOKIE_CLIENT_MESSAGE_TYPE =
-         message_type_e::MT_REQUEST_NO_RETURN;
--const message_type_e MAGIC_COOKIE_SERVICE_MESSAGE_TYPE =
-+inline constexpr message_type_e MAGIC_COOKIE_SERVICE_MESSAGE_TYPE =
-         message_type_e::MT_NOTIFICATION;
--const return_code_e MAGIC_COOKIE_RETURN_CODE = return_code_e::E_OK;
-+inline constexpr return_code_e MAGIC_COOKIE_RETURN_CODE = return_code_e::E_OK;
- 
--const byte_t CLIENT_COOKIE[] = { 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
-+inline constexpr byte_t CLIENT_COOKIE[] = { 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
-         0xDE, 0xAD, 0xBE, 0xEF, 0x01, 0x01, 0x01, 0x00 };
- 
--const byte_t SERVICE_COOKIE[] = { 0xFF, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00,
-+inline constexpr byte_t SERVICE_COOKIE[] = { 0xFF, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00,
-         0x08, 0xDE, 0xAD, 0xBE, 0xEF, 0x01, 0x01, 0x02, 0x00 };
- 
--const event_t ANY_EVENT = 0xFFFF;
--const client_t ANY_CLIENT = 0xFFFF;
-+inline constexpr event_t ANY_EVENT = 0xFFFF;
-+inline constexpr client_t ANY_CLIENT = 0xFFFF;
- 
--const int VSOMEIP_ALL = -1;
-+inline constexpr int VSOMEIP_ALL = -1;
- 
--const pending_security_update_id_t DEFAULT_SECURITY_UPDATE_ID = 0x0;
-+inline constexpr pending_security_update_id_t DEFAULT_SECURITY_UPDATE_ID = 0x0;
- 
- } // namespace vsomeip_v3
- 
-diff --git a/test/network_tests/application_tests/application_test.cpp b/test/network_tests/application_tests/application_test.cpp
-index a4a1923d..c70b6cd5 100644
---- a/test/network_tests/application_tests/application_test.cpp
-+++ b/test/network_tests/application_tests/application_test.cpp
-@@ -3,6 +3,7 @@
- // License, v. 2.0. If a copy of the MPL was not distributed with this
- // file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
-+#include <atomic>
- #include <thread>
- #include <mutex>
- #include <condition_variable>
-diff --git a/tools/vsomeip_ctrl.cpp b/tools/vsomeip_ctrl.cpp
-index 74510427..3e74a832 100644
---- a/tools/vsomeip_ctrl.cpp
-+++ b/tools/vsomeip_ctrl.cpp
-@@ -29,7 +29,6 @@ public:
-         instance_(_instance),
-         app_(vsomeip::runtime::get()->create_application("vsomeip_ctrl")),
-         wait_service_available_(true),
--        send_thread_(std::bind(&vsomeip_sender::send, this)),
-         service_id_(0x0),
-         method_id_(0x0),
-         length_(0),
-@@ -39,6 +38,8 @@ public:
-         return_code_(vsomeip::return_code_e::E_UNKNOWN),
-         wait_for_answer_(true)
-     {
-+        send_thread_ = std::thread{&vsomeip_sender::send, this};
-+
-         if (user_message_.size() < VSOMEIP_PAYLOAD_POS) {
-             VSOMEIP_ERROR << "Provided message is to short, min. length "
-                     "is 16 Bytes, exiting.";
-@@ -117,11 +118,11 @@ public:
-             << std::setw(4) << _response->get_instance() << "]:";
-         VSOMEIP_INFO << "########## begin message";
-         VSOMEIP_INFO << std::hex << std::setw(4)  << std::setfill('0')
--                << _response->get_service() 
-+                << _response->get_service()
-                 << std::hex << std::setw(4) << std::setfill('0')
-                 << _response->get_method()
-                 << " # service id / instance id";
--        VSOMEIP_INFO << std::hex << std::setw(8)  << std::setfill('0') 
-+        VSOMEIP_INFO << std::hex << std::setw(8)  << std::setfill('0')
-                 << _response->get_length() << " # length";
-         VSOMEIP_INFO << std::hex << std::setw(4)  << std::setfill('0')
-                 << _response->get_client()
-@@ -243,7 +244,7 @@ private:
-         }
- 
-         if (use_tcp_ && user_message_.size() > VSOMEIP_MAX_TCP_MESSAGE_SIZE) {
--            VSOMEIP_WARNING << "Max allowed message size for TCP is " 
-+            VSOMEIP_WARNING << "Max allowed message size for TCP is "
-                     << std::dec << VSOMEIP_MAX_TCP_MESSAGE_SIZE
-                     << ". Provided message size is: " << user_message_.size();
-         }
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch
deleted file mode 100644
index b15c8029ec..0000000000
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-From 9b806483d804ab335f7161fdd6248ae3e7ae3bde Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 9 Aug 2024 13:50:05 -0700
-Subject: [PATCH 2/2] network_tests: Include iomanip system header
-
-Latest gcc-14/clang-18 needs this header for setfill and setw
-
-Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/751]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- .../network_tests/big_payload_tests/big_payload_test_service.hpp | 1 +
- test/network_tests/cpu_load_tests/cpu_load_test_service.cpp      | 1 +
- test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp      | 1 +
- test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp     | 1 +
- test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp      | 1 +
- test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp     | 1 +
- test/network_tests/e2e_tests/e2e_test_client.hpp                 | 1 +
- test/network_tests/e2e_tests/e2e_test_service.hpp                | 1 +
- test/network_tests/event_tests/event_test_service.cpp            | 1 +
- .../header_factory_tests/header_factory_test_client.hpp          | 1 +
- .../header_factory_tests/header_factory_test_service.hpp         | 1 +
- test/network_tests/npdu_tests/npdu_test_client.hpp               | 1 +
- test/network_tests/npdu_tests/npdu_test_service.hpp              | 1 +
- test/network_tests/payload_tests/payload_test_client.hpp         | 1 +
- test/network_tests/payload_tests/payload_test_service.hpp        | 1 +
- .../restart_routing_tests/restart_routing_test_client.hpp        | 1 +
- .../restart_routing_tests/restart_routing_test_service.hpp       | 1 +
- .../routing_tests/external_local_routing_test_service.hpp        | 1 +
- test/network_tests/routing_tests/local_routing_test_client.hpp   | 1 +
- test/network_tests/routing_tests/local_routing_test_service.hpp  | 1 +
- .../second_address_tests/second_address_test_service.cpp         | 1 +
- test/network_tests/security_tests/security_test_client.hpp       | 1 +
- test/network_tests/security_tests/security_test_service.hpp      | 1 +
- .../suspend_resume_tests/suspend_resume_test_service.cpp         | 1 +
- 24 files changed, 24 insertions(+)
-
-diff --git a/test/network_tests/big_payload_tests/big_payload_test_service.hpp b/test/network_tests/big_payload_tests/big_payload_test_service.hpp
-index 44af28a9..101b6758 100644
---- a/test/network_tests/big_payload_tests/big_payload_test_service.hpp
-+++ b/test/network_tests/big_payload_tests/big_payload_test_service.hpp
-@@ -14,6 +14,7 @@
- #include <condition_variable>
- #include <functional>
- #include <queue>
-+#include <iomanip>
- 
- #include "big_payload_test_globals.hpp"
- #include <vsomeip/internal/logger.hpp>
-diff --git a/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp b/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp
-index 3d935e39..a98f3edf 100644
---- a/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp
-+++ b/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp
-@@ -13,6 +13,7 @@
- #include <functional>
- #include <numeric>
- #include <cmath> // for isfinite
-+#include <iomanip>
- 
- #include "cpu_load_test_globals.hpp"
- #include <vsomeip/internal/logger.hpp>
-diff --git a/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp b/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp
-index ad002913..82d5e7e2 100644
---- a/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp
-+++ b/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp
-@@ -14,6 +14,7 @@
- #include <mutex>
- #include <condition_variable>
- #include <atomic>
-+#include <iomanip>
- 
- class e2e_profile_04_test_client {
- public:
-diff --git a/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp b/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp
-index 25617917..17852b85 100644
---- a/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp
-+++ b/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp
-@@ -17,6 +17,7 @@
- #include <condition_variable>
- #include <mutex>
- #include <thread>
-+#include <iomanip>
- 
- class e2e_profile_04_test_service {
- public:
-diff --git a/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp b/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp
-index 9b10a589..30d889b5 100644
---- a/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp
-+++ b/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp
-@@ -14,6 +14,7 @@
- #include <mutex>
- #include <condition_variable>
- #include <atomic>
-+#include <iomanip>
- 
- class e2e_profile_07_test_client {
- public:
-diff --git a/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp b/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp
-index ad6488a5..ea1cc05c 100644
---- a/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp
-+++ b/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp
-@@ -17,6 +17,7 @@
- #include <condition_variable>
- #include <mutex>
- #include <thread>
-+#include <iomanip>
- 
- class e2e_profile_07_test_service {
- public:
-diff --git a/test/network_tests/e2e_tests/e2e_test_client.hpp b/test/network_tests/e2e_tests/e2e_test_client.hpp
-index 10f49784..c253f101 100644
---- a/test/network_tests/e2e_tests/e2e_test_client.hpp
-+++ b/test/network_tests/e2e_tests/e2e_test_client.hpp
-@@ -18,6 +18,7 @@
- #include <mutex>
- #include <condition_variable>
- #include <atomic>
-+#include <iomanip>
- 
- class e2e_test_client {
- public:
-diff --git a/test/network_tests/e2e_tests/e2e_test_service.hpp b/test/network_tests/e2e_tests/e2e_test_service.hpp
-index 7fd1c5a9..e839aacb 100644
---- a/test/network_tests/e2e_tests/e2e_test_service.hpp
-+++ b/test/network_tests/e2e_tests/e2e_test_service.hpp
-@@ -16,6 +16,7 @@
- #include <thread>
- #include <mutex>
- #include <condition_variable>
-+#include <iomanip>
- 
- class e2e_test_service {
- public:
-diff --git a/test/network_tests/event_tests/event_test_service.cpp b/test/network_tests/event_tests/event_test_service.cpp
-index 3728a827..d1f117e2 100644
---- a/test/network_tests/event_tests/event_test_service.cpp
-+++ b/test/network_tests/event_tests/event_test_service.cpp
-@@ -10,6 +10,7 @@
- #include <thread>
- #include <map>
- #include <atomic>
-+#include <iomanip>
- 
- #include <gtest/gtest.h>
- 
-diff --git a/test/network_tests/header_factory_tests/header_factory_test_client.hpp b/test/network_tests/header_factory_tests/header_factory_test_client.hpp
-index 79461b69..b72bbdca 100644
---- a/test/network_tests/header_factory_tests/header_factory_test_client.hpp
-+++ b/test/network_tests/header_factory_tests/header_factory_test_client.hpp
-@@ -14,6 +14,7 @@
- #include <mutex>
- #include <condition_variable>
- #include <functional>
-+#include <iomanip>
- 
- #include "../someip_test_globals.hpp"
- #include <common/vsomeip_app_utilities.hpp>
-diff --git a/test/network_tests/header_factory_tests/header_factory_test_service.hpp b/test/network_tests/header_factory_tests/header_factory_test_service.hpp
-index 7879946a..a553adde 100644
---- a/test/network_tests/header_factory_tests/header_factory_test_service.hpp
-+++ b/test/network_tests/header_factory_tests/header_factory_test_service.hpp
-@@ -13,6 +13,7 @@
- #include <mutex>
- #include <condition_variable>
- #include <functional>
-+#include <iomanip>
- 
- #include "../someip_test_globals.hpp"
- #include <common/vsomeip_app_utilities.hpp>
-diff --git a/test/network_tests/npdu_tests/npdu_test_client.hpp b/test/network_tests/npdu_tests/npdu_test_client.hpp
-index 2f469d40..7f615f14 100644
---- a/test/network_tests/npdu_tests/npdu_test_client.hpp
-+++ b/test/network_tests/npdu_tests/npdu_test_client.hpp
-@@ -15,6 +15,7 @@
- #include <condition_variable>
- #include <functional>
- #include <map>
-+#include <iomanip>
- 
- #include "../npdu_tests/npdu_test_globals.hpp"
- #include "../someip_test_globals.hpp"
-diff --git a/test/network_tests/npdu_tests/npdu_test_service.hpp b/test/network_tests/npdu_tests/npdu_test_service.hpp
-index bef06806..1caae785 100644
---- a/test/network_tests/npdu_tests/npdu_test_service.hpp
-+++ b/test/network_tests/npdu_tests/npdu_test_service.hpp
-@@ -15,6 +15,7 @@
- #include <functional>
- #include <chrono>
- #include <deque>
-+#include <iomanip>
- 
- class npdu_test_service
- {
-diff --git a/test/network_tests/payload_tests/payload_test_client.hpp b/test/network_tests/payload_tests/payload_test_client.hpp
-index 1bab6ba6..1754320c 100644
---- a/test/network_tests/payload_tests/payload_test_client.hpp
-+++ b/test/network_tests/payload_tests/payload_test_client.hpp
-@@ -15,6 +15,7 @@
- #include <mutex>
- #include <condition_variable>
- #include <functional>
-+#include <iomanip>
- 
- #include "../someip_test_globals.hpp"
- #include <common/vsomeip_app_utilities.hpp>
-diff --git a/test/network_tests/payload_tests/payload_test_service.hpp b/test/network_tests/payload_tests/payload_test_service.hpp
-index 7d3c01d5..06dbb684 100644
---- a/test/network_tests/payload_tests/payload_test_service.hpp
-+++ b/test/network_tests/payload_tests/payload_test_service.hpp
-@@ -13,6 +13,7 @@
- #include <mutex>
- #include <condition_variable>
- #include <functional>
-+#include <iomanip>
- 
- #include "../someip_test_globals.hpp"
- #include <common/vsomeip_app_utilities.hpp>
-diff --git a/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp b/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp
-index 8a7c9e70..6a758318 100644
---- a/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp
-+++ b/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp
-@@ -19,6 +19,7 @@
- #include <condition_variable>
- #include <atomic>
- #include <future>
-+#include <iomanip>
- 
- class routing_restart_test_client {
- public:
-diff --git a/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp b/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp
-index 7660b8fc..1fe4d86c 100644
---- a/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp
-+++ b/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp
-@@ -16,6 +16,7 @@
- #include <thread>
- #include <mutex>
- #include <condition_variable>
-+#include <iomanip>
- 
- class routing_restart_test_service {
- public:
-diff --git a/test/network_tests/routing_tests/external_local_routing_test_service.hpp b/test/network_tests/routing_tests/external_local_routing_test_service.hpp
-index 2499bc84..b1e2dfd8 100644
---- a/test/network_tests/routing_tests/external_local_routing_test_service.hpp
-+++ b/test/network_tests/routing_tests/external_local_routing_test_service.hpp
-@@ -13,6 +13,7 @@
- #include <mutex>
- #include <condition_variable>
- #include <functional>
-+#include <iomanip>
- 
- #include "../someip_test_globals.hpp"
- #include <common/vsomeip_app_utilities.hpp>
-diff --git a/test/network_tests/routing_tests/local_routing_test_client.hpp b/test/network_tests/routing_tests/local_routing_test_client.hpp
-index 09af0bf0..69ee6bfc 100644
---- a/test/network_tests/routing_tests/local_routing_test_client.hpp
-+++ b/test/network_tests/routing_tests/local_routing_test_client.hpp
-@@ -14,6 +14,7 @@
- #include <mutex>
- #include <condition_variable>
- #include <functional>
-+#include <iomanip>
- 
- #include "../someip_test_globals.hpp"
- #include <common/vsomeip_app_utilities.hpp>
-diff --git a/test/network_tests/routing_tests/local_routing_test_service.hpp b/test/network_tests/routing_tests/local_routing_test_service.hpp
-index 109dade4..932423d8 100644
---- a/test/network_tests/routing_tests/local_routing_test_service.hpp
-+++ b/test/network_tests/routing_tests/local_routing_test_service.hpp
-@@ -13,6 +13,7 @@
- #include <mutex>
- #include <condition_variable>
- #include <functional>
-+#include <iomanip>
- 
- #include "../someip_test_globals.hpp"
- #include <common/vsomeip_app_utilities.hpp>
-diff --git a/test/network_tests/second_address_tests/second_address_test_service.cpp b/test/network_tests/second_address_tests/second_address_test_service.cpp
-index fc9d0a28..3ffa493f 100644
---- a/test/network_tests/second_address_tests/second_address_test_service.cpp
-+++ b/test/network_tests/second_address_tests/second_address_test_service.cpp
-@@ -9,6 +9,7 @@
- #include <sstream>
- #include <thread>
- #include <map>
-+#include <iomanip>
- 
- #include <gtest/gtest.h>
- #include <vsomeip/vsomeip.hpp>
-diff --git a/test/network_tests/security_tests/security_test_client.hpp b/test/network_tests/security_tests/security_test_client.hpp
-index ab3d98b8..bd331138 100644
---- a/test/network_tests/security_tests/security_test_client.hpp
-+++ b/test/network_tests/security_tests/security_test_client.hpp
-@@ -18,6 +18,7 @@
- #include <mutex>
- #include <condition_variable>
- #include <atomic>
-+#include <iomanip>
- 
- class security_test_client {
- public:
-diff --git a/test/network_tests/security_tests/security_test_service.hpp b/test/network_tests/security_tests/security_test_service.hpp
-index 87fb94fd..1f227072 100644
---- a/test/network_tests/security_tests/security_test_service.hpp
-+++ b/test/network_tests/security_tests/security_test_service.hpp
-@@ -16,6 +16,7 @@
- #include <thread>
- #include <mutex>
- #include <condition_variable>
-+#include <iomanip>
- 
- class security_test_service {
- public:
-diff --git a/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp b/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp
-index 6f099ce7..dc9df239 100644
---- a/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp
-+++ b/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp
-@@ -7,6 +7,7 @@
- #include <mutex>
- #include <thread>
- #include <atomic>
-+#include <iomanip>
- 
- #include <gtest/gtest.h>
- 
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch
deleted file mode 100644
index 09dab9a8b0..0000000000
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-build-external-gtest.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From b1bf398015bc090020459954e5cd1ec3b51b8ac3 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Tue, 11 Jul 2023 16:53:46 +0800
-Subject: [PATCH] Do not build external gtest
-
-We don't need to build external gtest since we already depend on
-googletest.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- CMakeLists.txt                    | 11 ----
- test/CMakeLists.txt               | 22 +------
- test/network_tests/CMakeLists.txt | 99 -------------------------------
- 3 files changed, 3 insertions(+), 129 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d791c12e..f1bcba27 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,17 +18,6 @@ set (VSOMEIP_VERSION ${VSOMEIP_MAJOR_VERSION}.${VSOMEIP_MINOR_VERSION}.${VSOMEIP
- set (PACKAGE_VERSION ${VSOMEIP_VERSION}) # Used in documentation/doxygen.in
- set (CMAKE_VERBOSE_MAKEFILE off)
- 
--if (NOT GTEST_ROOT)
--    if (DEFINED ENV{GTEST_ROOT})
--        set(GTEST_ROOT $ENV{GTEST_ROOT})
--    else()
--        include(FetchContent)
--        FetchContent_Declare(googletest GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG v1.14.0) 
--        FetchContent_Populate(googletest)
--        set(GTEST_ROOT ${googletest_SOURCE_DIR})
--    endif()
--endif()
--
- ###################################################################################################
- # see http://www.cmake.org/Wiki/CMake/Tutorials/How_to_create_a_ProjectConfig.cmake_file
- ###################################################################################################
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index f66ac5d3..6f09bf40 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -17,27 +17,11 @@ find_package(benchmark)
- # remove export symbols from the cxx flags
- string(REPLACE "${EXPORTSYMBOLS}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- 
--# check for set environment variable
--if(${GTEST_ROOT} STREQUAL "n/a")
--    message(STATUS "GTEST_ROOT is not defined. For building the tests the variable
--             GTEST_ROOT has to be defined. Tests can not be built.")
--    # early exit
--    return()  # test can not be build -> make commands build_tests and check are not available
--else()
--    message(STATUS "GTEST_ROOT is set. gtest root path set to ${GTEST_ROOT}")
-+find_package(GTest)
-+if (NOT GTest_FOUND)
-+    message(WARNING "GTest is not found. Tests can not be built.")
- endif()
- 
--# build google test as static library (always) -> therefore deactivate BUILD_SHARED_LIBS in case it is active
--set(BUILD_SHARED_LIBS_AUTOMATIC_OFF 0)
--if ("${BUILD_SHARED_LIBS}" STREQUAL "ON")
--    set(BUILD_SHARED_LIBS OFF)
--    set(BUILD_SHARED_LIBS_AUTOMATIC_OFF 1)
--endif()
--add_subdirectory(${GTEST_ROOT} ${CMAKE_CURRENT_BINARY_DIR}/gtest EXCLUDE_FROM_ALL)
--if ("${BUILD_SHARED_LIBS_AUTOMATIC_OFF}" STREQUAL "1")
--    set(BUILD_SHARED_LIBS ON)
--    set(BUILD_SHARED_LIBS_AUTOMATIC_OFF 0)
--endif()
- 
- ##############################################################################
- # build tests
-diff --git a/test/network_tests/CMakeLists.txt b/test/network_tests/CMakeLists.txt
-index 883cc5cf..9a2a4f5e 100644
---- a/test/network_tests/CMakeLists.txt
-+++ b/test/network_tests/CMakeLists.txt
-@@ -4116,105 +4116,6 @@ if(NOT ${TESTS_BAT})
- 
- endif()
- 
--##############################################################################
--# Add for every test a dependency to gtest
--##############################################################################
--
--if(NOT ${TESTS_BAT})
--    add_dependencies(${TEST_CONFIGURATION} gtest)
--    add_dependencies(${TEST_APPLICATION} gtest)
--    add_dependencies(${TEST_APPLICATION_SINGLE_PROCESS_NAME} gtest)
--    add_dependencies(${TEST_APPLICATION_AVAILABILITY_NAME} gtest)
--    add_dependencies(${TEST_MAGIC_COOKIES_CLIENT} gtest)
--    add_dependencies(${TEST_MAGIC_COOKIES_SERVICE} gtest)
--    add_dependencies(${TEST_HEADER_FACTORY} gtest)
--    add_dependencies(${TEST_HEADER_FACTORY_CLIENT} gtest)
--    add_dependencies(${TEST_HEADER_FACTORY_SERVICE} gtest)
--    add_dependencies(${TEST_LOCAL_ROUTING_SERVICE} gtest)
--    add_dependencies(${TEST_LOCAL_ROUTING_CLIENT} gtest)
--    add_dependencies(${TEST_EXTERNAL_LOCAL_ROUTING_SERVICE} gtest)
--    add_dependencies(${TEST_PAYLOAD_SERVICE} gtest)
--    add_dependencies(${TEST_PAYLOAD_CLIENT} gtest)
--    add_dependencies(${TEST_BIG_PAYLOAD_SERVICE} gtest)
--    add_dependencies(${TEST_BIG_PAYLOAD_CLIENT} gtest)
--    add_dependencies(${TEST_CLIENT_ID_SERVICE} gtest)
--    add_dependencies(${TEST_CLIENT_ID_UTILITY} gtest)
--    add_dependencies(${TEST_DEBOUNCE_CLIENT} gtest)
--    add_dependencies(${TEST_DEBOUNCE_SERVICE} gtest)
--    add_dependencies(${TEST_DEBOUNCE_FILTER_CLIENT} gtest)
--    add_dependencies(${TEST_DEBOUNCE_FILTER_SERVICE} gtest)
--    add_dependencies(${TEST_DEBOUNCE_CALLBACK_CLIENT} gtest)
--    add_dependencies(${TEST_DEBOUNCE_CALLBACK_SERVICE} gtest)
--    add_dependencies(${TEST_DEBOUNCE_FREQUENCY_CLIENT} gtest)
--    add_dependencies(${TEST_DEBOUNCE_FREQUENCY_SERVICE} gtest)
--    add_dependencies(${TEST_SUBSCRIBE_NOTIFY_SERVICE} gtest)
--    add_dependencies(${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_SERVICE} gtest)
--    add_dependencies(${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_CLIENT} gtest)
--    add_dependencies(${TEST_SUBSCRIBE_NOTIFY_ONE_SERVICE} gtest)
--    add_dependencies(${TEST_CPU_LOAD_SERVICE} gtest)
--    add_dependencies(${TEST_CPU_LOAD_CLIENT} gtest)
--    add_dependencies(${TEST_INITIAL_EVENT_SERVICE} gtest)
--    add_dependencies(${TEST_INITIAL_EVENT_CLIENT} gtest)
--    add_dependencies(${TEST_INITIAL_EVENT_AVAILABILITY_CHECKER} gtest)
--    add_dependencies(${TEST_INITIAL_EVENT_STOP_SERVICE} gtest)
--    add_dependencies(${TEST_OFFER_SERVICE} gtest)
--    add_dependencies(${TEST_OFFER_CLIENT} gtest)
--    add_dependencies(${TEST_OFFER_SERVICE_EXTERNAL} gtest)
--    add_dependencies(${TEST_OFFER_EXTERNAL_SD_MESSAGE_SENDER} gtest)
--    add_dependencies(${TEST_OFFERED_SERVICES_INFO_CLIENT} gtest)
--    add_dependencies(${TEST_OFFERED_SERVICES_INFO_SERVICE} gtest)
--    add_dependencies(${TEST_PENDING_SUBSCRIPTION_SERVICE} gtest)
--    add_dependencies(${TEST_PENDING_SUBSCRIPTION_CLIENT} gtest)
--    add_dependencies(${TEST_MALICIOUS_DATA_SERVICE} gtest)
--    add_dependencies(${TEST_MALICIOUS_DATA_CLIENT} gtest)
--    if (${TEST_SECURITY})
--        add_dependencies(${TEST_SECURITY_SERVICE} gtest)
--        add_dependencies(${TEST_SECURITY_CLIENT} gtest)
--    endif()
--    add_dependencies(${TEST_E2E_SERVICE} gtest)
--    add_dependencies(${TEST_E2E_CLIENT} gtest)
--    if (${TEST_E2E_PROFILE_04})
--    add_dependencies(${TEST_E2E_PROFILE_04_SERVICE} gtest)
--    add_dependencies(${TEST_E2E_PROFILE_04_CLIENT} gtest)
--    endif()
--    if (${TEST_E2E_PROFILE_07})
--    add_dependencies(${TEST_E2E_PROFILE_07_SERVICE} gtest)
--    add_dependencies(${TEST_E2E_PROFILE_07_CLIENT} gtest)
--    endif()
--    add_dependencies(${TEST_EVENT_SERVICE} gtest)
--    add_dependencies(${TEST_EVENT_CLIENT} gtest)
--    if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX")
--    add_dependencies(${TEST_NPDU_SERVICE_ONE} gtest)
--    add_dependencies(${TEST_NPDU_SERVICE_TWO} gtest)
--    add_dependencies(${TEST_NPDU_SERVICE_THREE} gtest)
--    add_dependencies(${TEST_NPDU_SERVICE_FOUR} gtest)
--    add_dependencies(${TEST_NPDU_CLIENT_ONE} gtest)
--    add_dependencies(${TEST_NPDU_CLIENT_TWO} gtest)
--    add_dependencies(${TEST_NPDU_CLIENT_THREE} gtest)
--    add_dependencies(${TEST_NPDU_CLIENT_FOUR} gtest)
--    add_dependencies(${TEST_NPDU_DAEMON_CLIENT} gtest)
--    add_dependencies(${TEST_NPDU_DAEMON_SERVICE} gtest)
--    endif()
--    add_dependencies(${TEST_SOMEIPTP_CLIENT} gtest)
--    add_dependencies(${TEST_SOMEIPTP_SERVICE} gtest)
--    if(${TEST_SECOND_ADDRESS})
--        add_dependencies(${TEST_SECOND_ADDRESS_CLIENT} gtest)
--        add_dependencies(${TEST_SECOND_ADDRESS_SERVICE} gtest)
--    endif()
--    add_dependencies(${TEST_SUSPEND_RESUME_CLIENT} gtest)
--    add_dependencies(${TEST_SUSPEND_RESUME_SERVICE} gtest)
--else()
--    add_dependencies(${TEST_APPLICATION} gtest)
--    add_dependencies(${TEST_HEADER_FACTORY} gtest)
--    add_dependencies(${TEST_HEADER_FACTORY_CLIENT} gtest)
--    add_dependencies(${TEST_HEADER_FACTORY_SERVICE} gtest)
--    add_dependencies(${TEST_PAYLOAD_SERVICE} gtest)
--    add_dependencies(${TEST_PAYLOAD_CLIENT} gtest)
--    add_dependencies(${TEST_BIG_PAYLOAD_SERVICE} gtest)
--    add_dependencies(${TEST_BIG_PAYLOAD_CLIENT} gtest)
--    add_dependencies(${TEST_LOCAL_ROUTING_SERVICE} gtest)
--    add_dependencies(${TEST_LOCAL_ROUTING_CLIENT} gtest)
--endif()
- 
- ##############################################################################
- # Add tests to the target build_network_tests
--- 
-2.25.1
-
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch
index 4bb2318555..2d789627a3 100644
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch
@@ -23,11 +23,9 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f1bcba27..2653a4df 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -60,12 +60,12 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+@@ -70,7 +70,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux"
  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
      # This is only relevant for GCC and causes warnings on Clang
      set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc")
@@ -36,12 +34,12 @@ index f1bcba27..2653a4df 100644
  endif()
  
      set(NO_DEPRECATED "")
-     set(OPTIMIZE "")
--    set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wpedantic -Werror -fPIE")
-+    set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wpedantic")
+@@ -78,7 +78,7 @@ endif()
+   if(NOT DEFINED _FORTIFY_SOURCE)
+       set(_FORTIFY_SOURCE 2)
+   endif()
+-    set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -fPIE")
++    set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic")
  
      # force all use of std::mutex and std::recursive_mutex to use runtime init
      # instead of static initialization so mutexes can be hooked to enable PI as needed
--- 
-2.25.1
-
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.3.bb
index 36fa196a5f..f854078004 100644
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.3.bb
@@ -7,17 +7,17 @@ SECTION = "net"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
+GTEST_VER = "1.15.2"
 SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name=vsomeip \
+           https://github.com/google/googletest/releases/download/v${GTEST_VER}/googletest-${GTEST_VER}.tar.gz;name=gtest;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/ \
            file://0001-Fix-pkgconfig-dir-for-multilib.patch \
            file://0002-Install-example-configuration-files-to-etc-vsomeip.patch \
-           file://0003-Do-not-build-external-gtest.patch \
            file://0004-Do-not-specify-PIE-flag-explicitly.patch \
            file://0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch \
-           file://0001-Update-to-C-17-560.patch \
-           file://0002-network_tests-Include-iomanip-system-header.patch \
           "
 
-SRCREV = "02c199dff8aba814beebe3ca417fd991058fe90c"
+SRCREV = "6461369b3874c844642c9adaac9d1b7406794ab8"
+SRC_URI[gtest.sha256sum] = "7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926"
 
 COMPATIBLE_HOST:mips = "null"
 COMPATIBLE_HOST:mips64 = "null"
@@ -26,12 +26,12 @@ COMPATIBLE_HOST:libc-musl = 'null'
 
 DEPENDS = "boost dlt-daemon googletest"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
 EXTRA_OECMAKE = "-DINSTALL_LIB_DIR:PATH=${baselib} \
                  -DINSTALL_CMAKE_DIR:PATH=${baselib}/cmake/vsomeip3 \
+                 -DGTEST_ROOT=${S}/googletest-${GTEST_VER} \
                 "
 
 # For vsomeip-test
@@ -63,7 +63,7 @@ do_install:append() {
 
     for d in unit_tests network_tests; do
         install -d ${D}/opt/${PN}-test/test/$d
-        cp -f ${B}/test/$d/*test* ${D}/opt/${PN}-test/test/$d
+        cp -rf ${B}/test/$d/*_tests ${D}/opt/${PN}-test/test/$d
     done
 }
 
@@ -75,3 +75,4 @@ FILES:${PN}-dbg += " \
 FILES:${PN}-test = " \
    /opt/${PN}-test \
    "
+SKIP_RECIPE[vsomeip] ?= "Does not work with boost >= 1.87"
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd/0001-Fix-build-with-GCC-15.patch b/meta-networking/recipes-protocols/xl2tpd/xl2tpd/0001-Fix-build-with-GCC-15.patch
new file mode 100644
index 0000000000..2ba927bf0e
--- /dev/null
+++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd/0001-Fix-build-with-GCC-15.patch
@@ -0,0 +1,39 @@
+From 754b0ca247b2d789f9f613f8757b9732494e9489 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Thu, 6 Mar 2025 21:03:28 -0500
+Subject: [PATCH] Fix build with GCC 15
+
+GCC 15 defaults to C23, in which the interpretation of function
+declarations without parameters changed from unspecified to `void`.  This
+results in `control_handle_lac_status` not being compatible with the
+expected callback function type.  Adding the expected type parameters,
+albeit unused, fixes the compatibility.
+
+Upstream-Status: Submitted [https://github.com/xelerance/xl2tpd/pull/272]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ xl2tpd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xl2tpd.c b/xl2tpd.c
+index 3195988..0d148e9 100644
+--- a/xl2tpd.c
++++ b/xl2tpd.c
+@@ -74,7 +74,7 @@ static int control_handle_lac_hangup(FILE* resf, char* bufp);
+ static int control_handle_lac_disconnect(FILE* resf, char* bufp);
+ static int control_handle_lac_add_modify(FILE* resf, char* bufp);
+ static int control_handle_lac_remove(FILE* resf, char* bufp);
+-static int control_handle_lac_status();
++static int control_handle_lac_status(FILE*, char*);
+ static int control_handle_lns_remove(FILE* resf, char* bufp);
+ 
+ static struct control_requests_handler control_handlers[] = {
+@@ -1541,7 +1541,7 @@ static int control_handle_lac_remove(FILE* resf, char* bufp){
+     return 1;
+ }
+ 
+-static int control_handle_lac_status(){
++static int control_handle_lac_status(FILE*, char*){
+     show_status ();
+     return 1;
+ }
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb
index 08bab4a338..e1638bfa19 100644
--- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb
+++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb
@@ -8,12 +8,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/xelerance/xl2tpd.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/xelerance/xl2tpd.git;branch=master;protocol=https \
+    file://0001-Fix-build-with-GCC-15.patch \
+"
 SRCREV = "1ef2a025981223c1e16fc833bef226c86ff8c295"
 
 UPSTREAM_CHECK_URI = "https://github.com/xelerance/xl2tpd/releases"
 
-S = "${WORKDIR}/git"
 
 inherit update-rc.d
 
diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb
index f9dd66f605..be2cfb0816 100644
--- a/meta-networking/recipes-support/arptables/arptables_git.bb
+++ b/meta-networking/recipes-support/arptables/arptables_git.bb
@@ -14,7 +14,6 @@ SRC_URI = " \
 SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5"
 SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928"
 
-S = "${WORKDIR}/git"
 SYSTEMD_SERVICE:${PN} = "arptables.service"
 
 inherit systemd
diff --git a/meta-networking/recipes-support/bmon/bmon_4.0.bb b/meta-networking/recipes-support/bmon/bmon_4.0.bb
index c974d54fe8..f47069471a 100644
--- a/meta-networking/recipes-support/bmon/bmon_4.0.bb
+++ b/meta-networking/recipes-support/bmon/bmon_4.0.bb
@@ -9,4 +9,3 @@ SRC_URI = "git://github.com/tgraf/bmon.git;branch=master;protocol=https"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/git"
diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb
index cf0fc1c33d..59e3dbae5f 100644
--- a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb
+++ b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb
@@ -15,9 +15,8 @@ SRC_URI = "\
     file://0004-cleanup-includes.patch \
 "
 
-S = "${WORKDIR}/git"
 
-DEPENDS = "sysfsutils"
+CVE_PRODUCT = "kernel:bridge-utils"
 
 inherit autotools-brokensep update-alternatives
 
diff --git a/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-networking/recipes-support/celt051/celt051_git.bb
index 4842a0fbdf..a9a664c196 100644
--- a/meta-networking/recipes-support/celt051/celt051_git.bb
+++ b/meta-networking/recipes-support/celt051/celt051_git.bb
@@ -21,7 +21,6 @@ SRC_URI = "git://gitlab.xiph.org/xiph/celt.git;branch=compat-v0.5.1;protocol=htt
            file://0001-tests-Include-entcode.c-into-test-sources-to-provide.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools-brokensep
 
diff --git a/meta-networking/recipes-support/chrony/chrony_4.5.bb b/meta-networking/recipes-support/chrony/chrony_4.6.1.bb
index 0681a34393..5ac3e6d37e 100644
--- a/meta-networking/recipes-support/chrony/chrony_4.5.bb
+++ b/meta-networking/recipes-support/chrony/chrony_4.6.1.bb
@@ -30,7 +30,7 @@ SECTION = "net"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \
+SRC_URI = "https://chrony-project.org/releases/chrony-${PV}.tar.gz \
     file://chrony.conf \
     file://chronyd \
     file://arm_eabi.patch \
@@ -39,7 +39,7 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \
 SRC_URI:append:libc-musl = " \
     file://0001-Fix-compilation-with-musl.patch \
 "
-SRC_URI[sha256sum] = "19fe1d9f4664d445a69a96c71e8fdb60bcd8df24c73d1386e02287f7366ad422"
+SRC_URI[sha256sum] = "571ff73fbf0ae3097f0604eca2e00b1d8bb2e91affe1a3494785ff21d6199c5c"
 
 DEPENDS = "pps-tools"
 
@@ -48,9 +48,9 @@ DEPENDS = "pps-tools"
 inherit update-rc.d systemd pkgconfig
 
 # Add chronyd user if privdrop packageconfig is selected
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)}
+inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'useradd', '', d)}
 USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', '', d)}"
-USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /bin/nologin chronyd;', '', d)}"
+USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /sbin/nologin chronyd;', '', d)}"
 
 # Configuration options:
 # - Security-related:
@@ -67,6 +67,7 @@ PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss"
 PACKAGECONFIG[privdrop] = ",--disable-privdrop,libcap"
 PACKAGECONFIG[scfilter] = "--enable-scfilter,--without-seccomp,libseccomp"
 PACKAGECONFIG[ipv6] = ",--disable-ipv6,"
+PACKAGECONFIG[nts] = ",--disable-nts,gnutls"
 
 # --disable-static isn't supported by chrony's configure script.
 DISABLE_STATIC = ""
diff --git a/meta-networking/recipes-support/cifs/cifs-utils_7.0.bb b/meta-networking/recipes-support/cifs/cifs-utils_7.0.bb
index c78bbae7b8..e2918503be 100644
--- a/meta-networking/recipes-support/cifs/cifs-utils_7.0.bb
+++ b/meta-networking/recipes-support/cifs/cifs-utils_7.0.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SRCREV = "316522036133d44ed02cd39ed2748e2b59c85b30"
 SRC_URI = "git://git.samba.org/cifs-utils.git;branch=master"
 
-S = "${WORKDIR}/git"
 DEPENDS += "libtalloc"
 
 PACKAGECONFIG ??= ""
diff --git a/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch b/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch
new file mode 100644
index 0000000000..1712a53462
--- /dev/null
+++ b/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch
@@ -0,0 +1,36 @@
+From ebe9144fdfdc8154661b93322cec4a1c43aa75ff Mon Sep 17 00:00:00 2001
+From: alperak <alperyasinak1@gmail.com>
+Date: Tue, 1 Oct 2024 19:45:38 +0300
+Subject: [PATCH] Fix invalid conversion from int to CURLoption
+
+Options.hpp:281:74: error: invalid conversion from 'int' to 'CURLoption' [-fpermissive]
+  281 |         typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy;
+      |                                                                          ^
+      |                                                                          |
+      |                                                                          int
+
+Fix invalid conversion by adding explicit cast to CURLoption
+
+Upstream-Status: Pending
+
+Signed-off-by: alperak <alperyasinak1@gmail.com>
+---
+ include/curlpp/Options.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/curlpp/Options.hpp b/include/curlpp/Options.hpp
+index c705c9d..7c9a501 100644
+--- a/include/curlpp/Options.hpp
++++ b/include/curlpp/Options.hpp
+@@ -278,7 +278,7 @@ namespace options
+        typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_LIMIT> LowSpeedLimit;
+        typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_TIME> LowSpeedTime;
+        typedef curlpp::OptionTrait<long, CURLOPT_MAXCONNECTS> MaxConnects;
+-       typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy;
++       typedef curlpp::OptionTrait<curl_closepolicy, (CURLoption)CURLOPT_CLOSEPOLICY> ClosePolicy;
+        typedef curlpp::OptionTrait<bool, CURLOPT_FRESH_CONNECT> FreshConnect;
+        typedef curlpp::OptionTrait<bool, CURLOPT_FORBID_REUSE> ForbidReuse;
+        typedef curlpp::OptionTrait<long, CURLOPT_CONNECTTIMEOUT> ConnectTimeout;
+-- 
+2.25.1
+
diff --git a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb
index 131f1873a2..25ea1fdefb 100644
--- a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb
+++ b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb
@@ -8,11 +8,11 @@ DEPENDS = "curl"
 DEPENDS:class-native = "curl-native"
 
 SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \
-           file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch"
+           file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch \
+           file://0002-fix-invalid-conversion-from-int-to-CURLoption.patch"
 
 SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig binconfig
 
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.91.bb
index ba783d03ff..25f2d4c09a 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.91.bb
@@ -16,7 +16,7 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV
            file://dnsmasq-noresolvconf.service \
            file://dnsmasq-resolved.conf \
 "
-SRC_URI[sha256sum] = "8f6666b542403b5ee7ccce66ea73a4a51cf19dd49392aaccd37231a2c51b303b"
+SRC_URI[sha256sum] = "2d26a048df452b3cfa7ba05efbbcdb19b12fe7a0388761eb5d00938624bd76c8"
 
 inherit pkgconfig update-rc.d systemd
 
diff --git a/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch b/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch
new file mode 100644
index 0000000000..0765d963c1
--- /dev/null
+++ b/meta-networking/recipes-support/dovecot/dovecot/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch
@@ -0,0 +1,24 @@
+From 1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830 Mon Sep 17 00:00:00 2001
+From: fundawang <fundawang@yeah.net>
+Date: Sun, 27 Oct 2024 22:11:21 +0800
+Subject: [PATCH] configure: Explicitly check for icu-uc
+
+Ensure we link against libicu-uc when it's split in v76.
+
+Upstream-Status: Backport [https://github.com/dovecot/core/commit/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ m4/want_icu.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/m4/want_icu.m4
++++ b/m4/want_icu.m4
+@@ -1,7 +1,7 @@
+ AC_DEFUN([DOVECOT_WANT_ICU], [
+   if test "$want_icu" != "no"; then
+     if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists icu-i18n 2>/dev/null; then
+-      PKG_CHECK_MODULES(LIBICU, icu-i18n)
++      PKG_CHECK_MODULES(LIBICU, [icu-i18n icu-uc])
+       have_icu=yes
+       AC_DEFINE(HAVE_LIBICU,, [Define if you want ICU normalization support for FTS])
+     elif test "$want_icu" = "yes"; then
diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.1.bb
index 4e76d24526..3177cdb1d7 100644
--- a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb
+++ b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.1.bb
@@ -11,8 +11,9 @@ SRC_URI = "http://dovecot.org/releases/2.3/dovecot-${PV}.tar.gz \
            file://dovecot.socket \
            file://0001-not-check-pandoc.patch \
            file://0001-m4-Check-for-libunwind-instead-of-libunwind-generic.patch \
+           file://1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830.patch \
            "
-SRC_URI[sha256sum] = "05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d"
+SRC_URI[sha256sum] = "2d90a178c4297611088bf7daae5492a3bc3d5ab6328c3a032eb425d2c249097e"
 
 DEPENDS = "openssl xz zlib bzip2 libcap icu libtirpc bison-native"
 CFLAGS += "-I${STAGING_INCDIR}/tirpc"
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
new file mode 100644
index 0000000000..00105fb844
--- /dev/null
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-Fix-build-with-gcc-15.patch
@@ -0,0 +1,34 @@
+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-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
index ef0229d5bb..93cb8e185e 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch
@@ -1,29 +1,21 @@
-From 9109f15f5b8ae142823194b9ef50c392615fe38d Mon Sep 17 00:00:00 2001
+From a019fbe36ab965e754b818fe1bdb0cea0e3ffb60 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 21 Apr 2022 17:22:35 +0800
-Subject: [PATCH] drbd-utils: support usermerge
+Subject: [PATCH] drbd-utils: support usrmerge
 
 Upstream-Status: Inappropriate [oe-specific]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
 ---
- configure.ac                             |  2 +-
- scripts/Makefile.in                      | 10 +++++-----
- scripts/drbd-demote-or-escalate@.service |  2 +-
- scripts/drbd-promote@.service            |  4 ++--
- scripts/drbd-wait-promotable@.service    |  2 +-
- scripts/drbd.service                     |  6 +++---
- scripts/drbd@.service                    |  6 +++---
- scripts/ocf.ra@.service                  |  4 ++--
- user/v84/Makefile.in                     | 14 +++++++-------
- 9 files changed, 25 insertions(+), 25 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index d3ec5ff1..910232b1 100644
+index 37148597..52015fb2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -178,7 +178,7 @@ AC_ARG_WITH(tmpfilesdir,
+@@ -217,7 +217,7 @@ AC_ARG_WITH(tmpfilesdir,
  AC_SUBST(tmpfilesdir)
  
  # set default early
@@ -32,141 +24,6 @@ index d3ec5ff1..910232b1 100644
  if test x"$with_udev" = x || \
     test x"$with_udev" = xyes ; then
         if test x"$PKG_CONFIG" != x; then
-diff --git a/scripts/Makefile.in b/scripts/Makefile.in
-index 15a26f37..ff028310 100644
---- a/scripts/Makefile.in
-+++ b/scripts/Makefile.in
-@@ -90,11 +90,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd)
-        install -d $(DESTDIR)$(systemdunitdir)
-        install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/
-        install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/
--       install -d $(DESTDIR)/lib/drbd/scripts
--       install -m 755 drbd $(DESTDIR)/lib/drbd/scripts
--       install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts
--       install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts
--       install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts
-+       install -d $(DESTDIR)/${nonarch_libdir}/drbd/scripts
-+       install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd/scripts
-+       install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
-+       install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
-+       install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbd/scripts
-        install -d $(DESTDIR)$(tmpfilesdir)/
-        install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf
- endif
-diff --git a/scripts/drbd-demote-or-escalate@.service b/scripts/drbd-demote-or-escalate@.service
-index 20932238..8b5ce4a2 100644
---- a/scripts/drbd-demote-or-escalate@.service
-+++ b/scripts/drbd-demote-or-escalate@.service
-@@ -28,5 +28,5 @@ TimeoutSec=60
- # "Type=forking" would be an option to have it retry a number of times,
- # and then only escalate to FailureAction if that did not help.
- Type=oneshot
--ExecStart=/lib/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I
-+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary-or-escalate %I
- ExecStopPost=-/bin/journalctl --sync
-diff --git a/scripts/drbd-promote@.service b/scripts/drbd-promote@.service
-index 71345d9b..678e0703 100644
---- a/scripts/drbd-promote@.service
-+++ b/scripts/drbd-promote@.service
-@@ -24,5 +24,5 @@ RemainAfterExit=yes
- # (ab)using systemd features
- # if we cannot configure and promote, that's a condition, not a failure
- # See the comment above wrt. FailureAction vs OnFailure
--ExecCondition=/lib/drbd/scripts/drbd-service-shim.sh primary %I
--ExecStop=/lib/drbd/scripts/drbd-service-shim.sh secondary %I
-+ExecCondition=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh primary %I
-+ExecStop=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh secondary %I
-diff --git a/scripts/drbd-wait-promotable@.service b/scripts/drbd-wait-promotable@.service
-index 81c3789f..3416abc6 100644
---- a/scripts/drbd-wait-promotable@.service
-+++ b/scripts/drbd-wait-promotable@.service
-@@ -10,7 +10,7 @@ Type=oneshot
- 
- # on first start, wait for access to "good data"
- # let systemd handle timeouts
--ExecStart=/lib/drbd/scripts/drbd-wait-promotable.sh %I
-+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-wait-promotable.sh %I
- RemainAfterExit=yes
- 
- [Install]
-diff --git a/scripts/drbd.service b/scripts/drbd.service
-index 96c599e7..c81e95a6 100644
---- a/scripts/drbd.service
-+++ b/scripts/drbd.service
-@@ -12,11 +12,11 @@ RemainAfterExit=yes
- # A check for INIT_VERSION already exists, just set it to something.
- Environment=INIT_VERSION=systemd
- 
--ExecStart=/lib/drbd/scripts/drbd start
--ExecStop=/lib/drbd/scripts/drbd stop
-+ExecStart=@nonarch_libdir@/drbd/scripts/drbd start
-+ExecStop=@nonarch_libdir@/drbd/scripts/drbd stop
- 
- # Re-adjust everything on reload
--ExecReload=/lib/drbd/scripts/drbd reload
-+ExecReload=@nonarch_libdir@/drbd/scripts/drbd reload
- 
- [Install]
- WantedBy=multi-user.target
-diff --git a/scripts/drbd@.service b/scripts/drbd@.service
-index 0fad10be..556f3857 100644
---- a/scripts/drbd@.service
-+++ b/scripts/drbd@.service
-@@ -35,8 +35,8 @@ RemainAfterExit=yes
- 
- # depends... do we want this as ExecCondition or as ExecStart
- # failed start is "failed", failed condition is just "not startable yet"
--ExecStart=/lib/drbd/scripts/drbd-service-shim.sh adjust %I
--ExecReload=/lib/drbd/scripts/drbd-service-shim.sh adjust %I
-+ExecStart=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I
-+ExecReload=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh adjust %I
- 
- # can only succeed, if you first stop all depending services
--ExecStopPost=/lib/drbd/scripts/drbd-service-shim.sh down %I
-+ExecStopPost=@nonarch_libdir@/drbd/scripts/drbd-service-shim.sh down %I
-diff --git a/scripts/ocf.ra@.service b/scripts/ocf.ra@.service
-index 9c2268a6..1666c482 100644
---- a/scripts/ocf.ra@.service
-+++ b/scripts/ocf.ra@.service
-@@ -22,5 +22,5 @@ Environment=monitor_inverval=30
- # Only the first argument is used by the wrapper,
- # the %n is just to identify which is which in the process list.
- # All parameterization is done via Environment= in per instance override.conf
--ExecStart=/lib/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n
--ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n
-+ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n
-+ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n
-diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in
-index 0fcefc5f..81f7d5ec 100644
---- a/user/v84/Makefile.in
-+++ b/user/v84/Makefile.in
-@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes)
-        install -d $(DESTDIR)$(localstatedir)/lib/drbd
-        install -d $(DESTDIR)$(localstatedir)/run/drbd
-        install -d $(DESTDIR)$(localstatedir)/lock
--       install -d $(DESTDIR)/lib/drbd/
-+       install -d $(DESTDIR)/${nonarch_libdir}/drbd/
-        if getent group haclient > /dev/null 2> /dev/null ; then        \
--               install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \
--               install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ;                \
-+               install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ;   \
-+               install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ;          \
-        else                                                            \
--               install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ;              \
--               install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ;                \
-+               install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ;                \
-+               install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ;          \
-        fi
- endif
- 
- uninstall:
--       rm -f $(DESTDIR)/lib/drbd/drbdsetup-84
--       rm -f $(DESTDIR)/lib/drbd/drbdadm-84
-+       rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84
-+       rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84
- 
- spell:
-        for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \
 -- 
 2.25.1
 
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
index c7766067a1..ac2626c1c8 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbdmon-add-LDFLAGS-when-linking.patch
@@ -1,4 +1,4 @@
-From bb044160faf4ae7615ddfdb17641dd88c33cde57 Mon Sep 17 00:00:00 2001
+From 26ed5003847a14a16d0c1d4030aa1a361c0289fb Mon Sep 17 00:00:00 2001
 From: Sakib Sajal <sakib.sajal@windriver.com>
 Date: Thu, 31 Mar 2022 15:09:58 -0400
 Subject: [PATCH] drbdmon: add LDFLAGS when linking
@@ -7,11 +7,11 @@ Upstream-Status: Pending
 
 Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
 ---
- user/drbdmon/Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ user/drbdmon/Makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/user/drbdmon/Makefile.in b/user/drbdmon/Makefile.in
-index 7bd8987e..115a81b8 100644
+index 9c5427e9..0101a60b 100644
 --- a/user/drbdmon/Makefile.in
 +++ b/user/drbdmon/Makefile.in
 @@ -1,6 +1,6 @@
@@ -22,12 +22,19 @@ index 7bd8987e..115a81b8 100644
  CXX = @CXX@
  LIBS = @LIBS@
  
-@@ -72,7 +72,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h
+@@ -76,10 +76,10 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h
  $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h
  
  drbdmon: $(ls-obj)
 -       $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS)
 +       $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS)
  
+ drbd-events-log-supplier: $(supplier-obj)
+-       $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^
++       $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^
+ 
  # do not try to rebuild Makefile itself
  Makefile: ;
+-- 
+2.25.1
+
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb
index af0afc2a91..4c520e8c78 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_9.30.0.bb
@@ -8,16 +8,16 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
 
 SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;protocol=https \
-           git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \
+           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 \
            "
-SRCREV_drbd-utils = "ba2ce9037989b6141222c7901d1219cf852949f1"
-SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a"
+SRCREV_drbd-utils = "36ea199f38b543b2da92219109c2832e122e5bf9"
+SRCREV_drbd-headers = "94f4472513f351efba5788f783feba6ac6efe9fc"
 
 SRCREV_FORMAT = "drbd-utils_drbd-headers"
 
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases"
 
diff --git a/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb b/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb
index baa9398a18..badeed8e82 100644
--- a/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb
+++ b/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/nhorman/dropwatch.git;protocol=https;nobranch=1 \
 "
 SRCREV = "1e7e487a019a7c02f1f429c4d3a4647fa3787a13"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "binutils libnl libpcap readline"
 
diff --git a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb b/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb
index 723d7c8f78..d5dc10a889 100644
--- a/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb
+++ b/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb
@@ -25,7 +25,6 @@ SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https \
 
 SRCREV = "7281fbddb7da7478beb1d21e3cb105fff3778b31"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = " \
     -DCMAKE_SKIP_RPATH=TRUE \
diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb b/meta-networking/recipes-support/fetchmail/fetchmail_6.5.2.bb
index cc23d5a34e..c1def016e9 100644
--- a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb
+++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.5.2.bb
@@ -6,13 +6,13 @@ connections). It supports every remote-mail protocol now in use on the Internet:
 RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC."
 SECTION = "mail"
 LICENSE = "GPL-2.0-only & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ee6b9f41d9324434dd11bd8a38f1b044"
+LIC_FILES_CHKSUM = "file://COPYING;md5=46d2874dd6a0c8961d80c805f106a35f"
 
 DEPENDS = "openssl"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \
            "
-SRC_URI[sha256sum] = "a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9"
+SRC_URI[sha256sum] = "8fd0477408620ae382c1d0ef83d8946a95e5be0c2e582dd4ebe55cba513a45fe"
 
 inherit autotools gettext pkgconfig python3-dir python3native
 
diff --git a/meta-networking/recipes-support/fping/fping_5.2.bb b/meta-networking/recipes-support/fping/fping_5.3.bb
index f75b6441b2..5f3ec67cfc 100644
--- a/meta-networking/recipes-support/fping/fping_5.2.bb
+++ b/meta-networking/recipes-support/fping/fping_5.3.bb
@@ -15,9 +15,9 @@ NO_GENERIC_LICENSE[fping] = "COPYING"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901"
 
 SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz"
-SRC_URI[sha256sum] = "a7692d10d73fb0bb76e1f7459aa7f19bbcdbfc5adbedef02f468974b18b0e42f"
+SRC_URI[sha256sum] = "d57bd0141aea082e3adfc198bfc3db5dfd12a7014c7c2655e97f61cd54901d0e"
 
-S = "${WORKDIR}/fping-${PV}"
+S = "${UNPACKDIR}/fping-${PV}"
 
 inherit autotools
 
diff --git a/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb
index 8e23b66c48..9c2535b95b 100644
--- a/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb
+++ b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb
@@ -9,7 +9,6 @@ SECTION = "libdevel"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e4f3ea6e9b28af88dc0321190a1f8250"
 
-S = "${WORKDIR}/git"
 SRCREV = "4cdfdc38eca237c19c22a8b90490446ce6d970fa"
 SRC_URI = "git://github.com/maxmind/geoip-api-perl.git;branch=main;protocol=https \
     file://run-ptest \
diff --git a/meta-networking/recipes-support/geoip/geoip_1.6.12.bb b/meta-networking/recipes-support/geoip/geoip_1.6.12.bb
index b247823cd4..7482dba64a 100644
--- a/meta-networking/recipes-support/geoip/geoip_1.6.12.bb
+++ b/meta-networking/recipes-support/geoip/geoip_1.6.12.bb
@@ -11,10 +11,10 @@ SECTION = "libdevel"
 GEOIP_DATABASE_VERSION = "20181205"
 
 SRC_URI = "git://github.com/maxmind/geoip-api-c.git;branch=main;protocol=https \
-           http://sources.openembedded.org/GeoIP.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoIP-dat; \
-           http://sources.openembedded.org/GeoIPv6.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoIPv6-dat; \
-           http://sources.openembedded.org/GeoLiteCity.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoLiteCity-dat; \
-           http://sources.openembedded.org/GeoLiteCityv6.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoLiteCityv6-dat; \
+           https://downloads.yoctoproject.org/mirror/sources/GeoIP.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoIP-dat; \
+           https://downloads.yoctoproject.org/mirror/sources/GeoIPv6.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoIPv6-dat; \
+           https://downloads.yoctoproject.org/mirror/sources/GeoLiteCity.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoLiteCity-dat; \
+           https://downloads.yoctoproject.org/mirror/sources/GeoLiteCityv6.dat.${GEOIP_DATABASE_VERSION}.gz;apply=no;name=GeoLiteCityv6-dat; \
            file://run-ptest \
 "
 SRCREV = "4b526e7331ca1d692b74a0509ddcc725622ed31a"
@@ -36,7 +36,6 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad \
                     file://LICENSE;md5=0388276749a542b0d611601fa7c1dcc8 "
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb b/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb
index 528289b7fd..7def915db5 100644
--- a/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb
+++ b/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778"
 SRC_URI = "git://github.com/nodejs/http-parser.git;branch=master;protocol=https"
 SRCREV = "2343fd6b5214b2ded2cdcf76de2bf60903bb90cd"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "PLATFORM=linux"
 
diff --git a/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb b/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb
index 02a5520a97..bc0975ecc1 100644
--- a/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb
+++ b/meta-networking/recipes-support/ifenslave/ifenslave_2.14.bb
@@ -5,18 +5,12 @@ SECTION = "net"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=acc89812938cf9ad6b1debc37cea0253"
 
-inherit manpages
-MAN_PKG = "${PN}"
-
 SRCREV = "62e60904afbe58fda0c7104fdad1c4f618266ba6"
 SRC_URI = "git://salsa.debian.org/debian/ifenslave.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 
 do_install() {
     install -m 0755 -D ${S}/debian/ifenslave.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/ifenslave
     install -m 0755 -D ${S}/debian/ifenslave.if-post-down ${D}${sysconfdir}/network/if-post-down.d/ifenslave
     install -m 0755 -D ${S}/debian/ifenslave.if-up ${D}${sysconfdir}/network/if-up.d/ifenslave
 }
-
-FILES:${PN}-doc:remove = "${mandir}"
diff --git a/meta-networking/recipes-support/iftop/iftop/0001-cfgfile-fix-build-with-gcc-15.patch b/meta-networking/recipes-support/iftop/iftop/0001-cfgfile-fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..73540e18c6
--- /dev/null
+++ b/meta-networking/recipes-support/iftop/iftop/0001-cfgfile-fix-build-with-gcc-15.patch
@@ -0,0 +1,46 @@
+From e579fbe1f73dc89e2bf81a5b6c949f8ae24f93b2 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Fri, 21 Mar 2025 09:31:05 +0000
+Subject: [PATCH] cfgfile: fix build with gcc-15
+
+* fix read_config declaration to match
+
+cfgfile.c:247:5: error: conflicting types for 'read_config'; have 'int(char *, int)'
+  247 | int read_config(char *file, int whinge_on_error) {
+      |     ^~~~~~~~~~~
+In file included from cfgfile.c:16:
+cfgfile.h:16:5: note: previous declaration of 'read_config' with type 'int(void)'
+   16 | int read_config();
+      |     ^~~~~~~~~~~
+make[2]: *** [Makefile:566: cfgfile.o] Error 1
+make[2]: *** Waiting for unfinished jobs....
+iftop.c: In function 'main':
+iftop.c:803:5: error: too many arguments to function 'read_config'; expected 0, have 2
+  803 |     read_config(options.config_file, options.config_file_specified);
+      |     ^~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
+In file included from iftop.c:50:
+cfgfile.h:16:5: note: declared here
+   16 | int read_config();
+      |     ^~~~~~~~~~~
+
+Upstream-Status: Pending [last pre release was over 10 years ago and https://code.blinkace.com/pdw/iftop has last commit from 4 years ago]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+
+ cfgfile.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cfgfile.h b/cfgfile.h
+index 11ba475..a331b75 100644
+--- a/cfgfile.h
++++ b/cfgfile.h
+@@ -13,7 +13,7 @@ typedef struct {
+     int value;
+ } config_enumeration_type;
+ 
+-int read_config();
++int read_config(char *file, int whinge_on_error);
+ 
+ char *config_get_string(const char *directive);
+ int config_get_bool(const char *directive);
diff --git a/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb b/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb
index 517d781281..4d9fea58e0 100644
--- a/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb
+++ b/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76498170798db0f4f0fb685a225f702f"
 
 SRC_URI = "http://www.ex-parrot.com/pdw/iftop/download/iftop-${PV}.tar.gz \
            file://iftop-1.0-gcc10.patch \
+           file://0001-cfgfile-fix-build-with-gcc-15.patch \
           "
 SRC_URI[md5sum] = "7e6decb4958e8a4890cccac335239f24"
 SRC_URI[sha256sum] = "f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97"
diff --git a/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb b/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb
index 055c6e1432..18970751c3 100644
--- a/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb
+++ b/meta-networking/recipes-support/ipcalc/ipcalc_1.0.3.bb
@@ -9,6 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://gitlab.com/ipcalc/ipcalc.git;protocol=https;branch=master"
 SRCREV = "c341e55be386649c0a5347eefeae410753c4e753"
 
-S = "${WORKDIR}/git"
 
 inherit meson
diff --git a/meta-networking/recipes-support/libcpr/libcpr_1.10.5.bb b/meta-networking/recipes-support/libcpr/libcpr_1.12.0.bb
index 93fdb78eba..58da899081 100644
--- a/meta-networking/recipes-support/libcpr/libcpr_1.10.5.bb
+++ b/meta-networking/recipes-support/libcpr/libcpr_1.12.0.bb
@@ -8,10 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=08beaae5deae1c43c065592da8f38095"
 
 DEPENDS = "curl openssl"
 
-SRC_URI = "git://github.com/libcpr/cpr.git;protocol=https;branch=1.10.x"
-SRCREV = "3b15fa82ea74739b574d705fea44959b58142eb8"
+SRC_URI = "git://github.com/libcpr/cpr.git;protocol=https;branch=master"
+SRCREV = "da40186618909b1a7363d4e4495aa899c6e0eb75"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb b/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb
index 3d0764a3b9..50f83221c0 100644
--- a/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb
+++ b/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/libesmtp/libESMTP.git;branch=master;protocol=https \
            file://0001-Add-build-option-for-NTLM-support.patch"
 SRCREV = "1d0af244310a66943ab400be56b15a9087f181eb"
 
-S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742 \
                     file://COPYING.GPL;md5=393a5ca445f6965873eca0259a17f833"
diff --git a/meta-networking/recipes-support/libldb/libldb_2.8.1.bb b/meta-networking/recipes-support/libldb/libldb_2.8.1.bb
index 29ff2cf6f2..dbb27e6ba6 100644
--- a/meta-networking/recipes-support/libldb/libldb_2.8.1.bb
+++ b/meta-networking/recipes-support/libldb/libldb_2.8.1.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL-3.0-or-later & LGPL-2.1-or-later & GPL-3.0-or-later"
 DEPENDS += "libtdb libtalloc libtevent popt cmocka"
 RDEPENDS:pyldb += "python3"
 
-export PYTHONHASHSEED="1"
+export PYTHONHASHSEED = "1"
 export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}"
 
 SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \
@@ -38,11 +38,11 @@ SRC_URI[sha256sum] = "b68ce6eb0ccd2870fa3c8c334f2028b5d16606fd41308696c17b71959f
 
 inherit pkgconfig waf-samba ptest
 
-S = "${WORKDIR}/ldb-${PV}"
+S = "${UNPACKDIR}/ldb-${PV}"
 
 # Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
 # to cross Popen
-export WAF_NO_PREFORK="yes"
+export WAF_NO_PREFORK = "yes"
 
 EXTRA_OECONF += "--disable-rpath \
                  --disable-rpath-install \
diff --git a/meta-networking/recipes-support/libmemcached/libmemcached.inc b/meta-networking/recipes-support/libmemcached/libmemcached.inc
deleted file mode 100644
index 319ab29ce7..0000000000
--- a/meta-networking/recipes-support/libmemcached/libmemcached.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "open source C/C++ client library and tools for the memcached server"
-DEPENDS = "libevent util-linux"
-SECTION = "libdevel"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60"
-
-SRC_URI = "http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz"
-
-UPSTREAM_CHECK_URI = "https://launchpad.net/libmemcached"
-
-TARGET_LDFLAGS += "-luuid"
-TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl"
-
-inherit autotools gettext pkgconfig
diff --git a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
index 56778c0483..561308b33d 100644
--- a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
+++ b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
@@ -1,6 +1,11 @@
-require libmemcached.inc
+DESCRIPTION = "open source C/C++ client library and tools for the memcached server"
+DEPENDS = "libevent util-linux"
+SECTION = "libdevel"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60"
 
-SRC_URI += "\
+SRC_URI = "\
+           http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz \
            file://crosscompile.patch \
            file://0001-configure.ac-Do-not-configure-build-aux.patch \
            file://0001-Fix-comparison-types.patch \
@@ -8,3 +13,15 @@ SRC_URI += "\
            "
 SRC_URI[md5sum] = "b3958716b4e53ddc5992e6c49d97e819"
 SRC_URI[sha256sum] = "e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82"
+
+UPSTREAM_CHECK_URI = "https://launchpad.net/libmemcached"
+
+CVE_STATUS[CVE-2023-27478] = "fixed-version: this problem was not yet introduced in 1.0.18"
+
+TARGET_LDFLAGS += "-luuid"
+TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl"
+
+inherit autotools gettext pkgconfig
diff --git a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb
deleted file mode 100644
index cdf8415ff7..0000000000
--- a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require libmemcached.inc
-
-SRC_URI[md5sum] = "d59a462a92d296f76bff2d9bc72b2516"
-SRC_URI[sha256sum] = "3efa86c9733eaad55d7119cb16769424e2aa6c22b3392e8f973946fce6678d81"
diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.3.bb
index b617f097cf..ff36a61d15 100644
--- a/meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb
+++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.3.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6
                     file://pytalloc.h;beginline=1;endline=18;md5=21ab13bd853679d7d47a1739cb3b7db6 \
                     "
 
-export PYTHONHASHSEED="1"
+export PYTHONHASHSEED = "1"
 export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}"
 
 SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \
@@ -14,7 +14,7 @@ SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \
            file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \
            file://run-ptest \
 "
-SRC_URI[sha256sum] = "85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6"
+SRC_URI[sha256sum] = "dc46c40b9f46bb34dd97fe41f548b0e8b247b77a918576733c528e83abd854dd"
 
 inherit waf-samba pkgconfig ptest
 
@@ -30,11 +30,11 @@ PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind"
 
 SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}"
 
-S = "${WORKDIR}/talloc-${PV}"
+S = "${UNPACKDIR}/talloc-${PV}"
 
 # Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
 # to cross Popen
-export WAF_NO_PREFORK="yes"
+export WAF_NO_PREFORK = "yes"
 
 EXTRA_OECONF += "--disable-rpath \
                  --disable-rpath-install \
diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.13.bb
index a96527a3e6..7221130fe6 100644
--- a/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb
+++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.13.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL-3.0-or-later & GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \
                     file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6"
 
-export PYTHONHASHSEED="1"
+export PYTHONHASHSEED = "1"
 export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}"
 
 SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \
@@ -15,7 +15,7 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \
            file://run-ptest \
 "
 
-SRC_URI[sha256sum] = "6ce4b27498812d09237ece65a0d6dfac0941610e709848ecb822aa241084cd7a"
+SRC_URI[sha256sum] = "5ee276e7644d713e19e4b6adc00b440afb5851ff21e65821ffaed89e15a5e167"
 
 PACKAGECONFIG ??= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \
@@ -28,13 +28,13 @@ PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd"
 PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap"
 PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind"
 
-S = "${WORKDIR}/tdb-${PV}"
+S = "${UNPACKDIR}/tdb-${PV}"
 
 inherit waf-samba pkgconfig ptest
 
 # Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
 # to cross Popen
-export WAF_NO_PREFORK="yes"
+export WAF_NO_PREFORK = "yes"
 
 EXTRA_OECONF += "--disable-rpath \
                  --disable-rpath-install \
diff --git a/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch
index f1b8f8e9b1..a3301db077 100644
--- a/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch
+++ b/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch
@@ -1,4 +1,4 @@
-From 2bb7bf2d945d4ea0dafe3858adc6b8faae18b1e8 Mon Sep 17 00:00:00 2001
+From f8b5f542c782b235051ed39239dd32c93eb2c69c Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Wed, 24 Nov 2021 13:33:35 +0800
 Subject: [PATCH] Fix pyext_PATTERN for cross compilation
@@ -25,10 +25,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py
-index b2dd1a9..2bd3545 100644
+index 8646454..4eb8725 100644
 --- a/third_party/waf/waflib/Tools/python.py
 +++ b/third_party/waf/waflib/Tools/python.py
-@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'):
+@@ -351,7 +351,7 @@ def check_python_headers(conf, features='pyembed pyext'):
         x = 'MACOSX_DEPLOYMENT_TARGET'
         if dct[x]:
                 env[x] = conf.environ[x] = str(dct[x])
@@ -37,6 +37,3 @@ index b2dd1a9..2bd3545 100644
  
  
         # Try to get pythonX.Y-config
--- 
-2.25.1
-
diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb b/meta-networking/recipes-support/libtevent/libtevent_0.17.0.bb
index 0a37d7977d..7ee044d146 100644
--- a/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb
+++ b/meta-networking/recipes-support/libtevent/libtevent_0.17.0.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL-3.0-or-later"
 DEPENDS += "libtalloc libtirpc cmocka"
 RDEPENDS:python3-tevent = "python3"
 
-export PYTHONHASHSEED="1"
+export PYTHONHASHSEED = "1"
 export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}"
 
 SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \
@@ -17,7 +17,7 @@ SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \
 
 LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681"
 
-SRC_URI[sha256sum] = "362971e0f32dc1905f6fe4736319c4b8348c22dc85aa6c3f690a28efe548029e"
+SRC_URI[sha256sum] = "7702fb373b69da2960b86134b6a9ec6fa0b949a01756fec00a4a6a43575c8361"
 
 inherit pkgconfig ptest waf-samba
 
@@ -33,11 +33,11 @@ PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind"
 
 SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}"
 
-S = "${WORKDIR}/tevent-${PV}"
+S = "${UNPACKDIR}/tevent-${PV}"
 
 # Cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
 # to cross Popen
-export WAF_NO_PREFORK="yes"
+export WAF_NO_PREFORK = "yes"
 
 EXTRA_OECONF += "--disable-rpath \
                  --disable-rpath-install \
diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0001-Fix-implicit-declaration-error.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0001-Fix-implicit-declaration-error.patch
new file mode 100644
index 0000000000..1c5f79c9d8
--- /dev/null
+++ b/meta-networking/recipes-support/linux-atm/linux-atm/0001-Fix-implicit-declaration-error.patch
@@ -0,0 +1,44 @@
+From 1435d613ee632bd7a2aa15180acf06ff3723da41 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Sat, 26 Apr 2025 13:03:35 +0200
+Subject: [PATCH] Fix implicit-declaration error
+
+* taken from:
+  https://github.com/sbwml/package_network_utils_linux-atm/blob/main/patches/900-fix-implicit-declaration-error.patch
+
+* fixes:
+  http://errors.yoctoproject.org/Errors/Details/766901/
+  linux-atm-2.5.2/src/led/conn.c:414:57: error: passing argument 3 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types]
+
+Upstream-Status: Inappropriate [Upstream is dead]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ src/led/conn.c     | 2 +-
+ src/maint/hediag.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/led/conn.c b/src/led/conn.c
+index 99da5e4..89639e1 100644
+--- a/src/led/conn.c
++++ b/src/led/conn.c
+@@ -405,7 +405,7 @@ Conn_t *accept_conn(Conn_t *conn)
+ {
+         Conn_t *new;
+         struct sockaddr_atmsvc addr;
+-        size_t len;
++        socklen_t len;
+         int fd;
+         char buff[MAX_ATM_ADDR_LEN+1];
+ 
+diff --git a/src/maint/hediag.c b/src/maint/hediag.c
+index a4f792f..3b1b7fb 100644
+--- a/src/maint/hediag.c
++++ b/src/maint/hediag.c
+@@ -9,6 +9,7 @@
+ #include <linux/atmdev.h>
+ #include <linux/sonet.h>
+ #include <linux/atm_he.h>
++#include <string.h>
+ 
+ struct reg_table {
+        unsigned addr;
diff --git a/meta-networking/recipes-support/linux-atm/linux-atm/0002-Fix-build-with-gcc-15.patch b/meta-networking/recipes-support/linux-atm/linux-atm/0002-Fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..1cbd6a5831
--- /dev/null
+++ b/meta-networking/recipes-support/linux-atm/linux-atm/0002-Fix-build-with-gcc-15.patch
@@ -0,0 +1,91 @@
+From 2a9d42b2b190d533cf126a93bcad842cea825bbe Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Sat, 26 Apr 2025 13:04:56 +0200
+Subject: [PATCH] Fix build with gcc-15
+
+* taken from:
+  https://github.com/sbwml/package_network_utils_linux-atm/blob/1d1c3f884daf9ee4bce077f3db9d990617683669/patches/901-linux-atm-dont-use-bool-keyword.patch
+
+* fixes:
+  http://errors.yoctoproject.org/Errors/Details/852979/
+
+In file included from load_lex.l:11:
+../../../linux-atm-2.5.2/src/lane/load_lex.h:27:10: error: two or more data types in declaration specifiers
+   27 |   Bool_t bool;
+      |          ^~~~
+../../../linux-atm-2.5.2/src/lane/load_lex.h:27:14: warning: declaration does not declare anything
+   27 |   Bool_t bool;
+      |              ^
+In file included from ../../../linux-atm-2.5.2/src/lane/load.c:29:
+../../../linux-atm-2.5.2/src/lane/load_lex.h:27:10: error: two or more data types in declaration specifiers
+   27 |   Bool_t bool;
+      |          ^~~~
+../../../linux-atm-2.5.2/src/lane/load_lex.h:27:14: warning: declaration does not declare anything
+   27 |   Bool_t bool;
+      |              ^
+load_lex.l: In function 'yylex':
+load_lex.l:47:11: error: expected identifier before 'bool'
+load_lex.l:51:11: error: expected identifier before 'bool'
+../../../linux-atm-2.5.2/src/lane/load.c: In function 'load_vars':
+../../../linux-atm-2.5.2/src/lane/load.c:501:29: error: expected identifier before 'bool'
+  501 |                    g_return.bool==BL_TRUE?"True":"False");
+      |                             ^~~~
+../../../linux-atm-2.5.2/src/lane/load.c:502:51: error: expected identifier before 'bool'
+  502 |         set_var_bool(curr_unit, varname, g_return.bool);
+      |                                                   ^~~~
+make[3]: *** [Makefile:513: load.o] Error 1
+
+Upstream-Status: Inappropriate [Upstream is dead]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ src/lane/load.c     | 4 ++--
+ src/lane/load_lex.h | 2 +-
+ src/lane/load_lex.l | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/lane/load.c b/src/lane/load.c
+index 39d4672..1cc2202 100644
+--- a/src/lane/load.c
++++ b/src/lane/load.c
+@@ -498,8 +498,8 @@ load_vars(const char *file)
+        break;
+       case BOOLEAN:
+        Debug_unit(&load_unit, "Variable is boolean: %s", 
+-                  g_return.bool==BL_TRUE?"True":"False");
+-       set_var_bool(curr_unit, varname, g_return.bool);
++                  g_return.b==BL_TRUE?"True":"False");
++       set_var_bool(curr_unit, varname, g_return.b);
+        break;
+       case INTEGER:
+        Debug_unit(&load_unit, "Variable is integer: %d", g_return.intti);
+diff --git a/src/lane/load_lex.h b/src/lane/load_lex.h
+index 2384e70..72b8f9b 100644
+--- a/src/lane/load_lex.h
++++ b/src/lane/load_lex.h
+@@ -24,7 +24,7 @@
+ #define END 0
+ 
+ typedef struct {
+-  Bool_t bool;
++  Bool_t b;
+   int intti;
+   AtmAddr_t *atmaddress;
+   LaneDestination_t *destaddr;
+diff --git a/src/lane/load_lex.l b/src/lane/load_lex.l
+index c184795..1d412e3 100644
+--- a/src/lane/load_lex.l
++++ b/src/lane/load_lex.l
+@@ -44,11 +44,11 @@ H [0-9a-fA-F]
+                 return ATMADDRESS;
+                }
+ True   |
+-true           {g_return.bool = BL_TRUE;
++true           {g_return.b = BL_TRUE;
+                 return BOOLEAN;
+                }       
+ False  |
+-false          {g_return.bool = BL_FALSE;
++false          {g_return.b = BL_FALSE;
+                 return BOOLEAN;
+                }
+ \#.*           {}
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 391e0e4ab6..3d679d7dc7 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
@@ -16,6 +16,8 @@ SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${P
            file://0001-make-Add-PREFIX-knob.patch \
            file://0001-include-string-h-from-memcpy-and-strcpy-function-pro.patch \
            file://0001-configure-Check-for-symbol-from-libresolv-instead-of.patch \
+           file://0001-Fix-implicit-declaration-error.patch \
+           file://0002-Fix-build-with-gcc-15.patch \
            "
 
 SRC_URI:append:libc-musl = " file://musl-no-on_exit.patch"
@@ -32,7 +34,3 @@ inherit autotools pkgconfig
 EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}"
 
 FILES:${PN} += "${nonarch_base_libdir}/firmware"
-
-# http://errors.yoctoproject.org/Errors/Details/766901/
-# linux-atm-2.5.2/src/led/conn.c:414:57: error: passing argument 3 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types]
-CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.21.bb
index 0243f2a1db..407194792f 100644
--- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb
+++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.21.bb
@@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
 "
 
-SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225"
-
-PV .= "+git"
-LK_REL = "1.0.19"
+SRCREV = "37d5f1225573b91d706a5e547d081f79963a9deb"
 
 SRC_URI = " \
     git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \
@@ -20,7 +17,6 @@ SRC_URI = " \
     file://v6test.sh \
 "
 
-S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native"
 
@@ -34,19 +30,14 @@ do_install_ptest () {
     done
 }
 
-SOLIBVERSION="${LK_REL}"
-SOLIBMAJORVERSION="1"
-
 PACKAGES =+ "${PN}-withsctp ${PN}-utils"
 
 FILES:${PN} = " \
-    ${libdir}/libsctp.so.${SOLIBVERSION} \
-    ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \
+    ${libdir}/libsctp.so.* \
 "
 
 FILES:${PN}-withsctp = " \
-    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \
-    ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \
+    ${libdir}/lksctp-tools/libwithsctp.so.* \
 "
 
 FILES:${PN}-dev += " \
diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
index f0b7e9184e..b442fb9f56 100644
--- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
+++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/linux-wpan/lowpan-tools;branch=master;protocol=https
            "
 SRCREV = "1c2d8674cc6f4b1166a066e8822e295c105ae7a2"
 
-S = "${WORKDIR}/git"
 
 inherit autotools python3-dir pkgconfig
 
diff --git a/meta-networking/recipes-support/mctp/mctp/0001-mctp-bench-Adjust-headers.patch b/meta-networking/recipes-support/mctp/mctp/0001-mctp-bench-Adjust-headers.patch
new file mode 100644
index 0000000000..4ff9b09299
--- /dev/null
+++ b/meta-networking/recipes-support/mctp/mctp/0001-mctp-bench-Adjust-headers.patch
@@ -0,0 +1,38 @@
+From 166b2251a156a03a80318533440178ac0b913945 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 17 Feb 2025 21:29:41 -0800
+Subject: [PATCH] mctp-bench: Adjust headers
+
+bits/time.h is not be included directly, instead use time.h
+since poll.h is included there is no need to include sys/poll.h
+
+Fixes
+../git/src/mctp-bench.c:2:10: fatal error: 'bits/time.h' file not found
+    2 | #include <bits/time.h>
+      |          ^~~~~~~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/CodeConstruct/mctp/pull/65]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/mctp-bench.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/mctp-bench.c b/src/mctp-bench.c
+index eeb6fcf..60b3bb0 100644
+--- a/src/mctp-bench.c
++++ b/src/mctp-bench.c
+@@ -1,5 +1,5 @@
+ #define _XOPEN_SOURCE 700
+-#include <bits/time.h>
++#include <time.h>
+ #include <err.h>
+ #include <errno.h>
+ #include <poll.h>
+@@ -9,7 +9,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
+-#include <sys/poll.h>
+ #include <sys/socket.h>
+ #include <time.h>
+ #include <unistd.h>
diff --git a/meta-networking/recipes-support/mctp/mctp_1.1.bb b/meta-networking/recipes-support/mctp/mctp_2.1.bb
index bf3961be42..04fecf7aca 100644
--- a/meta-networking/recipes-support/mctp/mctp_1.1.bb
+++ b/meta-networking/recipes-support/mctp/mctp_2.1.bb
@@ -5,14 +5,18 @@ LICENSE = "GPL-2.0-only"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21"
 
-SRCREV = "a591ad885aa28f113cb45870b2fd5bce48378d6f"
+SRCREV = "dd944cf5b5a8b834f3685bcb2017190258dbcd0b"
 
-SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https"
+SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https \
+           file://0001-mctp-bench-Adjust-headers.patch"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig systemd
 
+EXTRA_OEMESON = " \
+    -Dtests=false \
+"
+
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 "
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb
index 3867b89052..52e7e53c32 100644
--- a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb
+++ b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb
@@ -3,12 +3,11 @@ require mdio-tools.inc
 DEPENDS += "virtual/kernel libmnl"
 # This module requires Linux 5.6 higher
 
-S = "${WORKDIR}/git"
 
 inherit module
 
 EXTRA_OEMAKE = "-C kernel/ KDIR=${STAGING_KERNEL_DIR}"
-MODULES_MODULE_SYMVERS_LOCATION="kernel"
+MODULES_MODULE_SYMVERS_LOCATION = "kernel"
 MODULES_INSTALL_TARGET = "install"
 
 RPROVIDES:${PN} += "kernel-module-mdio-netlink"
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools.inc b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc
index b99ce82810..fc8161eb1f 100644
--- a/meta-networking/recipes-support/mdio-tools/mdio-tools.inc
+++ b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "A low-level debug tool for communicating with devices attached to
 SECTION = "networking"
 HOMEPAGE = "https://github.com/wkz/mdio-tools"
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/wkz/mdio-tools.git;protocol=https;branch=master"
 SRCREV = "f74eaf38dbda441df4fcaeb21ca4465957953a2f"
diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb
index 0c64889bc3..2c8f9b8c37 100644
--- a/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb
+++ b/meta-networking/recipes-support/mdio-tools/mdio-tools_1.3.1.bb
@@ -2,8 +2,7 @@ require mdio-tools.inc
 
 DEPENDS += "virtual/kernel libmnl"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools
 
-RDEPENDS:${PN} = "kernel-module-mdio-netlink"
+RRECOMMENDS:${PN} = "kernel-module-mdio-netlink"
diff --git a/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch b/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch
deleted file mode 100644
index 15ef54f80e..0000000000
--- a/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 6021d3d60e64d9174f41515d2d962df9b5d7645e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 29 Aug 2022 17:15:28 -0700
-Subject: [PATCH] Fix function protypes
-
-clang-15+ has started diagnosing them as errors
-
-thread.c:925:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
-| void STATS_UNLOCK() {
-|                  ^
-|                   void
-
-Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/928]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- assoc.c     | 4 ++--
- memcached.c | 4 ++--
- slabs.c     | 2 +-
- testapp.c   | 2 +-
- thread.c    | 4 ++--
- 5 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/assoc.c b/assoc.c
-index bc68695..01063a9 100644
---- a/assoc.c
-+++ b/assoc.c
-@@ -261,7 +261,7 @@ static void *assoc_maintenance_thread(void *arg) {
- 
- static pthread_t maintenance_tid;
- 
--int start_assoc_maintenance_thread() {
-+int start_assoc_maintenance_thread(void) {
-     int ret;
-     char *env = getenv("MEMCACHED_HASH_BULK_MOVE");
-     if (env != NULL) {
-@@ -279,7 +279,7 @@ int start_assoc_maintenance_thread() {
-     return 0;
- }
- 
--void stop_assoc_maintenance_thread() {
-+void stop_assoc_maintenance_thread(void) {
-     mutex_lock(&maintenance_lock);
-     do_run_maintenance_thread = 0;
-     pthread_cond_signal(&maintenance_cond);
-diff --git a/memcached.c b/memcached.c
-index 7871fe8..4d3b54a 100644
---- a/memcached.c
-+++ b/memcached.c
-@@ -84,7 +84,7 @@ static int try_read_command_udp(conn *c);
- static enum try_read_result try_read_network(conn *c);
- static enum try_read_result try_read_udp(conn *c);
- 
--static int start_conn_timeout_thread();
-+static int start_conn_timeout_thread(void);
- 
- /* stats */
- static void stats_init(void);
-@@ -374,7 +374,7 @@ static void *conn_timeout_thread(void *arg) {
-     return NULL;
- }
- 
--static int start_conn_timeout_thread() {
-+static int start_conn_timeout_thread(void) {
-     int ret;
- 
-     if (settings.idle_timeout == 0)
-diff --git a/slabs.c b/slabs.c
-index 3c78d8a..0dadd35 100644
---- a/slabs.c
-+++ b/slabs.c
-@@ -638,7 +638,7 @@ static void *memory_allocate(size_t size) {
- }
- 
- /* Must only be used if all pages are item_size_max */
--static void memory_release() {
-+static void memory_release(void) {
-     void *p = NULL;
-     if (mem_base != NULL)
-         return;
-diff --git a/testapp.c b/testapp.c
-index 5face54..387a847 100644
---- a/testapp.c
-+++ b/testapp.c
-@@ -80,7 +80,7 @@ static struct conn *con = NULL;
- static bool allow_closed_read = false;
- static bool enable_ssl = false;
- 
--static void close_conn() {
-+static void close_conn(void) {
-     if (con == NULL) return;
- #ifdef TLS
-     if (con->ssl) {
-diff --git a/thread.c b/thread.c
-index d5ed052..f5efdc3 100644
---- a/thread.c
-+++ b/thread.c
-@@ -918,11 +918,11 @@ enum store_item_type store_item(item *item, int comm, conn* c) {
- 
- /******************************* GLOBAL STATS ******************************/
- 
--void STATS_LOCK() {
-+void STATS_LOCK(void) {
-     pthread_mutex_lock(&stats_lock);
- }
- 
--void STATS_UNLOCK() {
-+void STATS_UNLOCK(void) {
-     pthread_mutex_unlock(&stats_lock);
- }
- 
diff --git a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch b/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch
index 45428ed234..26281e73ef 100644
--- a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch
+++ b/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch
@@ -1,4 +1,7 @@
-memcached: add knob to detect whether hugetlbfs are checked
+From dfa90817a08f206f7e2dbba44d913968ae7f7d94 Mon Sep 17 00:00:00 2001
+From: Chong Lu <Chong.Lu@windriver.com>
+Date: Tue, 19 Aug 2014 17:38:32 +0800
+Subject: [PATCH] memcached: add knob to detect whether hugetlbfs are checked
 
 Add knob to detect whether hugetlbfs are checked or not.
 
@@ -6,12 +9,14 @@ Upstream-Status: Pending
 
 Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
 ---
- configure.ac | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
+diff --git a/configure.ac b/configure.ac
+index 6f2ef97..bd7dd96 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -488,8 +488,12 @@ if test "x$enable_static" = "xyes"; then
+@@ -559,8 +559,12 @@ if test "x$enable_static" = "xyes"; then
  fi
  
  dnl ----------------------------------------------------------------------------
diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.17.bb b/meta-networking/recipes-support/memcached/memcached_1.6.38.bb
index 270ad5486d..9799b55a09 100644
--- a/meta-networking/recipes-support/memcached/memcached_1.6.17.bb
+++ b/meta-networking/recipes-support/memcached/memcached_1.6.38.bb
@@ -21,9 +21,12 @@ RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \
 
 SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \
            file://memcached-add-hugetlbfs-check.patch \
-           file://0001-Fix-function-protypes.patch \
            "
-SRC_URI[sha256sum] = "2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224"
+SRC_URI[sha256sum] = "334d792294e37738796b5b03375c47bb6db283b1152e2ea4ccb720152dd17c66"
+
+CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly"
+
+UPSTREAM_CHECK_URI = "${HOMEPAGE}"
 
 # set the same COMPATIBLE_HOST as libhugetlbfs
 COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*"
diff --git a/meta-networking/recipes-support/mtr/mtr_0.95.bb b/meta-networking/recipes-support/mtr/mtr_0.95.bb
index 92f9c4bfc0..ac8b48e4e5 100644
--- a/meta-networking/recipes-support/mtr/mtr_0.95.bb
+++ b/meta-networking/recipes-support/mtr/mtr_0.95.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRCREV = "852e5617fbf331cf292723702161f0ac9afe257c"
 SRC_URI = "git://github.com/traviscross/mtr;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit/0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch b/meta-networking/recipes-support/nbdkit/nbdkit/0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch
new file mode 100644
index 0000000000..524ea0602d
--- /dev/null
+++ b/meta-networking/recipes-support/nbdkit/nbdkit/0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch
@@ -0,0 +1,34 @@
+From 1ccbd8fdbd2e367a702e48c8703b2f010d067b23 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 22 May 2023 18:16:24 -0700
+Subject: [PATCH] plugins: Avoid absolute buildpaths in binaries
+
+plugins seems to add CC to the plugins shared objects via compiler
+cmdline which ends up in real code. Therefore scrub buildpaths from CC
+and CFLAGS before passing them to plugin's build.
+
+Upstream-Status: Submitted [https://gitlab.com/nbdkit/nbdkit/-/merge_requests/30]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ plugins/cc/Makefile.am | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/plugins/cc/Makefile.am
++++ b/plugins/cc/Makefile.am
+@@ -44,9 +44,13 @@ nbdkit_cc_plugin_la_SOURCES = \
+        $(top_srcdir)/include/nbdkit-plugin.h \
+        $(NULL)
+ 
++workdir1 := $(shell dirname $(abs_top_builddir))
++workdir := $(shell dirname $(workdir1))
++cc_no_sysroot := $(shell echo \"$(CC)\"|sed -e 's#$(workdir)#<WORKDIR>#g')
++cflags_no_sysroot := $(shell echo \"$(CFLAGS)\"|sed -e 's#$(workdir)#<WORKDIR>#g')
+ nbdkit_cc_plugin_la_CPPFLAGS = \
+-       -DCC="\"$(CC_PLUGIN_CC)\"" \
+-       -DCFLAGS="\"$(CC_PLUGIN_CFLAGS)\"" \
++       -DCC=\"$(cc_no_sysroot)\" \
++       -DCFLAGS=\"$(cflags_no_sysroot)\" \
+        -I$(top_srcdir)/include \
+        -I$(top_builddir)/include \
+        -I$(top_srcdir)/common/include \
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb
index cdf2677f13..1c9db1e956 100644
--- a/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb
+++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.33.11.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \
            file://0001-plugins-Avoid-absolute-buildpaths-in-binaries.patch"
 SRCREV = "6c02c6a469d62a047f230b0ccf03f72328312d2b"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "curl xz e2fsprogs zlib"
 
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.43.11.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.43.11.bb
new file mode 100644
index 0000000000..9e7bdc9966
--- /dev/null
+++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.43.11.bb
@@ -0,0 +1,33 @@
+SUMMARY = "nbdkit is a toolkit for creating NBD servers."
+DESCRIPTION = "NBD — Network Block Device — is a protocol \
+for accessing Block Devices (hard disks and disk-like things) \
+over a Network. \
+\
+nbdkit is a toolkit for creating NBD servers."
+
+HOMEPAGE = "https://gitlab.com/nbdkit/nbdkit"
+LICENSE = "BSD-3-Clause"
+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 = "2d0f232b590f4001881dd0819f55af72b88c4b2f"
+
+
+DEPENDS = "curl xz e2fsprogs zlib"
+
+# autotools-brokensep is needed as nbdkit does not support build in external directory
+inherit pkgconfig python3native perlnative bash-completion autotools-brokensep
+
+# Those are required to build standalone
+EXTRA_OECONF = " --without-libvirt --without-libguestfs --disable-perl"
+
+# Disable some extended support (not desired for small embedded systems)
+#EXTRA_OECONF += " --disable-python"
+#EXTRA_OECONF += " --disable-ocaml"
+#EXTRA_OECONF += " --disable-rust"
+#EXTRA_OECONF += " --disable-ruby"
+#EXTRA_OECONF += " --disable-tcl"
+#EXTRA_OECONF += " --disable-lua"
+#EXTRA_OECONF += " --disable-vddk"
diff --git a/meta-networking/recipes-support/ncp/libowfat/0001-fix-incompatible-type-error-with-gcc-15.patch b/meta-networking/recipes-support/ncp/libowfat/0001-fix-incompatible-type-error-with-gcc-15.patch
new file mode 100644
index 0000000000..6f5f3e712e
--- /dev/null
+++ b/meta-networking/recipes-support/ncp/libowfat/0001-fix-incompatible-type-error-with-gcc-15.patch
@@ -0,0 +1,100 @@
+From 397d00cfd672f3782196e927d0a878ab1d800112 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Fri, 18 Apr 2025 17:30:48 +0900
+Subject: [PATCH] fix incompatible type error with gcc 15
+
+  * fix following errors:
+  ./select.h:13:12: error: conflicting types for 'select'; have 'int(void)'
+   13 | extern int select();
+      |            ^~~~~~
+   In file included from TOPDIR/tmp/work/core2-64-oe-linux/libowfat/0.32/recipe-sysroot/usr/include/sys/types.h:179,
+                 from ./select.h:6:
+   ./buffer.h:40:65: error: initialization of 'ssize_t (*)(void)' {aka 'long int (*)(void)'} from incompatible pointer type 'ssize_t (*)(int,  char *, size_t)' {aka 'long int (*)(int,  char *, long unsigned int)'} [-Wincompatible-pointer-types]
+   40 | #define BUFFER_INIT(op,fd,buf,len) { (char*)(buf), 0, 0, (len), (op), NULL, NULL, (fd) }
+      |                                                                 ^
+Upstream-Status: Submitted [felix-libowfat@fefe.de]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ buffer.h                  | 2 +-
+ buffer/buffer_frombuf.c   | 2 +-
+ buffer/buffer_stubborn.c  | 2 +-
+ buffer/buffer_stubborn2.c | 2 +-
+ buffer/buffer_tosa.c      | 2 +-
+ select.h2                 | 2 --
+ 6 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/buffer.h b/buffer.h
+index 54bed5c..eaf7acb 100644
+--- a/buffer.h
++++ b/buffer.h
+@@ -24,7 +24,7 @@ typedef struct buffer {
+   int fd;              /* passed as first argument to op */
+ } buffer;
+ 
+-#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, 0, (len), (op), NULL, NULL, (fd) }
++#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, 0, (len), (void*)(op), NULL, NULL, (fd) }
+ #define BUFFER_INIT_FREE(op,fd,buf,len) { (buf), 0, 0, (len), (op), NULL, buffer_free, (fd) }
+ #define BUFFER_INIT_READ(op,fd,buf,len) BUFFER_INIT(op,fd,buf,len) /*obsolete*/
+ #define BUFFER_INSIZE 8192
+diff --git a/buffer/buffer_frombuf.c b/buffer/buffer_frombuf.c
+index 0c9d931..2aa27ca 100644
+--- a/buffer/buffer_frombuf.c
++++ b/buffer/buffer_frombuf.c
+@@ -14,6 +14,6 @@ void buffer_frombuf(buffer* b,const char* x,size_t l) {
+   b->n=l;
+   b->a=l;
+   b->fd=0;
+-  b->op=dummyreadwrite;
++  b->op=(void*)dummyreadwrite;
+   b->deinit=0;
+ }
+diff --git a/buffer/buffer_stubborn.c b/buffer/buffer_stubborn.c
+index 2e00418..8079000 100644
+--- a/buffer/buffer_stubborn.c
++++ b/buffer/buffer_stubborn.c
+@@ -1,7 +1,7 @@
+ #include <errno.h>
+ #include "buffer.h"
+ 
+-int buffer_stubborn(ssize_t (*op)(),int fd,const char* buf, size_t len,void* cookie) {
++int buffer_stubborn(ssize_t (*op)(int,char*,size_t,void*),int fd,const char* buf, size_t len,void* cookie) {
+   ssize_t w;
+   errno=0;
+   while (len) {
+diff --git a/buffer/buffer_stubborn2.c b/buffer/buffer_stubborn2.c
+index b9146e2..b47a245 100644
+--- a/buffer/buffer_stubborn2.c
++++ b/buffer/buffer_stubborn2.c
+@@ -1,7 +1,7 @@
+ #include <errno.h>
+ #include "buffer.h"
+ 
+-ssize_t buffer_stubborn_read(ssize_t (*op)(),int fd,const char* buf, size_t len,void* cookie) {
++ssize_t buffer_stubborn_read(ssize_t (*op)(int,char*,size_t,void*),int fd,const char* buf, size_t len,void* cookie) {
+   ssize_t w;
+   for (;;) {
+     if ((w=op(fd,buf,len,cookie))<0)
+diff --git a/buffer/buffer_tosa.c b/buffer/buffer_tosa.c
+index a10be4f..99111a9 100644
+--- a/buffer/buffer_tosa.c
++++ b/buffer/buffer_tosa.c
+@@ -21,7 +21,7 @@ int buffer_tosa(buffer* b,stralloc* sa) {
+   b->n=0;
+   b->a=1024;
+   b->fd=0;
+-  b->op=strallocwrite;
++  b->op=(void*)strallocwrite;
+   b->cookie=sa;
+   b->deinit=0;
+   return 0;
+diff --git a/select.h2 b/select.h2
+index 961c380..2a22543 100644
+--- a/select.h2
++++ b/select.h2
+@@ -10,6 +10,4 @@
+ /* braindead BSD uses bzero in FD_ZERO but doesn't #include string.h */
+ #include <string.h>
+ 
+-extern int select();
+-
+ #endif
diff --git a/meta-networking/recipes-support/ncp/libowfat_0.32.bb b/meta-networking/recipes-support/ncp/libowfat_0.32.bb
index 94f36f904a..cc67d9aefa 100644
--- a/meta-networking/recipes-support/ncp/libowfat_0.32.bb
+++ b/meta-networking/recipes-support/ncp/libowfat_0.32.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz \
            file://0001-Depend-on-haveuint128.h-for-umult64.c.patch \
            file://0001-replace-__pure__-with-compiler-attribute-pure.patch \
+           file://0001-fix-incompatible-type-error-with-gcc-15.patch \
           "
 SRC_URI[md5sum] = "ee015ccf45cb2bc61c942642038c2bdc"
 SRC_URI[sha256sum] = "f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1"
diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch
new file mode 100644
index 0000000000..7bfb17bf08
--- /dev/null
+++ b/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch
@@ -0,0 +1,85 @@
+From 7b3e78cf0348ea737609a2ace07c7c55aae36bcb Mon Sep 17 00:00:00 2001
+From: Santiago Vila <sanvila@debian.org>
+Date: Wed, 9 Oct 2024 22:05:09 -0700
+Subject: [PATCH] Remove use of variables indicating buildtime information
+
+We should not really care about the build date or the build host
+
+Sourced From: https://salsa.debian.org/debian/ndisc6/-/blob/master/debian/patches/reproducible-build.patch?ref_type=heads
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ rdnss/rdnssd.c   | 2 --
+ src/addrinfo.c   | 2 --
+ src/ndisc.c      | 2 --
+ src/tcpspray.c   | 2 --
+ src/traceroute.c | 2 --
+ 5 files changed, 10 deletions(-)
+
+diff --git a/rdnss/rdnssd.c b/rdnss/rdnssd.c
+index b87edb2..7201525 100644
+--- a/rdnss/rdnssd.c
++++ b/rdnss/rdnssd.c
+@@ -741,8 +741,6 @@ version (void)
+ {
+        printf (_("rdnssd: IPv6 Recursive DNS Server discovery Daemon %s (%s)\n"),
+                VERSION, "$Rev$");
+-       printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
+-       printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
+        puts (_("Written by Pierre Ynard and Remi Denis-Courmont\n"));
+ 
+        printf (_("Copyright (C) %u-%u Pierre Ynard, Remi Denis-Courmont\n"),
+diff --git a/src/addrinfo.c b/src/addrinfo.c
+index cd73722..6316abd 100644
+--- a/src/addrinfo.c
++++ b/src/addrinfo.c
+@@ -148,8 +148,6 @@ static int quick_usage (const char *path)
+ static int version (void)
+ {
+         printf (_("addrinfo %s (%s)\n"), VERSION, "$Rev$");
+-       printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
+-        printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
+         puts (_("Written by Remi Denis-Courmont\n"));
+ 
+         printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2002, 2007);
+diff --git a/src/ndisc.c b/src/ndisc.c
+index b190b18..6e222a0 100644
+--- a/src/ndisc.c
++++ b/src/ndisc.c
+@@ -920,9 +920,7 @@ version (void)
+ {
+        printf (_(
+ "ndisc6: IPv6 Neighbor/Router Discovery userland tool %s (%s)\n"), VERSION, "$Rev$");
+-       printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
+ 
+-       printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
+        puts (_("Written by Remi Denis-Courmont\n"));
+ 
+        printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2004, 2007);
+diff --git a/src/tcpspray.c b/src/tcpspray.c
+index 39d8939..6347795 100644
+--- a/src/tcpspray.c
++++ b/src/tcpspray.c
+@@ -302,8 +302,6 @@ version (void)
+ {
+        printf (_(
+ "tcpspray6: TCP/IP bandwidth tester %s (%s)\n"), VERSION, "$Rev$");
+-       printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
+-       printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
+        puts (_("Written by Remi Denis-Courmont\n"));
+ 
+        printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007);
+diff --git a/src/traceroute.c b/src/traceroute.c
+index 489bc55..604b6af 100644
+--- a/src/traceroute.c
++++ b/src/traceroute.c
+@@ -1251,8 +1251,6 @@ version (void)
+ {
+        printf (_(
+ "traceroute6: TCP & UDP IPv6 traceroute tool %s (%s)\n"), VERSION, "$Rev$");
+-       printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME);
+-       printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION);
+        puts (_("Written by Remi Denis-Courmont\n"));
+ 
+        printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007);
diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
index fb00b83516..6931c64d4a 100644
--- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
+++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5"
 SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \
            file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \
+           file://0001-Remove-use-of-variables-indicating-buildtime-informa.patch \
            "
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "coreutils-native"
 
diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch
new file mode 100644
index 0000000000..c1757d39ad
--- /dev/null
+++ b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch
@@ -0,0 +1,51 @@
+From 4ca437b129252635e89694446945e69912300ceb Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 16 Apr 2025 20:35:46 +0900
+Subject: [PATCH] fix netcat-openbsd: ftbfs with GCC-15
+
+* fix build failure with GCC-15
+netcat.c:1443:41: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1443 |                         signal(SIGALRM, quit);
+      |                                         ^~~~
+      |                                         |
+      |                                         void (*)(void)
+In file included from netcat.c:100:
+TOPDIR/tmp/work/core2-64-oe-linux/netcat-openbsd/1.195/recipe-sysroot/usr/include/signal.h:88:57: note: expected '__sighandler_t' {aka 'void (*)(int)'} but argument is of type 'void (*)(void)'
+   88 | extern __sighandler_t signal (int __sig, __sighandler_t __handler)
+      |                                          ~~~~~~~~~~~~~~~^~~~~~~~~
+netcat.c:241:13: note: 'quit' declared here
+  241 | static void quit();
+      |             ^~~~
+TOPDIR/tmp/work/core2-64-oe-linux/netcat-openbsd/1.195/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
+   72 | typedef void (*__sighandler_t) (int);
+      |                ^~~~~~~~~~~~~~
+make: *** [Makefile:17: netcat.o] Error 1
+
+Upstream-Status: Submitted [https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097448]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ netcat.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/netcat.c b/netcat.c
+index d70598a..b8ba959 100644
+--- a/netcat.c
++++ b/netcat.c
+@@ -238,7 +238,7 @@ char *proto_name(int uflag, int dccpflag);
+ static int connect_with_timeout(int fd, const struct sockaddr *sa,
+         socklen_t salen, int ctimeout);
+ 
+-static void quit();
++static void quit(int sig);
+ 
+ int    b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize);
+ int    b64_pton(char const *src, u_char *target, size_t targsize);
+@@ -2235,7 +2235,7 @@ usage(int ret)
+  * quit()
+  * handler for a "-q" timeout (exit 0 instead of 1)
+  */
+-static void quit()
++static void quit(__attribute__((unused)) int sig)
+ {
+        exit(0);
+ }
diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb
index 20ad43a4d5..99ae90aa91 100644
--- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb
+++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.195.bb
@@ -10,6 +10,7 @@ do_patch[depends] = "quilt-native:do_populate_sysroot"
 SRC_URI = "http://snapshot.debian.org/archive/debian/20181022T085404Z/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \
            http://snapshot.debian.org/archive/debian/20181022T085404Z/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-1.debian.tar.xz;name=netcat-patch;subdir=${BP} \
            file://0001-bundle-own-base64-encode-decode-functions.patch \
+           file://0001-fix-netcat-openbsd-ftbfs-with-GCC-15.patch \
            "
 
 SRC_URI[netcat.md5sum] = "219d5e49c45658e229a3bda63063a986"
diff --git a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb
index c68974f9f0..4170e9fab0 100644
--- a/meta-networking/recipes-support/netcf/netcf_0.2.8.bb
+++ b/meta-networking/recipes-support/netcf/netcf_0.2.8.bb
@@ -18,7 +18,6 @@ DEPENDS += "augeas libnl libxslt libxml2"
 
 do_configure[depends] += "${MLPREFIX}gnulib:do_populate_sysroot"
 
-S = "${WORKDIR}/git"
 
 inherit gettext autotools perlnative pkgconfig systemd
 
@@ -27,8 +26,6 @@ EXTRA_OECONF:append:class-target = " --with-driver=redhat"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts,"
 
-EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"
-
 do_configure:prepend() {
     currdir=`pwd`
     cd ${S}
diff --git a/meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch b/meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch
new file mode 100644
index 0000000000..51313d8055
--- /dev/null
+++ b/meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch
@@ -0,0 +1,168 @@
+From fd4f2099efd378a3e00809b485ae22ebf20ab0f7 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 16 Apr 2025 20:02:36 +0900
+Subject: [PATCH] Fix too many arguments error occurring in gcc-15
+
+* See more details in http://errors.yoctoproject.org/Errors/Details/851803/
+../../git/src/nettest_bsd.c:4497:19: error: too many arguments to function 'alloc_sendfile_buf_ring'; expected 0, have 4
+ 4497 |       send_ring = alloc_sendfile_buf_ring(send_width,
+      |                   ^~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+In file included from ../../git/src/nettest_bsd.c:175:
+../../git/src/netlib.h:690:26: note: declared here
+  690 | extern  struct ring_elt *alloc_sendfile_buf_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~~~~
+In file included from ../../git/src/nettest_omni.c:184:
+../../git/src/hist.h:135:6: error: conflicting types for 'HIST_purge'; have 'void(struct histogram_struct *)'
+  135 | void HIST_purge(HIST h);
+      |      ^~~~~~~~~~
+In file included from ../../git/src/nettest_omni.c:166:
+../../git/src/netlib.h:651:17: note: previous declaration of 'HIST_purge' with type 'void(void)'
+  651 | extern void     HIST_purge();
+      |                 ^~~~~~~~~~
+../../git/src/nettest_bsd.c: In function 'recv_tcp_stream':
+../../git/src/nettest_bsd.c:5197:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
+ 5197 |   recv_ring = allocate_buffer_ring(recv_width,
+      |               ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+../../git/src/netlib.h:679:26: note: declared here
+  679 | extern  struct ring_elt *allocate_buffer_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_bsd.c: In function 'recv_tcp_maerts':
+../../git/src/nettest_bsd.c:5617:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
+ 5617 |   send_ring = allocate_buffer_ring(send_width,
+      |               ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+../../git/src/netlib.h:679:26: note: declared here
+  679 | extern  struct ring_elt *allocate_buffer_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_bsd.c: In function 'recv_udp_stream':
+../../git/src/nettest_bsd.c:7345:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
+ 7345 |   recv_ring = allocate_buffer_ring(recv_width,
+      |               ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+../../git/src/netlib.h:679:26: note: declared here
+  679 | extern  struct ring_elt *allocate_buffer_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_bsd.c: In function 'recv_udp_rr':
+../../git/src/nettest_bsd.c:8360:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
+ 8360 |   recv_ring = allocate_buffer_ring(recv_width,
+      |               ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+../../git/src/netlib.h:679:26: note: declared here
+  679 | extern  struct ring_elt *allocate_buffer_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_bsd.c:8365:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
+ 8365 |   send_ring = allocate_buffer_ring(send_width,
+      |               ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+../../git/src/netlib.h:679:26: note: declared here
+  679 | extern  struct ring_elt *allocate_buffer_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_bsd.c: In function 'recv_tcp_rr':
+../../git/src/nettest_bsd.c:8677:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
+ 8677 |   send_ring = allocate_buffer_ring(send_width,
+      |               ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+../../git/src/netlib.h:679:26: note: declared here
+  679 | extern  struct ring_elt *allocate_buffer_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_bsd.c:8682:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
+ 8682 |   recv_ring = allocate_buffer_ring(recv_width,
+      |               ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+../../git/src/netlib.h:679:26: note: declared here
+  679 | extern  struct ring_elt *allocate_buffer_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_omni.c: In function 'send_omni_inner':
+../../git/src/nettest_omni.c:4044:21: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
+ 4044 |         send_ring = allocate_buffer_ring(send_width,
+      |                     ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+../../git/src/netlib.h:679:26: note: declared here
+  679 | extern  struct ring_elt *allocate_buffer_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_omni.c:4086:21: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
+ 4086 |         recv_ring = allocate_buffer_ring(recv_width,
+      |                     ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+../../git/src/netlib.h:679:26: note: declared here
+  679 | extern  struct ring_elt *allocate_buffer_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_omni.c:5050:5: error: too many arguments to function 'HIST_get_stats'; expected 0, have 5
+ 5050 |     HIST_get_stats(time_hist,
+      |     ^~~~~~~~~~~~~~ ~~~~~~~~~
+../../git/src/netlib.h:650:17: note: declared here
+  650 | extern void     HIST_get_stats();
+      |                 ^~~~~~~~~~~~~~
+../../git/src/nettest_omni.c:5055:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
+ 5055 |     p50_latency = HIST_get_percentile(time_hist, 0.50);
+      |                   ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
+../../git/src/netlib.h:649:17: note: declared here
+  649 | extern int      HIST_get_percentile();
+      |                 ^~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_omni.c:5056:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
+ 5056 |     p90_latency = HIST_get_percentile(time_hist, 0.90);
+      |                   ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
+../../git/src/netlib.h:649:17: note: declared here
+  649 | extern int      HIST_get_percentile();
+      |                 ^~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_omni.c:5057:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
+ 5057 |     p99_latency = HIST_get_percentile(time_hist, 0.99);
+      |                   ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
+../../git/src/netlib.h:649:17: note: declared here
+  649 | extern int      HIST_get_percentile();
+      |                 ^~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_omni.c: In function 'recv_omni':
+../../git/src/nettest_omni.c:5354:17: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
+ 5354 |     send_ring = allocate_buffer_ring(send_width,
+      |                 ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+../../git/src/netlib.h:679:26: note: declared here
+  679 | extern  struct ring_elt *allocate_buffer_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~
+../../git/src/nettest_omni.c:5396:17: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
+ 5396 |     recv_ring = allocate_buffer_ring(recv_width,
+      |                 ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
+../../git/src/netlib.h:679:26: note: declared here
+  679 | extern  struct ring_elt *allocate_buffer_ring();
+      |                          ^~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/HewlettPackard/netperf/pull/86]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/netlib.h | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/netlib.h b/src/netlib.h
+index b1f4199..8e1f6fe 100644
+--- a/src/netlib.h
++++ b/src/netlib.h
+@@ -564,6 +564,7 @@ extern void   demo_interval_final();
+ #endif
+ #endif
+ 
++#include "hist.h"
+ extern  void    netlib_init();
+ extern  int     netlib_get_page_size();
+ extern  void    install_signal_catchers();
+@@ -646,9 +647,9 @@ extern char     *find_interface_slot(char *interface_name);
+ extern void     find_interface_ids(char *interface_name, int *vendor, int *device, int *sub_vend, int *sub_dev);
+ extern void     find_driver_info(char *ifname, char *driver, char *version, char *firmware, char *bus, int len);
+ extern void     find_system_info(char **system_model, char **cpu_model, int *cpu_frequency);
+-extern int      HIST_get_percentile();
+-extern void     HIST_get_stats();
+-extern void     HIST_purge();
++extern int      HIST_get_percentile(HIST h, const double percentile);
++extern void     HIST_get_stats(HIST h, int *min, int *max, double *mean, double *stddev);
++extern void     HIST_purge(HIST h);
+ extern void     find_security_info(int *enabled, int *type, char **specific);
+ extern void     demo_first_timestamp();
+ extern void     demo_reset();
+@@ -676,7 +677,7 @@ extern  void    catcher(int, siginfo_t *,void *);
+ #else
+ extern  void    catcher(int);
+ #endif /* __hpux */
+-extern  struct ring_elt *allocate_buffer_ring();
++extern  struct ring_elt *allocate_buffer_ring(int recv_width, int recv_size, int local_recv_align, int local_recv_offset);
+ extern void access_buffer(char *buffer_ptr,
+                          int length,
+                          int dirty_count,
+@@ -687,7 +688,7 @@ extern  struct ring_elt *allocate_exs_buffer_ring();
+ #endif /* HAVE_ICSC_EXS */
+ 
+ #ifdef HAVE_SENDFILE
+-extern  struct ring_elt *alloc_sendfile_buf_ring();
++extern  struct ring_elt *alloc_sendfile_buf_ring(int send_width, int send_size, int local_send_align, int local_send_offset);
+ extern  int netperf_sendfile(SOCKET send_socket, struct ring_elt *send_ring);
+ #endif /* HAVE_SENDFILE */
+ 
diff --git a/meta-networking/recipes-support/netperf/files/0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch b/meta-networking/recipes-support/netperf/files/0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch
new file mode 100644
index 0000000000..6aba8a4f79
--- /dev/null
+++ b/meta-networking/recipes-support/netperf/files/0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch
@@ -0,0 +1,41 @@
+From 333e92a2d804420748447e043c6a04affc600e20 Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Date: Thu, 27 Feb 2025 21:09:04 +0200
+Subject: [PATCH] Makefile.am: add ACLOCAL_AMFLAGS
+
+Add ACLOCAL_AMFLAGS, a standard way to tell aclocal where to find
+necessary macros.
+
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Upstream-Status: Submitted [https://github.com/HewlettPackard/netperf/pull/84]
+---
+ Makefile.am | 1 +
+ autogen.sh  | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2cb9c24f2eec..dc266e34c997 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,6 +19,7 @@
+ # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ # USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
++ACLOCAL_AMFLAGS = -I src/missing/m4
+ AUTOMAKE_OPTIONS = dist-bzip2 dist-zip
+ SUBDIRS = src doc
+ EXTRA_DIST = README.* Release_Notes inet_ntop.c autogen.sh m4
+diff --git a/autogen.sh b/autogen.sh
+index bc8389c24171..1156f42edae6 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+ 
+-aclocal -I src/missing/m4 \
++aclocal \
+ && automake  --add-missing \
+ && autoconf && autoheader
+-- 
+2.39.5
+
diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-networking/recipes-support/netperf/netperf_git.bb
index 579a04b86f..4043da5621 100644
--- a/meta-networking/recipes-support/netperf/netperf_git.bb
+++ b/meta-networking/recipes-support/netperf/netperf_git.bb
@@ -15,11 +15,12 @@ SRC_URI = "git://github.com/HewlettPackard/netperf.git;branch=master;protocol=ht
            file://0001-netlib.c-Move-including-sched.h-out-og-function.patch \
            file://0001-nettest_omni-Remove-duplicate-variable-definitions.patch \
            file://netserver_permissions.patch \
+           file://0001-Makefile.am-add-ACLOCAL_AMFLAGS.patch \
+           file://0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch \
            "
 
 SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4"
 
-S = "${WORKDIR}/git"
 
 inherit update-rc.d autotools texinfo systemd
 
@@ -35,12 +36,6 @@ PACKAGECONFIG[sctp] = "--enable-sctp,--disable-sctp,lksctp-tools,"
 PACKAGECONFIG[intervals] = "--enable-intervals,--disable-intervals,,"
 PACKAGECONFIG[histogram] = "--enable-histogram,--disable-histogram,,"
 
-# autotools.bbclass attends to include m4 files with path depth <= 2 by
-# "find ${S} -maxdepth 2 -name \*.m4", so move m4 files from m4/m4.
-do_configure:prepend() {
-    test -d ${S}/m4/m4 && mv -f ${S}/m4/m4 ${S}/m4-files
-}
-
 do_install() {
     sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${UNPACKDIR}/init
     install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d ${D}${systemd_system_unitdir}
@@ -69,6 +64,6 @@ do_install() {
 
 RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}"
 
-INITSCRIPT_NAME="netperf"
-INITSCRIPT_PARAMS="defaults"
+INITSCRIPT_NAME = "netperf"
+INITSCRIPT_PARAMS = "defaults"
 SYSTEMD_SERVICE:${PN} = "netserver.service"
diff --git a/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb b/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb
index 341eab015c..58ace6263d 100644
--- a/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb
+++ b/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb
@@ -10,7 +10,6 @@ SRC_URI = " \
         file://0001-Cmds-automatically-create-folder.patch \
         "
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
index 9b2c186873..54fd68ed43 100644
--- a/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
+++ b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/thkukuk/yp-tools;branch=master;protocol=https \
            file://domainname.service \
            "
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "libtirpc libnsl2 virtual/crypt"
 
diff --git a/meta-networking/recipes-support/ntimed/ntimed_git.bb b/meta-networking/recipes-support/ntimed/ntimed_git.bb
index 955c03f42d..36fba5f57b 100644
--- a/meta-networking/recipes-support/ntimed/ntimed_git.bb
+++ b/meta-networking/recipes-support/ntimed/ntimed_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/bsdphk/Ntimed;branch=master;protocol=https \
 PV = "0.0+git"
 SRCREV = "db0abbb4c80f2ecef6bc5d9639bca5bea28532a2"
 
-S = "${WORKDIR}/git"
 
 # use adjtimex on musl
 CFLAGS:append:libc-musl = " -Dntp_adjtime=adjtimex"
diff --git a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb b/meta-networking/recipes-support/ntopng/ndpi_4.2.bb
index 13c3398c2b..f0175167a4 100644
--- a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb
+++ b/meta-networking/recipes-support/ntopng/ndpi_4.2.bb
@@ -5,7 +5,7 @@ inspection. Based on OpenDPI it includes ntop extensions"
 SECTION = "libdevel"
 DEPENDS = "libpcap json-c"
 RDEPENDS:${PN} += " libpcap"
-LICENSE = "GPL-3.0-only"
+LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24"
 
 SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46"
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.2-stable;protocol=https \
            file://0001-autogen.sh-not-generate-configure.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep pkgconfig
 
diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
index 9bb93910f8..014706893a 100644
--- a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
+++ b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb
@@ -23,7 +23,6 @@ SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.2-stable \
            file://ntopng.service \
            "
 
-S = "${WORKDIR}/git"
 
 # don't use the lua under thirdparty as it supports cross compiling badly
 export LUA_LIB = "${STAGING_LIBDIR}/liblua.a"
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 302cf9915f..33d19a696a 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb
@@ -26,6 +26,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
 
 SRC_URI[sha256sum] = "cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5"
 
+UPSTREAM_CHECK_REGEX = "ntp-(?P<pver>(\d+(\.\d+)+)(p\d+)?)\.tar"
+
 CVE_STATUS[CVE-2016-9312] = "not-applicable-platform: Issue only applies on Windows"
 CVE_STATUS[CVE-2019-11331] = "upstream-wontfix: inherent to RFC 5905 and cannot be fixed without breaking compatibility"
 CVE_STATUS_GROUPS += "CVE_STATUS_NTP"
@@ -55,6 +57,11 @@ CVE_STATUS_NTP = " \
 
 inherit autotools update-rc.d useradd systemd pkgconfig
 
+# For some reason this recipe reconfigures the nested configure.ac files in
+# do_compile because libtool.m4 is newer than aclocal.m4, and that then
+# doesn't know about the site configuration.
+do_compile[prefuncs] += "autotools_sitefiles"
+
 # The ac_cv_header_readline_history is to stop ntpdc depending on either
 # readline or curses
 EXTRA_OECONF += "--with-net-snmp-config=no \
diff --git a/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb b/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb
index b02f775a55..17fc818e8a 100644
--- a/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb
+++ b/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb
@@ -18,8 +18,7 @@ SRC_URI = "http://nuttcp.net/${BPN}/beta/${BP}.c \
 SRC_URI[md5sum] = "d3c92c4d2f261221193c3726c1b9a42f"
 SRC_URI[sha256sum] = "8c5595bcd27c2fd66831be74c390df078cfb1870aa427f2511ac2586d236c8a1"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile () {
     ${CC} ${CFLAGS} ${LDFLAGS} -o nuttcp nuttcp-${PV}.c
diff --git a/meta-networking/recipes-support/open-isns/open-isns_0.102.bb b/meta-networking/recipes-support/open-isns/open-isns_0.102.bb
index 24c520901d..5c38f6b5dc 100644
--- a/meta-networking/recipes-support/open-isns/open-isns_0.102.bb
+++ b/meta-networking/recipes-support/open-isns/open-isns_0.102.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/open-iscsi/open-isns;branch=master;protocol=https \
 
 SRCREV = "c0e6d9fedc5a7041260de477fe1a8455fa074113"
 
-S = "${WORKDIR}/git"
 
 inherit systemd autotools-brokensep update-rc.d
 
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch
new file mode 100644
index 0000000000..aad1b10b52
--- /dev/null
+++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch
@@ -0,0 +1,26 @@
+From 2a79621f58bf1c4bc0166ccc044fcf343fb66b44 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Wed, 20 Nov 2024 10:40:03 +1100
+Subject: [PATCH] Fix build when compiling with -std=c23
+
+Fixes the build when using gcc 15
+
+Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/751]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ open-vm-tools/lib/lock/ul.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/open-vm-tools/lib/lock/ul.c b/open-vm-tools/lib/lock/ul.c
+index d376a98af..fc9fdb714 100644
+--- a/open-vm-tools/lib/lock/ul.c
++++ b/open-vm-tools/lib/lock/ul.c
+@@ -29,7 +29,7 @@
+ static Bool mxInPanic = FALSE;  // track when involved in a panic
+ static Bool mxUserCollectLockingTree = FALSE;
+ 
+-Bool (*MXUserTryAcquireForceFail)() = NULL;
++Bool (*MXUserTryAcquireForceFail)(const char *) = NULL;
+ 
+ static MX_Rank (*MXUserMxCheckRank)(void) = NULL;
+ static void (*MXUserMxLockLister)(void) = NULL;
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb
index 217829193f..fa26a759dc 100644
--- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb
+++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb
@@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only"
 LICENSE:modules/linux = "GPL-2.0-only"
 LICENSE:modules/solaris = "CDDL-1.0"
 
-SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.4.x \
+SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.5.x \
            file://tools.conf \
            file://vmtoolsd.service \
            file://vmtoolsd.init \
@@ -43,6 +43,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stabl
            file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \
            file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \
            file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \
+           file://0001-Fix-build-when-compiling-with-std-c23.patch;patchdir=.. \
            "
 
 UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
@@ -50,9 +51,9 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
 SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \
 "
 
-SRCREV = "9b94132f54fbed0b86dce04ff4402d1d8fd059c3"
+SRCREV = "f2ca37ef3510543172657b82493d1eceefa9a134"
 
-S = "${WORKDIR}/git/open-vm-tools"
+S = "${UNPACKDIR}/${BP}/open-vm-tools"
 
 DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps libtirpc"
 
diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb
index 74c5ef220d..86b24c1795 100644
--- a/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb
+++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb
@@ -32,7 +32,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
            file://ipmi.service \
            "
 
-S = "${WORKDIR}/OpenIPMI-${PV}"
+S = "${UNPACKDIR}/OpenIPMI-${PV}"
 
 SRC_URI[sha256sum] = "a0403148fa5f7bed930c958a4d1c558047e273763a408b3a0368edc137cc55d9"
 
diff --git a/meta-networking/recipes-support/openvpn/openvpn/run-ptest b/meta-networking/recipes-support/openvpn/openvpn/run-ptest
new file mode 100644
index 0000000000..5b187d9086
--- /dev/null
+++ b/meta-networking/recipes-support/openvpn/openvpn/run-ptest
@@ -0,0 +1,5 @@
+#!/bin/sh
+for x in `find ./ -name Makefile`;
+do
+        make -C `dirname ${x}` -k runtest-TESTS
+done
diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb b/meta-networking/recipes-support/openvpn/openvpn_2.6.14.bb
index d81b8ce449..67ea09fad5 100644
--- a/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb
+++ b/meta-networking/recipes-support/openvpn/openvpn_2.6.14.bb
@@ -3,18 +3,19 @@ HOMEPAGE = "https://openvpn.net/"
 SECTION = "net"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=89196bacc47ed37a5b242a535661a049"
-DEPENDS = "lzo lz4 openssl iproute2 libcap-ng ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+DEPENDS = "lzo lz4 openssl iproute2 libcap-ng ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} ${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)} "
 
-inherit autotools systemd update-rc.d pkgconfig
+inherit autotools systemd update-rc.d pkgconfig ptest
 
 SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \
            file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \
            file://openvpn \
+           file://run-ptest \
           "
 
 UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads"
 
-SRC_URI[sha256sum] = "1c610fddeb686e34f1367c347e027e418e07523a10f4d8ce4a2c2af2f61a1929"
+SRC_URI[sha256sum] = "9eb6a6618352f9e7b771a9d38ae1631b5edfeed6d40233e243e602ddf2195e7a"
 
 CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn"
 
@@ -42,6 +43,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
 
+RDEPENDS:${PN}-ptest:append = " make bash"
+
 do_install:append() {
     install -d ${D}/${sysconfdir}/init.d
     install -m 755 ${UNPACKDIR}/openvpn ${D}/${sysconfdir}/init.d
@@ -63,6 +66,47 @@ do_install:append() {
     install -d -m 710 ${D}/${localstatedir}/lib/openvpn
 }
 
+do_compile_ptest () {
+    for x in `find ${B}/tests/unit_tests -name Makefile -exec grep -l buildtest-TESTS {} \;`; do
+        dir=`dirname ${x}`
+        case $dir in
+            *example*)   
+                echo "Skipping directory: $dir"
+                ;;
+            *)           
+                oe_runmake -C ${dir} buildtest-TESTS
+                ;;
+        esac
+    done
+}
+
+do_install_ptest() {
+    for x in $(find ${B}/tests/unit_tests -name Makefile -exec grep -l buildtest-TESTS {} \;); do
+        dir=$(dirname ${x})
+
+        if [[ "$dir" == *example* ]]; then
+            continue
+        fi
+
+        target_dir="${D}/${PTEST_PATH}/unit_tests/$(basename ${dir})"
+        mkdir -p ${target_dir}
+        cp -f ${dir}/Makefile ${target_dir}/        
+        sed -i "s/^Makefile:/MM:/g" ${target_dir}/Makefile
+        sed -i 's/^#TESTS = $(am__EXEEXT_4)/TESTS = $(am__EXEEXT_4)/' ${target_dir}/Makefile
+
+        for testfile in $(find ${dir} -name "*testdriver"); do
+            cp -rf ${testfile} ${target_dir}/
+        done
+    done
+    sed -i 's|find ./|find ${PTEST_PATH}|g' ${D}${PTEST_PATH}/run-ptest
+    sed -i 's|${top_builddir}/src/openvpn|${sbindir}|g' ${S}/tests/t_lpback.sh
+    cp -f ${S}/tests/t_lpback.sh ${D}/${PTEST_PATH}
+    cp -f ${B}/tests/Makefile ${D}/${PTEST_PATH}
+    sed -i "s/^Makefile:/MM:/g" ${D}/${PTEST_PATH}/Makefile
+    sed -i "s/^test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh/test_scripts = t_lpback.sh/g" ${D}/${PTEST_PATH}/Makefile
+    
+}
+
 PACKAGES =+ " ${PN}-sample "
 
 RRECOMMENDS:${PN} = "kernel-module-tun"
diff --git a/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.4.bb
index ddcad46beb..706e7360a2 100644
--- a/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb
+++ b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.4.bb
@@ -10,15 +10,15 @@ HOMEPAGE = "http://pgpool.net"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9"
 
-SRC_URI = "http://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \
+SRC_URI = "https://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \
            file://0001-Fix-build-error-when-build-this-file.patch \
            file://define_SIGNAL_ARGS.patch \
            file://pgpool.sysconfig \
            file://pgpool.service \
            "
-SRC_URI[sha256sum] = "8e14b0558a15dae8767c8e1acee3f2f6c7c08ebfffda66a359367eaaa56c3936"
+SRC_URI[sha256sum] = "d1392e74ce2807f8ae628872cb1ab7914249921180dc99df40a1d602647a10fd"
 
-S = "${WORKDIR}/pgpool-II-${PV}"
+S = "${UNPACKDIR}/pgpool-II-${PV}"
 
 inherit autotools-brokensep systemd
 
@@ -48,3 +48,7 @@ do_install:append() {
     install -D -m 0644 ${S}/src/sample/pool_hba.conf.sample ${D}${sysconfdir}/pgpool-II/pool_hba.conf
     install -Dm 0644 ${UNPACKDIR}/pgpool.service ${D}${systemd_system_unitdir}/pgpool.service
 }
+
+# Avoid build failure with gcc-15:
+# http://errors.yoctoproject.org/Errors/Details/853019/
+CFLAGS += "-std=gnu17"
diff --git a/meta-networking/recipes-support/phytool/phytool.bb b/meta-networking/recipes-support/phytool/phytool.bb
index b918e50c68..6471f46c28 100644
--- a/meta-networking/recipes-support/phytool/phytool.bb
+++ b/meta-networking/recipes-support/phytool/phytool.bb
@@ -6,7 +6,6 @@ PV = "2+git"
 SRCREV = "8882328c08ba2efb13c049812098f1d0cb8adf0c"
 SRC_URI = "git://github.com/wkz/phytool.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 # The Makefile has "$PREFIX/bin" hardcoded into it, hence not using $bindir here
 do_install() {
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb
index 0c204c109f..2555c43a85 100644
--- a/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb
+++ b/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=http
            file://0001-librdmacm-Use-overloadable-function-attribute-with-c.patch \
 "
 SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6"
-S = "${WORKDIR}/git"
 
 #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md
 LICENSE = "BSD-2-Clause | GPL-2.0-only"
diff --git a/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb b/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb
index 950f6a2e21..bb12d7a907 100644
--- a/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb
+++ b/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb
@@ -8,6 +8,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SRCREV = "b315d06ddb0dad16a52fe91e5831b4030ce37010"
 SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
diff --git a/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb b/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb
index 518ca9e277..12fe3ececa 100644
--- a/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb
+++ b/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb
@@ -18,7 +18,6 @@ DEPENDS = "\
 SRC_URI = "git://github.com/irontec/sngrep.git;protocol=https;branch=master"
 SRCREV = "dad1033640f249fa4994f976cf6ee96826c15702"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb b/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
index 65f2f80ace..1a2d9dc9c4 100644
--- a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
+++ b/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
@@ -8,7 +8,6 @@ SRCREV = "7b07684ea6698d4885ff2062350ad8798a04de42"
 
 SRC_URI = "git://gitlab.freedesktop.org/spice/libcacard.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb
index c8a3f7f532..3588d674f7 100644
--- a/meta-networking/recipes-support/spice/spice-gtk_0.42.bb
+++ b/meta-networking/recipes-support/spice/spice-gtk_0.42.bb
@@ -12,7 +12,8 @@ SRCREV = "f04479c16f0969fb394ebe74b6eff74e560a42f0"
 
 SRC_URI = "gitsm://gitlab.freedesktop.org/spice/spice-gtk.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
+CVE_STATUS[CVE-2012-4425] = "fixed-version: fixed since 0.15.3"
+
 
 DEPENDS = " \
         ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \
diff --git a/meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb b/meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb
index 3af973eed1..b13dd5d148 100644
--- a/meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb
+++ b/meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb
@@ -7,7 +7,6 @@ SRCREV = "aa08162f036840d3e33502dc0a836b03b9cec97c"
 
 SRC_URI = "git://gitlab.freedesktop.org/spice/linux/vd_agent.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "opengl x11"
diff --git a/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb b/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb
index 3c8458baac..7f08eebee7 100644
--- a/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb
+++ b/meta-networking/recipes-support/spice/spice-protocol_0.14.4.bb
@@ -12,7 +12,6 @@ SRCREV = "6f453a775d87087c6ba59fc180c1a1e466631a47"
 
 SRC_URI = "git://gitlab.freedesktop.org/spice/spice-protocol.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/meta-networking/recipes-support/spice/spice_git.bb b/meta-networking/recipes-support/spice/spice_git.bb
index 419316a26e..c9418a1765 100644
--- a/meta-networking/recipes-support/spice/spice_git.bb
+++ b/meta-networking/recipes-support/spice/spice_git.bb
@@ -19,8 +19,9 @@ SRCREV = "0c2c1413a8b387ea597a95b6c867470a7c56c8ab"
 
 SRC_URI = "gitsm://gitlab.freedesktop.org/spice/spice;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
+CVE_STATUS[CVE-2016-0749] = "fixed-version: patched since 0.13.2"
+CVE_STATUS[CVE-2016-2150] = "fixed-version: patched since 0.13.2"
 CVE_STATUS[CVE-2018-10893] = "fixed-version: patched already, caused by inaccurate CPE in the NVD database."
 
 inherit meson gettext python3native python3-dir pkgconfig
@@ -28,7 +29,7 @@ inherit meson gettext python3native python3-dir pkgconfig
 DEPENDS = "spice-protocol jpeg pixman alsa-lib glib-2.0 gdk-pixbuf lz4 orc python3-pyparsing-native python3-six-native glib-2.0-native zlib"
 DEPENDS:append:class-nativesdk = " nativesdk-openssl"
 
-export PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3"
+export PYTHON = "${STAGING_BINDIR_NATIVE}/python3-native/python3"
 
 do_configure:prepend() {
         echo ${PV} > ${S}/.tarball-version
diff --git a/meta-networking/recipes-support/spice/usbredir_0.14.0.bb b/meta-networking/recipes-support/spice/usbredir_0.14.0.bb
index 82f48ccdb8..81c7fdf0c8 100644
--- a/meta-networking/recipes-support/spice/usbredir_0.14.0.bb
+++ b/meta-networking/recipes-support/spice/usbredir_0.14.0.bb
@@ -11,7 +11,6 @@ SRCREV = "2d373432e604960c1dcc14fb97098febe4d64025"
 
 SRC_URI = "git://gitlab.freedesktop.org/spice/usbredir;branch=main;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb b/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
index 2d63119750..9b1413df2e 100644
--- a/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
+++ b/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
@@ -4,10 +4,9 @@ SECTION = "net"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://asmping.c;beginline=2;endline=11;md5=1ca8d1a1ca931e5cfe604ebf20a78b71"
 
-SRC_URI = "http://www.venaas.no/multicast/ssmping/${BP}.tar.gz \
+SRC_URI = "${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.gz;downloadfilename=${BP}.tar.gz \
     file://0001-Makefile-tweak-install-dir.patch \
 "
-SRC_URI[md5sum] = "ad8e3d13f6d72918f73be7e7975d7fad"
 SRC_URI[sha256sum] = "22103a37eaa28489169a0927bc01e0596c3485fc4d29fc8456c07fd2c70fca6d"
 
 CFLAGS += "-D_GNU_SOURCE "
diff --git a/meta-networking/recipes-support/ssmtp/ssmtp/0001-Fix-incompatible-pointer-types-error-with-gcc-15.patch b/meta-networking/recipes-support/ssmtp/ssmtp/0001-Fix-incompatible-pointer-types-error-with-gcc-15.patch
new file mode 100644
index 0000000000..920c1cd2c5
--- /dev/null
+++ b/meta-networking/recipes-support/ssmtp/ssmtp/0001-Fix-incompatible-pointer-types-error-with-gcc-15.patch
@@ -0,0 +1,47 @@
+From 7d3db0f63b9fa4a0deca486eccbe60c3cfa00750 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 16 Apr 2025 18:28:24 +0900
+Subject: [PATCH] Fix incompatible-pointer-types error with gcc 15
+
+../ssmtp-2.64/ssmtp.c:1454:31: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1454 |         (void)signal(SIGALRM, (void(*)())handler);      /* Catch SIGALRM */
+      |                               ^~~~~~~~~~~~~~~~~~
+      |                               |
+      |                               void (*)(void)
+In file included from TOPDIR/tmp/work/core2-64-oe-linux/ssmtp/2.64/recipe-sysroot/usr/include/sys/param.h:28,
+                 from ../ssmtp-2.64/ssmtp.c:18:
+TOPDIR/tmp/work/core2-64-oe-linux/ssmtp/2.64/recipe-sysroot/usr/include/signal.h:88:57: note: expected '__sighandler_t' {aka 'void (*)(int)'} but argument is of type 'void (*)(void)'
+   88 | extern __sighandler_t signal (int __sig, __sighandler_t __handler)
+      |                                          ~~~~~~~~~~~~~~~^~~~~~~~~
+../ssmtp-2.64/ssmtp.c:1393:6: note: 'handler' declared here
+ 1393 | void handler(void)
+      |      ^~~~~~~
+
+Upstream-Status: Inactive-Upstream [This package has been orphaned https://bugs.debian.org/925056]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ ssmtp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ssmtp.c b/ssmtp.c
+index 4dedaf8..a938d14 100644
+--- a/ssmtp.c
++++ b/ssmtp.c
+@@ -1390,7 +1390,7 @@ handler() -- A "normal" non-portable version of an alarm handler
+                        like a socket. So we longjump instead, which is erronious on
+                        a small number of machines and ill-defined in the language
+ */
+-void handler(void)
++void handler(__attribute__((unused)) int sig)
+ {
+        extern jmp_buf TimeoutJmpBuf;
+ 
+@@ -1451,7 +1451,7 @@ int ssmtp(char *argv[])
+        from = from_format(uad, override_from);
+ 
+        /* Now to the delivery of the message */
+-       (void)signal(SIGALRM, (void(*)())handler);      /* Catch SIGALRM */
++       (void)signal(SIGALRM, handler); /* Catch SIGALRM */
+        (void)alarm((unsigned) MAXWAIT);                        /* Set initial timer */
+        if(setjmp(TimeoutJmpBuf) != 0) {
+                /* Then the timer has gone off and we bail out */
diff --git a/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb b/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb
index 499a79d1ed..8dc2d76477 100644
--- a/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb
+++ b/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb
@@ -9,6 +9,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.bz2 \
            file://use-DESTDIR.patch \
            file://0001-ssmtp-Correct-the-null-pointer-assignment-to-char-po.patch \
            file://0001-include-libgen.h-for-basename.patch \
+           file://0001-Fix-incompatible-pointer-types-error-with-gcc-15.patch \
            "
 
 SRC_URI[md5sum] = "65b4e0df4934a6cd08c506cabcbe584f"
diff --git a/meta-networking/recipes-support/strongswan/strongswan/0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch b/meta-networking/recipes-support/strongswan/strongswan/0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch
new file mode 100644
index 0000000000..92c848f095
--- /dev/null
+++ b/meta-networking/recipes-support/strongswan/strongswan/0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch
@@ -0,0 +1,25 @@
+From a7b5de569082398a14b7e571498e55d005903aaf Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias@strongswan.org>
+Date: Fri, 21 Feb 2025 17:18:35 +0100
+Subject: [PATCH] pki: Fix signature of help() to match that of a callback in
+ command_t
+
+Upstream-Status: Backport [a7b5de5 pki: Fix signature of help() to match that of a callback in command_t]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/pki/command.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pki/command.c b/src/pki/command.c
+index accec5fe5..6e6bf041e 100644
+--- a/src/pki/command.c
++++ b/src/pki/command.c
+@@ -265,7 +265,7 @@ int command_usage(char *error)
+ /**
+  * Show usage information
+  */
+-static int help(int c, char *v[])
++static int help()
+ {
+        return command_usage(NULL);
+ }
diff --git a/meta-networking/recipes-support/strongswan/strongswan/0002-callback-job-Replace-return_false-in-constructors-wi.patch b/meta-networking/recipes-support/strongswan/strongswan/0002-callback-job-Replace-return_false-in-constructors-wi.patch
new file mode 100644
index 0000000000..09451206ca
--- /dev/null
+++ b/meta-networking/recipes-support/strongswan/strongswan/0002-callback-job-Replace-return_false-in-constructors-wi.patch
@@ -0,0 +1,90 @@
+From d5d2568ff0e88d364dadf50b67bf17050763cf98 Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias@strongswan.org>
+Date: Fri, 21 Feb 2025 16:45:57 +0100
+Subject: [PATCH] callback-job: Replace return_false() in constructors with
+ dedicated function
+
+Besides being clearer, this fixes issues with GCC 15.  The latter uses
+C23 by default, which changes the meaning of function declarations
+without parameters such as
+
+        bool return false();
+
+Instead of "this function takes an unknown number of arguments", this
+now equals (void), that is, "this function takes no arguments".  So we
+run into incompatible pointer type warnings all over when using such
+functions.  They could be cast to (void*) but this seems the cleaner
+solution for this use case.
+
+Upstream-Status: Backport [d5d2568 callback-job: Replace return_false() in constructors with dedicated function]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/libstrongswan/processing/jobs/callback_job.c      | 10 +++++++++-
+ src/libstrongswan/processing/jobs/callback_job.h      | 11 ++++++++++-
+ src/libstrongswan/processing/scheduler.c              |  3 ++-
+ 3 files changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/src/libstrongswan/processing/jobs/callback_job.c b/src/libstrongswan/processing/jobs/callback_job.c
+index cb2a0aba5..3ab40b947 100644
+--- a/src/libstrongswan/processing/jobs/callback_job.c
++++ b/src/libstrongswan/processing/jobs/callback_job.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2009-2012 Tobias Brunner
++ * Copyright (C) 2009-2025 Tobias Brunner
+  * Copyright (C) 2007-2011 Martin Willi
+  *
+  * Copyright (C) secunet Security Networks AG
+@@ -131,3 +131,11 @@ callback_job_t *callback_job_create(callback_job_cb_t cb, void *data,
+        return callback_job_create_with_prio(cb, data, cleanup, cancel,
+                                                                                 JOB_PRIO_MEDIUM);
+ }
++
++/*
++ * Described in header
++ */
++bool callback_job_cancel_thread(void *data)
++{
++       return FALSE;
++}
+diff --git a/src/libstrongswan/processing/jobs/callback_job.h b/src/libstrongswan/processing/jobs/callback_job.h
+index 0f1ae212d..fda868879 100644
+--- a/src/libstrongswan/processing/jobs/callback_job.h
++++ b/src/libstrongswan/processing/jobs/callback_job.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2012 Tobias Brunner
++ * Copyright (C) 2012-2025 Tobias Brunner
+  * Copyright (C) 2007-2011 Martin Willi
+  *
+  * Copyright (C) secunet Security Networks AG
+@@ -62,6 +62,15 @@ typedef void (*callback_job_cleanup_t)(void *data);
+  */
+ typedef bool (*callback_job_cancel_t)(void *data);
+ 
++/**
++ * Default implementation of callback_job_cancel_t that simply returns FALSE
++ * to force cancellation of the thread by the processor.
++ *
++ * @param data                 ignored argument
++ * @return                             always returns FALSE
++ */
++bool callback_job_cancel_thread(void *data);
++
+ /**
+  * Class representing an callback Job.
+  *
+diff --git a/src/libstrongswan/processing/scheduler.c b/src/libstrongswan/processing/scheduler.c
+index c5e5dd83e..76d98ddff 100644
+--- a/src/libstrongswan/processing/scheduler.c
++++ b/src/libstrongswan/processing/scheduler.c
+@@ -329,7 +329,8 @@ scheduler_t * scheduler_create()
+        this->heap = (event_t**)calloc(this->heap_size + 1, sizeof(event_t*));
+ 
+        job = callback_job_create_with_prio((callback_job_cb_t)schedule, this,
+-                                                                               NULL, return_false, JOB_PRIO_CRITICAL);
++                                                                               NULL, callback_job_cancel_thread,
++                                                                               JOB_PRIO_CRITICAL);
+        lib->processor->queue_job(lib->processor, (job_t*)job);
+ 
+        return &this->public;
diff --git a/meta-networking/recipes-support/strongswan/strongswan/0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch b/meta-networking/recipes-support/strongswan/strongswan/0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch
new file mode 100644
index 0000000000..6c2a77105a
--- /dev/null
+++ b/meta-networking/recipes-support/strongswan/strongswan/0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch
@@ -0,0 +1,118 @@
+From 11978ddd39e800b5f35f721d726e8a4cb7e4ec0f Mon Sep 17 00:00:00 2001
+From: Tobias Brunner <tobias@strongswan.org>
+Date: Fri, 21 Feb 2025 17:00:44 +0100
+Subject: [PATCH] Cast uses of return_*(), nop() and enumerator_create_empty()
+
+As described in the previous commit, GCC 15 uses C23 by default and that
+changes the meaning of such argument-less function declarations.  So
+whenever we assign such a function to a pointer that expects a function
+with arguments it causes an incompatible pointer type warning.  We
+could define dedicated functions/callbacks whenever necessary, but this
+seems like the simpler approach for now (especially since most uses of
+these functions have already been cast).
+
+Upstream-Status: Backport [11978dd Cast uses of return_*(), nop() and enumerator_create_empty()]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/charon-nm/nm/nm_handler.c                           | 2 +-
+ src/libcharon/encoding/payloads/encrypted_payload.c     | 2 +-
+ src/libcharon/plugins/android_dns/android_dns_handler.c | 2 +-
+ src/libcharon/plugins/ha/ha_attribute.c                 | 2 +-
+ src/libcharon/plugins/updown/updown_handler.c           | 2 +-
+ src/libstrongswan/utils/identification.c                | 6 +++---
+ 6 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/charon-nm/nm/nm_handler.c b/src/charon-nm/nm/nm_handler.c
+index d7331ad72..39d0190ac 100644
+--- a/src/charon-nm/nm/nm_handler.c
++++ b/src/charon-nm/nm/nm_handler.c
+@@ -195,7 +195,7 @@ nm_handler_t *nm_handler_create()
+                .public = {
+                        .handler = {
+                                .handle = _handle,
+-                               .release = nop,
++                               .release = (void*)nop,
+                                .create_attribute_enumerator = _create_attribute_enumerator,
+                        },
+                        .create_enumerator = _create_enumerator,
+diff --git a/src/libcharon/encoding/payloads/encrypted_payload.c b/src/libcharon/encoding/payloads/encrypted_payload.c
+index 676d00b7a..4821c6108 100644
+--- a/src/libcharon/encoding/payloads/encrypted_payload.c
++++ b/src/libcharon/encoding/payloads/encrypted_payload.c
+@@ -1023,7 +1023,7 @@ encrypted_fragment_payload_t *encrypted_fragment_payload_create()
+                                .get_length = _frag_get_length,
+                                .add_payload = _frag_add_payload,
+                                .remove_payload = (void*)return_null,
+-                               .generate_payloads = nop,
++                               .generate_payloads = (void*)nop,
+                                .set_transform = _frag_set_transform,
+                                .get_transform = _frag_get_transform,
+                                .encrypt = _frag_encrypt,
+diff --git a/src/libcharon/plugins/android_dns/android_dns_handler.c b/src/libcharon/plugins/android_dns/android_dns_handler.c
+index 78f4f702a..14d2ff99a 100644
+--- a/src/libcharon/plugins/android_dns/android_dns_handler.c
++++ b/src/libcharon/plugins/android_dns/android_dns_handler.c
+@@ -191,7 +191,7 @@ METHOD(enumerator_t, enumerate_dns, bool,
+        VA_ARGS_VGET(args, type, data);
+        *type = INTERNAL_IP4_DNS;
+        *data = chunk_empty;
+-       this->venumerate = return_false;
++       this->venumerate = (void*)return_false;
+        return TRUE;
+ }
+ 
+diff --git a/src/libcharon/plugins/ha/ha_attribute.c b/src/libcharon/plugins/ha/ha_attribute.c
+index b865a4b82..103d1a937 100644
+--- a/src/libcharon/plugins/ha/ha_attribute.c
++++ b/src/libcharon/plugins/ha/ha_attribute.c
+@@ -381,7 +381,7 @@ ha_attribute_t *ha_attribute_create(ha_kernel_t *kernel, ha_segments_t *segments
+                        .provider = {
+                                .acquire_address = _acquire_address,
+                                .release_address = _release_address,
+-                               .create_attribute_enumerator = enumerator_create_empty,
++                               .create_attribute_enumerator = (void*)enumerator_create_empty,
+                        },
+                        .reserve = _reserve,
+                        .destroy = _destroy,
+diff --git a/src/libcharon/plugins/updown/updown_handler.c b/src/libcharon/plugins/updown/updown_handler.c
+index 36eb15615..3707e1e65 100644
+--- a/src/libcharon/plugins/updown/updown_handler.c
++++ b/src/libcharon/plugins/updown/updown_handler.c
+@@ -220,7 +220,7 @@ updown_handler_t *updown_handler_create()
+                        .handler = {
+                                .handle = _handle,
+                                .release = _release,
+-                               .create_attribute_enumerator = enumerator_create_empty,
++                               .create_attribute_enumerator = (void*)enumerator_create_empty,
+                        },
+                        .create_dns_enumerator = _create_dns_enumerator,
+                        .destroy = _destroy,
+diff --git a/src/libstrongswan/utils/identification.c b/src/libstrongswan/utils/identification.c
+index d31955b38..58a05052d 100644
+--- a/src/libstrongswan/utils/identification.c
++++ b/src/libstrongswan/utils/identification.c
+@@ -1625,7 +1625,7 @@ static private_identification_t *identification_create(id_type_t type)
+                        this->public.hash = _hash_binary;
+                        this->public.equals = _equals_binary;
+                        this->public.matches = _matches_any;
+-                       this->public.contains_wildcards = return_true;
++                       this->public.contains_wildcards = (void*)return_true;
+                        break;
+                case ID_FQDN:
+                case ID_RFC822_ADDR:
+@@ -1660,13 +1660,13 @@ static private_identification_t *identification_create(id_type_t type)
+                        this->public.hash = _hash_binary;
+                        this->public.equals = _equals_binary;
+                        this->public.matches = _matches_range;
+-                       this->public.contains_wildcards = return_false;
++                       this->public.contains_wildcards = (void*)return_false;
+                        break;
+                default:
+                        this->public.hash = _hash_binary;
+                        this->public.equals = _equals_binary;
+                        this->public.matches = _matches_binary;
+-                       this->public.contains_wildcards = return_false;
++                       this->public.contains_wildcards = (void*)return_false;
+                        break;
+        }
+        return this;
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.14.bb b/meta-networking/recipes-support/strongswan/strongswan_6.0.1.bb
index 2e2da8274b..771470f695 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.9.14.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_6.0.1.bb
@@ -8,10 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "flex-native flex bison-native"
 DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', '  tpm2-tss', '', d)}"
 
-SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2 \
-          "
+SRC_URI = " \
+    https://download.strongswan.org/strongswan-${PV}.tar.bz2 \
+    file://0001-pki-Fix-signature-of-help-to-match-that-of-a-callbac.patch \
+    file://0002-callback-job-Replace-return_false-in-constructors-wi.patch \
+    file://0003-Cast-uses-of-return_-nop-and-enumerator_create_empty.patch \
+    "
 
-SRC_URI[sha256sum] = "728027ddda4cb34c67c4cec97d3ddb8c274edfbabdaeecf7e74693b54fc33678"
+SRC_URI[sha256sum] = "212368cbc674fed31f3292210303fff06da8b90acad2d1387375ed855e6879c4"
 
 UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"
 
@@ -22,24 +26,33 @@ EXTRA_OECONF = " \
 
 EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
-PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl curve25519\
+PACKAGECONFIG ?= "curl openssl sqlite3 swanctl \
         ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \
         ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'tpm2', '', d)} \
         ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imc imc-hcd imc-os imc-scanner imc-attestation', '', d)} \
         ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imv imv-hcd imv-os imv-scanner imv-attestation', '', d)} \
 "
 
+PACKAGECONFIG[aes] = "--enable-aes,--disable-aes,,${PN}-plugin-aes"
 PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni"
 PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils"
 PACKAGECONFIG[charon] = "--enable-charon,--disable-charon,"
 PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl"
+PACKAGECONFIG[des] = "--enable-des,--disable-des,,${PN}-plugin-des"
 PACKAGECONFIG[eap-identity] = "--enable-eap-identity,--disable-eap-identity,,${PN}-plugin-eap-identity"
 PACKAGECONFIG[eap-mschapv2] = "--enable-eap-mschapv2,--disable-eap-mschapv2,,${PN}-plugin-eap-mschapv2"
+PACKAGECONFIG[fips-prf] = "--enable-fips-prf,--disable-fips-prf,,${PN}-plugin-fips-prf"
 PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp"
+PACKAGECONFIG[hmac] = "--enable-hmac,--disable-hmac,,${PN}-plugin-hmac"
 PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap"
+PACKAGECONFIG[md5] = "--enable-md5,--disable-md5,,${PN}-plugin-md5"
 PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql"
 PACKAGECONFIG[nm] = "--enable-nm,--disable-nm,networkmanager,${PN}-nm"
 PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl"
+PACKAGECONFIG[pkcs12] = "--enable-pkcs12,--disable-pkcs12,,${PN}-plugin-pkcs12"
+PACKAGECONFIG[rc2] = "--enable-rc2,--disable-rc2,,${PN}-plugin-rc2"
+PACKAGECONFIG[sha1] = "--enable-sha1,--disable-sha1,,${PN}-plugin-sha1"
+PACKAGECONFIG[sha2] = "--enable-sha2,--disable-sha2,,${PN}-plugin-sha2"
 PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup"
 PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite"
 PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke"
@@ -144,34 +157,23 @@ PACKAGESPLITFUNCS:prepend = "split_strongswan_plugins "
 # Install some default plugins based on default strongSwan ./configure options
 # See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist
 RDEPENDS:${PN} += "\
-    ${PN}-plugin-aes \
     ${PN}-plugin-attr \
     ${PN}-plugin-cmac \
     ${PN}-plugin-constraints \
-    ${PN}-plugin-des \
     ${PN}-plugin-dnskey \
     ${PN}-plugin-drbg \
-    ${PN}-plugin-fips-prf \
-    ${PN}-plugin-gcm \
-    ${PN}-plugin-hmac \
     ${PN}-plugin-kdf \
     ${PN}-plugin-kernel-netlink \
-    ${PN}-plugin-md5 \
-    ${PN}-plugin-mgf1 \
     ${PN}-plugin-nonce \
     ${PN}-plugin-pem \
     ${PN}-plugin-pgp \
     ${PN}-plugin-pkcs1 \
     ${PN}-plugin-pkcs7 \
     ${PN}-plugin-pkcs8 \
-    ${PN}-plugin-pkcs12 \
     ${PN}-plugin-pubkey \
     ${PN}-plugin-random \
-    ${PN}-plugin-rc2 \
     ${PN}-plugin-resolve \
     ${PN}-plugin-revocation \
-    ${PN}-plugin-sha1 \
-    ${PN}-plugin-sha2 \
     ${PN}-plugin-socket-default \
     ${PN}-plugin-sshkey \
     ${PN}-plugin-updown \
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 82d3551019..3520bf429e 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 7ff4eba20b5c4fc7365e5ee0dfb775ed29bdd5ce Mon Sep 17 00:00:00 2001
+From e08b9760d319d0334f2aad02d32d791c8ebd8564 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 2b4869f..180d31a 100644
+index c2229d0..5eaee8c 100644
 --- a/src/common.h
 +++ b/src/common.h
-@@ -492,7 +492,9 @@ extern char *sys_errlist[];
+@@ -497,7 +497,9 @@ extern char *sys_errlist[];
  #ifndef OPENSSL_NO_MD4
  #include <openssl/md4.h>
  #endif /* !defined(OPENSSL_NO_MD4) */
@@ -31,19 +31,19 @@ index 2b4869f..180d31a 100644
  #include <openssl/dh.h>
  #if OPENSSL_VERSION_NUMBER<0x10100000L
 diff --git a/src/protocol.c b/src/protocol.c
-index cfe6d3b..3936aea 100644
+index c390a6f..7aca745 100644
 --- a/src/protocol.c
 +++ b/src/protocol.c
-@@ -81,7 +81,7 @@ NOEXPORT void ldap_client_middle(CLI *);
- 
+@@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *);
  NOEXPORT void connect_server_early(CLI *);
+ NOEXPORT const char *connect_client_init(SERVICE_OPTIONS *);
  NOEXPORT void connect_client_middle(CLI *);
 -#ifndef OPENSSL_NO_MD4
 +#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES)
  NOEXPORT void ntlm(CLI *);
  NOEXPORT char *ntlm1(void);
  NOEXPORT char *ntlm3(char *, char *, char *, char *);
-@@ -1331,7 +1331,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
+@@ -1391,7 +1391,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 cfe6d3b..3936aea 100644
              ntlm(c);
  #else
              s_log(LOG_ERR, "NTLM authentication is not available");
-@@ -1374,7 +1374,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
+@@ -1434,7 +1434,7 @@ NOEXPORT void connect_client_middle(CLI *c) {
      str_free(line);
  }
  
@@ -61,6 +61,3 @@ index cfe6d3b..3936aea 100644
  
  /*
   * NTLM code is based on the following documentation:
--- 
-2.34.1
-
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.72.bb b/meta-networking/recipes-support/stunnel/stunnel_5.75.bb
index 6d21027a16..e13872abcd 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.72.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.75.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=906ac034adaee9d093318e51b53453ca"
+LIC_FILES_CHKSUM = "file://COPYING.md;md5=1e4388407e163ad0cde171362f9a7b94"
 
 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] = "3d532941281ae353319735144e4adb9ae489a10b7e309c58a48157f08f42e949"
+SRC_URI[sha256sum] = "0c1ef0ed85240974dccb94fe74fb92d6383474c7c0d10e8796d1f781a3ba5683"
 
 inherit autotools bash-completion pkgconfig
 
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb
index 32b869f241..144a12560b 100644
--- a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb
+++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb
@@ -30,6 +30,8 @@ SRC_URI[sha256sum] = "d76395ab82d659d526291b013eee200201380930793531515abfc6e77b
 
 UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar"
 
+CVE_PRODUCT = "tcpdump:tcpdump"
+
 inherit autotools-brokensep pkgconfig ptest
 
 PACKAGECONFIG ?= "openssl"
diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb b/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb
index 93197dc3bc..3d61160bb0 100644
--- a/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb
+++ b/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa6
 
 SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \
            "
-SRC_URI[sha256sum] = "e513f0710c4ab45ec627e5df6f7b80d12e488146e1bd500c92247e20ca608903"
+SRC_URI[sha256sum] = "082967d6bf793499d3d655cea2149e07c0da97287f1877a6eab88d17cb703d0d"
 
 UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar"
 
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch
new file mode 100644
index 0000000000..d8f0ab270c
--- /dev/null
+++ b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-Fix-linker-error-for-TX_RING.patch
@@ -0,0 +1,71 @@
+From 36e038d9e4047ae42a148f671f18971cc6a68558 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Thu, 10 Apr 2025 18:30:52 +0900
+Subject: [PATCH] Fix linker error for TX_RING
+
+Found similar issue in gcc 15 build environment.
+- See more details at: http://errors.yoctoproject.org/Errors/Details/851800/
+```
+TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket':
+/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put'
+TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf':
+/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init'
+TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket':
+/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put'
+TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf':
+/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init'
+TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket':
+/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:328:(.text+0x1be): undefined reference to `txring_put'
+TOPDIR/tmp/work/core2-64-oe-linux/tcpreplay/4.5.1/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/15.0.1/ld: ./common/libcommon.a(sendpacket.o): in function `sendpacket_open_pf':
+/usr/src/debug/tcpreplay/4.5.1/src/common/sendpacket.c:1088:(.text+0x7ea): undefined reference to `txring_init'
+```
+- The result of "nm -u txring.o" shows no symbols exist.
+
+- The config.h has HAVE_TX_RING defined but txring.c is not aware of it.
+  txring.c and txring.h include config.h at the beginning.
+
+- This resulted in a successful build in my build environment.
+
+It may
+Fixes #731
+Fixes #904
+
+Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/924]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/common/txring.c | 3 +++
+ src/common/txring.h | 4 ++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/common/txring.c b/src/common/txring.c
+index d5768d75..f522893d 100644
+--- a/src/common/txring.c
++++ b/src/common/txring.c
+@@ -31,6 +31,9 @@
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#include "defines.h"
++#include "config.h"
++
+ #ifdef HAVE_TX_RING
+ 
+ #include "txring.h"
+diff --git a/src/common/txring.h b/src/common/txring.h
+index 309da84c..3f14cac0 100644
+--- a/src/common/txring.h
++++ b/src/common/txring.h
+@@ -33,11 +33,11 @@
+ 
+ #pragma once
+ 
+-#ifdef HAVE_TX_RING
+-
+ #include "defines.h"
+ #include "config.h"
+ 
++#ifdef HAVE_TX_RING
++
+ #if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
+ #include <net/ethernet.h> /* the L2 protocols */
+ #include <netpacket/packet.h>
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch
new file mode 100644
index 0000000000..906c30e147
--- /dev/null
+++ b/meta-networking/recipes-support/tcpreplay/tcpreplay/0002-fix-incompatible-type-assignment-in-txring.c.patch
@@ -0,0 +1,31 @@
+From 5615e8f7bbf83f03acacd6d6ba9ff8dc6fdc91df Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Thu, 10 Apr 2025 18:49:51 +0900
+Subject: [PATCH] fix incompatible type assignment in txring.c
+
+* There is an incompatible type assignment error in txring.c.
+  txring.c:200:12: error: incompatible types when assigning to type 'txring_t' {aka 'struct txring_s'} from type 'txring_t *' {aka 'struct txring_s *'}
+  200 |     *txp = (txring_t *)safe_malloc(sizeof(txring_t));
+      |            ^
+
+  txp is allocated as txring_t *, so I fixed it.
+
+Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/924]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/common/txring.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/txring.c b/src/common/txring.c
+index f522893d..b062dac2 100644
+--- a/src/common/txring.c
++++ b/src/common/txring.c
+@@ -197,7 +197,7 @@ txring_init(int fd, unsigned int mtu)
+     txring_t *txp;
+ 
+     /* allocate memory for structure and fill it with different stuff*/
+-    *txp = (txring_t *)safe_malloc(sizeof(txring_t));
++    txp = (txring_t *)safe_malloc(sizeof(txring_t));
+     txp->treq = (struct tpacket_req *)safe_malloc(sizeof(struct tpacket_req));
+ 
+     txring_mkreq(txp->treq, mtu);
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb
index f01bbb95a5..46e06a928e 100644
--- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb
+++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb
@@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8"
 
 SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
     file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \
+    file://0001-Fix-linker-error-for-TX_RING.patch \
+    file://0002-fix-incompatible-type-assignment-in-txring.c.patch \
 "
 
 SRC_URI[sha256sum] = "2de79bfd67ec92ca9ae2ffb50456dd1d53ff40f3fa71b422c65e8062013c9e85"
diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb b/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb
index 862cba91e9..b72c375400 100644
--- a/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb
+++ b/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb
@@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/tracerou
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \
 "
-SRC_URI[sha256sum] = "9c6c260d96eaab51e3ce461b0a84fe87123ebc6dd6c9a59fab803f95b35a859e"
+SRC_URI[sha256sum] = "9ccef9cdb9d7a98ff7fbf93f79ebd0e48881664b525c4b232a0fcec7dcb9db5e"
 
 EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}"
 LTOEXTRA += "-flto-partition=none"
diff --git a/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch b/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch
index e3d65db734..3255a3fad0 100644
--- a/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch
+++ b/meta-networking/recipes-support/udpcast/udpcast/0001-include-stddef.h-for-ptrdiff_t.patch
@@ -13,15 +13,17 @@ Signed-off-by: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@savoirfairelin
  1 file changed, 1 insertion(+)
 
 diff --git a/receivedata.c b/receivedata.c
-index 9a68f67..0aa797f 100644
+index a5ed7e8..b3b2640 100644
 --- a/receivedata.c
 +++ b/receivedata.c
-@@ -1,4 +1,5 @@
+@@ -1,6 +1,7 @@
+ #include "config.h"
+ 
  #include <assert.h>
 +#include <stddef.h>
  #include <sys/types.h>
  #include <unistd.h>
  #include <stdlib.h>
 -- 
-2.34.1
+2.43.0
 
diff --git a/meta-networking/recipes-support/udpcast/udpcast_20230924.bb b/meta-networking/recipes-support/udpcast/udpcast_20250223.bb
index f93f9850a8..b3861ce7c5 100644
--- a/meta-networking/recipes-support/udpcast/udpcast_20230924.bb
+++ b/meta-networking/recipes-support/udpcast/udpcast_20250223.bb
@@ -13,10 +13,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e3cf524a29c8476be354bb329d36ff80"
 SRC_URI = "http://www.udpcast.linux.lu/download/${BP}.tar.gz \
            file://0001-include-stddef.h-for-ptrdiff_t.patch \
            "
-SRC_URI[sha256sum] = "17b5cd8b1e54f7e2e53357ac02ee86e4198bf704096987a03a3b5c402a0ecea1"
+SRC_URI[sha256sum] = "cefd7554c877e1bc76987d2b96b23f7699a2e5340c254454f61b6e0dae370aa7"
 
 # Installation of rateGovernor.h fails without brokensep
 inherit autotools-brokensep manpages
 
+PACKAGECONFIG[manpages] = ""
+
 # pod2man required to build manpages
 DEPENDS += "perl-native"
diff --git a/meta-networking/recipes-support/unbound/unbound/0001-fix-build-with-gcc-15-Wbuiltin-declaration-mismatch-.patch b/meta-networking/recipes-support/unbound/unbound/0001-fix-build-with-gcc-15-Wbuiltin-declaration-mismatch-.patch
new file mode 100644
index 0000000000..70a41f7e37
--- /dev/null
+++ b/meta-networking/recipes-support/unbound/unbound/0001-fix-build-with-gcc-15-Wbuiltin-declaration-mismatch-.patch
@@ -0,0 +1,44 @@
+From 1c58ce07919c36e6a11eead67bd6d14cc22acaec Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 2 Apr 2025 15:25:42 +0900
+Subject: [PATCH] fix build with gcc-15 -Wbuiltin-declaration-mismatch error
+
+See more details: http://errors.yoctoproject.org/Errors/Details/850313
+../git/compat/malloc.c:9:7: warning: conflicting types for built-in function 'malloc'; expected 'void *(long unsigned int)' [-Wbuiltin-declaration-mismatch]
+    9 | void *malloc ();
+      |       ^~~~~~
+../git/compat/malloc.c:5:1: note: 'malloc' is declared in header '<stdlib.h>'
+    4 | #include "config.h"
+  +++ |+#include <stdlib.h>
+    5 | #undef malloc
+../git/compat/malloc.c: In function 'rpl_malloc_unbound':
+../git/compat/malloc.c:23:10: error: too many arguments to function 'malloc'; expected 0, have 1
+   23 |   return malloc (n);
+      |          ^~~~~~  ~
+../git/compat/malloc.c:9:7: note: declared here
+    9 | void *malloc ();
+      |       ^~~~~~
+
+* Seeing that there is '#undef malloc', it appears they don't want to
+  use the malloc from stdlib.h.
+  Therefore, we need to correctly define the parameters for malloc.
+
+Upstream-Status: Submitted [https://github.com/NLnetLabs/unbound/pull/1262]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ compat/malloc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compat/malloc.c b/compat/malloc.c
+index d8097b13e..af9dcf134 100644
+--- a/compat/malloc.c
++++ b/compat/malloc.c
+@@ -6,7 +6,7 @@
+ #include <sys/types.h>
+ 
+ #ifndef USE_WINSOCK
+-void *malloc ();
++void *malloc (size_t n);
+ #else
+ /* provide a prototype */
+ void *malloc (size_t n);
diff --git a/meta-networking/recipes-support/unbound/unbound_1.21.0.bb b/meta-networking/recipes-support/unbound/unbound_1.22.0.bb
index 8c042dc5f4..c35148b77e 100644
--- a/meta-networking/recipes-support/unbound/unbound_1.21.0.bb
+++ b/meta-networking/recipes-support/unbound/unbound_1.22.0.bb
@@ -11,18 +11,24 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06"
 
 SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master \
            file://run-ptest \
+           file://0001-fix-build-with-gcc-15-Wbuiltin-declaration-mismatch-.patch \
            "
-SRCREV = "79e4c578518886a32475cfbb0de383ff3a905033"
+
+# 17 commits after 1.22.0 tag:
+# https://github.com/NLnetLabs/unbound/compare/release-1.22.0...7985d17b57d25be262de56c29a43ae4b61c1b896
+# to include fix for occasional build failure:
+# https://github.com/NLnetLabs/unbound/commit/46cfbf313d812a6e50614a691e162b171dc91d7b
+PV .= "+git"
+SRCREV = "7985d17b57d25be262de56c29a43ae4b61c1b896"
 
 inherit autotools pkgconfig systemd update-rc.d ptest
 
 DEPENDS = "openssl libtool-native bison-native expat"
 RDEPENDS:${PN} = "bash openssl-bin daemonize"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF = "--with-libexpat=${STAGING_EXECPREFIXDIR} \
-                --with-ssl=${STAGING_EXECPREFIXDIR} \
+                --disable-rpath --with-ssl=${STAGING_EXECPREFIXDIR} \
                 --enable-largefile"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
diff --git a/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb b/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb
index c3de38a6f8..4857c0af4f 100644
--- a/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb
+++ b/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb
@@ -22,7 +22,6 @@ EXTRA_OEMAKE = "\
     CC='${CC}' CFLAGS='${CFLAGS} -pthread -I${STAGING_INCDIR}/libnl3' \
 "
 
-S = "${WORKDIR}/git"
 
 # wavemon does not support using out-of-tree builds
 inherit autotools-brokensep pkgconfig
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.12.bb
index b80710683c..dc987e08ac 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.12.bb
@@ -2,22 +2,22 @@ DESCRIPTION = "wireshark - a popular network protocol analyzer"
 HOMEPAGE = "http://www.wireshark.org"
 SECTION = "net"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce"
 
 DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares speexdsp"
 
 DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native "
 
-SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \
+SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz \
            file://0001-wireshark-src-improve-reproducibility.patch \
            file://0002-flex-Remove-line-directives.patch \
            file://0004-lemon-Remove-line-directives.patch \
            file://0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch \
            "
 
-UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
+UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src/all-versions"
 
-SRC_URI[sha256sum] = "2c5de08e19081bd666a2ce3f052c023274d06acaabc5d667a3c3051a9c618f86"
+SRC_URI[sha256sum] = "6ed51da5f6638aba609be8d1d64a7a85312749a49261146c391fea391a3e5f06"
 
 PE = "1"
 
@@ -42,13 +42,13 @@ PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF"
 PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc"
 PACKAGECONFIG[libssh] = "-DENABLE_LIBSSH=ON,-DENABLE_LIBSSH=OFF, libssh2"
 PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4"
-PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd"
+PACKAGECONFIG[zstd] = "-DENABLE_ZSTD=ON,-DENABLE_ZSTD=OFF, zstd"
 PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2"
 
 # these next two options require addional layers
-PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg"
+PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON -DUSE_qt6=OFF, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg"
 
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
+inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
 
 EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \
                   -DBUILD_mmdbresolve=OFF \
diff --git a/meta-networking/recipes-support/wpan-tools/wpan-tools_0.9.bb b/meta-networking/recipes-support/wpan-tools/wpan-tools_0.10.bb
index 6b83cbd522..2f5ebe53ae 100644
--- a/meta-networking/recipes-support/wpan-tools/wpan-tools_0.9.bb
+++ b/meta-networking/recipes-support/wpan-tools/wpan-tools_0.10.bb
@@ -4,13 +4,12 @@ DESCRIPTION = "This is a set of utils to manage the Linux WPAN stack via \
 netlink interface. This requires recent kernel with nl802154 interface."
 
 LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4cfd939b1d7e6aba9fcefb7f6e2fd45d"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f008711099e40902ad091ed6396f33ea"
 
 DEPENDS = "libnl"
 
 SRC_URI = "git://github.com/linux-wpan/wpan-tools;branch=master;protocol=https"
-SRCREV = "a316ca2caa746d60817400e5bf646c2820f09273"
+SRCREV = "91b0f038aef2f62cb6a222d190b887fdfd6bc164"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig