1679 files changed, 49532 insertions, 20631 deletions

diff --git a/meta-oe/README.md b/meta-oe/README.md
index 676a2c8925..c7c14a4507 100644
--- a/meta-oe/README.md
+++ b/meta-oe/README.md
@@ -24,6 +24,11 @@ When sending single patches, please use something like:
 You are encouraged to fork the mirror on GitHub https://github.com/openembedded/meta-openembedded
 to share your patches, this is preferred for patch sets consisting of more than one patch.
 
+Note, it is discouraged to send patches via GitHub pull request system. Such
+patches get less attention from developers and can be mishandled or not
+reviewed properly. Please use emails instead. For exemple, you can use
+'git request-pull' to generate an email referencing your git repository.
+
 Other services like GitLab, repo.or.cz or self-hosted setups are of course accepted as well,
 'git fetch <remote>' works the same on all of them. We recommend GitHub because it is free, easy
 to use, has been proven to be reliable and has a really good web GUI.
diff --git a/meta-oe/SECURITY.md b/meta-oe/SECURITY.md
new file mode 100644
index 0000000000..1530103230
--- /dev/null
+++ b/meta-oe/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-oe/classes/capnproto.bbclass b/meta-oe/classes/capnproto.bbclass
new file mode 100644
index 0000000000..a698f41c95
--- /dev/null
+++ b/meta-oe/classes/capnproto.bbclass
@@ -0,0 +1,8 @@
+# Inherit this class in your recipe to compile against 
+# Cap'N Proto (capnproto) with CMake
+
+DEPENDS:append = " capnproto-native "
+DEPENDS:append:class-target = " capnproto "
+
+EXTRA_OECMAKE:append:class-target = " -DCAPNP_EXECUTABLE=${RECIPE_SYSROOT_NATIVE}${bindir}/capnp \
+                                      -DCAPNPC_CXX_EXECUTABLE=${RECIPE_SYSROOT_NATIVE}${bindir}/capnpc-c++ "
diff --git a/meta-oe/classes/check-version-mismatch.bbclass b/meta-oe/classes/check-version-mismatch.bbclass
new file mode 100644
index 0000000000..f735280d7a
--- /dev/null
+++ b/meta-oe/classes/check-version-mismatch.bbclass
@@ -0,0 +1,471 @@
+QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS:tune-%s" % d.getVar('TUNE_PKGARCH')) or ""}"
+QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS:tune-${TUNE_PKGARCH}"
+
+ENABLE_VERSION_MISMATCH_CHECK ?= "${@'1' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else '0'}"
+DEBUG_VERSION_MISMATCH_CHECK ?= "1"
+CHECK_VERSION_PV ?= ""
+
+DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.to_boolean(d.getVar('ENABLE_VERSION_MISMATCH_CHECK')) else ''}"
+
+QEMU_EXEC ?= "${@oe.qemu.qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}${libdir}','${STAGING_DIR_HOST}${base_libdir}', '${PKGD}${libdir}', '${PKGD}${base_libdir}'])}"
+
+python do_package_check_version_mismatch() {
+    import re
+    import subprocess
+    import shutil
+    import signal
+    import glob
+
+    classes_skip = ["nopackage", "image", "native", "cross", "crosssdk", "cross-canadian"]
+    for cs in classes_skip:
+        if bb.data.inherits_class(cs, d):
+            bb.note(f"Skip do_package_check_version_mismatch as {cs} is inherited.")
+            return
+
+    if not bb.utils.to_boolean(d.getVar('ENABLE_VERSION_MISMATCH_CHECK')):
+        bb.note("Skip do_package_check_version_mismatch as ENABLE_VERSION_MISMATCH_CHECK is disabled.")
+        return
+
+    __regexp_version_broad_match__ = re.compile(r"(?:\s|^|-|_|/|=| go|\()" +
+                                                r"(?P<version>v?[0-9][0-9.][0-9+.\-_~\(\)]*?|UNKNOWN)" +
+                                                r"(?:[+\-]release.*|[+\-]stable.*|)" +
+                                                r"(?P<extra>[+\-]unknown|[+\-]dirty|[+\-]rc?\d{1,3}|\+cargo-[0-9.]+|" +
+                                                r"[a-z]|-?[pP][0-9]{1,3}|-?beta[^\s]*|-?alpha[^\s]*|)" +
+                                                r"(?P<extra2>[+\-]dev|[+\-]devel|)" +
+                                                r"(?:,|:|\.|\)|-[0-9a-g]{6,42}|)" +
+                                                r"(?=\s|$)"
+                                                )
+    __regexp_exclude_year__ = re.compile(r"^(19|20)[0-9]{2}$")
+    __regexp_single_number_ending_with_dot__ = re.compile(r"^\d\.$")
+
+    def is_shared_library(filepath):
+        return re.match(r'.*\.so(\.\d+)*$', filepath) is not None
+
+    def get_possible_versions(output_contents, full_cmd=None, max_lines=None):
+        #
+        # Algorithm:
+        #   1. Check version line by line.
+        #   2. Skip some lines which we know that do not contain version information, e.g., License, Copyright.
+        #   3. Do broad match, finding all possible versions.
+        #   4. If there's a version found by any match, do exclude match (e.g., exclude years)
+        #   5. If there's a valid version, do stripping and converting and then add to possible_versions.
+        #   6. Return possible_versions
+        #
+        possible_versions = []
+        content_lines = output_contents.split("\n")
+        if max_lines:
+            content_lines = content_lines[0:max_lines]
+        if full_cmd:
+            base_cmd = os.path.basename(full_cmd)
+        __regex_help_format__ = re.compile(r"-[^\s].*")
+        for line in content_lines:
+            line = line.strip()
+            # skip help lines
+            if __regex_help_format__.match(line):
+                continue
+            # avoid command itself affecting output
+            if full_cmd:
+                if line.startswith(base_cmd):
+                    line = line[len(base_cmd):]
+                elif line.startswith(full_cmd):
+                    line = line[len(full_cmd):]
+            # skip specific lines
+            skip_keywords_start = ["copyright", "license", "compiled", "build", "built"]
+            skip_line = False
+            for sks in skip_keywords_start:
+                if line.lower().startswith(sks):
+                    skip_line = True
+                    break
+            if skip_line:
+                continue
+
+            # try broad match
+            for match in __regexp_version_broad_match__.finditer(line):
+                version = match.group("version")
+                #print(f"version = {version}")
+                # do exclude match
+                exclude_match = __regexp_exclude_year__.match(version)
+                if exclude_match:
+                    continue
+                exclude_match = __regexp_single_number_ending_with_dot__.match(version)
+                if exclude_match:
+                    continue
+                # do some stripping and converting
+                if version.startswith("("):
+                    version = version[1:-1]
+                if version.startswith("v"):
+                    version = version[1:]
+                if version.endswith(")") and "(" not in version:
+                    version = version[:-1]
+                if not version.endswith(")") and "(" in version:
+                    version = version.split('(')[0]
+                # handle extra version info
+                version = version + match.group("extra") + match.group("extra2")
+                possible_versions.append(version)
+        return possible_versions
+
+    def is_version_mismatch(rvs, pv):
+        got_match = False
+        if pv.startswith("git"):
+            return False
+        if "-pre" in pv:
+            pv = pv.split("-pre")[0]
+        if pv.startswith("v"):
+            pv = pv[1:]
+        for rv in rvs:
+            if rv == pv:
+                got_match = True
+                break
+            pv = pv.split("+git")[0]
+            # handle % character in pv which means matching any chars
+            if '%' in pv:
+                escaped_pv = re.escape(pv)
+                regex_pattern = escaped_pv.replace('%', '.*')
+                regex_pattern = f'^{regex_pattern}$'
+                if re.fullmatch(regex_pattern, rv):
+                    got_match = True
+                    break
+                else:
+                    continue
+            # handle cases such as 2.36.0-r0 v.s. 2.36.0
+            if "-r" in rv:
+                rv = rv.split("-r")[0]
+            chars_to_replace = ["-", "+", "_", "~"]
+            # convert to use "." as the version seperator
+            for cr in chars_to_replace:
+                rv = rv.replace(cr, ".")
+                pv = pv.replace(cr, ".")
+            if rv == pv:
+                got_match = True
+                break
+            # handle case such as 5.2.37(1) v.s. 5.2.37
+            if "(" in rv:
+                rv = rv.split("(")[0]
+                if rv == pv:
+                    got_match = True
+                    break
+            # handle case such as 4.4.3p1
+            if "p" in pv and "p" in rv.lower():
+                pv = pv.lower().replace(".p", "p")
+                rv = rv.lower().replace(".p", "p")
+                if pv == rv:
+                    got_match = True
+                    break
+            # handle cases such as 6.00 v.s. 6.0
+            if rv.startswith(pv):
+                if rv == pv + "0" or rv == pv + ".0":
+                    got_match = True
+                    break
+            elif pv.startswith(rv):
+                if pv == rv + "0" or pv == rv + ".0":
+                    got_match = True
+                    break
+            # handle cases such as 21306 v.s. 2.13.6
+            if "." in pv and not "." in rv:
+                pv_components = pv.split(".")
+                if rv.startswith(pv_components[0]):
+                    pv_num = 0
+                    for i in range(0, len(pv_components)):
+                        pv_num = pv_num * 100 + int(pv_components[i])
+                    if pv_num == int(rv):
+                        got_match = True
+                        break
+        if got_match:
+            return False
+        else:
+            return True
+
+    def is_elf_binary(fexec):
+        fexec_real = os.path.realpath(fexec)
+        elf = oe.qa.ELFFile(fexec_real)
+        try:
+            elf.open()
+            elf.close()
+            return True
+        except:
+            return False
+
+    def get_shebang(fexec):
+        try:
+            with open(fexec, 'r') as f:
+                first_line = f.readline().strip()
+                if first_line.startswith("#!"):
+                    return first_line
+                else:
+                    return None
+        except Exception as e:
+            return None
+
+    def get_interpreter_from_shebang(shebang):
+        if not shebang:
+            return None
+        hosttools_path = d.getVar("TMPDIR") + "/hosttools"
+        if "/sh" in shebang:
+            return hosttools_path + "/sh"
+        elif "/bash" in shebang:
+            return hosttools_path + "/bash"
+        elif "python" in shebang:
+            return hosttools_path + "/python3"
+        elif "perl" in shebang:
+            return hosttools_path + "/perl"
+        else:
+            return None
+
+    # helper function to get PKGV, useful for recipes such as perf
+    def get_pkgv(pn):
+        pkgdestwork = d.getVar("PKGDESTWORK")
+        recipe_data_fn = pkgdestwork + "/" + pn
+        pn_data = oe.packagedata.read_pkgdatafile(recipe_data_fn)
+        if not "PACKAGES" in pn_data:
+            return d.getVar("PV")
+        packages = pn_data["PACKAGES"].split()
+        for pkg in packages:
+            pkg_fn = pkgdestwork + "/runtime/" + pkg
+            pkg_data = oe.packagedata.read_pkgdatafile(pkg_fn)
+            if "PKGV" in pkg_data:
+                return pkg_data["PKGV"]
+
+    #
+    # traverse PKGD, find executables and run them to get runtime version information and compare it with recipe version information
+    #
+    enable_debug = bb.utils.to_boolean(d.getVar("DEBUG_VERSION_MISMATCH_CHECK"))
+    pkgd = d.getVar("PKGD")
+    pn = d.getVar("PN")
+    pv = d.getVar("CHECK_VERSION_PV")
+    if not pv:
+        pv = get_pkgv(pn)
+    qemu_exec = d.getVar("QEMU_EXEC").strip()
+    executables = []
+    possible_versions_all = []
+    data_lines = []
+
+    if enable_debug:
+        debug_directory = d.getVar("TMPDIR") + "/check-version-mismatch"
+        debug_data_file = debug_directory + "/" + pn
+        os.makedirs(debug_directory, exist_ok=True)
+        data_lines.append("pv: %s\n" % pv)
+
+    # handle a special case: a pure % means matching all, no point in further checking
+    if pv == "%":
+        if enable_debug:
+            data_lines.append("FINAL RESULT: MATCH (%s matches all, skipped)\n\n" % pv)
+            with open(debug_data_file, "w") as f:
+                f.writelines(data_lines)
+        return
+
+    got_quick_match_result = False
+    # handle python3-xxx recipes quickly
+    __regex_python_module_version__ = re.compile(r"(?:^|.*:)Version: (?P<version>.*)$")
+    if "python3-" in pn:
+        version_check_cmd = "find %s -name 'METADATA' | xargs grep '^Version: '" % pkgd
+        try:
+            output = subprocess.check_output(version_check_cmd, shell=True).decode("utf-8")
+            data_lines.append("version_check_cmd: %s\n" % version_check_cmd)
+            data_lines.append("output:\n'''\n%s'''\n" % output)
+            possible_versions = []
+            for line in output.split("\n"):
+                match = __regex_python_module_version__.match(line)
+                if match:
+                    possible_versions.append(match.group("version"))
+            possible_versions = sorted(set(possible_versions))
+            data_lines.append("possible versions: %s\n" % possible_versions)
+            if is_version_mismatch(possible_versions, pv):
+                data_lines.append("FINAL RESULT: MISMATCH (%s v.s. %s)\n\n" % (possible_versions, pv))
+                bb.warn("Possible runtime versions %s do not match recipe version %s" % (possible_versions, pv))
+            else:
+                data_lines.append("FINAL RESULT: MATCH (%s v.s. %s)\n\n" % (possible_versions, pv))
+            got_quick_match_result = True
+        except:
+            data_lines.append("version_check_cmd: %s\n" % version_check_cmd)
+            data_lines.append("result: RUN_FAILED\n\n")
+    if got_quick_match_result:
+        if enable_debug:
+            with open(debug_data_file, "w") as f:
+                f.writelines(data_lines)
+        return
+
+    # handle .pc files
+    version_check_cmd = "find %s -name '*.pc' | xargs grep -i version" % pkgd
+    try:
+        output = subprocess.check_output(version_check_cmd, shell=True).decode("utf-8")
+        data_lines.append("version_check_cmd: %s\n" % version_check_cmd)
+        data_lines.append("output:\n'''\n%s'''\n" % output)
+        possible_versions = get_possible_versions(output)
+        possible_versions = sorted(set(possible_versions))
+        data_lines.append("possible versions: %s\n" % possible_versions)
+        if is_version_mismatch(possible_versions, pv):
+            if pn.startswith("lib"):
+                data_lines.append("FINAL RESULT: MISMATCH (%s v.s. %s)\n\n" % (possible_versions, pv))
+                bb.warn("Possible runtime versions %s do not match recipe version %s" % (possible_versions, pv))
+                got_quick_match_result = True
+            else:
+                data_lines.append("result: MISMATCH (%s v.s. %s)\n\n" % (possible_versions, pv))
+        else:
+            data_lines.append("FINAL RESULT: MATCH (%s v.s. %s)\n\n" % (possible_versions, pv))
+            got_quick_match_result = True
+    except:
+        data_lines.append("version_check_cmd: %s\n" % version_check_cmd)
+        data_lines.append("result: RUN_FAILED\n\n")
+    if got_quick_match_result:
+        if enable_debug:
+            with open(debug_data_file, "w") as f:
+                f.writelines(data_lines)
+        return
+
+    skipped_directories = [".debug", "ptest", "installed-tests", "tests", "test", "__pycache__", "testcases"]
+    # avoid checking configuration files, they don't give useful version information and some init scripts
+    # will kill all processes
+    skipped_directories.append("etc")
+    skipped_directories.append("go/src")
+    pkgd_libdir = pkgd + d.getVar("libdir")
+    pkgd_base_libdir = pkgd + d.getVar("base_libdir")
+    extra_exec_libdirs = []
+    for root, dirs, files in os.walk(pkgd):
+        for dname in dirs:
+            fdir = os.path.join(root, dname)
+            if os.path.isdir(fdir) and fdir != pkgd_libdir and fdir != pkgd_base_libdir:
+                if fdir.startswith(pkgd_libdir) or fdir.startswith(pkgd_base_libdir):
+                    for sd in skipped_directories:
+                        if fdir.endswith("/" + sd) or ("/" + sd + "/") in fdir:
+                            break
+                    else:
+                        extra_exec_libdirs.append(fdir)
+        for fname in files:
+            fpath = os.path.join(root, fname)
+            if os.path.isfile(fpath) and os.access(fpath, os.X_OK):
+                for sd in skipped_directories:
+                    if ("/" + sd + "/") in fpath:
+                        break
+                else:
+                    if is_shared_library(fpath):
+                        # we don't check shared libraries
+                        continue
+                    else:
+                        executables.append(fpath)
+    if enable_debug:
+        data_lines.append("executables: %s\n" % executables)
+
+    found_match = False
+    some_cmd_succeed = False
+    if not executables:
+        bb.debug(1, "No executable found for %s" % pn)
+        data_lines.append("FINAL RESULT: NO_EXECUTABLE_FOUND\n\n")
+    else:
+        # first we extend qemu_exec to include library path if needed
+        if extra_exec_libdirs:
+            qemu_exec += ":" + ":".join(extra_exec_libdirs)
+        orig_qemu_exec = qemu_exec
+        for fexec in executables:
+            qemu_exec = orig_qemu_exec
+            for version_option in ["--version", "-V", "-v", "--help"]:
+                if not is_elf_binary(fexec):
+                    shebang = get_shebang(fexec)
+                    interpreter = get_interpreter_from_shebang(shebang)
+                    if not interpreter:
+                        bb.debug(1, "file %s is not supported to run" % fexec)
+                    elif interpreter.endswith("perl"):
+                        perl5lib_extra = pkgd + d.getVar("libdir") + "/perl5/site_perl"
+                        for p in glob.glob("%s/usr/share/*" % pkgd):
+                            perl5lib_extra += ":%s" % p
+                        qemu_exec += " -E PERL5LIB=%s:$PERL5LIB %s" % (perl5lib_extra, interpreter)
+                    elif interpreter.endswith("python3"):
+                        pythonpath_extra = glob.glob("%s%s/python3*/site-packages" % (pkgd, d.getVar("libdir")))
+                        if pythonpath_extra:
+                            qemu_exec += " -E PYTHONPATH=%s:$PYTHONPATH %s" % (pythonpath_extra[0], interpreter)
+                    else:
+                        qemu_exec += " %s" % interpreter
+                    # remove the '-E LD_LIBRARY_PATH=xxx'
+                    qemu_exec = re.sub(r"-E\s+LD_LIBRARY_PATH=\S+", "", qemu_exec)
+                version_check_cmd_full = "%s %s %s" % (qemu_exec, fexec, version_option)
+                version_check_cmd = version_check_cmd_full
+                #version_check_cmd = "%s %s" % (os.path.relpath(fexec, pkgd), version_option)
+                
+                try:
+                    cwd_temp = d.getVar("TMPDIR") + "/check-version-mismatch/cwd-temp/" + pn
+                    os.makedirs(cwd_temp, exist_ok=True)
+                    # avoid pseudo to manage any file we create
+                    sp_env = os.environ.copy()
+                    sp_env["PSEUDO_UNLOAD"] = "1"
+                    output = subprocess.check_output(version_check_cmd_full,
+                                                     shell=True,
+                                                     stderr=subprocess.STDOUT,
+                                                     cwd=cwd_temp,
+                                                     timeout=10,
+                                                     env=sp_env).decode("utf-8")
+                    some_cmd_succeed = True
+                    data_lines.append("version_check_cmd: %s\n" % version_check_cmd)
+                    data_lines.append("output:\n'''\n%s'''\n" % output)
+                    if version_option == "--help":
+                        max_lines = 5
+                    else:
+                        max_lines = None
+                    possible_versions = get_possible_versions(output, full_cmd=fexec, max_lines=max_lines)
+                    if "." in pv:
+                        possible_versions = [item for item in possible_versions if "." in item or item == "UNKNOWN"]
+                    data_lines.append("possible versions: %s\n" % possible_versions)
+                    if not possible_versions:
+                        data_lines.append("result: NO_RUNTIME_VERSION_FOUND\n\n")
+                        continue
+                    possible_versions_all.extend(possible_versions)
+                    possible_versions_all = sorted(set(possible_versions_all))
+                    if is_version_mismatch(possible_versions, pv):
+                        data_lines.append("result: MISMATCH (%s v.s. %s)\n\n" % (possible_versions, pv))
+                    else:
+                        found_match = True
+                        data_lines.append("result: MATCH (%s v.s. %s)\n\n" % (possible_versions, pv))
+                        break
+                except:
+                    data_lines.append("version_check_cmd: %s\n" % version_check_cmd)
+                    data_lines.append("result: RUN_FAILED\n\n")
+                finally:
+                    shutil.rmtree(cwd_temp)
+            if found_match:
+                break
+    if executables:
+        if found_match:
+            data_lines.append("FINAL RESULT: MATCH (%s v.s. %s)\n" % (possible_versions_all, pv))
+        elif len(possible_versions_all) == 0:
+            if some_cmd_succeed:
+                bb.debug(1, "No valid runtime version found")
+                data_lines.append("FINAL RESULT: NO_VALID_RUNTIME_VERSION_FOUND\n")
+            else:
+                bb.debug(1, "All version check command failed")
+                data_lines.append("FINAL RESULT: RUN_FAILED\n")
+        else:
+            bb.warn("Possible runtime versions %s do not match recipe version %s" % (possible_versions_all, pv))
+            data_lines.append("FINAL RESULT: MISMATCH (%s v.s. %s)\n" % (possible_versions_all, pv))
+
+    if enable_debug:
+        with open(debug_data_file, "w") as f:
+            f.writelines(data_lines)
+
+    # clean up stale processes
+    process_name_common_prefix = "%s %s" % (' '.join(qemu_exec.split()[1:]), pkgd)
+    find_stale_process_cmd = "ps -e -o pid,args | grep -v grep | grep -F '%s'" % process_name_common_prefix
+    try:
+        stale_process_output = subprocess.check_output(find_stale_process_cmd, shell=True).decode("utf-8")
+        stale_process_pids = []
+        for line in stale_process_output.split("\n"):
+            line = line.strip()
+            if not line:
+                continue
+            pid = line.split()[0]
+            stale_process_pids.append(pid)
+        for pid in stale_process_pids:
+            os.kill(int(pid), signal.SIGKILL)
+    except Exception as e:
+        bb.debug(1, "No stale process")
+}
+
+addtask do_package_check_version_mismatch after do_prepare_recipe_sysroot do_package before do_build
+
+do_build[rdeptask] += "do_package_check_version_mismatch"
+do_rootfs[recrdeptask] += "do_package_check_version_mismatch"
+
+SSTATETASKS += "do_package_check_version_mismatch"
+do_package_check_version_mismatch[sstate-inputdirs] = ""
+do_package_check_version_mismatch[sstate-outputdirs] = ""
+python do_package_check_version_mismatch_setscene () {
+    sstate_setscene(d)
+}
+addtask do_package_check_version_mismatch_setscene
diff --git a/meta-oe/classes/discoverable-disk-image.bbclass b/meta-oe/classes/discoverable-disk-image.bbclass
new file mode 100644
index 0000000000..1f3a7b08e1
--- /dev/null
+++ b/meta-oe/classes/discoverable-disk-image.bbclass
@@ -0,0 +1,137 @@
+##
+# Copyright OpenEmbedded Contributors
+#
+# SPDX-License-Identifier: MIT
+#
+#
+# Discoverable Disk Image (DDI)
+#
+# "DDIs (Discoverable Disk Images) are self-describing file system
+# images that follow the DPS ( Discoverable Partitions Specification),
+# wrapped in a GPT partition table, that may contain root (or /usr/)
+# filesystems for bootable OS images, system extensions, configuration
+# extensions, portable services, containers and more, and shall be
+# protected by signed dm-verity all combined into one. They are
+# designed to be composable and stackable, and provide security by
+# default."
+# https://uapi-group.org/specifications/specs/discoverable_disk_image/
+# https://uapi-group.org/specifications/specs/discoverable_partitions_specification/
+# https://www.freedesktop.org/software/systemd/man/latest/systemd.image-policy.html
+
+# To be able to use discoverable-disk-images with a
+# root-verity-sig or usr-verity-sig configuration:
+# - systemd needs to include the PACKAGECONFIG 'cryptsetup', and
+# - the kernel needs the following features enabled:
+#   CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+#   CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING=y
+#   CONFIG_EROFS_FS=y
+#   CONFIG_EROFS_FS_XATTR=y
+#   CONFIG_EROFS_FS_ZIP=y
+#   CONFIG_EROFS_FS_ZIP_LZMA=y
+#   CONFIG_INTEGRITY_SIGNATURE=y
+#   CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+#   CONFIG_INTEGRITY_PLATFORM_KEYRING=y
+#   CONFIG_SYSTEM_BLACKLIST_KEYRING=y
+#   CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
+#   CONFIG_SIGNATURE=y
+
+# To sign DDIs, a key and certificate need to be provided by setting
+# the variables:
+#   REPART_PRIVATE_KEY
+#     private key so sign the verity-hash
+#   REPART_PRIVATE_KEY_SOURCE
+#     optional, can be "engine:pkcs11" when using a (soft)hsm
+#   REPART_CERTIFICATE
+#     corresponding public certificate, in .pem format
+#
+
+# For signature verification, systemd-sysext expects the matching
+# certificate to reside in /etc/verity.d as PEM formated .crt file.
+#
+# To enforce loading of only signed extension images, an appropriate
+# image policy has to be passed to systemd-sysext, e.g.:
+# systemd-sysext --image-policy='root=signed+absent:usr=signed+absent:=unused+absent' merge
+
+# 'systemd-dissect' can be used to inspect, manually mount, ... a DDI.
+
+inherit image
+
+IMAGE_FSTYPES = "ddi"
+
+DEPENDS += " \
+    systemd-repart-native \
+    erofs-utils-native \
+    openssl-native \
+"
+
+# systemd-repart --make-ddi takes one of "sysext", "confext" or "portable",
+# which it then takes and looks up definitions in the host os; which we need
+# to divert to the sysroot-native by setting '--definitions=' instead.
+# The chosen DDI_TYPE influences which parts of the rootfs are copied into
+# the ddi by systemd-repart:
+#   sysext: /usr (and if it exists: /opt)
+#   confext: /etc
+#   portable: /
+# For details see systemd/repart/definitions/${REPART_DDI_TYPE}.repart.d/*
+REPART_DDI_TYPE ?= "sysext"
+
+REPART_DDI_EXTENSION ?= "ddi"
+
+# systemd-repart creates temporary directoryies under /var/tmp/.#repartXXXXXXX/,
+# to estimate partition size etc. Since files are copied there from the image/rootfs
+# folder - which are owned by pseudo-root - this temporary location has to be
+# added to the directories handled by pseudo; otherwise calls to e.g.
+# fchown(0,0) inside systemd git/src/shared/copy.c end up failing.
+PSEUDO_INCLUDE_PATHS .= ",/var/tmp/"
+
+oe_image_systemd_repart_make_ddi() {
+
+    local additional_args=""
+
+    if [ -n "${REPART_PRIVATE_KEY}" ]
+    then
+        if [ -n "${REPART_PRIVATE_KEY_SOURCE}" ]
+        then
+            additional_args="$additional_args --private-key-source=${REPART_PRIVATE_KEY_SOURCE}"
+        fi
+        additional_args="$additional_args --private-key=${REPART_PRIVATE_KEY}"
+    fi
+
+    if [ -n "${REPART_CERTIFICATE}" ]
+    then
+        additional_args="$additional_args --certificate=${REPART_CERTIFICATE}"
+    fi
+
+    # map architectures to systemd's expected values
+    local systemd_arch="${TARGET_ARCH}"
+    case "${systemd_arch}" in
+        aarch64)
+        systemd_arch=arm64
+        ;;
+        x86_64)
+        systemd_arch=x86-64
+        ;;
+    esac
+
+    # prepare system-repart configuration
+    mkdir -p ${B}/definitions.repart.d
+    cp ${STAGING_LIBDIR_NATIVE}/systemd/repart/definitions/${REPART_DDI_TYPE}.repart.d/* ${B}/definitions.repart.d/
+    # enable erofs compression
+    sed -i "/^Compression/d" ${B}/definitions.repart.d/10-root.conf
+    echo "Compression=lzma\nCompressionLevel=3" >> ${B}/definitions.repart.d/10-root.conf
+    # disable verity signature partition creation, if no key is provided
+    if [ -z "${REPART_PRIVATE_KEY}" ]; then
+        rm ${B}/definitions.repart.d/30-root-verity-sig.conf
+    fi
+
+    systemd-repart \
+        --definitions="${B}/definitions.repart.d/" \
+        --copy-source="${IMAGE_ROOTFS}" \
+        --empty=create --size=auto --dry-run=no --offline=yes \
+        --architecture="${systemd_arch}" \
+        --json=pretty --no-pager $additional_args \
+        "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${REPART_DDI_EXTENSION}"
+}
+
+IMAGE_CMD:ddi = "oe_image_systemd_repart_make_ddi"
+do_image_ddi[deptask] += "do_unpack"
diff --git a/meta-oe/classes/fitimage.bbclass b/meta-oe/classes/fitimage.bbclass
new file mode 100644
index 0000000000..03fa2fcd57
--- /dev/null
+++ b/meta-oe/classes/fitimage.bbclass
@@ -0,0 +1,540 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright PHYTEC Messtechnik GmbH
+# Copyright (C) 2024 Pengutronix, <yocto@pengutronix.de>
+#
+# Class for creating (signed) FIT images
+# Description:
+#
+# You have to define the 'images' to put in the FIT image in your recipe file
+# following this example:
+#
+#    FITIMAGE_IMAGES ?= "kernel fdt fdto setup ramdisk bootscript"
+#
+#    FITIMAGE_IMAGE_kernel ?= "virtual/kernel"
+#    FITIMAGE_IMAGE_kernel[type] ?= "kernel"
+#
+#    FITIMAGE_IMAGE_fdt ?= "virtual/dtb" # or "virtual/kernel"
+#    FITIMAGE_IMAGE_fdt[type] ?= "fdt"
+#    #FITIMAGE_IMAGE_fdt[file] ?= "hw-name.dtb"
+#
+#    FITIMAGE_IMAGE_fdto ?= "virtual/kernel"
+#    FITIMAGE_IMAGE_fdto[type] ?= "fdto"
+#    FITIMAGE_IMAGE_fdto[file] ?= <list of all dtbo files from KERNEL_DEVICETREE>
+#
+#    Add a devicetree created on-thy-fly of a base dtb and serveral dtbo's
+#    FITIMAGE_IMAGE_fdtapply ?= "virtual/kernel"
+#    FITIMAGE_IMAGE_fdtapply[type] ?= "fdtapply"
+#    FITIMAGE_IMAGE_fdtapply[file] ?= "base.dtb overlay-1.dtbo overlay-2.dtbo"
+#    FITIMAGE_IMAGE_fdtapply[name] ?= "<name for new generated fdt>"
+#
+#    FITIMAGE_IMAGE_ramdisk ?= "core-image-minimal"
+#    FITIMAGE_IMAGE_ramdisk[type] ?= "ramdisk"
+#    FITIMAGE_IMAGE_ramdisk[fstype] ?= "cpio.gz"
+#
+#    FITIMAGE_IMAGE_bootscript ?= "bootscript"
+#    FITIMAGE_IMAGE_bootscript[type] ?= "bootscript"
+#    FITIMAGE_IMAGE_bootscript[file] ?= "boot.scr"
+#
+# Valid options for the [type] varflag are: "kernel", "fdt", "fdto", "fdtapply", "ramdisk", "bootscript".
+#
+# To enable signing, set
+#
+#    FITIMAGE_SIGN = "1"
+#
+# and configure FITIMAGE_SIGN_KEYDIR (and FITIMAGE_SIGN_KEYNAME) according to
+# your needs.
+#
+# For signing via PKCS#11 URIs provided by the meta-oe signing.bbclass, add:
+#
+#    inherit signing
+#
+#    FITIMAGE_SIGNING_KEY_ROLE = "fit"
+#
+#    do_fitimage:prepend() {
+#        signing_prepare
+#        signing_use_role "${FITIMAGE_SIGNING_KEY_ROLE}"
+#    }
+#
+#    FITIMAGE_SIGN = "1"
+#    FITIMAGE_MKIMAGE_EXTRA_ARGS = "--engine pkcs11"
+#    FITIMAGE_SIGN_KEYDIR = "${PKCS11_URI}"
+
+
+LICENSE ?= "MIT"
+
+inherit deploy kernel-artifact-names image-artifact-names kernel-arch nopackages
+
+do_patch[noexec] = "1"
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+deltask do_populate_sysroot
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+DEPENDS = "u-boot-mkimage-native dtc-native"
+
+FITIMAGE_SIGN ?= "0"
+FITIMAGE_SIGN[doc] = "Enable FIT image signing"
+FITIMAGE_SIGN_KEYDIR ?= ""
+FITIMAGE_SIGN_KEYDIR[doc] = "Key directory or pkcs#11 URI to use for signing configuration"
+FITIMAGE_MKIMAGE_EXTRA_ARGS[doc] = "Extra arguemnts to pass to uboot-mkimage call"
+FITIMAGE_HASH_ALGO ?= "sha256"
+FITIMAGE_HASH_ALGO[doc] = "Hash algorithm to use"
+FITIMAGE_ENCRYPT_ALGO ?= "rsa2048"
+FITIMAGE_ENCRYPT_ALGO[doc] = "Signature algorithm to use"
+FITIMAGE_CONFIG_PREFIX ?= "conf-"
+FITIMAGE_CONFIG_PREFIX[doc] = "Prefix to use for FIT configuration node name"
+
+FITIMAGE_LOADADDRESS ??= ""
+FITIMAGE_ENTRYPOINT  ??= ""
+FITIMAGE_DTB_LOADADDRESS ??= ""
+FITIMAGE_DTB_OVERLAY_LOADADDRESS ??= ""
+FITIMAGE_RD_LOADADDRESS ??= ""
+FITIMAGE_RD_ENTRYPOINT ??= ""
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+# Create dependency list from images
+python __anonymous() {
+    for image in (d.getVar('FITIMAGE_IMAGES') or "").split():
+        imageflags = d.getVarFlags('FITIMAGE_IMAGE_%s' % image, expand=['type', 'depends']) or {}
+        imgtype = imageflags.get('type')
+        if not imgtype:
+            bb.debug(1, "No [type] given for image '%s', defaulting to 'kernel'" % image)
+            imgtype = 'kernel'
+        recipe = d.getVar('FITIMAGE_IMAGE_%s' % image)
+
+        if not recipe:
+            bb.fatal(f"No recipe set for image '{image}'. Specify via 'FITIMAGE_IMAGE_{image} = \"<recipe-name>\"'")
+            return
+
+        d.appendVarFlag('do_unpack', 'vardeps', ' FITIMAGE_IMAGE_%s' % image)
+        depends = imageflags.get('depends')
+        if depends:
+            d.appendVarFlag('do_unpack', 'depends', ' ' + depends)
+            continue
+
+        if imgtype == 'ramdisk':
+            d.appendVarFlag('do_unpack', 'depends', ' ' + recipe + ':do_image_complete')
+        elif 'fdt' in imgtype:
+            d.appendVarFlag('do_unpack', 'depends', ' ' + recipe + ':do_populate_sysroot')
+            d.appendVarFlag('do_unpack', 'depends', ' ' + recipe + ':do_deploy')
+        else:
+            d.appendVarFlag('do_unpack', 'depends', ' ' + recipe + ':do_deploy')
+
+        if 'fdt' in imgtype and d.getVar('PREFERRED_PROVIDER_virtual/dtb'):
+            d.setVar('EXTERNAL_KERNEL_DEVICETREE', '${RECIPE_SYSROOT}/boot/devicetree')
+}
+
+S = "${UNPACKDIR}"
+B = "${WORKDIR}/build"
+
+#
+# Emit the fitImage ITS header
+#
+def fitimage_emit_fit_header(d, fd):
+    fd.write('/dts-v1/;\n\n/ {\n')
+    fd.write(d.expand('\tdescription = "fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}";\n'))
+    fd.write('\t#address-cells = <1>;\n')
+
+#
+# Emit the fitImage ITS footer
+#
+def fitimage_emit_fit_footer(d, fd):
+    fd.write('};\n')
+
+#
+# Emit the fitImage section
+#
+def fitimage_emit_section_start(d, fd, section):
+    fd.write(f'\t{section} {{\n')
+
+#
+# Emit the fitImage section end
+#
+def fitimage_emit_section_end(d, fd):
+    fd.write('\t};\n')
+
+def fitimage_emit_section_kernel(d, fd, imgpath, imgsource, imgcomp):
+    kernelcount = 1
+    kernel_csum = d.getVar("FITIMAGE_HASH_ALGO")
+    arch = d.getVar("ARCH")
+    loadaddr = d.getVar("FITIMAGE_LOADADDRESS")
+    entryaddr = d.getVar("FITIMAGE_ENTRYPOINT")
+
+    bb.note(f"Adding kernel-{kernelcount} section to ITS file")
+
+    fd.write(f'\t\tkernel-{kernelcount} {{\n')
+    fd.write('\t\t\tdescription = "Linux kernel";\n')
+    fd.write(f'\t\t\tdata = /incbin/("{imgpath}/{imgsource}");\n')
+    fd.write('\t\t\ttype = "kernel";\n')
+    fd.write(f'\t\t\tarch = "{arch}";\n')
+    fd.write('\t\t\tos = "linux";\n')
+    fd.write(f'\t\t\tcompression = "{imgcomp}";\n')
+    if (loadaddr):
+        fd.write(f'\t\t\tload = <{loadaddr}>;\n')
+    if (entryaddr):
+        fd.write(f'\t\t\tentry = <{entryaddr}>;\n')
+    fd.write('\t\t\thash-1 {\n')
+    fd.write(f'\t\t\t\talgo = "{kernel_csum}";\n')
+    fd.write('\t\t\t};\n')
+    fd.write('\t\t};\n')
+
+#
+# Emit the fitImage ITS DTB section
+#
+def _fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path, loadaddr, desc):
+    dtb_csum = d.getVar("FITIMAGE_HASH_ALGO")
+    arch = d.getVar("ARCH")
+
+    bb.note(f"Adding fdt-{dtb_file} section to ITS file")
+
+    fd.write(f'\t\tfdt-{dtb_file} {{\n')
+    fd.write(f'\t\t\tdescription = "{desc}";\n')
+    fd.write(f'\t\t\tdata = /incbin/("{dtb_path}/{dtb_file}");\n')
+    fd.write('\t\t\ttype = "flat_dt";\n')
+    fd.write(f'\t\t\tarch = "{arch}";\n')
+    fd.write('\t\t\tcompression = "none";\n')
+    if loadaddr:
+        fd.write(f'\t\t\tload = <{loadaddr}>;\n')
+    fd.write('\t\t\thash-1 {\n')
+    fd.write(f'\t\t\t\talgo = "{dtb_csum}";\n')
+    fd.write('\t\t\t};\n')
+    fd.write('\t\t};\n')
+
+
+def fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path):
+    loadaddr = d.getVar("FITIMAGE_DTB_LOADADDRESS")
+
+    _fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path, loadaddr, "Flattened Device Tree blob")
+
+#
+# Emit the fitImage ITS DTB overlay section
+#
+def fitimage_emit_section_dtb_overlay(d, fd, dtb_file, dtb_path):
+    loadaddr = d.getVar("FITIMAGE_DTB_OVERLAY_LOADADDRESS")
+
+    _fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path, loadaddr, "Flattened Device Tree Overlay blob")
+
+
+#
+# Emit the fitImage ITS ramdisk section
+#
+def fitimage_emit_section_ramdisk(d, fd, img_file, img_path):
+    ramdisk_count = "1"
+    ramdisk_csum = d.getVar("FITIMAGE_HASH_ALGO")
+    arch = d.getVar("ARCH")
+    loadaddr = d.getVar("FITIMAGE_RD_LOADADDRESS")
+    entryaddr = d.getVar("FITIMAGE_RD_ENTRYPOINT")
+
+    bb.note(f"Adding ramdisk-{ramdisk_count} section to ITS file")
+
+    fd.write(f'\t\tramdisk-{ramdisk_count} {{\n')
+    fd.write(f'\t\t\tdescription = "{img_file}";\n')
+    fd.write(f'\t\t\tdata = /incbin/("{img_path}/{img_file}");\n')
+    fd.write('\t\t\ttype = "ramdisk";\n')
+    fd.write(f'\t\t\tarch = "{arch}";\n')
+    fd.write('\t\t\tos = "linux";\n')
+    fd.write('\t\t\tcompression = "none";\n')
+    if (loadaddr):
+        fd.write(f'\t\t\tload = <{loadaddr}>;\n')
+    if (entryaddr):
+        fd.write(f'\t\t\tentry = <{entryaddr}>;\n')
+    fd.write('\t\t\thash-1 {\n')
+    fd.write(f'\t\t\t\talgo = "{ramdisk_csum}";\n')
+    fd.write('\t\t\t};\n')
+    fd.write('\t\t};\n')
+
+def fitimage_emit_section_bootscript(d, fd, imgpath, imgsource):
+    hash_algo = d.getVar("FITIMAGE_HASH_ALGO")
+    arch = d.getVar("ARCH")
+
+    bb.note(f"Adding bootscr-{imgsource} section to ITS file")
+
+    fd.write(f'\t\tbootscr-{imgsource} {{\n')
+    fd.write('\t\t\tdescription = "U-boot script";\n')
+    fd.write(f'\t\t\tdata = /incbin/("{imgpath}/{imgsource}");\n')
+    fd.write('\t\t\ttype = "script";\n')
+    fd.write(f'\t\t\tarch = "{arch}";\n')
+    fd.write('\t\t\tos = "linux";\n')
+    fd.write('\t\t\tcompression = "none";\n')
+    fd.write('\t\t\thash-1 {\n')
+    fd.write(f'\t\t\t\talgo = "{hash_algo}";\n')
+    fd.write('\t\t\t};\n')
+    fd.write('\t\t};\n')
+
+def fitimage_emit_subsection_signature(d, fd, sign_images_list):
+    hash_algo = d.getVar("FITIMAGE_HASH_ALGO")
+    encrypt_algo = d.getVar("FITIMAGE_ENCRYPT_ALGO") or ""
+    conf_sign_keyname = d.getVar("FITIMAGE_SIGN_KEYNAME")
+    signer_name = d.getVar("FITIMAGE_SIGNER")
+    signer_version = d.getVar("FITIMAGE_SIGNER_VERSION")
+    sign_images = ", ".join(f'"{s}"' for s in sign_images_list)
+
+    fd.write('\t\t\tsignature-1 {\n')
+    fd.write(f'\t\t\t\talgo = "{hash_algo},{encrypt_algo}";\n')
+    if conf_sign_keyname:
+        fd.write(f'\t\t\t\tkey-name-hint = "{conf_sign_keyname}";\n')
+    fd.write(f'\t\t\t\tsign-images = {sign_images};\n')
+    fd.write(f'\t\t\t\tsigner-name = "{signer_name}";\n')
+    fd.write(f'\t\t\t\tsigner-version = "{signer_version}";\n')
+    fd.write('\t\t\t};\n')
+
+#
+# Emit the fitImage ITS configuration section
+#
+def fitimage_emit_section_config(d, fd, dtb, kernelcount, ramdiskcount, setupcount, bootscriptid, compatible, dtbcount):
+    sign = d.getVar("FITIMAGE_SIGN")
+    conf_default = None
+    conf_prefix = d.getVar('FITIMAGE_CONFIG_PREFIX') or ""
+
+    bb.note(f"Adding {conf_prefix}{dtb} section to ITS file")
+
+    conf_desc="Linux kernel"
+    if dtb:
+        conf_desc += ", FDT blob"
+    if ramdiskcount:
+         conf_desc += ", ramdisk"
+    if setupcount:
+         conf_desc += ", setup"
+    if bootscriptid:
+         conf_desc += ", u-boot script"
+    if dtbcount == 1:
+        conf_default = d.getVar('FITIMAGE_DEFAULT_CONFIG') or f'{conf_prefix}{dtb}'
+
+    if conf_default:
+        fd.write(f'\t\tdefault = "{conf_default}";\n')
+    fd.write(f'\t\t{conf_prefix}{dtb} {{\n')
+    fd.write(f'\t\t\tdescription = "{dtbcount} {conf_desc}";\n')
+    if kernelcount:
+        fd.write('\t\t\tkernel = "kernel-1";\n')
+    fd.write(f'\t\t\tfdt = "fdt-{dtb}";\n')
+    if ramdiskcount:
+        fd.write(f'\t\t\tramdisk = "ramdisk-{ramdiskcount}";\n')
+    if bootscriptid:
+        fd.write(f'\t\t\tbootscr = "bootscr-{bootscriptid}";\n')
+    if compatible:
+        fd.write(f'\t\t\tcompatible = "{compatible}";\n')
+
+    if sign == "1":
+        sign_images = ["kernel"]
+        if dtb:
+            sign_images.append("fdt")
+        if ramdiskcount:
+            sign_images.append("ramdisk")
+        if setupcount:
+            sign_images.append("setup")
+        if bootscriptid:
+            sign_images.append("bootscr")
+        fitimage_emit_subsection_signature(d, fd, sign_images)
+
+    fd.write('\t\t'  + '};\n')
+
+#
+# Emits a device tree overlay config section
+#
+def fitimage_emit_section_config_fdto(d, fd, dtb, compatible):
+    sign = d.getVar("FITIMAGE_SIGN")
+    bb.note("Adding overlay config section to ITS file")
+
+    fd.write(f'\t\t{dtb} {{\n')
+    fd.write(f'\t\t\tdescription = "Device Tree Overlay";\n')
+    fd.write(f'\t\t\tfdt = "fdt-{dtb}";\n')
+    if compatible:
+       fd.write(f'\t\t\tcompatible = "{compatible}";\n')
+
+    if sign == "1":
+        sign_images = ["fdt"]
+        fitimage_emit_subsection_signature(d, fd, sign_images)
+
+    fd.write('\t\t'  + '};\n')
+
+python write_manifest() {
+    machine = d.getVar('MACHINE')
+    kernelcount=1
+    DTBS = ""
+    DTBOS = ""
+    ramdiskcount = ""
+    setupcount = ""
+    bootscriptid = ""
+    compatible = ""
+
+    def get_dtbs(d, dtb_suffix):
+        sysroot = d.getVar('RECIPE_SYSROOT')
+        deploydir = d.getVar('DEPLOY_DIR_IMAGE')
+
+        dtbs = (d.getVar('KERNEL_DEVICETREE') or '').split()
+        dtbs = [os.path.basename(x) for x in dtbs if x.endswith(dtb_suffix)]
+        ext_dtbs = os.listdir(d.getVar('EXTERNAL_KERNEL_DEVICETREE')) if d.getVar('EXTERNAL_KERNEL_DEVICETREE') else []
+        ext_dtbs = [x for x in ext_dtbs if x.endswith(dtb_suffix)]
+
+        result = []
+        # Prefer BSP dts if BSP and kernel provide the same dts
+        for d in sorted(set(dtbs + ext_dtbs)):
+            dtbpath = f'{sysroot}/boot/devicetree/{d}' if d in ext_dtbs else f'{deploydir}/{d}'
+            result.append(dtbpath)
+
+        return " ".join(result)
+
+    with open('%s/manifest.its' % d.getVar('B'), 'w') as fd:
+        images = d.getVar('FITIMAGE_IMAGES')
+        if not images:
+            bb.warn("No images specified in FITIMAGE_IMAGES. Generated FIT image will be empty")
+
+        fitimage_emit_fit_header(d, fd)
+        fitimage_emit_section_start(d, fd, 'images')
+
+        for image in (images or "").split():
+            imageflags = d.getVarFlags('FITIMAGE_IMAGE_%s' % image, expand=['file', 'fstype', 'type', 'comp']) or {}
+            imgtype = imageflags.get('type', 'kernel')
+            if imgtype == 'kernel':
+                if d.getVar('KERNEL_IMAGETYPE') not in ('zImage', 'Image') and not imageflags.get('comp'):
+                    bb.warn(f"KERNEL_IMAGETYPE is '{d.getVar('KERNEL_IMAGETYPE')}' but FITIMAGE_IMAGE_kernel[comp] is not set.")
+                default = "%s-%s%s" % (d.getVar('KERNEL_IMAGETYPE'), machine, d.getVar('KERNEL_IMAGE_BIN_EXT'))
+                imgsource = imageflags.get('file', default)
+                imgcomp = imageflags.get('comp', 'none')
+                imgpath = d.getVar("DEPLOY_DIR_IMAGE")
+                fitimage_emit_section_kernel(d, fd, imgpath, imgsource, imgcomp)
+            elif imgtype == 'fdt':
+                default = get_dtbs(d, "dtb")
+                dtbfiles = imageflags.get('file', default)
+                if not dtbfiles:
+                    bb.fatal(f"No dtb file found for image '{image}'. Set KERNEL_DEVICETREE, [file] varflag, or reference devicetree.bbclass-based recipe.")
+                for dtb in dtbfiles.split():
+                    dtb_path, dtb_file = os.path.split(dtb)
+                    DTBS += f" {dtb}"
+                    fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path)
+            elif imgtype == 'fdto':
+                default = get_dtbs(d, "dtbo")
+                dtbofiles = imageflags.get('file', default)
+                if not dtbofiles:
+                    bb.fatal(f"No dtbo file found for image '{image}'. Set KERNEL_DEVICETREE, [file] varflag, or reference devicetree.bbclass-based recipe.")
+                for dtb in dtbofiles.split():
+                    dtb_path, dtb_file = os.path.split(dtb)
+                    DTBOS = DTBOS + " " + dtb
+                    fitimage_emit_section_dtb_overlay(d, fd, dtb_file, dtb_path)
+            elif imgtype == 'fdtapply':
+                import subprocess
+                dtbofiles = imageflags.get('file', None)
+                if not dtbofiles:
+                    bb.fatal(f"No dtbo file found for image '{image}'. Set via [file] varflag.")
+                dtboutname = imageflags.get('name', None)
+                if not dtboutname:
+                    bb.fatal(f"No dtb output name found for image '{image}'. Set via [name] varflag.")
+                dtbresult = "%s/%s" % (d.getVar('B'), dtboutname)
+                dtbcommand = ""
+                for dtb in dtbofiles.split():
+                    dtb_path, dtb_file = os.path.split(dtb)
+                    if not dtb_path:
+                        dtb_path = d.getVar("DEPLOY_DIR_IMAGE")
+                    if not dtbcommand:
+                        if not dtb_file.endswith('.dtb'):
+                            bb.fatal(f"fdtapply failed: Expected (non-overlay) .dtb file as first element, but got {dtb_file}")
+                        dtbcommand = f"fdtoverlay -i {dtb_path}/{dtb_file} -o {dtbresult}"
+                    else:
+                        if not dtb_file.endswith('.dtbo'):
+                            bb.fatal(f"fdtapply failed: Expected .dtbo file, but got {dtb_file}")
+                        dtbcommand += f" {dtb_path}/{dtb_file}"
+                result = subprocess.run(dtbcommand, stderr=subprocess.PIPE, shell=True, text=True)
+                if result.returncode != 0:
+                    bb.fatal(f"Running {dtbcommand} failed: {result.stderr}")
+                dtb_path, dtb_file = os.path.split(dtbresult)
+                DTBS += f" {dtbresult}"
+                fitimage_emit_section_dtb(d, fd, dtb_file, dtb_path)
+            elif imgtype == 'ramdisk':
+                ramdiskcount = "1"
+                default_imgfstype = d.getVar('INITRAMFS_FSTYPES' or "").split()[0]
+                img_fstype = imageflags.get('fstype', default_imgfstype)
+                img_file = "%s%s.%s" % (d.getVar('FITIMAGE_IMAGE_%s' % image), d.getVar('IMAGE_MACHINE_SUFFIX'), img_fstype)
+                img_path = d.getVar("DEPLOY_DIR_IMAGE")
+                fitimage_emit_section_ramdisk(d, fd, img_file, img_path)
+            elif imgtype == 'bootscript':
+                if bootscriptid:
+                    bb.fatal("Only a single boot script is supported (already set to: %s)" % bootscriptid)
+                imgsource = imageflags.get('file', None)
+                imgpath = d.getVar("DEPLOY_DIR_IMAGE")
+                bootscriptid = imgsource
+                fitimage_emit_section_bootscript(d, fd, imgpath, imgsource)
+            else:
+                bb.fatal(f"Unsupported image type: '{imgtype}'")
+        fitimage_emit_section_end(d, fd)
+        #
+        # Step 5: Prepare a configurations section
+        #
+        fitimage_emit_section_start(d, fd, 'configurations')
+        confcount = 0
+        dtbcount = 1
+        for dtb in (DTBS or "").split():
+            import subprocess
+            try:
+                cmd = "fdtget -t s {} / compatible".format(dtb)
+                compatible = subprocess.check_output(cmd, shell=True, text=True).split()[0]
+            except subprocess.CalledProcessError:
+                bb.fatal("Failed to find root-node compatible string in (%s)" % dtb)
+
+            dtb_path, dtb_file = os.path.split(dtb)
+            fitimage_emit_section_config(d, fd, dtb_file, kernelcount, ramdiskcount, setupcount, bootscriptid, compatible, dtbcount)
+            dtbcount += 1
+            confcount += 1
+        for dtb in (DTBOS or "").split():
+            import subprocess
+            try:
+                cmd = "fdtget -t s {} / compatible".format(dtb)
+                compatible = subprocess.check_output(cmd, shell=True, text=True).split()[0]
+            except subprocess.CalledProcessError:
+                bb.note("Failed to find root-node compatible string in (%s)" % dtb)
+                compatible = None
+
+            dtb_path, dtb_file = os.path.split(dtb)
+            fitimage_emit_section_config_fdto(d, fd, dtb_file, compatible)
+            confcount += 1
+
+        fitimage_emit_section_end(d, fd)
+
+        if confcount == 0:
+            bb.fatal("Empty 'configurations' node generated! At least one 'fdt' or 'fdto' type is required.")
+
+        fitimage_emit_fit_footer(d, fd)
+}
+
+do_configure[postfuncs] += "write_manifest"
+
+do_fitimage () {
+    if [ "${FITIMAGE_SIGN}" = "1" ]; then
+        uboot-mkimage ${FITIMAGE_MKIMAGE_EXTRA_ARGS} \
+            -k "${FITIMAGE_SIGN_KEYDIR}" -r \
+            -f "${B}/manifest.its" \
+            "${B}/fitImage"
+    else
+        uboot-mkimage ${FITIMAGE_MKIMAGE_EXTRA_ARGS} \
+            -f "${B}/manifest.its" \
+            "${B}/fitImage"
+    fi
+}
+addtask fitimage after do_configure
+
+ITS_NAME ?= "${PN}-${KERNEL_ARTIFACT_NAME}"
+ITS_LINK_NAME ?= "${PN}-${KERNEL_ARTIFACT_LINK_NAME}"
+FITIMAGE_IMAGE_NAME ?= "fitImage-${PN}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}"
+FITIMAGE_IMAGE_LINK_NAME ?= "fitImage-${PN}-${KERNEL_FIT_LINK_NAME}"
+
+SSTATE_SKIP_CREATION:task-deploy = '1'
+
+do_deploy() {
+    bbnote 'Copying fit-image.its source file...'
+    install -m 0644 ${B}/manifest.its ${DEPLOYDIR}/${ITS_NAME}.its
+
+    bbnote 'Copying all created fdt from type fdtapply'
+    for DTB_FILE in `find ${B} -maxdepth 1 -name *.dtb`; do
+        install -m 0644 ${DTB_FILE} ${DEPLOYDIR}/
+    done
+
+    bbnote 'Copying fitImage file...'
+    install -m 0644 ${B}/fitImage ${DEPLOYDIR}/${FITIMAGE_IMAGE_NAME}
+
+    cd ${DEPLOYDIR}
+    ln -sf ${ITS_NAME}.its ${ITS_LINK_NAME}.its
+    ln -sf ${FITIMAGE_IMAGE_NAME} ${FITIMAGE_IMAGE_LINK_NAME}
+}
+addtask deploy after do_fitimage before do_build
diff --git a/meta-oe/classes/gitpkgv.bbclass b/meta-oe/classes/gitpkgv.bbclass
index 5ab507969c..eb4b1eae9a 100644
--- a/meta-oe/classes/gitpkgv.bbclass
+++ b/meta-oe/classes/gitpkgv.bbclass
@@ -70,54 +70,52 @@ def get_git_pkgv(d, use_tags):
         names = []
         for url in ud.values():
             if url.type == 'git' or url.type == 'gitsm':
-                names.extend(url.revisions.keys())
+                names.append(url.name)
         if len(names) > 0:
             format = '_'.join(names)
         else:
             format = 'default'
-
     found = False
     for url in ud.values():
         if url.type == 'git' or url.type == 'gitsm':
-            for name, rev in url.revisions.items():
-                if not os.path.exists(url.localpath):
-                    return None
+            if not os.path.exists(url.localpath):
+                return None
 
-                found = True
+            found = True
 
-                vars = { 'repodir' : quote(url.localpath),
-                         'rev' : quote(rev) }
+            vars = { 'repodir' : quote(url.localpath),
+                     'rev' : quote(url.revision) }
 
-                rev = bb.fetch2.get_srcrev(d).split('+')[1]
-                rev_file = os.path.join(url.localpath, "oe-gitpkgv_" + rev)
+            rev = bb.fetch2.get_srcrev(d).split('+')[1]
+            rev_file = os.path.join(url.localpath, "oe-gitpkgv_" + url.revision)
 
-                if not os.path.exists(rev_file) or os.path.getsize(rev_file)==0:
-                    commits = bb.fetch2.runfetchcmd(
-                        "git --git-dir=%(repodir)s rev-list %(rev)s -- 2>/dev/null | wc -l"
-                        % vars, d, quiet=True).strip().lstrip('0')
+            if not os.path.exists(rev_file) or os.path.getsize(rev_file)==0:
+                commits = bb.fetch2.runfetchcmd(
+                    "git --git-dir=%(repodir)s rev-list %(rev)s -- 2>/dev/null | wc -l"
+                    % vars, d, quiet=True).strip().lstrip('0')
 
-                    if commits != "":
-                        oe.path.remove(rev_file, recurse=False)
-                        with open(rev_file, "w") as f:
-                            f.write("%d\n" % int(commits))
-                    else:
-                        commits = "0"
-                else:
-                    with open(rev_file, "r") as f:
-                        commits = f.readline(128).strip()
-
-                if use_tags:
-                    try:
-                        output = bb.fetch2.runfetchcmd(
-                            "git --git-dir=%(repodir)s describe %(rev)s --tags --exact-match 2>/dev/null"
-                            % vars, d, quiet=True).strip()
-                        ver = gitpkgv_drop_tag_prefix(d, output)
-                    except Exception:
-                        ver = "0.0-%s-g%s" % (commits, vars['rev'][:7])
+                if commits != "":
+                    oe.path.remove(rev_file, recurse=False)
+                    with open(rev_file, "w") as f:
+                        f.write("%d\n" % int(commits))
                 else:
-                    ver = "%s+%s" % (commits, vars['rev'][:7])
-
-                format = format.replace(name, ver)
+                    commits = "0"
+            else:
+                with open(rev_file, "r") as f:
+                    commits = f.readline(128).strip()
+
+            if use_tags:
+                try:
+                    output = bb.fetch2.runfetchcmd(
+                        "git --git-dir=%(repodir)s describe %(rev)s --tags --exact-match 2>/dev/null"
+                        % vars, d, quiet=True).strip()
+                    ver = gitpkgv_drop_tag_prefix(d, output)
+                except Exception:
+                    ver = "0.0-%s-g%s" % (commits, vars['rev'][:7])
+            else:
+                ver = "%s+%s" % (commits, vars['rev'][:7])
+
+            format = format.replace(url.name, ver)
 
     if found:
         return format
diff --git a/meta-oe/classes/gpe.bbclass b/meta-oe/classes/gpe.bbclass
deleted file mode 100644
index a9b1cd5a90..0000000000
--- a/meta-oe/classes/gpe.bbclass
+++ /dev/null
@@ -1,17 +0,0 @@
-DEPENDS:prepend = "virtual/libintl intltool-native "
-GPE_TARBALL_SUFFIX ?= "gz"
-SRC_URI = "${GPE_MIRROR}/${BP}.tar.${GPE_TARBALL_SUFFIX}"
-FILES:${PN} += "${datadir}/gpe ${datadir}/application-registry"
-SECTION ?= "gpe"
-
-inherit gettext
-
-gpe_do_compile() {
-    oe_runmake PREFIX=${prefix}
-}
-
-gpe_do_install() {
-    oe_runmake PREFIX=${prefix} DESTDIR=${D} install
-}
-
-EXPORT_FUNCTIONS do_compile do_install
diff --git a/meta-oe/classes/image_types_verity.bbclass b/meta-oe/classes/image_types_verity.bbclass
index b42217c453..d77bc20a13 100644
--- a/meta-oe/classes/image_types_verity.bbclass
+++ b/meta-oe/classes/image_types_verity.bbclass
@@ -26,6 +26,10 @@
 # should be the same blockdevice in the command shown above while <dm_dev_name>
 # is the name of the to be created dm-verity-device.
 #
+# By specifying a different VERITY_IMAGE_HASHDEV_SUFFIX, the hash tree data can
+# be created in a separate file. In this case, <dev> is just zero padded to a
+# multiple of VERITY_BLOCK_SIZE. <hash_dev> will be a separate file.
+#
 # The root hash is calculated using a salt to make attacks more difficult. Thus,
 # please grant each image recipe its own salt which could be generated e.g. via
 #
@@ -42,6 +46,7 @@ VERITY_SALT ?= "${CLASS_VERITY_SALT}"
 VERITY_BLOCK_SIZE ?= "4096"
 VERITY_IMAGE_FSTYPE ?= "ext4"
 VERITY_IMAGE_SUFFIX ?= ".verity"
+VERITY_IMAGE_HASHDEV_SUFFIX ?= "${VERITY_IMAGE_SUFFIX}"
 VERITY_INPUT_IMAGE ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${VERITY_IMAGE_FSTYPE}"
 
 IMAGE_TYPEDEP:verity = "${VERITY_IMAGE_FSTYPE}"
@@ -56,6 +61,7 @@ python __anonymous() {
 }
 
 python do_image_verity () {
+    import io
     import os
     import subprocess
     import shutil
@@ -66,6 +72,9 @@ python do_image_verity () {
     verity_image_suffix = d.getVar('VERITY_IMAGE_SUFFIX')
     verity = '{}{}'.format(image, verity_image_suffix)
 
+    verity_image_hashdev_suffix = d.getVar('VERITY_IMAGE_HASHDEV_SUFFIX')
+    verity_hashdev = '{}{}'.format(image, verity_image_hashdev_suffix)
+
     # For better readability the parameter VERITY_BLOCK_SIZE is specified in
     # bytes. It must be a multiple of the logical sector size which is 512 bytes
     # in Linux. Make sure that this is the case as otherwise the resulting
@@ -87,9 +96,9 @@ python do_image_verity () {
     bb.debug(1, f"data_size_blocks: {data_size_blocks}, {data_size_rest}")
     bb.debug(1, f"data_size: {data_size}")
 
-    # Create verity image
-    try:
-        output = subprocess.check_output([
+    if verity == verity_hashdev:
+        # creating self-contained dm-verity image
+        veritysetup_command = [
             'veritysetup', 'format',
             '--no-superblock',
             '--salt={}'.format(salt),
@@ -98,7 +107,27 @@ python do_image_verity () {
             '--hash-block-size={}'.format(block_size),
             '--hash-offset={}'.format(data_size),
             verity, verity,
-            ])
+        ]
+    else:
+        # creating separate dm-verity and hash device image
+        veritysetup_command = [
+            'veritysetup', 'format',
+            '--salt={}'.format(salt),
+            '--data-blocks={}'.format(data_blocks),
+            '--data-block-size={}'.format(block_size),
+            '--hash-block-size={}'.format(block_size),
+            verity, verity_hashdev,
+        ]
+        # veritysetup expects the data device size to be a multiple of block_size
+        # when creating a separate hashdev file, zero pad verity file if needed
+        if data_size_rest:
+            with open(verity, 'rb+') as verityfile:
+                verityfile.seek(0, io.SEEK_END)
+                verityfile.write(b'\x00' * (block_size - data_size_rest))
+
+    # Create verity image
+    try:
+        output = subprocess.check_output(veritysetup_command)
     except subprocess.CalledProcessError as err:
         bb.fatal('%s returned with %s (%s)' % (err.cmd, err.returncode, err.output))
 
@@ -128,7 +157,11 @@ python do_image_verity () {
         bb.fatal('Unexpected error %s' % err)
 
     # Create symlinks
-    for suffix in [ verity_image_suffix, '.verity-info', '.verity-params' ]:
+    suffix_list = [ verity_image_suffix, '.verity-info', '.verity-params' ]
+    if verity != verity_hashdev:
+        suffix_list.append(verity_image_hashdev_suffix)
+
+    for suffix in suffix_list:
         try:
             os.remove(link + suffix)
         except FileNotFoundError:
diff --git a/meta-oe/classes/panel-mipi-dbi.bbclass b/meta-oe/classes/panel-mipi-dbi.bbclass
new file mode 100644
index 0000000000..7ceebc72e0
--- /dev/null
+++ b/meta-oe/classes/panel-mipi-dbi.bbclass
@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright Pengutronix <yocto@pengutronix.de>
+#
+# Class to generate firmware files for use with the `panel-mipi-dbi` Linux
+# driver.
+#
+# The firmware source file contains a list of commands to send to the display
+# controller in order to initialize it:
+#
+#   $ cat shineworld,lh133k.txt
+#   command 0x11 # exit sleep mode
+#   delay 120
+#
+#   # Enable color inversion
+#   command 0x21 # INVON
+#   ...
+#
+# A recipe to compile such a command list into a firmware blob for use with
+# the `panel-mipi-dbi` driver looks something like this:
+#
+#   $ cat panel-shineworld-lh133k.bb
+#   inherit panel-mipi-dbi
+#
+#   SRC_URI = "file://${PANEL_FIRMWARE}"
+#
+#   PANEL_FIRMWARE = "shineworld,lh133k.txt"
+#   ...
+
+DEPENDS = "panel-mipi-dbi-native"
+
+PANEL_FIRMWARE_BIN ?= "${@d.getVar('PANEL_FIRMWARE').removesuffix('.txt')}.bin"
+
+do_configure[noexec] = "1"
+
+do_compile () {
+    mipi-dbi-cmd \
+        "${B}/${PANEL_FIRMWARE_BIN}" \
+        "${UNPACKDIR}/${PANEL_FIRMWARE}"
+}
+
+do_install () {
+    install -m 0644 -D \
+        "${B}/${PANEL_FIRMWARE_BIN}" \
+        "${D}${nonarch_base_libdir}/firmware/${PANEL_FIRMWARE_BIN}"
+}
+
+FILES:${PN} = "${nonarch_base_libdir}/firmware/"
diff --git a/meta-oe/classes/signing.bbclass b/meta-oe/classes/signing.bbclass
index f52d861b76..5068360ca7 100644
--- a/meta-oe/classes/signing.bbclass
+++ b/meta-oe/classes/signing.bbclass
@@ -54,7 +54,7 @@
 SIGNING_PKCS11_URI ?= ""
 SIGNING_PKCS11_MODULE ?= ""
 
-DEPENDS += "softhsm-native libp11-native opensc-native openssl-native"
+DEPENDS += "softhsm-native libp11-native opensc-native openssl-native extract-cert-native"
 
 def signing_class_prepare(d):
     import os.path
@@ -87,11 +87,21 @@ def signing_class_prepare(d):
         export(role, "SIGNING_PKCS11_URI_%s_", pkcs11_uri)
         export(role, "SIGNING_PKCS11_MODULE_%s_", pkcs11_module)
 
+        # there can be an optional CA associated with this role
+        ca_cert_name = d.getVarFlag("SIGNING_CA", role) or d.getVar("SIGNING_CA")
+        if ca_cert_name:
+            export(role, "SIGNING_CA_%s_", ca_cert_name)
+
 signing_pkcs11_tool() {
     pkcs11-tool --module "${STAGING_LIBDIR_NATIVE}/softhsm/libsofthsm2.so" --login --pin 1111 $*
 }
 
 signing_import_prepare() {
+    # the $PN is used as 'label' in the softhsm, which is a "CK_UTF8CHAR
+    # paddedLabel[32]" in softhsm2-util.cpp, so it must not be longer.
+    LEN=$(echo -n ${PN} | wc -c)
+    test $LEN -le 32 || bbfatal "PN must not have a length greater than 32 chars."
+
     export _SIGNING_ENV_FILE_="${B}/meta-signing.env"
     rm -f "$_SIGNING_ENV_FILE_"
 
@@ -118,28 +128,131 @@ signing_import_define_role() {
     echo "_SIGNING_PKCS11_MODULE_${role}_=\"softhsm\"" >> $_SIGNING_ENV_FILE_
 }
 
-# signing_import_cert_from_der <role> <der>
+# signing_import_cert_from_der <cert_name> <der>
 #
-# Import a certificate from DER file to a role. To be used
-# with SoftHSM.
+# Import a certificate from DER file to a cert_name.
+# Where the <cert_name> can either be a previously setup
+# signing_import_define_role linking the certificate to a signing key,
+# or a new identifier when dealing with a standalone certificate.
+#
+# To be used with SoftHSM.
 signing_import_cert_from_der() {
-    local role="${1}"
+    local cert_name="${1}"
     local der="${2}"
 
-    signing_pkcs11_tool --type cert --write-object "${der}" --label "${role}"
+    # check wether the cert_name/role needs to be defined first,
+    # or do so otherwise
+    local uri=$(siging_get_uri $cert_name)
+    if [ -z "$uri" ]; then
+        signing_import_define_role "$cert_name"
+    fi
+
+    signing_pkcs11_tool --type cert --write-object "${der}" --label "${cert_name}"
 }
 
-# signing_import_cert_from_pem <role> <pem>
+# signing_import_set_ca <cert_name> <ca_cert_name>
 #
-# Import a certificate from PEM file to a role. To be used
-# with SoftHSM.
+# Link the certificate from <cert_name> to its issuer stored in
+# <ca_cert_name> By walking this linked list a CA-chain can later be
+# reconstructed from the involed roles.
+signing_import_set_ca() {
+    local cert_name="${1}"
+    local ca_cert_name="${2}"
+
+    echo "_SIGNING_CA_${cert_name}_=\"${ca_cert_name}\"" >> $_SIGNING_ENV_FILE_
+    echo "added link from ${cert_name} to ${ca_cert_name}"
+}
+
+# signing_get_ca <cert_name>
+#
+# returns the <ca_cert_name> that has been set previously through
+# either signing_import_set_ca;
+# or a local.conf override SIGNING_CA[role] = ...
+# If none was set, the empty string is returned.
+signing_get_ca() {
+    local cert_name="${1}"
+
+    # prefer local configuration
+    eval local ca="\$SIGNING_CA_${cert_name}_"
+    if [ -n "$ca" ]; then
+        echo "$ca"
+        return
+    fi
+
+    # fall back to softhsm
+    eval echo "\$_SIGNING_CA_${cert_name}_"
+}
+
+# signing_has_ca <cert_name>
+#
+# check if the cert_name links to another cert_name that is its
+# certificate authority/issuer.
+signing_has_ca() {
+    local ca_cert_name="$(signing_get_ca ${1})"
+
+    test -n "$ca_cert_name"
+    return $?
+}
+
+# signing_get_intermediate_certs <cert_name>
+#
+# return a list of role/name intermediary CA certificates for a given
+# <cert_name> by walking the chain setup with signing_import_set_ca.
+#
+# The returned list will not include the the root CA, and can
+# potentially be empty.
+#
+# To be used with SoftHSM.
+signing_get_intermediate_certs() {
+    local cert_name="${1}"
+    local intermediary=""
+    while signing_has_ca "${cert_name}"; do
+        cert_name="$(signing_get_ca ${cert_name})"
+        if signing_has_ca "${cert_name}"; then
+            intermediary="${intermediary} ${cert_name}"
+        fi
+    done
+    echo "${intermediary}"
+}
+
+# signing_get_root_cert <cert_name>
+#
+# return the role/name of the CA root certificate for a given
+# <cert_name>, by walking the chain setup with signing_import_set_ca
+# all the way to the last in line that doesn't have a CA set - which
+# would be the root.
+#
+# To be used with SoftHSM.
+signing_get_root_cert() {
+    local cert_name="${1}"
+    while signing_has_ca "${cert_name}"; do
+        cert_name="$(signing_get_ca ${cert_name})"
+    done
+    echo "${cert_name}"
+}
+
+# signing_import_cert_from_pem <cert_name> <pem>
+#
+# Import a certificate from PEM file to a cert_name.
+# Where the <cert_name> can either be a previously setup
+# signing_import_define_role linking the certificate to a signing key,
+# or a new identifier when dealing with a standalone certificate.
+#
+# To be used with SoftHSM.
 signing_import_cert_from_pem() {
-    local role="${1}"
+    local cert_name="${1}"
     local pem="${2}"
 
+    # check wether the cert_name/role needs to be defined first,
+    # or do so otherwise
+    local uri=$(siging_get_uri $cert_name)
+    if [ -z "$uri" ]; then
+        signing_import_define_role "$cert_name"
+    fi
+
     openssl x509 \
         -in "${pem}" -inform pem -outform der |
-    signing_pkcs11_tool --type cert --write-object /proc/self/fd/0 --label "${role}"
+    signing_pkcs11_tool --type cert --write-object /proc/self/fd/0 --label "${cert_name}"
 }
 
 # signing_import_pubkey_from_der <role> <der>
@@ -311,6 +424,30 @@ signing_get_module() {
     fi
 }
 
+# signing_extract_cert_der <role> <der>
+#
+# Export a certificate attached to a role into a DER file.
+# To be used with SoftHSM.
+signing_extract_cert_der() {
+    local role="${1}"
+    local output="${2}"
+
+    extract-cert "$(signing_get_uri $role)" "${output}"
+}
+
+# signing_extract_cert_pem <role> <pem>
+#
+# Export a certificate attached to a role into a PEM file.
+# To be used with SoftHSM.
+signing_extract_cert_pem() {
+    local role="${1}"
+    local output="${2}"
+
+    extract-cert "$(signing_get_uri $role)" "${output}.tmp-der"
+    openssl x509 -inform der -in "${output}.tmp-der" -out "${output}"
+    rm "${output}.tmp-der"
+}
+
 python () {
     signing_class_prepare(d)
 }
diff --git a/meta-oe/classes/sysext-image.bbclass b/meta-oe/classes/sysext-image.bbclass
new file mode 100644
index 0000000000..3771236c6e
--- /dev/null
+++ b/meta-oe/classes/sysext-image.bbclass
@@ -0,0 +1,87 @@
+#
+# Copyright OpenEmbedded Contributors
+#
+# SPDX-License-Identifier: MIT
+#
+
+# System extension images may – dynamically at runtime — extend the
+# /usr/ and /opt/ directory hierarchies with additional files. This is
+# particularly useful on immutable system images where a /usr/ and/or
+# /opt/ hierarchy residing on a read-only file system shall be
+# extended temporarily at runtime without making any persistent
+# modifications.
+
+## Example usage:
+# extension-image-example.bb
+#SUMMARY = "An example image to showcase a system extension image."
+#LICENSE = "MIT"
+#inherit discoverable-disk-image sysext-image
+#IMAGE_FEATURES = ""
+#IMAGE_LINGUAS = ""
+#IMAGE_INSTALL = "gdb"
+#
+## After building, the resulting 'extension-image-example-*sysext.rootfs.ddi'
+# can be deployed to an embedded system (running from a RO rootfs) and
+# 'merged' into the OS by following steps:
+## 1. place a symlink into the systemd-sysext image search path:
+# $> mkdir /run/extensions
+# $> ln -s /tmp/extension-example.sysext.ddi /run/extensions/example.raw
+## 2. list all available extensions:
+# $> systemd-sysext list
+## 3. and enable the found extensions:
+# $> SYSTEMD_LOG_LEVEL=debug systemd-sysext merge
+
+# Note: PACKAGECONFIG:pn-systemd needs to include 'sysext'
+
+# systemd-sysext [1] has a simple mechanism for version compatibility:
+# the extension to be loaded has to contain a file named
+# /usr/lib/extension-release.d/extension-release.NAME
+# with "NAME" part *exactly* matching the filename of the extensions
+# raw-device filename/
+#
+# From the extension-release file the "ID" and "VERSION_ID" fields are
+# matched against same fields present in `os-release` and the extension
+# is "merged" only if values in both fields from both files are an
+# exact match.
+#
+# Link: https://www.freedesktop.org/software/systemd/man/latest/systemd-sysext.html
+
+inherit image
+
+# Include '.sysext' in the deployed image filename and symlink
+IMAGE_NAME = "${IMAGE_BASENAME}${IMAGE_MACHINE_SUFFIX}${IMAGE_VERSION_SUFFIX}.sysext"
+IMAGE_LINK_NAME = "${IMAGE_BASENAME}${IMAGE_MACHINE_SUFFIX}.sysext"
+EXTENSION_NAME = "${IMAGE_LINK_NAME}.${IMAGE_FSTYPES}"
+
+# Base extension identification fields
+EXTENSION_ID_FIELD ?= "${DISTRO}"
+EXTENSION_VERSION_FIELD ?= "${DISTRO_VERSION}"
+
+sysext_image_add_version_identifier_file() {
+    # Use matching based on Distro name and version
+    echo 'ID=${EXTENSION_ID_FIELD}' > ${WORKDIR}/extension-release.base
+    # os-release.bb does "sanitise_value(ver)", which needs to be done here too
+    echo 'VERSION_ID=${EXTENSION_VERSION_FIELD}' \
+        | sed 's,+,-,g;s, ,_,g' \
+        >> ${WORKDIR}/extension-release.base
+
+    # Instruct `systemd-sysext` to perform re-load once extension image is verified
+    echo 'EXTENSION_RELOAD_MANAGER=1' >> ${WORKDIR}/extension-release.base
+
+    install -d ${IMAGE_ROOTFS}${nonarch_libdir}/extension-release.d
+    install -m 0644 ${WORKDIR}/extension-release.base \
+        ${IMAGE_ROOTFS}${nonarch_libdir}/extension-release.d/extension-release.${EXTENSION_NAME}
+
+    # systemd-sysext expects an extension-release file of the exact same name as the image;
+    # by setting a xattr we allow renaming of the extension image file.
+    # (Kernel: this requires xattr support in the used filesystem)
+    setfattr -n user.extension-release.strict -v false \
+        ${IMAGE_ROOTFS}${nonarch_libdir}/extension-release.d/extension-release.${EXTENSION_NAME}
+}
+
+ROOTFS_POSTPROCESS_COMMAND += "sysext_image_add_version_identifier_file"
+
+# remove 'os-release' from the packages to be installed into the image.
+# systemd-sysext otherwise raises the error:
+# Extension contains '/usr/lib/os-release', which is not allowed, refusing.
+PACKAGE_EXCLUDE += "os-release"
diff --git a/meta-oe/conf/include/non-repro-meta-oe.inc b/meta-oe/conf/include/non-repro-meta-oe.inc
deleted file mode 100755
index 7961d851f9..0000000000
--- a/meta-oe/conf/include/non-repro-meta-oe.inc
+++ /dev/null
@@ -1,107 +0,0 @@
-# List of known non-reproducible package of the meta-oe layer
-# Please keep this list sorted
-KNOWN_NON_REPRO_META_OE = " \
-    boinc-client-dev \
-    cjson-ptest \
-    cpuid-doc \
-    crash \
-    crash-dbg \
-    crash-src \
-    dhrystone \
-    dhrystone-dbg \
-    dhrystone-dev \
-    dhrystone-src \
-    directfb \
-    directfb-dbg \
-    doxygen-src \
-    editorconfig-core-c-dev \
-    etcd-cpp-apiv3-dev \
-    fbgrab-doc \
-    fluentbit-src \
-    fvwm-dbg \
-    fvwm-doc \
-    fvwm-extra \
-    gcab-src \
-    gosu \
-    gosu-dbg \
-    gosu-dev \
-    gosu-staticdev \
-    gphoto2 \
-    gphoto2-dbg \
-    hddtemp-locale-de \
-    hdf5 \
-    hdf5-dbg \
-    hdf5-src \
-    hdf5-staticdev \
-    hplip \
-    hplip-dbg \
-    jpnevulator-doc \
-    jsonrpc-dev \
-    kpatch-build \
-    kpatch-doc \
-    ldns \
-    libbotan-3-bin \
-    libbotan-3-dbg \
-    libbotan-3-dev \
-    libck-doc \
-    libdbus-cxx-dev \
-    libforms \
-    libiio-src \
-    libjcat-dbg \
-    libjcat-ptest \
-    libthrift-c-glib-zlib-src \
-    libvncserver-dev \
-    libwebsockets-testapps \
-    libwmf \
-    libyui-ncurses-dbg \
-    libyui-ncurses-dev \
-    lmbench-staticdev \
-    log4cpp \
-    lprng \
-    lprng-dbg \
-    lshw \
-    lshw-locale-fr \
-    mariadb-dbg \
-    mariadb-server \
-    mariadb-src \
-    mce-test \
-    mime-support-doc \
-    minifi-cpp \
-    minifi-cpp-dbg \
-    minifi-cpp-src \
-    mozjs-115-src \
-    mpv \
-    mpv-dbg \
-    nana \
-    nbench-byte \
-    nbench-byte-dbg \
-    nbench-byte-src \
-    nspr-staticdev \
-    openocd \
-    openocd-dbg \
-    pcp \
-    pcp-dev \
-    pcp-doc \
-    pcp-src \
-    perfetto \
-    perfetto-dbg \
-    php-phar \
-    pidgin \
-    pidgin-dbg \
-    pim435-staticdev \
-    postgresql-server-dev \
-    qcbor-staticdev \
-    sharutils \
-    sharutils-dbg \
-    smemstat-doc \
-    soci-dev \
-    thin-provisioning-tools-dev \
-    vulkan-cts \
-    vulkan-cts-dbg \
-    waylandpp-dev \
-    yasm-src \
-    zlog-staticdev \
-    zsh \
-    zsh-dbg \
-    zsh-src \
-"
diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
index eaa86c411b..d77b97d576 100644
--- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
+++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
@@ -7,9 +7,11 @@
 #
 # ptests which take less than ~30s each
 PTESTS_FAST_META_OE = "\
+    asio \
     cmocka \
     cunit \
     duktape \
+    fuse3 \
     function2 \
     fwupd \
     gcab \
@@ -17,27 +19,31 @@ PTESTS_FAST_META_OE = "\
     jq \
     leveldb \
     libcereal \
-    libee \
     libgpiod \
+    libjcat \
     libio-pty-perl \
     libmanette \
     librelp \
     libssh \
+    libteam \
     libtinyxml2 \
+    libtoml11 \
     libxml++-5.0 \
     libyang \
     lmdb \
     microsoft-gsl \
     minicoredumper \
+    minizip-ng \
     neon \
     nlohmann-json \
     nodejs \
     onig \
     oprofile \
+    pegtl \
     protobuf \
     pv \
-    python3-pefile \
     sdbus-c++ \
+    tomlplusplus \
     uthash \
     xmlsec1 \
     zeromq \
@@ -46,7 +52,7 @@ PTESTS_FAST_META_OE = "\
 PTESTS_FAST_META_OE:append:x86 = " mcelog"
 PTESTS_FAST_META_OE:append:x86-64 = " mcelog"
 
-PTESTS_FAST_META_OE:remove:libc-musl = "minicoredumper"
+PTESTS_FAST_META_OE:remove:libc-musl = "jemalloc minicoredumper oprofile"
 PTESTS_FAST_META_OE:remove:riscv64 = "nodejs oprofile"
 PTESTS_FAST_META_OE:remove:riscv32 = "nodejs oprofile"
 
@@ -54,20 +60,20 @@ PTESTS_SLOW_META_OE = "\
     c-ares \
     fftw \
     libusb-compat \
-    rsyslog \
-    mariadb \
-    poco \
+    rocksdb \
     re2 \
 "
 PTESTS_SLOW_META_OE:append:x86 = " kernel-selftest"
 PTESTS_SLOW_META_OE:append:x86-64 = " kernel-selftest"
 PTESTS_SLOW_META_OE:remove:libc-musl = "kernel-selftest"
 
-PTESTS_PROBLEMS_META_OE ="\
+PTESTS_PROBLEMS_META_OE = "\
     keyutils \
     libdbi-perl \
-    libjcat \
-    libteam \
+    mariadb \
     ostree \
+    poco \
     psqlodbc \
+    rsyslog \
 "
+PTESTS_PROBLEMS_META_OE:append:libc-musl = " jemalloc minicoredumper oprofile"
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index a254990ec5..5501e4315f 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -26,8 +26,12 @@ BBFILE_PRIORITY_openembedded-layer = "5"
 # only activates content when identified layers are present,
 # to ensure yocto compatibility check pass
 BBFILES_DYNAMIC += " \
+    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes-*/*/*.bb \
+    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes-*/*/*.bbappend \
     meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \
     meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bbappend \
+    multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/recipes-*/*/*.bb \
+    multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/recipes-*/*/*.bbappend \
     networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/recipes-*/*/*.bb \
     networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/recipes-*/*/*.bbappend \
     gnome-layer:${LAYERDIR}/dynamic-layers/gnome-layer/recipes-*/*/*.bb \
@@ -44,7 +48,7 @@ LAYERVERSION_openembedded-layer = "1"
 
 LAYERDEPENDS_openembedded-layer = "core"
 
-LAYERSERIES_COMPAT_openembedded-layer = "styhead"
+LAYERSERIES_COMPAT_openembedded-layer = "walnascar whinlatter"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
@@ -56,6 +60,7 @@ PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf"
 PREFERRED_PROVIDER_coreutils = "coreutils"
 PREFERRED_PROVIDER_virtual/opencl-icd ?= "opencl-icd-loader"
 PREFERRED_RPROVIDER_virtual-opencl-icd ?= "opencl-icd-loader"
+PREFERRED_RPROVIDER_virtual-redis ?= "redis"
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   fbset-modes \
@@ -118,3 +123,146 @@ NON_MULTILIB_RECIPES:append = " crash pahole libbpf"
 
 NON_MULTILIB_RECIPES:remove:x86 = "libbpf"
 NON_MULTILIB_RECIPES:remove:x86-64 = "libbpf"
+
+# List of known non-reproducible package of the meta-oe layer
+# Please keep this list sorted
+OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += " \
+    apitrace \
+    apitrace-dbg \
+    asio-dbg \
+    asio-ptest \
+    asio-src \
+    cpuid-doc \
+    dhrystone \
+    dhrystone-dbg \
+    dhrystone-dev \
+    dhrystone-src \
+    directfb \
+    directfb-dbg \
+    doxygen-src \
+    edid-decode \
+    edid-decode-dbg \
+    editorconfig-core-c-dev \
+    etcd-cpp-apiv3-dev \
+    evemu-tools-python \
+    fbgrab-doc \
+    fluentbit-src \
+    fsverity-utils-dbg \
+    fsverity-utils-staticdev \
+    fvwm-dbg \
+    fvwm-doc \
+    fvwm-extra \
+    fwupd-dbg \
+    fwupd-ptest \
+    gcab-src \
+    gosu \
+    gosu-dbg \
+    gosu-dev \
+    gosu-staticdev \
+    gphoto2 \
+    gphoto2-dbg \
+    hddtemp-locale-de \
+    hdf5 \
+    hdf5-dbg \
+    hdf5-src \
+    hdf5-staticdev \
+    hplip-dbg \
+    hplip-filter \
+    hplip-src \
+    iotop \
+    iotop-dbg \
+    ipmiutil \
+    ipmiutil-dbg \
+    ipmiutil-dev \
+    jpnevulator-doc \
+    jsonrpc-dev \
+    kpatch-build \
+    kpatch-doc \
+    ldns \
+    libass9 \
+    libass-dbg \
+    libbotan-3-7 \
+    libbotan-3-bin \
+    libbotan-3-dbg \
+    libbotan-3-dev \
+    libck-doc \
+    libdbus-cxx-dev \
+    libforms \
+    libfsverity0 \
+    libhugetlbfs-doc \
+    libiio-src \
+    libjcat-dbg \
+    libjcat-ptest \
+    librelp-dbg \
+    librelp-ptest \
+    libsdl2-compat \
+    libsdl2-compat-dbg \
+    libsource-highlight5 \
+    libsource-highlight-dbg \
+    libsource-highlight-dev \
+    libsource-highlight-src \
+    libthrift-c-glib-zlib-src \
+    libvncserver-dev \
+    libwebsockets-testapps \
+    libwmf \
+    libyui-ncurses-dbg \
+    libyui-ncurses-dev \
+    lmbench-staticdev \
+    log4cpp \
+    lprng \
+    lprng-dbg \
+    lshw \
+    lshw-locale-fr \
+    mariadb-dbg \
+    mariadb-server \
+    mariadb-src \
+    mce-test \
+    mime-support-doc \
+    minifi-cpp \
+    minifi-cpp-dbg \
+    minifi-cpp-src \
+    mpv \
+    mpv-dbg \
+    nana \
+    nbench-byte \
+    nbench-byte-dbg \
+    nbench-byte-src \
+    nspr-staticdev \
+    obconf-locale-es \
+    pcp \
+    pcp-dev \
+    pcp-doc \
+    pcp-src \
+    perfetto \
+    perfetto-dbg \
+    php-phar \
+    pidgin \
+    pidgin-dbg \
+    pim435-staticdev \
+    poco-ptest \
+    postgresql-server-dev \
+    qcbor-staticdev \
+    qperf-doc \
+    sharutils \
+    sharutils-dbg \
+    smemstat-doc \
+    soci-dev \
+    switchtec-user \
+    switchtec-user-dbg \
+    switchtec-user-staticdev \
+    thin-provisioning-tools-dev \
+    toybox-inittab \
+    toybox-inittab-dbg \
+    toybox-inittab-dev \
+    transmission-dbg \
+    transmission-gtk \
+    transmission-src \
+    vulkan-cts \
+    vulkan-cts-dbg \
+    waylandpp-dev \
+    yasm-src \
+    zlog-staticdev \
+    zsh \
+    zsh-dbg \
+    zsh-src \
+"
diff --git a/meta-oe/conf/version-check.conf b/meta-oe/conf/version-check.conf
new file mode 100644
index 0000000000..b41c9e8d22
--- /dev/null
+++ b/meta-oe/conf/version-check.conf
@@ -0,0 +1,37 @@
+INHERIT += "check-version-mismatch"
+# we need ps command to clean stale processes
+HOSTTOOLS += "ps"
+
+# Special cases that need to be handled.
+# % has the same meaning as in bbappend files, that is, match any chars.
+
+# oe-core
+CHECK_VERSION_PV:pn-rust-llvm = "${LLVM_RELEASE}"
+CHECK_VERSION_PV:pn-igt-gpu-tools = "${PV}-${PV}"
+CHECK_VERSION_PV:pn-vim = "${@'.'.join(d.getVar('PV').split('.')[:-1])}"
+CHECK_VERSION_PV:pn-vim-tiny = "${@'.'.join(d.getVar('PV').split('.')[:-1])}"
+CHECK_VERSION_PV:pn-ncurses = "${PV}.%"
+CHECK_VERSION_PV:pn-alsa-tools = "%"
+CHECK_VERSION_PV:pn-gst-examples = "%"
+CHECK_VERSION_PV:pn-piglit = "%"
+CHECK_VERSION_PV:pn-kernel-devsrc = "%"
+CHECK_VERSION_PV:pn-qemuwrapper-cross = "%"
+CHECK_VERSION_PV:pn-gnu-config = "%"
+CHECK_VERSION_PV:pn-sysvinit-inittab = "%"
+CHECK_VERSION_PV:pn-opkg-utils = "%"
+CHECK_VERSION_PV:pn-libedit = "${@d.getVar('PV').split('-')[1]}"
+
+# meta-oe
+CHECK_VERSION_PV:pn-iozone3 = "3.${PV}"
+CHECK_VERSION_PV:pn-can-utils = "%"
+CHECK_VERSION_PV:pn-luajit = "${PV}.%"
+CHECK_VERSION_PV:pn-sg3-utils = "%"
+CHECK_VERSION_PV:pn-netperf = "2.7.%"
+CHECK_VERSION_PV:pn-bridge-utils = "1.7%"
+CHECK_VERSION_PV:pn-turbostat = "2024.07.26"
+CHECK_VERSION_PV:pn-bpftool = "%"
+CHECK_VERSION_PV:pn-libhugetlbfs = "%"
+CHECK_VERSION_PV:pn-pps-tools = '%'
+CHECK_VERSION_PV:pn-libusb-compat = "0.1.12"
+CHECK_VERSION_PV:pn-jemalloc = "${@d.getVar('PV').split('+')[0]}%"
+CHECK_VERSION_PV:pn-dialog = "${@d.getVar('PV').split('-')[0]}%"
diff --git a/meta-oe/dynamic-layers/clang-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-oe/dynamic-layers/clang-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
new file mode 100755
index 0000000000..d3fc8d3254
--- /dev/null
+++ b/meta-oe/dynamic-layers/clang-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
@@ -0,0 +1,3 @@
+RDEPENDS:packagegroup-meta-oe-support += " \
+    thin-provisioning-tools \
+"
diff --git a/meta-oe/dynamic-layers/clang-layer/recipes-devtools/spdm-utils/spdm-utils-crates.inc b/meta-oe/dynamic-layers/clang-layer/recipes-devtools/spdm-utils/spdm-utils-crates.inc
new file mode 100644
index 0000000000..7a2aae9be7
--- /dev/null
+++ b/meta-oe/dynamic-layers/clang-layer/recipes-devtools/spdm-utils/spdm-utils-crates.inc
@@ -0,0 +1,558 @@
+# Autogenerated with 'bitbake -c update_crates spdm-utils'
+
+# from Cargo.lock
+SRC_URI += " \
+    crate://crates.io/aho-corasick/1.1.3 \
+    crate://crates.io/anstream/0.6.18 \
+    crate://crates.io/anstyle/1.0.10 \
+    crate://crates.io/anstyle-parse/0.2.6 \
+    crate://crates.io/anstyle-query/1.1.2 \
+    crate://crates.io/anstyle-wincon/3.0.7 \
+    crate://crates.io/asn1-rs/0.5.2 \
+    crate://crates.io/asn1-rs/0.6.2 \
+    crate://crates.io/asn1-rs-derive/0.4.0 \
+    crate://crates.io/asn1-rs-derive/0.5.1 \
+    crate://crates.io/asn1-rs-impl/0.1.0 \
+    crate://crates.io/asn1-rs-impl/0.2.0 \
+    crate://crates.io/async-attributes/1.1.2 \
+    crate://crates.io/async-channel/1.9.0 \
+    crate://crates.io/async-channel/2.3.1 \
+    crate://crates.io/async-executor/1.13.1 \
+    crate://crates.io/async-global-executor/2.4.1 \
+    crate://crates.io/async-io/2.4.0 \
+    crate://crates.io/async-lock/3.4.0 \
+    crate://crates.io/async-std/1.13.0 \
+    crate://crates.io/async-task/4.7.1 \
+    crate://crates.io/atomic-waker/1.1.2 \
+    crate://crates.io/autocfg/1.4.0 \
+    crate://crates.io/bindgen/0.71.1 \
+    crate://crates.io/bitfield/0.14.0 \
+    crate://crates.io/bitflags/1.3.2 \
+    crate://crates.io/bitflags/2.8.0 \
+    crate://crates.io/block-buffer/0.10.4 \
+    crate://crates.io/blocking/1.6.1 \
+    crate://crates.io/bumpalo/3.16.0 \
+    crate://crates.io/cexpr/0.6.0 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/cfg_aliases/0.2.1 \
+    crate://crates.io/clang-sys/1.8.1 \
+    crate://crates.io/clap/4.5.27 \
+    crate://crates.io/clap_builder/4.5.27 \
+    crate://crates.io/clap_derive/4.5.24 \
+    crate://crates.io/clap_lex/0.7.4 \
+    crate://crates.io/colorchoice/1.0.3 \
+    crate://crates.io/colored/2.2.0 \
+    crate://crates.io/concurrent-queue/2.5.0 \
+    crate://crates.io/core-foundation/0.10.0 \
+    crate://crates.io/core-foundation-sys/0.8.7 \
+    crate://crates.io/cpufeatures/0.2.17 \
+    crate://crates.io/crossbeam-utils/0.8.21 \
+    crate://crates.io/crunchy/0.2.3 \
+    crate://crates.io/crypto-common/0.1.6 \
+    crate://crates.io/data-encoding/2.7.0 \
+    crate://crates.io/der-parser/8.2.0 \
+    crate://crates.io/deranged/0.3.11 \
+    crate://crates.io/digest/0.10.7 \
+    crate://crates.io/displaydoc/0.2.5 \
+    crate://crates.io/either/1.13.0 \
+    crate://crates.io/embedded-crc-macros/1.0.0 \
+    crate://crates.io/env_logger/0.10.2 \
+    crate://crates.io/errno/0.3.10 \
+    crate://crates.io/event-listener/2.5.3 \
+    crate://crates.io/event-listener/5.4.0 \
+    crate://crates.io/event-listener-strategy/0.5.3 \
+    crate://crates.io/fastrand/2.3.0 \
+    crate://crates.io/futures/0.3.31 \
+    crate://crates.io/futures-channel/0.3.31 \
+    crate://crates.io/futures-core/0.3.31 \
+    crate://crates.io/futures-executor/0.3.31 \
+    crate://crates.io/futures-io/0.3.31 \
+    crate://crates.io/futures-lite/2.6.0 \
+    crate://crates.io/futures-macro/0.3.31 \
+    crate://crates.io/futures-sink/0.3.31 \
+    crate://crates.io/futures-task/0.3.31 \
+    crate://crates.io/futures-util/0.3.31 \
+    crate://crates.io/generic-array/0.14.7 \
+    crate://crates.io/glob/0.3.2 \
+    crate://crates.io/gloo-timers/0.3.0 \
+    crate://crates.io/half/2.4.1 \
+    crate://crates.io/heck/0.5.0 \
+    crate://crates.io/hermit-abi/0.4.0 \
+    crate://crates.io/home/0.5.11 \
+    crate://crates.io/humantime/2.1.0 \
+    crate://crates.io/io-kit-sys/0.4.1 \
+    crate://crates.io/is-terminal/0.4.15 \
+    crate://crates.io/is_terminal_polyfill/1.70.1 \
+    crate://crates.io/itertools/0.13.0 \
+    crate://crates.io/itoa/1.0.14 \
+    crate://crates.io/js-sys/0.3.77 \
+    crate://crates.io/kv-log-macro/1.0.7 \
+    crate://crates.io/lazy_static/1.5.0 \
+    crate://crates.io/libc/0.2.169 \
+    crate://crates.io/libloading/0.8.6 \
+    crate://crates.io/libmctp/0.2.0 \
+    crate://crates.io/libudev/0.3.0 \
+    crate://crates.io/libudev-sys/0.1.4 \
+    crate://crates.io/linux-raw-sys/0.4.15 \
+    crate://crates.io/log/0.4.25 \
+    crate://crates.io/mach2/0.4.2 \
+    crate://crates.io/memchr/2.7.4 \
+    crate://crates.io/memmap2/0.5.10 \
+    crate://crates.io/minicbor/0.25.1 \
+    crate://crates.io/minicbor-derive/0.15.3 \
+    crate://crates.io/minimal-lexical/0.2.1 \
+    crate://crates.io/nix/0.26.4 \
+    crate://crates.io/nix/0.29.0 \
+    crate://crates.io/nom/7.1.3 \
+    crate://crates.io/num-bigint/0.4.6 \
+    crate://crates.io/num-conv/0.1.0 \
+    crate://crates.io/num-integer/0.1.46 \
+    crate://crates.io/num-traits/0.2.19 \
+    crate://crates.io/oid-registry/0.6.1 \
+    crate://crates.io/once_cell/1.20.2 \
+    crate://crates.io/parking/2.2.1 \
+    crate://crates.io/pin-project-lite/0.2.16 \
+    crate://crates.io/pin-utils/0.1.0 \
+    crate://crates.io/piper/0.2.4 \
+    crate://crates.io/pkg-config/0.3.31 \
+    crate://crates.io/polling/3.7.4 \
+    crate://crates.io/powerfmt/0.2.0 \
+    crate://crates.io/prettyplease/0.2.29 \
+    crate://crates.io/proc-macro2/1.0.93 \
+    crate://crates.io/quote/1.0.38 \
+    crate://crates.io/regex/1.11.1 \
+    crate://crates.io/regex-automata/0.4.9 \
+    crate://crates.io/regex-syntax/0.8.5 \
+    crate://crates.io/rustc-hash/2.1.0 \
+    crate://crates.io/rusticata-macros/4.1.0 \
+    crate://crates.io/rustix/0.38.44 \
+    crate://crates.io/rustversion/1.0.19 \
+    crate://crates.io/scopeguard/1.2.0 \
+    crate://crates.io/serde/1.0.217 \
+    crate://crates.io/serde_derive/1.0.217 \
+    crate://crates.io/serialport/4.7.0 \
+    crate://crates.io/sha2/0.10.8 \
+    crate://crates.io/shlex/1.3.0 \
+    crate://crates.io/slab/0.4.9 \
+    crate://crates.io/smbus-pec/1.0.1 \
+    crate://crates.io/strsim/0.11.1 \
+    crate://crates.io/syn/1.0.109 \
+    crate://crates.io/syn/2.0.96 \
+    crate://crates.io/synstructure/0.12.6 \
+    crate://crates.io/synstructure/0.13.1 \
+    crate://crates.io/termcolor/1.4.1 \
+    crate://crates.io/thiserror/1.0.69 \
+    crate://crates.io/thiserror-impl/1.0.69 \
+    crate://crates.io/time/0.3.37 \
+    crate://crates.io/time-core/0.1.2 \
+    crate://crates.io/time-macros/0.2.19 \
+    crate://crates.io/tracing/0.1.41 \
+    crate://crates.io/tracing-core/0.1.33 \
+    crate://crates.io/typenum/1.17.0 \
+    crate://crates.io/unescaper/0.1.5 \
+    crate://crates.io/unicode-ident/1.0.15 \
+    crate://crates.io/unicode-xid/0.2.6 \
+    crate://crates.io/utf8parse/0.2.2 \
+    crate://crates.io/value-bag/1.10.0 \
+    crate://crates.io/version_check/0.9.5 \
+    crate://crates.io/wasm-bindgen/0.2.100 \
+    crate://crates.io/wasm-bindgen-backend/0.2.100 \
+    crate://crates.io/wasm-bindgen-futures/0.4.50 \
+    crate://crates.io/wasm-bindgen-macro/0.2.100 \
+    crate://crates.io/wasm-bindgen-macro-support/0.2.100 \
+    crate://crates.io/wasm-bindgen-shared/0.2.100 \
+    crate://crates.io/web-sys/0.3.77 \
+    crate://crates.io/which/6.0.3 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.9 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/windows-sys/0.59.0 \
+    crate://crates.io/windows-targets/0.52.6 \
+    crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
+    crate://crates.io/windows_aarch64_msvc/0.52.6 \
+    crate://crates.io/windows_i686_gnu/0.52.6 \
+    crate://crates.io/windows_i686_gnullvm/0.52.6 \
+    crate://crates.io/windows_i686_msvc/0.52.6 \
+    crate://crates.io/windows_x86_64_gnu/0.52.6 \
+    crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
+    crate://crates.io/windows_x86_64_msvc/0.52.6 \
+    crate://crates.io/winsafe/0.0.19 \
+    crate://crates.io/x509-parser/0.15.1 \
+"
+
+SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+SRC_URI[anstream-0.6.18.sha256sum] = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+SRC_URI[anstyle-1.0.10.sha256sum] = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+SRC_URI[anstyle-parse-0.2.6.sha256sum] = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+SRC_URI[anstyle-query-1.1.2.sha256sum] = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+SRC_URI[anstyle-wincon-3.0.7.sha256sum] = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+SRC_URI[asn1-rs-0.5.2.sha256sum] = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
+SRC_URI[asn1-rs-0.6.2.sha256sum] = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048"
+SRC_URI[asn1-rs-derive-0.4.0.sha256sum] = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
+SRC_URI[asn1-rs-derive-0.5.1.sha256sum] = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
+SRC_URI[asn1-rs-impl-0.1.0.sha256sum] = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
+SRC_URI[asn1-rs-impl-0.2.0.sha256sum] = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
+SRC_URI[async-attributes-1.1.2.sha256sum] = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
+SRC_URI[async-channel-1.9.0.sha256sum] = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+SRC_URI[async-channel-2.3.1.sha256sum] = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+SRC_URI[async-executor-1.13.1.sha256sum] = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
+SRC_URI[async-global-executor-2.4.1.sha256sum] = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+SRC_URI[async-io-2.4.0.sha256sum] = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
+SRC_URI[async-lock-3.4.0.sha256sum] = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+SRC_URI[async-std-1.13.0.sha256sum] = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615"
+SRC_URI[async-task-4.7.1.sha256sum] = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+SRC_URI[atomic-waker-1.1.2.sha256sum] = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+SRC_URI[autocfg-1.4.0.sha256sum] = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+SRC_URI[bindgen-0.71.1.sha256sum] = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
+SRC_URI[bitfield-0.14.0.sha256sum] = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
+SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+SRC_URI[bitflags-2.8.0.sha256sum] = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+SRC_URI[blocking-1.6.1.sha256sum] = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+SRC_URI[bumpalo-3.16.0.sha256sum] = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+SRC_URI[clang-sys-1.8.1.sha256sum] = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+SRC_URI[clap-4.5.27.sha256sum] = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796"
+SRC_URI[clap_builder-4.5.27.sha256sum] = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7"
+SRC_URI[clap_derive-4.5.24.sha256sum] = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
+SRC_URI[clap_lex-0.7.4.sha256sum] = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+SRC_URI[colorchoice-1.0.3.sha256sum] = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+SRC_URI[colored-2.2.0.sha256sum] = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
+SRC_URI[concurrent-queue-2.5.0.sha256sum] = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+SRC_URI[core-foundation-0.10.0.sha256sum] = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+SRC_URI[crunchy-0.2.3.sha256sum] = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+SRC_URI[data-encoding-2.7.0.sha256sum] = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
+SRC_URI[der-parser-8.2.0.sha256sum] = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
+SRC_URI[deranged-0.3.11.sha256sum] = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+SRC_URI[either-1.13.0.sha256sum] = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+SRC_URI[embedded-crc-macros-1.0.0.sha256sum] = "4f1c75747a43b086df1a87fb2a889590bc0725e0abf54bba6d0c4bf7bd9e762c"
+SRC_URI[env_logger-0.10.2.sha256sum] = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+SRC_URI[errno-0.3.10.sha256sum] = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+SRC_URI[event-listener-2.5.3.sha256sum] = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+SRC_URI[event-listener-5.4.0.sha256sum] = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
+SRC_URI[event-listener-strategy-0.5.3.sha256sum] = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
+SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+SRC_URI[futures-0.3.31.sha256sum] = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+SRC_URI[futures-channel-0.3.31.sha256sum] = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+SRC_URI[futures-core-0.3.31.sha256sum] = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+SRC_URI[futures-executor-0.3.31.sha256sum] = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+SRC_URI[futures-io-0.3.31.sha256sum] = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+SRC_URI[futures-lite-2.6.0.sha256sum] = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
+SRC_URI[futures-macro-0.3.31.sha256sum] = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+SRC_URI[futures-sink-0.3.31.sha256sum] = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+SRC_URI[futures-task-0.3.31.sha256sum] = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+SRC_URI[futures-util-0.3.31.sha256sum] = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+SRC_URI[glob-0.3.2.sha256sum] = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+SRC_URI[gloo-timers-0.3.0.sha256sum] = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+SRC_URI[half-2.4.1.sha256sum] = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+SRC_URI[hermit-abi-0.4.0.sha256sum] = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+SRC_URI[home-0.5.11.sha256sum] = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+SRC_URI[humantime-2.1.0.sha256sum] = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+SRC_URI[io-kit-sys-0.4.1.sha256sum] = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b"
+SRC_URI[is-terminal-0.4.15.sha256sum] = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37"
+SRC_URI[is_terminal_polyfill-1.70.1.sha256sum] = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+SRC_URI[itoa-1.0.14.sha256sum] = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+SRC_URI[js-sys-0.3.77.sha256sum] = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+SRC_URI[kv-log-macro-1.0.7.sha256sum] = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+SRC_URI[libc-0.2.169.sha256sum] = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+SRC_URI[libloading-0.8.6.sha256sum] = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+SRC_URI[libmctp-0.2.0.sha256sum] = "0d077261b65cfe16a3d490243354fbaec3f22e5bcad546d21394105ab836d1d0"
+SRC_URI[libudev-0.3.0.sha256sum] = "78b324152da65df7bb95acfcaab55e3097ceaab02fb19b228a9eb74d55f135e0"
+SRC_URI[libudev-sys-0.1.4.sha256sum] = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
+SRC_URI[linux-raw-sys-0.4.15.sha256sum] = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+SRC_URI[log-0.4.25.sha256sum] = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+SRC_URI[mach2-0.4.2.sha256sum] = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
+SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+SRC_URI[memmap2-0.5.10.sha256sum] = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+SRC_URI[minicbor-0.25.1.sha256sum] = "c0452a60c1863c1f50b5f77cd295e8d2786849f35883f0b9e18e7e6e1b5691b0"
+SRC_URI[minicbor-derive-0.15.3.sha256sum] = "bd2209fff77f705b00c737016a48e73733d7fbccb8b007194db148f03561fb70"
+SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+SRC_URI[nix-0.26.4.sha256sum] = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+SRC_URI[nix-0.29.0.sha256sum] = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+SRC_URI[num-conv-0.1.0.sha256sum] = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+SRC_URI[oid-registry-0.6.1.sha256sum] = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
+SRC_URI[once_cell-1.20.2.sha256sum] = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+SRC_URI[parking-2.2.1.sha256sum] = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+SRC_URI[pin-project-lite-0.2.16.sha256sum] = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+SRC_URI[piper-0.2.4.sha256sum] = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+SRC_URI[pkg-config-0.3.31.sha256sum] = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+SRC_URI[polling-3.7.4.sha256sum] = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
+SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+SRC_URI[prettyplease-0.2.29.sha256sum] = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac"
+SRC_URI[proc-macro2-1.0.93.sha256sum] = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+SRC_URI[quote-1.0.38.sha256sum] = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+SRC_URI[regex-automata-0.4.9.sha256sum] = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+SRC_URI[rustc-hash-2.1.0.sha256sum] = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+SRC_URI[rusticata-macros-4.1.0.sha256sum] = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
+SRC_URI[rustix-0.38.44.sha256sum] = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+SRC_URI[rustversion-1.0.19.sha256sum] = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+SRC_URI[serde-1.0.217.sha256sum] = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+SRC_URI[serde_derive-1.0.217.sha256sum] = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+SRC_URI[serialport-4.7.0.sha256sum] = "5ecfc4858c2266c7695d8b8460bbd612fa81bd2e250f5f0dd16195e4b4f8b3d8"
+SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+SRC_URI[slab-0.4.9.sha256sum] = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+SRC_URI[smbus-pec-1.0.1.sha256sum] = "ca0763a680cd5d72b28f7bfc8a054c117d8841380a6ad4f72f05bd2a34217d3e"
+SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+SRC_URI[syn-2.0.96.sha256sum] = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+SRC_URI[synstructure-0.12.6.sha256sum] = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+SRC_URI[synstructure-0.13.1.sha256sum] = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+SRC_URI[termcolor-1.4.1.sha256sum] = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+SRC_URI[thiserror-1.0.69.sha256sum] = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+SRC_URI[thiserror-impl-1.0.69.sha256sum] = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+SRC_URI[time-0.3.37.sha256sum] = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+SRC_URI[time-core-0.1.2.sha256sum] = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+SRC_URI[time-macros-0.2.19.sha256sum] = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+SRC_URI[tracing-0.1.41.sha256sum] = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+SRC_URI[tracing-core-0.1.33.sha256sum] = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+SRC_URI[typenum-1.17.0.sha256sum] = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+SRC_URI[unescaper-0.1.5.sha256sum] = "c878a167baa8afd137494101a688ef8c67125089ff2249284bd2b5f9bfedb815"
+SRC_URI[unicode-ident-1.0.15.sha256sum] = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243"
+SRC_URI[unicode-xid-0.2.6.sha256sum] = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+SRC_URI[value-bag-1.10.0.sha256sum] = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
+SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+SRC_URI[wasm-bindgen-0.2.100.sha256sum] = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+SRC_URI[wasm-bindgen-backend-0.2.100.sha256sum] = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+SRC_URI[wasm-bindgen-futures-0.4.50.sha256sum] = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+SRC_URI[wasm-bindgen-macro-0.2.100.sha256sum] = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+SRC_URI[wasm-bindgen-macro-support-0.2.100.sha256sum] = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+SRC_URI[wasm-bindgen-shared-0.2.100.sha256sum] = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+SRC_URI[web-sys-0.3.77.sha256sum] = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+SRC_URI[which-6.0.3.sha256sum] = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
+SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+SRC_URI[winapi-util-0.1.9.sha256sum] = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+SRC_URI[winsafe-0.0.19.sha256sum] = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
+SRC_URI[x509-parser-0.15.1.sha256sum] = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da"
+# from tock-responder/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/aho-corasick/1.1.3 \
+    crate://crates.io/atty/0.2.14 \
+    crate://crates.io/autocfg/1.4.0 \
+    crate://crates.io/bindgen/0.71.1 \
+    crate://crates.io/bitfield/0.14.0 \
+    crate://crates.io/bitflags/1.3.2 \
+    crate://crates.io/bitflags/2.8.0 \
+    crate://crates.io/byteorder/0.5.3 \
+    crate://crates.io/cexpr/0.6.0 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/clang-sys/1.8.1 \
+    crate://crates.io/clap/3.2.25 \
+    crate://crates.io/clap_derive/3.2.25 \
+    crate://crates.io/clap_lex/0.2.4 \
+    crate://crates.io/critical-section/1.2.0 \
+    crate://crates.io/either/1.13.0 \
+    crate://crates.io/elf/0.0.10 \
+    crate://crates.io/embedded-alloc/0.5.1 \
+    crate://crates.io/embedded-crc-macros/1.0.0 \
+    crate://crates.io/errno/0.3.10 \
+    crate://crates.io/glob/0.3.2 \
+    crate://crates.io/hashbrown/0.12.3 \
+    crate://crates.io/heck/0.4.1 \
+    crate://crates.io/hermit-abi/0.1.19 \
+    crate://crates.io/home/0.5.11 \
+    crate://crates.io/indexmap/1.9.3 \
+    crate://crates.io/itertools/0.13.0 \
+    crate://crates.io/libc/0.2.169 \
+    crate://crates.io/libloading/0.8.6 \
+    crate://crates.io/libm/0.2.11 \
+    crate://crates.io/libmctp/0.2.0 \
+    crate://crates.io/linked_list_allocator/0.10.5 \
+    crate://crates.io/linux-raw-sys/0.4.15 \
+    crate://crates.io/log/0.4.25 \
+    crate://crates.io/memchr/2.7.4 \
+    crate://crates.io/minimal-lexical/0.2.1 \
+    crate://crates.io/nom/7.1.3 \
+    crate://crates.io/numtoa/0.1.0 \
+    crate://crates.io/once_cell/1.20.2 \
+    crate://crates.io/os_str_bytes/6.6.1 \
+    crate://crates.io/portable-atomic/1.10.0 \
+    crate://crates.io/prettyplease/0.2.29 \
+    crate://crates.io/proc-macro-error/1.0.4 \
+    crate://crates.io/proc-macro-error-attr/1.0.4 \
+    crate://crates.io/proc-macro2/1.0.93 \
+    crate://crates.io/quote/1.0.38 \
+    crate://crates.io/redox_syscall/0.2.16 \
+    crate://crates.io/redox_termios/0.1.3 \
+    crate://crates.io/regex/1.11.1 \
+    crate://crates.io/regex-automata/0.4.9 \
+    crate://crates.io/regex-syntax/0.8.5 \
+    crate://crates.io/rustc-hash/2.1.0 \
+    crate://crates.io/rustix/0.38.44 \
+    crate://crates.io/shlex/1.3.0 \
+    crate://crates.io/smbus-pec/1.0.1 \
+    crate://crates.io/strsim/0.10.0 \
+    crate://crates.io/syn/1.0.109 \
+    crate://crates.io/syn/2.0.96 \
+    crate://crates.io/termcolor/1.4.1 \
+    crate://crates.io/termion/1.5.6 \
+    crate://crates.io/textwrap/0.16.1 \
+    crate://crates.io/unicode-ident/1.0.15 \
+    crate://crates.io/version_check/0.9.5 \
+    crate://crates.io/which/6.0.3 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.9 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/windows-sys/0.59.0 \
+    crate://crates.io/windows-targets/0.52.6 \
+    crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
+    crate://crates.io/windows_aarch64_msvc/0.52.6 \
+    crate://crates.io/windows_i686_gnu/0.52.6 \
+    crate://crates.io/windows_i686_gnullvm/0.52.6 \
+    crate://crates.io/windows_i686_msvc/0.52.6 \
+    crate://crates.io/windows_x86_64_gnu/0.52.6 \
+    crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
+    crate://crates.io/windows_x86_64_msvc/0.52.6 \
+    crate://crates.io/winsafe/0.0.19 \
+"
+
+SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+SRC_URI[autocfg-1.4.0.sha256sum] = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+SRC_URI[bindgen-0.71.1.sha256sum] = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
+SRC_URI[bitfield-0.14.0.sha256sum] = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
+SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+SRC_URI[bitflags-2.8.0.sha256sum] = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+SRC_URI[byteorder-0.5.3.sha256sum] = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
+SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[clang-sys-1.8.1.sha256sum] = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+SRC_URI[clap-3.2.25.sha256sum] = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+SRC_URI[clap_derive-3.2.25.sha256sum] = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
+SRC_URI[clap_lex-0.2.4.sha256sum] = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+SRC_URI[critical-section-1.2.0.sha256sum] = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
+SRC_URI[either-1.13.0.sha256sum] = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+SRC_URI[elf-0.0.10.sha256sum] = "4841de15dbe0e49b9b62a417589299e3be0d557e0900d36acb87e6dae47197f5"
+SRC_URI[embedded-alloc-0.5.1.sha256sum] = "ddae17915accbac2cfbc64ea0ae6e3b330e6ea124ba108dada63646fd3c6f815"
+SRC_URI[embedded-crc-macros-1.0.0.sha256sum] = "4f1c75747a43b086df1a87fb2a889590bc0725e0abf54bba6d0c4bf7bd9e762c"
+SRC_URI[errno-0.3.10.sha256sum] = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+SRC_URI[glob-0.3.2.sha256sum] = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+SRC_URI[home-0.5.11.sha256sum] = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+SRC_URI[libc-0.2.169.sha256sum] = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+SRC_URI[libloading-0.8.6.sha256sum] = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+SRC_URI[libm-0.2.11.sha256sum] = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+SRC_URI[libmctp-0.2.0.sha256sum] = "0d077261b65cfe16a3d490243354fbaec3f22e5bcad546d21394105ab836d1d0"
+SRC_URI[linked_list_allocator-0.10.5.sha256sum] = "9afa463f5405ee81cdb9cc2baf37e08ec7e4c8209442b5d72c04cfb2cd6e6286"
+SRC_URI[linux-raw-sys-0.4.15.sha256sum] = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+SRC_URI[log-0.4.25.sha256sum] = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
+SRC_URI[once_cell-1.20.2.sha256sum] = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+SRC_URI[os_str_bytes-6.6.1.sha256sum] = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
+SRC_URI[portable-atomic-1.10.0.sha256sum] = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+SRC_URI[prettyplease-0.2.29.sha256sum] = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac"
+SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+SRC_URI[proc-macro2-1.0.93.sha256sum] = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+SRC_URI[quote-1.0.38.sha256sum] = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+SRC_URI[redox_termios-0.1.3.sha256sum] = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb"
+SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+SRC_URI[regex-automata-0.4.9.sha256sum] = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+SRC_URI[rustc-hash-2.1.0.sha256sum] = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+SRC_URI[rustix-0.38.44.sha256sum] = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+SRC_URI[smbus-pec-1.0.1.sha256sum] = "ca0763a680cd5d72b28f7bfc8a054c117d8841380a6ad4f72f05bd2a34217d3e"
+SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+SRC_URI[syn-2.0.96.sha256sum] = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+SRC_URI[termcolor-1.4.1.sha256sum] = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e"
+SRC_URI[textwrap-0.16.1.sha256sum] = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+SRC_URI[unicode-ident-1.0.15.sha256sum] = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243"
+SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+SRC_URI[which-6.0.3.sha256sum] = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
+SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+SRC_URI[winapi-util-0.1.9.sha256sum] = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+SRC_URI[winsafe-0.0.19.sha256sum] = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
+SRC_URI[clap-4.5.26.sha256sum] = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
+SRC_URI[clap_builder-4.5.26.sha256sum] = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
+SRC_URI[cpufeatures-0.2.16.sha256sum] = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
+SRC_URI[crunchy-0.2.2.sha256sum] = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+SRC_URI[is-terminal-0.4.13.sha256sum] = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
+SRC_URI[rustix-0.38.43.sha256sum] = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
+SRC_URI[unicode-ident-1.0.14.sha256sum] = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+SRC_URI[bindgen-0.63.0.sha256sum] = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
+SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+SRC_URI[critical-section-1.1.2.sha256sum] = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
+SRC_URI[errno-0.3.9.sha256sum] = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+SRC_URI[home-0.5.9.sha256sum] = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+SRC_URI[libloading-0.8.5.sha256sum] = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+SRC_URI[libm-0.2.8.sha256sum] = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+SRC_URI[linux-raw-sys-0.4.14.sha256sum] = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+SRC_URI[log-0.4.22.sha256sum] = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+SRC_URI[peeking_take_while-0.1.2.sha256sum] = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+SRC_URI[portable-atomic-1.7.0.sha256sum] = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+SRC_URI[regex-1.10.5.sha256sum] = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+SRC_URI[regex-automata-0.4.7.sha256sum] = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+SRC_URI[regex-syntax-0.8.4.sha256sum] = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+SRC_URI[rustix-0.38.34.sha256sum] = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+SRC_URI[which-4.4.2.sha256sum] = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+SRC_URI[which-6.0.2.sha256sum] = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075"
+SRC_URI[winapi-util-0.1.8.sha256sum] = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
diff --git a/meta-oe/dynamic-layers/clang-layer/recipes-devtools/spdm-utils/spdm-utils_0.7.2.bb b/meta-oe/dynamic-layers/clang-layer/recipes-devtools/spdm-utils/spdm-utils_0.7.2.bb
new file mode 100644
index 0000000000..ba6ad09098
--- /dev/null
+++ b/meta-oe/dynamic-layers/clang-layer/recipes-devtools/spdm-utils/spdm-utils_0.7.2.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Linux applications to manage, test and develop devices supporting DMTF Security Protocol and Data Model (SPDM) "
+HOMEPAGE = "https://github.com/westerndigitalcorporation/spdm-utils"
+LICENSE = "Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = "\
+    file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \
+    file://LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \
+    "
+
+inherit cargo cargo-update-recipe-crates pkgconfig
+
+export BINDGEN_EXTRA_CLANG_ARGS
+BINDGEN_EXTRA_CLANG_ARGS = "--sysroot=${STAGING_DIR_HOST} -I${STAGING_INCDIR}"
+
+SRC_URI += "git://github.com/westerndigitalcorporation/spdm-utils.git;protocol=https;branch=master"
+
+include spdm-utils-crates.inc
+
+SRCREV = "f67ac9e00b79f603ecbbd29928a4ecc3dec5abd5"
+
+# bindgen-cli comes from meta-clang and depends on libclang
+DEPENDS += "libspdm udev bindgen-cli-native pciutils"
+
+COMPATIBLE_HOST:riscv32 = "null"
+COMPATIBLE_HOST:mipsarcho32 = "null"
diff --git a/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc b/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc
new file mode 100644
index 0000000000..e06fc31905
--- /dev/null
+++ b/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc
@@ -0,0 +1,282 @@
+# Autogenerated with 'bitbake -c update_crates thin-provisioning-tools'
+
+# from Cargo.lock
+SRC_URI += " \
+    crate://crates.io/adler/1.0.2 \
+    crate://crates.io/aho-corasick/1.1.3 \
+    crate://crates.io/anstream/0.6.15 \
+    crate://crates.io/anstyle/1.0.8 \
+    crate://crates.io/anstyle-parse/0.2.5 \
+    crate://crates.io/anstyle-query/1.1.1 \
+    crate://crates.io/anstyle-wincon/3.0.4 \
+    crate://crates.io/anyhow/1.0.86 \
+    crate://crates.io/atty/0.2.14 \
+    crate://crates.io/autocfg/1.3.0 \
+    crate://crates.io/base64/0.22.1 \
+    crate://crates.io/bindgen/0.69.4 \
+    crate://crates.io/bitflags/1.3.2 \
+    crate://crates.io/bitflags/2.6.0 \
+    crate://crates.io/bytemuck/1.16.3 \
+    crate://crates.io/byteorder/1.5.0 \
+    crate://crates.io/cassowary/0.3.0 \
+    crate://crates.io/cexpr/0.6.0 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/cfg_aliases/0.2.1 \
+    crate://crates.io/clang-sys/1.8.1 \
+    crate://crates.io/clap/4.5.13 \
+    crate://crates.io/clap_builder/4.5.13 \
+    crate://crates.io/clap_lex/0.7.2 \
+    crate://crates.io/colorchoice/1.0.2 \
+    crate://crates.io/console/0.15.8 \
+    crate://crates.io/crc32c/0.6.8 \
+    crate://crates.io/crc32fast/1.4.2 \
+    crate://crates.io/data-encoding/2.6.0 \
+    crate://crates.io/devicemapper/0.34.3 \
+    crate://crates.io/devicemapper-sys/0.3.0 \
+    crate://crates.io/downcast/0.11.0 \
+    crate://crates.io/duct/0.13.7 \
+    crate://crates.io/either/1.13.0 \
+    crate://crates.io/encode_unicode/0.3.6 \
+    crate://crates.io/env_filter/0.1.2 \
+    crate://crates.io/env_logger/0.8.4 \
+    crate://crates.io/env_logger/0.11.5 \
+    crate://crates.io/errno/0.3.9 \
+    crate://crates.io/exitcode/1.1.2 \
+    crate://crates.io/fastrand/2.1.0 \
+    crate://crates.io/fixedbitset/0.4.2 \
+    crate://crates.io/flate2/1.0.31 \
+    crate://crates.io/fragile/2.0.0 \
+    crate://crates.io/getrandom/0.2.15 \
+    crate://crates.io/glob/0.3.1 \
+    crate://crates.io/hermit-abi/0.1.19 \
+    crate://crates.io/hermit-abi/0.3.9 \
+    crate://crates.io/humantime/2.1.0 \
+    crate://crates.io/indicatif/0.17.8 \
+    crate://crates.io/instant/0.1.13 \
+    crate://crates.io/iovec/0.1.4 \
+    crate://crates.io/is_terminal_polyfill/1.70.1 \
+    crate://crates.io/itertools/0.12.1 \
+    crate://crates.io/lazy_static/1.5.0 \
+    crate://crates.io/lazycell/1.3.0 \
+    crate://crates.io/libc/0.2.155 \
+    crate://crates.io/libloading/0.8.5 \
+    crate://crates.io/libudev-sys/0.1.4 \
+    crate://crates.io/linux-raw-sys/0.4.14 \
+    crate://crates.io/log/0.4.22 \
+    crate://crates.io/memchr/2.7.4 \
+    crate://crates.io/minimal-lexical/0.2.1 \
+    crate://crates.io/miniz_oxide/0.7.4 \
+    crate://crates.io/mockall/0.13.0 \
+    crate://crates.io/mockall_derive/0.13.0 \
+    crate://crates.io/nix/0.29.0 \
+    crate://crates.io/nom/7.1.3 \
+    crate://crates.io/num-derive/0.4.2 \
+    crate://crates.io/num-traits/0.2.19 \
+    crate://crates.io/num_cpus/1.16.0 \
+    crate://crates.io/number_prefix/0.4.0 \
+    crate://crates.io/numtoa/0.1.0 \
+    crate://crates.io/once_cell/1.19.0 \
+    crate://crates.io/os_pipe/1.2.1 \
+    crate://crates.io/pkg-config/0.3.30 \
+    crate://crates.io/portable-atomic/1.11.0 \
+    crate://crates.io/ppv-lite86/0.2.20 \
+    crate://crates.io/predicates/3.1.2 \
+    crate://crates.io/predicates-core/1.0.8 \
+    crate://crates.io/predicates-tree/1.0.11 \
+    crate://crates.io/proc-macro2/1.0.86 \
+    crate://crates.io/quick-xml/0.36.1 \
+    crate://crates.io/quickcheck/1.0.3 \
+    crate://crates.io/quickcheck_macros/1.0.0 \
+    crate://crates.io/quote/1.0.36 \
+    crate://crates.io/rand/0.8.5 \
+    crate://crates.io/rand_chacha/0.3.1 \
+    crate://crates.io/rand_core/0.6.4 \
+    crate://crates.io/rangemap/1.5.1 \
+    crate://crates.io/redox_syscall/0.2.16 \
+    crate://crates.io/redox_termios/0.1.3 \
+    crate://crates.io/regex/1.10.6 \
+    crate://crates.io/regex-automata/0.4.7 \
+    crate://crates.io/regex-syntax/0.8.4 \
+    crate://crates.io/retry/2.0.0 \
+    crate://crates.io/roaring/0.10.6 \
+    crate://crates.io/rustc-hash/1.1.0 \
+    crate://crates.io/rustc_version/0.4.0 \
+    crate://crates.io/rustix/0.38.34 \
+    crate://crates.io/safemem/0.3.3 \
+    crate://crates.io/semver/1.0.23 \
+    crate://crates.io/serde/1.0.204 \
+    crate://crates.io/serde_derive/1.0.204 \
+    crate://crates.io/shared_child/1.0.1 \
+    crate://crates.io/shlex/1.3.0 \
+    crate://crates.io/strsim/0.11.1 \
+    crate://crates.io/syn/1.0.109 \
+    crate://crates.io/syn/2.0.72 \
+    crate://crates.io/tempfile/3.11.0 \
+    crate://crates.io/termion/1.5.6 \
+    crate://crates.io/termtree/0.4.1 \
+    crate://crates.io/thiserror/1.0.63 \
+    crate://crates.io/thiserror-impl/1.0.63 \
+    crate://crates.io/threadpool/1.8.1 \
+    crate://crates.io/tui/0.19.0 \
+    crate://crates.io/udev/0.7.0 \
+    crate://crates.io/unicode-ident/1.0.12 \
+    crate://crates.io/unicode-segmentation/1.11.0 \
+    crate://crates.io/unicode-width/0.1.13 \
+    crate://crates.io/utf8parse/0.2.2 \
+    crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/windows-sys/0.52.0 \
+    crate://crates.io/windows-sys/0.59.0 \
+    crate://crates.io/windows-targets/0.52.6 \
+    crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
+    crate://crates.io/windows_aarch64_msvc/0.52.6 \
+    crate://crates.io/windows_i686_gnu/0.52.6 \
+    crate://crates.io/windows_i686_gnullvm/0.52.6 \
+    crate://crates.io/windows_i686_msvc/0.52.6 \
+    crate://crates.io/windows_x86_64_gnu/0.52.6 \
+    crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
+    crate://crates.io/windows_x86_64_msvc/0.52.6 \
+    crate://crates.io/zerocopy/0.7.35 \
+    crate://crates.io/zerocopy-derive/0.7.35 \
+"
+
+SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+SRC_URI[anstream-0.6.15.sha256sum] = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+SRC_URI[anstyle-1.0.8.sha256sum] = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+SRC_URI[anstyle-parse-0.2.5.sha256sum] = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+SRC_URI[anstyle-query-1.1.1.sha256sum] = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+SRC_URI[anstyle-wincon-3.0.4.sha256sum] = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+SRC_URI[anyhow-1.0.86.sha256sum] = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+SRC_URI[base64-0.22.1.sha256sum] = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+SRC_URI[bindgen-0.69.4.sha256sum] = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+SRC_URI[bytemuck-1.16.3.sha256sum] = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
+SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+SRC_URI[cassowary-0.3.0.sha256sum] = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
+SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+SRC_URI[clang-sys-1.8.1.sha256sum] = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+SRC_URI[clap-4.5.13.sha256sum] = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
+SRC_URI[clap_builder-4.5.13.sha256sum] = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
+SRC_URI[clap_lex-0.7.2.sha256sum] = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+SRC_URI[colorchoice-1.0.2.sha256sum] = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+SRC_URI[crc32c-0.6.8.sha256sum] = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47"
+SRC_URI[crc32fast-1.4.2.sha256sum] = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+SRC_URI[data-encoding-2.6.0.sha256sum] = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+SRC_URI[devicemapper-0.34.3.sha256sum] = "59209790c5d189070a52937581950947207e740fadc87f68af14f34d0eb333df"
+SRC_URI[devicemapper-sys-0.3.0.sha256sum] = "3d6681f5413e2094480381a97b8299f548c0579f07095ee20fe58e0a28cb34b5"
+SRC_URI[downcast-0.11.0.sha256sum] = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
+SRC_URI[duct-0.13.7.sha256sum] = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c"
+SRC_URI[either-1.13.0.sha256sum] = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+SRC_URI[env_filter-0.1.2.sha256sum] = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
+SRC_URI[env_logger-0.11.5.sha256sum] = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+SRC_URI[errno-0.3.9.sha256sum] = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+SRC_URI[exitcode-1.1.2.sha256sum] = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193"
+SRC_URI[fastrand-2.1.0.sha256sum] = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+SRC_URI[flate2-1.0.31.sha256sum] = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
+SRC_URI[fragile-2.0.0.sha256sum] = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
+SRC_URI[getrandom-0.2.15.sha256sum] = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+SRC_URI[hermit-abi-0.3.9.sha256sum] = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+SRC_URI[humantime-2.1.0.sha256sum] = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+SRC_URI[indicatif-0.17.8.sha256sum] = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
+SRC_URI[instant-0.1.13.sha256sum] = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+SRC_URI[is_terminal_polyfill-1.70.1.sha256sum] = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+SRC_URI[itertools-0.12.1.sha256sum] = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+SRC_URI[libloading-0.8.5.sha256sum] = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+SRC_URI[libudev-sys-0.1.4.sha256sum] = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
+SRC_URI[linux-raw-sys-0.4.14.sha256sum] = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+SRC_URI[log-0.4.22.sha256sum] = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+SRC_URI[miniz_oxide-0.7.4.sha256sum] = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+SRC_URI[mockall-0.13.0.sha256sum] = "d4c28b3fb6d753d28c20e826cd46ee611fda1cf3cde03a443a974043247c065a"
+SRC_URI[mockall_derive-0.13.0.sha256sum] = "341014e7f530314e9a1fdbc7400b244efea7122662c96bfa248c31da5bfb2020"
+SRC_URI[nix-0.29.0.sha256sum] = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+SRC_URI[num-derive-0.4.2.sha256sum] = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
+SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+SRC_URI[os_pipe-1.2.1.sha256sum] = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
+SRC_URI[pkg-config-0.3.30.sha256sum] = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+SRC_URI[portable-atomic-1.11.0.sha256sum] = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+SRC_URI[ppv-lite86-0.2.20.sha256sum] = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+SRC_URI[predicates-3.1.2.sha256sum] = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
+SRC_URI[predicates-core-1.0.8.sha256sum] = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
+SRC_URI[predicates-tree-1.0.11.sha256sum] = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
+SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+SRC_URI[quick-xml-0.36.1.sha256sum] = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
+SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
+SRC_URI[quickcheck_macros-1.0.0.sha256sum] = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9"
+SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+SRC_URI[rangemap-1.5.1.sha256sum] = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684"
+SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+SRC_URI[redox_termios-0.1.3.sha256sum] = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb"
+SRC_URI[regex-1.10.6.sha256sum] = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+SRC_URI[regex-automata-0.4.7.sha256sum] = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+SRC_URI[regex-syntax-0.8.4.sha256sum] = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+SRC_URI[retry-2.0.0.sha256sum] = "9166d72162de3575f950507683fac47e30f6f2c3836b71b7fbc61aa517c9c5f4"
+SRC_URI[roaring-0.10.6.sha256sum] = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1"
+SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+SRC_URI[rustix-0.38.34.sha256sum] = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+SRC_URI[semver-1.0.23.sha256sum] = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+SRC_URI[serde-1.0.204.sha256sum] = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+SRC_URI[serde_derive-1.0.204.sha256sum] = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+SRC_URI[shared_child-1.0.1.sha256sum] = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c"
+SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+SRC_URI[syn-2.0.72.sha256sum] = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+SRC_URI[tempfile-3.11.0.sha256sum] = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53"
+SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e"
+SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
+SRC_URI[thiserror-1.0.63.sha256sum] = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+SRC_URI[thiserror-impl-1.0.63.sha256sum] = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+SRC_URI[tui-0.19.0.sha256sum] = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1"
+SRC_URI[udev-0.7.0.sha256sum] = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a"
+SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+SRC_URI[unicode-width-0.1.13.sha256sum] = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+SRC_URI[zerocopy-0.7.35.sha256sum] = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+SRC_URI[zerocopy-derive-0.7.35.sha256sum] = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc b/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc
index ceea67c364..ceea67c364 100644
--- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc
+++ b/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc
diff --git a/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch b/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch
new file mode 100644
index 0000000000..ed5f40a881
--- /dev/null
+++ b/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch
@@ -0,0 +1,38 @@
+From 11c494b418570a3fbdfbbbdfbbc4db0108743cc7 Mon Sep 17 00:00:00 2001
+From: Dan Gohman <dev@sunfishcode.online>
+Date: Sun, 6 Apr 2025 05:22:49 -0700
+Subject: [PATCH] Define more ioctl codes on riscv32gc-unknown-linux-gnu
+
+Define ioctl codes including `FICLONE` and `FS_IOC32_GETVERSION` on
+riscv32gc-unknown-linux-gnu.
+
+Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/4382]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/unix/linux_like/linux/arch/generic/mod.rs | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/unix/linux_like/linux/arch/generic/mod.rs b/src/unix/linux_like/linux/arch/generic/mod.rs
+index 2f437e1..db1f1e7 100644
+--- a/src/unix/linux_like/linux/arch/generic/mod.rs
++++ b/src/unix/linux_like/linux/arch/generic/mod.rs
+@@ -114,6 +114,7 @@ cfg_if! {
+                  target_arch = "x86_64",
+                  target_arch = "arm",
+                  target_arch = "aarch64",
++                 target_arch = "riscv32",
+                  target_arch = "riscv64",
+                  target_arch = "s390x",
+                  target_arch = "csky",
+@@ -218,7 +219,10 @@ cfg_if! {
+     // where S stands for size (int, long, struct...)
+     // where T stands for type ('f','v','X'...)
+     // where N stands for NR (NumbeR)
+-    if #[cfg(any(target_arch = "x86", target_arch = "arm", target_arch = "csky"))] {
++    if #[cfg(any(target_arch = "x86",
++                 target_arch = "arm",
++                 target_arch = "riscv32",
++                 target_arch = "csky"))] {
+         pub const FS_IOC_GETFLAGS: ::Ioctl = 0x80046601;
+         pub const FS_IOC_SETFLAGS: ::Ioctl = 0x40046602;
+         pub const FS_IOC_GETVERSION: ::Ioctl = 0x80047601;
diff --git a/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Use-portable-atomics-crate.patch b/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Use-portable-atomics-crate.patch
new file mode 100644
index 0000000000..54d4fb4ae3
--- /dev/null
+++ b/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Use-portable-atomics-crate.patch
@@ -0,0 +1,86 @@
+From aa7186a69f8fb46cdb736e03682deb77f993103b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 5 Apr 2025 18:53:03 -0700
+Subject: [PATCH] Use portable atomics crate
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This extends building thing-provisioning-tools for
+32bit architectures without 64bit atomics support e.g.
+armv5, mips, ppc32 and riscv32. More info on portable-atomics [1]
+
+Fixes
+
+error[E0432]: unresolved import `std::sync::atomic::AtomicU64`
+│  232    --> src/cache/writeback.rs:6:25
+│  234    | use std::sync::atomic::{AtomicU64, Ordering};
+│  235    |                         ^^^^^^^^^
+
+[1] https://crates.io/crates/portable-atomic
+
+Upstream-Status: Submitted [https://github.com/jthornber/thin-provisioning-tools/pull/321]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Cargo.lock             | 5 +++--
+ Cargo.toml             | 1 +
+ src/cache/writeback.rs | 2 +-
+ src/thin/stat.rs       | 2 +-
+ 4 files changed, 6 insertions(+), 4 deletions(-)
+
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -649,9 +649,9 @@ checksum = "d231b230927b5e4ad203db57bbcb
+ 
+ [[package]]
+ name = "portable-atomic"
+-version = "1.7.0"
++version = "1.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
++checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+ 
+ [[package]]
+ name = "ppv-lite86"
+@@ -1000,6 +1000,7 @@ dependencies = [
+  "num-derive",
+  "num-traits",
+  "num_cpus",
++ "portable-atomic",
+  "quick-xml",
+  "quickcheck",
+  "quickcheck_macros",
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -30,6 +30,7 @@ nom = "7.1"
+ num_cpus = "1.16"
+ num-derive = "0.4"
+ num-traits = "0.2"
++portable-atomic = "1.11"
+ quick-xml = "0.36"
+ rand = "0.8"
+ rangemap = "1.5"
+--- a/src/cache/writeback.rs
++++ b/src/cache/writeback.rs
+@@ -1,9 +1,9 @@
+ use anyhow::anyhow;
++use portable_atomic::{AtomicU64, Ordering};
+ use roaring::RoaringBitmap;
+ use std::fs::File;
+ use std::io::Cursor;
+ use std::path::Path;
+-use std::sync::atomic::{AtomicU64, Ordering};
+ use std::sync::mpsc::{self, SyncSender};
+ use std::sync::{Arc, Mutex};
+ use std::thread;
+--- a/src/thin/stat.rs
++++ b/src/thin/stat.rs
+@@ -1,7 +1,7 @@
+ use anyhow::{anyhow, Result};
++use portable_atomic::{AtomicU64, Ordering};
+ use std::collections::BTreeMap;
+ use std::path::Path;
+-use std::sync::atomic::{AtomicU64, Ordering};
+ use std::sync::{Arc, Mutex};
+ use std::vec::Vec;
+ 
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb b/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.1.0.bb
index 09b91f6b37..3ec7d486fa 100644
--- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb
+++ b/meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.1.0.bb
@@ -4,17 +4,25 @@ HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools"
 LICENSE = "GPL-3.0-only"
 SECTION = "devel"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-S = "${WORKDIR}/git"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 
 SRC_URI = " \
     git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \
+    file://0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch;patchdir=${CARGO_VENDORING_DIRECTORY}/libc-0.2.155 \
+    file://0001-Use-portable-atomics-crate.patch \
     "
 
-SRCREV = "b2d57dad4c3378544d7b36f3fc61e60989c5c092"
+# v1.1.0
+SRCREV = "b745ab35057bdd0a4f1406938916621dcf2b7ef6"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 inherit cargo cargo-update-recipe-crates
+inherit pkgconfig
+
+DEPENDS += "udev libdevmapper libdevmapper-native clang-native"
+
+export LIBCLANG_PATH = "${STAGING_LIBDIR_NATIVE}"
+export BINDGEN_EXTRA_CLANG_ARGS = "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} --target=${TARGET_SYS}"
 
 require ${BPN}-crates.inc
 require ${BPN}-git-crates.inc
@@ -34,16 +42,18 @@ do_install:append() {
             thin_delta \
             thin_dump \
             thin_ls \
-            thin_repair \
-            thin_restore \
-            thin_rmap \
             thin_metadata_size \
             thin_metadata_pack \
             thin_metadata_unpack \
+            thin_repair \
+            thin_restore \
+            thin_rmap \
+            thin_shrink \
             thin_trim \
             era_check \
             era_dump \
             era_invalidate \
+            era_repair \
             era_restore; do
                 ln -sf pdata_tools ${D}${sbindir}/$tool
             done
diff --git a/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
index f15b36184d..596255951e 100644
--- a/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
+++ b/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
@@ -1,3 +1,3 @@
-RDEPENDS:packagegroup-meta-oe-graphics +="\
+RDEPENDS:packagegroup-meta-oe-graphics += "\
     openbox-xdgmenu \
 "
diff --git a/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb b/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb
index ac197a631e..2dfeb177e0 100644
--- a/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb
+++ b/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb
@@ -16,6 +16,7 @@ SRC_URI = " \
     file://fix-menu-generation.patch \
 "
 SRC_URI[sha256sum] = "824e099928aab2fb628f0fa4870ef7bba10b95581e47c2d8fa216709a0f399b3"
+UPSTREAM_CHECK_URI = "https://launchpad.net/openbox-xdgmenu/"
 
 inherit pkgconfig features_check
 # depends on openbox, which is X11-only
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb
index 90c9a7147c..a32c9403c8 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb
@@ -20,7 +20,6 @@ SRCREV = "8416326777b2aada0706539b8f9f6acefa476b16"
 SRC_URI = "git://github.com/tomba/rwmem.git;protocol=https;name=rwmem;branch=master \
            file://0001-include-missing-cstdint.patch"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig python3native
 
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0002-meson.build-do-not-use-Werror.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch
index 663a80ecde..663a80ecde 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0002-meson.build-do-not-use-Werror.patch
+++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch
deleted file mode 100644
index 4f385e917a..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d3aa30f5cd7ba375e006a755752acbcfcd619452 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Wed, 6 Mar 2024 19:27:15 +0800
-Subject: [PATCH] meson.build: drop unnecessary build dependencies
-
-The pytest and pycoverage are required by meson test but not for
-building. Mark them as 'required: false' to get rid of unnecessary
-build dependencies.
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- meson.build | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 9556836a..30f33fe2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -25,8 +25,8 @@ bash_completions_dir = completions.get_variable(pkgconfig: 'completionsdir', def
- # Order: Fedora/Mageia/openSUSE || Debian/Ubuntu
- pyflakes = find_program('pyflakes-3', 'pyflakes3', required: false)
- pycodestyle = find_program('pycodestyle-3', 'pycodestyle', 'pep8', required: false)
--pytest = find_program('pytest-3', 'pytest3')  # also requires the pytest-cov plugin
--pycoverage = find_program('coverage-3', 'python3-coverage')
-+pytest = find_program('pytest-3', 'pytest3', required: false)  # also requires the pytest-cov plugin
-+pycoverage = find_program('coverage-3', 'python3-coverage', required: false)
- pandoc = find_program('pandoc', required: false)
- find = find_program('find')
- 
-@@ -75,6 +75,7 @@ if get_option('unit_testing')
- endif
- 
- #FIXME: exclude doc/env/
-+if pyflakes.found() and pycodestyle.found()
- test('linting',
-      pyflakes,
-      timeout: 100,
-@@ -91,7 +92,9 @@ test('legacy-tests',
-      find_program('tests/cli_legacy.py'),
-      timeout: 600,
-      env: test_env)
-+endif
- #TODO: split out dbus tests into own test() instance, to run in parallel
-+if pycoverage.found()
- test('unit-tests',
-      pycoverage,
-      args: ['run', '-a', '-m', 'pytest', '-s', '-v', '--cov-append', meson.current_source_dir()],
-@@ -143,4 +146,5 @@ if get_option('b_coverage')
-          priority: -99, # run last
-          is_parallel: false)
- endif
-+endif
- 
--- 
-2.25.1
-
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch
deleted file mode 100644
index 9f01108a20..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6e3dd61bf90a7ca8c36c5b95943cbff7c1ad3c2d Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Wed, 6 Mar 2024 16:12:31 +0800
-Subject: [PATCH] networkd.c: define scope specific to case statement
-
-Per [1], define a scope specific to case statement to fix build with
-clang.
-
-Fixes:
-../git/src/networkd.c:544:13: error: expected expression
-  544 |             gchar* first = g_strcmp0(def->id, def->veth_peer_link->id) < 0 ? def->id : def->veth_peer_link->id;
-      |             ^
-../git/src/networkd.c:545:17: error: use of undeclared identifier 'first'
-  545 |             if (first != def->id) {
-      |                 ^
-
-[1] https://stackoverflow.com/questions/92396/why-cant-variables-be-declared-in-a-switch-statement
-
-Upstream-Status: Pending
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- src/networkd.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/networkd.c b/src/networkd.c
-index 25121c48..5eb9c0fe 100644
---- a/src/networkd.c
-+++ b/src/networkd.c
-@@ -541,12 +541,14 @@ write_netdev_file(const NetplanNetDefinition* def, const char* rootdir, const ch
-              * and, if the selected name is the name of the netdef being written, we generate
-              * the .netdev file. Otherwise we skip the netdef.
-              */
-+        {
-             gchar* first = g_strcmp0(def->id, def->veth_peer_link->id) < 0 ? def->id : def->veth_peer_link->id;
-             if (first != def->id) {
-                 g_string_free(s, TRUE);
-                 return;
-             }
-             g_string_append_printf(s, "Kind=veth\n\n[Peer]\nName=%s\n", def->veth_peer_link->id);
-+        }
-             break;
- 
-         case NETPLAN_DEF_TYPE_TUNNEL:
--- 
-2.25.1
-
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.2.bb
index 229414718c..ef1945b4fe 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.2.bb
@@ -14,26 +14,24 @@ inherit meson pkgconfig systemd python3targetconfig features_check
 
 REQUIRED_DISTRO_FEATURES = "systemd"
 
-SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \
-           file://0001-meson.build-drop-unnecessary-build-dependencies.patch \
-           file://0002-meson.build-do-not-use-Werror.patch \
+SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=stable/1.1;protocol=https \
+           file://0001-meson.build-do-not-use-Werror.patch \
           "
 
 SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch"
-SRC_URI:append:toolchain-clang = " file://0001-networkd.c-define-scope-specific-to-case-statement.patch"
 
-SRCREV = "45f7cd1569896d9e316c130bf5c60b7ccfc8211d"
+SRCREV = "01045f683b9419beb90119497cd1b2be44e83b8e"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 libyaml util-linux-libuuid \
            systemd python3-cffi-native \
           "
 
-EXTRA_OEMESON = "-Dunit_testing=false"
+EXTRA_OEMESON = "-Dtesting=false -Dunit_testing=false"
 
 RDEPENDS:${PN} = "python3-core python3-netifaces python3-pyyaml \
                   python3-dbus python3-rich python3-cffi \
+                  python3-json python3-fcntl \
                   util-linux-libuuid libnetplan \
                  "
 
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.7.4.bb
index 2c749eeba7..57e162cabd 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.7.4.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-SRC_URI[sha256sum] = "6505d94d3173e2469950b03d5b99dac4210af7b659a3a1a3b58da35b2a984da6"
+SRC_URI[sha256sum] = "5811a3c5a2334e41776f249df20c1d6a0def62a6e11e77bf2abeaa02f2725260"
 
 inherit pypi setuptools3
 
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
index ee5c77a85d..23515d9fa8 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
@@ -37,7 +37,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \
            file://0001-Fix-type-mismatch-on-32bit-arches.patch \
            file://0001-Fix-build-on-32bit.patch \
            "
-SRC_URI:append:libc-musl ="\
+SRC_URI:append:libc-musl = "\
            file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \
            file://0002-Fix-default-stack-size-to-256K.patch \
            file://0004-wiredtiger-Disable-strtouq-on-musl.patch \
@@ -48,7 +48,6 @@ SRC_URI:append:toolchain-clang = "\
            file://0001-asio-Dont-use-experimental-with-clang.patch \
            "
 
-S = "${WORKDIR}/git"
 
 CVE_STATUS[CVE-2014-8180] = "not-applicable-config: Not affecting our configuration so it can be safely ignored."
 CVE_STATUS[CVE-2017-2665] = "not-applicable-config: Not affecting our configuration so it can be safely ignored."
@@ -73,10 +72,6 @@ WIREDTIGER ?= "off"
 WIREDTIGER:x86-64 = "on"
 WIREDTIGER:aarch64 = "on"
 
-# ld.gold: fatal error: build/59f4f0dd/mongo/mongod: Structure needs cleaning
-LDFLAGS:append:x86:libc-musl = " -fuse-ld=bfd"
-LDFLAGS:remove:toolchain-clang = "-fuse-ld=bfd"
-
 EXTRA_OESCONS = "PREFIX=${prefix} \
                  DESTDIR=${D} \
                  MAXLINELENGTH='2097152' \
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.8.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.1.bb
index c86750f8b6..c86750f8b6 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.8.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.9.1.bb
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.1.bb
index e43931a4ec..e43931a4ec 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.9.1.bb
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc
index 87dbc73e63..4fe3995cd5 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc
+++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc
@@ -1,11 +1,10 @@
-DESCRIPTION="Protocol Buffers with small code size"
-LICENSE="Zlib"
+DESCRIPTION = "Protocol Buffers with small code size"
+LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f"
 
-SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https"
-SRCREV = "6cfe48d6f1593f8fa5c0f90437f5e6522587745e"
+SRC_URI = "git://github.com/nanopb/nanopb.git;branch=maintenance_0.4;protocol=https"
+SRCREV = "cad3c18ef15a663e30e3e43e3a752b66378adec1"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb
index c29c51a2ae..d4987acede 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb
@@ -13,7 +13,6 @@ PV = "0.5.9+git"
 SRCREV = "0e2ce9b9c46c47363436f9ee730f7c71bf455f0f"
 SRC_URI = "git://github.com/lcdproc/lcdproc;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig update-rc.d
 
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-multimedia/kmsxx/kmsxx_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-multimedia/kmsxx/kmsxx_git.bb
index cdba1a24d1..5d204d7d94 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-multimedia/kmsxx/kmsxx_git.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-multimedia/kmsxx/kmsxx_git.bb
@@ -20,7 +20,6 @@ PACKAGECONFIG[utils] += "-Dutils=true, -Dutils=false"
 
 DEPENDS += "libdrm libevdev fmt"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
@@ -31,5 +30,5 @@ do_install:append() {
     fi
 }
 
-FILES:${PN} ="${bindir} ${libdir}"
+FILES:${PN} = "${bindir} ${libdir}"
 FILES:${PN}-python += "${PYTHON_SITEPACKAGES_DIR}/*"
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-support/nvmetcli/nvmetcli_0.7.bb b/meta-oe/dynamic-layers/meta-python/recipes-support/nvmetcli/nvmetcli_0.8.bb
index ec483321b6..cf2d54c07d 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-support/nvmetcli/nvmetcli_0.7.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-support/nvmetcli/nvmetcli_0.8.bb
@@ -19,10 +19,9 @@ SYSTEMD_AUTO_ENABLE ?= "disable"
 
 RDEPENDS:${PN} += "python3 python3-six python3-pyparsing python3-configshell-fb"
 
-SRCREV = "0a6b088db2dc2e5de11e6f23f1e890e4b54fee64"
+SRCREV = "d323d5a3091af490502c5d025ec7361a3a2cfbd9"
 SRC_URI = "git://git.infradead.org/users/hch/nvmetcli.git;branch=master"
 
-S = "${WORKDIR}/git"
 
 do_install:append() {
     # Install example configuration scripts.
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb
index 9f85532064..79a7f4095e 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb
@@ -12,13 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 HG_CHANGESET = "98273ce331bb"
 SRC_URI = "https://selenic.com/repo/${BPN}/archive/${HG_CHANGESET}.tar.bz2;downloadfilename=${BP}.tar.bz2 \
            file://0001-smem-fix-support-for-source-option-python3.patch"
-SRC_URI[md5sum] = "51c3989779360f42b42ef46b2831be3a"
 SRC_URI[sha256sum] = "161131c686a6d9962a0e96912526dd46308e022d62e3f8acaed5a56fda8e08ce"
 
 UPSTREAM_CHECK_URI = "https://selenic.com/repo/smem/tags"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/${BPN}-${HG_CHANGESET}"
+S = "${UNPACKDIR}/${BPN}-${HG_CHANGESET}"
 
 do_compile() {
         ${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap
diff --git a/meta-oe/dynamic-layers/multimedia-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-oe/dynamic-layers/multimedia-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
new file mode 100644
index 0000000000..7353193c23
--- /dev/null
+++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
@@ -0,0 +1 @@
+RDEPENDS:packagegroup-meta-oe-graphics:append = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'multimedia-layer', ' taisei', '', d)}"
diff --git a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-Remove-strip-option-from-executable-build.patch b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-Remove-strip-option-from-executable-build.patch
new file mode 100644
index 0000000000..aa36c2c3f8
--- /dev/null
+++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-Remove-strip-option-from-executable-build.patch
@@ -0,0 +1,29 @@
+From 6c86f8aea2a29c33af3f212afa9f0ea180822d1e Mon Sep 17 00:00:00 2001
+From: Thomas Perrot <thomas.perrot@bootlin.com>
+Date: Wed, 6 Nov 2024 21:02:54 +0100
+Subject: [PATCH] Remove strip option from executable build
+
+To improve debugging experience, OE tasks will strip binaries.
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 88d4d53263ae..8a1f540836e0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -73,7 +73,6 @@ project('taisei', 'c',
+
+         # You may want to change these for a debug build dir
+         'buildtype=release',
+-        'strip=true',
+         'b_lto=true',
+         'b_ndebug=if-release',
+     ]
+--
+2.47.0
+
diff --git a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch
new file mode 100644
index 0000000000..09f4be300c
--- /dev/null
+++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch
@@ -0,0 +1,58 @@
+From 6f40a8cfbc4dd5ca4c3156338e8e35f25d4d4599 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 22 Nov 2024 01:16:25 -0800
+Subject: [PATCH] util/consideredharmful: Use overloadable func attribute with
+ clang
+
+When building with glibc HEAD, it has fortified headers with clang as well
+and clang reports errors e.g.
+
+| ../git/src/util/consideredharmful.h:33:7: error: redeclaration of 'strncat' must have the 'overloadable' attribute
+|    33 | char* strncat();
+|       |       ^
+| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/taisei/1.4.2/recipe-sysroot/usr/include/bits/string_fortified.h:145:8: note: previous overload of function is here
+|   145 | __NTH (strncat (__fortify_clang_overload_arg (char *, __restrict, __dest),
+|       |        ^
+
+Upstream-Status: Submitted [https://github.com/taisei-project/taisei/pull/393]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/util/consideredharmful.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/util/consideredharmful.h
++++ b/src/util/consideredharmful.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ #include "taisei.h"
++#include "util/compat.h"
+ 
+ #include <stdio.h>
+ 
+@@ -24,17 +25,23 @@ PRAGMA(GCC diagnostic ignored "-Wstrict-
+ // clang generates lots of these warnings with _FORTIFY_SOURCE
+ PRAGMA(GCC diagnostic ignored "-Wignored-attributes")
+ 
++#ifdef __GLIBC__
++#define OVERLOADABLE __attribute__((overloadable))
++#else
++#define OVERLOADABLE
++#endif
++
+ #undef fopen
+ attr_deprecated("Use vfs_open or SDL_RWFromFile instead")
+ FILE* fopen();
+ 
+ #undef strncat
+ attr_deprecated("This function likely doesn't do what you expect, use strlcat")
+-char* strncat();
++char* OVERLOADABLE strncat();
+ 
+ #undef strncpy
+ attr_deprecated("This function likely doesn't do what you expect, use strlcpy")
+-char* strncpy();
++char* OVERLOADABLE strncpy();
+ 
+ #undef errx
+ attr_deprecated("Use log_fatal instead")
diff --git a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.2.bb b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.2.bb
new file mode 100644
index 0000000000..ee65f89ab7
--- /dev/null
+++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.2.bb
@@ -0,0 +1,52 @@
+SUMMARY = "Taisei Project is an open source danmaku"
+DESCRIPTION = "Taisei Project is an open source fan-game set in the world of \
+               Tōhō Project. It is a top-down vertical-scrolling curtain fire \
+               shooting game (STG), also known as a 'bullet hell' or 'danmaku'. \
+               STGs are fast-paced games focused around pattern recognition and \
+               mastery through practice."
+HOMEPAGE = "https://taisei-project.org"
+BUGTRACKER = "https://github.com/taisei-project/taisei/issues"
+LICENSE = "CC-BY-4.0 & CC0-1.0 & MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1a11ffd7e1bdd1d3156cecec60a2846f"
+
+DEPENDS = "\
+    cglm \
+    freetype \
+    virtual/libsdl2 \
+    libwebp \
+    opusfile \
+    zstd \
+"
+DEPENDS:append:libc-musl = " libucontext"
+LDFLAGS:append:libc-musl = " -lucontext"
+
+RDEPENDS_${PN} = "\
+    cglm (>= 0.7.8) \
+    freetype \
+    libsdl2 (>= 2.0.16) \
+    libpng (>= 1.5.0) \
+    libwebp (>= 0.5) \
+    libzstd (>= 1.4.0) \
+    opengl (>= 3.3) \
+    opusfile \
+    zlib \
+"
+
+SRC_URI = "gitsm://github.com/taisei-project/taisei.git;branch=v1.4.x;protocol=https \
+           file://0001-util-consideredharmful-Use-overloadable-func-attribu.patch \
+           file://0001-Remove-strip-option-from-executable-build.patch"
+
+SRCREV = "c098579d4fa0f004ccc204c5bc46eac3717cba28"
+
+
+inherit features_check meson mime mime-xdg pkgconfig python3native
+
+REQUIRED_DISTRO_FEATURES = "opengl"
+
+PACKAGECONFIG ??= ""
+
+PACKAGECONFIG[a_null] = "-Da_null=true,-Da_null=false"
+PACKAGECONFIG[developer] = "-Ddeveloper=true,-Ddeveloper=false"
+PACKAGECONFIG[docs] = "-Ddocs=true,-Ddocs=false,python3-docutils-native"
+
+FILES:${PN} += "${datadir}"
diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.3.bb
index a7a3bf12c5..301861de38 100644
--- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb
+++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.3.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Tools to provide a way to get Platform Reliability, Availability and Serviceability (RAS) reports made via the Kernel tracing events"
-HOMEPAGE = "http://git.infradead.org/users/mchehab/rasdaemon.git"
+HOMEPAGE = "https://github.com/mchehab/rasdaemon"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc"
 
@@ -7,9 +7,8 @@ SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master;protocol=https \
            file://rasdaemon.service \
            file://init"
 
-SRCREV = "4e83b848e7961af25028f3a2cecf37a63279a2bf"
+SRCREV = "db0870edd2919f4f4d0101843136bcae92ab0743"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "libtraceevent"
 RDEPENDS:${BPN} = "perl perl-module-file-basename perl-module-file-find perl-module-file-spec perl-module-getopt-long \
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb
index 86b0ce0778..4d30327372 100644
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb
@@ -3,8 +3,7 @@ SECTION = "console/utils"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 SRC_URI = " \
     file://android-gadget-setup \
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb
index b98c70db77..7bbac1db75 100644
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "file://android-gadget-setup"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d ${D}${bindir}
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch
index b719acec4c..a35428b5b4 100644
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch
@@ -1,4 +1,4 @@
-From fe211cbc305a9316c1d4da2f086d6a50f1c92188 Mon Sep 17 00:00:00 2001
+From 194513bababa9707ec54bc7119613a0d5eca9f79 Mon Sep 17 00:00:00 2001
 From: Etienne Cordonnier <ecordonnier@snap.com>
 Date: Fri, 17 Mar 2023 10:33:11 +0100
 Subject: [PATCH] android-tools: modifications to make it build in yocto
@@ -12,27 +12,47 @@ Subject: [PATCH] android-tools: modifications to make it build in yocto
 
 Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
 
----
-Upstream-Status: Pending
+- fix warning: library search path "/usr/lib/p7zip" is unsafe for cross-compilation
 
+- fix error: include location "/usr/include/android" is unsafe for cross-compilation
+
+Upstream-Status: Pending
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ debian/development/etc1tool.mk                 |  1 -
  debian/external/boringssl/libcrypto.mk         |  1 +
+ debian/libnativehelper/libnativehelper.mk      |  1 -
+ debian/system/core/adb.mk                      |  1 -
  debian/system/core/append2simg.mk              |  2 +-
- debian/system/core/fastboot.mk                 |  2 +-
+ debian/system/core/fastboot.mk                 |  3 +--
  debian/system/core/img2simg.mk                 |  2 +-
- debian/system/core/libbacktrace.mk             |  8 ++++----
+ debian/system/core/libbacktrace.mk             | 10 ++++------
  debian/system/core/libbase.mk                  |  5 +++--
  debian/system/core/libcutils.mk                |  5 +++--
  debian/system/core/liblog.mk                   |  3 ++-
  debian/system/core/libsparse.mk                |  5 +++--
- debian/system/core/libutils.mk                 |  2 +-
+ debian/system/core/libutils.mk                 |  4 ++--
  debian/system/core/libziparchive.mk            |  5 +++--
  debian/system/core/simg2img.mk                 |  2 +-
  debian/system/core/simg2simg.mk                |  2 +-
+ debian/system/extras/libext4_utils.mk          |  1 -
  frameworks/native/libs/adbd_auth/adbd_auth.cpp |  2 ++
  system/core/adb/adb_listeners.cpp              | 12 ++++++------
  system/core/adb/transport_local.cpp            |  2 +-
- 16 files changed, 34 insertions(+), 26 deletions(-)
+ 20 files changed, 35 insertions(+), 34 deletions(-)
 
+diff --git a/debian/development/etc1tool.mk b/debian/development/etc1tool.mk
+index 2d787e98bb86..e03ac5f0048c 100644
+--- a/debian/development/etc1tool.mk
++++ b/debian/development/etc1tool.mk
+@@ -4,7 +4,6 @@ SOURCES = development/tools/etc1tool/etc1tool.cpp
+ 
+ CXXFLAGS += -std=gnu++2a
+ CPPFLAGS += \
+-  -I/usr/include/android \
+   -Idevelopment/include \
+   -Iframeworks/native/opengl/include \
+ 
 diff --git a/debian/external/boringssl/libcrypto.mk b/debian/external/boringssl/libcrypto.mk
 index c0ea54f4..b3a77bfd 100644
 --- a/debian/external/boringssl/libcrypto.mk
@@ -45,6 +65,38 @@ index c0ea54f4..b3a77bfd 100644
    -Iexternal/boringssl/src/crypto \
    -Iexternal/boringssl/src/include \
  
+diff --git a/debian/libnativehelper/libnativehelper.mk b/debian/libnativehelper/libnativehelper.mk
+index 7a0c94a6b7b5..880b2fdf9154 100644
+--- a/debian/libnativehelper/libnativehelper.mk
++++ b/debian/libnativehelper/libnativehelper.mk
+@@ -11,7 +11,6 @@ OBJECTS = $(SOURCES:.cpp=.o)
+ 
+ CXXFLAGS += -std=gnu++2a
+ CPPFLAGS += \
+-  -I/usr/include/android \
+   -Ilibnativehelper/header_only_include \
+   -Ilibnativehelper/include \
+   -Ilibnativehelper/include_jni \
+diff --git a/debian/system/core/adb.mk b/debian/system/core/adb.mk
+index 9769b68ab793..58c9a63bd225 100644
+--- a/debian/system/core/adb.mk
++++ b/debian/system/core/adb.mk
+@@ -19,7 +19,6 @@ CPPFLAGS += \
+   -D_GNU_SOURCE \
+   -DADB_HOST=1 \
+   -DADB_VERSION='"$(DEB_VERSION)"' \
+-  -I/usr/include/android \
+   -Iexternal/boringssl/include \
+   -Isystem/core/adb \
+   -Isystem/core/base/include \
+@@ -28,7 +27,6 @@ CPPFLAGS += \
+ LDFLAGS += \
+   -Ldebian/out/system/core \
+   -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -fuse-ld=gold \
+   -lbase \
+   -lcutils \
+   -lpthread \
 diff --git a/debian/system/core/append2simg.mk b/debian/system/core/append2simg.mk
 index 1599bdb8..598c751d 100644
 --- a/debian/system/core/append2simg.mk
@@ -62,15 +114,24 @@ diff --git a/debian/system/core/fastboot.mk b/debian/system/core/fastboot.mk
 index d5c9a285..a59ba1a4 100644
 --- a/debian/system/core/fastboot.mk
 +++ b/debian/system/core/fastboot.mk
-@@ -49,7 +49,7 @@ CPPFLAGS += \
+@@ -30,7 +30,6 @@ CXXFLAGS += -std=gnu++2a -fpermissive
+ CPPFLAGS += \
+    -D_FILE_OFFSET_BITS=64 \
+    -DPLATFORM_TOOLS_VERSION='"$(PLATFORM_TOOLS_VERSION)"' \
+-   -I/usr/include/android \
+    -Iexternal/boringssl/include \
+    -Iexternal/avb \
+    -Isystem/core/adb \
+@@ -49,8 +48,7 @@ CPPFLAGS += \
  
  LDFLAGS += \
    -Ldebian/out/system/core \
 -  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -fuse-ld=gold \
 +  -Wl,-rpath='$$ORIGIN/../lib/android' \
-   -fuse-ld=gold \
    -lbase \
    -lcutils \
+   -lpthread \
 diff --git a/debian/system/core/img2simg.mk b/debian/system/core/img2simg.mk
 index 11adf014..8baf5ba5 100644
 --- a/debian/system/core/img2simg.mk
@@ -85,7 +146,7 @@ index 11adf014..8baf5ba5 100644
    -llog \
    -lpthread \
 diff --git a/debian/system/core/libbacktrace.mk b/debian/system/core/libbacktrace.mk
-index e3411d76..86e69874 100644
+index e3411d76..e7dd984c 100644
 --- a/debian/system/core/libbacktrace.mk
 +++ b/debian/system/core/libbacktrace.mk
 @@ -1,4 +1,4 @@
@@ -94,9 +155,11 @@ index e3411d76..86e69874 100644
  
  NAME = libbacktrace
  
-@@ -83,10 +84,9 @@ CPPFLAGS += \
+@@ -81,12 +81,10 @@ CPPFLAGS += \
+   -Isystem/core/libunwindstack/include \
+ 
  LDFLAGS += \
-   -L/usr/lib/p7zip \
+-  -L/usr/lib/p7zip \
    -Ldebian/out/system/core \
 -  -Wl,-rpath=/usr/lib/p7zip \
 -  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
@@ -107,7 +170,7 @@ index e3411d76..86e69874 100644
    -lbase \
    -llog \
    -lpthread \
-@@ -101,7 +101,7 @@ endif
+@@ -101,7 +99,7 @@ endif
  build: $(OBJECTS_CXX) $(OBJECTS_ASSEMBLY) debian/out/external/libunwind/libunwind.a
         mkdir -p debian/out/system/core
         $(CXX) $^ -o debian/out/system/core/$(NAME).so.0 $(LDFLAGS)
@@ -216,7 +279,7 @@ index c2b2694c..2da12b8e 100644
  $(OBJECTS): %.o: %.cpp
         $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS)
 diff --git a/debian/system/core/libutils.mk b/debian/system/core/libutils.mk
-index c37b1d2d..332492c1 100644
+index c37b1d2d..0c748c8b 100644
 --- a/debian/system/core/libutils.mk
 +++ b/debian/system/core/libutils.mk
 @@ -1,4 +1,4 @@
@@ -287,6 +350,18 @@ index ed53b04c..646ab030 100644
    -lbase \
    -llog \
    -lpthread \
+diff --git a/debian/system/extras/libext4_utils.mk b/debian/system/extras/libext4_utils.mk
+index 264bb95ad36a..99125097c8e3 100644
+--- a/debian/system/extras/libext4_utils.mk
++++ b/debian/system/extras/libext4_utils.mk
+@@ -25,7 +25,6 @@ CPPFLAGS += \
+   -D_LARGEFILE64_SOURCE \
+   -DFEC_NO_KLOG \
+   -DSQUASHFS_NO_KLOG \
+-  -I/usr/include/android \
+   -Isystem/core/base/include \
+   -Isystem/core/libcutils/include \
+   -Isystem/core/libsparse/include \
 diff --git a/frameworks/native/libs/adbd_auth/adbd_auth.cpp b/frameworks/native/libs/adbd_auth/adbd_auth.cpp
 index a9c23110..6ca334ba 100644
 --- a/frameworks/native/libs/adbd_auth/adbd_auth.cpp
@@ -373,3 +448,6 @@ index c7261860..5988ec4d 100644
      auto it = local_transports.find(adb_port);
      if (it == local_transports.end()) {
          return nullptr;
+-- 
+2.34.1
+
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service
index ddf8d7f74e..b6661f2e39 100644
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Android Debug Bridge
-ConditionPathExists=/var/usb-debugging-enabled
+ConditionPathExists=/etc/usb-debugging-enabled
 Before=android-system.service
 
 [Service]
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
index 456c7400ef..63e31e90cc 100644
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
     file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \
     file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \
 "
-DEPENDS = "libbsd libpcre zlib libcap libusb squashfs-tools p7zip libselinux googletest"
+DEPENDS = "libbsd libpcre zlib libcap libusb squashfs-tools 7zip libselinux googletest"
 
 SRCREV_core = "abfd66fafcbb691d7860df059f1df1c9b1ef29da"
 
@@ -43,9 +43,9 @@ SRC_URI += " \
 
 # patches which don't come from debian
 SRC_URI += " \
-    file://rules_yocto.mk;subdir=git \
+    file://rules_yocto.mk;subdir=${BB_GIT_DEFAULT_DESTSUFFIX} \
     file://android-tools-adbd.service \
-    file://adbd.mk;subdir=git/debian/system/core \
+    file://adbd.mk;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/debian/system/core \
     file://remount \
     file://0001-Fixes-for-yocto-build.patch \
     file://0002-android-tools-modifications-to-make-it-build-in-yoct.patch \
@@ -55,7 +55,6 @@ SRC_URI += " \
     file://0001-liblp-fix-building-with-GCC-14.patch \
 "
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/${BPN}"
 
 # http://errors.yoctoproject.org/Errors/Details/1debian881/
@@ -68,6 +67,7 @@ COMPATIBLE_HOST:powerpc64le = "(null)"
 
 inherit systemd
 
+SYSTEMD_PACKAGES = "${PN}-adbd"
 SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service"
 
 # Find libbsd headers during native builds
@@ -167,7 +167,7 @@ do_install() {
 
 PACKAGES =+ "${PN}-fstools ${PN}-adbd"
 
-RDEPENDS:${BPN} = "${BPN}-conf p7zip"
+RDEPENDS:${BPN} = "${BPN}-conf 7zip"
 
 FILES:${PN}-adbd = "\
     ${bindir}/adbd \
@@ -187,9 +187,3 @@ FILES:${PN}-fstools = "\
 FILES:${PN} += "${libdir}/android ${libdir}/android/*"
 
 BBCLASSEXTEND = "native"
-
-android_tools_enable_devmode() {
-    touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled
-}
-
-ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}"
diff --git a/meta-oe/files/static-group-meta-oe b/meta-oe/files/static-group-meta-oe
index 543c893c00..17ca545d10 100644
--- a/meta-oe/files/static-group-meta-oe
+++ b/meta-oe/files/static-group-meta-oe
@@ -6,4 +6,5 @@ postgres:x:28:
 zabbix:x:605:
 mail:x:606:
 influxdb:x:622:
+gpio:x:624:
 nogroup:x:65534:
diff --git a/meta-oe/files/static-passwd-meta-oe b/meta-oe/files/static-passwd-meta-oe
index daf686b930..47380b8d00 100644
--- a/meta-oe/files/static-passwd-meta-oe
+++ b/meta-oe/files/static-passwd-meta-oe
@@ -9,3 +9,6 @@ pcp:x:620:nogroup::/:/bin/nologin
 pcpqa:x:621:nogroup::/:/bin/nologin
 influxdb:x:622:influxdb::/var/lib/influxdb:/bin/nologin
 mongodb:x:623:nogroup::/:/bin/nologin
+gpio-manager:x:624:gpio::/:/bin/nologin
+flatpak:x:625:625:Flatpak system helper:/:/sbin/nologin
+
diff --git a/meta-oe/licenses/MINPACK b/meta-oe/licenses/MINPACK
deleted file mode 100644
index 132cc3f33f..0000000000
--- a/meta-oe/licenses/MINPACK
+++ /dev/null
@@ -1,51 +0,0 @@
-Minpack Copyright Notice (1999) University of Chicago.  All rights reserved
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions of source code must retain the above
-copyright notice, this list of conditions and the following
-disclaimer.
-
-2. Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials
-provided with the distribution.
-
-3. The end-user documentation included with the
-redistribution, if any, must include the following
-acknowledgment:
-
-   "This product includes software developed by the
-   University of Chicago, as Operator of Argonne National
-   Laboratory.
-
-Alternately, this acknowledgment may appear in the software
-itself, if and wherever such third-party acknowledgments
-normally appear.
-
-4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS"
-WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE
-UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND
-THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
-OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
-OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
-USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
-THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
-DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION
-UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL
-BE CORRECTED.
-
-5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT
-HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF
-ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT,
-INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
-ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
-PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
-SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
-(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
-EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE
-POSSIBILITY OF SUCH LOSS OR DAMAGES.
diff --git a/meta-oe/licenses/NPSL b/meta-oe/licenses/NPSL
new file mode 100644
index 0000000000..be7ed8d841
--- /dev/null
+++ b/meta-oe/licenses/NPSL
@@ -0,0 +1,583 @@
+Nmap Public Source License Version 0.95
+For more information on this license, see https://nmap.org/npsl/
+
+0. Preamble
+
+The intent of this license is to establish freedom to share and change
+the software regulated by this license under the open source model. It
+also includes a Contributor Agreement and disclaims any warranty on
+Covered Software. Companies wishing to use or incorporate Covered
+Software within their own products may find that our Nmap OEM product
+(https://nmap.org/oem/) better suits their needs. Open source
+developers who wish to incorporate parts of Covered Software into free
+software with conflicting licenses may write Licensor to request a
+waiver of terms.
+
+If the Nmap Project (directly or through one of its commercial
+licensing customers) has granted you additional rights to Nmap or Nmap
+OEM, those additional rights take precedence where they conflict with
+the terms of this license agreement.
+
+This License represents the complete agreement concerning subject
+matter hereof. It contains the license terms themselves, but not the
+reasoning behind them or detailed explanations. For further
+information about this License, see https://nmap.org/npsl/ . That page
+makes a good faith attempt to explain this License, but it does not
+and can not modify its governing terms in any way.
+
+1. Definitions
+
+* "Contribution" means any work of authorship, including the original
+  version of the Work and any modifications or additions to that Work
+  or Derivative Works thereof, that is intentionally submitted to
+  Licensor by the copyright owner or by an individual or Legal Entity
+  authorized to submit on behalf of the copyright owner. For the
+  purposes of this definition, "submitted" means any form of
+  electronic, verbal, or written communication sent to the Licensor or
+  its representatives, including but not limited to communication on
+  electronic mailing lists, source code control systems, web sites,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a
+  Contribution."
+
+* "Contributor" means Licensor and any individual or Legal Entity on
+  behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+* "Covered Software" means the work of authorship, whether in Source
+  or Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+
+* "Derivative Work" or "Collective Work" means any work, whether in
+  Source or Object form, that is based on (or derived from) the Work
+  and for which the editorial revisions, annotations, elaborations, or
+  other modifications represent, as a whole, an original work of
+  authorship. It includes software as described in Section 3 of this
+  License.
+
+* "Executable" means Covered Software in any form other than Source Code.
+
+* "Externally Deploy" means to Deploy the Covered Software in any way
+  that may be accessed or used by anyone other than You, used to
+  provide any services to anyone other than You, or used in any way to
+  deliver any content to anyone other than You, whether the Covered
+  Software is distributed to those parties, made available as an
+  application intended for use over a computer network, or used to
+  provide services or otherwise deliver content to anyone other than
+  You.
+
+* "GPL" means the GNU General Public License Version 2, as published
+  by the Free Software Foundation and provided in Exhibit A.
+
+* "Legal Entity" means the union of the acting entity and all other
+  entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+* "License" means this document, including Exhibits.
+
+* "Licensor" means Nmap Software LLC and its successors and assigns.
+
+* "Main License Body" means all of the terms of this document,
+  excluding Exhibits.
+
+* "You" (or "Your") means an individual or Legal Entity exercising
+  permissions granted by this License.
+
+2. General Terms
+
+Covered Software is licensed to you under the terms of the GPL
+(Exhibit A), with all the exceptions, clarifications, and additions
+noted in this Main License Body. Where the terms in this Main License
+Body conflict in any way with the GPL, the Main License Body terms
+shall take precedence. These additional terms mean that You may not
+distribute Covered Software or Derivative Works under plain GPL terms
+without special permission from Licensor.
+
+You are not required to accept this License. However, nothing else
+grants You permission to use, copy, modify or distribute the software
+or its derivative works. These actions are prohibited by law if You do
+not accept this License. Therefore, by modifying, copying or
+distributing the software (or any work based on the software), You
+indicate your acceptance of this License to do so, and all its terms
+and conditions. In addition, you agree to the terms of this License by
+clicking the Accept button or downloading the software.
+
+3. Derivative Works
+
+This License (including the GPL portion) places important restrictions
+on derived works. Licensor interprets that term quite broadly. To
+avoid any misunderstandings, we consider software to constitute a
+"derivative work" of Covered Software for the purposes of this license
+if it does any of the following:
+
+* Integrates source code from Covered Software
+
+* Reads or includes Covered Software data files, such as nmap-os-db or
+  nmap-service-probes.
+
+* Is designed specifically to execute Covered Software and parse the
+  results (as opposed to typical shell or execution-menu apps, which
+  will execute anything you tell them to).
+
+* Includes Covered Software in a proprietary executable installer. The
+  installers produced by InstallShield are an example of
+  this. Including Nmap with other software in compressed or archival
+  form does not trigger this provision, provided appropriate open
+  source decompression or de-archiving software is widely available
+  for no charge. For the purposes of this license, an installer is
+  considered to include Covered Software even if it actually retrieves
+  a copy of Covered Software from another source during runtime (such
+  as by downloading it from the Internet).
+
+* Links (statically or dynamically) to a library which does any of the
+  above
+
+* Executes a helper program, module, or script to do any of the above.
+
+
+This list is not exclusive, but is meant to clarify Licensor's
+intentions with some common examples. Distribution of any works which
+meet these criteria (and that also choose to accept this license to
+benefit from the rights granted herein) must be under the terms of
+this license (including this Main License Body and GPL), with no
+additional conditions or restrictions. They must abide by all
+restrictions that the GPL places on derivative or collective works,
+including the requirements for distributing their source code and
+allowing royalty-free redistribution.
+
+Licensor does not purport to control through this license any software
+which does not require the rights granted herein (such as rights to
+redistribute and/or incorporate Covered Software executables and
+source code). In particular, many software packages include the
+ability to parse Covered Software results provided by an end user or
+to execute Covered Software that end user may have already installed
+on their system. To the extent that copyright doctrines such as fair
+use allow their practices without the need to exercise any rights
+granted by this license, vendors and distributors of such software are
+not bound by our definition of derivative works or any other clauses
+in this license.
+
+4. Contributor Agreement (Grant of Copyright and Patent Licenses)
+
+Each Contributor hereby grants to Licensor a perpetual, worldwide,
+non-exclusive, no-charge, royalty-free, irrevocable copyright license
+to reproduce, prepare Derivative Works of, publicly display, publicly
+perform, sublicense, and distribute the Contribution and such
+Derivative Works in Source or Object form.
+
+Each Contributor hereby grants to You and Licensor a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except
+as stated in this section) patent license to make, have made, use,
+offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such
+Contributor that are necessarily infringed by their Contribution(s)
+alone or by combination of their Contribution(s) with the Work to
+which such Contribution(s) was submitted. If You institute patent
+litigation against any entity (including a cross-claim or counterclaim
+in a lawsuit) alleging that the Work or a Contribution incorporated
+within the Work constitutes direct or contributory patent
+infringement, then any patent licenses granted to You under this
+License for that Work shall terminate as of the date such litigation
+is filed.
+
+Contributors may impose different terms on their Contributions by
+stating those terms in writing at the time the Contribution is
+made. Contributors may withhold all authority from Licensor to
+incorporate submissions by conspicuously marking or otherwise
+designating them in writing as "Not a Contribution" at the time they
+make the work available.
+
+5. Disclaimer of Warranty and Limitation of Liability
+
+Unless required by applicable law or agreed to in writing, Licensor
+provides the Covered Software (and each Contributor provides its
+Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, either express or implied, including, without limitation,
+any warranties or conditions of TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely
+responsible for determining the appropriateness of using or
+redistributing the Covered Software and assume any risks associated
+with Your exercise of permissions under this License.
+
+In no event and under no legal theory, whether in tort (including
+negligence), contract, or otherwise, unless required by applicable law
+(such as deliberate and grossly negligent acts) or agreed to in
+writing, shall any Contributor be liable to You for damages, including
+any direct, indirect, special, incidental, or consequential damages of
+any character arising as a result of this License or out of the use or
+inability to use the Covered Software (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or
+malfunction, or any and all other commercial damages or losses), even
+if such Contributor has been advised of the possibility of such
+damages.
+
+6. External Deployment
+
+If You Externally Deploy Covered Software, such as hosting a website
+designed to execute Nmap scans for users, the system and its
+documentation must, if technically feasible, prominently display a
+notice stating that the system uses the Nmap Security Scanner to
+perform its tasks. If technically feasible, the notice must contain a
+hyperlink to https://nmap.org/ or provide that URL in the text.
+
+7. Trademarks
+
+This License does not grant permission to use the trade names,
+trademarks, service marks, or product names of the Licensor, except as
+required for reasonable and customary use in describing the origin of
+the Covered Software.
+
+8. Termination for Patent Action
+
+This License shall terminate automatically and You may no longer
+exercise any of the rights granted to You by this License as of the
+date You commence an action, including a cross-claim or counterclaim,
+against Licensor or any licensee alleging that the Covered Software
+infringes a patent. This termination provision shall not apply for an
+action alleging patent infringement by combinations of the Covered
+Software with other software or hardware.
+
+9. Jurisdiction, Venue and Governing Law
+
+This License is governed by the laws of the State of Washington and
+the intellectual property laws of the United States of America,
+excluding the jurisdiction's conflict-of-law provisions. Any
+litigation or other dispute resolution between You and Licensor
+relating to this License shall take place in the Northern District of
+California, and You and Licensor hereby consent to the personal
+jurisdiction of, and venue in, the state and federal courts within
+that District with respect to this License. The application of the
+United Nations Convention on Contracts for the International Sale of
+Goods is expressly excluded.
+
+10. Npcap and the Official Nmap Windows Builds
+
+The official Windows Nmap builds includes the Npcap driver and library
+(https://npcap.com) for packet capture and transmission on
+Windows. That software is under its own separate license terms rather
+than this license. Therefore anyone wishing to use or redistribute
+both pieces of software must comply with both licenses. Since Npcap
+does not allow for redistribution without special permission, the
+official Nmap Windows builds which include Npcap may not be
+redistributed without special permission. Such permission can be
+requested by email to sales@nmap.com.
+
+11. Permission to link with OpenSSL
+
+Licensor grants permission to link Covered Software with any version
+of the OpenSSL library from OpenSSL.Org, and distribute linked
+combinations including the two (assuming such distribution is
+otherwise allowed by this agreement). You must obey this License in
+all respects for all code used other than OpenSSL.
+
+12. Waiver; Construction
+
+Failure by Licensor or any Contributor to enforce any provision of
+this License will not be deemed a waiver of future enforcement of that
+or any other provision. Any law or regulation which provides that the
+language of a contract shall be construed against the drafter will not
+apply to this License.
+
+13. Enforceability
+
+If any provision of this License is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this License, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.
+
+Exhibit A. The GNU General Public License Version 2
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+Preamble
+
+The licenses for most software are designed to take away your freedom
+to share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on,
+we want its recipients to know that what they have is not the
+original, so that any problems introduced by others will not reflect
+on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at
+all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a
+notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the Program
+(independent of having been made by running the Program). Whether that
+is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy an appropriate copyright notice
+and disclaimer of warranty; keep intact all the notices that refer to
+this License and to the absence of any warranty; and give any other
+recipients of the Program a copy of this License along with the
+Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a
+fee.
+
+2. You may modify your copy or copies of the Program or any portion of
+it, thus forming a work based on the Program, and copy and distribute
+such modifications or work under the terms of Section 1 above,
+provided that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any part
+thereof, to be licensed as a whole at no charge to all third parties
+under the terms of this License.
+
+c) If the modified program normally reads commands interactively when
+run, you must cause it, when started running for such interactive use
+in the most ordinary way, to print or display an announcement
+including an appropriate copyright notice and a notice that there is
+no warranty (or else, saying that you provide a warranty) and that
+users may redistribute the program under these conditions, and telling
+the user how to view a copy of this License. (Exception: if the
+Program itself is interactive but does not normally print such an
+announcement, your work based on the Program is not required to print
+an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections 1
+and 2 above on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years,
+to give any third party, for a charge no more than your cost of
+physically performing source distribution, a complete machine-readable
+copy of the corresponding source code, to be distributed under the
+terms of Sections 1 and 2 above on a medium customarily used for
+software interchange; or,
+
+c) Accompany it with the information you received as to the offer to
+distribute corresponding source code. (This alternative is allowed
+only for noncommercial distribution and only if you received the
+program in object code or executable form with such an offer, in
+accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt otherwise
+to copy, modify, sublicense or distribute the Program is void, and
+will automatically terminate your rights under this License. However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted
+herein. You are not responsible for enforcing compliance by third
+parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new
+versions of the General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Program does not specify a
+version number of this License, you may choose any version ever
+published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the
+author to ask for permission. For software which is copyrighted by the
+Free Software Foundation, write to the Free Software Foundation; we
+sometimes make exceptions for this. Our decision will be guided by the
+two goals of preserving the free status of all derivatives of our free
+software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
+LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
+AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF
+ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+[For brevity, we've cut out the GPL's final section on "How to Apply
+These Terms to Your New Program", but you can find that at
+https://www.gnu.org/licenses/gpl-2.0.html#SEC4 ]
+
diff --git a/meta-oe/licenses/OpenLDAP b/meta-oe/licenses/OLDAP-2.8
index 05ad7571e4..05ad7571e4 100644
--- a/meta-oe/licenses/OpenLDAP
+++ b/meta-oe/licenses/OLDAP-2.8
diff --git a/meta-oe/licenses/X11 b/meta-oe/licenses/X11
deleted file mode 100644
index da3e406240..0000000000
--- a/meta-oe/licenses/X11
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 Alex Graveley
- * Copyright (C) 2010 Ulrik Sverdrup <ulrik.sverdrup@gmail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
diff --git a/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb b/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb
index c305aadd02..c70f8a9ef4 100644
--- a/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb
+++ b/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://copyright.txt;md5=cd4dde95a6b9d122f0a9150ae9cc3ee0"
 
 SRC_URI = "http://www.coker.com.au/bonnie++/${BPN}_${PV}.tgz \
 "
-SRC_URI[md5sum] = "1414aab86e2db1b4691bd4be82031012"
 SRC_URI[sha256sum] = "507bd2ce5360c7c98b91b0fdc2bed5c9320b5c9699f7d4a3d1c86b256896c15e"
 
 inherit autotools-brokensep
diff --git a/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb b/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb
index c58524aa64..feda6599a8 100644
--- a/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb
+++ b/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/ssvb/cpuburn-arm.git;branch=master;protocol=https \
            file://0003-burn.S-Remove-.func-.endfunc.patch \
            "
 
-S = "${WORKDIR}/git"
 
 do_compile() {
 
diff --git a/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb b/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
index 32f51fee49..d300c40a47 100644
--- a/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
+++ b/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
@@ -22,5 +22,4 @@ TARGET_CC_ARCH += "${LDFLAGS}"
 
 FILES:tbench = "${bindir}/tbench* ${prefix}/share/client.txt"
 
-SRC_URI[md5sum] = "1fe56ff71b9a416f8889d7150ac54da4"
 SRC_URI[sha256sum] = "6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a"
diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/0001-fix-too-many-arguments-error-in-gcc15.patch b/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/0001-fix-too-many-arguments-error-in-gcc15.patch
new file mode 100644
index 0000000000..63701d9c97
--- /dev/null
+++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/0001-fix-too-many-arguments-error-in-gcc15.patch
@@ -0,0 +1,32 @@
+From a0a976c0c4c2b92d61e71e00be4adfd8ea6d0d8f Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Thu, 10 Apr 2025 14:14:15 +0900
+Subject: [PATCH] fix too many arguments error in gcc15
+
+dhry_1.c: In function 'main':
+dhry_1.c:176:23: error: too many arguments to function 'Func_1'; expected 0, have 2
+  176 |       if (Enum_Loc == Func_1 (Ch_Index, 'C'))
+      |                       ^~~~~~  ~~~~~~~~
+dhry_1.c:33:17: note: declared here
+   33 | Enumeration     Func_1 ();
+      |                 ^~~~~~
+
+Upstream-Status: Inactive-Upstream [lastrelease: 1988]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ dhry_1.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dhry_1.c b/dhry_1.c
+index b081b86..e5a4873 100644
+--- a/dhry_1.c
++++ b/dhry_1.c
+@@ -30,7 +30,7 @@ char            Ch_1_Glob,
+ int             Arr_1_Glob [50];
+ int             Arr_2_Glob [50] [50];
+ 
+-Enumeration     Func_1 ();
++Enumeration     Func_1 (Capital_Letter Ch_1_Par_Val, Capital_Letter Ch_2_Par_Val);
+   /* forward declaration necessary since Enumeration may not simply be int */
+ 
+ #ifndef REG
diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
index 5d27acbdc0..a8d750e885 100644
--- a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
+++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d1
 SRC_URI = "http://www.netlib.org/benchmark/dhry-c;downloadfilename=dhry-c.shar \
            file://dhrystone.patch \
            file://dhrystone-c89.patch \
+           file://0001-fix-too-many-arguments-error-in-gcc15.patch \
 "
-SRC_URI[md5sum] = "75aa5909c174eed98c134be2f56307da"
 SRC_URI[sha256sum] = "038a7e9169787125c3451a6c941f3aca5db2d2f3863871afcdce154ef17f4e3e"
 
 # Need to override Makefile variables
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.36.bb b/meta-oe/recipes-benchmark/fio/fio_3.39.bb
index a871ed8fe5..345c7f08e7 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.36.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.39.bb
@@ -22,11 +22,11 @@ PACKAGECONFIG_NUMA:armeb = ""
 PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}"
 PACKAGECONFIG[numa] = ",--disable-numa,numactl"
 
-PV .= "+git"
-SRCREV = "b2403d413ee734e8835539319d8bc3429a0777ac"
 SRC_URI = "git://git.kernel.dk/fio.git;branch=master"
+SRCREV = "a6e474c9e896e4ba1eb40066a03402afb040710a"
+
+UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 # avoids build breaks when using no-static-libs.inc
 DISABLE_STATIC = ""
@@ -35,7 +35,7 @@ EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'"
 EXTRA_OECONF = "${@bb.utils.contains('MACHINE_FEATURES', 'x86', '--disable-optimizations', '', d)}"
 
 do_configure() {
-    ./configure ${EXTRA_OECONF}
+    ./configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
 }
 
 do_install() {
diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
index 0b61d6ed62..8bcb763f06 100644
--- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
@@ -21,7 +21,6 @@ SRC_URI = " \
 "
 SRCREV = "42e3d8fe3aa88743ef90348138f643f7b04a9237"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
 
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3/0001-let-system-headers-provide-pread64.patch b/meta-oe/recipes-benchmark/iozone3/iozone3/0001-let-system-headers-provide-pread64.patch
deleted file mode 100644
index a61a56a71d..0000000000
--- a/meta-oe/recipes-benchmark/iozone3/iozone3/0001-let-system-headers-provide-pread64.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 64389a67b93a53b9fb7e9e20e905a5ee4613606b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 15 Jan 2020 17:10:42 -0800
-Subject: [PATCH] let system headers provide pread64()
-
-The signature does not match with system headers anyway
-
-Fixes
-
-iozone.c:1270:9: error: redeclaration of 'pread64' must have the 'overloadable' attribute                                                                       ssize_t pread64();                                                                      ^                                                                       /mnt/b/yoe/build/tmp/work/core2-64-yoe-linux/iozone3/488-r0/recipe-sysroot/usr/include/bits/unistd.h:83:1: note: previous overload of function is here          pread64 (int __fd, void *const __clang_pass_object_size0 __buf,                 ^
-1 error generated.
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- iozone.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/iozone.c b/iozone.c
-index 090dd5f..fdea400 100644
---- a/iozone.c
-+++ b/iozone.c
-@@ -1267,7 +1267,6 @@ int pit_gettimeofday();
- #ifdef HAVE_ANSIC_C
- #if defined (HAVE_PREAD) && defined(_LARGEFILE64_SOURCE)
- ssize_t pwrite64(); 
--ssize_t pread64(); 
- #endif
- #if !defined(linux)
- char *getenv();
--- 
-2.25.0
-
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_507.bb
index 6ab1121efb..725b0af209 100644
--- a/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb
+++ b/meta-oe/recipes-benchmark/iozone3/iozone3_507.bb
@@ -3,18 +3,17 @@ HOMEPAGE = "http://www.iozone.org/"
 SECTION = "console/tests"
 LICENSE = "iozone3"
 LIC_FILES_CHKSUM = "file://iozone.c;beginline=37;endline=48;md5=7331260091868dcad0f9edea735b5f4b \
-    file://iozone.c;beginline=276;endline=282;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \
+    file://iozone.c;beginline=317;endline=323;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \
 "
 SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \
     file://parallelism.patch \
-    file://0001-let-system-headers-provide-pread64.patch \
     file://copyright.txt \
 "
-SRC_URI[sha256sum] = "114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7"
+SRC_URI[sha256sum] = "1e8087ada056f5d8018ee0bc76686d416fc2251ed03038055dbd0af78d1e5ce3"
 
 UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar"
 
-S = "${WORKDIR}/${BPN}_${PV}/src/current"
+S = "${UNPACKDIR}/${BPN}_${PV}/src/current"
 
 #
 # All other arches can use the default OEMAKE except those
diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch b/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch
deleted file mode 100644
index dc3b85f8ef..0000000000
--- a/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 6df092a4153c6c37cfaddcabf2cd25a910a7f6e1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 2 Sep 2019 15:40:52 -0700
-Subject: [PATCH] Detect bool definition considering stdbool.h being present
-
-This helps in defining the value correctly on different platforms e.g.
-clang/libc++ depends on the definition coming from stdbool.h
-current builds fail to compile therefore
-
-TMPDIR/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/iperf2/2.0.13-r0/recipe-sysroot/usr/include/c++/v1/type_traits:742:29: error: redefinition of '__libcpp_is_integral<int>'
-template <>          struct __libcpp_is_integral<int>                : public true_type {};
-                            ^~~~~~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- m4/dast.m4 | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/m4/dast.m4
-+++ b/m4/dast.m4
-@@ -11,7 +11,12 @@ AH_TEMPLATE([false])
- 
- AC_DEFUN(DAST_CHECK_BOOL, [
- 
--AC_CHECK_SIZEOF(bool)
-+if test "$ac_cv_header_stdbool_h" = yes; then
-+  AC_CHECK_SIZEOF(bool,,[#include <stdbool.h>])
-+else
-+  AC_CHECK_SIZEOF(bool)
-+fi
-+
- if test "$ac_cv_sizeof_bool" = 0 ; then
-   AC_DEFINE(bool, int)
- fi
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,7 +113,7 @@ AC_SEARCH_LIBS([socket], [socket], [],
- 
- dnl Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h])
-+AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdbool.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h])
- 
- dnl ===================================================================
- dnl Checks for typedefs, structures
---- a/include/util.h
-+++ b/include/util.h
-@@ -56,7 +56,9 @@
- #ifdef HAVE_CONFIG_H
-     #include "config.h"
- #endif
--
-+#ifdef HAVE_STDBOOL_H
-+# include <stdbool.h>
-+#endif
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2/0001-fix-for-buildroot-linux-breakage-ticket-342.patch b/meta-oe/recipes-benchmark/iperf2/iperf2/0001-fix-for-buildroot-linux-breakage-ticket-342.patch
new file mode 100644
index 0000000000..0a6bc7150b
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf2/iperf2/0001-fix-for-buildroot-linux-breakage-ticket-342.patch
@@ -0,0 +1,26 @@
+From a25566dd66fb0ca951b3b6f6fa5a4bfaac276c71 Mon Sep 17 00:00:00 2001
+From: Robert McMahon <rjmcmahon@rjmcmahon.com>
+Date: Tue, 12 Nov 2024 12:06:54 -0800
+Subject: [PATCH] fix for buildroot linux breakage, ticket 342
+
+Upstream-Status: Backport [https://sourceforge.net/p/iperf2/code/ci/a25566dd66fb0ca951b3b6f6fa5a4bfaac276c71/]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/checksums.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/checksums.c b/src/checksums.c
+index 852f1952..d7a8109e 100644
+--- a/src/checksums.c
++++ b/src/checksums.c
+@@ -47,6 +47,9 @@
+  * by Robert J. McMahon (rjmcmahon@rjmcmahon.com, bob.mcmahon@broadcom.com)
+  * -------------------------------------------------------------------
+  */
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
+ #include "headers.h"
+ 
+ /*
diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb
index 86e5fef530..3d965dac00 100644
--- a/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb
+++ b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb
@@ -5,13 +5,12 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e136a7b2560d80bcbf0d9b3e1356ecff"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/iperf-${PV}.tar.gz \
-           file://0001-Detect-bool-definition-considering-stdbool.h-being-p.patch \
+           file://0001-fix-for-buildroot-linux-breakage-ticket-342.patch \
 "
 
-SRC_URI[md5sum] = "31ea1c6d5cbf80b16ff3abe4288dad5e"
-SRC_URI[sha256sum] = "c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad"
+SRC_URI[sha256sum] = "754ab0a7e28033dbea81308ef424bc7df4d6e2fe31b60cc536b61b51fefbd8fb"
 
-S = "${WORKDIR}/iperf-${PV}"
+S = "${UNPACKDIR}/iperf-${PV}"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-fix-build-with-gcc-15.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..d3f3e712c9
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-fix-build-with-gcc-15.patch
@@ -0,0 +1,66 @@
+From a46630d4e373e9a3ef974c1b67767f6816c66572 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Mon, 9 Dec 2024 10:13:02 +0000
+Subject: [PATCH] fix build with gcc-15
+
+Upstream-Status: Submitted [https://github.com/esnet/iperf/pull/1805]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ src/iperf_api.c | 8 ++++----
+ src/iperf_api.h | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/iperf_api.c b/src/iperf_api.c
+index 7fb741e..4bb5b2f 100644
+--- a/src/iperf_api.c
++++ b/src/iperf_api.c
+@@ -599,25 +599,25 @@ iperf_set_mapped_v4(struct iperf_test *ipt, const int val)
+ }
+ 
+ void 
+-iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)())
++iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)(struct iperf_stream *))
+ {
+         ipt->on_new_stream = callback;
+ }
+ 
+ void 
+-iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)())
++iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
+ {
+         ipt->on_test_start = callback;
+ }
+ 
+ void 
+-iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)())
++iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
+ {
+         ipt->on_connect = callback;
+ }
+ 
+ void 
+-iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)())
++iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
+ {
+         ipt->on_test_finish = callback;
+ }
+diff --git a/src/iperf_api.h b/src/iperf_api.h
+index 1313142..df10c38 100644
+--- a/src/iperf_api.h
++++ b/src/iperf_api.h
+@@ -213,10 +213,10 @@ void    iperf_set_dont_fragment( struct iperf_test* ipt, int dont_fragment );
+ void    iperf_set_test_congestion_control(struct iperf_test* ipt, char* cc);
+ void    iperf_set_test_mss(struct iperf_test* ipt, int mss);
+ void    iperf_set_mapped_v4(struct iperf_test* ipt, const int val);
+-void    iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)());
+-void    iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)());
+-void    iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)());
+-void    iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)());
++void    iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)(struct iperf_stream *));
++void    iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
++void    iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
++void    iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
+ 
+ #if defined(HAVE_SSL)
+ void    iperf_set_test_client_username(struct iperf_test *ipt, const char *client_username);
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.17.1.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.18.bb
index 44fae0255f..08f29937c0 100644
--- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.17.1.bb
+++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.18.bb
@@ -15,11 +15,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9873a72f714e240530e759e103ac7b2"
 SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \
            file://0002-Remove-pg-from-profile_CFLAGS.patch \
            file://0001-configure.ac-check-for-CPP-prog.patch \
+           file://0001-fix-build-with-gcc-15.patch \
            "
 
-SRCREV = "2acfcfe94e928e74542c9f107e02aa6dd4748a79"
+SRCREV = "2a2984488d6de8f7a2d1f5938e03ca7be57e227c"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
@@ -29,3 +29,5 @@ PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sc
 PACKAGECONFIG[openssl] = "--with-openssl=${RECIPE_SYSROOT}${prefix},--without-openssl,openssl"
 
 CFLAGS += "-D_GNU_SOURCE"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb b/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb
index 4ace4515ad..ae87262870 100644
--- a/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb
+++ b/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb
@@ -13,7 +13,9 @@ SRC_URI = "git://git.musl-libc.org/libc-bench;branch=master \
            file://0001-build-Do-not-override-ldflags-from-environment.patch \
            "
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 do_install () {
     install -d ${D}${bindir}
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
deleted file mode 100644
index 0787ef27d2..0000000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 0a163f60b4a316c4b6f1726a71c84755f3bd85e7 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.jansa@lge.com>
-Date: Wed, 16 Sep 2020 04:36:04 -0700
-Subject: [PATCH] Revert "ld.hugetlbfs: fix -Ttext-segment argument on AArch64"
-
-This reverts commit 852dcc963ce44861ed7c4e225aa92ff2b5b43579.
-
-* works around
-  ERROR: libhugetlbfs-1_2.23-r0 do_populate_sysroot: Fatal errors occurred in subprocesses:
-  Command '['arm-oe-linux-gnueabi-strip', '--remove-section=.comment', '--remove-section=.note', 'libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw']' returned non-zero exit status 1.
-  Subprocess output:arm-oe-linux-gnueabi-strip:
-  libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58: error: PHDR segment not covered by LOAD segment
-  arm-oe-linux-gnueabi-strip: libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58[.interp]: file format not recognized
-
-I don't see anything suspicious in the build (the same cmdline as in 2.22
-version), but it uses
-
-libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
--Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
--fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
--Werror=format-security -Werror=return-type
---sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot
--I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c
-libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
--Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
--fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
--Werror=format-security -Werror=return-type
---sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot
--B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
--ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl
--lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o
-obj32/testutils.o
-libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
--Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
--fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
--Werror=format-security -Werror=return-type
---sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot
--I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c
-libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc
- -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1
--Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
--fstack-protector-strong  -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
--Werror=format-security -Werror=return-type
---sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot
--B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now
--ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl
--lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o
-obj32/testutils.o
-
-And the git log between 2.22 and 2.23 is also very short and looks
-reasonable.
-https://github.com/libhugetlbfs/libhugetlbfs/compare/2.22...2.23
-
-When checking with readelf -l it also shows the error about PHDR segment:
-arm-oe-linux-gnueabi-readelf -l
-./1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw
-
-Elf file type is DYN (Shared object file)
-Entry point 0x201105
-There are 10 program headers, starting at offset 52
-
-Program Headers:
-  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  PHDR           0x000034 0x00200034 0x00200034 0x00140 0x00140 R   0x4
-  INTERP         0x000174 0x00200174 0x00200174 0x0001d 0x0001d R   0x1
-      [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
-  LOAD           0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000
-  LOAD           0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW  0x200000
-  DYNAMIC        0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW  0x4
-  NOTE           0x000194 0x00200194 0x00200194 0x00044 0x00044 R   0x4
-  GNU_EH_FRAME   0x012224 0x00212224 0x00212224 0x00008 0x00008 R   0x4
-  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
-  EXIDX          0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R   0x4
-  GNU_RELRO      0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW  0x4
-
- Section to Segment mapping:
-  Segment Sections...
-   00
-   01     .interp
-   02     .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr
-.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text
-.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr
-   03     .fini_array .init_array .dynamic .got .data .bss
-   04     .dynamic
-   05     .note.ABI-tag .note.gnu.build-id
-   06     .eh_frame_hdr
-   07
-   08     .ARM.extab .ARM.exidx
-   09     .fini_array .init_array .dynamic .got
-
-arm-oe-linux-gnueabi-readelf -l
-./1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw
-
-Elf file type is DYN (Shared object file)
-Entry point 0x31cd1
-There are 10 program headers, starting at offset 52
-
-Program Headers:
-  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  PHDR           0x000000 0x00000000 0x00000000 0x00000 0x00000 R   0
-readelf: Error: the PHDR segment is not covered by a LOAD segment
-  INTERP         0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R   0x1
-      [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
-  LOAD           0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000
-  LOAD           0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW  0x200000
-  DYNAMIC        0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW  0x4
-  NOTE           0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R   0x4
-  GNU_EH_FRAME   0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R   0x4
-  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
-  EXIDX          0x032828 0x00032828 0x00032828 0x00008 0x00008 R   0x4
-  GNU_RELRO      0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW  0x4
-
- Section to Segment mapping:
-  Segment Sections...
-   00
-   01     .interp
-   02     .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr
-.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text
-.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr
-   03     .fini_array .init_array .dynamic .got .data .bss
-   04     .dynamic
-   05     .note.ABI-tag .note.gnu.build-id
-   06     .eh_frame_hdr
-   07
-   08     .ARM.extab .ARM.exidx
-   09     .fini_array .init_array .dynamic .got
-
-And the diff between these 2:
-
-1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf
-1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf
- Elf file type is DYN (Shared object file)
--Entry point 0x201105
-+Entry point 0x31cd1
- There are 10 program headers, starting at offset 52
-
- Program Headers:
-   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
--  PHDR           0x000034 0x00200034 0x00200034 0x00140 0x00140 R   0x4
--  INTERP         0x000174 0x00200174 0x00200174 0x0001d 0x0001d R   0x1
-+  PHDR           0x000000 0x00000000 0x00000000 0x00000 0x00000 R   0
-+readelf: Error: the PHDR segment is not covered by a LOAD segment
-+  INTERP         0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R   0x1
-       [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3]
--  LOAD           0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000
--  LOAD           0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW  0x200000
--  DYNAMIC        0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW  0x4
--  NOTE           0x000194 0x00200194 0x00200194 0x00044 0x00044 R   0x4
--  GNU_EH_FRAME   0x012224 0x00212224 0x00212224 0x00008 0x00008 R   0x4
-+  LOAD           0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000
-+  LOAD           0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW  0x200000
-+  DYNAMIC        0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW  0x4
-+  NOTE           0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R   0x4
-+  GNU_EH_FRAME   0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R   0x4
-   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x10
--  EXIDX          0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R   0x4
--  GNU_RELRO      0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW  0x4
-+  EXIDX          0x032828 0x00032828 0x00032828 0x00008 0x00008 R   0x4
-+  GNU_RELRO      0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW  0x4
-
-  Section to Segment mapping:
-
-Revert fixes this build issue, but I still don't see why it fails this way.
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# Date:      Wed Sep 16 13:43:09 2020 +0200
-#
-# On branch jansa/master
-# Changes to be committed:
-#       new file:   meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch
-#       modified:   meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
-#
-# Untracked files:
-#       counts.txt
-#       diff
-#       log.svn
-#       log.svn2
-#       wip/
-#
----
- ld.hugetlbfs | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/ld.hugetlbfs b/ld.hugetlbfs
-index 5e4e497..6ee8238 100755
---- a/ld.hugetlbfs
-+++ b/ld.hugetlbfs
-@@ -130,9 +130,7 @@ if [ "$HTLB_ALIGN" == "slice" ]; then
-        # targeting the ARM platform one needs to explicitly set the text segment offset
-        # otherwise it will be NULL.
-        case "$EMU" in
--       armelf*_linux_eabi|aarch64elf*|aarch64linux*)
--               printf -v TEXTADDR "%x" "$SLICE_SIZE"
--               HTLBOPTS="$HTLBOPTS -Ttext-segment=$TEXTADDR" ;;
-+       armelf*_linux_eabi|aarch64elf*|aarch64linux*)   HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;;
-        elf_i386)               HTLBOPTS="$HTLBOPTS -Ttext-segment=0x08000000" ;;
-        elf64ppc|elf64lppc)
-                if [ "$MMU_TYPE" == "Hash" ] ; then
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
index a13c5389fb..3dbc34d08d 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
@@ -1,20 +1,20 @@
-From 183a4dafe141197de5840f2e48c266ef209307aa Mon Sep 17 00:00:00 2001
+From b448672f1bc08dcef2ae07727ae6f124a3032a35 Mon Sep 17 00:00:00 2001
 From: Ting Liu <b28495@freescale.com>
 Date: Mon, 18 Jun 2012 16:37:05 +0800
 Subject: [PATCH] skip checking LIB32 and LIB64 if they point to the same place
 
 Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Ting Liu <b28495@freescale.com>
 
+Signed-off-by: Ting Liu <b28495@freescale.com>
 ---
- Makefile | 1 -
+ Makefile.in | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/Makefile b/Makefile
-index 51e41f0..373df3c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -177,7 +177,6 @@ REALLIB32 = $(realpath $(PREFIX)/$(LIB32))
+diff --git a/Makefile.in b/Makefile.in
+index 65ae5a4..25be577 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -196,7 +196,6 @@ REALLIB32 = $(realpath $(PREFIX)/$(LIB32))
  REALLIB64 = $(realpath $(PREFIX)/$(LIB64))
  ifneq ($(realpath $(PREFIX)),)
  ifeq ($(REALLIB32),$(REALLIB64))
@@ -22,3 +22,6 @@ index 51e41f0..373df3c 100644
  endif
  endif
  
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch
deleted file mode 100644
index 78a4cb0fc2..0000000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b6dba773491bbb7b4664dacdd87a12af860f1bd8 Mon Sep 17 00:00:00 2001
-From: Oleksiy Obitotskyy <oobitots@cisco.com>
-Date: Thu, 28 Jan 2021 05:43:33 -0800
-Subject: [PATCH] tests/makefile: Append CPPFLAGS rather then override
-
-CPPFLAGS overrided and we could miss some options needed.
-
-Upstream-Status: Submitted
-Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
----
- tests/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/Makefile b/tests/Makefile
-index 0ca3716..d262932 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -33,8 +33,8 @@ HELPERS = get_hugetlbfs_path compare_kvers
- HELPER_LIBS = libheapshrink.so
- BADTOOLCHAIN = bad-toolchain.sh
- 
--CFLAGS = -O2 -Wall -g
--CPPFLAGS = -I..
-+CFLAGS += -O2 -Wall -g
-+CPPFLAGS += -I..
- STATIC_LIBHUGE = -Wl,--whole-archive -lhugetlbfs -Wl,--no-whole-archive
- STATIC_LDLIBS = -Wl,--no-as-needed -lpthread
- LDLIBS = $(STATIC_LDLIBS) -ldl -lhugetlbfs_privutils
--- 
-2.26.2.Cisco
-
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch
index f95e9e85a4..1b99c007f5 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch
@@ -1,4 +1,4 @@
-From 82a4f60ab24dff121f5f9d3bbcd9a8a28bb7caef Mon Sep 17 00:00:00 2001
+From d3903cbe348c6ecb2f38b37f20dafa6b0ca3b114 Mon Sep 17 00:00:00 2001
 From: Chunrong Guo <B40290@freescale.com>
 Date: Sun, 8 Sep 2013 23:21:49 -0500
 Subject: [PATCH] libhugetlbfs: avoid search host library path for cross
@@ -7,7 +7,6 @@ Subject: [PATCH] libhugetlbfs: avoid search host library path for cross
 Upstream-Status: Inappropriate [oe-core specific]
 
 Signed-off-by: Chunrong Guo <B40290@freescale.com>
-
 ---
  ldscripts/elf32ppclinux.xB   | 2 +-
  ldscripts/elf32ppclinux.xBDT | 2 +-
@@ -95,3 +94,6 @@ index 1855202..c62d245 100644
  INPUT(-lhugetlbfs);
  /* Do we need any of these for elf?
     __DYNAMIC = 0;    */
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-tests-Makefile-install-static-4G-edge-testcases.patch
index b8b2f8e6fb..98cdf2f51c 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-tests-Makefile-install-static-4G-edge-testcases.patch
@@ -1,22 +1,21 @@
-From f1ad8ff887f16daee8d06eca3df0f2541bfdaac0 Mon Sep 17 00:00:00 2001
+From 3e54866a0ea3c9e933e91213cbe6e55b7ff67b87 Mon Sep 17 00:00:00 2001
 From: Ting Liu <b28495@freescale.com>
 Date: Mon, 23 Sep 2013 08:00:55 +0000
-Subject: [PATCH] libhugetlbfs: add recipe
-
-Upstream-Status: Submitted
+Subject: [PATCH] tests/Makefile: install static 4G edge testcases
 
 TESTS_64 is empty, install will fail due to missing file operand
 
-Signed-off-by: Ting Liu <b28495@freescale.com>
+Upstream-Status: Submitted
 
+Signed-off-by: Ting Liu <b28495@freescale.com>
 ---
- tests/Makefile | 2 +-
+ tests/Makefile.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/tests/Makefile b/tests/Makefile
-index 073df96..0ca3716 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index d33a228..d262932 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
 @@ -295,7 +295,7 @@ obj64/install:
         $(INSTALL) -m 755 wrapper-utils.sh $(DESTDIR)$(INST_TESTSDIR64)/obj64
         $(INSTALL) -m 755 $(HELPERS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64
@@ -26,3 +25,6 @@ index 073df96..0ca3716 100644
         $(INSTALL) -m 755 run_tests.py $(DESTDIR)$(INST_TESTSDIR64)
  
  install: $(OBJDIRS:%=%/install)
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
index 83934abef8..6b010365a0 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
@@ -1,4 +1,4 @@
-From 0077532b07e268347cb8557be6d70148d5f0e840 Mon Sep 17 00:00:00 2001
+From 86d3ebfc4da5ccbc82fdee4abaf2cbf758d82403 Mon Sep 17 00:00:00 2001
 From: Ting Liu <b28495@freescale.com>
 Date: Wed, 21 Aug 2013 15:44:57 +0800
 Subject: [PATCH] run_test.py: not use hard coded path ../obj/hugeadm
@@ -20,10 +20,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/tests/run_tests.py b/tests/run_tests.py
-index 018264d..0aabcd1 100755
+index 4793262..6cd0241 100755
 --- a/tests/run_tests.py
 +++ b/tests/run_tests.py
-@@ -245,9 +245,19 @@ def get_pagesizes():
+@@ -250,9 +250,19 @@ def get_pagesizes():
      Use libhugetlbfs' hugeadm utility to get a list of page sizes that have
      active mount points and at least one huge page allocated to the pool.
      """
@@ -45,5 +45,5 @@ index 018264d..0aabcd1 100755
          return sizes
  
 -- 
-2.7.4
+2.25.1
 
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
index 7cc180a4b7..fc8776af66 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
@@ -1,4 +1,4 @@
-From b5887693d90c430291b644c2f5713b5fdd1777ce Mon Sep 17 00:00:00 2001
+From 8c7a379876e3c7a32bef8620f94a85d20b7b186f Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Tue, 4 Nov 2014 00:49:11 -0800
 Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for
@@ -7,7 +7,6 @@ Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for
 Upstream-Status: Inappropriate [cross compile specific]
 
 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
-
 ---
  ldscripts/elf_i386.xB   | 1 -
  ldscripts/elf_i386.xBDT | 1 -
@@ -37,3 +36,6 @@ index d72aebe..3bac1b1 100644
  INPUT(-lhugetlbfs);
  /* Do we need any of these for elf?
     __DYNAMIC = 0;    */
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-stddef.h-for-ptrdiff_t.patch
index 914b0514f8..33a4efb1fa 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-stddef.h-for-ptrdiff_t.patch
@@ -1,18 +1,17 @@
-From 351d1de09dd80049b7a2cb02c5750635d0389873 Mon Sep 17 00:00:00 2001
+From 5fe5dae674e259bcdd57b9c6a0004111ab0700ce Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:25:57 -0700
 Subject: [PATCH] include stddef.h for ptrdiff_t
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
  morecore.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/morecore.c b/morecore.c
-index 6563bbd..0eef782 100644
+index 405c566..0edccd2 100644
 --- a/morecore.c
 +++ b/morecore.c
 @@ -19,6 +19,7 @@
@@ -23,3 +22,6 @@ index 6563bbd..0eef782 100644
  #include <stdio.h>
  #include <stdlib.h>
  #include <malloc.h>
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0007-Mark-glibc-specific-code-so.patch
index 7ad6c43eb1..5b2c91b8a1 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0007-Mark-glibc-specific-code-so.patch
@@ -1,21 +1,20 @@
-From 0f548286848c70aa325c6748d80e8651389b4938 Mon Sep 17 00:00:00 2001
+From c98e64c56d0118a2d5f950eaceaed0e85eaa2543 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:32:59 -0700
 Subject: [PATCH] Mark glibc specific code so
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
  morecore.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/morecore.c b/morecore.c
-index 0eef782..d48509c 100644
+index 0edccd2..db22216 100644
 --- a/morecore.c
 +++ b/morecore.c
-@@ -364,6 +364,7 @@ void hugetlbfs_setup_morecore(void)
+@@ -371,6 +371,7 @@ void hugetlbfs_setup_morecore(void)
  
         INFO("setup_morecore(): heapaddr = 0x%lx\n", heapaddr);
  
@@ -23,7 +22,7 @@ index 0eef782..d48509c 100644
         heaptop = heapbase = (void *)heapaddr;
         if (__hugetlb_opts.thp_morecore)
                 __morecore = &thp_morecore;
-@@ -371,7 +372,6 @@ void hugetlbfs_setup_morecore(void)
+@@ -378,7 +379,6 @@ void hugetlbfs_setup_morecore(void)
                 __morecore = &hugetlbfs_morecore;
  
         /* Set some allocator options more appropriate for hugepages */
@@ -31,9 +30,13 @@ index 0eef782..d48509c 100644
         if (__hugetlb_opts.shrink_ok)
                 mallopt(M_TRIM_THRESHOLD, hpage_size + hpage_size / 2);
         else
-@@ -381,4 +381,5 @@ void hugetlbfs_setup_morecore(void)
+@@ -388,5 +388,6 @@ void hugetlbfs_setup_morecore(void)
          * This doesn't appear to prohibit malloc() from falling back
          * to mmap() if we run out of hugepages. */
         mallopt(M_MMAP_MAX, 0);
 +#endif
  }
+ #endif /* HAS_MORECORE */
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch
index 858a8e511a..73844b71f9 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch
@@ -1,20 +1,19 @@
-From 9ff04d7acc700387e3837f8ab11a41efea5ee8b0 Mon Sep 17 00:00:00 2001
+From 4f69eb130dc2c67a90f2460cedb78f6db11dd6d2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:44:26 -0700
 Subject: [PATCH] alloc.c: Avoid sysconf(_SC_LEVEL2_CACHE_LINESIZE) on linux
 
 musl does not have it
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
  alloc.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/alloc.c b/alloc.c
-index bce9464..cf7eb40 100644
+index b8ed663..a58c43d 100644
 --- a/alloc.c
 +++ b/alloc.c
 @@ -245,6 +245,19 @@ void free_huge_pages(void *ptr)
@@ -46,3 +45,6 @@ index bce9464..cf7eb40 100644
                 linemod = time(NULL);
         }
  
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0009-shm.c-Mark-glibc-specific-changes-so.patch
index c3f7b3e479..4fbf30e24b 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0009-shm.c-Mark-glibc-specific-changes-so.patch
@@ -1,13 +1,12 @@
-From 9ce323432a7f4d99f617970c7e35b607b9bbf843 Mon Sep 17 00:00:00 2001
+From 37239dd5f14a34b05e77b3ca6e34f96161f1339a Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:48:04 -0700
 Subject: [PATCH] shm.c: Mark glibc specific changes so
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
  shm.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
@@ -28,3 +27,6 @@ index 1f82cab..9447b63 100644
  
  /* call syscall shmget through the generic syscall mechanism */
  static int syscall_shmget(key_t key, size_t size, int shmflg)
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0010-Include-dirent.h-for-ino_t.patch
index 8bd1633392..a530a5267a 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0010-Include-dirent.h-for-ino_t.patch
@@ -1,4 +1,4 @@
-From bb8c370aaaf25b1fe1fbf984e73177018026cb91 Mon Sep 17 00:00:00 2001
+From ec9163c0436d1c77cecc941aca2e524b26001b15 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:51:02 -0700
 Subject: [PATCH] Include dirent.h for ino_t
@@ -6,13 +6,13 @@ Subject: [PATCH] Include dirent.h for ino_t
 Fixes
 error: unknown type name 'ino_t'; did you mean 'int'?
 
+Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 Update for 2.22.
 Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
 ---
-Upstream-Status: Pending
-
  tests/hugetests.h | 1 +
  1 file changed, 1 insertion(+)
 
@@ -29,5 +29,5 @@ index bc4e16a..fbe4dc0 100644
  
  #include "libhugetlbfs_privutils.h"
 -- 
-2.7.4
+2.25.1
 
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0011-include-limits.h-for-PATH_MAX.patch
index e4f8030961..08de396d9f 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0011-include-limits.h-for-PATH_MAX.patch
@@ -1,4 +1,4 @@
-From 5f64aa8c47c2d3a155a97e262f89cc47394a69eb Mon Sep 17 00:00:00 2001
+From 79b76433f4b6f2f14914817b7e8ac0db1df39250 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 21 Jun 2018 19:58:53 -0700
 Subject: [PATCH] include limits.h for PATH_MAX
@@ -7,17 +7,16 @@ Fixes
 
 error: 'PATH_MAX' undeclared
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
  hugeadm.c                | 1 +
  tests/gethugepagesizes.c | 1 +
  2 files changed, 2 insertions(+)
 
 diff --git a/hugeadm.c b/hugeadm.c
-index fe4211d..8db274c 100644
+index 79a4867..65d5136 100644
 --- a/hugeadm.c
 +++ b/hugeadm.c
 @@ -33,6 +33,7 @@
@@ -29,7 +28,7 @@ index fe4211d..8db274c 100644
  #include <sys/stat.h>
  #include <sys/types.h>
 diff --git a/tests/gethugepagesizes.c b/tests/gethugepagesizes.c
-index 9551b38..2645e3f 100644
+index 5777265..990db69 100644
 --- a/tests/gethugepagesizes.c
 +++ b/tests/gethugepagesizes.c
 @@ -29,6 +29,7 @@
@@ -40,3 +39,6 @@ index 9551b38..2645e3f 100644
  
  #include "hugetests.h"
  
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-huge_page_setup_helper-use-python3-interpreter.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0012-huge_page_setup_helper-use-python3-interpreter.patch
index e45f283b38..0583df95ad 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-huge_page_setup_helper-use-python3-interpreter.patch
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0012-huge_page_setup_helper-use-python3-interpreter.patch
@@ -1,4 +1,4 @@
-From b77c61de4d88d2c6e5d31f4f5a5877cc4c61272e Mon Sep 17 00:00:00 2001
+From e5580e392b8764e1e6509c5a4ed13fb2ce7566b9 Mon Sep 17 00:00:00 2001
 From: Andrey Zhizhikin <andrey.z@gmail.com>
 Date: Mon, 27 Jan 2020 17:27:55 +0000
 Subject: [PATCH] huge_page_setup_helper: use python3 interpreter
@@ -15,7 +15,7 @@ Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/huge_page_setup_helper.py b/huge_page_setup_helper.py
-index a9ba2bf..7ba0c92 100755
+index 01fc8dc..79a88ca 100755
 --- a/huge_page_setup_helper.py
 +++ b/huge_page_setup_helper.py
 @@ -1,4 +1,4 @@
@@ -25,5 +25,5 @@ index a9ba2bf..7ba0c92 100755
  #
  # Tool to set up Linux large page support with minimal effort
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch
new file mode 100644
index 0000000000..264a535cc7
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch
@@ -0,0 +1,41 @@
+From 825444522d698991be04bbfa683a7cf785c6f72c Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Wed, 2 Oct 2024 00:06:34 +0800
+Subject: [PATCH] elflink.c: include libgen.h for basename
+
+Basename prototype has been removed from string.h from latest musl[1].
+Compilers e.g. clang-18 flags the absense of prototype as error.
+Therefore include libgen.h for providing it.
+
+elflink.c: In function 'get_shared_file_name':
+elflink.c:363:19: error: implicit declaration of function 'basename' [-Wimplicit-function-declaration]
+  363 |         binary2 = basename(binary);
+      |                   ^~~~~~~~
+elflink.c:363:17: error: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
+  363 |         binary2 = basename(binary);
+      |                 ^
+
+[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
+
+Upstream-Status: Pending
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ elflink.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/elflink.c b/elflink.c
+index 278d338..0e78d61 100644
+--- a/elflink.c
++++ b/elflink.c
+@@ -38,6 +38,7 @@
+ #include <limits.h>
+ #include <elf.h>
+ #include <dlfcn.h>
++#include <libgen.h>
+ 
+ #include "version.h"
+ #include "hugetlbfs.h"
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb
new file mode 100644
index 0000000000..e688d6ede2
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb
@@ -0,0 +1,79 @@
+SUMMARY = "A library which provides easy access to huge pages of memory"
+HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+RDEPENDS:${PN} += "bash"
+RDEPENDS:${PN}-tests += "bash python3-core python3-resource"
+
+PE = "1"
+
+SRCREV = "1322884fb0d55dc55f53563c1aa6328d118997e7"
+SRC_URI = " \
+    git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https;branch=master \
+    file://0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \
+    file://0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch \
+    file://0003-tests-Makefile-install-static-4G-edge-testcases.patch \
+    file://0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
+    file://0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
+    file://0006-include-stddef.h-for-ptrdiff_t.patch \
+    file://0007-Mark-glibc-specific-code-so.patch \
+    file://0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \
+    file://0009-shm.c-Mark-glibc-specific-changes-so.patch \
+    file://0010-Include-dirent.h-for-ino_t.patch \
+    file://0011-include-limits.h-for-PATH_MAX.patch \
+    file://0012-huge_page_setup_helper-use-python3-interpreter.patch \
+    file://0013-elflink.c-include-libgen.h-for-basename.patch \
+"
+
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
+
+
+COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*"
+
+LIBARGS = "LIB32=${baselib} LIB64=${baselib}"
+LIBHUGETLBFS_ARCH = "${TARGET_ARCH}"
+LIBHUGETLBFS_ARCH:powerpc = "ppc"
+LIBHUGETLBFS_ARCH:powerpc64 = "ppc64"
+LIBHUGETLBFS_ARCH:powerpc64le = "ppc64le"
+EXTRA_OEMAKE = "'ARCH=${LIBHUGETLBFS_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' ${LIBARGS} BUILDTYPE=NATIVEONLY V=2"
+PARALLEL_MAKE = ""
+CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0"
+
+export HUGETLB_LDSCRIPT_PATH = "${S}/ldscripts"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+LDFLAGS += "-B${S}"
+
+inherit autotools-brokensep
+
+do_configure:prepend() {
+    ln -sf ld.hugetlbfs ${S}/ld
+    ln -sf ld.hugetlbfs ${S}/ld.bfd
+    ln -sf ld.hugetlbfs ${S}/ld.lld
+}
+
+do_install() {
+    oe_runmake PREFIX=${prefix} DESTDIR=${D}  \
+        INST_TESTSDIR32=${libdir}/libhugetlbfs/tests \
+        INST_TESTSDIR64=${libdir}/libhugetlbfs/tests \
+        install-tests
+
+    sed -i \
+        -e 's|${RECIPE_SYSROOT_NATIVE}||g' \
+        -e 's|${RECIPE_SYSROOT}||g' \
+        -e 's|${S}||g' \
+        `find ${D}${libdir}/libhugetlbfs/tests -name dummy.ldscript`
+}
+
+PACKAGES =+ "${PN}-tests "
+FILES:${PN} += "${libdir}/*.so"
+FILES:${PN}-dev = "${includedir}"
+FILES:${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug"
+FILES:${PN}-tests += "${libdir}/libhugetlbfs/tests"
+
+INSANE_SKIP:${PN} = "dev-so"
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
deleted file mode 100644
index 80af9873b1..0000000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ /dev/null
@@ -1,79 +0,0 @@
-SUMMARY = "A library which provides easy access to huge pages of memory"
-HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
-
-DEPENDS = "sysfsutils"
-RDEPENDS:${PN} += "bash python3-core"
-RDEPENDS:${PN}-tests += "bash python3-core"
-
-PV = "2.23"
-PE = "1"
-
-SRCREV = "6b126a4d7da9490fa40fe7e1b962edcb939feddc"
-SRC_URI = " \
-    git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https;branch=master \
-    file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \
-    file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \
-    file://tests-Makefile-install-static-4G-edge-testcases.patch \
-    file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
-    file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
-    file://0001-include-stddef.h-for-ptrdiff_t.patch \
-    file://0002-Mark-glibc-specific-code-so.patch \
-    file://0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \
-    file://0004-shm.c-Mark-glibc-specific-changes-so.patch \
-    file://0005-Include-dirent.h-for-ino_t.patch \
-    file://0006-include-limits.h-for-PATH_MAX.patch \
-    file://0001-huge_page_setup_helper-use-python3-interpreter.patch \
-    file://0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch \
-    file://0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch \
-"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
-
-S = "${WORKDIR}/git"
-
-COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*"
-
-LIBARGS = "LIB32=${baselib} LIB64=${baselib}"
-LIBHUGETLBFS_ARCH = "${TARGET_ARCH}"
-LIBHUGETLBFS_ARCH:powerpc = "ppc"
-LIBHUGETLBFS_ARCH:powerpc64 = "ppc64"
-LIBHUGETLBFS_ARCH:powerpc64le = "ppc64le"
-EXTRA_OEMAKE = "'ARCH=${LIBHUGETLBFS_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' ${LIBARGS} BUILDTYPE=NATIVEONLY V=2"
-PARALLEL_MAKE = ""
-CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0"
-
-export HUGETLB_LDSCRIPT_PATH="${S}/ldscripts"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-#The CUSTOM_LDSCRIPTS doesn't work with the gold linker
-inherit cpan-base
-do_configure() {
-    if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then
-      sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/'  Makefile
-    fi
-}
-
-do_install() {
-        oe_runmake PREFIX=${prefix} DESTDIR=${D}  \
-          INST_TESTSDIR32=${libdir}/libhugetlbfs/tests \
-          INST_TESTSDIR64=${libdir}/libhugetlbfs/tests \
-          install-tests
-}
-
-
-PACKAGES =+ "${PN}-tests "
-FILES:${PN} += "${libdir}/*.so"
-FILES:${PN}-dev = "${includedir}"
-FILES:${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug"
-FILES:${PN}-tests += "${libdir}/libhugetlbfs/tests"
-
-INSANE_SKIP:${PN} = "dev-so"
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-# see https://github.com/libhugetlbfs/libhugetlbfs/issues/52
-SKIP_RECIPE[libhugetlbfs] ?= "Needs porting to glibc 2.34+"
diff --git a/meta-oe/recipes-benchmark/linpack/linpack/0001-Fix-build-error-in-gcc-15.0.1-due-to-function-redecl.patch b/meta-oe/recipes-benchmark/linpack/linpack/0001-Fix-build-error-in-gcc-15.0.1-due-to-function-redecl.patch
new file mode 100644
index 0000000000..fbde7396c2
--- /dev/null
+++ b/meta-oe/recipes-benchmark/linpack/linpack/0001-Fix-build-error-in-gcc-15.0.1-due-to-function-redecl.patch
@@ -0,0 +1,52 @@
+From a1c1211fd6fc8d82053074c6dc531340f046c8d4 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Tue, 1 Apr 2025 16:06:56 +0900
+Subject: [PATCH] Fix build error in gcc 15.0.1 due to function redeclaration.
+
+Fix build error:
+linpacknew.c: In function 'dgefa':
+linpacknew.c:257:9: error: conflicting types for 'idamax'; have 'int(void)'
+  257 |     int idamax(),j,k,kp1,l,nm1;
+      |         ^~~~~~
+linpacknew.c:63:13: note: previous declaration of 'idamax' with type 'int(int,  REAL *, int)' {aka 'int(int,  double *, int)'}
+   63 | static int  idamax   (int n,REAL *dx,int incx);
+      |             ^~~~~~
+linpacknew.c:272:21: error: too many arguments to function 'idamax'; expected 0, have 3
+  272 |                 l = idamax(n-k,&a[lda*k+k],1) + k;
+      |                     ^~~~~~ ~~~
+linpacknew.c:257:9: note: declared here
+  257 |     int idamax(),j,k,kp1,l,nm1;
+      |         ^~~~~~
+linpacknew.c:326:21: error: too many arguments to function 'idamax'; expected 0, have 3
+  326 |                 l = idamax(n-k,&a[lda*k+k],1) + k;
+      |                     ^~~~~~ ~~~
+linpacknew.c:257:9: note: declared here
+  257 |     int idamax(),j,k,kp1,l,nm1;
+      |         ^~~~~~
+
+The function was already declared as static int idamax(int n, REAL *dx, int incx);
+on line 63, but it was redeclared as int idamax() inside the dgefa function on line 257,
+causing a conflict.
+where functions are redeclared without parameters,
+causing conflicts with the original function definitions.
+
+Upstream-Status: Inactive-Upstream [lastrelease: 2/25/94]
+
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ linpacknew.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linpacknew.c b/linpacknew.c
+index c656082..5c8687b 100644
+--- a/linpacknew.c
++++ b/linpacknew.c
+@@ -254,7 +254,7 @@ static void dgefa(REAL *a,int lda,int n,int *ipvt,int *info,int roll)
+ 
+     {
+     REAL t;
+-    int idamax(),j,k,kp1,l,nm1;
++    int j,k,kp1,l,nm1;
+ 
+     /* gaussian elimination with partial pivoting */
+ 
diff --git a/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb b/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb
index a0327ee154..6a500dbf01 100644
--- a/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb
+++ b/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb
@@ -2,16 +2,15 @@ DESCRIPTION = "LINPACK Benchmarks are a measure of a system's floating point com
 SUMMARY = "LINPACK is a software library for performing numerical linear algebra on digital computers"
 
 LICENSE = "PD"
-LIC_FILES_CHKSUM ="file://${UNPACKDIR}/linpacknew.c;beginline=1;endline=23;md5=aa025e3bc44190c71e4c5e3b084fed87"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/linpacknew.c;beginline=1;endline=23;md5=aa025e3bc44190c71e4c5e3b084fed87"
 
 SRC_URI = "http://www.netlib.org/benchmark/linpackc.new;downloadfilename=linpacknew.c \
            file://0001-linpack-Define-DP-only-when-SP-is-not-defined.patch \
+                   file://0001-Fix-build-error-in-gcc-15.0.1-due-to-function-redecl.patch \
           "
-SRC_URI[md5sum] = "1c5d0b6a31264685d2e651c920e3cdf4"
 SRC_URI[sha256sum] = "a63f2ec86512959f1fd926bfafb85905b2d7b7402942ffae3af374d48745e97e"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile () {
         ${CC} ${CFLAGS} ${LDFLAGS} -DDP -o linpack_dp linpacknew.c -lm
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/0001-Fix-build-errors-related-to-incorrect-function-param.patch b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-Fix-build-errors-related-to-incorrect-function-param.patch
new file mode 100644
index 0000000000..30f52023cd
--- /dev/null
+++ b/meta-oe/recipes-benchmark/lmbench/lmbench/0001-Fix-build-errors-related-to-incorrect-function-param.patch
@@ -0,0 +1,252 @@
+From 8a6b5f649fe7f42aff4f69a8d99c522adb22f54c Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Thu, 10 Apr 2025 13:19:07 +0900
+Subject: [PATCH] Fix build errors related to incorrect function parameters in
+ gcc-15
+
+* see more details
+  http://errors.yoctoproject.org/Errors/Details/851798/
+
+    lat_rpc.c:172:1: error: conflicting types for 'client_rpc_xact_1'; have 'char *(char *, CLIENT *)' {aka 'char *(char *, struct __rpc_client *)'}
+    172 | client_rpc_xact_1(char *argp, CLIENT *clnt)
+        | ^~~~~~~~~~~~~~~~~
+    bench.h:349:14: note: previous declaration of 'client_rpc_xact_1' with type 'char *(void)'
+    349 | extern char *client_rpc_xact_1();
+        |              ^~~~~~~~~~~~~~~~~
+    lat_rpc.c: In function 'rpc_xact_1':
+    lat_rpc.c:189:1: warning: old-style function definition [-Wold-style-definition]
+    189 | rpc_xact_1(msg, transp)
+        | ^~~~~~~~~~
+    lat_rpc.c:192:1: error: number of arguments doesn't match prototype
+    192 | {
+        | ^
+    bench.h:348:14: error: prototype declaration
+    348 | extern char *rpc_xact_1();
+        |              ^~~~~~~~~~
+
+  Fix errors due to old-style function declarations
+
+  The code was using old-style function declarations without proper prototypes,
+  which causes compilation errors with newer GCC versions. This patch updates
+  the function declarations to use modern C syntax with proper parameter types.
+
+Upstream-Status: Submitted [https://sourceforge.net/p/lmbench/patches/3]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/bench.h   |  4 ++--
+ src/lat_rpc.c | 24 ++++++++++--------------
+ src/lat_udp.c |  4 ++--
+ src/lmdd.c    | 18 +++++++++---------
+ src/lmhttp.c  |  4 ++--
+ 5 files changed, 25 insertions(+), 29 deletions(-)
+
+diff --git a/src/bench.h b/src/bench.h
+index 1768ef7..4fc2822 100644
+--- a/src/bench.h
++++ b/src/bench.h
+@@ -345,7 +345,7 @@ extern int sched_pin(int cpu);
+ #define XACT_VERS ((u_long)1)
+ #define RPC_XACT ((u_long)1)
+ #define RPC_EXIT ((u_long)2)
+-extern char *rpc_xact_1();
+-extern char *client_rpc_xact_1();
++extern char *rpc_xact_1(char *msg, struct svc_req *rqstp);
++extern char *client_rpc_xact_1(char *argp, CLIENT *clnt);
+ 
+ #endif /* _BENCH_H */
+diff --git a/src/lat_rpc.c b/src/lat_rpc.c
+index 9c02192..e1450af 100644
+--- a/src/lat_rpc.c
++++ b/src/lat_rpc.c
+@@ -185,17 +185,15 @@ client_rpc_xact_1(char *argp, CLIENT *clnt)
+  * The remote procedure[s] that will be called
+  */
+ /* ARGSUSED */
+-char   *
+-rpc_xact_1(msg, transp)
+-       char    *msg;
+-       register SVCXPRT *transp;
++char *
++rpc_xact_1(char *msg, struct svc_req *rqstp /* transp is unused */)
+ {
+        static char r = 123;
+ 
+        return &r;
+ }
+ 
+-static void xact_prog_1();
++static void xact_prog_1(struct svc_req *rqstp, register SVCXPRT *transp);
+ 
+ void
+ server_main()
+@@ -233,16 +231,14 @@ server_main()
+ }
+ 
+ static void
+-xact_prog_1(rqstp, transp)
+-       struct svc_req *rqstp;
+-       register SVCXPRT *transp;
++xact_prog_1(struct svc_req *rqstp, register SVCXPRT *transp)
+ {
+        union {
+                char rpc_xact_1_arg;
+        } argument;
+        char *result;
+-       bool_t (*xdr_argument)(), (*xdr_result)();
+-       char *(*local)();
++       bool_t (*xdr_argument)(XDR *, void *), (*xdr_result)(XDR *, void *);
++       char *(*local)(char *, struct svc_req *);
+ 
+        switch (rqstp->rq_proc) {
+        case NULLPROC:
+@@ -250,9 +246,9 @@ xact_prog_1(rqstp, transp)
+                return;
+ 
+        case RPC_XACT:
+-               xdr_argument = xdr_char;
+-               xdr_result = xdr_char;
+-               local = (char *(*)()) rpc_xact_1;
++               xdr_argument = (bool_t (*)(XDR *, void *))xdr_char;
++               xdr_result = (bool_t (*)(XDR *, void *))xdr_char;
++               local = rpc_xact_1;
+                break;
+ 
+        case RPC_EXIT:
+@@ -269,7 +265,7 @@ xact_prog_1(rqstp, transp)
+                svcerr_decode(transp);
+                return;
+        }
+-       result = (*local)(&argument, rqstp);
++       result = local(&argument.rpc_xact_1_arg, rqstp);
+        if (result != NULL && !svc_sendreply(transp, (xdrproc_t)xdr_result, result)) {
+                svcerr_systemerr(transp);
+        }
+diff --git a/src/lat_udp.c b/src/lat_udp.c
+index cdd2e9b..292d5c4 100644
+--- a/src/lat_udp.c
++++ b/src/lat_udp.c
+@@ -19,7 +19,7 @@ char  *id = "$Id$\n";
+ 
+ void   client_main(int ac, char **av);
+ void   server_main();
+-void   timeout();
++void   timeout(int sig);
+ void   init(iter_t iterations, void* cookie);
+ void   cleanup(iter_t iterations, void* cookie);
+ void    doit(iter_t iterations, void* cookie);
+@@ -164,7 +164,7 @@ cleanup(iter_t iterations, void* cookie)
+ }
+ 
+ void
+-timeout()
++timeout(__attribute__((unused)) int sig)
+ {
+        fprintf(stderr, "Recv timed out\n");
+        exit(1);
+diff --git a/src/lmdd.c b/src/lmdd.c
+index dee37b4..da64b04 100644
+--- a/src/lmdd.c
++++ b/src/lmdd.c
+@@ -76,7 +76,7 @@ int   norepeats = -1;
+        bds_msg *m1, *m2;
+ #endif
+ 
+-uint64 getarg();
++uint64 getarg(char *s, int ac, char **av);
+ int    been_there(uint64 off);
+ int    getfile(char *s, int ac, char **av);
+ 
+@@ -148,7 +148,7 @@ char   *cmds[] = {
+ 
+ 
+ void error(char *);
+-void    done();
++void    done(int sig);
+ #ifdef DBG
+ extern int dbg;
+ #endif
+@@ -162,7 +162,7 @@ main(int ac, char **av)
+        int     Fork, misses, mismatch, outpat, inpat, in, timeopen, gotcnt;
+        int     slp;
+        uint64  skip, size, count;
+-       void    chkarg();
++       void    chkarg(char *arg);
+        int     i;
+        uint64  off = 0;
+        int     touch;
+@@ -332,7 +332,7 @@ main(int ac, char **av)
+                register int moved;
+ 
+                if (gotcnt && count-- <= 0) {
+-                       done();
++                       done(0);
+                }
+ 
+                /*
+@@ -445,7 +445,7 @@ main(int ac, char **av)
+                        perror("read");
+                }
+                if (moved <= 0) {
+-                       done();
++                       done(0);
+                }
+                if (inpat != -1) {
+                        register int foo, cnt;
+@@ -458,7 +458,7 @@ main(int ac, char **av)
+                                            (uint)(off + foo*sizeof(int)),
+                                            buf[foo]);
+                                        if (mismatch != -1 && --misses == 0) {
+-                                               done();
++                                               done(0);
+                                        }
+                                }
+                        }
+@@ -523,7 +523,7 @@ main(int ac, char **av)
+                        if (moved2 != moved) {
+                                fprintf(stderr, "write: wanted=%d got=%d\n",
+                                    moved, moved2);
+-                               done();
++                               done(0);
+                        }
+                        if ((Wtmax != -1) || (Wtmin != -1)) {
+                                int mics = stop(&start_tv, &stop_tv);
+@@ -560,7 +560,7 @@ main(int ac, char **av)
+                                perror("write");
+                        }
+                        if (moved2 != moved) {
+-                               done();
++                               done(0);
+                        }
+ 
+                        if (touch) {
+@@ -626,7 +626,7 @@ chkarg(char *arg)
+ }
+ 
+ void 
+-done(void)
++done(__attribute__((unused)) int sig)
+ {
+        int     i;
+        int     step;
+diff --git a/src/lmhttp.c b/src/lmhttp.c
+index 41d9949..c2f3cb9 100644
+--- a/src/lmhttp.c
++++ b/src/lmhttp.c
+@@ -26,7 +26,7 @@ char  *buf;
+ char   *bufs[3];
+ int    Dflg, dflg, nflg, lflg, fflg, zflg;
+ int    data, logfile;
+-void   die();
++void   die(int sig);
+ void   worker();
+ char   *http_time(void);
+ char   *date(time_t *tt);
+@@ -387,7 +387,7 @@ logit(int sock, char *name, int size)
+        nbytes += len;
+ }
+ 
+-void die()
++void die(__attribute__((unused)) int sig)
+ {
+        if (nbytes) {
+                write(logfile, logbuf, nbytes);
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
index 6729e81fa5..acd4d6decf 100644
--- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
+++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
@@ -29,8 +29,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
            file://0001-doc-Fix-typos-in-lat_unix_connect-manual-page.patch \
            file://0001-bench.h-Fix-typo-in-specifying-string.h.patch \
            file://0001-scripts-build-Fix-the-tests-to-build-with-clang15.patch \
+           file://0001-Fix-build-errors-related-to-incorrect-function-param.patch \
            "
-SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf"
 SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lmbench/files/development/"
diff --git a/meta-oe/recipes-benchmark/mbw/mbw_2.0.bb b/meta-oe/recipes-benchmark/mbw/mbw_2.0.bb
index bb8c4625d5..1fd95de038 100644
--- a/meta-oe/recipes-benchmark/mbw/mbw_2.0.bb
+++ b/meta-oe/recipes-benchmark/mbw/mbw_2.0.bb
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/raas/${BPN}.git;branch=master;protocol=https"
 
 SRCREV = "c3155b544a5065e8235508059c6512af6c46bd4d"
 
-S = "${WORKDIR}/git"
 
 do_install() {
     install -d ${D}${bindir}
diff --git a/meta-oe/recipes-benchmark/memtester/memtester_4.6.0.bb b/meta-oe/recipes-benchmark/memtester/memtester_4.7.1.bb
index 42cee1108d..fd6713ea9f 100644
--- a/meta-oe/recipes-benchmark/memtester/memtester_4.6.0.bb
+++ b/meta-oe/recipes-benchmark/memtester/memtester_4.7.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \
            file://Makefile.patch \
            "
-SRC_URI[sha256sum] = "c9fe4eb7e80c8cef5202f9065c4c0682f5616647c0455e916a5700f98e3dbb2e"
+SRC_URI[sha256sum] = "e427de663f7bd22d1ebee8af12506a852c010bd4fcbca1e0e6b02972d298b5bb"
 
 do_compile () {
     echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc
diff --git a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/0001-Fix-build-error-with-gcc-15.patch b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/0001-Fix-build-error-with-gcc-15.patch
new file mode 100644
index 0000000000..8e01e17e91
--- /dev/null
+++ b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/0001-Fix-build-error-with-gcc-15.patch
@@ -0,0 +1,34 @@
+From 3ee8798764919cd3f7d983f99f6189bbb940d639 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Thu, 10 Apr 2025 10:53:14 +0900
+Subject: [PATCH] Fix build error with gcc-15
+
+* Fix the following build error with gcc-15:
+nbench1.c:3520:13: error: conflicting types for 'adjust_mid_wts'; have 'void(int)'
+ 3520 | static void adjust_mid_wts(int patt)
+      |             ^~~~~~~~~~~~~~
+In file included from nbench1.c:64:
+nbench1.h:373:13: note: previous declaration of 'adjust_mid_wts' with type 'void(void)'
+  373 | static void adjust_mid_wts();
+      |             ^~~~~~~~~~~~~~
+
+Upstream-Status: Inappropriate [no upstream]
+
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ nbench1.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nbench1.h b/nbench1.h
+index 13a5907..b81ca82 100644
+--- a/nbench1.h
++++ b/nbench1.h
+@@ -370,7 +370,7 @@ static void do_out_error(int patt);
+ static void worst_pass_error();
+ static void do_mid_error();
+ static void adjust_out_wts();
+-static void adjust_mid_wts();
++static void adjust_mid_wts(int patt);
+ static void do_back_pass(int patt);
+ static void move_wt_changes();
+ static int check_out_error();
diff --git a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb
index b4d55be1b0..da03ebb291 100644
--- a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb
+++ b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb
@@ -9,9 +9,9 @@ SECTION = "console/utils"
 
 SRC_URI = "https://fossies.org/linux/misc/old/${BP}.tar.gz \
            file://nbench_32bits.patch \
-           file://Makefile-add-more-dependencies-to-pointer.h.patch"
+           file://Makefile-add-more-dependencies-to-pointer.h.patch \
+           file://0001-Fix-build-error-with-gcc-15.patch"
 
-SRC_URI[md5sum] = "285dfab361080759d477ea1fe7d3093a"
 SRC_URI[sha256sum] = "723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb
index 8de3314b3c..5f105c9f8e 100644
--- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb
+++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz \
 
 SRC_URI[sha256sum] = "1f2092d536c0a3193efc53e4a50f3cee65c0ef1a78d31e5404f1c663fff7b7f4"
 
-S = "${WORKDIR}/phoronix-test-suite"
+S = "${UNPACKDIR}/phoronix-test-suite"
 
 inherit systemd allarch mime mime-xdg
 
@@ -25,6 +25,9 @@ do_install() {
     fi
 }
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[pdf] = ",,,ttf-dejavu-sans"
+
 # It is not advisable to enable these services by default since they can cause
 # continual target reboots if they encounter network problems.
 #
diff --git a/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb b/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb
index b32f37153e..e034371604 100644
--- a/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb
+++ b/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb
@@ -9,7 +9,6 @@ inherit autotools-brokensep
 SRCREV = "c706363815a38ff2c5cbc07b73e2cfaaa59bae0f"
 SRC_URI = "git://github.com/linux-rdma/qperf.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 do_configure() {
   ./cleanup
diff --git a/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb b/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb
index 629b123042..caefdb7b6b 100644
--- a/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb
+++ b/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb
@@ -6,7 +6,10 @@ SRCREV = "f97f1ae321d1fb8111a2c638075702ed2512ff07"
 PV = "3.6"
 SRC_URI = "git://github.com/Algodev-github/S.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
+# Current PV is not a git tag but a Readme content, track commits to detect
+# upstream updates
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 # installing in /opt/S-suite since the package has
 # dependencies to the directory structure.
diff --git a/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb b/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb
index ba61ff971e..2d450094b7 100644
--- a/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb
+++ b/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb
@@ -18,6 +18,5 @@ GI_DATA_ENABLED:libc-musl:armv7a = "False"
 GI_DATA_ENABLED:libc-musl:armv7ve = "False"
 SRC_URI = "git://github.com/stressapptest/stressapptest;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
diff --git a/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb b/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb
index 11e33fec55..198552e5c6 100644
--- a/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb
+++ b/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb
@@ -13,7 +13,6 @@ inherit autotools-brokensep pkgconfig
 SRC_URI = "git://github.com/akopytov/sysbench.git;protocol=https;branch=master"
 SRCREV = "ebf1c90da05dea94648165e4f149abc20c979557"
 
-S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64).*-linux*"
 
diff --git a/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb b/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb
index 200a0de849..8f65a6135c 100644
--- a/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb
+++ b/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/ssvb/tinymembench.git;branch=master;protocol=https \
            file://0001-asm-Delete-.func-.endfunc-directives.patch \
            "
 
-S = "${WORKDIR}/git"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
diff --git a/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb b/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
index 0769715f45..98914836ed 100644
--- a/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
+++ b/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
@@ -11,7 +11,6 @@ SRC_URI = "\
     file://0001-Drop-inline-of-crc32-function-to-fix-build-using-GCC.patch \
     file://0001-Specify-printf-formats.patch \
 "
-SRC_URI[md5sum] = "bf485bf820e693c79e6bd2a38702a128"
 SRC_URI[sha256sum] = "8ad011059a35ac70cdb5e3d3999ceee44a8e8e9078926844b0685b7ea9db2bcc"
 
 EXTRA_OEMAKE = "PREFIX=${D}/usr"
diff --git a/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb b/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb
index ce28fc732c..0c6661567b 100644
--- a/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb
+++ b/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb
@@ -2,14 +2,12 @@ DESCRIPTION = "Whetstone benchmark is a synthetic benchmark for evaluating the p
 SUMMARY = "CPU benchmark to measure floating point performance"
 
 LICENSE = "PD"
-LIC_FILES_CHKSUM ="file://${UNPACKDIR}/whetstone.c;beginline=1;endline=52;md5=c795edc15e7e1d92ca8f88ad718449f5"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/whetstone.c;beginline=1;endline=52;md5=c795edc15e7e1d92ca8f88ad718449f5"
 
 SRC_URI = "http://www.netlib.org/benchmark/whetstone.c"
-SRC_URI[md5sum] = "d8eb2cd7104bb5a12d614ac6d3f1f9fb"
 SRC_URI[sha256sum] = "333e4ceca042c146f63eec605573d16ae8b07166cbc44a17bec1ea97c6f1efbf"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile () {
         ${CC} ${CFLAGS} ${LDFLAGS} -Ofast -o whetstone whetstone.c -lm
diff --git a/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb b/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb
index b392581ecb..2a9ba574ef 100644
--- a/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb
+++ b/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb
@@ -9,5 +9,6 @@ SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.
 
 inherit autotools
 
-SRC_URI[md5sum] = "9e4ec55201be0be71ffbc56d38b42b57"
 SRC_URI[sha256sum] = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f"
+
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/acpitool/files/acpitool/"
diff --git a/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb b/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb
index 4688ae860b..ec3cdcaa75 100644
--- a/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb
+++ b/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb
@@ -10,7 +10,6 @@ REQUIRED_DISTRO_FEATURES = "polkit"
 SRC_URI = "git://gitlab.freedesktop.org/bolt/bolt.git;protocol=https;branch=master"
 SRCREV = "f03c50b22ae3fda26711ddabd91e2c5dd8103478"
 
-S = "${WORKDIR}/git"
 
 CVE_PRODUCT = "freedesktop:bolt"
 
@@ -18,5 +17,5 @@ inherit cmake pkgconfig meson features_check
 
 FILES:${PN} += "${datadir}/dbus-1/* \
                 ${datadir}/polkit-1/* \
-                ${libdir}/systemd/* \
-               "
+                ${systemd_system_unitdir} \
+"
diff --git a/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb b/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb
index 302a61e8a8..515c009ead 100644
--- a/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb
+++ b/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb
@@ -13,7 +13,9 @@ SRC_URI = "git://gitlab.com/pibox/con2fbmap.git;protocol=https;branch=master \
            file://0001-con2fbmap-Add-missing-include-on-string.h.patch \
            "
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 inherit autotools
 
diff --git a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb
index cb62ee46af..9e23a4b67d 100644
--- a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb
+++ b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb
@@ -14,10 +14,12 @@ SRC_URI = "git://github.com/emagii/cpufrequtils.git;branch=master;protocol=https
            file://0001-dont-unset-cflags.patch \
 "
 
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 EXTRA_OEMAKE:append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} "
 
 
-S = "${WORKDIR}/git"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch
new file mode 100644
index 0000000000..fbc0f5a18e
--- /dev/null
+++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch
@@ -0,0 +1,21 @@
+Author: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
+Date:   Fri Jul 5 16:39:13 2024 +0200
+Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/86]
+
+    Makefile: allow overriding CC
+    
+    Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
+
+diff --git a/Makefile b/Makefile
+index 139e5c0c3c3c..226303a6921e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,7 +12,7 @@ endif
+ endif
+ 
+ PROGRAM = dpcmd
+-CC      = gcc
++CC     ?= gcc
+ PREFIX ?= /usr/local
+ 
+ PKG_CONFIG ?= pkg-config
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch
new file mode 100644
index 0000000000..0fc8ac5bd2
--- /dev/null
+++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch
@@ -0,0 +1,39 @@
+From dac9d0ea5c419049c9ab0a5ba90d15d77a3271b0 Mon Sep 17 00:00:00 2001
+From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com>
+Date: Mon, 22 Jul 2024 13:02:59 +0000
+Subject: [PATCH] Makefile: add conditional stripping
+Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/88]
+
+This patch introduces a `NOSTRIP` conditional flag to the `install`
+target in the Makefile. The purpose of this flag is to allow the
+disabling of binary stripping during installation. This is
+particularly useful in development environments, such as BitBake,
+which handle stripping internally.
+
+When `NOSTRIP` is set to `1`, the `strip` command will be skipped
+during the installation process, preventing potential conflicts or
+redundant operations.
+
+Signed-off-by: Tymoteusz Burak <tymoteusz.burak@3mdeb.com>
+
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 139e5c0..8b33320 100644
+--- a/Makefile
++++ b/Makefile
+@@ -58,7 +58,9 @@ install: $(PROGRAM)
+        [ $(shell id -u) -eq 0 ] || (echo "Error: install needs root privileges" && false)
+        install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/DediProg
+        echo -n "install: " && install -v -o 0 -g 0 -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)
++ifneq ($(NOSTRIP),1)
+        strip $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)
++endif
+        install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/share/DediProg
+        echo -n "install: " && install -v -o 0 -g 0 -m 0644 ChipInfoDb.dedicfg $(DESTDIR)$(PREFIX)/share/DediProg/ChipInfoDb.dedicfg
+        install -v -o 0 -g 0 -m 755 -d $(DESTDIR)/etc/udev/rules.d
+-- 
+2.30.2
+
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb
new file mode 100644
index 0000000000..e0041b58e6
--- /dev/null
+++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "Linux software for Dediprog SF100 and SF600 SPI flash programmers"
+SECTION = "devel"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb"
+
+DEPENDS = "libusb"
+
+SRCREV = "e691f2d432144e3dbc82e9e0eea1ebaed4f3becf"
+SRC_URI = " \
+    git://github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master \
+    file://0001-add-support-for-cross-compilation.patch \
+    file://0002-Makefile-add-conditional-stripping.patch \
+    "
+
+EXTRA_OEMAKE = "NOSTRIP=1 DESTDIR=${D} PREFIX=${prefix}"
+
+PV = "1.0+${SRCPV}"
+
+
+do_install() {
+    oe_runmake install
+}
+
+do_install:append:class-nativesdk() {
+    # QA override: omit packaging dediprog's udev rule under /etc/udev.
+    # The file resides outside the nativesdk ${prefix} and must not pollute the
+    # host environment.
+    rm -rf ${D}/etc
+}
+
+FILES:${PN} += " \
+    ${bindir} \
+    ${datadir}/DediProg \
+"
+
+inherit pkgconfig
+
+BBCLASSEXTEND += " native nativesdk"
diff --git a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb
index 6c80f4c81d..0d8f3c8a6b 100644
--- a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb
+++ b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb
@@ -13,7 +13,6 @@ DEPENDS = " sysfsutils"
 SRCREV = "1c57818ecee186aa47af0342149577df5302c022"
 PV = "0.18+git"
 
-S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/grondo/edac-utils;branch=master;protocol=https \
     file://make-init-script-be-able-to-automatically-load-EDAC-.patch \
diff --git a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb
index f3760a40e6..1542ee73d1 100644
--- a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb
+++ b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb
@@ -13,7 +13,9 @@ SRC_URI = "git://github.com/teg/firmwared.git;branch=master;protocol=https \
 PV = "0+git"
 SRCREV = "2e6b5db43d63a5c0283a4cae9a6a20b7ad107a04"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 DEPENDS = "glib-2.0 systemd"
 
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
deleted file mode 100644
index e481c5a161..0000000000
--- a/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2c777126765b4095bf481d5cfe4a21470374d940 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 30 Mar 2021 15:12:09 -0700
-Subject: [PATCH] flashrom: Mark RISCV as non memory-mapped I/O architecture
-
-Upstream-Status: Submitted [https://review.coreboot.org/c/flashrom/+/51960]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Change-Id: I55c4e8529d36f0850dd56441c3fb8602c5d889fd
----
- Makefile   | 2 +-
- hwaccess.h | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 6d37d55..203e04b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -559,7 +559,7 @@ endif
- # Disable all drivers needing raw access (memory, PCI, port I/O) on
- # architectures with unknown raw access properties.
- # Right now those architectures are alpha hppa m68k sh s390
--ifneq ($(ARCH),$(filter $(ARCH),x86 mips ppc arm sparc arc))
-+ifneq ($(ARCH),$(filter $(ARCH),x86 mips ppc arm sparc arc riscv))
- ifeq ($(CONFIG_RAYER_SPI), yes)
- UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes
- else
-diff --git a/hwaccess.h b/hwaccess.h
-index 5602c15..e79988a 100644
---- a/hwaccess.h
-+++ b/hwaccess.h
-@@ -295,6 +295,10 @@ int libpayload_wrmsr(int addr, msr_t msr);
- 
- /* Non memory mapped I/O is not supported on ARC. */
- 
-+#elif IS_RISCV
-+
-+/* Non memory mapped I/O is not supported on RISCV. */
-+
- #else
- 
- #error Unknown architecture, please check if it supports PCI port IO.
--- 
-2.31.1
-
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch
deleted file mode 100644
index f3316aa264..0000000000
--- a/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 3334dd4e9fc34c79c3925c3c24869939d8955f21 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Sat, 18 Jul 2020 12:16:00 -0700
-Subject: [PATCH] hwaccess: use __asm__ as is done elsewhere
-
-Fixes compilation under powerpc platform. Made the change for the SPARC
-platform as well.
-
-../hwaccess.c: In function 'sync_primitive':
-../hwaccess.c:74:2: warning: implicit declaration of function 'asm'
- [-Wimplicit-function-declaration]
-   74 |  asm("eieio" : : : "memory");
-      |  ^~~
-../hwaccess.c:74:13: error: expected ')' before ':' token
-   74 |  asm("eieio" : : : "memory");
-
-Upstream-Status: Submitted [https://github.com/flashrom/flashrom/pull/155]
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- hwaccess.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/hwaccess.c b/hwaccess.c
-index 48ccb34..2a39989 100644
---- a/hwaccess.c
-+++ b/hwaccess.c
-@@ -71,18 +71,18 @@ static inline void sync_primitive(void)
-  * See also https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/memory-barriers.txt
-  */
- #if IS_PPC // cf. http://lxr.free-electrons.com/source/arch/powerpc/include/asm/barrier.h
--       asm("eieio" : : : "memory");
-+       __asm__ ("eieio" : : : "memory");
- #elif IS_SPARC
- #if defined(__sparc_v9__) || defined(__sparcv9)
-        /* Sparc V9 CPUs support three different memory orderings that range from x86-like TSO to PowerPC-like
-         * RMO. The modes can be switched at runtime thus to make sure we maintain the right order of access we
-         * use the strongest hardware memory barriers that exist on Sparc V9. */
--       asm volatile ("membar #Sync" ::: "memory");
-+       __asm__ volatile ("membar #Sync" ::: "memory");
- #elif defined(__sparc_v8__) || defined(__sparcv8)
-        /* On SPARC V8 there is no RMO just PSO and that does not apply to I/O accesses... but if V8 code is run
-         * on V9 CPUs it might apply... or not... we issue a write barrier anyway. That's the most suitable
-         * operation in the V8 instruction set anyway. If you know better then please tell us. */
--       asm volatile ("stbar");
-+       __asm__ volatile ("stbar");
- #else
-        #error Unknown and/or unsupported SPARC instruction set version detected.
- #endif
--- 
-2.32.0
-
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch
new file mode 100644
index 0000000000..8dfed855b4
--- /dev/null
+++ b/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch
@@ -0,0 +1,49 @@
+From 3ea99c117aa4c7a3502c93e4e4df50b3623e46c3 Mon Sep 17 00:00:00 2001
+From: Patrick Rudolph <patrick.rudolph@9elements.com>
+Date: Tue, 15 Oct 2024 10:42:05 +0200
+Subject: [PATCH 2/2] meson: Add options pciutils, ftdi, usb
+
+The options have been dropped in favor of an array option called programmer.
+Since this doesn't integrate well into yocto add back the old options.
+
+Upstream-Status: Inappropriate Just to fix yocto build system
+
+Change-Id: Ib697b9f7cc7fc553cfdeb75ae9d49a367badd286
+Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
+---
+ meson.build       | 6 +++---
+ meson_options.txt | 3 +++
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 6c8d3d3..61b794d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -150,9 +150,9 @@ systems_serial     = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd', 'da
+ 
+ cpus_port_io = [ 'x86', 'x86_64' ]
+ 
+-group_ftdi   = get_option('programmer').contains('group_ftdi')
+-group_pci    = get_option('programmer').contains('group_pci')
+-group_usb    = get_option('programmer').contains('group_usb')
++group_ftdi   = get_option('programmer').contains('group_ftdi') or get_option('ftdi')
++group_pci    = get_option('programmer').contains('group_pci') or get_option('pciutils')
++group_usb    = get_option('programmer').contains('group_usb') or get_option('usb')
+ group_i2c    = get_option('programmer').contains('group_i2c')
+ group_serial = get_option('programmer').contains('group_serial')
+ group_jlink  = get_option('programmer').contains('group_jlink')
+diff --git a/meson_options.txt b/meson_options.txt
+index 87456a9..570b152 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -24,4 +24,7 @@ option('ni845x_search_path', type : 'string', value : 'C:\Program Files (x86)\Na
+ option('delay_minimum_sleep_us', type : 'integer', min : 0, value : 100,
+        description : 'Minimum time in microseconds to suspend execution for (rather than polling) when a delay is required.'
+                    + ' Larger values may perform better on machines with low timer resolution, at the cost of increased power.')
++option('pciutils', type : 'boolean', value : false, description : 'Select programmer group pci')
++option('usb', type : 'boolean', value : false, description : 'Select programmer group usb')
++option('ftdi', type : 'boolean', value : false, description : 'Select programmer group ftdi')
+ option('rpmc', type : 'feature', value : 'auto', description : 'Support for Replay Protected Monotonic Counter (RPMC) commands as specified by JESD260')
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/meson-fixes.patch b/meta-oe/recipes-bsp/flashrom/flashrom/meson-fixes.patch
deleted file mode 100644
index e45236ee07..0000000000
--- a/meta-oe/recipes-bsp/flashrom/flashrom/meson-fixes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Add a ftdi option alongside USB and PCI to control the external dependency, and
-ensure that the build is successful in all combinations of options.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-diff --git a/meson.build b/meson.build
-index 375089c..0df9d69 100644
---- a/meson.build
-+++ b/meson.build
-@@ -91,6 +91,8 @@ else
-   config_digilent_spi = false
-   config_developerbox_spi = false
-   config_pickit2_spi = false
-+  config_stlinkv3_spi = false
-+  config_usbblaster_spi = false
- endif
- 
- # some programmers require libpci
-@@ -118,6 +120,21 @@ else
-   config_satasii = false
- endif
- 
-+# some programmers require libftdi
-+if get_option('ftdi')
-+  deps += dependency('libftdi1')
-+else
-+  config_ft2232_spi = false
-+  config_usbblaster_spi = false
-+endif
-+
-+if not (target_machine.cpu_family() == 'x86' or target_machine.cpu_family() == 'x86_64')
-+  config_satamv = false
-+  config_nic3com = false
-+  config_rayer_spi = false
-+  config_nicrealtek = false
-+endif
-+
- # set defines for configured programmers
- if config_atahpt
-   srcs += 'atahpt.c'
-@@ -163,7 +180,6 @@ endif
- if config_ft2232_spi
-   srcs += 'ft2232_spi.c'
-   cargs += '-DCONFIG_FT2232_SPI=1'
--  deps += dependency('libftdi1')
-   cargs += '-DHAVE_FT232H=1'
- endif
- if config_gfxnvidia
-@@ -216,6 +232,7 @@ endif
- if config_nicintel
-   srcs += 'nicintel.c'
-   cargs += '-DCONFIG_NICINTEL=1'
-+  need_raw_access = true
- endif
- if config_nicintel_eeprom
-   srcs += 'nicintel_eeprom.c'
-diff --git a/meson_options.txt b/meson_options.txt
-index ea87311..b6b842d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,5 +1,6 @@
- option('pciutils', type : 'boolean', value : true, description : 'use pciutils')
- option('usb', type : 'boolean', value : true, description : 'use libusb1')
-+option('ftdi', type : 'boolean', value : true, description : 'use libftdi')
- 
- option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers')
- option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller')
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.1.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.5.1.bb
index b2592d294b..f7121e2503 100644
--- a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.1.bb
+++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.5.1.bb
@@ -3,14 +3,13 @@ LICENSE = "GPL-2.0-or-later"
 HOMEPAGE = "http://flashrom.org"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \
-           file://meson-fixes.patch \
-           file://0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch \
-           file://0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch \
+SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.xz \
+           file://0002-meson-Add-options-pciutils-ftdi-usb.patch \
            "
-SRC_URI[sha256sum] = "89a7ff5beb08c89b8795bbd253a51b9453547a864c31793302296b56bbc56d65"
 
-S = "${WORKDIR}/flashrom-v${PV}"
+SRC_URI[sha256sum] = "1f934b076ed49eace203655ec249fc7861a6b8e87fe4aef732e47b6e485b6293"
+
+S = "${UNPACKDIR}/flashrom-v${PV}"
 
 inherit meson pkgconfig
 
@@ -18,3 +17,5 @@ PACKAGECONFIG ??= "pci usb ftdi"
 PACKAGECONFIG[pci] = "-Dpciutils=true,-Dpciutils=false,pciutils"
 PACKAGECONFIG[usb] = "-Dusb=true,-Dusb=false,libusb"
 PACKAGECONFIG[ftdi] = "-Dftdi=true,-Dftdi=false,libftdi"
+
+EXTRA_OEMESON = "-Dbash_completion=disabled -Dtests=disabled"
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb
index d72f2d9c53..bbf2b1fdac 100644
--- a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb
+++ b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb
@@ -6,7 +6,6 @@ SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \
            file://0001-efi-generate_binary.py-Use-env-to-detect-python3.patch"
 
 SRCREV = "58a2928f778278ab1f7f8fcddbab81ba587a8962"
-S = "${WORKDIR}/git"
 
 DEPENDS = "gnu-efi python3-pefile-native"
 
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.25.bb
index e6c276ba4e..a098bf8eea 100644
--- a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb
+++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.25.bb
@@ -6,14 +6,15 @@ DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native python3-jinja2-na
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
            file://run-ptest"
-SRC_URI[sha256sum] = "4e554f77a8a73383a41d5637b62e6c8a8936e66cd1d18585baf29d7fe47fc4d7"
+SRC_URI[sha256sum] = "a1d484778ae87c69b38f417659b33fe3d689373ce0831d1f95617b8aa76e8c37"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 # Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages useradd
+inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages
 
 GIDOCGEN_MESON_OPTION = 'docs'
 GIDOCGEN_MESON_ENABLE_FLAG = 'enabled'
@@ -115,17 +116,6 @@ DISABLE_NON_X86:x86 = ""
 DISABLE_NON_X86:x86-64 = ""
 PACKAGECONFIG:remove = "${DISABLE_NON_X86}"
 
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd"
-
-do_install:append() {
-    if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then
-        #Fix up permissions on polkit rules.d to work with rpm4 constraints
-        chmod 700 ${D}/${datadir}/polkit-1/rules.d
-        chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
-    fi
-}
-
 FILES:${PN} += "${libdir}/fwupd-plugins-* \
                 ${libdir}/fwupd-${PV} \
                 ${systemd_unitdir} \
@@ -140,3 +130,5 @@ FILES:${PN} += "${libdir}/fwupd-plugins-* \
 FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \
                       ${datadir}/installed-tests/"
 RDEPENDS:${PN}-ptest += "gnome-desktop-testing"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
diff --git a/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb b/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb
index 57057c9bf5..d3d08720a6 100644
--- a/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb
+++ b/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "\
     utility lsi2c. \
 "
 HOMEPAGE = "https://github.com/costad2/i2cdev"
-LICENSE = "GPL-2.0-or-later"
+LICENSE = "LGPL-2.1-only & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "\
     file://COPYING;md5=768997ba510a952bef1775c50bc22b00 \
     file://include/libi2cdev.h;beginline=12;endline=25;md5=72486a5e192d6ac5c7e55a4a95e380a6 \
@@ -21,6 +21,5 @@ SRC_URI = "\
 "
 SRCREV = "ed9ad777d842880e7ac6ca5e0de4bd2d3b4d02dc"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
diff --git a/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb b/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb
index 22bb30a504..d4d76e0e59 100644
--- a/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb
+++ b/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb
@@ -16,7 +16,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
            file://musl.patch \
            file://init"
 
-SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb"
 SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6"
 
 inherit update-rc.d
diff --git a/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb b/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
index 88a6e5bb30..ff3b29406b 100644
--- a/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
+++ b/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
@@ -23,7 +23,6 @@ SRCREV = "b0edae14e8660b80ffe0384354038a9f62e2978d"
 COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 COMPATIBLE_HOST:libc-musl = "null"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '', d)}"
 
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
index 6fad255c89..aebdd25bda 100644
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
@@ -12,8 +12,7 @@ SRC_URI = "file://fancontrol \
            file://sensors.conf \
            file://sensord \
 "
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PACKAGECONFIG ??= "sensord"
 PACKAGECONFIG[sensord] = ",,"
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
index 07027225c5..af0f5a7999 100644
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
@@ -44,20 +44,19 @@ SYSTEMD_SERVICE:${PN}-fancontrol = "fancontrol.service"
 SYSTEMD_SERVICE:${PN}-sensord = "sensord.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = 'EXLDFLAGS="${LDFLAGS}" \
         MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \
         LIBDIR=${libdir} \
-        CC="${CC}" AR="${AR}"'
+        CC="${CC}" AR="${AR}" \
+        PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}"'
 
 do_compile() {
-    sed -i -e 's:^# \(PROG_EXTRA\):\1:' ${S}/Makefile
     # Respect LDFLAGS
     sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile
     sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \
                 ${S}/lib/Module.mk
-    oe_runmake user PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}"
+    oe_runmake user
 }
 
 do_install() {
diff --git a/meta-oe/recipes-bsp/lsscsi/lsscsi_0.32.bb b/meta-oe/recipes-bsp/lsscsi/lsscsi_0.32.bb
new file mode 100644
index 0000000000..9df6ee9efc
--- /dev/null
+++ b/meta-oe/recipes-bsp/lsscsi/lsscsi_0.32.bb
@@ -0,0 +1,15 @@
+SUMMARY = "The lsscsi command lists information about SCSI devices in Linux"
+HOMEPAGE = "http://sg.danny.cz/scsi/lsscsi.html"
+LICENSE = "GPL-2.0-only"
+SECTION = "base"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+
+SRC_URI = "http://sg.danny.cz/scsi/${BP}.tgz"
+
+SRC_URI[sha256sum] = "0a800e9e94dca2ab702d65d72777ae8cae078e3d74d0bcbed64ba0849e8029a1"
+
+inherit autotools
+
+S = "${UNPACKDIR}/lsscsi-${PV}"
+
+UPSTREAM_CHECK_REGEX = "lsscsi-(?P<pver>\d+(\.\d+)+)\.tgz"
diff --git a/meta-oe/recipes-bsp/lsscsi/lsscsi_030.bb b/meta-oe/recipes-bsp/lsscsi/lsscsi_030.bb
deleted file mode 100644
index 9d3d7d8060..0000000000
--- a/meta-oe/recipes-bsp/lsscsi/lsscsi_030.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "The lsscsi command lists information about SCSI devices in Linux"
-HOMEPAGE = "http://sg.danny.cz/scsi/lsscsi.html"
-LICENSE = "GPL-2.0-only"
-SECTION = "base"
-LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-
-SRC_URI = "http://sg.danny.cz/scsi/${BP}.tgz"
-
-SRC_URI[sha256sum] = "619a2187405f02c5f57682f3478bffc75326803cd08839e39d434250c5518b15"
-
-inherit autotools
-
-S = "${WORKDIR}/lsscsi-${PV}r154"
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch
deleted file mode 100644
index be1452af51..0000000000
--- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From ac2ff1dbe0b44953de636c50c7d7f8c1e9f1e458 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 4 May 2024 09:13:06 +0100
-Subject: [PATCH] nvme: Use C99 types for uint32_t
-
-<stdint.h> provides `uint32_t`, while `u_int_32` is an unofficial/internal
-typedef that glibc happens to provide. This fixes the build on musl.
-
-Bug: https://bugs.gentoo.org/931194
-
-Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/ac2ff1dbe0b44953de636c50c7d7f8c1e9f1e458]
-Signed-off-by: Sam James <sam@gentoo.org>
----
- nvme.c        | 13 +++++++------
- util/base64.c |  5 +++--
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/nvme.c b/nvme.c
-index 46a2399a..5409ddf2 100644
---- a/nvme.c
-+++ b/nvme.c
-@@ -34,6 +34,7 @@
- #include <inttypes.h>
- #include <locale.h>
- #include <stdio.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-@@ -9081,8 +9082,8 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru
- 
-        unsigned char decoded_key[128];
-        unsigned int decoded_len;
--       u_int32_t crc = crc32(0L, NULL, 0);
--       u_int32_t key_crc;
-+       uint32_t crc = crc32(0L, NULL, 0);
-+       uint32_t key_crc;
-        int err = 0, hmac;
-        struct config {
-                char    *key;
-@@ -9150,10 +9151,10 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru
-                return -EINVAL;
-        }
-        crc = crc32(crc, decoded_key, decoded_len);
--       key_crc = ((u_int32_t)decoded_key[decoded_len]) |
--                  ((u_int32_t)decoded_key[decoded_len + 1] << 8) |
--                  ((u_int32_t)decoded_key[decoded_len + 2] << 16) |
--                  ((u_int32_t)decoded_key[decoded_len + 3] << 24);
-+       key_crc = ((uint32_t)decoded_key[decoded_len]) |
-+                  ((uint32_t)decoded_key[decoded_len + 1] << 8) |
-+                  ((uint32_t)decoded_key[decoded_len + 2] << 16) |
-+                  ((uint32_t)decoded_key[decoded_len + 3] << 24);
-        if (key_crc != crc) {
-                nvme_show_error("CRC mismatch (key %08x, crc %08x)", key_crc, crc);
-                return -EINVAL;
-diff --git a/util/base64.c b/util/base64.c
-index 7f47cda6..0e89f2e9 100644
---- a/util/base64.c
-+++ b/util/base64.c
-@@ -20,6 +20,7 @@
-  * MA  02110-1301, USA.
-  */
- 
-+#include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
-@@ -42,7 +43,7 @@ static const char base64_table[65] =
- int base64_encode(const unsigned char *src, int srclen, char *dst)
- {
-        int i, bits = 0;
--       u_int32_t ac = 0;
-+       uint32_t ac = 0;
-        char *cp = dst;
- 
-        for (i = 0; i < srclen; i++) {
-@@ -77,7 +78,7 @@ int base64_encode(const unsigned char *src, int srclen, char *dst)
-  */
- int base64_decode(const char *src, int srclen, unsigned char *dst)
- {
--       u_int32_t ac = 0;
-+       uint32_t ac = 0;
-        int i, bits = 0;
-        unsigned char *bp = dst;
- 
--- 
-2.45.1
-
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch
deleted file mode 100644
index 1881b18aac..0000000000
--- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 47d33d8da7a5b7310a2c2f4328115b439039e46c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 21 May 2024 14:09:32 -0700
-Subject: [PATCH] plugins/ssstc: Replace __uint16_t with uint16_t
-
-uint16_t is ISO defined and comes from stdint.h, makes it
-portable across glibc and musl on linux.
-
-Upstream-Status: Submitted [https://github.com/linux-nvme/nvme-cli/pull/2351]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- plugins/ssstc/ssstc-nvme.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/ssstc/ssstc-nvme.c b/plugins/ssstc/ssstc-nvme.c
-index 03e4fe3f..302df988 100644
---- a/plugins/ssstc/ssstc-nvme.c
-+++ b/plugins/ssstc/ssstc-nvme.c
-@@ -64,9 +64,9 @@ void show_ssstc_add_smart_log_jsn(struct nvme_additional_smart_log *smart,
-                unsigned int nsid, const char *devname)
- {
-        struct json_object *root, *entry_stats, *dev_stats, *multi;
--       __uint16_t wear_level_min = 0;
--       __uint16_t wear_level_max = 0;
--       __uint16_t wear_level_avg = 0;
-+       uint16_t wear_level_min = 0;
-+       uint16_t wear_level_max = 0;
-+       uint16_t wear_level_avg = 0;
-        uint64_t raw_val = 0;
- 
-        root = json_create_object();
--- 
-2.45.1
-
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.9.1.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb
index 9b4288ff89..eae49b04ea 100644
--- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.9.1.bb
+++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb
@@ -6,14 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \
                     file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \
                     file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2"
 DEPENDS = "json-c libnvme"
-SRCREV = "b340fd7dcf1aef76f8d46ab28bef3c170d310887"
+SRCREV = "71fa5d9310d6b41a69e844593423ac91b1453472"
 
-SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https \
-           file://0001-nvme-Use-C99-types-for-uint32_t.patch \
-           file://0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch \
-           "
-
-S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https"
 
 inherit bash-completion meson pkgconfig systemd
 
@@ -32,3 +27,8 @@ FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions"
 ALLOW_EMPTY:${PN}-user = "1"
 
 RDEPENDS:${PN}-user = "util-linux-uuidgen"
+
+# This one is reproducible only on 32bit MACHINEs
+# http://errors.yoctoproject.org/Errors/Details/766964/
+# git/plugins/virtium/virtium-nvme.c:205:63: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb
index 2a736716db..0bdd8042f8 100644
--- a/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb
+++ b/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb
@@ -15,7 +15,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/${BP}.tar.xz \
            file://lex_sys_types.patch \
 "
 
-SRC_URI[md5sum] = "885431c3cefb76ffdad8cb985134e996"
 SRC_URI[sha256sum] = "57c27be8f04ef4d535bcfa988567316cc57659fe69068327486dab53791e6558"
 
 inherit pkgconfig
diff --git a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
index 20e870ccb2..a270a23dde 100644
--- a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
+++ b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
@@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b5fcfc87fb615860d398b5e38685edf"
 SRC_URI = "file://pointercal \
            file://COPYING"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     # Only install file if it has a contents
diff --git a/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb b/meta-oe/recipes-connectivity/ace/ace_8.0.2.bb
index af4f2c54bb..35252c3efc 100644
--- a/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb
+++ b/meta-oe/recipes-connectivity/ace/ace_8.0.2.bb
@@ -7,23 +7,30 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77"
 
 DEPENDS += "openssl gperf-native"
 
-SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_19/ACE-${PV}.tar.bz2 \
+SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-8_0_2/ACE-${PV}.tar.bz2 \
            file://ace_config.patch \
            file://no_sysctl.patch \
           "
-SRC_URI[sha256sum] = "739be290a38229aaa5b5150e6ea55ce427e80970f0ace4c5040ac46644526f41"
+SRC_URI[sha256sum] = "dba38a905858ec4a44c04b4bbaef42b891adf061e8c0bbdaa1dce2c04fcccb7f"
+
+UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
+CVE_STATUS[CVE-2009-1147] = "cpe-incorrect: this CVE is for vmware ace"
 
 COMPATIBLE_HOST:libc-musl = "null"
 
-S = "${WORKDIR}/ACE_wrappers"
-B = "${WORKDIR}/ACE_wrappers/ace"
-export ACE_ROOT="${WORKDIR}/ACE_wrappers"
+S = "${UNPACKDIR}/ACE_wrappers"
+B = "${UNPACKDIR}/ACE_wrappers/ace"
+export ACE_ROOT = "${UNPACKDIR}/ACE_wrappers"
 
 inherit pkgconfig
 
-CXXFLAGS:append = " -fpermissive -Wnodeprecated-declarations"
-CXX:append = " -std=gnu++14 -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= "
-EXTRA_OEMAKE += "INSTALL_LIB=${baselib}"
+CXXFLAGS:append = " -fpermissive -Wno-deprecated-declarations"
+CXX:append = " -ffile-prefix-map=${UNPACKDIR}= "
+export CCFLAGS = "${CXXFLAGS}"
+
+EXTRA_OEMAKE += "INSTALL_LIB=${baselib} install_rpath=0"
 
 do_install() {
     export D="${D}"
@@ -37,5 +44,3 @@ do_install() {
 
     rm -r ${D}/usr/share
 }
-
-UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases"
diff --git a/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.1.0.bb b/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.1.0.bb
new file mode 100644
index 0000000000..fc020695e3
--- /dev/null
+++ b/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.1.0.bb
@@ -0,0 +1,13 @@
+SUMMARY = "MQTT communication C++ library using Boost.Asio"
+HOMEPAGE = "https://github.com/redboltz/async_mqtt"
+LICENSE = "BSL-1.0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c"
+
+SRC_URI = "git://github.com/redboltz/async_mqtt;protocol=http;branch=main;protocol=https"
+SRCREV = "21046ebc4a5475c14cea446715734c88fe33d276"
+
+DEPENDS = "openssl boost"
+
+
+inherit cmake
diff --git a/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb b/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb
index 1fdb76eeb4..52a0af810f 100644
--- a/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb
+++ b/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Gammu bindings for Python"
-DESCRIPTION ="Python bindings for the Gammu library."
+DESCRIPTION = "Python bindings for the Gammu library."
 HOMEPAGE = "https://wammu.eu/python-gammu/"
 BUGRACKER = "https://github.com/gammu/python-gammu/issues"
 LICENSE = "GPL-2.0-or-later"
@@ -12,7 +12,7 @@ inherit pypi setuptools3 pkgconfig
 SRC_URI += "file://0001-setup.py-StrictVersion-packaging.version.patch"
 SRC_URI[sha256sum] = "49fc70f01bc192c43ff3ec815e082df5261ea4c8d36a695e977734c4eb4df868"
 
-S = "${WORKDIR}/python-gammu-${PV}"
+S = "${UNPACKDIR}/python-gammu-${PV}"
 
 DEPENDS += "gammu python3-packaging-native"
 
diff --git a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
index 7ad28d594d..06f0b5bf0a 100644
--- a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
+++ b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
@@ -15,7 +15,8 @@ SRC_URI = "git://github.com/labapart/gattlib.git;branch=master;protocol=https \
 SRCBRANCH = "master"
 SRCREV = "33a8a275928b186381bb0aea0f9778e330e57ec3"
 
-S = "${WORKDIR}/git"
+
+CVE_STATUS[CVE-2019-6498] = "fixed-version: patch is already included in sources"
 
 PACKAGECONFIG[examples] = "-DGATTLIB_BUILD_EXAMPLES=ON,-DGATTLIB_BUILD_EXAMPLES=OFF"
 
diff --git a/meta-oe/recipes-connectivity/gensio/gensio_2.8.4.bb b/meta-oe/recipes-connectivity/gensio/gensio_2.8.7.bb
index 1f85c46e2f..9325b1e5dc 100644
--- a/meta-oe/recipes-connectivity/gensio/gensio_2.8.4.bb
+++ b/meta-oe/recipes-connectivity/gensio/gensio_2.8.7.bb
@@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
                     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     "
 
-SRCREV = "300644fc02b7099ca27ca5bac88c47e159ba8a6b"
+SRCREV = "e4dbb9687bd5e887fa98a4cdcec012ea85da1ef2"
 
 SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig b/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig
index a62bec4034..7f8e0b9eaa 100644
--- a/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig
@@ -142,6 +142,9 @@ CONFIG_IEEE80211N=y
 # IEEE 802.11ac (Very High Throughput) support
 CONFIG_IEEE80211AC=y
 
+# Simultaneous Authentication of Equals (SAE), WPA3-Personal
+CONFIG_SAE=y
+
 # Remove debugging code that is printing out debug messages to stdout.
 # This can be used to reduce the size of the hostapd considerably if debugging
 # code is not needed.
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.11.bb
index 44683bf735..693afe6c53 100644
--- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.11.bb
@@ -2,7 +2,7 @@ SUMMARY = "User space daemon for extended IEEE 802.11 management"
 HOMEPAGE = "http://w1.fi/hostapd/"
 SECTION = "kernel/userland"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://hostapd/README;beginline=5;endline=47;md5=aa03b8bd6216d1a7ca01fd4b89863073"
+LIC_FILES_CHKSUM = "file://hostapd/README;beginline=5;endline=47;md5=8e2c69e491b28390f9de0df1f64ebd6d"
 
 DEPENDS = "libnl openssl"
 
@@ -14,7 +14,7 @@ SRC_URI = " \
 "
 
 
-SRC_URI[sha256sum] = "206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d"
+SRC_URI[sha256sum] = "2b3facb632fd4f65e32f4bf82a76b4b72c501f995a4f62e330219fe7aed1747a"
 
 inherit update-rc.d systemd pkgconfig features_check
 
diff --git a/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb b/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb
index 62651bc308..14104ffcce 100644
--- a/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb
+++ b/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb
@@ -12,7 +12,6 @@ SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz \
 
 SRC_URI:append:libc-musl = " file://Fix-build-with-musl.patch"
 
-SRC_URI[md5sum] = "df6f4bab52f46ffd6eb1f5912d4ccee3"
 SRC_URI[sha256sum] = "474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0"
 
 inherit autotools update-rc.d pkgconfig
diff --git a/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb b/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb
index 5b5af30607..95dba3a409 100644
--- a/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb
+++ b/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb
@@ -9,6 +9,7 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz
 SRC_URI[sha256sum] = "72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/iwd b/meta-oe/recipes-connectivity/iwd/iwd/iwd
new file mode 100644
index 0000000000..89fc75c9ab
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/iwd
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+DAEMON=/usr/libexec/iwd
+PIDFILE=/var/run/iwd.pid
+DESC="iNet wireless daemon"
+
+if [ -f /etc/default/iwd ] ; then
+        . /etc/default/iwd
+fi
+
+set -e
+
+do_start() {
+        start-stop-daemon --start --background --name iwd --quiet --exec $DAEMON
+}
+
+do_stop() {
+        start-stop-daemon --stop --oknodo --name iwd --quiet
+}
+
+case "$1" in
+  start)
+        echo "Starting $DESC"
+        do_start
+        ;;
+  stop)
+        echo "Stopping $DESC"
+        do_stop
+        ;;
+  restart|force-reload)
+        echo "Restarting $DESC"
+        do_stop
+        sleep 1
+        do_start
+        ;;
+  *)
+        echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0
\ No newline at end of file
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_2.18.bb b/meta-oe/recipes-connectivity/iwd/iwd_3.8.bb
index 4d993031d3..80e36054bd 100644
--- a/meta-oe/recipes-connectivity/iwd/iwd_2.18.bb
+++ b/meta-oe/recipes-connectivity/iwd/iwd_3.8.bb
@@ -3,14 +3,15 @@ HOMEPAGE = "https://iwd.wiki.kernel.org/"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
 
-DEPENDS = "ell"
+DEPENDS = "dbus"
 
 SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \
            file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \
+           file://iwd \ 
            "
-SRC_URI[sha256sum] = "100d029171d161411f6cd8e1f95708e3a4351fb19e6847ba04819377b5fed13e"
+SRC_URI[sha256sum] = "c556a5a5376270af68940e04e26765026fbbbe4941668317c274c91042611cdf"
 
-inherit autotools manpages pkgconfig python3native systemd
+inherit autotools manpages pkgconfig python3native systemd update-rc.d
 
 PACKAGECONFIG ??= " \
     client \
@@ -24,7 +25,8 @@ PACKAGECONFIG[wired] = "--enable-wired,--disable-wired"
 PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono"
 PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd"
 
-EXTRA_OECONF = "--enable-external-ell"
+INITSCRIPT_NAME = "iwd"
+INITSCRIPT_PARAMS = "start 04 5 2 3 . stop 23 0 1 6 ."
 
 SYSTEMD_SERVICE:${PN} = " \
     iwd.service \
@@ -38,6 +40,11 @@ do_configure:prepend() {
 do_install:append() {
     # If client and monitor are disabled, bindir is empty, causing a QA error
     rmdir --ignore-fail-on-non-empty ${D}/${bindir}
+
+    if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${UNPACKDIR}/iwd ${D}${sysconfdir}/init.d/iwd
+    fi
 }
 
 FILES:${PN} += " \
@@ -46,7 +53,7 @@ FILES:${PN} += " \
     ${systemd_unitdir}/network \
 "
 
-RDEPENDS:${PN} = "dbus"
+RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_dbus}"
 
 RRECOMMENDS:${PN} = "\
     kernel-module-pkcs7-message \
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-Eliminate-old-style-function-declarations.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-Eliminate-old-style-function-declarations.patch
new file mode 100644
index 0000000000..3f90ccc56f
--- /dev/null
+++ b/meta-oe/recipes-connectivity/krb5/krb5/0001-Eliminate-old-style-function-declarations.patch
@@ -0,0 +1,10803 @@
+From adf3daca40e5fb2a8c08fd36a5006e70fef4de0d Mon Sep 17 00:00:00 2001
+From: Ken Hornstein <kenh@cmf.nrl.navy.mil>
+Date: Fri, 9 Jun 2023 23:53:53 -0400
+Subject: [PATCH] Eliminate old-style function declarations
+
+The C2x standard removes support for non-prototype function
+declarations, and clang 15 issues warnings for them
+(https://reviews.llvm.org/D122895).  Add -Werror=strict-prototypes to
+the build and fix all of the non-prototype declarations and
+definitions.
+
+For RPC code, try to be consistent with libtirpc and recent *BSD
+versions of rpcgen.  This includes casting each time a concrete
+function is used as an xdrproc_t value, since each XDR per-type
+function accepts a different object pointer type.  A few invocations
+of xdrproc_t values pass a third argument with value LASTUNSIGNED,
+even though XDR per-type functions accept only two parameters.
+libtirpc has removed these third arguments; do so here as well.
+
+[ghudson@mit.edu: added -Werror=strict-prototypes and fixed
+declarations it breaks under gcc and clang; added xdrproc_t changes;
+rewrote commit message; style changes]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+Upstream-Status: Backport [https://github.com/krb5/krb5/commit/4b9d7f7c107f01a61600fddcd8cde3812d0366a2]
+
+---
+ src/aclocal.m4                                |   2 +-
+ src/appl/gss-sample/gss-client.c              |  29 +---
+ src/appl/gss-sample/gss-misc.c                |  26 +--
+ src/appl/gss-sample/gss-server.c              |   2 +-
+ src/appl/user_user/server.c                   |   5 +-
+ src/clients/kdestroy/kdestroy.c               |   2 +-
+ src/clients/kinit/kinit.c                     |   4 +-
+ src/clients/klist/klist.c                     |   2 +-
+ src/clients/ksu/authorization.c               |  95 ++++------
+ src/clients/ksu/ccache.c                      | 108 ++++--------
+ src/clients/ksu/heuristic.c                   |  94 ++++------
+ src/clients/ksu/krb_auth_su.c                 |  49 ++----
+ src/clients/ksu/main.c                        |  40 ++---
+ src/clients/kvno/kvno.c                       |   2 +-
+ src/include/gssrpc/auth_gssapi.h              |  10 +-
+ src/include/gssrpc/xdr.h                      |   3 +-
+ src/include/k5-int.h                          |   2 +-
+ src/include/k5-plugin.h                       |   2 +-
+ src/include/net-server.h                      |   6 +-
+ src/kadmin/cli/getdate.y                      |   3 -
+ src/kadmin/cli/kadmin.c                       |   6 +-
+ src/kadmin/cli/keytab.c                       |   4 +-
+ src/kadmin/dbutil/kdb5_create.c               |  16 +-
+ src/kadmin/dbutil/kdb5_destroy.c              |   4 +-
+ src/kadmin/dbutil/kdb5_stash.c                |   4 +-
+ src/kadmin/dbutil/kdb5_util.c                 |  24 +--
+ src/kadmin/dbutil/ovload.c                    |  14 +-
+ src/kadmin/dbutil/strtok.c                    |   4 +-
+ src/kadmin/ktutil/ktutil.c                    |  45 ++---
+ src/kadmin/ktutil/ktutil_funcs.c              |  37 ++--
+ src/kadmin/server/ipropd_svc.c                |  24 +--
+ src/kadmin/server/kadm_rpc_svc.c              | 162 +++++++++---------
+ src/kadmin/server/ovsec_kadmd.c               |   4 +-
+ src/kdc/t_ndr.c                               |   2 +-
+ src/kdc/t_replay.c                            |   6 +-
+ src/kprop/kpropd.c                            |   2 +-
+ src/kprop/kproplog.c                          |   4 +-
+ src/lib/apputils/net-server.c                 |   7 +-
+ src/lib/crypto/builtin/aes/aes-gen.c          |  18 +-
+ .../crypto/builtin/camellia/camellia-gen.c    |  18 +-
+ src/lib/crypto/builtin/des/des_int.h          |   3 -
+ src/lib/crypto/builtin/des/destest.c          |  21 +--
+ src/lib/crypto/builtin/des/t_verify.c         |  15 +-
+ src/lib/crypto/builtin/sha1/t_shs.c           |   7 +-
+ src/lib/crypto/builtin/sha1/t_shs3.c          |   7 +-
+ src/lib/crypto/crypto_tests/aes-test.c        |   8 +-
+ src/lib/crypto/crypto_tests/camellia-test.c   |   8 +-
+ src/lib/crypto/crypto_tests/t_cf2.c           |   4 +-
+ src/lib/crypto/crypto_tests/t_cts.c           |   2 +-
+ src/lib/crypto/crypto_tests/t_encrypt.c       |   2 +-
+ src/lib/crypto/crypto_tests/t_fork.c          |   2 +-
+ src/lib/crypto/crypto_tests/t_hmac.c          |   3 +-
+ src/lib/crypto/crypto_tests/t_mddriver.c      |  25 ++-
+ src/lib/crypto/crypto_tests/t_nfold.c         |  16 +-
+ src/lib/crypto/crypto_tests/t_prf.c           |   2 +-
+ src/lib/crypto/crypto_tests/t_sha2.c          |   2 +-
+ src/lib/gssapi/generic/t_seqstate.c           |   2 +-
+ src/lib/gssapi/krb5/accept_sec_context.c      |  76 +++-----
+ src/lib/gssapi/krb5/compare_name.c            |   7 +-
+ src/lib/gssapi/krb5/context_time.c            |   6 +-
+ src/lib/gssapi/krb5/delete_sec_context.c      |   7 +-
+ src/lib/gssapi/krb5/disp_name.c               |   9 +-
+ src/lib/gssapi/krb5/disp_status.c             |  11 +-
+ src/lib/gssapi/krb5/export_sec_context.c      |   7 +-
+ src/lib/gssapi/krb5/gssapi_krb5.c             |   4 +-
+ src/lib/gssapi/krb5/import_name.c             |   8 +-
+ src/lib/gssapi/krb5/import_sec_context.c      |  10 +-
+ src/lib/gssapi/krb5/indicate_mechs.c          |   4 +-
+ src/lib/gssapi/krb5/init_sec_context.c        |  55 ++----
+ src/lib/gssapi/krb5/inq_context.c             |  17 +-
+ src/lib/gssapi/krb5/inq_cred.c                |  26 +--
+ src/lib/gssapi/krb5/inq_names.c               |   6 +-
+ src/lib/gssapi/krb5/k5seal.c                  |  38 ++--
+ src/lib/gssapi/krb5/k5unseal.c                |  51 ++----
+ src/lib/gssapi/krb5/process_context_token.c   |   8 +-
+ src/lib/gssapi/krb5/rel_cred.c                |   4 +-
+ src/lib/gssapi/krb5/rel_name.c                |   4 +-
+ src/lib/gssapi/krb5/rel_oid.c                 |   8 +-
+ src/lib/gssapi/krb5/ser_sctx.c                |  16 +-
+ src/lib/gssapi/krb5/util_cksum.c              |   6 +-
+ src/lib/gssapi/krb5/util_seed.c               |   5 +-
+ src/lib/gssapi/krb5/util_seqnum.c             |  19 +-
+ src/lib/gssapi/krb5/val_cred.c                |   4 +-
+ src/lib/gssapi/krb5/wrap_size_limit.c         |  11 +-
+ .../gssapi/mechglue/g_accept_sec_context.c    |  31 +---
+ src/lib/gssapi/mechglue/g_acquire_cred.c      |  95 +++-------
+ .../gssapi/mechglue/g_acquire_cred_with_pw.c  |  56 ++----
+ src/lib/gssapi/mechglue/g_canon_name.c        |  10 +-
+ src/lib/gssapi/mechglue/g_compare_name.c      |  12 +-
+ src/lib/gssapi/mechglue/g_context_time.c      |  10 +-
+ .../gssapi/mechglue/g_delete_sec_context.c    |  10 +-
+ src/lib/gssapi/mechglue/g_dsp_name.c          |  12 +-
+ src/lib/gssapi/mechglue/g_dsp_status.c        |  22 +--
+ src/lib/gssapi/mechglue/g_dup_name.c          |   8 +-
+ src/lib/gssapi/mechglue/g_exp_sec_context.c   |  10 +-
+ src/lib/gssapi/mechglue/g_export_name.c       |   8 +-
+ src/lib/gssapi/mechglue/g_glue.c              |  75 +++-----
+ src/lib/gssapi/mechglue/g_imp_name.c          |  18 +-
+ src/lib/gssapi/mechglue/g_imp_sec_context.c   |  11 +-
+ src/lib/gssapi/mechglue/g_init_sec_context.c  |  37 +---
+ src/lib/gssapi/mechglue/g_initialize.c        |  22 +--
+ src/lib/gssapi/mechglue/g_inq_cred.c          |  31 +---
+ src/lib/gssapi/mechglue/g_inq_names.c         |   8 +-
+ src/lib/gssapi/mechglue/g_mechname.c          |  14 +-
+ src/lib/gssapi/mechglue/g_oid_ops.c           |  27 +--
+ src/lib/gssapi/mechglue/g_process_context.c   |  10 +-
+ src/lib/gssapi/mechglue/g_rel_buffer.c        |   6 +-
+ src/lib/gssapi/mechglue/g_rel_cred.c          |   7 +-
+ src/lib/gssapi/mechglue/g_rel_name.c          |   7 +-
+ src/lib/gssapi/mechglue/g_rel_oid_set.c       |   6 +-
+ src/lib/gssapi/mechglue/g_sign.c              |  29 +---
+ src/lib/gssapi/mechglue/g_store_cred.c        |  48 ++----
+ src/lib/gssapi/mechglue/g_unseal.c            |  35 +---
+ src/lib/gssapi/mechglue/g_unwrap_aead.c       |  19 +-
+ src/lib/gssapi/mechglue/g_unwrap_iov.c        |  15 +-
+ src/lib/gssapi/mechglue/g_verify.c            |  30 +---
+ src/lib/gssapi/mechglue/g_wrap_aead.c         |  39 ++---
+ src/lib/gssapi/mechglue/g_wrap_iov.c          |  43 +----
+ src/lib/kadm5/clnt/client_rpc.c               |   1 +
+ src/lib/kadm5/kadm_rpc.h                      |  45 -----
+ src/lib/kadm5/kadm_rpc_xdr.c                  |  37 ++--
+ src/lib/kadm5/misc_free.c                     |   5 +-
+ src/lib/kadm5/srv/adb_xdr.c                   |   6 +-
+ src/lib/kadm5/srv/svr_principal.c             |  12 +-
+ src/lib/kadm5/str_conv.c                      |  18 +-
+ src/lib/kadm5/t_kadm5.c                       |  22 +--
+ src/lib/kdb/kdb5.c                            |   8 +-
+ src/lib/kdb/kdb_cpw.c                         |  32 +---
+ src/lib/kdb/keytab.c                          |  19 +-
+ src/lib/kdb/t_stringattr.c                    |   2 +-
+ src/lib/krad/packet.c                         |   2 +-
+ src/lib/krad/t_attr.c                         |   2 +-
+ src/lib/krad/t_attrset.c                      |   2 +-
+ src/lib/krad/t_code.c                         |   2 +-
+ src/lib/krb5/ccache/cc_keyring.c              |   2 +-
+ src/lib/krb5/krb/plugin.c                     |   2 +-
+ src/lib/krb5/krb/t_authdata.c                 |   2 +-
+ src/lib/krb5/krb/t_response_items.c           |   2 +-
+ src/lib/krb5/krb/t_ser.c                      |   8 +-
+ src/lib/krb5/krb/t_sname_match.c              |   2 +-
+ src/lib/krb5/krb/t_valid_times.c              |   2 +-
+ src/lib/krb5/rcache/t_memrcache.c             |   2 +-
+ src/lib/rpc/auth_gss.c                        |   4 +-
+ src/lib/rpc/auth_gssapi.c                     |  14 +-
+ src/lib/rpc/auth_gssapi_misc.c                |   4 +-
+ src/lib/rpc/authunix_prot.c                   |   3 +-
+ src/lib/rpc/clnt_perror.c                     |   1 -
+ src/lib/rpc/clnt_raw.c                        |   2 +-
+ src/lib/rpc/dyn.c                             |  85 ++++-----
+ src/lib/rpc/pmap_clnt.c                       |   9 +-
+ src/lib/rpc/pmap_getmaps.c                    |   5 +-
+ src/lib/rpc/pmap_getport.c                    |   6 +-
+ src/lib/rpc/pmap_prot2.c                      |   3 +-
+ src/lib/rpc/pmap_rmt.c                        |   7 +-
+ src/lib/rpc/rpc_prot.c                        |   4 +-
+ src/lib/rpc/svc.c                             |   4 +-
+ src/lib/rpc/svc_auth_gss.c                    |  10 +-
+ src/lib/rpc/svc_auth_gssapi.c                 |  28 +--
+ src/lib/rpc/svc_simple.c                      |   4 +-
+ src/lib/rpc/unit-test/client.c                |  18 +-
+ src/lib/rpc/unit-test/rpc_test_clnt.c         |   4 +-
+ src/lib/rpc/unit-test/rpc_test_svc.c          |  16 +-
+ src/lib/rpc/unit-test/server.c                |   2 +-
+ src/lib/rpc/xdr.c                             |   4 +-
+ src/lib/rpc/xdr_array.c                       |   4 +-
+ src/lib/rpc/xdr_rec.c                         |  13 +-
+ src/lib/rpc/xdr_reference.c                   |   4 +-
+ src/lib/rpc/xdr_sizeof.c                      |  29 +---
+ src/plugins/kdb/db2/db2_exp.c                 |   4 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_close.c   |  10 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_conv.c    |  13 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_delete.c  |  34 +---
+ src/plugins/kdb/db2/libdb2/btree/bt_get.c     |   6 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_open.c    |  12 +-
+ .../kdb/db2/libdb2/btree/bt_overflow.c        |  16 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_page.c    |   8 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_put.c     |  11 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_search.c  |  17 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_seq.c     |  27 +--
+ src/plugins/kdb/db2/libdb2/btree/bt_split.c   |  42 +----
+ src/plugins/kdb/db2/libdb2/btree/bt_utils.c   |  18 +-
+ src/plugins/kdb/db2/libdb2/db/db.c            |  26 ++-
+ src/plugins/kdb/db2/libdb2/hash/dbm.c         |  50 ++----
+ src/plugins/kdb/db2/libdb2/hash/hash.c        |  94 +++-------
+ src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c |  35 +---
+ src/plugins/kdb/db2/libdb2/hash/hash_func.c   |  16 +-
+ src/plugins/kdb/db2/libdb2/hash/hash_log2.c   |   3 +-
+ src/plugins/kdb/db2/libdb2/hash/hash_page.c   | 121 ++++---------
+ src/plugins/kdb/db2/libdb2/hash/hsearch.c     |   9 +-
+ src/plugins/kdb/db2/libdb2/mpool/mpool.c      |  54 ++----
+ src/plugins/kdb/db2/libdb2/recno/rec_close.c  |   7 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_delete.c |  14 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_get.c    |  22 +--
+ src/plugins/kdb/db2/libdb2/recno/rec_open.c   |   9 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_put.c    |  12 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_search.c |   5 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_seq.c    |   5 +-
+ src/plugins/kdb/db2/libdb2/recno/rec_utils.c  |   6 +-
+ src/plugins/kdb/db2/libdb2/test/dbtest.c      |  59 ++-----
+ src/plugins/kdb/db2/pol_xdr.c                 |   2 +-
+ .../kdb/ldap/ldap_util/kdb5_ldap_util.c       |   4 +-
+ src/plugins/kdb/lmdb/kdb_lmdb.c               |   4 +-
+ src/plugins/kdb/test/kdb_test.c               |   4 +-
+ .../preauth/pkinit/pkinit_crypto_openssl.c    |   4 +-
+ src/plugins/preauth/spake/t_vectors.c         |   2 +-
+ src/tests/asn.1/krb5_decode_test.c            |   5 +-
+ src/tests/asn.1/krb5_encode_test.c            |  13 +-
+ src/tests/asn.1/t_trval.c                     |  14 +-
+ src/tests/asn.1/trval.c                       |  73 +++-----
+ src/tests/conccache.c                         |   4 +-
+ src/tests/create/kdb5_mkdums.c                |  16 +-
+ src/tests/forward.c                           |   2 +-
+ src/tests/gss-threads/gss-client.c            |   4 +-
+ src/tests/gss-threads/gss-server.c            |   2 +-
+ src/tests/gssapi/reload.c                     |   2 +-
+ src/tests/gssapi/t_add_cred.c                 |   2 +-
+ src/tests/gssapi/t_enctypes.c                 |   2 +-
+ src/tests/gssapi/t_invalid.c                  |   2 +-
+ src/tests/gssapi/t_oid.c                      |   2 +-
+ src/tests/gssapi/t_spnego.c                   |   2 +-
+ src/tests/hammer/kdc5_hammer.c                |  36 ++--
+ src/tests/kdbtest.c                           |   2 +-
+ src/tests/misc/test_getpw.c                   |   2 +-
+ src/tests/plugorder.c                         |   2 +-
+ src/tests/shlib/t_loader.c                    |   2 +-
+ src/tests/softpkcs11/main.c                   |   2 +-
+ src/tests/t_inetd.c                           |   7 +-
+ src/tests/test1.c                             |   4 +-
+ src/tests/verify/kdb5_verify.c                |  17 +-
+ src/util/et/error_message.c                   |   2 +-
+ src/util/et/test_et.c                         |   3 +-
+ src/util/profile/prof_init.c                  |   2 +-
+ src/util/profile/t_profile.c                  |  22 +--
+ src/util/profile/test_load.c                  |   2 +-
+ src/util/profile/test_parse.c                 |   5 +-
+ src/util/profile/test_profile.c               |  10 +-
+ src/util/profile/test_vtable.c                |   3 +-
+ src/util/ss/error.c                           |  13 +-
+ src/util/ss/execute_cmd.c                     |  23 +--
+ src/util/ss/help.c                            | 115 ++++++-------
+ src/util/ss/invocation.c                      |  13 +-
+ src/util/ss/list_rqs.c                        |  11 +-
+ src/util/ss/listen.c                          |  32 ++--
+ src/util/ss/pager.c                           |  10 +-
+ src/util/ss/parse.c                           |   6 +-
+ src/util/ss/prompt.c                          |   7 +-
+ src/util/ss/request_tbl.c                     |  11 +-
+ src/util/ss/requests.c                        |   2 +-
+ src/util/ss/ss.h                              |   1 -
+ src/util/ss/ss_internal.h                     |   3 +-
+ src/util/support/plugins.c                    |  10 +-
+ src/util/support/t_hashtab.c                  |   6 +-
+ src/util/support/t_hex.c                      |   3 +-
+ src/util/support/t_json.c                     |   2 +-
+ src/util/support/t_k5buf.c                    |  16 +-
+ src/util/support/t_unal.c                     |   3 +-
+ 256 files changed, 1387 insertions(+), 2745 deletions(-)
+
+diff --git a/src/aclocal.m4 b/src/aclocal.m4
+index 3d66a87..6457cdc 100644
+--- a/src/aclocal.m4
++++ b/src/aclocal.m4
+@@ -545,7 +545,7 @@ if test "$GCC" = yes ; then
+     TRY_WARN_CC_FLAG(-Wno-format-zero-length)
+     # Other flags here may not be supported on some versions of
+     # gcc that people want to use.
+-    for flag in overflow strict-overflow missing-format-attribute missing-prototypes return-type missing-braces parentheses switch unused-function unused-label unused-variable unused-value unknown-pragmas sign-compare newline-eof error=uninitialized no-maybe-uninitialized error=pointer-arith error=int-conversion error=incompatible-pointer-types error=discarded-qualifiers error=implicit-int ; do
++    for flag in overflow strict-overflow missing-format-attribute missing-prototypes return-type missing-braces parentheses switch unused-function unused-label unused-variable unused-value unknown-pragmas sign-compare newline-eof error=uninitialized no-maybe-uninitialized error=pointer-arith error=int-conversion error=incompatible-pointer-types error=discarded-qualifiers error=implicit-int error=strict-prototypes; do
+       TRY_WARN_CC_FLAG(-W$flag)
+     done
+     #  old-style-definition? generates many, many warnings
+diff --git a/src/appl/gss-sample/gss-client.c b/src/appl/gss-sample/gss-client.c
+index 6e2aa33..0722ae1 100644
+--- a/src/appl/gss-sample/gss-client.c
++++ b/src/appl/gss-sample/gss-client.c
+@@ -75,7 +75,7 @@ static gss_OID_desc gss_spnego_mechanism_oid_desc =
+ {6, (void *)"\x2b\x06\x01\x05\x05\x02"};
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, "Usage: gss-client [-port port] [-mech mechanism] "
+             "[-spnego] [-d]\n");
+@@ -359,9 +359,7 @@ client_establish_context(int s, char *service_name, OM_uint32 gss_flags,
+ }
+ 
+ static void
+-read_file(file_name, in_buf)
+-    char   *file_name;
+-    gss_buffer_t in_buf;
++read_file(char *file_name, gss_buffer_t in_buf)
+ {
+     int     fd, count;
+     struct stat stat_buf;
+@@ -431,21 +429,10 @@ read_file(file_name, in_buf)
+  * verifies it with gss_verify.  -1 is returned if any step fails,
+  * otherwise 0 is returned.  */
+ static int
+-call_server(host, port, oid, service_name, gss_flags, auth_flag,
+-            wrap_flag, encrypt_flag, mic_flag, v1_format, msg, use_file,
+-            mcount, username, password)
+-    char   *host;
+-    u_short port;
+-    gss_OID oid;
+-    char   *service_name;
+-    OM_uint32 gss_flags;
+-    int     auth_flag, wrap_flag, encrypt_flag, mic_flag;
+-    int     v1_format;
+-    char   *msg;
+-    int     use_file;
+-    int     mcount;
+-    char    *username;
+-    char    *password;
++call_server(char *host, u_short port, gss_OID oid, char *service_name,
++            OM_uint32 gss_flags, int auth_flag, int wrap_flag,
++            int encrypt_flag, int mic_flag, int v1_format, char *msg,
++            int use_file, int mcount, char *username, char *password)
+ {
+     gss_ctx_id_t context = GSS_C_NO_CONTEXT;
+     gss_buffer_desc in_buf, out_buf;
+@@ -774,9 +761,7 @@ worker_bee(void *unused)
+ }
+ 
+ int
+-main(argc, argv)
+-    int     argc;
+-    char  **argv;
++main(int argc, char **argv)
+ {
+     int     i;
+ 
+diff --git a/src/appl/gss-sample/gss-misc.c b/src/appl/gss-sample/gss-misc.c
+index 1d051ed..7eb4c79 100644
+--- a/src/appl/gss-sample/gss-misc.c
++++ b/src/appl/gss-sample/gss-misc.c
+@@ -157,10 +157,7 @@ read_all(int fildes, void *data, unsigned int nbyte)
+  * if an error occurs or if it could not write all the data.
+  */
+ int
+-send_token(s, flags, tok)
+-    int     s;
+-    int     flags;
+-    gss_buffer_t tok;
++send_token(int s, int flags, gss_buffer_t tok)
+ {
+     int     ret;
+     unsigned char char_flags = (unsigned char) flags;
+@@ -230,10 +227,7 @@ send_token(s, flags, tok)
+  * and -1 if an error occurs or if it could not read all the data.
+  */
+ int
+-recv_token(s, flags, tok)
+-    int     s;
+-    int    *flags;
+-    gss_buffer_t tok;
++recv_token(int s, int *flags, gss_buffer_t tok)
+ {
+     int     ret;
+     unsigned char char_flags;
+@@ -303,10 +297,7 @@ recv_token(s, flags, tok)
+ }
+ 
+ static void
+-display_status_1(m, code, type)
+-    char   *m;
+-    OM_uint32 code;
+-    int     type;
++display_status_1(char *m, OM_uint32 code, int type)
+ {
+     OM_uint32 min_stat;
+     gss_buffer_desc msg;
+@@ -344,10 +335,7 @@ display_status_1(m, code, type)
+  * followed by a newline.
+  */
+ void
+-display_status(msg, maj_stat, min_stat)
+-    char   *msg;
+-    OM_uint32 maj_stat;
+-    OM_uint32 min_stat;
++display_status(char *msg, OM_uint32 maj_stat, OM_uint32 min_stat)
+ {
+     display_status_1(msg, maj_stat, GSS_C_GSS_CODE);
+     display_status_1(msg, min_stat, GSS_C_MECH_CODE);
+@@ -370,8 +358,7 @@ display_status(msg, maj_stat, min_stat)
+  */
+ 
+ void
+-display_ctx_flags(flags)
+-    OM_uint32 flags;
++display_ctx_flags(OM_uint32 flags)
+ {
+     if (flags & GSS_C_DELEG_FLAG)
+         fprintf(display_file, "context flag: GSS_C_DELEG_FLAG\n");
+@@ -388,8 +375,7 @@ display_ctx_flags(flags)
+ }
+ 
+ void
+-print_token(tok)
+-    gss_buffer_t tok;
++print_token(gss_buffer_t tok)
+ {
+     unsigned int   i;
+     unsigned char *p = tok->value;
+diff --git a/src/appl/gss-sample/gss-server.c b/src/appl/gss-sample/gss-server.c
+index 9b6ce9f..0e9c857 100644
+--- a/src/appl/gss-sample/gss-server.c
++++ b/src/appl/gss-sample/gss-server.c
+@@ -73,7 +73,7 @@ static OM_uint32
+ showLocalIdentity(OM_uint32 *minor, gss_name_t name);
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, "Usage: gss-server [-port port] [-verbose] [-once]");
+ #ifdef _WIN32
+diff --git a/src/appl/user_user/server.c b/src/appl/user_user/server.c
+index f2b5b61..afb3d2b 100644
+--- a/src/appl/user_user/server.c
++++ b/src/appl/user_user/server.c
+@@ -39,9 +39,8 @@
+ 
+ /* fd 0 is a tcp socket used to talk to the client */
+ 
+-int main(argc, argv)
+-    int argc;
+-    char *argv[];
++int
++main(int argc, char *argv[])
+ {
+     krb5_data pname_data, tkt_data;
+     int sock = 0;
+diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
+index 774b729..48f672a 100644
+--- a/src/clients/kdestroy/kdestroy.c
++++ b/src/clients/kdestroy/kdestroy.c
+@@ -47,7 +47,7 @@ char *progname;
+ 
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, _("Usage: %s [-A] [-q] [-c cache_name] [-p princ_name]\n"),
+             progname);
+diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
+index f4c7b2b..7a33ffa 100644
+--- a/src/clients/kinit/kinit.c
++++ b/src/clients/kinit/kinit.c
+@@ -45,7 +45,7 @@
+ #ifdef HAVE_PWD_H
+ #include <pwd.h>
+ static char *
+-get_name_from_os()
++get_name_from_os(void)
+ {
+     struct passwd *pw;
+ 
+@@ -137,7 +137,7 @@ const char *shopts = "r:fpFPn54aAVl:s:c:kit:T:RS:vX:CEI:";
+ #define USAGE_BREAK "\n\t"
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr,
+             _("Usage: %s [-V] [-l lifetime] [-s start_time] "
+diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
+index dcdc5a2..c797b16 100644
+--- a/src/clients/klist/klist.c
++++ b/src/clients/klist/klist.c
+@@ -80,7 +80,7 @@ static void fillit(FILE *, unsigned int, int);
+ #define KEYTAB 2
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, _("Usage: %s [-e] [-V] [[-c] [-l] [-A] [-d] [-f] [-s] "
+                       "[-a [-n]]] [-k [-i] [-t] [-K]] [-C] [name]\n"),
+diff --git a/src/clients/ksu/authorization.c b/src/clients/ksu/authorization.c
+index fb9d5d0..17a8a8f 100644
+--- a/src/clients/ksu/authorization.c
++++ b/src/clients/ksu/authorization.c
+@@ -30,9 +30,8 @@
+ 
+ static void auth_cleanup (FILE *, FILE *, char *);
+ 
+-krb5_boolean fowner(fp, uid)
+-    FILE *fp;
+-    uid_t uid;
++krb5_boolean
++fowner(FILE *fp, uid_t uid)
+ {
+     struct stat sbuf;
+ 
+@@ -59,16 +58,10 @@ krb5_boolean fowner(fp, uid)
+  *
+  */
+ 
+-krb5_error_code krb5_authorization(context, principal, luser,
+-                                   cmd, ok, out_fcmd)
+-/* IN */
+-    krb5_context context;
+-    krb5_principal principal;
+-    const char *luser;
+-    char *cmd;
+-    /* OUT */
+-    krb5_boolean *ok;
+-    char **out_fcmd;
++krb5_error_code
++krb5_authorization(krb5_context context, krb5_principal principal,
++                   const char *luser, char *cmd, krb5_boolean *ok,
++                   char **out_fcmd)
+ {
+     struct passwd *pwd;
+     char *princname;
+@@ -178,10 +171,8 @@ any tokens after the principal name  FALSE is returned.
+ 
+ ***********************************************************/
+ 
+-krb5_error_code k5login_lookup (fp, princname, found)
+-    FILE *fp;
+-    char *princname;
+-    krb5_boolean *found;
++krb5_error_code
++k5login_lookup(FILE *fp, char *princname, krb5_boolean *found)
+ {
+ 
+     krb5_error_code retval;
+@@ -240,12 +231,9 @@ if princname is found{
+ 
+ 
+ ***********************************************************/
+-krb5_error_code k5users_lookup (fp, princname, cmd, found, out_fcmd)
+-    FILE *fp;
+-    char *princname;
+-    char *cmd;
+-    krb5_boolean *found;
+-    char **out_fcmd;
++krb5_error_code
++k5users_lookup(FILE *fp, char *princname, char *cmd,
++               krb5_boolean *found, char **out_fcmd)
+ {
+     krb5_error_code retval;
+     char * line;
+@@ -328,10 +316,8 @@ resolves it into a full path name.
+ 
+ ************************************************/
+ 
+-krb5_boolean fcmd_resolve(fcmd, out_fcmd, out_err)
+-    char *fcmd;
+-    char ***out_fcmd;
+-    char **out_err;
++krb5_boolean
++fcmd_resolve(char *fcmd, char ***out_fcmd, char **out_err)
+ {
+     char * err;
+     char ** tmp_fcmd;
+@@ -407,8 +393,8 @@ cmd_single - checks if cmd consists of a path
+ 
+ ********************************************/
+ 
+-krb5_boolean cmd_single(cmd)
+-    char * cmd;
++krb5_boolean
++cmd_single(char *cmd)
+ {
+ 
+     if ( ( strrchr( cmd, '/')) ==  NULL){
+@@ -423,9 +409,8 @@ cmd_arr_cmp_postfix - compares a command with the postfix
+          of fcmd
+ ********************************************/
+ 
+-int cmd_arr_cmp_postfix(fcmd_arr, cmd)
+-    char **fcmd_arr;
+-    char *cmd;
++int
++cmd_arr_cmp_postfix(char **fcmd_arr, char *cmd)
+ {
+     char  * temp_fcmd;
+     char *ptr;
+@@ -457,9 +442,8 @@ cmd_arr_cmp - checks if cmd matches any
+ 
+ **********************************************/
+ 
+-int cmd_arr_cmp (fcmd_arr, cmd)
+-    char **fcmd_arr;
+-    char *cmd;
++int
++cmd_arr_cmp(char **fcmd_arr, char *cmd)
+ {
+     int result =1;
+     int i = 0;
+@@ -475,10 +459,8 @@ int cmd_arr_cmp (fcmd_arr, cmd)
+ }
+ 
+ 
+-krb5_boolean find_first_cmd_that_exists(fcmd_arr, cmd_out, err_out)
+-    char **fcmd_arr;
+-    char **cmd_out;
+-    char **err_out;
++krb5_boolean
++find_first_cmd_that_exists(char **fcmd_arr, char **cmd_out, char **err_out)
+ {
+     struct stat st_temp;
+     int i = 0;
+@@ -517,12 +499,9 @@ returns 1 if there is an error, 0 if no error.
+ 
+ ***************************************************************/
+ 
+-int match_commands (fcmd, cmd, match, cmd_out, err_out)
+-    char *fcmd;
+-    char *cmd;
+-    krb5_boolean *match;
+-    char **cmd_out;
+-    char **err_out;
++int
++match_commands(char *fcmd, char *cmd, krb5_boolean *match,
++               char **cmd_out, char **err_out)
+ {
+     char ** fcmd_arr;
+     char * err;
+@@ -566,11 +545,8 @@ int match_commands (fcmd, cmd, match, cmd_out, err_out)
+               is set to null if eof.
+ *********************************************************/
+ 
+-krb5_error_code get_line (fp, out_line)
+-/* IN */
+-    FILE *fp;
+-    /* OUT */
+-    char **out_line;
++krb5_error_code
++get_line(FILE *fp, char **out_line)
+ {
+     char * line, *r, *newline , *line_ptr;
+     int chunk_count = 1;
+@@ -615,9 +591,8 @@ will be returned as part of the first token.
+ Note: this routine reuses the space pointed to by line
+ ******************************************************/
+ 
+-char *  get_first_token (line, lnext)
+-    char *line;
+-    char **lnext;
++char *
++get_first_token(char *line, char **lnext)
+ {
+ 
+     char * lptr, * out_ptr;
+@@ -651,8 +626,8 @@ Note: that this function modifies the stream
+       lnext to the next tocken.
+ **********************************************************/
+ 
+-char *  get_next_token (lnext)
+-    char **lnext;
++char *
++get_next_token (char **lnext)
+ {
+     char * lptr, * out_ptr;
+ 
+@@ -677,10 +652,8 @@ char *  get_next_token (lnext)
+     return out_ptr;
+ }
+ 
+-static void auth_cleanup(users_fp, login_fp, princname)
+-    FILE *users_fp;
+-    FILE *login_fp;
+-    char *princname;
++static void
++auth_cleanup(FILE *users_fp, FILE *login_fp, char *princname)
+ {
+ 
+     free (princname);
+@@ -690,8 +663,8 @@ static void auth_cleanup(users_fp, login_fp, princname)
+         fclose(login_fp);
+ }
+ 
+-void init_auth_names(pw_dir)
+-    char *pw_dir;
++void
++init_auth_names(char *pw_dir)
+ {
+     const char *sep;
+     int r1, r2;
+diff --git a/src/clients/ksu/ccache.c b/src/clients/ksu/ccache.c
+index cbb9aa2..cca9ce2 100644
+--- a/src/clients/ksu/ccache.c
++++ b/src/clients/ksu/ccache.c
+@@ -40,24 +40,18 @@ copies the default cache into the secondary cache,
+ 
+ ************************************************************************/
+ 
+-void show_credential();
++void show_credential(krb5_context, krb5_creds *, krb5_ccache);
+ 
+ /* modifies only the cc_other, the algorithm may look a bit funny,
+    but I had to do it this way, since remove function did not come
+    with k5 beta 3 release.
+ */
+ 
+-krb5_error_code krb5_ccache_copy(context, cc_def, target_principal, cc_target,
+-                                 restrict_creds, primary_principal, stored)
+-/* IN */
+-    krb5_context context;
+-    krb5_ccache cc_def;
+-    krb5_principal target_principal;
+-    krb5_ccache cc_target;
+-    krb5_boolean restrict_creds;
+-    krb5_principal primary_principal;
+-    /* OUT */
+-    krb5_boolean *stored;
++krb5_error_code
++krb5_ccache_copy(krb5_context context, krb5_ccache cc_def,
++                 krb5_principal target_principal, krb5_ccache cc_target,
++                 krb5_boolean restrict_creds, krb5_principal primary_principal,
++                 krb5_boolean *stored)
+ {
+     int i=0;
+     krb5_error_code retval=0;
+@@ -105,11 +99,9 @@ krb5_error_code krb5_ccache_copy(context, cc_def, target_principal, cc_target,
+ }
+ 
+ 
+-krb5_error_code krb5_store_all_creds(context, cc, creds_def, creds_other)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_creds **creds_def;
+-    krb5_creds **creds_other;
++krb5_error_code
++krb5_store_all_creds(krb5_context context, krb5_ccache cc,
++                     krb5_creds **creds_def, krb5_creds **creds_other)
+ {
+ 
+     int i = 0;
+@@ -173,10 +165,8 @@ krb5_error_code krb5_store_all_creds(context, cc, creds_def, creds_other)
+     return 0;
+ }
+ 
+-krb5_boolean compare_creds(context, cred1, cred2)
+-    krb5_context context;
+-    krb5_creds *cred1;
+-    krb5_creds *cred2;
++krb5_boolean
++compare_creds(krb5_context context, krb5_creds *cred1, krb5_creds *cred2)
+ {
+     krb5_boolean retval;
+ 
+@@ -188,13 +178,9 @@ krb5_boolean compare_creds(context, cred1, cred2)
+     return retval;
+ }
+ 
+-
+-
+-
+-krb5_error_code krb5_get_nonexp_tkts(context, cc, creds_array)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_creds ***creds_array;
++krb5_error_code
++krb5_get_nonexp_tkts(krb5_context context, krb5_ccache cc,
++                     krb5_creds ***creds_array)
+ {
+ 
+     krb5_creds creds, temp_tktq, temp_tkt;
+@@ -262,10 +248,8 @@ krb5_error_code krb5_get_nonexp_tkts(context, cc, creds_array)
+ 
+ }
+ 
+-
+-krb5_error_code krb5_check_exp(context, tkt_time)
+-    krb5_context context;
+-    krb5_ticket_times tkt_time;
++krb5_error_code
++krb5_check_exp(krb5_context context, krb5_ticket_times tkt_time)
+ {
+     krb5_error_code retval =0;
+     krb5_timestamp currenttime;
+@@ -290,9 +274,8 @@ krb5_error_code krb5_check_exp(context, tkt_time)
+     return 0;
+ }
+ 
+-
+-char *flags_string(cred)
+-    krb5_creds *cred;
++char *
++flags_string(krb5_creds *cred)
+ {
+     static char buf[32];
+     int i = 0;
+@@ -323,7 +306,8 @@ char *flags_string(cred)
+     return(buf);
+ }
+ 
+-void printtime(krb5_timestamp ts)
++void
++printtime(krb5_timestamp ts)
+ {
+     char fmtbuf[18], fill = ' ';
+ 
+@@ -333,9 +317,7 @@ void printtime(krb5_timestamp ts)
+ 
+ 
+ krb5_error_code
+-krb5_get_login_princ(luser, princ_list)
+-    const char *luser;
+-    char ***princ_list;
++krb5_get_login_princ(const char *luser, char ***princ_list)
+ {
+     struct stat sbuf;
+     struct passwd *pwd;
+@@ -420,13 +402,8 @@ krb5_get_login_princ(luser, princ_list)
+     return 0;
+ }
+ 
+-
+-
+ void
+-show_credential(context, cred, cc)
+-    krb5_context context;
+-    krb5_creds *cred;
+-    krb5_ccache cc;
++show_credential(krb5_context context, krb5_creds *cred, krb5_ccache cc)
+ {
+     krb5_error_code retval;
+     char *name, *sname, *flags;
+@@ -519,11 +496,9 @@ gen_sym(krb5_context context, char **sym_out)
+     return 0;
+ }
+ 
+-krb5_error_code krb5_ccache_overwrite(context, ccs, cct, primary_principal)
+-    krb5_context context;
+-    krb5_ccache ccs;
+-    krb5_ccache cct;
+-    krb5_principal primary_principal;
++krb5_error_code
++krb5_ccache_overwrite(krb5_context context, krb5_ccache ccs, krb5_ccache cct,
++                      krb5_principal primary_principal)
+ {
+     krb5_error_code retval=0;
+     krb5_principal temp_principal;
+@@ -560,14 +535,10 @@ krb5_error_code krb5_ccache_overwrite(context, ccs, cct, primary_principal)
+     return retval;
+ }
+ 
+-krb5_error_code krb5_store_some_creds(context, cc, creds_def, creds_other, prst,
+-                                      stored)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_creds **creds_def;
+-    krb5_creds **creds_other;
+-    krb5_principal prst;
+-    krb5_boolean *stored;
++krb5_error_code
++krb5_store_some_creds(krb5_context context, krb5_ccache cc,
++                      krb5_creds **creds_def, krb5_creds **creds_other,
++                      krb5_principal prst, krb5_boolean *stored)
+ {
+ 
+     int i = 0;
+@@ -610,10 +581,8 @@ krb5_error_code krb5_store_some_creds(context, cc, creds_def, creds_other, prst,
+     return 0;
+ }
+ 
+-krb5_error_code krb5_ccache_filter (context, cc, prst)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_principal prst;
++krb5_error_code
++krb5_ccache_filter(krb5_context context, krb5_ccache cc, krb5_principal prst)
+ {
+ 
+     int i=0;
+@@ -657,10 +626,9 @@ krb5_error_code krb5_ccache_filter (context, cc, prst)
+     return 0;
+ }
+ 
+-krb5_boolean  krb5_find_princ_in_cred_list (context, creds_list, princ)
+-    krb5_context context;
+-    krb5_creds **creds_list;
+-    krb5_principal princ;
++krb5_boolean
++krb5_find_princ_in_cred_list(krb5_context context, krb5_creds **creds_list,
++                             krb5_principal princ)
+ {
+ 
+     int i = 0;
+@@ -682,11 +650,9 @@ krb5_boolean  krb5_find_princ_in_cred_list (context, creds_list, princ)
+     return temp_stored;
+ }
+ 
+-krb5_error_code  krb5_find_princ_in_cache (context, cc, princ, found)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_principal princ;
+-    krb5_boolean *found;
++krb5_error_code
++krb5_find_princ_in_cache(krb5_context context, krb5_ccache cc,
++                         krb5_principal princ, krb5_boolean *found)
+ {
+     krb5_error_code retval;
+     krb5_creds ** creds_list = NULL;
+diff --git a/src/clients/ksu/heuristic.c b/src/clients/ksu/heuristic.c
+index 4f7280f..e906de8 100644
+--- a/src/clients/ksu/heuristic.c
++++ b/src/clients/ksu/heuristic.c
+@@ -41,9 +41,8 @@ get_all_princ_from_file - retrieves all principal names
+ static void close_time (int, FILE *, int, FILE *);
+ static krb5_boolean find_str_in_list (char **, char *);
+ 
+-krb5_error_code get_all_princ_from_file (fp, plist)
+-    FILE *fp;
+-    char ***plist;
++krb5_error_code
++get_all_princ_from_file(FILE *fp, char ***plist)
+ {
+ 
+     krb5_error_code retval;
+@@ -92,10 +91,8 @@ list_union - combines list1 and list2 into combined_list.
+              or used by combined_list.
+ **************************************************************/
+ 
+-krb5_error_code list_union(list1, list2, combined_list)
+-    char **list1;
+-    char **list2;
+-    char ***combined_list;
++krb5_error_code
++list_union(char **list1, char **list2, char ***combined_list)
+ {
+ 
+     unsigned int c1 =0, c2 = 0, i=0, j=0;
+@@ -141,11 +138,7 @@ krb5_error_code list_union(list1, list2, combined_list)
+ }
+ 
+ krb5_error_code
+-filter(fp, cmd, k5users_list, k5users_filt_list)
+-    FILE *fp;
+-    char *cmd;
+-    char **k5users_list;
+-    char ***k5users_filt_list;
++filter(FILE *fp, char *cmd, char **k5users_list, char ***k5users_filt_list)
+ {
+ 
+     krb5_error_code retval =0;
+@@ -195,10 +188,7 @@ filter(fp, cmd, k5users_list, k5users_filt_list)
+ }
+ 
+ krb5_error_code
+-get_authorized_princ_names(luser, cmd, princ_list)
+-    const char *luser;
+-    char *cmd;
+-    char ***princ_list;
++get_authorized_princ_names(const char *luser, char *cmd, char ***princ_list)
+ {
+ 
+     struct passwd *pwd;
+@@ -272,11 +262,8 @@ get_authorized_princ_names(luser, cmd, princ_list)
+     return 0;
+ }
+ 
+-static void close_time(k5users_flag, users_fp, k5login_flag, login_fp)
+-    int k5users_flag;
+-    FILE *users_fp;
+-    int k5login_flag;
+-    FILE *login_fp;
++static void
++close_time(int k5users_flag, FILE *users_fp, int k5login_flag, FILE *login_fp)
+ {
+ 
+     if (!k5users_flag) fclose(users_fp);
+@@ -284,9 +271,8 @@ static void close_time(k5users_flag, users_fp, k5login_flag, login_fp)
+ 
+ }
+ 
+-static krb5_boolean find_str_in_list(list , elm)
+-    char **list;
+-    char *elm;
++static krb5_boolean
++find_str_in_list(char **list, char *elm)
+ {
+ 
+     int i=0;
+@@ -313,12 +299,9 @@ A principal is picked that has the best chance of getting in.
+ 
+ **********************************************************************/
+ 
+-
+-krb5_error_code get_closest_principal(context, plist, client, found)
+-    krb5_context context;
+-    char **plist;
+-    krb5_principal *client;
+-    krb5_boolean *found;
++krb5_error_code
++get_closest_principal(krb5_context context, char **plist,
++                      krb5_principal *client, krb5_boolean *found)
+ {
+     krb5_error_code retval =0;
+     krb5_principal temp_client, best_client = NULL;
+@@ -385,12 +368,9 @@ find_either_ticket checks to see whether there is a ticket for the
+    end server or tgt, if neither is there the return FALSE,
+ *****************************************************************/
+ 
+-krb5_error_code find_either_ticket (context, cc, client, end_server, found)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_principal client;
+-    krb5_principal end_server;
+-    krb5_boolean *found;
++krb5_error_code
++find_either_ticket(krb5_context context, krb5_ccache cc, krb5_principal client,
++                   krb5_principal end_server, krb5_boolean *found)
+ {
+ 
+     krb5_principal kdc_server;
+@@ -424,13 +404,9 @@ krb5_error_code find_either_ticket (context, cc, client, end_server, found)
+     return 0;
+ }
+ 
+-
+-krb5_error_code find_ticket (context, cc, client, server, found)
+-    krb5_context context;
+-    krb5_ccache cc;
+-    krb5_principal client;
+-    krb5_principal server;
+-    krb5_boolean *found;
++krb5_error_code
++find_ticket(krb5_context context, krb5_ccache cc, krb5_principal client,
++            krb5_principal server, krb5_boolean *found)
+ {
+ 
+     krb5_creds tgt, tgtq;
+@@ -470,13 +446,9 @@ krb5_error_code find_ticket (context, cc, client, server, found)
+     return 0;
+ }
+ 
+-
+-
+-krb5_error_code find_princ_in_list (context, princ, plist, found)
+-    krb5_context context;
+-    krb5_principal princ;
+-    char **plist;
+-    krb5_boolean *found;
++krb5_error_code
++find_princ_in_list(krb5_context context, krb5_principal princ, char **plist,
++                   krb5_boolean *found)
+ {
+ 
+     int i=0;
+@@ -516,21 +488,13 @@ path_out gets set to ...
+ 
+ ***********************************************************************/
+ 
+-krb5_error_code get_best_princ_for_target(context, source_uid, target_uid,
+-                                          source_user, target_user,
+-                                          cc_source, options, cmd,
+-                                          hostname, client, path_out)
+-    krb5_context context;
+-    uid_t source_uid;
+-    uid_t target_uid;
+-    char *source_user;
+-    char *target_user;
+-    krb5_ccache cc_source;
+-    krb5_get_init_creds_opt *options;
+-    char *cmd;
+-    char *hostname;
+-    krb5_principal *client;
+-    int *path_out;
++krb5_error_code
++get_best_princ_for_target(krb5_context context, uid_t source_uid,
++                          uid_t target_uid, char *source_user,
++                          char *target_user, krb5_ccache cc_source,
++                          krb5_get_init_creds_opt *options, char *cmd,
++                          char *hostname, krb5_principal *client,
++                          int *path_out)
+ {
+ 
+     princ_info princ_trials[10];
+diff --git a/src/clients/ksu/krb_auth_su.c b/src/clients/ksu/krb_auth_su.c
+index fb848dc..db10251 100644
+--- a/src/clients/ksu/krb_auth_su.c
++++ b/src/clients/ksu/krb_auth_su.c
+@@ -29,18 +29,13 @@
+ #include "ksu.h"
+ 
+ 
+-void plain_dump_principal ();
+-
+-krb5_boolean krb5_auth_check(context, client_pname, hostname, options,
+-                             target_user, cc, path_passwd, target_uid)
+-    krb5_context context;
+-    krb5_principal client_pname;
+-    char *hostname;
+-    krb5_get_init_creds_opt *options;
+-    char *target_user;
+-    uid_t target_uid;
+-    krb5_ccache cc;
+-    int *path_passwd;
++void plain_dump_principal(krb5_context, krb5_principal);
++
++krb5_boolean
++krb5_auth_check(krb5_context context, krb5_principal client_pname,
++                char *hostname, krb5_get_init_creds_opt *options,
++                char *target_user, krb5_ccache cc, int *path_passwd,
++                uid_t target_uid)
+ {
+     krb5_principal client;
+     krb5_verify_init_creds_opt vfy_opts;
+@@ -137,13 +132,10 @@ krb5_boolean krb5_auth_check(context, client_pname, hostname, options,
+     return (TRUE);
+ }
+ 
+-krb5_boolean ksu_get_tgt_via_passwd(context, client, options, zero_password,
+-                                    creds_out)
+-    krb5_context context;
+-    krb5_principal client;
+-    krb5_get_init_creds_opt *options;
+-    krb5_boolean *zero_password;
+-    krb5_creds *creds_out;
++krb5_boolean
++ksu_get_tgt_via_passwd(krb5_context context, krb5_principal client,
++                       krb5_get_init_creds_opt *options,
++                       krb5_boolean *zero_password, krb5_creds *creds_out)
+ {
+     krb5_error_code code;
+     krb5_creds creds;
+@@ -212,11 +204,8 @@ krb5_boolean ksu_get_tgt_via_passwd(context, client, options, zero_password,
+     return (TRUE);
+ }
+ 
+-
+-void dump_principal (context, str, p)
+-    krb5_context context;
+-    char *str;
+-    krb5_principal p;
++void
++dump_principal(krb5_context context, char *str, krb5_principal p)
+ {
+     char * stname;
+     krb5_error_code retval;
+@@ -228,9 +217,8 @@ void dump_principal (context, str, p)
+     fprintf(stderr, " %s: %s\n", str, stname);
+ }
+ 
+-void plain_dump_principal (context, p)
+-    krb5_context context;
+-    krb5_principal p;
++void
++plain_dump_principal (krb5_context context, krb5_principal p)
+ {
+     char * stname;
+     krb5_error_code retval;
+@@ -251,11 +239,8 @@ A principal is picked that has the best chance of getting in.
+ 
+ **********************************************************************/
+ 
+-
+-krb5_error_code get_best_principal(context, plist, client)
+-    krb5_context context;
+-    char **plist;
+-    krb5_principal *client;
++krb5_error_code
++get_best_principal(krb5_context context, char **plist, krb5_principal *client)
+ {
+     krb5_error_code retval =0;
+     krb5_principal temp_client, best_client = NULL;
+diff --git a/src/clients/ksu/main.c b/src/clients/ksu/main.c
+index af12861..7298436 100644
+--- a/src/clients/ksu/main.c
++++ b/src/clients/ksu/main.c
+@@ -64,7 +64,9 @@ static krb5_error_code resolve_target_cache(krb5_context ksu_context,
+ /* insure the proper specification of target user as well as catching
+    ill specified arguments to commands */
+ 
+-void usage (){
++void
++usage(void)
++{
+     fprintf(stderr,
+             _("Usage: %s [target user] [-n principal] [-c source cachename] "
+               "[-k] [-r time] [-p|-P] [-f|-F] [-l lifetime] [-zZ] [-q] "
+@@ -80,9 +82,7 @@ void usage (){
+ static uid_t source_uid, target_uid;
+ 
+ int
+-main (argc, argv)
+-    int argc;
+-    char ** argv;
++main(int argc, char ** argv)
+ {
+     int hp =0;
+     int some_rest_copy = 0;
+@@ -114,7 +114,6 @@ main (argc, argv)
+     char ** params;
+     int keep_target_cache = 0;
+     int child_pid, child_pgrp, ret_pid;
+-    extern char * getpass(), *crypt();
+     int pargc;
+     char ** pargv;
+     krb5_boolean stored = FALSE, cc_reused = FALSE, given_princ = FALSE;
+@@ -965,11 +964,10 @@ cleanup:
+ 
+ #ifdef HAVE_GETUSERSHELL
+ 
+-int standard_shell(sh)
+-    char *sh;
++int
++standard_shell(char *sh)
+ {
+     char *cp;
+-    char *getusershell();
+ 
+     while ((cp = getusershell()) != NULL)
+         if (!strcmp(cp, sh))
+@@ -979,7 +977,8 @@ int standard_shell(sh)
+ 
+ #endif /* HAVE_GETUSERSHELL */
+ 
+-static char * ontty()
++static char *
++ontty(void)
+ {
+     char *p;
+     static char buf[MAXPATHLEN + 5];
+@@ -996,10 +995,8 @@ static char * ontty()
+     return (buf);
+ }
+ 
+-
+-static int set_env_var(name, value)
+-    char *name;
+-    char *value;
++static int
++set_env_var(char *name, char *value)
+ {
+     char * env_var_buf;
+ 
+@@ -1008,9 +1005,8 @@ static int set_env_var(name, value)
+ 
+ }
+ 
+-static void sweep_up(context, cc)
+-    krb5_context context;
+-    krb5_ccache cc;
++static void
++sweep_up(krb5_context context, krb5_ccache cc)
+ {
+     krb5_error_code retval;
+ 
+@@ -1038,11 +1034,7 @@ get_params is to be called for the -a option or -e option to
+ *****************************************************************/
+ 
+ krb5_error_code
+-get_params(optindex, pargc, pargv, params)
+-    int *optindex;
+-    int pargc;
+-    char **pargv;
+-    char ***params;
++get_params(int *optindex, int pargc, char **pargv, char ***params)
+ {
+ 
+     int i,j;
+@@ -1075,10 +1067,8 @@ void print_status(const char *fmt, ...)
+ }
+ 
+ krb5_error_code
+-ksu_tgtname(context, server, client, tgtprinc)
+-    krb5_context context;
+-    const krb5_data *server, *client;
+-    krb5_principal *tgtprinc;
++ksu_tgtname(krb5_context context, const krb5_data *server,
++            const krb5_data *client, krb5_principal *tgtprinc)
+ {
+     return krb5_build_principal_ext(context, tgtprinc, client->length, client->data,
+                                     KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME,
+diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
+index 03f72f5..ac77a7d 100644
+--- a/src/clients/kvno/kvno.c
++++ b/src/clients/kvno/kvno.c
+@@ -39,7 +39,7 @@ static char *prog;
+ static int quiet = 0;
+ 
+ static void
+-xusage()
++xusage(void)
+ {
+     fprintf(stderr, _("usage: %s [-c ccache] [-e etype] [-k keytab] [-q] "
+                       "[-u | -S sname]\n"
+diff --git a/src/include/gssrpc/auth_gssapi.h b/src/include/gssrpc/auth_gssapi.h
+index 9d94853..63436a6 100644
+--- a/src/include/gssrpc/auth_gssapi.h
++++ b/src/include/gssrpc/auth_gssapi.h
+@@ -82,14 +82,12 @@ bool_t xdr_authgssapi_init_res(XDR *, auth_gssapi_init_res *);
+ 
+ bool_t auth_gssapi_wrap_data
+ (OM_uint32 *major, OM_uint32 *minor,
+-          gss_ctx_id_t context, uint32_t seq_num, XDR
+-          *out_xdrs, bool_t (*xdr_func)(), caddr_t
+-          xdr_ptr);
++          gss_ctx_id_t context, uint32_t seq_num,
++          XDR *out_xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr);
+ bool_t auth_gssapi_unwrap_data
+ (OM_uint32 *major, OM_uint32 *minor,
+-          gss_ctx_id_t context, uint32_t seq_num, XDR
+-          *in_xdrs, bool_t (*xdr_func)(), caddr_t
+-          xdr_ptr);
++          gss_ctx_id_t context, uint32_t seq_num,
++          XDR *in_xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr);
+ 
+ AUTH *auth_gssapi_create
+ (CLIENT *clnt,
+diff --git a/src/include/gssrpc/xdr.h b/src/include/gssrpc/xdr.h
+index da9e173..4e5c29b 100644
+--- a/src/include/gssrpc/xdr.h
++++ b/src/include/gssrpc/xdr.h
+@@ -102,7 +102,6 @@ enum xdr_op {
+  *
+  * XXX can't actually prototype it, because some take three args!!!
+  */
+-typedef        bool_t (*xdrproc_t)();
+ 
+ /*
+  * The XDR handle.
+@@ -143,6 +142,8 @@ typedef struct XDR {
+        int             x_handy;        /* extra private word */
+ } XDR;
+ 
++typedef        bool_t (*xdrproc_t)(XDR *, void *);
++
+ /*
+  * Operations defined on a XDR handle
+  *
+diff --git a/src/include/k5-int.h b/src/include/k5-int.h
+index 2f7791b..ce74b5a 100644
+--- a/src/include/k5-int.h
++++ b/src/include/k5-int.h
+@@ -2239,7 +2239,7 @@ make_data(void *data, unsigned int len)
+ }
+ 
+ static inline krb5_data
+-empty_data()
++empty_data(void)
+ {
+     return make_data(NULL, 0);
+ }
+diff --git a/src/include/k5-plugin.h b/src/include/k5-plugin.h
+index 90809e1..5c5af58 100644
+--- a/src/include/k5-plugin.h
++++ b/src/include/k5-plugin.h
+@@ -97,7 +97,7 @@ krb5int_get_plugin_data (struct plugin_file_handle *, const char *, void **,
+ 
+ long KRB5_CALLCONV
+ krb5int_get_plugin_func (struct plugin_file_handle *, const char *,
+-                         void (**)(), struct errinfo *);
++                         void (**)(void), struct errinfo *);
+ 
+ 
+ long KRB5_CALLCONV
+diff --git a/src/include/net-server.h b/src/include/net-server.h
+index a30749d..29b235e 100644
+--- a/src/include/net-server.h
++++ b/src/include/net-server.h
+@@ -30,6 +30,7 @@
+ #define NET_SERVER_H
+ 
+ #include <verto.h>
++#include <gssrpc/rpc.h>
+ 
+ /* The delimiter characters supported by the addresses string. */
+ #define ADDRESSES_DELIM ",; "
+@@ -64,13 +65,14 @@ krb5_error_code loop_add_udp_address(int default_port, const char *addresses);
+ krb5_error_code loop_add_tcp_address(int default_port, const char *addresses);
+ krb5_error_code loop_add_rpc_service(int default_port, const char *addresses,
+                                      u_long prognum, u_long versnum,
+-                                     void (*dispatchfn)());
++                                     void (*dispatchfn)(struct svc_req *,
++                                                        SVCXPRT *));
+ 
+ krb5_error_code loop_setup_network(verto_ctx *ctx, void *handle,
+                                    const char *progname,
+                                    int tcp_listen_backlog);
+ krb5_error_code loop_setup_signals(verto_ctx *ctx, void *handle,
+-                                   void (*reset)());
++                                   void (*reset)(void *));
+ void loop_free(verto_ctx *ctx);
+ 
+ /* to be supplied by the server application */
+diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y
+index d14cf96..3d69f0b 100644
+--- a/src/kadmin/cli/getdate.y
++++ b/src/kadmin/cli/getdate.y
+@@ -100,9 +100,6 @@ struct my_timeb {
+ #define bcopy(from, to, len) memcpy ((to), (from), (len))
+ #endif
+ 
+-extern struct tm       *gmtime();
+-extern struct tm       *localtime();
+-
+ #define yyparse getdate_yyparse
+ #define yylex getdate_yylex
+ #define yyerror getdate_yyerror
+diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
+index f3ea6fa..23b64b0 100644
+--- a/src/kadmin/cli/kadmin.c
++++ b/src/kadmin/cli/kadmin.c
+@@ -98,7 +98,7 @@ error(const char *fmt, ...)
+ }
+ 
+ static void
+-usage()
++usage(void)
+ {
+     error(_("Usage: %s [-r realm] [-p principal] [-q query] "
+             "[clnt|local args]\n"
+@@ -1130,7 +1130,7 @@ kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc,
+ }
+ 
+ static void
+-kadmin_addprinc_usage()
++kadmin_addprinc_usage(void)
+ {
+     error(_("usage: add_principal [options] principal\n"));
+     error(_("\toptions are:\n"));
+@@ -1154,7 +1154,7 @@ kadmin_addprinc_usage()
+ }
+ 
+ static void
+-kadmin_modprinc_usage()
++kadmin_modprinc_usage(void)
+ {
+     error(_("usage: modify_principal [options] principal\n"));
+     error(_("\toptions are:\n"));
+diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c
+index b0c8378..26f340a 100644
+--- a/src/kadmin/cli/keytab.c
++++ b/src/kadmin/cli/keytab.c
+@@ -50,14 +50,14 @@ static int quiet;
+ static int norandkey;
+ 
+ static void
+-add_usage()
++add_usage(void)
+ {
+     fprintf(stderr, _("Usage: ktadd [-k[eytab] keytab] [-q] [-e keysaltlist] "
+                       "[-norandkey] [principal | -glob princ-exp] [...]\n"));
+ }
+ 
+ static void
+-rem_usage()
++rem_usage(void)
+ {
+     fprintf(stderr, _("Usage: ktremove [-k[eytab] keytab] [-q] principal "
+                       "[kvno|\"all\"|\"old\"]\n"));
+diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
+index 038a0b2..9178fca 100644
+--- a/src/kadmin/dbutil/kdb5_create.c
++++ b/src/kadmin/dbutil/kdb5_create.c
+@@ -139,9 +139,8 @@ extern int exit_status;
+ extern kadm5_config_params global_params;
+ extern krb5_context util_context;
+ 
+-void kdb5_create(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++kdb5_create(int argc, char *argv[])
+ {
+     int optchar;
+ 
+@@ -337,9 +336,7 @@ void kdb5_create(argc, argv)
+ }
+ 
+ static krb5_error_code
+-tgt_keysalt_iterate(ksent, ptr)
+-    krb5_key_salt_tuple *ksent;
+-    krb5_pointer        ptr;
++tgt_keysalt_iterate(krb5_key_salt_tuple *ksent, krb5_pointer ptr)
+ {
+     krb5_context        context;
+     krb5_error_code     kret;
+@@ -378,11 +375,8 @@ tgt_keysalt_iterate(ksent, ptr)
+ }
+ 
+ static krb5_error_code
+-add_principal(context, princ, op, pblock)
+-    krb5_context context;
+-    krb5_principal princ;
+-    enum ap_op op;
+-    struct realm_info *pblock;
++add_principal(krb5_context context, krb5_principal princ, enum ap_op op,
++              struct realm_info *pblock)
+ {
+     krb5_error_code       retval;
+     krb5_db_entry         *entry = NULL;
+diff --git a/src/kadmin/dbutil/kdb5_destroy.c b/src/kadmin/dbutil/kdb5_destroy.c
+index fffce74..556cf0b 100644
+--- a/src/kadmin/dbutil/kdb5_destroy.c
++++ b/src/kadmin/dbutil/kdb5_destroy.c
+@@ -39,9 +39,7 @@ char *yes = "yes\n";                    /* \n to compare against result of
+                                            fgets */
+ 
+ void
+-kdb5_destroy(argc, argv)
+-    int argc;
+-    char *argv[];
++kdb5_destroy(int argc, char *argv[])
+ {
+     extern int optind;
+     int optchar;
+diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c
+index e05944f..eaba6cd 100644
+--- a/src/kadmin/dbutil/kdb5_stash.c
++++ b/src/kadmin/dbutil/kdb5_stash.c
+@@ -63,9 +63,7 @@ extern int exit_status;
+ extern int close_policy_db;
+ 
+ void
+-kdb5_stash(argc, argv)
+-    int argc;
+-    char *argv[];
++kdb5_stash(int argc, char *argv[])
+ {
+     extern char *optarg;
+     extern int optind;
+diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
+index 19a5925..55d529f 100644
+--- a/src/kadmin/dbutil/kdb5_util.c
++++ b/src/kadmin/dbutil/kdb5_util.c
+@@ -143,8 +143,8 @@ struct _cmd_table {
+     {NULL, NULL, 0},
+ };
+ 
+-static struct _cmd_table *cmd_lookup(name)
+-    char *name;
++static struct _cmd_table *
++cmd_lookup(char *name)
+ {
+     struct _cmd_table *cmd = cmd_table;
+     while (cmd->name) {
+@@ -162,8 +162,9 @@ static struct _cmd_table *cmd_lookup(name)
+ char **db5util_db_args = NULL;
+ int    db5util_db_args_size = 0;
+ 
+-static void extended_com_err_fn (const char *myprog, errcode_t code,
+-                                 const char *fmt, va_list args)
++static void
++extended_com_err_fn(const char *myprog, errcode_t code, const char *fmt,
++                    va_list args)
+ {
+     const char *emsg;
+     if (code) {
+@@ -177,7 +178,8 @@ static void extended_com_err_fn (const char *myprog, errcode_t code,
+     fprintf (stderr, "\n");
+ }
+ 
+-int add_db_arg(char *arg)
++int
++add_db_arg(char *arg)
+ {
+     char **temp;
+     db5util_db_args_size++;
+@@ -191,9 +193,8 @@ int add_db_arg(char *arg)
+     return 1;
+ }
+ 
+-int main(argc, argv)
+-    int argc;
+-    char *argv[];
++int
++main(int argc, char *argv[])
+ {
+     struct _cmd_table *cmd = NULL;
+     char *koptarg, **cmd_argv;
+@@ -365,7 +366,8 @@ int main(argc, argv)
+  * cannot be fetched (the master key stash file may not exist when the
+  * program is run).
+  */
+-static int open_db_and_mkey()
++static int
++open_db_and_mkey()
+ {
+     krb5_error_code retval;
+     krb5_data scratch, pwd, seed;
+@@ -508,9 +510,7 @@ quit()
+ }
+ 
+ static void
+-add_random_key(argc, argv)
+-    int argc;
+-    char **argv;
++add_random_key(int argc, char **argv)
+ {
+     krb5_error_code ret;
+     krb5_principal princ;
+diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c
+index 15a5ab3..b2e6c00 100644
+--- a/src/kadmin/dbutil/ovload.c
++++ b/src/kadmin/dbutil/ovload.c
+@@ -11,9 +11,8 @@
+ 
+ #define LINESIZE        32768 /* XXX */
+ 
+-static int parse_pw_hist_ent(current, hist)
+-    char *current;
+-    osa_pw_hist_ent *hist;
++static int
++parse_pw_hist_ent(char *current, osa_pw_hist_ent *hist)
+ {
+     int tmp, i, j, ret;
+     char *cp;
+@@ -90,12 +89,9 @@ done:
+  *      [modifies]
+  *
+  */
+-int process_ov_principal(kcontext, fname, filep, verbose, linenop)
+-    krb5_context        kcontext;
+-    const char          *fname;
+-    FILE                *filep;
+-    krb5_boolean        verbose;
+-    int                 *linenop;
++int
++process_ov_principal(krb5_context kcontext, const char *fname, FILE *filep,
++                     krb5_boolean verbose, int *linenop)
+ {
+     XDR                     xdrs;
+     osa_princ_ent_t         rec;
+diff --git a/src/kadmin/dbutil/strtok.c b/src/kadmin/dbutil/strtok.c
+index dee466a..93f3e85 100644
+--- a/src/kadmin/dbutil/strtok.c
++++ b/src/kadmin/dbutil/strtok.c
+@@ -50,9 +50,7 @@
+  */
+ 
+ char *
+-nstrtok(s, delim)
+-    char *s;
+-    const char *delim;
++nstrtok(char *s, const char *delim)
+ {
+     const char *spanp;
+     int c, sc;
+diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
+index 92d7023..87a69ca 100644
+--- a/src/kadmin/ktutil/ktutil.c
++++ b/src/kadmin/ktutil/ktutil.c
+@@ -39,9 +39,8 @@ extern ss_request_table ktutil_cmds;
+ krb5_context kcontext;
+ krb5_kt_list ktlist = NULL;
+ 
+-int main(argc, argv)
+-    int argc;
+-    char *argv[];
++int
++main(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+     int sci_idx;
+@@ -63,9 +62,8 @@ int main(argc, argv)
+     exit(0);
+ }
+ 
+-void ktutil_clear_list(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_clear_list(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+ 
+@@ -79,9 +77,8 @@ void ktutil_clear_list(argc, argv)
+     ktlist = NULL;
+ }
+ 
+-void ktutil_read_v5(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_read_v5(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+ 
+@@ -94,17 +91,15 @@ void ktutil_read_v5(argc, argv)
+         com_err(argv[0], retval, _("while reading keytab \"%s\""), argv[1]);
+ }
+ 
+-void ktutil_read_v4(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_read_v4(int argc, char *argv[])
+ {
+     fprintf(stderr, _("%s: reading srvtabs is no longer supported\n"),
+             argv[0]);
+ }
+ 
+-void ktutil_write_v5(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_write_v5(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+ 
+@@ -117,17 +112,15 @@ void ktutil_write_v5(argc, argv)
+         com_err(argv[0], retval, _("while writing keytab \"%s\""), argv[1]);
+ }
+ 
+-void ktutil_write_v4(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_write_v4(int argc, char *argv[])
+ {
+     fprintf(stderr, _("%s: writing srvtabs is no longer supported\n"),
+             argv[0]);
+ }
+ 
+-void ktutil_add_entry(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_add_entry(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+     char *princ = NULL;
+@@ -183,9 +176,8 @@ void ktutil_add_entry(argc, argv)
+         com_err(argv[0], retval, _("while adding new entry"));
+ }
+ 
+-void ktutil_delete_entry(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_delete_entry(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+ 
+@@ -198,9 +190,8 @@ void ktutil_delete_entry(argc, argv)
+         com_err(argv[0], retval, _("while deleting entry %d"), atoi(argv[1]));
+ }
+ 
+-void ktutil_list(argc, argv)
+-    int argc;
+-    char *argv[];
++void
++ktutil_list(int argc, char *argv[])
+ {
+     krb5_error_code retval;
+     krb5_kt_list lp;
+diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c
+index 56bed1b..e489b5b 100644
+--- a/src/kadmin/ktutil/ktutil_funcs.c
++++ b/src/kadmin/ktutil/ktutil_funcs.c
+@@ -37,9 +37,8 @@
+ /*
+  * Free a kt_list
+  */
+-krb5_error_code ktutil_free_kt_list(context, list)
+-    krb5_context context;
+-    krb5_kt_list list;
++krb5_error_code
++ktutil_free_kt_list(krb5_context context, krb5_kt_list list)
+ {
+     krb5_kt_list lp, prev;
+     krb5_error_code retval = 0;
+@@ -60,10 +59,8 @@ krb5_error_code ktutil_free_kt_list(context, list)
+  * Delete a numbered entry in a kt_list.  Takes a pointer to a kt_list
+  * in case head gets deleted.
+  */
+-krb5_error_code ktutil_delete(context, list, idx)
+-    krb5_context context;
+-    krb5_kt_list *list;
+-    int idx;
++krb5_error_code
++ktutil_delete(krb5_context context, krb5_kt_list *list, int idx)
+ {
+     krb5_kt_list lp, prev;
+     int i;
+@@ -138,16 +135,10 @@ get_etype_info(krb5_context context, krb5_principal princ, int fetch,
+  * password or key.  If the keytab list is NULL, allocate a new
+  * one first.
+  */
+-krb5_error_code ktutil_add(context, list, princ_str, fetch, kvno,
+-                           enctype_str, use_pass, salt_str)
+-    krb5_context context;
+-    krb5_kt_list *list;
+-    char *princ_str;
+-    int fetch;
+-    krb5_kvno kvno;
+-    char *enctype_str;
+-    int use_pass;
+-    char *salt_str;
++krb5_error_code
++ktutil_add(krb5_context context, krb5_kt_list *list, char *princ_str,
++           int fetch, krb5_kvno kvno, char *enctype_str, int use_pass,
++           char *salt_str)
+ {
+     krb5_keytab_entry *entry = NULL;
+     krb5_kt_list lp, *last;
+@@ -269,10 +260,8 @@ cleanup:
+  * Read in a keytab and append it to list.  If list starts as NULL,
+  * allocate a new one if necessary.
+  */
+-krb5_error_code ktutil_read_keytab(context, name, list)
+-    krb5_context context;
+-    char *name;
+-    krb5_kt_list *list;
++krb5_error_code
++ktutil_read_keytab(krb5_context context, char *name, krb5_kt_list *list)
+ {
+     krb5_kt_list lp = NULL, tail = NULL, back = NULL;
+     krb5_keytab kt;
+@@ -344,10 +333,8 @@ close_kt:
+ /*
+  * Takes a kt_list and writes it to the named keytab.
+  */
+-krb5_error_code ktutil_write_keytab(context, list, name)
+-    krb5_context context;
+-    krb5_kt_list list;
+-    char *name;
++krb5_error_code
++ktutil_write_keytab(krb5_context context, krb5_kt_list list, char *name)
+ {
+     krb5_kt_list lp;
+     krb5_keytab kt;
+diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
+index 56e9b90..e5dd233 100644
+--- a/src/kadmin/server/ipropd_svc.c
++++ b/src/kadmin/server/ipropd_svc.c
+@@ -535,8 +535,8 @@ krb5_iprop_prog_1(struct svc_req *rqstp,
+        kdb_last_t iprop_get_updates_1_arg;
+     } argument;
+     void *result;
+-    bool_t (*_xdr_argument)(), (*_xdr_result)();
+-    void *(*local)(/* union XXX *, struct svc_req * */);
++    xdrproc_t _xdr_argument, _xdr_result;
++    void *(*local)(char *, struct svc_req *);
+     char *whoami = "krb5_iprop_prog_1";
+ 
+     if (!check_iprop_rpcsec_auth(rqstp)) {
+@@ -555,21 +555,21 @@ krb5_iprop_prog_1(struct svc_req *rqstp,
+        return;
+ 
+     case IPROP_GET_UPDATES:
+-       _xdr_argument = xdr_kdb_last_t;
+-       _xdr_result = xdr_kdb_incr_result_t;
+-       local = (void *(*)()) iprop_get_updates_1_svc;
++       _xdr_argument = (xdrproc_t)xdr_kdb_last_t;
++       _xdr_result = (xdrproc_t)xdr_kdb_incr_result_t;
++       local = (void *(*)(char *, struct svc_req *))iprop_get_updates_1_svc;
+        break;
+ 
+     case IPROP_FULL_RESYNC:
+-       _xdr_argument = xdr_void;
+-       _xdr_result = xdr_kdb_fullresync_result_t;
+-       local = (void *(*)()) iprop_full_resync_1_svc;
++       _xdr_argument = (xdrproc_t)xdr_void;
++       _xdr_result = (xdrproc_t)xdr_kdb_fullresync_result_t;
++       local = (void *(*)(char *, struct svc_req *))iprop_full_resync_1_svc;
+        break;
+ 
+     case IPROP_FULL_RESYNC_EXT:
+-       _xdr_argument = xdr_u_int32;
+-       _xdr_result = xdr_kdb_fullresync_result_t;
+-       local = (void *(*)()) iprop_full_resync_ext_1_svc;
++       _xdr_argument = (xdrproc_t)xdr_u_int32;
++       _xdr_result = (xdrproc_t)xdr_kdb_fullresync_result_t;
++       local = (void *(*)(char *, struct svc_req *))iprop_full_resync_ext_1_svc;
+        break;
+ 
+     default:
+@@ -587,7 +587,7 @@ krb5_iprop_prog_1(struct svc_req *rqstp,
+        svcerr_decode(transp);
+        return;
+     }
+-    result = (*local)(&argument, rqstp);
++    result = (*local)((char *)&argument, rqstp);
+ 
+     if (_xdr_result && result != NULL &&
+        !svc_sendreply(transp, _xdr_result, result)) {
+diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
+index 8371fa7..f0e43d9 100644
+--- a/src/kadmin/server/kadm_rpc_svc.c
++++ b/src/kadmin/server/kadm_rpc_svc.c
+@@ -9,6 +9,7 @@
+ #include <gssapi/gssapi_krb5.h> /* for gss_nt_krb5_name */
+ #include <syslog.h>
+ #include <kadm5/kadm_rpc.h>
++#include <kadm5/admin_xdr.h>
+ #include <krb5.h>
+ #include <kadm5/admin.h>
+ #include <adm_proto.h>
+@@ -36,9 +37,8 @@ static int check_rpcsec_auth(struct svc_req *);
+  * Modifies:
+  */
+ 
+-void kadm_1(rqstp, transp)
+-   struct svc_req *rqstp;
+-   SVCXPRT *transp;
++void
++kadm_1(struct svc_req *rqstp, SVCXPRT *transp)
+ {
+      union {
+          cprinc_arg create_principal_2_arg;
+@@ -73,8 +73,8 @@ void kadm_1(rqstp, transp)
+          getpkeys_ret get_principal_keys_ret;
+      } result;
+      bool_t retval;
+-     bool_t (*xdr_argument)(), (*xdr_result)();
+-     bool_t (*local)();
++     xdrproc_t xdr_argument, xdr_result;
++     bool_t (*local)(char *, void *, struct svc_req *);
+ 
+      if (rqstp->rq_cred.oa_flavor != AUTH_GSSAPI &&
+         !check_rpcsec_auth(rqstp)) {
+@@ -92,153 +92,153 @@ void kadm_1(rqstp, transp)
+          return;
+ 
+      case CREATE_PRINCIPAL:
+-         xdr_argument = xdr_cprinc_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) create_principal_2_svc;
++         xdr_argument = (xdrproc_t)xdr_cprinc_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))create_principal_2_svc;
+          break;
+ 
+      case DELETE_PRINCIPAL:
+-         xdr_argument = xdr_dprinc_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) delete_principal_2_svc;
++          xdr_argument = (xdrproc_t)xdr_dprinc_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))delete_principal_2_svc;
+          break;
+ 
+      case MODIFY_PRINCIPAL:
+-         xdr_argument = xdr_mprinc_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) modify_principal_2_svc;
++         xdr_argument = (xdrproc_t)xdr_mprinc_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))modify_principal_2_svc;
+          break;
+ 
+      case RENAME_PRINCIPAL:
+-         xdr_argument = xdr_rprinc_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) rename_principal_2_svc;
++         xdr_argument = (xdrproc_t)xdr_rprinc_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))rename_principal_2_svc;
+          break;
+ 
+      case GET_PRINCIPAL:
+-         xdr_argument = xdr_gprinc_arg;
+-         xdr_result = xdr_gprinc_ret;
+-         local = (bool_t (*)()) get_principal_2_svc;
++         xdr_argument = (xdrproc_t)xdr_gprinc_arg;
++         xdr_result = (xdrproc_t)xdr_gprinc_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))get_principal_2_svc;
+          break;
+ 
+      case GET_PRINCS:
+-         xdr_argument = xdr_gprincs_arg;
+-         xdr_result = xdr_gprincs_ret;
+-         local = (bool_t (*)()) get_princs_2_svc;
++         xdr_argument = (xdrproc_t)xdr_gprincs_arg;
++         xdr_result = (xdrproc_t)xdr_gprincs_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))get_princs_2_svc;
+          break;
+ 
+      case CHPASS_PRINCIPAL:
+-         xdr_argument = xdr_chpass_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) chpass_principal_2_svc;
++         xdr_argument = (xdrproc_t)xdr_chpass_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))chpass_principal_2_svc;
+          break;
+ 
+      case SETKEY_PRINCIPAL:
+-         xdr_argument = xdr_setkey_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) setkey_principal_2_svc;
++         xdr_argument = (xdrproc_t)xdr_setkey_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))setkey_principal_2_svc;
+          break;
+ 
+      case CHRAND_PRINCIPAL:
+-         xdr_argument = xdr_chrand_arg;
+-         xdr_result = xdr_chrand_ret;
+-         local = (bool_t (*)()) chrand_principal_2_svc;
++         xdr_argument = (xdrproc_t)xdr_chrand_arg;
++         xdr_result = (xdrproc_t)xdr_chrand_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))chrand_principal_2_svc;
+          break;
+ 
+      case CREATE_POLICY:
+-         xdr_argument = xdr_cpol_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) create_policy_2_svc;
++         xdr_argument = (xdrproc_t)xdr_cpol_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))create_policy_2_svc;
+          break;
+ 
+      case DELETE_POLICY:
+-         xdr_argument = xdr_dpol_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) delete_policy_2_svc;
++         xdr_argument = (xdrproc_t)xdr_dpol_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))delete_policy_2_svc;
+          break;
+ 
+      case MODIFY_POLICY:
+-         xdr_argument = xdr_mpol_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) modify_policy_2_svc;
++         xdr_argument = (xdrproc_t)xdr_mpol_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))modify_policy_2_svc;
+          break;
+ 
+      case GET_POLICY:
+-         xdr_argument = xdr_gpol_arg;
+-         xdr_result = xdr_gpol_ret;
+-         local = (bool_t (*)()) get_policy_2_svc;
++         xdr_argument = (xdrproc_t)xdr_gpol_arg;
++         xdr_result = (xdrproc_t)xdr_gpol_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))get_policy_2_svc;
+          break;
+ 
+      case GET_POLS:
+-         xdr_argument = xdr_gpols_arg;
+-         xdr_result = xdr_gpols_ret;
+-         local = (bool_t (*)()) get_pols_2_svc;
++         xdr_argument = (xdrproc_t)xdr_gpols_arg;
++         xdr_result = (xdrproc_t)xdr_gpols_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))get_pols_2_svc;
+          break;
+ 
+      case GET_PRIVS:
+-         xdr_argument = xdr_u_int32;
+-         xdr_result = xdr_getprivs_ret;
+-         local = (bool_t (*)()) get_privs_2_svc;
++         xdr_argument = (xdrproc_t)xdr_u_int32;
++         xdr_result = (xdrproc_t)xdr_getprivs_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))get_privs_2_svc;
+          break;
+ 
+      case INIT:
+-         xdr_argument = xdr_u_int32;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) init_2_svc;
++         xdr_argument = (xdrproc_t)xdr_u_int32;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))init_2_svc;
+          break;
+ 
+      case CREATE_PRINCIPAL3:
+-         xdr_argument = xdr_cprinc3_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) create_principal3_2_svc;
++         xdr_argument = (xdrproc_t)xdr_cprinc3_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))create_principal3_2_svc;
+          break;
+ 
+      case CHPASS_PRINCIPAL3:
+-         xdr_argument = xdr_chpass3_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) chpass_principal3_2_svc;
++         xdr_argument = (xdrproc_t)xdr_chpass3_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))chpass_principal3_2_svc;
+          break;
+ 
+      case CHRAND_PRINCIPAL3:
+-         xdr_argument = xdr_chrand3_arg;
+-         xdr_result = xdr_chrand_ret;
+-         local = (bool_t (*)()) chrand_principal3_2_svc;
++         xdr_argument = (xdrproc_t)xdr_chrand3_arg;
++         xdr_result = (xdrproc_t)xdr_chrand_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))chrand_principal3_2_svc;
+          break;
+ 
+      case SETKEY_PRINCIPAL3:
+-         xdr_argument = xdr_setkey3_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) setkey_principal3_2_svc;
++         xdr_argument = (xdrproc_t)xdr_setkey3_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))setkey_principal3_2_svc;
+          break;
+ 
+      case PURGEKEYS:
+-         xdr_argument = xdr_purgekeys_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) purgekeys_2_svc;
++         xdr_argument = (xdrproc_t)xdr_purgekeys_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))purgekeys_2_svc;
+          break;
+ 
+      case GET_STRINGS:
+-         xdr_argument = xdr_gstrings_arg;
+-         xdr_result = xdr_gstrings_ret;
+-         local = (bool_t (*)()) get_strings_2_svc;
++         xdr_argument = (xdrproc_t)xdr_gstrings_arg;
++         xdr_result = (xdrproc_t)xdr_gstrings_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))get_strings_2_svc;
+          break;
+ 
+      case SET_STRING:
+-         xdr_argument = xdr_sstring_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) set_string_2_svc;
++         xdr_argument = (xdrproc_t)xdr_sstring_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))set_string_2_svc;
+          break;
+ 
+      case SETKEY_PRINCIPAL4:
+-         xdr_argument = xdr_setkey4_arg;
+-         xdr_result = xdr_generic_ret;
+-         local = (bool_t (*)()) setkey_principal4_2_svc;
++         xdr_argument = (xdrproc_t)xdr_setkey4_arg;
++         xdr_result = (xdrproc_t)xdr_generic_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))setkey_principal4_2_svc;
+          break;
+ 
+      case EXTRACT_KEYS:
+-         xdr_argument = xdr_getpkeys_arg;
+-         xdr_result = xdr_getpkeys_ret;
+-         local = (bool_t (*)()) get_principal_keys_2_svc;
++         xdr_argument = (xdrproc_t)xdr_getpkeys_arg;
++         xdr_result = (xdrproc_t)xdr_getpkeys_ret;
++         local = (bool_t (*)(char *, void *, struct svc_req *))get_principal_keys_2_svc;
+          break;
+ 
+      default:
+@@ -253,7 +253,7 @@ void kadm_1(rqstp, transp)
+          return;
+      }
+      memset(&result, 0, sizeof(result));
+-     retval = (*local)(&argument, &result, rqstp);
++     retval = (*local)((char *)&argument, &result, rqstp);
+      if (retval && !svc_sendreply(transp, xdr_result, (void *)&result)) {
+          krb5_klog_syslog(LOG_ERR, "WARNING! Unable to send function results, "
+                 "continuing.");
+diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
+index b29a0f5..a9508af 100644
+--- a/src/kadmin/server/ovsec_kadmd.c
++++ b/src/kadmin/server/ovsec_kadmd.c
+@@ -77,7 +77,7 @@ static krb5_context context;
+ static char *progname;
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, _("Usage: kadmind [-x db_args]* [-r realm] [-m] [-nofork] "
+                       "[-port port-number]\n"
+@@ -173,7 +173,7 @@ setup_loop(kadm5_config_params *params, int proponly, verto_ctx **ctx_out)
+ 
+ /* Point GSSAPI at the KDB keytab so we don't need an actual file keytab. */
+ static krb5_error_code
+-setup_kdb_keytab()
++setup_kdb_keytab(void)
+ {
+     krb5_error_code ret;
+ 
+diff --git a/src/kdc/t_ndr.c b/src/kdc/t_ndr.c
+index a3ac661..c2a2414 100644
+--- a/src/kdc/t_ndr.c
++++ b/src/kdc/t_ndr.c
+@@ -173,7 +173,7 @@ test_dec_enc(uint8_t *blob, size_t len, char *name, int fail)
+ #define RUN_TEST_FAIL(blob) test_dec_enc(blob, sizeof(blob), #blob, 1)
+ 
+ int
+-main()
++main(void)
+ {
+     printf("Running NDR tests...\n");
+ 
+diff --git a/src/kdc/t_replay.c b/src/kdc/t_replay.c
+index 57aad88..c9c9d65 100644
+--- a/src/kdc/t_replay.c
++++ b/src/kdc/t_replay.c
+@@ -570,7 +570,8 @@ test_kdc_insert_lookaside_cache_expire(void **state)
+     assert_int_equal(total_size, e2_size);
+ }
+ 
+-int main()
++int
++main(void)
+ {
+     int ret;
+ 
+@@ -611,7 +612,8 @@ int main()
+ 
+ #else /* NOCACHE */
+ 
+-int main()
++int
++main(void)
+ {
+     return 0;
+ }
+diff --git a/src/kprop/kpropd.c b/src/kprop/kpropd.c
+index aa3c81e..1b530fc 100644
+--- a/src/kprop/kpropd.c
++++ b/src/kprop/kpropd.c
+@@ -165,7 +165,7 @@ static kadm5_ret_t kadm5_get_kiprop_host_srv_name(krb5_context context,
+                                                   char **host_service_name);
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr,
+             _("\nUsage: %s [-r realm] [-s keytab] [-d] [-D] [-S]\n"
+diff --git a/src/kprop/kproplog.c b/src/kprop/kproplog.c
+index 06af2a1..1f10aa6 100644
+--- a/src/kprop/kproplog.c
++++ b/src/kprop/kproplog.c
+@@ -24,7 +24,7 @@
+ static char *progname;
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, _("\nUsage: %s [-h] [-v] [-v] [-e num]\n\t%s -R\n\n"),
+             progname, progname);
+@@ -393,7 +393,7 @@ print_update(kdb_hlog_t *ulog, uint32_t entry, uint32_t ulogentries,
+                 print_attr(&upd.kdb_update.kdbe_t_val[j], verbose > 1 ? 1 : 0);
+         }
+ 
+-        xdr_free(xdr_kdb_incr_update_t, (char *)&upd);
++        xdr_free((xdrproc_t)xdr_kdb_incr_update_t, (char *)&upd);
+         free(dbprinc);
+     }
+ }
+diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c
+index 1bdc793..75372d8 100644
+--- a/src/lib/apputils/net-server.c
++++ b/src/lib/apputils/net-server.c
+@@ -203,7 +203,7 @@ struct connection {
+ struct rpc_svc_data {
+     u_long prognum;
+     u_long versnum;
+-    void (*dispatch)();
++    void (*dispatch)(struct svc_req *, SVCXPRT *);
+ };
+ 
+ struct bind_address {
+@@ -255,7 +255,7 @@ free_sighup_context(verto_ctx *ctx, verto_ev *ev)
+ }
+ 
+ krb5_error_code
+-loop_setup_signals(verto_ctx *ctx, void *handle, void (*reset)())
++loop_setup_signals(verto_ctx *ctx, void *handle, void (*reset)(void *))
+ {
+     struct sighup_context *sc;
+     verto_ev *ev;
+@@ -434,7 +434,8 @@ loop_add_tcp_address(int default_port, const char *addresses)
+ 
+ krb5_error_code
+ loop_add_rpc_service(int default_port, const char *addresses, u_long prognum,
+-                     u_long versnum, void (*dispatchfn)())
++                     u_long versnum,
++                     void (*dispatchfn)(struct svc_req *, SVCXPRT *))
+ {
+     struct rpc_svc_data svc;
+ 
+diff --git a/src/lib/crypto/builtin/aes/aes-gen.c b/src/lib/crypto/builtin/aes/aes-gen.c
+index b528d37..4d7a16e 100644
+--- a/src/lib/crypto/builtin/aes/aes-gen.c
++++ b/src/lib/crypto/builtin/aes/aes-gen.c
+@@ -54,7 +54,8 @@ uint8_t test_case[NTESTS][4 * B] = {
+ aes_encrypt_ctx ctx;
+ aes_decrypt_ctx dctx;
+ 
+-static void init ()
++static void
++init (void)
+ {
+     AES_RETURN r;
+ 
+@@ -71,7 +72,8 @@ static void hexdump(const unsigned char *ptr, size_t len)
+        printf ("%s%02X", (i % 16 == 0) ? "\n    " : " ", ptr[i]);
+ }
+ 
+-static void fips_test ()
++static void
++fips_test (void)
+ {
+     static const unsigned char fipskey[16] = {
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+@@ -254,7 +256,8 @@ cts_dec (unsigned char *out, unsigned char *in, unsigned char *iv,
+     memcpy(out+B, pn, len-B);
+ }
+ 
+-static void ecb_test ()
++static void
++ecb_test (void)
+ {
+     unsigned int testno;
+     uint8_t output[4 * B], tmp[4 * B];
+@@ -285,7 +288,8 @@ static void ecb_test ()
+ 
+ unsigned char ivec[16] = { 0 };
+ 
+-static void cbc_test ()
++static void
++cbc_test (void)
+ {
+     unsigned int testno;
+     uint8_t output[4 * B], tmp[4 * B];
+@@ -314,7 +318,8 @@ static void cbc_test ()
+     printf ("\n");
+ }
+ 
+-static void cts_test ()
++static void
++cts_test (void)
+ {
+     unsigned int testno;
+     uint8_t output[4 * B], tmp[4 * B];
+@@ -339,7 +344,8 @@ static void cts_test ()
+     printf ("\n");
+ }
+ 
+-int main ()
++int
++main (void)
+ {
+     init ();
+     fips_test ();
+diff --git a/src/lib/crypto/builtin/camellia/camellia-gen.c b/src/lib/crypto/builtin/camellia/camellia-gen.c
+index 23b69c1..6eca0e0 100644
+--- a/src/lib/crypto/builtin/camellia/camellia-gen.c
++++ b/src/lib/crypto/builtin/camellia/camellia-gen.c
+@@ -19,7 +19,8 @@ struct {
+ } test_case[NTESTS];
+ camellia_ctx ctx, dctx;
+ 
+-static void init ()
++static void
++init (void)
+ {
+     size_t i, j;
+     cam_rval r;
+@@ -46,7 +47,8 @@ static void hexdump(const unsigned char *ptr, size_t len)
+        printf ("%s%02X", (i % 16 == 0) ? "\n    " : " ", ptr[i]);
+ }
+ 
+-static void fips_test ()
++static void
++fips_test (void)
+ {
+     static const unsigned char fipskey[16] = {
+        0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+@@ -234,7 +236,8 @@ cts_dec (unsigned char *out, unsigned char *in, unsigned char *iv,
+     memcpy(out+B, pn, len-B);
+ }
+ 
+-static void ecb_test ()
++static void
++ecb_test (void)
+ {
+     size_t testno;
+     unsigned char tmp[4*B];
+@@ -265,7 +268,8 @@ static void ecb_test ()
+ 
+ unsigned char ivec[16] = { 0 };
+ 
+-static void cbc_test ()
++static void
++cbc_test (void)
+ {
+     size_t testno;
+     unsigned char tmp[4*B];
+@@ -294,7 +298,8 @@ static void cbc_test ()
+     printf ("\n");
+ }
+ 
+-static void cts_test ()
++static void
++cts_test (void)
+ {
+     size_t testno;
+     unsigned char tmp[4*B];
+@@ -319,7 +324,8 @@ static void cts_test ()
+     printf ("\n");
+ }
+ 
+-int main ()
++int
++main (void)
+ {
+     init ();
+     fips_test ();
+diff --git a/src/lib/crypto/builtin/des/des_int.h b/src/lib/crypto/builtin/des/des_int.h
+index f8dc6b2..46fed7d 100644
+--- a/src/lib/crypto/builtin/des/des_int.h
++++ b/src/lib/crypto/builtin/des/des_int.h
+@@ -203,9 +203,6 @@ krb5_error_code mit_des_combine_subkeys(const krb5_keyblock *,
+                                         const krb5_keyblock *,
+                                         krb5_keyblock **);
+ 
+-/* f_pcbc.c */
+-int mit_des_pcbc_encrypt();
+-
+ /* f_sched.c */
+ int mit_des_make_key_sched(mit_des_cblock, mit_des_key_schedule);
+ 
+diff --git a/src/lib/crypto/builtin/des/destest.c b/src/lib/crypto/builtin/des/destest.c
+index 5211430..0a1a5be 100644
+--- a/src/lib/crypto/builtin/des/destest.c
++++ b/src/lib/crypto/builtin/des/destest.c
+@@ -62,9 +62,7 @@ void des_cblock_print_file (mit_des_cblock, FILE *);
+ krb5_octet zeroblock[8] = {0,0,0,0,0,0,0,0};
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char *argv[];
++main(int argc, char *argv[])
+ {
+     char block1[17], block2[17], block3[17];
+     /* Force tests of unaligned accesses.  */
+@@ -151,9 +149,7 @@ int value[128] = {
+ };
+ 
+ void
+-convert(text, cblock)
+-    char *text;
+-    unsigned char cblock[];
++convert(char *text, unsigned char cblock[])
+ {
+     int i;
+     for (i = 0; i < 8; i++) {
+@@ -173,16 +169,13 @@ convert(text, cblock)
+  */
+ 
+ int
+-mit_des_is_weak_key(key)
+-    mit_des_cblock key;
++mit_des_is_weak_key(mit_des_cblock key)
+ {
+     return 0;                           /* fake it out for testing */
+ }
+ 
+ void
+-des_cblock_print_file(x, fp)
+-    mit_des_cblock x;
+-    FILE *fp;
++des_cblock_print_file(mit_des_cblock x, FILE *fp)
+ {
+     unsigned char *y = (unsigned char *) x;
+     int i = 0;
+@@ -207,8 +200,7 @@ des_cblock_print_file(x, fp)
+  *                       correct des parity.
+  */
+ int
+-mit_des_check_key_parity(key)
+-    mit_des_cblock key;
++mit_des_check_key_parity(mit_des_cblock key)
+ {
+     unsigned int i;
+ 
+@@ -226,8 +218,7 @@ mit_des_check_key_parity(key)
+ }
+ 
+ void
+-mit_des_fixup_key_parity(key)
+-    mit_des_cblock key;
++mit_des_fixup_key_parity(mit_des_cblock key)
+ {
+     unsigned int i;
+     for (i=0; i<sizeof(mit_des_cblock); i++)
+diff --git a/src/lib/crypto/builtin/des/t_verify.c b/src/lib/crypto/builtin/des/t_verify.c
+index 4a19933..11f1a40 100644
+--- a/src/lib/crypto/builtin/des/t_verify.c
++++ b/src/lib/crypto/builtin/des/t_verify.c
+@@ -128,9 +128,7 @@ unsigned char mresult[8] = {
+ mit_des_key_schedule sched;
+ 
+ int
+-main(argc,argv)
+-    int argc;
+-    char *argv[];
++main(int argc, char *argv[])
+ {
+     /* Local Declarations */
+     size_t  in_length;
+@@ -335,9 +333,7 @@ main(argc,argv)
+ }
+ 
+ static void
+-do_encrypt(in,out)
+-    unsigned char *in;
+-    unsigned char *out;
++do_encrypt(unsigned char *in, unsigned char *out)
+ {
+     int i, j;
+     for (i =1; i<=nflag; i++) {
+@@ -359,9 +355,7 @@ do_encrypt(in,out)
+ }
+ 
+ static void
+-do_decrypt(in,out)
+-    unsigned char *out;
+-    unsigned char *in;
++do_decrypt(unsigned char *in, unsigned char *out)
+     /* try to invert it */
+ {
+     int i, j;
+@@ -388,8 +382,7 @@ do_decrypt(in,out)
+  */
+ 
+ int
+-mit_des_is_weak_key(key)
+-    mit_des_cblock key;
++mit_des_is_weak_key(mit_des_cblock key)
+ {
+     return 0;                           /* fake it out for testing */
+ }
+diff --git a/src/lib/crypto/builtin/sha1/t_shs.c b/src/lib/crypto/builtin/sha1/t_shs.c
+index c1d18f5..a668cb0 100644
+--- a/src/lib/crypto/builtin/sha1/t_shs.c
++++ b/src/lib/crypto/builtin/sha1/t_shs.c
+@@ -29,9 +29,8 @@ static SHS_LONG shsTestResults[][ 5 ] = {
+ };
+ #endif /* NEW_SHS */
+ 
+-static int compareSHSresults(shsInfo, shsTestLevel)
+-    SHS_INFO *shsInfo;
+-    int shsTestLevel;
++static int
++compareSHSresults(SHS_INFO *shsInfo, int shsTestLevel)
+ {
+     int i, fail = 0;
+ 
+@@ -55,7 +54,7 @@ static int compareSHSresults(shsInfo, shsTestLevel)
+ }
+ 
+ int
+-main()
++main(int argc, char *argv[])
+ {
+     SHS_INFO shsInfo;
+     unsigned int i;
+diff --git a/src/lib/crypto/builtin/sha1/t_shs3.c b/src/lib/crypto/builtin/sha1/t_shs3.c
+index 7aa0bbd..87caf7f 100644
+--- a/src/lib/crypto/builtin/sha1/t_shs3.c
++++ b/src/lib/crypto/builtin/sha1/t_shs3.c
+@@ -55,9 +55,7 @@ int mode;
+ int Dflag;
+ 
+ int
+-main(argc,argv)
+-    int argc;
+-    char **argv;
++main(int argc, char **argv)
+ {
+     char *argp;
+ 
+@@ -131,8 +129,7 @@ static void process(void)
+ 
+ #ifndef shsDigest
+ static unsigned char *
+-shsDigest(si)
+-    SHS_INFO *si;
++shsDigest(SHS_INFO *si)
+ {
+     longReverse(si->digest, SHS_DIGESTSIZE);
+     return (unsigned char*) si->digest;
+diff --git a/src/lib/crypto/crypto_tests/aes-test.c b/src/lib/crypto/crypto_tests/aes-test.c
+index a7382a4..d26f711 100644
+--- a/src/lib/crypto/crypto_tests/aes-test.c
++++ b/src/lib/crypto/crypto_tests/aes-test.c
+@@ -37,14 +37,14 @@ static char plain[16], cipher[16], zero[16];
+ 
+ static krb5_keyblock enc_key;
+ static krb5_data ivec;
+-static void init()
++static void init(void)
+ {
+     enc_key.contents = (krb5_octet *)key;
+     enc_key.length = 16;
+     ivec.data = zero;
+     ivec.length = 16;
+ }
+-static void enc()
++static void enc(void)
+ {
+     krb5_key k;
+     krb5_crypto_iov iov;
+@@ -93,7 +93,7 @@ static void vk_test_1(int len, krb5_enctype etype)
+     }
+     printf("\n==========\n");
+ }
+-static void vk_test()
++static void vk_test(void)
+ {
+     vk_test_1(16, ENCTYPE_AES128_CTS_HMAC_SHA1_96);
+     vk_test_1(32, ENCTYPE_AES256_CTS_HMAC_SHA1_96);
+@@ -119,7 +119,7 @@ static void vt_test_1(int len, krb5_enctype etype)
+     }
+     printf("\n==========\n");
+ }
+-static void vt_test()
++static void vt_test(void)
+ {
+     vt_test_1(16, ENCTYPE_AES128_CTS_HMAC_SHA1_96);
+     vt_test_1(32, ENCTYPE_AES256_CTS_HMAC_SHA1_96);
+diff --git a/src/lib/crypto/crypto_tests/camellia-test.c b/src/lib/crypto/crypto_tests/camellia-test.c
+index 23d1466..ca6579f 100644
+--- a/src/lib/crypto/crypto_tests/camellia-test.c
++++ b/src/lib/crypto/crypto_tests/camellia-test.c
+@@ -35,14 +35,14 @@ static char plain[16], cipher[16], zero[16];
+ 
+ static krb5_keyblock enc_key;
+ static krb5_data ivec;
+-static void init()
++static void init(void)
+ {
+     enc_key.contents = (unsigned char *)key;
+     enc_key.length = 16;
+     ivec.data = zero;
+     ivec.length = 16;
+ }
+-static void enc()
++static void enc(void)
+ {
+     krb5_key k;
+     krb5_crypto_iov iov;
+@@ -91,7 +91,7 @@ static void vk_test_1(int len)
+     }
+     printf("\n==========\n");
+ }
+-static void vk_test()
++static void vk_test(void)
+ {
+     vk_test_1(16);
+     vk_test_1(32);
+@@ -117,7 +117,7 @@ static void vt_test_1(int len, krb5_enctype etype)
+     }
+     printf("\n==========\n");
+ }
+-static void vt_test()
++static void vt_test(void)
+ {
+     vt_test_1(16, ENCTYPE_CAMELLIA128_CTS_CMAC);
+     vt_test_1(32, ENCTYPE_CAMELLIA256_CTS_CMAC);
+diff --git a/src/lib/crypto/crypto_tests/t_cf2.c b/src/lib/crypto/crypto_tests/t_cf2.c
+index 67c9dcd..4c894ad 100644
+--- a/src/lib/crypto/crypto_tests/t_cf2.c
++++ b/src/lib/crypto/crypto_tests/t_cf2.c
+@@ -46,7 +46,9 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-int main () {
++int
++main(void)
++{
+     krb5_error_code ret;
+     char pepper1[1025], pepper2[1025];
+     krb5_keyblock *k1 = NULL, *k2 = NULL, *out = NULL;
+diff --git a/src/lib/crypto/crypto_tests/t_cts.c b/src/lib/crypto/crypto_tests/t_cts.c
+index fe50516..f8a5a53 100644
+--- a/src/lib/crypto/crypto_tests/t_cts.c
++++ b/src/lib/crypto/crypto_tests/t_cts.c
+@@ -77,7 +77,7 @@ static void printk(const char *descr, krb5_keyblock *k) {
+     printd(descr, &d);
+ }
+ 
+-static void test_cts()
++static void test_cts(void)
+ {
+     static const char input[4*16] =
+         "I would like the General Gau's Chicken, please, and wonton soup.";
+diff --git a/src/lib/crypto/crypto_tests/t_encrypt.c b/src/lib/crypto/crypto_tests/t_encrypt.c
+index bd9b946..64092ef 100644
+--- a/src/lib/crypto/crypto_tests/t_encrypt.c
++++ b/src/lib/crypto/crypto_tests/t_encrypt.c
+@@ -88,7 +88,7 @@ display(const char *msg, const krb5_data *d)
+ }
+ 
+ int
+-main ()
++main(void)
+ {
+     krb5_context context = 0;
+     krb5_data  in, in2, out, out2, check, check2, state, signdata;
+diff --git a/src/lib/crypto/crypto_tests/t_fork.c b/src/lib/crypto/crypto_tests/t_fork.c
+index 428fc8a..8be7474 100644
+--- a/src/lib/crypto/crypto_tests/t_fork.c
++++ b/src/lib/crypto/crypto_tests/t_fork.c
+@@ -55,7 +55,7 @@ prepare_enc_data(krb5_key key, size_t in_len, krb5_enc_data *enc_data)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_keyblock kb_aes, kb_rc4;
+     krb5_key key_aes, key_rc4;
+diff --git a/src/lib/crypto/crypto_tests/t_hmac.c b/src/lib/crypto/crypto_tests/t_hmac.c
+index da359cb..e40136b 100644
+--- a/src/lib/crypto/crypto_tests/t_hmac.c
++++ b/src/lib/crypto/crypto_tests/t_hmac.c
+@@ -122,7 +122,8 @@ static krb5_error_code hmac1(const struct krb5_hash_provider *h,
+     return err;
+ }
+ 
+-static void test_hmac()
++static void
++test_hmac(void)
+ {
+     krb5_keyblock key;
+     krb5_data in, out;
+diff --git a/src/lib/crypto/crypto_tests/t_mddriver.c b/src/lib/crypto/crypto_tests/t_mddriver.c
+index ad65d03..035f825 100644
+--- a/src/lib/crypto/crypto_tests/t_mddriver.c
++++ b/src/lib/crypto/crypto_tests/t_mddriver.c
+@@ -111,9 +111,8 @@ struct md_test_entry md_test_suite[] = {
+    -t       - runs time trial
+    -x       - runs test script
+ */
+-int main (argc, argv)
+-    int argc;
+-    char *argv[];
++int
++main(int argc, char *argv[])
+ {
+     int i;
+ 
+@@ -128,10 +127,8 @@ int main (argc, argv)
+     return (0);
+ }
+ 
+-static void MDHash (bytes, len, count, out)
+-    char *bytes;
+-    size_t len, count;
+-    unsigned char *out;
++static void
++MDHash(char *bytes, size_t len, size_t count, unsigned char *out)
+ {
+     krb5_crypto_iov *iov;
+     krb5_data outdata = make_data (out, MDProvider.hashsize);
+@@ -150,8 +147,8 @@ static void MDHash (bytes, len, count, out)
+ 
+ /* Digests a string and prints the result.
+  */
+-static void MDString (string)
+-    char *string;
++static void
++MDString(char *string)
+ {
+     unsigned char digest[16];
+ 
+@@ -164,7 +161,8 @@ static void MDString (string)
+ /* Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte
+    blocks.
+ */
+-static void MDTimeTrial ()
++static void
++MDTimeTrial(void)
+ {
+     time_t endTime, startTime;
+     unsigned char block[TEST_BLOCK_LEN], digest[16];
+@@ -197,7 +195,8 @@ static void MDTimeTrial ()
+ 
+ /* Digests a reference suite of strings and prints the results.
+  */
+-static void MDTestSuite ()
++static void
++MDTestSuite(void)
+ {
+ #ifdef HAVE_TEST_SUITE
+     struct md_test_entry *entry;
+@@ -246,8 +245,8 @@ static void MDTestSuite ()
+ 
+ /* Prints a message digest in hexadecimal.
+  */
+-static void MDPrint (digest)
+-    unsigned char digest[16];
++static void
++MDPrint(unsigned char digest[16])
+ {
+     unsigned int i;
+ 
+diff --git a/src/lib/crypto/crypto_tests/t_nfold.c b/src/lib/crypto/crypto_tests/t_nfold.c
+index b94353c..a741b61 100644
+--- a/src/lib/crypto/crypto_tests/t_nfold.c
++++ b/src/lib/crypto/crypto_tests/t_nfold.c
+@@ -33,17 +33,20 @@
+ 
+ #define ASIZE(ARRAY) (sizeof(ARRAY)/sizeof(ARRAY[0]))
+ 
+-static void printhex (size_t len, const unsigned char *p)
++static void
++printhex(size_t len, const unsigned char *p)
+ {
+     while (len--)
+         printf ("%02x", 0xff & *p++);
+ }
+ 
+-static void printstringhex (const unsigned char *p) {
++static void
++printstringhex(const unsigned char *p) {
+     printhex (strlen ((const char *) p), p);
+ }
+ 
+-static void rfc_tests ()
++static void
++rfc_tests(void)
+ {
+     unsigned i;
+     struct {
+@@ -92,7 +95,8 @@ static void rfc_tests ()
+     }
+ }
+ 
+-static void fold_kerberos(unsigned int nbytes)
++static void
++fold_kerberos(unsigned int nbytes)
+ {
+     unsigned char cipher_text[300];
+     unsigned int j;
+@@ -125,9 +129,7 @@ unsigned char nfold_192[4][24] = {
+ };
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char *argv[];
++main(int argc, char *argv[])
+ {
+     unsigned char cipher_text[64];
+     unsigned int i, j;
+diff --git a/src/lib/crypto/crypto_tests/t_prf.c b/src/lib/crypto/crypto_tests/t_prf.c
+index d9877bd..6fa0afb 100644
+--- a/src/lib/crypto/crypto_tests/t_prf.c
++++ b/src/lib/crypto/crypto_tests/t_prf.c
+@@ -116,7 +116,7 @@ struct test {
+ };
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_error_code ret;
+     krb5_data output;
+diff --git a/src/lib/crypto/crypto_tests/t_sha2.c b/src/lib/crypto/crypto_tests/t_sha2.c
+index e6fa584..776c4e9 100644
+--- a/src/lib/crypto/crypto_tests/t_sha2.c
++++ b/src/lib/crypto/crypto_tests/t_sha2.c
+@@ -137,7 +137,7 @@ hash_test(const struct krb5_hash_provider *hash, struct test *tests)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     hash_test(&krb5int_hash_sha256, sha256_tests);
+     hash_test(&krb5int_hash_sha384, sha384_tests);
+diff --git a/src/lib/gssapi/generic/t_seqstate.c b/src/lib/gssapi/generic/t_seqstate.c
+index 8f44fcf..4df1ed6 100644
+--- a/src/lib/gssapi/generic/t_seqstate.c
++++ b/src/lib/gssapi/generic/t_seqstate.c
+@@ -164,7 +164,7 @@ struct test {
+ };
+ 
+ int
+-main()
++main(void)
+ {
+     size_t i, j;
+     enum width w;
+diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
+index b35e11b..227aa54 100644
+--- a/src/lib/gssapi/krb5/accept_sec_context.c
++++ b/src/lib/gssapi/krb5/accept_sec_context.c
+@@ -160,11 +160,8 @@ create_constrained_deleg_creds(OM_uint32 *minor_status,
+ 
+ /* Decode, decrypt and store the forwarded creds in the local ccache. */
+ static krb5_error_code
+-rd_and_store_for_creds(context, auth_context, inbuf, out_cred)
+-    krb5_context context;
+-    krb5_auth_context auth_context;
+-    krb5_data *inbuf;
+-    krb5_gss_cred_id_t *out_cred;
++rd_and_store_for_creds(krb5_context context, krb5_auth_context auth_context,
++                       krb5_data *inbuf, krb5_gss_cred_id_t *out_cred)
+ {
+     krb5_creds ** creds = NULL;
+     krb5_error_code retval;
+@@ -286,20 +283,12 @@ cleanup:
+  * Performs third leg of DCE authentication
+  */
+ static OM_uint32
+-kg_accept_dce(minor_status, context_handle, verifier_cred_handle,
+-              input_token, input_chan_bindings, src_name, mech_type,
+-              output_token, ret_flags, time_rec, delegated_cred_handle)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t *context_handle;
+-    gss_cred_id_t verifier_cred_handle;
+-    gss_buffer_t input_token;
+-    gss_channel_bindings_t input_chan_bindings;
+-    gss_name_t *src_name;
+-    gss_OID *mech_type;
+-    gss_buffer_t output_token;
+-    OM_uint32 *ret_flags;
+-    OM_uint32 *time_rec;
+-    gss_cred_id_t *delegated_cred_handle;
++kg_accept_dce(OM_uint32 *minor_status, gss_ctx_id_t *context_handle,
++              gss_cred_id_t verifier_cred_handle, gss_buffer_t input_token,
++              gss_channel_bindings_t input_chan_bindings, gss_name_t *src_name,
++              gss_OID *mech_type, gss_buffer_t output_token,
++              OM_uint32 *ret_flags, OM_uint32 *time_rec,
++              gss_cred_id_t *delegated_cred_handle)
+ {
+     krb5_error_code code;
+     krb5_gss_ctx_id_rec *ctx = 0;
+@@ -637,23 +626,13 @@ fail:
+ }
+ 
+ static OM_uint32
+-kg_accept_krb5(minor_status, context_handle,
+-               verifier_cred_handle, input_token,
+-               input_chan_bindings, src_name, mech_type,
+-               output_token, ret_flags, time_rec,
+-               delegated_cred_handle, exts)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t *context_handle;
+-    gss_cred_id_t verifier_cred_handle;
+-    gss_buffer_t input_token;
+-    gss_channel_bindings_t input_chan_bindings;
+-    gss_name_t *src_name;
+-    gss_OID *mech_type;
+-    gss_buffer_t output_token;
+-    OM_uint32 *ret_flags;
+-    OM_uint32 *time_rec;
+-    gss_cred_id_t *delegated_cred_handle;
+-    krb5_gss_ctx_ext_t exts;
++kg_accept_krb5(OM_uint32 *minor_status, gss_ctx_id_t *context_handle,
++               gss_cred_id_t verifier_cred_handle, gss_buffer_t input_token,
++               gss_channel_bindings_t input_chan_bindings,
++               gss_name_t *src_name, gss_OID *mech_type,
++               gss_buffer_t output_token, OM_uint32 *ret_flags,
++               OM_uint32 *time_rec, gss_cred_id_t *delegated_cred_handle,
++               krb5_gss_ctx_ext_t exts)
+ {
+     krb5_context context;
+     unsigned char *ptr;
+@@ -1310,22 +1289,15 @@ krb5_gss_accept_sec_context_ext(
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_accept_sec_context(minor_status, context_handle,
+-                            verifier_cred_handle, input_token,
+-                            input_chan_bindings, src_name, mech_type,
+-                            output_token, ret_flags, time_rec,
+-                            delegated_cred_handle)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t *context_handle;
+-    gss_cred_id_t verifier_cred_handle;
+-    gss_buffer_t input_token;
+-    gss_channel_bindings_t input_chan_bindings;
+-    gss_name_t *src_name;
+-    gss_OID *mech_type;
+-    gss_buffer_t output_token;
+-    OM_uint32 *ret_flags;
+-    OM_uint32 *time_rec;
+-    gss_cred_id_t *delegated_cred_handle;
++krb5_gss_accept_sec_context(OM_uint32 *minor_status,
++                            gss_ctx_id_t *context_handle,
++                            gss_cred_id_t verifier_cred_handle,
++                            gss_buffer_t input_token,
++                            gss_channel_bindings_t input_chan_bindings,
++                            gss_name_t *src_name, gss_OID *mech_type,
++                            gss_buffer_t output_token, OM_uint32 *ret_flags,
++                            OM_uint32 *time_rec,
++                            gss_cred_id_t *delegated_cred_handle)
+ {
+     krb5_gss_ctx_ext_rec exts;
+ 
+diff --git a/src/lib/gssapi/krb5/compare_name.c b/src/lib/gssapi/krb5/compare_name.c
+index 3f3788d..3aa5a0d 100644
+--- a/src/lib/gssapi/krb5/compare_name.c
++++ b/src/lib/gssapi/krb5/compare_name.c
+@@ -28,11 +28,8 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_compare_name(minor_status, name1, name2, name_equal)
+-    OM_uint32 *minor_status;
+-    gss_name_t name1;
+-    gss_name_t name2;
+-    int *name_equal;
++krb5_gss_compare_name(OM_uint32 *minor_status, gss_name_t name1,
++                      gss_name_t name2, int *name_equal)
+ {
+     krb5_context context;
+     krb5_error_code code;
+diff --git a/src/lib/gssapi/krb5/context_time.c b/src/lib/gssapi/krb5/context_time.c
+index 226de05..0ab885d 100644
+--- a/src/lib/gssapi/krb5/context_time.c
++++ b/src/lib/gssapi/krb5/context_time.c
+@@ -28,10 +28,8 @@
+  */
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_context_time(minor_status, context_handle, time_rec)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t context_handle;
+-    OM_uint32 *time_rec;
++krb5_gss_context_time(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                      OM_uint32 *time_rec)
+ {
+     krb5_error_code code;
+     krb5_gss_ctx_id_rec *ctx;
+diff --git a/src/lib/gssapi/krb5/delete_sec_context.c b/src/lib/gssapi/krb5/delete_sec_context.c
+index 4b9dfae..92e84b7 100644
+--- a/src/lib/gssapi/krb5/delete_sec_context.c
++++ b/src/lib/gssapi/krb5/delete_sec_context.c
+@@ -28,10 +28,9 @@
+  */
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_delete_sec_context(minor_status, context_handle, output_token)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t *context_handle;
+-    gss_buffer_t output_token;
++krb5_gss_delete_sec_context(OM_uint32 *minor_status,
++                            gss_ctx_id_t *context_handle,
++                            gss_buffer_t output_token)
+ {
+     krb5_context context;
+     krb5_gss_ctx_id_rec *ctx;
+diff --git a/src/lib/gssapi/krb5/disp_name.c b/src/lib/gssapi/krb5/disp_name.c
+index b097bf0..75fef01 100644
+--- a/src/lib/gssapi/krb5/disp_name.c
++++ b/src/lib/gssapi/krb5/disp_name.c
+@@ -24,12 +24,9 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_display_name(minor_status, input_name, output_name_buffer,
+-                      output_name_type)
+-    OM_uint32 *minor_status;
+-    gss_name_t input_name;
+-    gss_buffer_t output_name_buffer;
+-    gss_OID *output_name_type;
++krb5_gss_display_name(OM_uint32 *minor_status, gss_name_t input_name,
++                      gss_buffer_t output_name_buffer,
++                      gss_OID *output_name_type)
+ {
+     krb5_context context;
+     krb5_error_code code;
+diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c
+index 6ff62a9..71000b7 100644
+--- a/src/lib/gssapi/krb5/disp_status.c
++++ b/src/lib/gssapi/krb5/disp_status.c
+@@ -154,14 +154,9 @@ void krb5_gss_delete_error_info(void *p)
+ /**/
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_display_status(minor_status, status_value, status_type,
+-                        mech_type, message_context, status_string)
+-    OM_uint32 *minor_status;
+-    OM_uint32 status_value;
+-    int status_type;
+-    gss_OID mech_type;
+-    OM_uint32 *message_context;
+-    gss_buffer_t status_string;
++krb5_gss_display_status(OM_uint32 *minor_status, OM_uint32 status_value,
++                        int status_type, gss_OID mech_type,
++                        OM_uint32 *message_context, gss_buffer_t status_string)
+ {
+     status_string->length = 0;
+     status_string->value = NULL;
+diff --git a/src/lib/gssapi/krb5/export_sec_context.c b/src/lib/gssapi/krb5/export_sec_context.c
+index 44e5008..9730e05 100644
+--- a/src/lib/gssapi/krb5/export_sec_context.c
++++ b/src/lib/gssapi/krb5/export_sec_context.c
+@@ -27,10 +27,9 @@
+ #include "gssapiP_krb5.h"
+ #ifndef LEAN_CLIENT
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_export_sec_context(minor_status, context_handle, interprocess_token)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        *context_handle;
+-    gss_buffer_t        interprocess_token;
++krb5_gss_export_sec_context(OM_uint32 *minor_status,
++                            gss_ctx_id_t *context_handle,
++                            gss_buffer_t interprocess_token)
+ {
+     krb5_context        context = NULL;
+     krb5_error_code     kret;
+diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
+index 1e62b07..370b7d1 100644
+--- a/src/lib/gssapi/krb5/gssapi_krb5.c
++++ b/src/lib/gssapi/krb5/gssapi_krb5.c
+@@ -197,9 +197,7 @@ g_set kg_vdb = G_SET_INIT;
+  * so handling the expiration/invalidation condition here isn't needed.
+  */
+ OM_uint32
+-kg_get_defcred(minor_status, cred)
+-    OM_uint32 *minor_status;
+-    gss_cred_id_t *cred;
++kg_get_defcred(OM_uint32 *minor_status, gss_cred_id_t *cred)
+ {
+     OM_uint32 major;
+ 
+diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c
+index f64635a..cc6883b 100644
+--- a/src/lib/gssapi/krb5/import_name.c
++++ b/src/lib/gssapi/krb5/import_name.c
+@@ -120,12 +120,8 @@ parse_hostbased(const char *str, size_t len,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_import_name(minor_status, input_name_buffer,
+-                     input_name_type, output_name)
+-    OM_uint32 *minor_status;
+-    gss_buffer_t input_name_buffer;
+-    gss_OID input_name_type;
+-    gss_name_t *output_name;
++krb5_gss_import_name(OM_uint32 *minor_status, gss_buffer_t input_name_buffer,
++                     gss_OID input_name_type, gss_name_t *output_name)
+ {
+     krb5_context context;
+     krb5_principal princ = NULL;
+diff --git a/src/lib/gssapi/krb5/import_sec_context.c b/src/lib/gssapi/krb5/import_sec_context.c
+index 7d26f4d..e39c036 100644
+--- a/src/lib/gssapi/krb5/import_sec_context.c
++++ b/src/lib/gssapi/krb5/import_sec_context.c
+@@ -32,8 +32,7 @@
+  * Fix up the OID of the mechanism so that uses the static version of
+  * the OID if possible.
+  */
+-gss_OID krb5_gss_convert_static_mech_oid(oid)
+-    gss_OID    oid;
++gss_OID krb5_gss_convert_static_mech_oid(gss_OID oid)
+ {
+     const gss_OID_desc      *p;
+     OM_uint32               minor_status;
+@@ -49,10 +48,9 @@ gss_OID krb5_gss_convert_static_mech_oid(oid)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_import_sec_context(minor_status, interprocess_token, context_handle)
+-    OM_uint32           *minor_status;
+-    gss_buffer_t        interprocess_token;
+-    gss_ctx_id_t        *context_handle;
++krb5_gss_import_sec_context(OM_uint32 *minor_status,
++                            gss_buffer_t interprocess_token,
++                            gss_ctx_id_t *context_handle)
+ {
+     krb5_context        context;
+     krb5_error_code     kret = 0;
+diff --git a/src/lib/gssapi/krb5/indicate_mechs.c b/src/lib/gssapi/krb5/indicate_mechs.c
+index 45538cb..49d55e6 100644
+--- a/src/lib/gssapi/krb5/indicate_mechs.c
++++ b/src/lib/gssapi/krb5/indicate_mechs.c
+@@ -29,9 +29,7 @@
+ #include "mglueP.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_indicate_mechs(minor_status, mech_set)
+-    OM_uint32 *minor_status;
+-    gss_OID_set *mech_set;
++krb5_gss_indicate_mechs(OM_uint32 *minor_status, gss_OID_set *mech_set)
+ {
+     return generic_gss_copy_oid_set(minor_status, kg_all_mechs, mech_set);
+ }
+diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
+index 5748b84..0397fe1 100644
+--- a/src/lib/gssapi/krb5/init_sec_context.c
++++ b/src/lib/gssapi/krb5/init_sec_context.c
+@@ -117,14 +117,10 @@ int krb5_gss_dbg_client_expcreds = 0;
+  * Common code which fetches the correct krb5 credentials from the
+  * ccache.
+  */
+-static krb5_error_code get_credentials(context, cred, server, now,
+-                                       endtime, out_creds)
+-    krb5_context context;
+-    krb5_gss_cred_id_t cred;
+-    krb5_gss_name_t server;
+-    krb5_timestamp now;
+-    krb5_timestamp endtime;
+-    krb5_creds **out_creds;
++static krb5_error_code
++get_credentials(krb5_context context, krb5_gss_cred_id_t cred,
++                krb5_gss_name_t server, krb5_timestamp now,
++                krb5_timestamp endtime, krb5_creds **out_creds)
+ {
+     krb5_error_code     code;
+     krb5_creds          in_creds, evidence_creds, mcreds, *result_creds = NULL;
+@@ -365,17 +361,11 @@ cleanup:
+ }
+ 
+ static krb5_error_code
+-make_ap_req_v1(context, ctx, cred, k_cred, ad_context,
+-               chan_bindings, mech_type, token, exts)
+-    krb5_context context;
+-    krb5_gss_ctx_id_rec *ctx;
+-    krb5_gss_cred_id_t cred;
+-    krb5_creds *k_cred;
+-    krb5_authdata_context ad_context;
+-    gss_channel_bindings_t chan_bindings;
+-    gss_OID mech_type;
+-    gss_buffer_t token;
+-    krb5_gss_ctx_ext_t exts;
++make_ap_req_v1(krb5_context context, krb5_gss_ctx_id_rec *ctx,
++               krb5_gss_cred_id_t cred, krb5_creds *k_cred,
++               krb5_authdata_context ad_context,
++               gss_channel_bindings_t chan_bindings, gss_OID mech_type,
++               gss_buffer_t token, krb5_gss_ctx_ext_t exts)
+ {
+     krb5_flags mk_req_flags = 0;
+     krb5_error_code code;
+@@ -1048,24 +1038,15 @@ krb5int_gss_use_kdc_context(OM_uint32 *minor_status,
+ #endif
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_init_sec_context(minor_status, claimant_cred_handle,
+-                          context_handle, target_name, mech_type,
+-                          req_flags, time_req, input_chan_bindings,
+-                          input_token, actual_mech_type, output_token,
+-                          ret_flags, time_rec)
+-    OM_uint32 *minor_status;
+-    gss_cred_id_t claimant_cred_handle;
+-    gss_ctx_id_t *context_handle;
+-    gss_name_t target_name;
+-    gss_OID mech_type;
+-    OM_uint32 req_flags;
+-    OM_uint32 time_req;
+-    gss_channel_bindings_t input_chan_bindings;
+-    gss_buffer_t input_token;
+-    gss_OID *actual_mech_type;
+-    gss_buffer_t output_token;
+-    OM_uint32 *ret_flags;
+-    OM_uint32 *time_rec;
++krb5_gss_init_sec_context(OM_uint32 *minor_status,
++                          gss_cred_id_t claimant_cred_handle,
++                          gss_ctx_id_t *context_handle,
++                          gss_name_t target_name, gss_OID mech_type,
++                          OM_uint32 req_flags, OM_uint32 time_req,
++                          gss_channel_bindings_t input_chan_bindings,
++                          gss_buffer_t input_token, gss_OID *actual_mech_type,
++                          gss_buffer_t output_token, OM_uint32 *ret_flags,
++                          OM_uint32 *time_rec)
+ {
+     krb5_gss_ctx_ext_rec exts;
+ 
+diff --git a/src/lib/gssapi/krb5/inq_context.c b/src/lib/gssapi/krb5/inq_context.c
+index 97678e3..f8229f9 100644
+--- a/src/lib/gssapi/krb5/inq_context.c
++++ b/src/lib/gssapi/krb5/inq_context.c
+@@ -78,18 +78,11 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_inquire_context(minor_status, context_handle, initiator_name,
+-                         acceptor_name, lifetime_rec, mech_type, ret_flags,
+-                         locally_initiated, opened)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t context_handle;
+-    gss_name_t *initiator_name;
+-    gss_name_t *acceptor_name;
+-    OM_uint32 *lifetime_rec;
+-    gss_OID *mech_type;
+-    OM_uint32 *ret_flags;
+-    int *locally_initiated;
+-    int *opened;
++krb5_gss_inquire_context(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                         gss_name_t *initiator_name, gss_name_t *acceptor_name,
++                         OM_uint32 *lifetime_rec, gss_OID *mech_type,
++                         OM_uint32 *ret_flags, int *locally_initiated,
++                         int *opened)
+ {
+     krb5_context context;
+     krb5_error_code code;
+diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c
+index 0e67595..e968f8a 100644
+--- a/src/lib/gssapi/krb5/inq_cred.c
++++ b/src/lib/gssapi/krb5/inq_cred.c
+@@ -73,14 +73,9 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
+-                      cred_usage, mechanisms)
+-    OM_uint32 *minor_status;
+-    gss_cred_id_t cred_handle;
+-    gss_name_t *name;
+-    OM_uint32 *lifetime_ret;
+-    gss_cred_usage_t *cred_usage;
+-    gss_OID_set *mechanisms;
++krb5_gss_inquire_cred(OM_uint32 *minor_status, gss_cred_id_t cred_handle,
++                      gss_name_t *name, OM_uint32 *lifetime_ret,
++                      gss_cred_usage_t *cred_usage, gss_OID_set *mechanisms)
+ {
+     krb5_context context;
+     gss_cred_id_t defcred = GSS_C_NO_CREDENTIAL;
+@@ -209,16 +204,11 @@ cleanup:
+ 
+ /* V2 interface */
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_inquire_cred_by_mech(minor_status, cred_handle,
+-                              mech_type, name, initiator_lifetime,
+-                              acceptor_lifetime, cred_usage)
+-    OM_uint32           *minor_status;
+-    gss_cred_id_t       cred_handle;
+-    gss_OID             mech_type;
+-    gss_name_t          *name;
+-    OM_uint32           *initiator_lifetime;
+-    OM_uint32           *acceptor_lifetime;
+-    gss_cred_usage_t *cred_usage;
++krb5_gss_inquire_cred_by_mech(OM_uint32 *minor_status,
++                              gss_cred_id_t cred_handle, gss_OID mech_type,
++                              gss_name_t *name, OM_uint32 *initiator_lifetime,
++                              OM_uint32 *acceptor_lifetime,
++                              gss_cred_usage_t *cred_usage)
+ {
+     krb5_gss_cred_id_t  cred;
+     OM_uint32           lifetime;
+diff --git a/src/lib/gssapi/krb5/inq_names.c b/src/lib/gssapi/krb5/inq_names.c
+index b326adb..4a3709b 100644
+--- a/src/lib/gssapi/krb5/inq_names.c
++++ b/src/lib/gssapi/krb5/inq_names.c
+@@ -27,10 +27,8 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_inquire_names_for_mech(minor_status, mechanism, name_types)
+-    OM_uint32   *minor_status;
+-    gss_OID     mechanism;
+-    gss_OID_set *name_types;
++krb5_gss_inquire_names_for_mech(OM_uint32 *minor_status, gss_OID mechanism,
++                                gss_OID_set *name_types)
+ {
+     OM_uint32   major, minor;
+ 
+diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c
+index 99275be..71df11e 100644
+--- a/src/lib/gssapi/krb5/k5seal.c
++++ b/src/lib/gssapi/krb5/k5seal.c
+@@ -290,16 +290,10 @@ make_seal_token_v1 (krb5_context context,
+    and do not encode the ENC_TYPE, MSG_LENGTH, or MSG_TEXT fields */
+ 
+ OM_uint32
+-kg_seal(minor_status, context_handle, conf_req_flag, qop_req,
+-        input_message_buffer, conf_state, output_message_buffer, toktype)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t context_handle;
+-    int conf_req_flag;
+-    gss_qop_t qop_req;
+-    gss_buffer_t input_message_buffer;
+-    int *conf_state;
+-    gss_buffer_t output_message_buffer;
+-    int toktype;
++kg_seal(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++        int conf_req_flag, gss_qop_t qop_req,
++        gss_buffer_t input_message_buffer, int *conf_state,
++        gss_buffer_t output_message_buffer, int toktype)
+ {
+     krb5_gss_ctx_id_rec *ctx;
+     krb5_error_code code;
+@@ -361,16 +355,10 @@ kg_seal(minor_status, context_handle, conf_req_flag, qop_req,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_wrap(minor_status, context_handle, conf_req_flag,
+-              qop_req, input_message_buffer, conf_state,
+-              output_message_buffer)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        context_handle;
+-    int                 conf_req_flag;
+-    gss_qop_t           qop_req;
+-    gss_buffer_t        input_message_buffer;
+-    int                 *conf_state;
+-    gss_buffer_t        output_message_buffer;
++krb5_gss_wrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++              int conf_req_flag, gss_qop_t qop_req,
++              gss_buffer_t input_message_buffer, int *conf_state,
++              gss_buffer_t output_message_buffer)
+ {
+     return(kg_seal(minor_status, context_handle, conf_req_flag,
+                    qop_req, input_message_buffer, conf_state,
+@@ -378,13 +366,9 @@ krb5_gss_wrap(minor_status, context_handle, conf_req_flag,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_get_mic(minor_status, context_handle, qop_req,
+-                 message_buffer, message_token)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        context_handle;
+-    gss_qop_t           qop_req;
+-    gss_buffer_t        message_buffer;
+-    gss_buffer_t        message_token;
++krb5_gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                 gss_qop_t qop_req, gss_buffer_t message_buffer,
++                 gss_buffer_t message_token)
+ {
+     return(kg_seal(minor_status, context_handle, 0,
+                    qop_req, message_buffer, NULL,
+diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c
+index 9b183bc..c63e04b 100644
+--- a/src/lib/gssapi/krb5/k5unseal.c
++++ b/src/lib/gssapi/krb5/k5unseal.c
+@@ -58,17 +58,10 @@
+    conf_state is only valid if SEAL. */
+ 
+ static OM_uint32
+-kg_unseal_v1(context, minor_status, ctx, ptr, bodysize, message_buffer,
+-             conf_state, qop_state, toktype)
+-    krb5_context context;
+-    OM_uint32 *minor_status;
+-    krb5_gss_ctx_id_rec *ctx;
+-    unsigned char *ptr;
+-    int bodysize;
+-    gss_buffer_t message_buffer;
+-    int *conf_state;
+-    gss_qop_t *qop_state;
+-    int toktype;
++kg_unseal_v1(krb5_context context, OM_uint32 *minor_status,
++             krb5_gss_ctx_id_rec *ctx, unsigned char *ptr, int bodysize,
++             gss_buffer_t message_buffer, int *conf_state,
++             gss_qop_t *qop_state, int toktype)
+ {
+     krb5_error_code code;
+     int conflen = 0;
+@@ -360,15 +353,9 @@ kg_unseal_v1(context, minor_status, ctx, ptr, bodysize, message_buffer,
+    conf_state is only valid if SEAL. */
+ 
+ OM_uint32
+-kg_unseal(minor_status, context_handle, input_token_buffer,
+-          message_buffer, conf_state, qop_state, toktype)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t context_handle;
+-    gss_buffer_t input_token_buffer;
+-    gss_buffer_t message_buffer;
+-    int *conf_state;
+-    gss_qop_t *qop_state;
+-    int toktype;
++kg_unseal(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++          gss_buffer_t input_token_buffer, gss_buffer_t message_buffer,
++          int *conf_state, gss_qop_t *qop_state, int toktype)
+ {
+     krb5_gss_ctx_id_rec *ctx;
+     unsigned char *ptr;
+@@ -439,15 +426,10 @@ kg_unseal(minor_status, context_handle, input_token_buffer,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_unwrap(minor_status, context_handle,
+-                input_message_buffer, output_message_buffer,
+-                conf_state, qop_state)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        context_handle;
+-    gss_buffer_t        input_message_buffer;
+-    gss_buffer_t        output_message_buffer;
+-    int                 *conf_state;
+-    gss_qop_t           *qop_state;
++krb5_gss_unwrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                gss_buffer_t input_message_buffer,
++                gss_buffer_t output_message_buffer, int *conf_state,
++                gss_qop_t *qop_state)
+ {
+     OM_uint32           rstat;
+ 
+@@ -458,14 +440,9 @@ krb5_gss_unwrap(minor_status, context_handle,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_verify_mic(minor_status, context_handle,
+-                    message_buffer, token_buffer,
+-                    qop_state)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        context_handle;
+-    gss_buffer_t        message_buffer;
+-    gss_buffer_t        token_buffer;
+-    gss_qop_t           *qop_state;
++krb5_gss_verify_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                    gss_buffer_t message_buffer, gss_buffer_t token_buffer,
++                    gss_qop_t *qop_state)
+ {
+     OM_uint32           rstat;
+ 
+diff --git a/src/lib/gssapi/krb5/process_context_token.c b/src/lib/gssapi/krb5/process_context_token.c
+index a672f48..67805fb 100644
+--- a/src/lib/gssapi/krb5/process_context_token.c
++++ b/src/lib/gssapi/krb5/process_context_token.c
+@@ -28,11 +28,9 @@
+  */
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_process_context_token(minor_status, context_handle,
+-                               token_buffer)
+-    OM_uint32 *minor_status;
+-    gss_ctx_id_t context_handle;
+-    gss_buffer_t token_buffer;
++krb5_gss_process_context_token(OM_uint32 *minor_status,
++                               gss_ctx_id_t context_handle,
++                               gss_buffer_t token_buffer)
+ {
+     krb5_gss_ctx_id_rec *ctx;
+     OM_uint32 majerr;
+diff --git a/src/lib/gssapi/krb5/rel_cred.c b/src/lib/gssapi/krb5/rel_cred.c
+index 0da6c1b..9e04e2f 100644
+--- a/src/lib/gssapi/krb5/rel_cred.c
++++ b/src/lib/gssapi/krb5/rel_cred.c
+@@ -24,9 +24,7 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_release_cred(minor_status, cred_handle)
+-    OM_uint32 *minor_status;
+-    gss_cred_id_t *cred_handle;
++krb5_gss_release_cred(OM_uint32 *minor_status, gss_cred_id_t *cred_handle)
+ {
+     krb5_context context;
+     krb5_gss_cred_id_t cred;
+diff --git a/src/lib/gssapi/krb5/rel_name.c b/src/lib/gssapi/krb5/rel_name.c
+index 3dabe32..558bb6d 100644
+--- a/src/lib/gssapi/krb5/rel_name.c
++++ b/src/lib/gssapi/krb5/rel_name.c
+@@ -24,9 +24,7 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_release_name(minor_status, input_name)
+-    OM_uint32 *minor_status;
+-    gss_name_t *input_name;
++krb5_gss_release_name(OM_uint32 *minor_status, gss_name_t *input_name)
+ {
+     krb5_context context;
+     krb5_error_code code;
+diff --git a/src/lib/gssapi/krb5/rel_oid.c b/src/lib/gssapi/krb5/rel_oid.c
+index 739efe4..900c410 100644
+--- a/src/lib/gssapi/krb5/rel_oid.c
++++ b/src/lib/gssapi/krb5/rel_oid.c
+@@ -27,9 +27,7 @@
+ #include "gssapiP_krb5.h"
+ 
+ OM_uint32
+-krb5_gss_release_oid(minor_status, oid)
+-    OM_uint32   *minor_status;
+-    gss_OID     *oid;
++krb5_gss_release_oid(OM_uint32 *minor_status, gss_OID *oid)
+ {
+     /*
+      * The V2 API says the following!
+@@ -52,9 +50,7 @@ krb5_gss_release_oid(minor_status, oid)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_internal_release_oid(minor_status, oid)
+-    OM_uint32   *minor_status;
+-    gss_OID     *oid;
++krb5_gss_internal_release_oid(OM_uint32 *minor_status, gss_OID *oid)
+ {
+     /*
+      * This function only knows how to release internal OIDs. It will
+diff --git a/src/lib/gssapi/krb5/ser_sctx.c b/src/lib/gssapi/krb5/ser_sctx.c
+index 9e2d32e..1129b6a 100644
+--- a/src/lib/gssapi/krb5/ser_sctx.c
++++ b/src/lib/gssapi/krb5/ser_sctx.c
+@@ -137,10 +137,8 @@ kg_oid_size(gss_OID oid, size_t *sizep)
+ }
+ 
+ static krb5_error_code
+-kg_seqstate_externalize(arg, buffer, lenremain)
+-    g_seqnum_state      arg;
+-    krb5_octet          **buffer;
+-    size_t              *lenremain;
++kg_seqstate_externalize(g_seqnum_state arg, krb5_octet **buffer,
++                        size_t *lenremain)
+ {
+     krb5_error_code err;
+     err = krb5_ser_pack_int32(KV5M_GSS_QUEUE, buffer, lenremain);
+@@ -152,10 +150,8 @@ kg_seqstate_externalize(arg, buffer, lenremain)
+ }
+ 
+ static krb5_error_code
+-kg_seqstate_internalize(argp, buffer, lenremain)
+-    g_seqnum_state      *argp;
+-    krb5_octet          **buffer;
+-    size_t              *lenremain;
++kg_seqstate_internalize(g_seqnum_state *argp, krb5_octet **buffer,
++                        size_t *lenremain)
+ {
+     krb5_int32 ibuf;
+     krb5_octet         *bp;
+@@ -193,9 +189,7 @@ kg_seqstate_internalize(argp, buffer, lenremain)
+ }
+ 
+ static krb5_error_code
+-kg_seqstate_size(arg, sizep)
+-    g_seqnum_state      arg;
+-    size_t              *sizep;
++kg_seqstate_size(g_seqnum_state arg, size_t *sizep)
+ {
+     krb5_error_code kret;
+     size_t required;
+diff --git a/src/lib/gssapi/krb5/util_cksum.c b/src/lib/gssapi/krb5/util_cksum.c
+index 5b87956..5f7694f 100644
+--- a/src/lib/gssapi/krb5/util_cksum.c
++++ b/src/lib/gssapi/krb5/util_cksum.c
+@@ -28,10 +28,8 @@
+ 
+ /* Checksumming the channel bindings always uses plain MD5.  */
+ krb5_error_code
+-kg_checksum_channel_bindings(context, cb, cksum)
+-    krb5_context context;
+-    gss_channel_bindings_t cb;
+-    krb5_checksum *cksum;
++kg_checksum_channel_bindings(krb5_context context, gss_channel_bindings_t cb,
++                             krb5_checksum *cksum)
+ {
+     struct k5buf buf;
+     size_t sumlen;
+diff --git a/src/lib/gssapi/krb5/util_seed.c b/src/lib/gssapi/krb5/util_seed.c
+index 6e1c9ac..6857363 100644
+--- a/src/lib/gssapi/krb5/util_seed.c
++++ b/src/lib/gssapi/krb5/util_seed.c
+@@ -29,10 +29,7 @@
+ static const unsigned char zeros[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0};
+ 
+ krb5_error_code
+-kg_make_seed(context, key, seed)
+-    krb5_context context;
+-    krb5_key key;
+-    unsigned char *seed;
++kg_make_seed(krb5_context context, krb5_key key, unsigned char *seed)
+ {
+     krb5_error_code code;
+     krb5_key rkey = NULL;
+diff --git a/src/lib/gssapi/krb5/util_seqnum.c b/src/lib/gssapi/krb5/util_seqnum.c
+index bef631d..a5a4d5c 100644
+--- a/src/lib/gssapi/krb5/util_seqnum.c
++++ b/src/lib/gssapi/krb5/util_seqnum.c
+@@ -30,13 +30,8 @@
+  */
+ 
+ krb5_error_code
+-kg_make_seq_num(context, key, direction, seqnum, cksum, buf)
+-    krb5_context context;
+-    krb5_key key;
+-    int direction;
+-    krb5_ui_4 seqnum;
+-    unsigned char *cksum;
+-    unsigned char *buf;
++kg_make_seq_num(krb5_context context, krb5_key key, int direction,
++                krb5_ui_4 seqnum, unsigned char *cksum, unsigned char *buf)
+ {
+     unsigned char plain[8];
+ 
+@@ -59,13 +54,9 @@ kg_make_seq_num(context, key, direction, seqnum, cksum, buf)
+     return(kg_encrypt(context, key, KG_USAGE_SEQ, cksum, plain, buf, 8));
+ }
+ 
+-krb5_error_code kg_get_seq_num(context, key, cksum, buf, direction, seqnum)
+-    krb5_context context;
+-    krb5_key key;
+-    unsigned char *cksum;
+-    unsigned char *buf;
+-    int *direction;
+-    krb5_ui_4 *seqnum;
++krb5_error_code
++kg_get_seq_num(krb5_context context, krb5_key key, unsigned char *cksum,
++               unsigned char *buf, int *direction, krb5_ui_4 *seqnum)
+ {
+     krb5_error_code code;
+     unsigned char plain[8];
+diff --git a/src/lib/gssapi/krb5/val_cred.c b/src/lib/gssapi/krb5/val_cred.c
+index cb1cb93..83e7634 100644
+--- a/src/lib/gssapi/krb5/val_cred.c
++++ b/src/lib/gssapi/krb5/val_cred.c
+@@ -57,9 +57,7 @@ krb5_gss_validate_cred_1(OM_uint32 *minor_status, gss_cred_id_t cred_handle,
+ }
+ 
+ OM_uint32
+-krb5_gss_validate_cred(minor_status, cred_handle)
+-    OM_uint32 *minor_status;
+-    gss_cred_id_t cred_handle;
++krb5_gss_validate_cred(OM_uint32 *minor_status, gss_cred_id_t cred_handle)
+ {
+     krb5_context context;
+     krb5_error_code code;
+diff --git a/src/lib/gssapi/krb5/wrap_size_limit.c b/src/lib/gssapi/krb5/wrap_size_limit.c
+index 7959f42..8ea6ce1 100644
+--- a/src/lib/gssapi/krb5/wrap_size_limit.c
++++ b/src/lib/gssapi/krb5/wrap_size_limit.c
+@@ -74,14 +74,9 @@
+ 
+ /* V2 interface */
+ OM_uint32 KRB5_CALLCONV
+-krb5_gss_wrap_size_limit(minor_status, context_handle, conf_req_flag,
+-                         qop_req, req_output_size, max_input_size)
+-    OM_uint32           *minor_status;
+-    gss_ctx_id_t        context_handle;
+-    int                 conf_req_flag;
+-    gss_qop_t           qop_req;
+-    OM_uint32           req_output_size;
+-    OM_uint32           *max_input_size;
++krb5_gss_wrap_size_limit(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                         int conf_req_flag, gss_qop_t qop_req,
++                         OM_uint32 req_output_size, OM_uint32 *max_input_size)
+ {
+     krb5_gss_ctx_id_rec *ctx;
+     OM_uint32           data_size, conflen;
+diff --git a/src/lib/gssapi/mechglue/g_accept_sec_context.c b/src/lib/gssapi/mechglue/g_accept_sec_context.c
+index 4f2a66e..e4eff1f 100644
+--- a/src/lib/gssapi/mechglue/g_accept_sec_context.c
++++ b/src/lib/gssapi/mechglue/g_accept_sec_context.c
+@@ -128,30 +128,13 @@ allow_mech_by_default(gss_OID mech)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_accept_sec_context (minor_status,
+-                        context_handle,
+-                        verifier_cred_handle,
+-                        input_token_buffer,
+-                        input_chan_bindings,
+-                        src_name,
+-                        mech_type,
+-                        output_token,
+-                        ret_flags,
+-                        time_rec,
+-                        d_cred)
+-
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t *         context_handle;
+-gss_cred_id_t          verifier_cred_handle;
+-gss_buffer_t           input_token_buffer;
+-gss_channel_bindings_t input_chan_bindings;
+-gss_name_t *           src_name;
+-gss_OID *              mech_type;
+-gss_buffer_t           output_token;
+-OM_uint32 *            ret_flags;
+-OM_uint32 *            time_rec;
+-gss_cred_id_t *                d_cred;
+-
++gss_accept_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle,
++                      gss_cred_id_t verifier_cred_handle,
++                      gss_buffer_t input_token_buffer,
++                      gss_channel_bindings_t input_chan_bindings,
++                      gss_name_t *src_name, gss_OID *mech_type,
++                      gss_buffer_t output_token, OM_uint32 *ret_flags,
++                      OM_uint32 *time_rec, gss_cred_id_t *d_cred)
+ {
+     OM_uint32          status, temp_status, temp_minor_status;
+     OM_uint32          temp_ret_flags = 0;
+diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c
+index c885f56..2fc9c5c 100644
+--- a/src/lib/gssapi/mechglue/g_acquire_cred.c
++++ b/src/lib/gssapi/mechglue/g_acquire_cred.c
+@@ -85,24 +85,10 @@ val_acq_cred_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_acquire_cred(minor_status,
+-                 desired_name,
+-                 time_req,
+-                 desired_mechs,
+-                cred_usage,
+-                 output_cred_handle,
+-                 actual_mechs,
+-                 time_rec)
+-
+-OM_uint32 *            minor_status;
+-gss_name_t             desired_name;
+-OM_uint32              time_req;
+-gss_OID_set            desired_mechs;
+-int                    cred_usage;
+-gss_cred_id_t *                output_cred_handle;
+-gss_OID_set *          actual_mechs;
+-OM_uint32 *            time_rec;
+-
++gss_acquire_cred(OM_uint32 *minor_status, gss_name_t desired_name,
++                OM_uint32 time_req, gss_OID_set desired_mechs,
++                int cred_usage, gss_cred_id_t *output_cred_handle,
++                gss_OID_set *actual_mechs, OM_uint32 *time_rec)
+ {
+     return gss_acquire_cred_from(minor_status, desired_name, time_req,
+                                 desired_mechs, cred_usage, NULL,
+@@ -110,26 +96,11 @@ OM_uint32 *                time_rec;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_acquire_cred_from(minor_status,
+-                     desired_name,
+-                     time_req,
+-                     desired_mechs,
+-                     cred_usage,
+-                     cred_store,
+-                     output_cred_handle,
+-                     actual_mechs,
+-                     time_rec)
+-
+-OM_uint32 *                    minor_status;
+-gss_name_t                     desired_name;
+-OM_uint32                      time_req;
+-gss_OID_set                    desired_mechs;
+-int                            cred_usage;
+-gss_const_key_value_set_t      cred_store;
+-gss_cred_id_t *                        output_cred_handle;
+-gss_OID_set *                  actual_mechs;
+-OM_uint32 *                    time_rec;
+-
++gss_acquire_cred_from(OM_uint32 * minor_status, gss_name_t desired_name,
++                     OM_uint32 time_req, gss_OID_set desired_mechs,
++                     int cred_usage, gss_const_key_value_set_t cred_store,
++                     gss_cred_id_t *output_cred_handle,
++                     gss_OID_set *actual_mechs, OM_uint32 *time_rec)
+ {
+     OM_uint32 major = GSS_S_FAILURE, tmpMinor;
+     OM_uint32 first_major = GSS_S_COMPLETE, first_minor = 0;
+@@ -397,22 +368,12 @@ error:
+ 
+ /* V2 KRB5_CALLCONV */
+ OM_uint32 KRB5_CALLCONV
+-gss_add_cred(minor_status, input_cred_handle,
+-                 desired_name, desired_mech, cred_usage,
+-                 initiator_time_req, acceptor_time_req,
+-                 output_cred_handle, actual_mechs,
+-                 initiator_time_rec, acceptor_time_rec)
+-    OM_uint32          *minor_status;
+-    gss_cred_id_t      input_cred_handle;
+-    gss_name_t         desired_name;
+-    gss_OID            desired_mech;
+-    gss_cred_usage_t   cred_usage;
+-    OM_uint32          initiator_time_req;
+-    OM_uint32          acceptor_time_req;
+-    gss_cred_id_t      *output_cred_handle;
+-    gss_OID_set                *actual_mechs;
+-    OM_uint32          *initiator_time_rec;
+-    OM_uint32          *acceptor_time_rec;
++gss_add_cred(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle,
++            gss_name_t desired_name, gss_OID desired_mech,
++            gss_cred_usage_t cred_usage, OM_uint32 initiator_time_req,
++            OM_uint32 acceptor_time_req, gss_cred_id_t *output_cred_handle,
++            gss_OID_set *actual_mechs, OM_uint32 *initiator_time_rec,
++            OM_uint32 *acceptor_time_rec)
+ {
+     return gss_add_cred_from(minor_status, input_cred_handle, desired_name,
+                             desired_mech, cred_usage, initiator_time_req,
+@@ -422,25 +383,13 @@ gss_add_cred(minor_status, input_cred_handle,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_add_cred_from(minor_status, input_cred_handle,
+-                 desired_name, desired_mech,
+-                 cred_usage,
+-                 initiator_time_req, acceptor_time_req,
+-                 cred_store,
+-                 output_cred_handle, actual_mechs,
+-                 initiator_time_rec, acceptor_time_rec)
+-    OM_uint32          *minor_status;
+-    gss_cred_id_t      input_cred_handle;
+-    gss_name_t         desired_name;
+-    gss_OID            desired_mech;
+-    gss_cred_usage_t   cred_usage;
+-    OM_uint32          initiator_time_req;
+-    OM_uint32          acceptor_time_req;
+-    gss_const_key_value_set_t  cred_store;
+-    gss_cred_id_t      *output_cred_handle;
+-    gss_OID_set                *actual_mechs;
+-    OM_uint32          *initiator_time_rec;
+-    OM_uint32          *acceptor_time_rec;
++gss_add_cred_from(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle,
++                 gss_name_t desired_name, gss_OID desired_mech,
++                 gss_cred_usage_t cred_usage, OM_uint32 initiator_time_req,
++                 OM_uint32 acceptor_time_req,
++                 gss_const_key_value_set_t cred_store,
++                 gss_cred_id_t *output_cred_handle, gss_OID_set *actual_mechs,
++                 OM_uint32 *initiator_time_rec, OM_uint32 *acceptor_time_rec)
+ {
+     OM_uint32          status, temp_minor_status;
+     OM_uint32          time_req, time_rec = 0, *time_recp = NULL;
+diff --git a/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c b/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c
+index cc34acc..86abf98 100644
+--- a/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c
++++ b/src/lib/gssapi/mechglue/g_acquire_cred_with_pw.c
+@@ -98,26 +98,12 @@ val_acq_cred_pw_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_acquire_cred_with_password(
+-    minor_status,
+-    desired_name,
+-    password,
+-    time_req,
+-    desired_mechs,
+-    cred_usage,
+-    output_cred_handle,
+-    actual_mechs,
+-    time_rec)
+-
+-OM_uint32 *            minor_status;
+-const gss_name_t       desired_name;
+-const gss_buffer_t     password;
+-OM_uint32              time_req;
+-const gss_OID_set      desired_mechs;
+-int                    cred_usage;
+-gss_cred_id_t *                output_cred_handle;
+-gss_OID_set *          actual_mechs;
+-OM_uint32 *            time_rec;
++gss_acquire_cred_with_password(OM_uint32 *minor_status,
++                              const gss_name_t desired_name,
++                              const gss_buffer_t password, OM_uint32 time_req,
++                              const gss_OID_set desired_mechs, int cred_usage,
++                              gss_cred_id_t *output_cred_handle,
++                              gss_OID_set *actual_mechs, OM_uint32 *time_rec)
+ {
+     OM_uint32 major = GSS_S_FAILURE;
+     OM_uint32 initTimeOut, acceptTimeOut, outTime = GSS_C_INDEFINITE;
+@@ -306,23 +292,19 @@ val_add_cred_pw_args(
+ 
+ /* V2 KRB5_CALLCONV */
+ OM_uint32 KRB5_CALLCONV
+-gss_add_cred_with_password(minor_status, input_cred_handle,
+-                 desired_name, desired_mech, password, cred_usage,
+-                 initiator_time_req, acceptor_time_req,
+-                 output_cred_handle, actual_mechs,
+-                 initiator_time_rec, acceptor_time_rec)
+-    OM_uint32          *minor_status;
+-    const gss_cred_id_t        input_cred_handle;
+-    const gss_name_t   desired_name;
+-    const gss_OID      desired_mech;
+-    const gss_buffer_t password;
+-    gss_cred_usage_t   cred_usage;
+-    OM_uint32          initiator_time_req;
+-    OM_uint32          acceptor_time_req;
+-    gss_cred_id_t      *output_cred_handle;
+-    gss_OID_set                *actual_mechs;
+-    OM_uint32          *initiator_time_rec;
+-    OM_uint32          *acceptor_time_rec;
++gss_add_cred_with_password(
++    OM_uint32 *minor_status,
++    const gss_cred_id_t input_cred_handle,
++    const gss_name_t desired_name,
++    const gss_OID desired_mech,
++    const gss_buffer_t password,
++    gss_cred_usage_t cred_usage,
++    OM_uint32 initiator_time_req,
++    OM_uint32 acceptor_time_req,
++    gss_cred_id_t *output_cred_handle,
++    gss_OID_set *actual_mechs,
++    OM_uint32 *initiator_time_rec,
++    OM_uint32 *acceptor_time_rec)
+ {
+     OM_uint32          status, temp_minor_status;
+     OM_uint32          time_req, time_rec;
+diff --git a/src/lib/gssapi/mechglue/g_canon_name.c b/src/lib/gssapi/mechglue/g_canon_name.c
+index 61f657f..c5214db 100644
+--- a/src/lib/gssapi/mechglue/g_canon_name.c
++++ b/src/lib/gssapi/mechglue/g_canon_name.c
+@@ -54,14 +54,8 @@ val_canon_name_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_canonicalize_name(minor_status,
+-                               input_name,
+-                               mech_type,
+-                               output_name)
+-OM_uint32 *minor_status;
+-const gss_name_t input_name;
+-const gss_OID mech_type;
+-gss_name_t *output_name;
++gss_canonicalize_name(OM_uint32 *minor_status, const gss_name_t input_name,
++                     const gss_OID mech_type, gss_name_t *output_name)
+ {
+        gss_union_name_t in_union, out_union = NULL, dest_union = NULL;
+        OM_uint32 major_status = GSS_S_FAILURE, tmpmin;
+diff --git a/src/lib/gssapi/mechglue/g_compare_name.c b/src/lib/gssapi/mechglue/g_compare_name.c
+index af2e76b..74a9529 100644
+--- a/src/lib/gssapi/mechglue/g_compare_name.c
++++ b/src/lib/gssapi/mechglue/g_compare_name.c
+@@ -59,16 +59,8 @@ val_comp_name_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_compare_name (minor_status,
+-                  name1,
+-                  name2,
+-                  name_equal)
+-
+-OM_uint32 *            minor_status;
+-gss_name_t             name1;
+-gss_name_t             name2;
+-int *                  name_equal;
+-
++gss_compare_name(OM_uint32 * minor_status, gss_name_t name1, gss_name_t name2,
++                int * name_equal)
+ {
+     OM_uint32          major_status, temp_minor;
+     gss_union_name_t   union_name1, union_name2;
+diff --git a/src/lib/gssapi/mechglue/g_context_time.c b/src/lib/gssapi/mechglue/g_context_time.c
+index c947e76..b11b32d 100644
+--- a/src/lib/gssapi/mechglue/g_context_time.c
++++ b/src/lib/gssapi/mechglue/g_context_time.c
+@@ -29,14 +29,8 @@
+ #include "mglueP.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_context_time (minor_status,
+-                  context_handle,
+-                  time_rec)
+-
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-OM_uint32 *            time_rec;
+-
++gss_context_time(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++                OM_uint32 * time_rec)
+ {
+     OM_uint32          status;
+     gss_union_ctx_id_t ctx;
+diff --git a/src/lib/gssapi/mechglue/g_delete_sec_context.c b/src/lib/gssapi/mechglue/g_delete_sec_context.c
+index 574ff02..dc86cce 100644
+--- a/src/lib/gssapi/mechglue/g_delete_sec_context.c
++++ b/src/lib/gssapi/mechglue/g_delete_sec_context.c
+@@ -62,14 +62,8 @@ val_del_sec_ctx_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_delete_sec_context (minor_status,
+-                        context_handle,
+-                        output_token)
+-
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t *         context_handle;
+-gss_buffer_t           output_token;
+-
++gss_delete_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle,
++                      gss_buffer_t output_token)
+ {
+     OM_uint32          status;
+     gss_union_ctx_id_t ctx;
+diff --git a/src/lib/gssapi/mechglue/g_dsp_name.c b/src/lib/gssapi/mechglue/g_dsp_name.c
+index 21867c8..fae64f7 100644
+--- a/src/lib/gssapi/mechglue/g_dsp_name.c
++++ b/src/lib/gssapi/mechglue/g_dsp_name.c
+@@ -70,16 +70,8 @@ val_dsp_name_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_display_name (minor_status,
+-                  input_name,
+-                  output_name_buffer,
+-                  output_name_type)
+-
+-OM_uint32 *            minor_status;
+-gss_name_t             input_name;
+-gss_buffer_t           output_name_buffer;
+-gss_OID *              output_name_type;
+-
++gss_display_name(OM_uint32 *minor_status, gss_name_t input_name,
++                gss_buffer_t output_name_buffer, gss_OID *output_name_type)
+ {
+     OM_uint32          major_status;
+     gss_union_name_t   union_name;
+diff --git a/src/lib/gssapi/mechglue/g_dsp_status.c b/src/lib/gssapi/mechglue/g_dsp_status.c
+index 70e8492..14a7a82 100644
+--- a/src/lib/gssapi/mechglue/g_dsp_status.c
++++ b/src/lib/gssapi/mechglue/g_dsp_status.c
+@@ -36,20 +36,9 @@
+ static OM_uint32 displayMajor(OM_uint32, OM_uint32 *, gss_buffer_t);
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_display_status (minor_status,
+-                    status_value,
+-                    status_type,
+-                    req_mech_type,
+-                    message_context,
+-                    status_string)
+-
+-OM_uint32 *            minor_status;
+-OM_uint32              status_value;
+-int                    status_type;
+-gss_OID                        req_mech_type;
+-OM_uint32 *            message_context;
+-gss_buffer_t           status_string;
+-
++gss_display_status(OM_uint32 *minor_status, OM_uint32 status_value,
++                  int status_type, gss_OID req_mech_type,
++                  OM_uint32 *message_context, gss_buffer_t status_string)
+ {
+     gss_OID            mech_type = (gss_OID) req_mech_type;
+     gss_mechanism      mech;
+@@ -147,10 +136,7 @@ gss_buffer_t               status_string;
+  *     >= 2 - the supplementary error code bit shifted by 1
+  */
+ static OM_uint32
+-displayMajor(status, msgCtxt, outStr)
+-OM_uint32 status;
+-OM_uint32 *msgCtxt;
+-gss_buffer_t outStr;
++displayMajor(OM_uint32 status, OM_uint32 *msgCtxt, gss_buffer_t outStr)
+ {
+        OM_uint32 oneVal, mask = 0x1, currErr;
+        char *errStr = NULL;
+diff --git a/src/lib/gssapi/mechglue/g_dup_name.c b/src/lib/gssapi/mechglue/g_dup_name.c
+index ff01db2..bf6eb60 100644
+--- a/src/lib/gssapi/mechglue/g_dup_name.c
++++ b/src/lib/gssapi/mechglue/g_dup_name.c
+@@ -51,12 +51,8 @@ val_dup_name_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_duplicate_name(minor_status,
+-               src_name,
+-               dest_name)
+-OM_uint32 *minor_status;
+-const gss_name_t src_name;
+-gss_name_t *dest_name;
++gss_duplicate_name(OM_uint32 *minor_status, const gss_name_t src_name,
++                  gss_name_t *dest_name)
+ {
+                gss_union_name_t src_union, dest_union;
+                OM_uint32 major_status = GSS_S_FAILURE;
+diff --git a/src/lib/gssapi/mechglue/g_exp_sec_context.c b/src/lib/gssapi/mechglue/g_exp_sec_context.c
+index a04afe3..68a3267 100644
+--- a/src/lib/gssapi/mechglue/g_exp_sec_context.c
++++ b/src/lib/gssapi/mechglue/g_exp_sec_context.c
+@@ -68,14 +68,8 @@ val_exp_sec_ctx_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_export_sec_context(minor_status,
+-                       context_handle,
+-                       interprocess_token)
+-
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t *         context_handle;
+-gss_buffer_t           interprocess_token;
+-
++gss_export_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle,
++                      gss_buffer_t interprocess_token)
+ {
+     OM_uint32          status;
+     OM_uint32          length;
+diff --git a/src/lib/gssapi/mechglue/g_export_name.c b/src/lib/gssapi/mechglue/g_export_name.c
+index c845f8c..2e0611d 100644
+--- a/src/lib/gssapi/mechglue/g_export_name.c
++++ b/src/lib/gssapi/mechglue/g_export_name.c
+@@ -20,12 +20,8 @@
+ #include <errno.h>
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_export_name(minor_status,
+-                       input_name,
+-                       exported_name)
+-OM_uint32 *            minor_status;
+-const gss_name_t       input_name;
+-gss_buffer_t           exported_name;
++gss_export_name(OM_uint32 *minor_status, const gss_name_t input_name,
++               gss_buffer_t exported_name)
+ {
+        gss_union_name_t                union_name;
+ 
+diff --git a/src/lib/gssapi/mechglue/g_glue.c b/src/lib/gssapi/mechglue/g_glue.c
+index 176fbe6..47f4993 100644
+--- a/src/lib/gssapi/mechglue/g_glue.c
++++ b/src/lib/gssapi/mechglue/g_glue.c
+@@ -75,9 +75,8 @@ static gss_OID_desc gss_krb5_mechanism_oid_desc =
+ 
+ #define NTLMSSP_SIGNATURE "NTLMSSP"
+ 
+-OM_uint32 gssint_get_mech_type(OID, token)
+-    gss_OID            OID;
+-    gss_buffer_t       token;
++OM_uint32
++gssint_get_mech_type(gss_OID OID, gss_buffer_t token)
+ {
+     /* Check for interoperability exceptions */
+     if (token->length >= sizeof(NTLMSSP_SIGNATURE) &&
+@@ -163,12 +162,10 @@ import_internal_attributes(OM_uint32 *minor,
+  *  Internal routines to get and release an internal mechanism name
+  */
+ 
+-OM_uint32 gssint_import_internal_name (minor_status, mech_type, union_name,
+-                               internal_name)
+-OM_uint32      *minor_status;
+-gss_OID                mech_type;
+-gss_union_name_t       union_name;
+-gss_name_t     *internal_name;
++OM_uint32
++gssint_import_internal_name(OM_uint32 *minor_status, gss_OID mech_type,
++                           gss_union_name_t union_name,
++                           gss_name_t *internal_name)
+ {
+     OM_uint32          status, tmpMinor;
+     gss_mechanism      mech;
+@@ -220,12 +217,10 @@ gss_name_t        *internal_name;
+     return (status);
+ }
+ 
+-OM_uint32 gssint_export_internal_name(minor_status, mech_type,
+-                                    internal_name, name_buf)
+-    OM_uint32          *minor_status;
+-    const gss_OID              mech_type;
+-    const gss_name_t   internal_name;
+-    gss_buffer_t               name_buf;
++OM_uint32
++gssint_export_internal_name(OM_uint32 *minor_status, const gss_OID mech_type,
++                           const gss_name_t internal_name,
++                           gss_buffer_t name_buf)
+ {
+     OM_uint32 status;
+     gss_mechanism mech;
+@@ -307,13 +302,10 @@ OM_uint32 gssint_export_internal_name(minor_status, mech_type,
+     return (GSS_S_COMPLETE);
+ } /*  gssint_export_internal_name */
+ 
+-OM_uint32 gssint_display_internal_name (minor_status, mech_type, internal_name,
+-                                external_name, name_type)
+-OM_uint32      *minor_status;
+-gss_OID                mech_type;
+-gss_name_t     internal_name;
+-gss_buffer_t   external_name;
+-gss_OID                *name_type;
++OM_uint32
++gssint_display_internal_name(OM_uint32 *minor_status, gss_OID mech_type,
++                            gss_name_t internal_name,
++                            gss_buffer_t external_name, gss_OID *name_type)
+ {
+     OM_uint32          status;
+     gss_mechanism      mech;
+@@ -337,10 +329,9 @@ gss_OID            *name_type;
+     return (GSS_S_BAD_MECH);
+ }
+ 
+-OM_uint32 gssint_release_internal_name (minor_status, mech_type, internal_name)
+-OM_uint32      *minor_status;
+-gss_OID                mech_type;
+-gss_name_t     *internal_name;
++OM_uint32
++gssint_release_internal_name(OM_uint32 *minor_status, gss_OID mech_type,
++                            gss_name_t *internal_name)
+ {
+     OM_uint32          status;
+     gss_mechanism      mech;
+@@ -362,14 +353,10 @@ gss_name_t        *internal_name;
+     return (GSS_S_BAD_MECH);
+ }
+ 
+-OM_uint32 gssint_delete_internal_sec_context (minor_status,
+-                                             mech_type,
+-                                             internal_ctx,
+-                                             output_token)
+-OM_uint32      *minor_status;
+-gss_OID                mech_type;
+-gss_ctx_id_t   *internal_ctx;
+-gss_buffer_t   output_token;
++OM_uint32
++gssint_delete_internal_sec_context(OM_uint32 *minor_status, gss_OID mech_type,
++                                  gss_ctx_id_t *internal_ctx,
++                                  gss_buffer_t output_token)
+ {
+     OM_uint32          status;
+     gss_mechanism      mech;
+@@ -394,12 +381,10 @@ gss_buffer_t      output_token;
+  * name.  Note that internal_name should be considered "consumed" by
+  * this call, whether or not we return an error.
+  */
+-OM_uint32 gssint_convert_name_to_union_name(minor_status, mech,
+-                                          internal_name, external_name)
+-    OM_uint32 *minor_status;
+-    gss_mechanism      mech;
+-    gss_name_t internal_name;
+-    gss_name_t *external_name;
++OM_uint32
++gssint_convert_name_to_union_name(OM_uint32 *minor_status, gss_mechanism mech,
++                                 gss_name_t internal_name,
++                                 gss_name_t *external_name)
+ {
+     OM_uint32 major_status,tmp;
+     gss_union_name_t union_name;
+@@ -473,9 +458,7 @@ allocation_failure:
+  * external union credential.
+  */
+ gss_cred_id_t
+-gssint_get_mechanism_cred(union_cred, mech_type)
+-    gss_union_cred_t   union_cred;
+-    gss_OID            mech_type;
++gssint_get_mechanism_cred(gss_union_cred_t union_cred, gss_OID mech_type)
+ {
+     int                i;
+ 
+@@ -494,10 +477,8 @@ gssint_get_mechanism_cred(union_cred, mech_type)
+  * Both space for the structure and the data is allocated.
+  */
+ OM_uint32
+-gssint_create_copy_buffer(srcBuf, destBuf, addNullChar)
+-    const gss_buffer_t srcBuf;
+-    gss_buffer_t               *destBuf;
+-    int                        addNullChar;
++gssint_create_copy_buffer(const gss_buffer_t srcBuf, gss_buffer_t *destBuf,
++                         int addNullChar)
+ {
+     gss_buffer_t aBuf;
+     unsigned int len;
+diff --git a/src/lib/gssapi/mechglue/g_imp_name.c b/src/lib/gssapi/mechglue/g_imp_name.c
+index a805078..65fa6c0 100644
+--- a/src/lib/gssapi/mechglue/g_imp_name.c
++++ b/src/lib/gssapi/mechglue/g_imp_name.c
+@@ -81,16 +81,8 @@ val_imp_name_args(
+ static gss_buffer_desc emptyNameBuffer;
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_import_name(minor_status,
+-                input_name_buffer,
+-                input_name_type,
+-                output_name)
+-
+-OM_uint32 *            minor_status;
+-gss_buffer_t           input_name_buffer;
+-gss_OID                        input_name_type;
+-gss_name_t *           output_name;
+-
++gss_import_name(OM_uint32 * minor_status, gss_buffer_t input_name_buffer,
++               gss_OID input_name_type, gss_name_t * output_name)
+ {
+     gss_union_name_t   union_name;
+     OM_uint32          tmp, major_status = GSS_S_FAILURE;
+@@ -183,10 +175,8 @@ allocation_failure:
+ }
+ 
+ static OM_uint32
+-importExportName(minor, unionName, inputNameType)
+-    OM_uint32 *minor;
+-    gss_union_name_t unionName;
+-    gss_OID inputNameType;
++importExportName(OM_uint32 *minor, gss_union_name_t unionName,
++                gss_OID inputNameType)
+ {
+     gss_OID_desc mechOid;
+     gss_buffer_desc expName;
+diff --git a/src/lib/gssapi/mechglue/g_imp_sec_context.c b/src/lib/gssapi/mechglue/g_imp_sec_context.c
+index 6315201..55a3136 100644
+--- a/src/lib/gssapi/mechglue/g_imp_sec_context.c
++++ b/src/lib/gssapi/mechglue/g_imp_sec_context.c
+@@ -69,14 +69,9 @@ val_imp_sec_ctx_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_import_sec_context(minor_status,
+-                       interprocess_token,
+-                       context_handle)
+-
+-OM_uint32 *            minor_status;
+-gss_buffer_t           interprocess_token;
+-gss_ctx_id_t *         context_handle;
+-
++gss_import_sec_context(OM_uint32 *minor_status,
++                      gss_buffer_t interprocess_token,
++                      gss_ctx_id_t *context_handle)
+ {
+     OM_uint32          length = 0;
+     OM_uint32          status;
+diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c
+index a58074c..d639a8d 100644
+--- a/src/lib/gssapi/mechglue/g_init_sec_context.c
++++ b/src/lib/gssapi/mechglue/g_init_sec_context.c
+@@ -88,34 +88,15 @@ val_init_sec_ctx_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_init_sec_context (minor_status,
+-                      claimant_cred_handle,
+-                      context_handle,
+-                      target_name,
+-                      req_mech_type,
+-                      req_flags,
+-                      time_req,
+-                      input_chan_bindings,
+-                      input_token,
+-                      actual_mech_type,
+-                      output_token,
+-                      ret_flags,
+-                      time_rec)
+-
+-OM_uint32 *            minor_status;
+-gss_cred_id_t          claimant_cred_handle;
+-gss_ctx_id_t *         context_handle;
+-gss_name_t             target_name;
+-gss_OID                        req_mech_type;
+-OM_uint32              req_flags;
+-OM_uint32              time_req;
+-gss_channel_bindings_t input_chan_bindings;
+-gss_buffer_t           input_token;
+-gss_OID *              actual_mech_type;
+-gss_buffer_t           output_token;
+-OM_uint32 *            ret_flags;
+-OM_uint32 *            time_rec;
+-
++gss_init_sec_context(OM_uint32 *minor_status,
++                    gss_cred_id_t claimant_cred_handle,
++                    gss_ctx_id_t *context_handle, gss_name_t target_name,
++                    gss_OID req_mech_type, OM_uint32 req_flags,
++                    OM_uint32 time_req,
++                    gss_channel_bindings_t input_chan_bindings,
++                    gss_buffer_t input_token, gss_OID *actual_mech_type,
++                    gss_buffer_t output_token, OM_uint32 *ret_flags,
++                    OM_uint32 *time_rec)
+ {
+     OM_uint32          status, temp_minor_status;
+     gss_union_name_t   union_name;
+diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
+index 22f6c61..7e36c4a 100644
+--- a/src/lib/gssapi/mechglue/g_initialize.c
++++ b/src/lib/gssapi/mechglue/g_initialize.c
+@@ -169,9 +169,7 @@ gssint_mechglue_initialize_library(void)
+  * This routine requires direct access to the mechList.
+  */
+ OM_uint32 KRB5_CALLCONV
+-gss_release_oid(minor_status, oid)
+-OM_uint32 *minor_status;
+-gss_OID *oid;
++gss_release_oid(OM_uint32 *minor_status, gss_OID *oid)
+ {
+        OM_uint32 major;
+        gss_mech_info aMech;
+@@ -267,9 +265,7 @@ prune_deprecated(gss_OID_set mech_set)
+  * a mech oid set, and only update it once the file has changed.
+  */
+ OM_uint32 KRB5_CALLCONV
+-gss_indicate_mechs(minorStatus, mechSet_out)
+-OM_uint32 *minorStatus;
+-gss_OID_set *mechSet_out;
++gss_indicate_mechs(OM_uint32 *minorStatus, gss_OID_set *mechSet_out)
+ {
+        OM_uint32 status;
+ 
+@@ -417,8 +413,7 @@ build_mechSet(void)
+  * caller is responsible for freeing the memory
+  */
+ char *
+-gssint_get_modOptions(oid)
+-const gss_OID oid;
++gssint_get_modOptions(const gss_OID oid)
+ {
+        gss_mech_info aMech;
+        char *modOptions = NULL;
+@@ -479,7 +474,7 @@ load_if_changed(const char *pathname, time_t last, time_t *highest)
+ /* Try to load any config files which have changed since the last call.  Config
+  * files are MECH_CONF and any files matching MECH_CONF_PATTERN. */
+ static void
+-loadConfigFiles()
++loadConfigFiles(void)
+ {
+        glob_t globbuf;
+        time_t highest = (time_t)-1, now;
+@@ -679,7 +674,8 @@ gssint_register_mechinfo(gss_mech_info template)
+                memset(&errinfo, 0, sizeof(errinfo)); \
+                if (krb5int_get_plugin_func(_dl, \
+                                            #_symbol, \
+-                                           (void (**)())&(_mech)->_symbol, \
++                                           (void (**)(void)) \
++                                           &(_mech)->_symbol, \
+                                            &errinfo) || errinfo.code) {  \
+                        (_mech)->_symbol = NULL; \
+                        k5_clear_error(&errinfo); \
+@@ -801,7 +797,7 @@ build_dynamicMech(void *dl, const gss_OID mech_type)
+                memset(&errinfo, 0, sizeof(errinfo));                   \
+                if (krb5int_get_plugin_func(_dl,                        \
+                                            "gssi" #_nsym,              \
+-                                           (void (**)())&(_mech)->_psym \
++                                           (void (**)(void))&(_mech)->_psym \
+                                            ## _nsym,                   \
+                                            &errinfo) || errinfo.code) { \
+                        (_mech)->_psym ## _nsym = NULL;                 \
+@@ -948,7 +944,7 @@ loadInterMech(gss_mech_info minfo)
+        }
+ 
+        if (krb5int_get_plugin_func(dl, MECH_INTERPOSER_SYM,
+-                                   (void (**)())&isym, &errinfo) != 0)
++                                   (void (**)(void))&isym, &errinfo) != 0)
+                goto cleanup;
+ 
+        /* Get a list of mechs to interpose. */
+@@ -1184,7 +1180,7 @@ gssint_get_mechanism(gss_const_OID oid)
+                return ((gss_mechanism)NULL);
+        }
+ 
+-       if (krb5int_get_plugin_func(dl, MECH_SYM, (void (**)())&sym,
++       if (krb5int_get_plugin_func(dl, MECH_SYM, (void (**)(void))&sym,
+                                    &errinfo) == 0) {
+                /* Call the symbol to get the mechanism table */
+                aMech->mech = (*sym)(aMech->mech_type);
+diff --git a/src/lib/gssapi/mechglue/g_inq_cred.c b/src/lib/gssapi/mechglue/g_inq_cred.c
+index 4ed7774..0aa9acc 100644
+--- a/src/lib/gssapi/mechglue/g_inq_cred.c
++++ b/src/lib/gssapi/mechglue/g_inq_cred.c
+@@ -35,20 +35,9 @@
+ #include <time.h>
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_inquire_cred(minor_status,
+-                 cred_handle,
+-                 name,
+-                 lifetime,
+-                cred_usage,
+-                 mechanisms)
+-
+-OM_uint32 *            minor_status;
+-gss_cred_id_t          cred_handle;
+-gss_name_t *           name;
+-OM_uint32 *            lifetime;
+-int *                  cred_usage;
+-gss_OID_set *          mechanisms;
+-
++gss_inquire_cred(OM_uint32 *minor_status, gss_cred_id_t cred_handle,
++                gss_name_t *name, OM_uint32 *lifetime, int *cred_usage,
++                gss_OID_set *mechanisms)
+ {
+     OM_uint32          status, temp_minor_status;
+     gss_union_cred_t   union_cred;
+@@ -159,15 +148,11 @@ error:
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
+-                        initiator_lifetime, acceptor_lifetime, cred_usage)
+-    OM_uint32          *minor_status;
+-    gss_cred_id_t      cred_handle;
+-    gss_OID            mech_type;
+-    gss_name_t         *name;
+-    OM_uint32          *initiator_lifetime;
+-    OM_uint32          *acceptor_lifetime;
+-    gss_cred_usage_t *cred_usage;
++gss_inquire_cred_by_mech(OM_uint32 *minor_status, gss_cred_id_t cred_handle,
++                        gss_OID mech_type, gss_name_t *name,
++                        OM_uint32 *initiator_lifetime,
++                        OM_uint32 *acceptor_lifetime,
++                        gss_cred_usage_t *cred_usage)
+ {
+     gss_union_cred_t   union_cred;
+     gss_cred_id_t      mech_cred;
+diff --git a/src/lib/gssapi/mechglue/g_inq_names.c b/src/lib/gssapi/mechglue/g_inq_names.c
+index d22af8b..066c00c 100644
+--- a/src/lib/gssapi/mechglue/g_inq_names.c
++++ b/src/lib/gssapi/mechglue/g_inq_names.c
+@@ -32,12 +32,8 @@
+ 
+ /* Last argument new for V2 */
+ OM_uint32 KRB5_CALLCONV
+-gss_inquire_names_for_mech(minor_status, mechanism, name_types)
+-
+-OM_uint32 *    minor_status;
+-gss_OID        mechanism;
+-gss_OID_set *  name_types;
+-
++gss_inquire_names_for_mech(OM_uint32 *minor_status, gss_OID mechanism,
++                          gss_OID_set *name_types)
+ {
+     OM_uint32          status;
+     gss_OID            selected_mech = GSS_C_NO_OID, public_mech;
+diff --git a/src/lib/gssapi/mechglue/g_mechname.c b/src/lib/gssapi/mechglue/g_mechname.c
+index cfb0a0d..5664fa1 100644
+--- a/src/lib/gssapi/mechglue/g_mechname.c
++++ b/src/lib/gssapi/mechglue/g_mechname.c
+@@ -20,8 +20,8 @@ static gss_mech_spec_name name_list = NULL;
+ /*
+  * generic searching helper function.
+  */
+-static gss_mech_spec_name search_mech_spec(name_type)
+-    gss_OID name_type;
++static gss_mech_spec_name
++search_mech_spec(gss_OID name_type)
+ {
+     gss_mech_spec_name p;
+ 
+@@ -36,8 +36,8 @@ static gss_mech_spec_name search_mech_spec(name_type)
+  * Given a name_type, if it is specific to a mechanism, return the
+  * mechanism OID.  Otherwise, return NULL.
+  */
+-gss_OID gss_find_mechanism_from_name_type(name_type)
+-    gss_OID name_type;
++gss_OID
++gss_find_mechanism_from_name_type(gss_OID name_type)
+ {
+     gss_mech_spec_name p;
+ 
+@@ -54,10 +54,8 @@ gss_OID gss_find_mechanism_from_name_type(name_type)
+  * Otherwise, enter the pair into the registry.
+  */
+ OM_uint32
+-gss_add_mech_name_type(minor_status, name_type, mech)
+-    OM_uint32  *minor_status;
+-    gss_OID    name_type;
+-    gss_OID    mech;
++gss_add_mech_name_type(OM_uint32 *minor_status, gss_OID name_type,
++                      gss_OID mech)
+ {
+     OM_uint32  major_status, tmp;
+     gss_mech_spec_name p;
+diff --git a/src/lib/gssapi/mechglue/g_oid_ops.c b/src/lib/gssapi/mechglue/g_oid_ops.c
+index 1d7970c..f29fb3b 100644
+--- a/src/lib/gssapi/mechglue/g_oid_ops.c
++++ b/src/lib/gssapi/mechglue/g_oid_ops.c
+@@ -33,9 +33,7 @@
+  */
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_create_empty_oid_set(minor_status, oid_set)
+-    OM_uint32  *minor_status;
+-    gss_OID_set        *oid_set;
++gss_create_empty_oid_set(OM_uint32 *minor_status, gss_OID_set *oid_set)
+ {
+     OM_uint32 status;
+     status = generic_gss_create_empty_oid_set(minor_status, oid_set);
+@@ -45,10 +43,8 @@ gss_create_empty_oid_set(minor_status, oid_set)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_add_oid_set_member(minor_status, member_oid, oid_set)
+-    OM_uint32  *minor_status;
+-    gss_OID    member_oid;
+-    gss_OID_set        *oid_set;
++gss_add_oid_set_member(OM_uint32 *minor_status, gss_OID member_oid,
++                      gss_OID_set *oid_set)
+ {
+     OM_uint32 status;
+     status = generic_gss_add_oid_set_member(minor_status, member_oid, oid_set);
+@@ -58,20 +54,14 @@ gss_add_oid_set_member(minor_status, member_oid, oid_set)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_test_oid_set_member(minor_status, member, set, present)
+-    OM_uint32  *minor_status;
+-    gss_OID    member;
+-    gss_OID_set        set;
+-    int                *present;
++gss_test_oid_set_member(OM_uint32 *minor_status, gss_OID member,
++                       gss_OID_set set, int *present)
+ {
+     return generic_gss_test_oid_set_member(minor_status, member, set, present);
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_oid_to_str(minor_status, oid, oid_str)
+-    OM_uint32          *minor_status;
+-    gss_OID            oid;
+-    gss_buffer_t       oid_str;
++gss_oid_to_str(OM_uint32 *minor_status, gss_OID oid, gss_buffer_t oid_str)
+ {
+     OM_uint32 status = generic_gss_oid_to_str(minor_status, oid, oid_str);
+     if (status != GSS_S_COMPLETE)
+@@ -80,10 +70,7 @@ gss_oid_to_str(minor_status, oid, oid_str)
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_str_to_oid(minor_status, oid_str, oid)
+-    OM_uint32          *minor_status;
+-    gss_buffer_t       oid_str;
+-    gss_OID            *oid;
++gss_str_to_oid(OM_uint32 *minor_status, gss_buffer_t oid_str, gss_OID *oid)
+ {
+     OM_uint32 status = generic_gss_str_to_oid(minor_status, oid_str, oid);
+     if (status != GSS_S_COMPLETE)
+diff --git a/src/lib/gssapi/mechglue/g_process_context.c b/src/lib/gssapi/mechglue/g_process_context.c
+index 3968b5d..2b3f6c7 100644
+--- a/src/lib/gssapi/mechglue/g_process_context.c
++++ b/src/lib/gssapi/mechglue/g_process_context.c
+@@ -29,14 +29,8 @@
+ #include "mglueP.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_process_context_token (minor_status,
+-                           context_handle,
+-                           token_buffer)
+-
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-gss_buffer_t           token_buffer;
+-
++gss_process_context_token(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                         gss_buffer_t token_buffer)
+ {
+     OM_uint32          status;
+     gss_union_ctx_id_t ctx;
+diff --git a/src/lib/gssapi/mechglue/g_rel_buffer.c b/src/lib/gssapi/mechglue/g_rel_buffer.c
+index 8c3328a..60117bd 100644
+--- a/src/lib/gssapi/mechglue/g_rel_buffer.c
++++ b/src/lib/gssapi/mechglue/g_rel_buffer.c
+@@ -33,11 +33,7 @@
+ #endif
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_release_buffer (minor_status,
+-                   buffer)
+-
+-OM_uint32 *            minor_status;
+-gss_buffer_t           buffer;
++gss_release_buffer(OM_uint32 *minor_status, gss_buffer_t buffer)
+ {
+     if (minor_status)
+        *minor_status = 0;
+diff --git a/src/lib/gssapi/mechglue/g_rel_cred.c b/src/lib/gssapi/mechglue/g_rel_cred.c
+index ccdee05..ee3d1d7 100644
+--- a/src/lib/gssapi/mechglue/g_rel_cred.c
++++ b/src/lib/gssapi/mechglue/g_rel_cred.c
+@@ -31,12 +31,7 @@
+ #endif
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_release_cred(minor_status,
+-                 cred_handle)
+-
+-OM_uint32 *            minor_status;
+-gss_cred_id_t *                cred_handle;
+-
++gss_release_cred(OM_uint32 *minor_status, gss_cred_id_t *cred_handle)
+ {
+     OM_uint32          status, temp_status;
+     int                        j;
+diff --git a/src/lib/gssapi/mechglue/g_rel_name.c b/src/lib/gssapi/mechglue/g_rel_name.c
+index e008692..d490f9f 100644
+--- a/src/lib/gssapi/mechglue/g_rel_name.c
++++ b/src/lib/gssapi/mechglue/g_rel_name.c
+@@ -34,12 +34,7 @@
+ #include <string.h>
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_release_name (minor_status,
+-                 input_name)
+-
+-OM_uint32 *            minor_status;
+-gss_name_t *           input_name;
+-
++gss_release_name(OM_uint32 *minor_status, gss_name_t *input_name)
+ {
+     gss_union_name_t   union_name;
+ 
+diff --git a/src/lib/gssapi/mechglue/g_rel_oid_set.c b/src/lib/gssapi/mechglue/g_rel_oid_set.c
+index fa008d6..9151dd2 100644
+--- a/src/lib/gssapi/mechglue/g_rel_oid_set.c
++++ b/src/lib/gssapi/mechglue/g_rel_oid_set.c
+@@ -33,11 +33,7 @@
+ #endif
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_release_oid_set (minor_status,
+-                    set)
+-
+-OM_uint32 *            minor_status;
+-gss_OID_set *          set;
++gss_release_oid_set(OM_uint32 *minor_status, gss_OID_set *set)
+ {
+     return generic_gss_release_oid_set(minor_status, set);
+ }
+diff --git a/src/lib/gssapi/mechglue/g_sign.c b/src/lib/gssapi/mechglue/g_sign.c
+index 03fbd8c..c9af1da 100644
+--- a/src/lib/gssapi/mechglue/g_sign.c
++++ b/src/lib/gssapi/mechglue/g_sign.c
+@@ -66,18 +66,9 @@ val_get_mic_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_get_mic (minor_status,
+-            context_handle,
+-            qop_req,
+-            message_buffer,
+-            msg_token)
+-
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-gss_qop_t              qop_req;
+-gss_buffer_t           message_buffer;
+-gss_buffer_t           msg_token;
+-
++gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++           gss_qop_t qop_req, gss_buffer_t message_buffer,
++           gss_buffer_t msg_token)
+ {
+     OM_uint32          status;
+     gss_union_ctx_id_t ctx;
+@@ -118,18 +109,8 @@ gss_buffer_t               msg_token;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_sign (minor_status,
+-          context_handle,
+-          qop_req,
+-          message_buffer,
+-          msg_token)
+-
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-int                    qop_req;
+-gss_buffer_t           message_buffer;
+-gss_buffer_t           msg_token;
+-
++gss_sign(OM_uint32 *minor_status, gss_ctx_id_t context_handle, int qop_req,
++        gss_buffer_t message_buffer, gss_buffer_t msg_token)
+ {
+        return (gss_get_mic(minor_status, context_handle, (gss_qop_t) qop_req,
+                            message_buffer, msg_token));
+diff --git a/src/lib/gssapi/mechglue/g_store_cred.c b/src/lib/gssapi/mechglue/g_store_cred.c
+index c2b6ddf..231b3e8 100644
+--- a/src/lib/gssapi/mechglue/g_store_cred.c
++++ b/src/lib/gssapi/mechglue/g_store_cred.c
+@@ -93,24 +93,10 @@ val_store_cred_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_store_cred(minor_status,
+-              input_cred_handle,
+-              cred_usage,
+-              desired_mech,
+-              overwrite_cred,
+-              default_cred,
+-              elements_stored,
+-              cred_usage_stored)
+-
+-OM_uint32              *minor_status;
+-gss_cred_id_t           input_cred_handle;
+-gss_cred_usage_t        cred_usage;
+-const gss_OID           desired_mech;
+-OM_uint32               overwrite_cred;
+-OM_uint32               default_cred;
+-gss_OID_set            *elements_stored;
+-gss_cred_usage_t       *cred_usage_stored;
+-
++gss_store_cred(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle,
++              gss_cred_usage_t cred_usage, const gss_OID desired_mech,
++              OM_uint32 overwrite_cred, OM_uint32 default_cred,
++              gss_OID_set *elements_stored, gss_cred_usage_t *cred_usage_stored)
+ {
+        return gss_store_cred_into(minor_status, input_cred_handle, cred_usage,
+                                   desired_mech, overwrite_cred, default_cred,
+@@ -119,26 +105,12 @@ gss_cred_usage_t  *cred_usage_stored;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_store_cred_into(minor_status,
+-                   input_cred_handle,
+-                   cred_usage,
+-                   desired_mech,
+-                   overwrite_cred,
+-                   default_cred,
+-                   cred_store,
+-                   elements_stored,
+-                   cred_usage_stored)
+-
+-OM_uint32                       *minor_status;
+-gss_cred_id_t                   input_cred_handle;
+-gss_cred_usage_t                cred_usage;
+-gss_OID                                 desired_mech;
+-OM_uint32                       overwrite_cred;
+-OM_uint32                       default_cred;
+-gss_const_key_value_set_t       cred_store;
+-gss_OID_set                     *elements_stored;
+-gss_cred_usage_t                *cred_usage_stored;
+-
++gss_store_cred_into(OM_uint32 *minor_status, gss_cred_id_t input_cred_handle,
++                   gss_cred_usage_t cred_usage, gss_OID desired_mech,
++                   OM_uint32 overwrite_cred, OM_uint32 default_cred,
++                   gss_const_key_value_set_t cred_store,
++                   gss_OID_set *elements_stored,
++                   gss_cred_usage_t *cred_usage_stored)
+ {
+        OM_uint32               major_status = GSS_S_FAILURE;
+        gss_union_cred_t        union_cred;
+diff --git a/src/lib/gssapi/mechglue/g_unseal.c b/src/lib/gssapi/mechglue/g_unseal.c
+index c208635..2be3745 100644
+--- a/src/lib/gssapi/mechglue/g_unseal.c
++++ b/src/lib/gssapi/mechglue/g_unseal.c
+@@ -29,20 +29,10 @@
+ #include "mglueP.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_unwrap (minor_status,
+-            context_handle,
+-            input_message_buffer,
+-            output_message_buffer,
+-            conf_state,
+-            qop_state)
+-
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-gss_buffer_t           input_message_buffer;
+-gss_buffer_t           output_message_buffer;
+-int *                  conf_state;
+-gss_qop_t *            qop_state;
+-
++gss_unwrap(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++          gss_buffer_t input_message_buffer,
++          gss_buffer_t output_message_buffer,
++          int *conf_state, gss_qop_t *qop_state)
+ {
+ /* EXPORT DELETE START */
+     OM_uint32          status;
+@@ -111,20 +101,9 @@ gss_qop_t *                qop_state;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_unseal (minor_status,
+-            context_handle,
+-            input_message_buffer,
+-            output_message_buffer,
+-            conf_state,
+-            qop_state)
+-
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-gss_buffer_t           input_message_buffer;
+-gss_buffer_t           output_message_buffer;
+-int *                  conf_state;
+-int *                  qop_state;
+-
++gss_unseal(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++          gss_buffer_t input_message_buffer,
++          gss_buffer_t output_message_buffer, int *conf_state, int *qop_state)
+ {
+     return (gss_unwrap(minor_status, context_handle,
+                       input_message_buffer,
+diff --git a/src/lib/gssapi/mechglue/g_unwrap_aead.c b/src/lib/gssapi/mechglue/g_unwrap_aead.c
+index 0682bd8..5c9ff30 100644
+--- a/src/lib/gssapi/mechglue/g_unwrap_aead.c
++++ b/src/lib/gssapi/mechglue/g_unwrap_aead.c
+@@ -154,20 +154,11 @@ gssint_unwrap_aead (gss_mechanism mech,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_unwrap_aead (minor_status,
+-                 context_handle,
+-                input_message_buffer,
+-                input_assoc_buffer,
+-                output_payload_buffer,
+-                 conf_state,
+-                 qop_state)
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-gss_buffer_t           input_message_buffer;
+-gss_buffer_t           input_assoc_buffer;
+-gss_buffer_t           output_payload_buffer;
+-int                    *conf_state;
+-gss_qop_t              *qop_state;
++gss_unwrap_aead(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++               gss_buffer_t input_message_buffer,
++               gss_buffer_t input_assoc_buffer,
++               gss_buffer_t output_payload_buffer,
++               int *conf_state, gss_qop_t *qop_state)
+ {
+ 
+     OM_uint32          status;
+diff --git a/src/lib/gssapi/mechglue/g_unwrap_iov.c b/src/lib/gssapi/mechglue/g_unwrap_iov.c
+index 599be2c..bf9c3bc 100644
+--- a/src/lib/gssapi/mechglue/g_unwrap_iov.c
++++ b/src/lib/gssapi/mechglue/g_unwrap_iov.c
+@@ -59,18 +59,9 @@ val_unwrap_iov_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_unwrap_iov (minor_status,
+-                context_handle,
+-                conf_state,
+-                qop_state,
+-                iov,
+-                iov_count)
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-int *                  conf_state;
+-gss_qop_t              *qop_state;
+-gss_iov_buffer_desc  * iov;
+-int                    iov_count;
++gss_unwrap_iov(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++              int *conf_state, gss_qop_t *qop_state,
++              gss_iov_buffer_desc *iov, int iov_count)
+ {
+  /* EXPORT DELETE START */
+ 
+diff --git a/src/lib/gssapi/mechglue/g_verify.c b/src/lib/gssapi/mechglue/g_verify.c
+index 8996fce..86ade66 100644
+--- a/src/lib/gssapi/mechglue/g_verify.c
++++ b/src/lib/gssapi/mechglue/g_verify.c
+@@ -29,18 +29,9 @@
+ #include "mglueP.h"
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_verify_mic (minor_status,
+-               context_handle,
+-               message_buffer,
+-               token_buffer,
+-               qop_state)
+-
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-gss_buffer_t           message_buffer;
+-gss_buffer_t           token_buffer;
+-gss_qop_t *            qop_state;
+-
++gss_verify_mic(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++              gss_buffer_t message_buffer, gss_buffer_t token_buffer,
++              gss_qop_t *qop_state)
+ {
+     OM_uint32          status;
+     gss_union_ctx_id_t ctx;
+@@ -89,18 +80,9 @@ gss_qop_t *          qop_state;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_verify (minor_status,
+-            context_handle,
+-            message_buffer,
+-            token_buffer,
+-            qop_state)
+-
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-gss_buffer_t           message_buffer;
+-gss_buffer_t           token_buffer;
+-int *                  qop_state;
+-
++gss_verify(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++          gss_buffer_t message_buffer, gss_buffer_t token_buffer,
++          int *qop_state)
+ {
+        return (gss_verify_mic(minor_status, context_handle,
+                               message_buffer, token_buffer,
+diff --git a/src/lib/gssapi/mechglue/g_wrap_aead.c b/src/lib/gssapi/mechglue/g_wrap_aead.c
+index 7fe3b7b..5a6570f 100644
+--- a/src/lib/gssapi/mechglue/g_wrap_aead.c
++++ b/src/lib/gssapi/mechglue/g_wrap_aead.c
+@@ -177,15 +177,11 @@ gssint_wrap_aead_iov_shim(gss_mechanism mech,
+ }
+ 
+ OM_uint32
+-gssint_wrap_aead (gss_mechanism mech,
+-                 OM_uint32 *minor_status,
+-                 gss_union_ctx_id_t ctx,
+-                 int conf_req_flag,
+-                 gss_qop_t qop_req,
+-                 gss_buffer_t input_assoc_buffer,
+-                 gss_buffer_t input_payload_buffer,
+-                 int *conf_state,
+-                 gss_buffer_t output_message_buffer)
++gssint_wrap_aead(gss_mechanism mech, OM_uint32 *minor_status,
++                gss_union_ctx_id_t ctx, int conf_req_flag, gss_qop_t qop_req,
++                gss_buffer_t input_assoc_buffer,
++                gss_buffer_t input_payload_buffer,
++                int *conf_state, gss_buffer_t output_message_buffer)
+ {
+  /* EXPORT DELETE START */
+     OM_uint32          status;
+@@ -223,22 +219,15 @@ gssint_wrap_aead (gss_mechanism mech,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_wrap_aead (minor_status,
+-               context_handle,
+-               conf_req_flag,
+-               qop_req,
+-              input_assoc_buffer,
+-              input_payload_buffer,
+-               conf_state,
+-               output_message_buffer)
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-int                    conf_req_flag;
+-gss_qop_t              qop_req;
+-gss_buffer_t           input_assoc_buffer;
+-gss_buffer_t           input_payload_buffer;
+-int *                  conf_state;
+-gss_buffer_t           output_message_buffer;
++gss_wrap_aead (
++    OM_uint32 * minor_status,
++    gss_ctx_id_t context_handle,
++    int conf_req_flag,
++    gss_qop_t qop_req,
++    gss_buffer_t input_assoc_buffer,
++    gss_buffer_t input_payload_buffer,
++    int * conf_state,
++    gss_buffer_t output_message_buffer)
+ {
+     OM_uint32          status;
+     gss_mechanism      mech;
+diff --git a/src/lib/gssapi/mechglue/g_wrap_iov.c b/src/lib/gssapi/mechglue/g_wrap_iov.c
+index 14447c4..aaf3a93 100644
+--- a/src/lib/gssapi/mechglue/g_wrap_iov.c
++++ b/src/lib/gssapi/mechglue/g_wrap_iov.c
+@@ -60,20 +60,9 @@ val_wrap_iov_args(
+ 
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_wrap_iov (minor_status,
+-              context_handle,
+-              conf_req_flag,
+-              qop_req,
+-              conf_state,
+-              iov,
+-              iov_count)
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-int                    conf_req_flag;
+-gss_qop_t              qop_req;
+-int *                  conf_state;
+-gss_iov_buffer_desc  * iov;
+-int                    iov_count;
++gss_wrap_iov(OM_uint32 * minor_status, gss_ctx_id_t context_handle,
++            int conf_req_flag, gss_qop_t qop_req, int *conf_state,
++            gss_iov_buffer_desc *iov, int iov_count)
+ {
+  /* EXPORT DELETE START */
+ 
+@@ -120,20 +109,10 @@ int                       iov_count;
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_wrap_iov_length (minor_status,
+-                     context_handle,
+-                     conf_req_flag,
+-                     qop_req,
+-                     conf_state,
+-                     iov,
+-                     iov_count)
+-OM_uint32 *            minor_status;
+-gss_ctx_id_t           context_handle;
+-int                    conf_req_flag;
+-gss_qop_t              qop_req;
+-int *                  conf_state;
+-gss_iov_buffer_desc  * iov;
+-int                    iov_count;
++gss_wrap_iov_length(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
++                   int conf_req_flag, gss_qop_t qop_req,
++                   int *conf_state, gss_iov_buffer_desc *iov,
++                   int iov_count)
+ {
+  /* EXPORT DELETE START */
+ 
+@@ -239,12 +218,8 @@ gss_get_mic_iov_length(OM_uint32 *minor_status, gss_ctx_id_t context_handle,
+ }
+ 
+ OM_uint32 KRB5_CALLCONV
+-gss_release_iov_buffer (minor_status,
+-                       iov,
+-                       iov_count)
+-OM_uint32 *            minor_status;
+-gss_iov_buffer_desc *  iov;
+-int                    iov_count;
++gss_release_iov_buffer(OM_uint32 * minor_status, gss_iov_buffer_desc *iov,
++                      int iov_count)
+ {
+     OM_uint32          status = GSS_S_COMPLETE;
+     int                        i;
+diff --git a/src/lib/kadm5/clnt/client_rpc.c b/src/lib/kadm5/clnt/client_rpc.c
+index d84d158..c8d844e 100644
+--- a/src/lib/kadm5/clnt/client_rpc.c
++++ b/src/lib/kadm5/clnt/client_rpc.c
+@@ -1,6 +1,7 @@
+ /* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
+ #include <gssrpc/rpc.h>
+ #include <kadm5/kadm_rpc.h>
++#include <kadm5/admin_xdr.h>
+ #include <krb5.h>
+ #include <kadm5/admin.h>
+ #include <string.h>  /* for memset prototype */
+diff --git a/src/lib/kadm5/kadm_rpc.h b/src/lib/kadm5/kadm_rpc.h
+index 5099c6c..9efe49a 100644
+--- a/src/lib/kadm5/kadm_rpc.h
++++ b/src/lib/kadm5/kadm_rpc.h
+@@ -360,49 +360,4 @@ extern enum clnt_stat get_principal_keys_2(getpkeys_arg *, getpkeys_ret *,
+                                           CLIENT *);
+ extern  bool_t get_principal_keys_2_svc(getpkeys_arg *, getpkeys_ret *,
+                                        struct svc_req *);
+-
+-extern bool_t xdr_cprinc_arg ();
+-extern bool_t xdr_cprinc3_arg ();
+-extern bool_t xdr_generic_ret ();
+-extern bool_t xdr_dprinc_arg ();
+-extern bool_t xdr_mprinc_arg ();
+-extern bool_t xdr_rprinc_arg ();
+-extern bool_t xdr_gprincs_arg ();
+-extern bool_t xdr_gprincs_ret ();
+-extern bool_t xdr_chpass_arg ();
+-extern bool_t xdr_chpass3_arg ();
+-extern bool_t xdr_setkey_arg ();
+-extern bool_t xdr_setkey3_arg ();
+-extern bool_t xdr_setkey4_arg ();
+-extern bool_t xdr_chrand_arg ();
+-extern bool_t xdr_chrand3_arg ();
+-extern bool_t xdr_chrand_ret ();
+-extern bool_t xdr_gprinc_arg ();
+-extern bool_t xdr_gprinc_ret ();
+-extern bool_t xdr_kadm5_ret_t ();
+-extern bool_t xdr_kadm5_principal_ent_rec ();
+-extern bool_t xdr_kadm5_policy_ent_rec ();
+-extern bool_t  xdr_krb5_keyblock ();
+-extern bool_t  xdr_krb5_principal ();
+-extern bool_t  xdr_krb5_enctype ();
+-extern bool_t  xdr_krb5_octet ();
+-extern bool_t  xdr_krb5_int32 ();
+-extern bool_t  xdr_u_int32 ();
+-extern bool_t xdr_cpol_arg ();
+-extern bool_t xdr_dpol_arg ();
+-extern bool_t xdr_mpol_arg ();
+-extern bool_t xdr_gpol_arg ();
+-extern bool_t xdr_gpol_ret ();
+-extern bool_t xdr_gpols_arg ();
+-extern bool_t xdr_gpols_ret ();
+-extern bool_t xdr_getprivs_ret ();
+-extern bool_t xdr_purgekeys_arg ();
+-extern bool_t xdr_gstrings_arg ();
+-extern bool_t xdr_gstrings_ret ();
+-extern bool_t xdr_sstring_arg ();
+-extern bool_t xdr_krb5_string_attr ();
+-extern bool_t xdr_kadm5_key_data ();
+-extern bool_t xdr_getpkeys_arg ();
+-extern bool_t xdr_getpkeys_ret ();
+-
+ #endif /* __KADM_RPC_H__ */
+diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c
+index 287cae7..5e052dd 100644
+--- a/src/lib/kadm5/kadm_rpc_xdr.c
++++ b/src/lib/kadm5/kadm_rpc_xdr.c
+@@ -408,7 +408,7 @@ _xdr_kadm5_principal_ent_rec(XDR *xdrs, kadm5_principal_ent_rec *objp,
+                return (FALSE);
+        }
+        if (!xdr_nulltype(xdrs, (void **) &objp->mod_name,
+-                         xdr_krb5_principal)) {
++                         (xdrproc_t)xdr_krb5_principal)) {
+                return (FALSE);
+        }
+        if (!xdr_krb5_timestamp(xdrs, &objp->mod_date)) {
+@@ -451,12 +451,13 @@ _xdr_kadm5_principal_ent_rec(XDR *xdrs, kadm5_principal_ent_rec *objp,
+                return (FALSE);
+        }
+        if (!xdr_nulltype(xdrs, (void **) &objp->tl_data,
+-                         xdr_krb5_tl_data)) {
++                         (xdrproc_t)xdr_krb5_tl_data)) {
+                return FALSE;
+        }
+        n = objp->n_key_data;
+        r = xdr_array(xdrs, (caddr_t *) &objp->key_data, &n, objp->n_key_data,
+-                     sizeof(krb5_key_data), xdr_krb5_key_data_nocontents);
++                     sizeof(krb5_key_data),
++                     (xdrproc_t)xdr_krb5_key_data_nocontents);
+        objp->n_key_data = n;
+        if (!r) {
+                return (FALSE);
+@@ -528,7 +529,7 @@ _xdr_kadm5_policy_ent_rec(XDR *xdrs, kadm5_policy_ent_rec *objp, int vers)
+                        return (FALSE);
+                }
+                if (!xdr_nulltype(xdrs, (void **) &objp->tl_data,
+-                                 xdr_krb5_tl_data)) {
++                                 (xdrproc_t)xdr_krb5_tl_data)) {
+                        return FALSE;
+                }
+        }
+@@ -576,7 +577,7 @@ xdr_cprinc3_arg(XDR *xdrs, cprinc3_arg *objp)
+        if (!xdr_array(xdrs, (caddr_t *)&objp->ks_tuple,
+                       (unsigned int *)&objp->n_ks_tuple, ~0,
+                       sizeof(krb5_key_salt_tuple),
+-                      xdr_krb5_key_salt_tuple)) {
++                      (xdrproc_t)xdr_krb5_key_salt_tuple)) {
+                return (FALSE);
+        }
+        if (!xdr_nullstring(xdrs, &objp->passwd)) {
+@@ -668,7 +669,7 @@ xdr_gprincs_ret(XDR *xdrs, gprincs_ret *objp)
+          }
+          if (!xdr_array(xdrs, (caddr_t *) &objp->princs,
+                         (unsigned int *) &objp->count, ~0,
+-                        sizeof(char *), xdr_nullstring)) {
++                        sizeof(char *), (xdrproc_t)xdr_nullstring)) {
+               return (FALSE);
+          }
+      }
+@@ -706,7 +707,7 @@ xdr_chpass3_arg(XDR *xdrs, chpass3_arg *objp)
+        if (!xdr_array(xdrs, (caddr_t *)&objp->ks_tuple,
+                       (unsigned int*)&objp->n_ks_tuple, ~0,
+                       sizeof(krb5_key_salt_tuple),
+-                      xdr_krb5_key_salt_tuple)) {
++                      (xdrproc_t)xdr_krb5_key_salt_tuple)) {
+                return (FALSE);
+        }
+        if (!xdr_nullstring(xdrs, &objp->pass)) {
+@@ -726,7 +727,7 @@ xdr_setkey_arg(XDR *xdrs, setkey_arg *objp)
+        }
+        if (!xdr_array(xdrs, (caddr_t *) &objp->keyblocks,
+                       (unsigned int *) &objp->n_keys, ~0,
+-                      sizeof(krb5_keyblock), xdr_krb5_keyblock)) {
++                      sizeof(krb5_keyblock), (xdrproc_t)xdr_krb5_keyblock)) {
+                return (FALSE);
+        }
+        return (TRUE);
+@@ -746,12 +747,13 @@ xdr_setkey3_arg(XDR *xdrs, setkey3_arg *objp)
+        }
+        if (!xdr_array(xdrs, (caddr_t *) &objp->ks_tuple,
+                       (unsigned int *) &objp->n_ks_tuple, ~0,
+-                      sizeof(krb5_key_salt_tuple), xdr_krb5_key_salt_tuple)) {
++                      sizeof(krb5_key_salt_tuple),
++                      (xdrproc_t)xdr_krb5_key_salt_tuple)) {
+                return (FALSE);
+        }
+        if (!xdr_array(xdrs, (caddr_t *) &objp->keyblocks,
+                       (unsigned int *) &objp->n_keys, ~0,
+-                      sizeof(krb5_keyblock), xdr_krb5_keyblock)) {
++                      sizeof(krb5_keyblock), (xdrproc_t)xdr_krb5_keyblock)) {
+                return (FALSE);
+        }
+        return (TRUE);
+@@ -771,7 +773,8 @@ xdr_setkey4_arg(XDR *xdrs, setkey4_arg *objp)
+        }
+        if (!xdr_array(xdrs, (caddr_t *) &objp->key_data,
+                       (unsigned int *) &objp->n_key_data, ~0,
+-                      sizeof(kadm5_key_data), xdr_kadm5_key_data)) {
++                      sizeof(kadm5_key_data),
++                      (xdrproc_t)xdr_kadm5_key_data)) {
+                return FALSE;
+        }
+        return TRUE;
+@@ -804,7 +807,7 @@ xdr_chrand3_arg(XDR *xdrs, chrand3_arg *objp)
+        if (!xdr_array(xdrs, (caddr_t *)&objp->ks_tuple,
+                       (unsigned int*)&objp->n_ks_tuple, ~0,
+                       sizeof(krb5_key_salt_tuple),
+-                      xdr_krb5_key_salt_tuple)) {
++                      (xdrproc_t)xdr_krb5_key_salt_tuple)) {
+                return (FALSE);
+        }
+        return (TRUE);
+@@ -822,7 +825,8 @@ xdr_chrand_ret(XDR *xdrs, chrand_ret *objp)
+        if (objp->code == KADM5_OK) {
+                if (!xdr_array(xdrs, (char **)&objp->keys,
+                               (unsigned int *)&objp->n_keys, ~0,
+-                              sizeof(krb5_keyblock), xdr_krb5_keyblock))
++                              sizeof(krb5_keyblock),
++                              (xdrproc_t)xdr_krb5_keyblock))
+                        return FALSE;
+        }
+ 
+@@ -965,7 +969,7 @@ xdr_gpols_ret(XDR *xdrs, gpols_ret *objp)
+          }
+          if (!xdr_array(xdrs, (caddr_t *) &objp->pols,
+                         (unsigned int *) &objp->count, ~0,
+-                        sizeof(char *), xdr_nullstring)) {
++                        sizeof(char *), (xdrproc_t)xdr_nullstring)) {
+               return (FALSE);
+          }
+      }
+@@ -1030,7 +1034,7 @@ xdr_gstrings_ret(XDR *xdrs, gstrings_ret *objp)
+                if (!xdr_array(xdrs, (caddr_t *) &objp->strings,
+                               (unsigned int *) &objp->count, ~0,
+                               sizeof(krb5_string_attr),
+-                              xdr_krb5_string_attr)) {
++                              (xdrproc_t)xdr_krb5_string_attr)) {
+                        return (FALSE);
+                }
+        }
+@@ -1198,7 +1202,8 @@ xdr_getpkeys_ret(XDR *xdrs, getpkeys_ret *objp)
+        if (objp->code == KADM5_OK) {
+                if (!xdr_array(xdrs, (caddr_t *) &objp->key_data,
+                               (unsigned int *) &objp->n_key_data, ~0,
+-                              sizeof(kadm5_key_data), xdr_kadm5_key_data)) {
++                              sizeof(kadm5_key_data),
++                              (xdrproc_t)xdr_kadm5_key_data)) {
+                    return FALSE;
+                }
+        }
+diff --git a/src/lib/kadm5/misc_free.c b/src/lib/kadm5/misc_free.c
+index 74d2376..9ac47bb 100644
+--- a/src/lib/kadm5/misc_free.c
++++ b/src/lib/kadm5/misc_free.c
+@@ -41,9 +41,8 @@ kadm5_free_name_list(void *server_handle, char **names, int count)
+ }
+ 
+ /* XXX this ought to be in libkrb5.a, but isn't */
+-kadm5_ret_t krb5_free_key_data_contents(context, key)
+-    krb5_context context;
+-    krb5_key_data *key;
++kadm5_ret_t
++krb5_free_key_data_contents(krb5_context context, krb5_key_data *key)
+ {
+     int i, idx;
+ 
+diff --git a/src/lib/kadm5/srv/adb_xdr.c b/src/lib/kadm5/srv/adb_xdr.c
+index fc73297..b6ffdb8 100644
+--- a/src/lib/kadm5/srv/adb_xdr.c
++++ b/src/lib/kadm5/srv/adb_xdr.c
+@@ -53,8 +53,7 @@ xdr_osa_pw_hist_ent(XDR *xdrs, osa_pw_hist_ent *objp)
+ {
+     if (!xdr_array(xdrs, (caddr_t *) &objp->key_data,
+                   (u_int *) &objp->n_key_data, ~0,
+-                  sizeof(krb5_key_data),
+-                  xdr_krb5_key_data))
++                  sizeof(krb5_key_data), (xdrproc_t)xdr_krb5_key_data))
+        return (FALSE);
+     return (TRUE);
+ }
+@@ -88,8 +87,7 @@ xdr_osa_princ_ent_rec(XDR *xdrs, osa_princ_ent_t objp)
+        return (FALSE);
+     if (!xdr_array(xdrs, (caddr_t *) &objp->old_keys,
+                   (unsigned int *) &objp->old_key_len, ~0,
+-                  sizeof(osa_pw_hist_ent),
+-                  xdr_osa_pw_hist_ent))
++                  sizeof(osa_pw_hist_ent), (xdrproc_t)xdr_osa_pw_hist_ent))
+        return (FALSE);
+     return (TRUE);
+ }
+diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
+index 8c3ad3a..d5bb0b1 100644
+--- a/src/lib/kadm5/srv/svr_principal.c
++++ b/src/lib/kadm5/srv/svr_principal.c
+@@ -30,9 +30,9 @@ static int decrypt_key_data(krb5_context context,
+ /*
+  * XXX Functions that ought to be in libkrb5.a, but aren't.
+  */
+-kadm5_ret_t krb5_copy_key_data_contents(context, from, to)
+-    krb5_context context;
+-    krb5_key_data *from, *to;
++kadm5_ret_t
++krb5_copy_key_data_contents(krb5_context context, krb5_key_data *from,
++                            krb5_key_data *to)
+ {
+     int i, idx;
+ 
+@@ -75,10 +75,8 @@ static krb5_tl_data *dup_tl_data(krb5_tl_data *tl)
+ }
+ 
+ /* This is in lib/kdb/kdb_cpw.c, but is static */
+-static void cleanup_key_data(context, count, data)
+-    krb5_context   context;
+-    int                    count;
+-    krb5_key_data        * data;
++static void
++cleanup_key_data(krb5_context context, int count, krb5_key_data *data)
+ {
+     int i;
+ 
+diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c
+index 7982956..f2fae83 100644
+--- a/src/lib/kadm5/str_conv.c
++++ b/src/lib/kadm5/str_conv.c
+@@ -267,11 +267,8 @@ cleanup:
+  *      Salttype may be negative to indicate a search for only a enctype.
+  */
+ krb5_boolean
+-krb5_keysalt_is_present(ksaltlist, nksalts, enctype, salttype)
+-    krb5_key_salt_tuple *ksaltlist;
+-    krb5_int32          nksalts;
+-    krb5_enctype        enctype;
+-    krb5_int32          salttype;
++krb5_keysalt_is_present(krb5_key_salt_tuple *ksaltlist, krb5_int32 nksalts,
++                        krb5_enctype enctype, krb5_int32 salttype)
+ {
+     krb5_boolean        foundit;
+     int                 i;
+@@ -375,12 +372,11 @@ cleanup:
+  * If ignoresalt set, then salttype is ignored.
+  */
+ krb5_error_code
+-krb5_keysalt_iterate(ksaltlist, nksalt, ignoresalt, iterator, arg)
+-    krb5_key_salt_tuple *ksaltlist;
+-    krb5_int32          nksalt;
+-    krb5_boolean        ignoresalt;
+-    krb5_error_code     (*iterator) (krb5_key_salt_tuple *, krb5_pointer);
+-    krb5_pointer        arg;
++krb5_keysalt_iterate(krb5_key_salt_tuple *ksaltlist, krb5_int32 nksalt,
++                     krb5_boolean ignoresalt,
++                     krb5_error_code (*iterator)(krb5_key_salt_tuple *,
++                                                 void *),
++                     void *arg)
+ {
+     int                 i;
+     krb5_error_code     kret;
+diff --git a/src/lib/kadm5/t_kadm5.c b/src/lib/kadm5/t_kadm5.c
+index 153147f..b3ab100 100644
+--- a/src/lib/kadm5/t_kadm5.c
++++ b/src/lib/kadm5/t_kadm5.c
+@@ -276,7 +276,7 @@ cpw_test_succeed(char *user, krb5_principal princ, char *pass)
+ }
+ 
+ static void
+-test_chpass()
++test_chpass(void)
+ {
+     krb5_principal princ = parse_princ("chpass-test");
+     krb5_principal hist_princ = parse_princ("kadmin/history");
+@@ -334,7 +334,7 @@ cpol_test_compare(char *user, kadm5_policy_ent_t ent, uint32_t mask)
+ }
+ 
+ static void
+-test_create_policy()
++test_create_policy(void)
+ {
+     void *handle;
+     kadm5_policy_ent_rec ent;
+@@ -440,7 +440,7 @@ cprinc_test_compare(char *user, kadm5_principal_ent_t ent, uint32_t mask,
+ }
+ 
+ static void
+-test_create_principal()
++test_create_principal(void)
+ {
+     void *handle;
+     kadm5_principal_ent_rec ent;
+@@ -535,7 +535,7 @@ dpol_test_succeed(char *user, char *name)
+ }
+ 
+ static void
+-test_delete_policy()
++test_delete_policy(void)
+ {
+     krb5_principal princ = parse_princ("delete-policy-test-princ");
+ 
+@@ -587,7 +587,7 @@ dprinc_test_succeed(char *user, krb5_principal princ)
+ }
+ 
+ static void
+-test_delete_principal()
++test_delete_principal(void)
+ {
+     krb5_principal princ = parse_princ("delete-principal-test");
+ 
+@@ -638,7 +638,7 @@ gpol_test_fail(char *user, char *name, krb5_error_code code)
+ }
+ 
+ static void
+-test_get_policy()
++test_get_policy(void)
+ {
+     /* Fails with unknown policy. */
+     dpol_test_fail("admin", "unknown-policy", KADM5_UNK_POLICY);
+@@ -684,7 +684,7 @@ gprinc_test_fail(char *user, krb5_principal princ, krb5_error_code code)
+ }
+ 
+ static void
+-test_get_principal()
++test_get_principal(void)
+ {
+     void *handle;
+     kadm5_principal_ent_rec ent;
+@@ -743,7 +743,7 @@ test_get_principal()
+ }
+ 
+ static void
+-test_init_destroy()
++test_init_destroy(void)
+ {
+     krb5_context ctx;
+     kadm5_ret_t ret;
+@@ -1019,7 +1019,7 @@ mpol_test_compare(void *handle, kadm5_policy_ent_t ent, uint32_t mask)
+ }
+ 
+ static void
+-test_modify_policy()
++test_modify_policy(void)
+ {
+     kadm5_policy_ent_rec ent;
+ 
+@@ -1109,7 +1109,7 @@ mprinc_test_compare(char *user, kadm5_principal_ent_t ent, uint32_t mask)
+ }
+ 
+ static void
+-test_modify_principal()
++test_modify_principal(void)
+ {
+     void *handle;
+     krb5_principal princ = parse_princ("modify-principal-test");
+@@ -1233,7 +1233,7 @@ rnd_test_succeed(char *user, krb5_principal princ)
+ }
+ 
+ static void
+-test_randkey()
++test_randkey(void)
+ {
+     void *handle;
+     krb5_principal princ = parse_princ("randkey-principal-test");
+diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
+index 415ae64..0837f56 100644
+--- a/src/lib/kdb/kdb5.c
++++ b/src/lib/kdb/kdb5.c
+@@ -75,13 +75,13 @@ free_mkey_list(krb5_context context, krb5_keylist_node *mkey_list)
+ }
+ 
+ int
+-kdb_init_lock_list()
++kdb_init_lock_list(void)
+ {
+     return k5_mutex_finish_init(&db_lock);
+ }
+ 
+ static int
+-kdb_lock_list()
++kdb_lock_list(void)
+ {
+     int err;
+     err = CALL_INIT_FUNCTION (kdb_init_lock_list);
+@@ -92,14 +92,14 @@ kdb_lock_list()
+ }
+ 
+ void
+-kdb_fini_lock_list()
++kdb_fini_lock_list(void)
+ {
+     if (INITIALIZER_RAN(kdb_init_lock_list))
+         k5_mutex_destroy(&db_lock);
+ }
+ 
+ static void
+-kdb_unlock_list()
++kdb_unlock_list(void)
+ {
+     k5_mutex_unlock(&db_lock);
+ }
+diff --git a/src/lib/kdb/kdb_cpw.c b/src/lib/kdb/kdb_cpw.c
+index 450860f..c33c7cf 100644
+--- a/src/lib/kdb/kdb_cpw.c
++++ b/src/lib/kdb/kdb_cpw.c
+@@ -57,10 +57,7 @@
+ enum save { DISCARD_ALL, KEEP_LAST_KVNO, KEEP_ALL };
+ 
+ int
+-krb5_db_get_key_data_kvno(context, count, data)
+-    krb5_context          context;
+-    int                   count;
+-    krb5_key_data       * data;
++krb5_db_get_key_data_kvno(krb5_context context, int count, krb5_key_data *data)
+ {
+     int i, kvno;
+     /* Find last key version number */
+@@ -73,10 +70,7 @@ krb5_db_get_key_data_kvno(context, count, data)
+ }
+ 
+ static void
+-cleanup_key_data(context, count, data)
+-    krb5_context          context;
+-    int                   count;
+-    krb5_key_data       * data;
++cleanup_key_data(krb5_context context, int count, krb5_key_data *data)
+ {
+     int i;
+ 
+@@ -149,13 +143,9 @@ preserve_old_keys(krb5_context context, krb5_keyblock *mkey,
+ }
+ 
+ static krb5_error_code
+-add_key_rnd(context, master_key, ks_tuple, ks_tuple_count, db_entry, kvno)
+-    krb5_context          context;
+-    krb5_keyblock       * master_key;
+-    krb5_key_salt_tuple * ks_tuple;
+-    int                   ks_tuple_count;
+-    krb5_db_entry       * db_entry;
+-    int                   kvno;
++add_key_rnd(krb5_context context, krb5_keyblock *master_key,
++            krb5_key_salt_tuple *ks_tuple, int ks_tuple_count,
++            krb5_db_entry *db_entry, int kvno)
+ {
+     krb5_keyblock         key;
+     int                   i, j;
+@@ -246,15 +236,9 @@ make_random_salt(krb5_context context, krb5_keysalt *salt_out)
+  * If passwd is NULL the assumes that the caller wants a random password.
+  */
+ static krb5_error_code
+-add_key_pwd(context, master_key, ks_tuple, ks_tuple_count, passwd,
+-            db_entry, kvno)
+-    krb5_context          context;
+-    krb5_keyblock       * master_key;
+-    krb5_key_salt_tuple * ks_tuple;
+-    int                   ks_tuple_count;
+-    const char          * passwd;
+-    krb5_db_entry       * db_entry;
+-    int                   kvno;
++add_key_pwd(krb5_context context, krb5_keyblock *master_key,
++            krb5_key_salt_tuple *ks_tuple, int ks_tuple_count,
++            const char *passwd, krb5_db_entry *db_entry, int kvno)
+ {
+     krb5_error_code       retval;
+     krb5_keysalt          key_salt;
+diff --git a/src/lib/kdb/keytab.c b/src/lib/kdb/keytab.c
+index a623e00..346cf96 100644
+--- a/src/lib/kdb/keytab.c
++++ b/src/lib/kdb/keytab.c
+@@ -71,10 +71,7 @@ krb5_db_register_keytab(krb5_context context)
+ }
+ 
+ krb5_error_code
+-krb5_ktkdb_resolve(context, name, id)
+-    krb5_context          context;
+-    const char          * name;
+-    krb5_keytab         * id;
++krb5_ktkdb_resolve(krb5_context context, const char *name, krb5_keytab *id)
+ {
+     if ((*id = (krb5_keytab) malloc(sizeof(**id))) == NULL)
+         return(ENOMEM);
+@@ -84,9 +81,7 @@ krb5_ktkdb_resolve(context, name, id)
+ }
+ 
+ krb5_error_code
+-krb5_ktkdb_close(context, kt)
+-    krb5_context context;
+-    krb5_keytab kt;
++krb5_ktkdb_close(krb5_context context, krb5_keytab kt)
+ {
+     /*
+      * This routine is responsible for freeing all memory allocated
+@@ -119,13 +114,9 @@ krb5_ktkdb_set_context(krb5_context ctx)
+ }
+ 
+ krb5_error_code
+-krb5_ktkdb_get_entry(in_context, id, principal, kvno, enctype, entry)
+-    krb5_context          in_context;
+-    krb5_keytab           id;
+-    krb5_const_principal  principal;
+-    krb5_kvno             kvno;
+-    krb5_enctype          enctype;
+-    krb5_keytab_entry   * entry;
++krb5_ktkdb_get_entry(krb5_context in_context, krb5_keytab id,
++                     krb5_const_principal principal, krb5_kvno kvno,
++                     krb5_enctype enctype, krb5_keytab_entry *entry)
+ {
+     krb5_context          context;
+     krb5_error_code       kerror = 0;
+diff --git a/src/lib/kdb/t_stringattr.c b/src/lib/kdb/t_stringattr.c
+index 1174036..2c64301 100644
+--- a/src/lib/kdb/t_stringattr.c
++++ b/src/lib/kdb/t_stringattr.c
+@@ -38,7 +38,7 @@
+  */
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_db_entry *ent;
+     krb5_context context;
+diff --git a/src/lib/krad/packet.c b/src/lib/krad/packet.c
+index c597174..aee830b 100644
+--- a/src/lib/krad/packet.c
++++ b/src/lib/krad/packet.c
+@@ -200,7 +200,7 @@ auth_generate_response(krb5_context ctx, const char *secret,
+ 
+ /* Create a new packet. */
+ static krad_packet *
+-packet_new()
++packet_new(void)
+ {
+     krad_packet *pkt;
+ 
+diff --git a/src/lib/krad/t_attr.c b/src/lib/krad/t_attr.c
+index eb2a780..2bce7aa 100644
+--- a/src/lib/krad/t_attr.c
++++ b/src/lib/krad/t_attr.c
+@@ -40,7 +40,7 @@ const static unsigned char auth[] = {
+ };
+ 
+ int
+-main()
++main(void)
+ {
+     unsigned char outbuf[MAX_ATTRSETSIZE];
+     const char *decoded = "accept";
+diff --git a/src/lib/krad/t_attrset.c b/src/lib/krad/t_attrset.c
+index 7928335..085f4b2 100644
+--- a/src/lib/krad/t_attrset.c
++++ b/src/lib/krad/t_attrset.c
+@@ -40,7 +40,7 @@ const static unsigned char encpass[] = {
+ };
+ 
+ int
+-main()
++main(void)
+ {
+     unsigned char buffer[KRAD_PACKET_SIZE_MAX], encoded[MAX_ATTRSETSIZE];
+     const char *username = "testUser", *password = "accept";
+diff --git a/src/lib/krad/t_code.c b/src/lib/krad/t_code.c
+index b245a7e..6cd522a 100644
+--- a/src/lib/krad/t_code.c
++++ b/src/lib/krad/t_code.c
+@@ -30,7 +30,7 @@
+ #include "t_test.h"
+ 
+ int
+-main()
++main(void)
+ {
+     const char *tmp;
+ 
+diff --git a/src/lib/krb5/ccache/cc_keyring.c b/src/lib/krb5/ccache/cc_keyring.c
+index 1dadeef..ab3cda6 100644
+--- a/src/lib/krb5/ccache/cc_keyring.c
++++ b/src/lib/krb5/ccache/cc_keyring.c
+@@ -314,7 +314,7 @@ get_persistent_real(uid_t uid)
+  * for the session anchor.
+  */
+ static key_serial_t
+-session_write_anchor()
++session_write_anchor(void)
+ {
+     key_serial_t s, u;
+ 
+diff --git a/src/lib/krb5/krb/plugin.c b/src/lib/krb5/krb/plugin.c
+index 3bb7a38..1286e9e 100644
+--- a/src/lib/krb5/krb/plugin.c
++++ b/src/lib/krb5/krb/plugin.c
+@@ -355,7 +355,7 @@ load_if_needed(krb5_context context, struct plugin_mapping *map,
+     krb5_error_code ret;
+     char *symname = NULL;
+     struct plugin_file_handle *handle = NULL;
+-    void (*initvt_fn)();
++    void (*initvt_fn)(void);
+ 
+     if (map->module != NULL || map->dyn_path == NULL)
+         return;
+diff --git a/src/lib/krb5/krb/t_authdata.c b/src/lib/krb5/krb/t_authdata.c
+index dd834b9..44f4a1c 100644
+--- a/src/lib/krb5/krb/t_authdata.c
++++ b/src/lib/krb5/krb/t_authdata.c
+@@ -74,7 +74,7 @@ static void compare_authdata(const krb5_authdata *adc1, krb5_authdata *adc2) {
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_context context;
+     krb5_authdata **results;
+diff --git a/src/lib/krb5/krb/t_response_items.c b/src/lib/krb5/krb/t_response_items.c
+index 0deb929..a6b02ca 100644
+--- a/src/lib/krb5/krb/t_response_items.c
++++ b/src/lib/krb5/krb/t_response_items.c
+@@ -61,7 +61,7 @@ nstrcmp(const char *a, const char *b)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     k5_response_items *ri;
+ 
+diff --git a/src/lib/krb5/krb/t_ser.c b/src/lib/krb5/krb/t_ser.c
+index d6746b7..9780c2e 100644
+--- a/src/lib/krb5/krb/t_ser.c
++++ b/src/lib/krb5/krb/t_ser.c
+@@ -195,7 +195,7 @@ ser_checksum(krb5_checksum *cksum)
+ }
+ 
+ static void
+-ser_context_test()
++ser_context_test(void)
+ {
+     krb5_context context;
+     profile_t sprofile;
+@@ -216,7 +216,7 @@ ser_context_test()
+ }
+ 
+ static void
+-ser_acontext_test()
++ser_acontext_test(void)
+ {
+     krb5_auth_context   actx;
+     krb5_address        local_address;
+@@ -306,7 +306,7 @@ ser_acontext_test()
+ }
+ 
+ static void
+-ser_princ_test()
++ser_princ_test(void)
+ {
+     krb5_principal      princ;
+     char                pname[1024];
+@@ -320,7 +320,7 @@ ser_princ_test()
+ }
+ 
+ static void
+-ser_cksum_test()
++ser_cksum_test(void)
+ {
+     krb5_checksum       checksum;
+     krb5_octet          ckdata[24];
+diff --git a/src/lib/krb5/krb/t_sname_match.c b/src/lib/krb5/krb/t_sname_match.c
+index 021b720..ee5623c 100644
+--- a/src/lib/krb5/krb/t_sname_match.c
++++ b/src/lib/krb5/krb/t_sname_match.c
+@@ -80,7 +80,7 @@ struct test {
+ };
+ 
+ int
+-main()
++main(void)
+ {
+     size_t i;
+     struct test *t;
+diff --git a/src/lib/krb5/krb/t_valid_times.c b/src/lib/krb5/krb/t_valid_times.c
+index e4b5f1b..1a8036e 100644
+--- a/src/lib/krb5/krb/t_valid_times.c
++++ b/src/lib/krb5/krb/t_valid_times.c
+@@ -36,7 +36,7 @@
+ #define BOUNDARY (uint32_t)INT32_MIN
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_error_code ret;
+     krb5_context context;
+diff --git a/src/lib/krb5/rcache/t_memrcache.c b/src/lib/krb5/rcache/t_memrcache.c
+index 6f212b0..665da75 100644
+--- a/src/lib/krb5/rcache/t_memrcache.c
++++ b/src/lib/krb5/rcache/t_memrcache.c
+@@ -33,7 +33,7 @@
+ #include "memrcache.c"
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_error_code ret;
+     krb5_context context;
+diff --git a/src/lib/rpc/auth_gss.c b/src/lib/rpc/auth_gss.c
+index 319bc75..f61322d 100644
+--- a/src/lib/rpc/auth_gss.c
++++ b/src/lib/rpc/auth_gss.c
+@@ -445,9 +445,9 @@ authgss_refresh(AUTH *auth, struct rpc_msg *msg)
+                        memset(&gr, 0, sizeof(gr));
+ 
+                        call_stat = clnt_call(gd->clnt, NULLPROC,
+-                                             xdr_rpc_gss_init_args,
++                                             (xdrproc_t)xdr_rpc_gss_init_args,
+                                              &send_token,
+-                                             xdr_rpc_gss_init_res,
++                                             (xdrproc_t)xdr_rpc_gss_init_res,
+                                              (caddr_t)&gr, AUTH_TIMEOUT);
+ 
+                        gss_release_buffer(&min_stat, &send_token);
+diff --git a/src/lib/rpc/auth_gssapi.c b/src/lib/rpc/auth_gssapi.c
+index 8ab7ab5..b5e03b9 100644
+--- a/src/lib/rpc/auth_gssapi.c
++++ b/src/lib/rpc/auth_gssapi.c
+@@ -283,11 +283,11 @@ next_token:
+ 
+          PRINTF(("gssapi_create: calling GSSAPI_INIT (%d)\n", init_func));
+ 
+-         xdr_free(xdr_authgssapi_init_res, &call_res);
++         xdr_free((xdrproc_t)xdr_authgssapi_init_res, &call_res);
+          memset(&call_res, 0, sizeof(call_res));
+          callstat = clnt_call(clnt, init_func,
+-                              xdr_authgssapi_init_arg, &call_arg,
+-                              xdr_authgssapi_init_res, &call_res,
++                              (xdrproc_t)xdr_authgssapi_init_arg, &call_arg,
++                              (xdrproc_t)xdr_authgssapi_init_res, &call_res,
+                               timeout);
+          gss_release_buffer(minor_stat, &call_arg.token);
+ 
+@@ -436,7 +436,7 @@ next_token:
+      /* don't assume the caller will want to change clnt->cl_auth */
+      clnt->cl_auth = save_auth;
+ 
+-     xdr_free(xdr_authgssapi_init_res, &call_res);
++     xdr_free((xdrproc_t)xdr_authgssapi_init_res, &call_res);
+      return auth;
+ 
+      /******************************************************************/
+@@ -458,7 +458,7 @@ cleanup:
+      if (rpc_createerr.cf_stat == 0)
+          rpc_createerr.cf_stat = RPC_AUTHERROR;
+ 
+-     xdr_free(xdr_authgssapi_init_res, &call_res);
++     xdr_free((xdrproc_t)xdr_authgssapi_init_res, &call_res);
+      return auth;
+ }
+ 
+@@ -760,7 +760,7 @@ skip_call:
+ static bool_t auth_gssapi_wrap(
+      AUTH *auth,
+      XDR *out_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      OM_uint32 gssstat, minor_stat;
+@@ -791,7 +791,7 @@ static bool_t auth_gssapi_wrap(
+ static bool_t auth_gssapi_unwrap(
+      AUTH *auth,
+      XDR *in_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      OM_uint32 gssstat, minor_stat;
+diff --git a/src/lib/rpc/auth_gssapi_misc.c b/src/lib/rpc/auth_gssapi_misc.c
+index a60eb7f..57fc1fb 100644
+--- a/src/lib/rpc/auth_gssapi_misc.c
++++ b/src/lib/rpc/auth_gssapi_misc.c
+@@ -199,7 +199,7 @@ bool_t auth_gssapi_wrap_data(
+      gss_ctx_id_t context,
+      uint32_t seq_num,
+      XDR *out_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      gss_buffer_desc in_buf, out_buf;
+@@ -267,7 +267,7 @@ bool_t auth_gssapi_unwrap_data(
+      gss_ctx_id_t context,
+      uint32_t seq_num,
+      XDR *in_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      gss_buffer_desc in_buf, out_buf;
+diff --git a/src/lib/rpc/authunix_prot.c b/src/lib/rpc/authunix_prot.c
+index 512d5a5..92276c3 100644
+--- a/src/lib/rpc/authunix_prot.c
++++ b/src/lib/rpc/authunix_prot.c
+@@ -58,7 +58,8 @@ xdr_authunix_parms(XDR *xdrs, struct authunix_parms *p)
+            && xdr_int(xdrs, &(p->aup_uid))
+            && xdr_int(xdrs, &(p->aup_gid))
+            && xdr_array(xdrs, (caddr_t *)&(p->aup_gids),
+-                   &(p->aup_len), NGRPS, sizeof(int), xdr_int) ) {
++                        &(p->aup_len), NGRPS, sizeof(int),
++                        (xdrproc_t)xdr_int)) {
+                return (TRUE);
+        }
+        return (FALSE);
+diff --git a/src/lib/rpc/clnt_perror.c b/src/lib/rpc/clnt_perror.c
+index fcc3657..912b267 100644
+--- a/src/lib/rpc/clnt_perror.c
++++ b/src/lib/rpc/clnt_perror.c
+@@ -76,7 +76,6 @@ char *
+ clnt_sperror(CLIENT *rpch, char *s)
+ {
+        struct rpc_err e;
+-       void clnt_perrno();
+        char *err;
+        char *bufstart = get_buf();
+        char *str = bufstart;
+diff --git a/src/lib/rpc/clnt_raw.c b/src/lib/rpc/clnt_raw.c
+index dcbb5cf..7e62a5c 100644
+--- a/src/lib/rpc/clnt_raw.c
++++ b/src/lib/rpc/clnt_raw.c
+@@ -80,7 +80,7 @@ static struct clnt_ops client_ops = {
+        clntraw_control
+ };
+ 
+-void   svc_getreq();
++void   svc_getreq(int);
+ 
+ /*
+  * Create a client handle for memory based rpc.
+diff --git a/src/lib/rpc/dyn.c b/src/lib/rpc/dyn.c
+index bce1fd2..a505f34 100644
+--- a/src/lib/rpc/dyn.c
++++ b/src/lib/rpc/dyn.c
+@@ -30,10 +30,8 @@
+ /*
+  * Made obsolete by DynInsert, now just a convenience function.
+  */
+-int DynAppend(obj, els, num)
+-   DynObjectP obj;
+-   DynPtr els;
+-   int num;
++int
++DynAppend(DynObjectP obj, DynPtr els, int num)
+ {
+      return DynInsert(obj, DynSize(obj), els, num);
+ }
+@@ -52,8 +50,8 @@ int DynAppend(obj, els, num)
+ 
+ static int default_increment = DEFAULT_INC;
+ 
+-DynObjectP DynCreate(el_size, inc)
+-   int el_size, inc;
++DynObjectP
++DynCreate(int el_size, int inc)
+ {
+      DynObjectP obj;
+ 
+@@ -77,8 +75,8 @@ DynObjectP DynCreate(el_size, inc)
+      return obj;
+ }
+ 
+-DynObjectP DynCopy(obj)
+-   DynObjectP obj;
++DynObjectP
++DynCopy(DynObjectP obj)
+ {
+      DynObjectP obj1;
+ 
+@@ -104,8 +102,8 @@ DynObjectP DynCopy(obj)
+      return obj1;
+ }
+ 
+-int DynDestroy(obj)
+-     /*@only@*/DynObjectP obj;
++int
++DynDestroy(/*@only@*/DynObjectP obj)
+ {
+      if (obj->paranoid) {
+          if (obj->debug)
+@@ -118,8 +116,8 @@ int DynDestroy(obj)
+      return DYN_OK;
+ }
+ 
+-int DynRelease(obj)
+-   DynObjectP obj;
++int
++DynRelease(DynObjectP obj)
+ {
+      if (obj->debug)
+          fprintf(stderr, "dyn: release: freeing object structure.\n");
+@@ -134,9 +132,8 @@ int DynRelease(obj)
+  * contains the source code for the function DynDebug().
+  */
+ 
+-int DynDebug(obj, state)
+-   DynObjectP obj;
+-   int state;
++int
++DynDebug(DynObjectP obj, int state)
+ {
+      obj->debug = state;
+ 
+@@ -155,9 +152,8 @@ int DynDebug(obj, state)
+  * Checkers!  Get away from that "hard disk erase" button!
+  *    (Stupid dog.  He almost did it to me again ...)
+  */
+-int DynDelete(obj, idx)
+-   DynObjectP obj;
+-   int idx;
++int
++DynDelete(DynObjectP obj, int idx)
+ {
+      if (idx < 0) {
+          if (obj->debug)
+@@ -219,9 +215,8 @@ int DynDelete(obj, idx)
+  * contains the source code for the function DynInitZero().
+  */
+ 
+-int DynInitzero(obj, state)
+-   DynObjectP obj;
+-   int state;
++int
++DynInitzero(DynObjectP obj, int state)
+ {
+      obj->initzero = state;
+ 
+@@ -237,10 +232,8 @@ int DynInitzero(obj, state)
+  * contains the source code for the function DynInsert().
+  */
+ 
+-int DynInsert(obj, idx, els_in, num)
+-   DynObjectP obj;
+-   void *els_in;
+-   int idx, num;
++int
++DynInsert(DynObjectP obj, int idx, void *els_in, int num)
+ {
+      DynPtr els = (DynPtr) els_in;
+      int ret;
+@@ -290,9 +283,8 @@ int DynInsert(obj, idx, els_in, num)
+  * contains the source code for the function DynDebug().
+  */
+ 
+-int DynParanoid(obj, state)
+-   DynObjectP obj;
+-   int state;
++int
++DynParanoid(DynObjectP obj, int state)
+ {
+      obj->paranoid = state;
+ 
+@@ -308,8 +300,8 @@ int DynParanoid(obj, state)
+  * contains the source code for the functions DynGet() and DynAdd().
+  */
+ 
+-DynPtr DynArray(obj)
+-   DynObjectP obj;
++DynPtr
++DynArray(DynObjectP obj)
+ {
+      if (obj->debug)
+          fprintf(stderr, "dyn: array: returning array pointer %p.\n",
+@@ -318,9 +310,8 @@ DynPtr DynArray(obj)
+      return obj->array;
+ }
+ 
+-DynPtr DynGet(obj, num)
+-   DynObjectP obj;
+-   int num;
++DynPtr
++DynGet(DynObjectP obj, int num)
+ {
+      if (num < 0) {
+          if (obj->debug)
+@@ -342,9 +333,7 @@ DynPtr DynGet(obj, num)
+      return (DynPtr) obj->array + obj->el_size*num;
+ }
+ 
+-int DynAdd(obj, el)
+-   DynObjectP obj;
+-   void *el;
++int DynAdd(DynObjectP obj, void *el)
+ {
+      int       ret;
+ 
+@@ -364,10 +353,8 @@ int DynAdd(obj, el)
+  * obj->num_el) will not be updated properly and many other functions
+  * in the library will lose.  Have a nice day.
+  */
+-int DynPut(obj, el_in, idx)
+-   DynObjectP obj;
+-   void *el_in;
+-   int idx;
++int
++DynPut(DynObjectP obj, void *el_in, int idx)
+ {
+      DynPtr el = (DynPtr) el_in;
+      int ret;
+@@ -397,9 +384,8 @@ int DynPut(obj, el_in, idx)
+ /*
+  * Resize the array so that element req exists.
+  */
+-int _DynResize(obj, req)
+-   DynObjectP obj;
+-   int req;
++int
++_DynResize(DynObjectP obj, int req)
+ {
+      int size;
+ 
+@@ -430,9 +416,8 @@ int _DynResize(obj, req)
+  * Ideally, this function should not be called from outside the
+  * library.  However, nothing will break if it is.
+  */
+-int _DynRealloc(obj, num_incs)
+-   DynObjectP obj;
+-   int num_incs;
++int
++_DynRealloc(DynObjectP obj, int num_incs)
+ {
+      DynPtr temp;
+      int new_size_in_bytes;
+@@ -475,8 +460,8 @@ int _DynRealloc(obj, num_incs)
+  * contains the source code for the function DynSize().
+  */
+ 
+-int DynSize(obj)
+-   DynObjectP obj;
++int
++DynSize(DynObjectP obj)
+ {
+      if (obj->debug)
+          fprintf(stderr, "dyn: size: returning size %d.\n", obj->num_el);
+@@ -484,8 +469,8 @@ int DynSize(obj)
+      return obj->num_el;
+ }
+ 
+-int DynCapacity(obj)
+-   DynObjectP obj;
++int
++DynCapacity(DynObjectP obj)
+ {
+      if (obj->debug)
+          fprintf(stderr, "dyn: capacity: returning cap of %d.\n", obj->size);
+diff --git a/src/lib/rpc/pmap_clnt.c b/src/lib/rpc/pmap_clnt.c
+index 952a251..5c3bba3 100644
+--- a/src/lib/rpc/pmap_clnt.c
++++ b/src/lib/rpc/pmap_clnt.c
+@@ -54,8 +54,6 @@ static char sccsid[] = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
+ static struct timeval timeout = { 5, 0 };
+ static struct timeval tottimeout = { 60, 0 };
+ 
+-void clnt_perror();
+-
+ /*
+  * Set a mapping between program,version and port.
+  * Calls the pmap service remotely to do the mapping.
+@@ -128,7 +126,8 @@ pmap_set(
+            }
+        }
+ #endif
+-       if (CLNT_CALL(client, PMAPPROC_SET, xdr_pmap, &parms, xdr_bool, &rslt,
++       if (CLNT_CALL(client, PMAPPROC_SET, (xdrproc_t)xdr_pmap, &parms,
++                     (xdrproc_t)xdr_bool, &rslt,
+            tottimeout) != RPC_SUCCESS) {
+                clnt_perror(client, "Cannot register service");
+                return (FALSE);
+@@ -161,8 +160,8 @@ pmap_unset(
+        parms.pm_prog = program;
+        parms.pm_vers = version;
+        parms.pm_port = parms.pm_prot = 0;
+-       CLNT_CALL(client, PMAPPROC_UNSET, xdr_pmap, &parms, xdr_bool, &rslt,
+-           tottimeout);
++       CLNT_CALL(client, PMAPPROC_UNSET, (xdrproc_t)xdr_pmap, &parms,
++                 (xdrproc_t)xdr_bool, &rslt, tottimeout);
+        CLNT_DESTROY(client);
+        (void)close(sock);
+        return (rslt);
+diff --git a/src/lib/rpc/pmap_getmaps.c b/src/lib/rpc/pmap_getmaps.c
+index b8a9cec..a9c4c52 100644
+--- a/src/lib/rpc/pmap_getmaps.c
++++ b/src/lib/rpc/pmap_getmaps.c
+@@ -77,8 +77,9 @@ pmap_getmaps(struct sockaddr_in *address)
+        client = clnttcp_create(address, PMAPPROG,
+            PMAPVERS, &sock, 50, 500);
+        if (client != (CLIENT *)NULL) {
+-               if (CLNT_CALL(client, PMAPPROC_DUMP, xdr_void, NULL, xdr_pmaplist,
+-                   &head, minutetimeout) != RPC_SUCCESS) {
++               if (CLNT_CALL(client, PMAPPROC_DUMP, xdr_void, NULL,
++                             (xdrproc_t)xdr_pmaplist, &head,
++                             minutetimeout) != RPC_SUCCESS) {
+                        clnt_perror(client, "pmap_getmaps rpc problem");
+                }
+                CLNT_DESTROY(client);
+diff --git a/src/lib/rpc/pmap_getport.c b/src/lib/rpc/pmap_getport.c
+index 66635a1..2d0792b 100644
+--- a/src/lib/rpc/pmap_getport.c
++++ b/src/lib/rpc/pmap_getport.c
+@@ -79,8 +79,10 @@ pmap_getport(
+                parms.pm_vers = version;
+                parms.pm_prot = protocol;
+                parms.pm_port = 0;  /* not needed or used */
+-               if (CLNT_CALL(client, PMAPPROC_GETPORT, xdr_pmap, &parms,
+-                   xdr_u_short, &port, tottimeout) != RPC_SUCCESS){
++               if (CLNT_CALL(client, PMAPPROC_GETPORT,
++                             (xdrproc_t)xdr_pmap, &parms,
++                             (xdrproc_t)xdr_u_short, &port,
++                             tottimeout) != RPC_SUCCESS){
+                        rpc_createerr.cf_stat = RPC_PMAPFAILURE;
+                        clnt_geterr(client, &rpc_createerr.cf_error);
+                } else if (port == 0) {
+diff --git a/src/lib/rpc/pmap_prot2.c b/src/lib/rpc/pmap_prot2.c
+index aeccac6..3c0c612 100644
+--- a/src/lib/rpc/pmap_prot2.c
++++ b/src/lib/rpc/pmap_prot2.c
+@@ -109,7 +109,8 @@ xdr_pmaplist(XDR *xdrs, struct pmaplist **rp)
+                if (freeing)
+                        next = &((*rp)->pml_next);
+                if (! xdr_reference(xdrs, (caddr_t *)rp,
+-                   (u_int)sizeof(struct pmaplist), xdr_pmap))
++                                   (u_int)sizeof(struct pmaplist),
++                                   (xdrproc_t)xdr_pmap))
+                        return (FALSE);
+                rp = (freeing) ? next : &((*rp)->pml_next);
+        }
+diff --git a/src/lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c
+index 522cb20..79d52fe 100644
+--- a/src/lib/rpc/pmap_rmt.c
++++ b/src/lib/rpc/pmap_rmt.c
+@@ -105,8 +105,9 @@ pmap_rmtcall(
+                r.port_ptr = port_ptr;
+                r.results_ptr = resp;
+                r.xdr_results = xdrres;
+-               stat = CLNT_CALL(client, PMAPPROC_CALLIT, xdr_rmtcall_args, &a,
+-                   xdr_rmtcallres, &r, tout);
++               stat = CLNT_CALL(client, PMAPPROC_CALLIT,
++                                (xdrproc_t)xdr_rmtcall_args, &a,
++                                (xdrproc_t)xdr_rmtcallres, &r, tout);
+                CLNT_DESTROY(client);
+        } else {
+                stat = RPC_FAILED;
+@@ -344,7 +345,7 @@ clnt_broadcast(
+        recv_again:
+                msg.acpted_rply.ar_verf = gssrpc__null_auth;
+                msg.acpted_rply.ar_results.where = (caddr_t)&r;
+-                msg.acpted_rply.ar_results.proc = xdr_rmtcallres;
++               msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_rmtcallres;
+                readfds = mask;
+                t2 = t;
+                switch (select(gssrpc__rpc_dtablesize(), &readfds, (fd_set *)NULL,
+diff --git a/src/lib/rpc/rpc_prot.c b/src/lib/rpc/rpc_prot.c
+index 9b82e12..296968b 100644
+--- a/src/lib/rpc/rpc_prot.c
++++ b/src/lib/rpc/rpc_prot.c
+@@ -132,8 +132,8 @@ xdr_rejected_reply(XDR *xdrs, struct rejected_reply *rr)
+ }
+ 
+ static struct xdr_discrim reply_dscrm[3] = {
+-       { (int)MSG_ACCEPTED, xdr_accepted_reply },
+-       { (int)MSG_DENIED, xdr_rejected_reply },
++       { (int)MSG_ACCEPTED, (xdrproc_t)xdr_accepted_reply },
++       { (int)MSG_DENIED, (xdrproc_t)xdr_rejected_reply },
+        { __dontcare__, NULL_xdrproc_t } };
+ 
+ /*
+diff --git a/src/lib/rpc/svc.c b/src/lib/rpc/svc.c
+index cfbc7aa..0bcf04e 100644
+--- a/src/lib/rpc/svc.c
++++ b/src/lib/rpc/svc.c
+@@ -80,7 +80,7 @@ static struct svc_callout {
+        struct svc_callout *sc_next;
+        rpcprog_t                   sc_prog;
+        rpcprog_t                   sc_vers;
+-       void                (*sc_dispatch)();
++       void                (*sc_dispatch)(struct svc_req *, SVCXPRT *);
+ } *svc_head;
+ 
+ static struct svc_callout *svc_find(rpcprog_t, rpcvers_t,
+@@ -162,7 +162,7 @@ svc_register(
+        SVCXPRT *xprt,
+        rpcprog_t prog,
+        rpcvers_t vers,
+-       void (*dispatch)(),
++       void (*dispatch)(struct svc_req *, SVCXPRT *),
+        int protocol)
+ {
+        struct svc_callout *prev;
+diff --git a/src/lib/rpc/svc_auth_gss.c b/src/lib/rpc/svc_auth_gss.c
+index aba7694..98d601c 100644
+--- a/src/lib/rpc/svc_auth_gss.c
++++ b/src/lib/rpc/svc_auth_gss.c
+@@ -193,7 +193,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
+        /* Deserialize arguments. */
+        memset(&recv_tok, 0, sizeof(recv_tok));
+ 
+-       if (!svc_getargs(rqst->rq_xprt, xdr_rpc_gss_init_args,
++       if (!svc_getargs(rqst->rq_xprt, (xdrproc_t)xdr_rpc_gss_init_args,
+                         (caddr_t)&recv_tok))
+                return (FALSE);
+ 
+@@ -209,7 +209,8 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst,
+                                              NULL,
+                                              NULL);
+ 
+-       svc_freeargs(rqst->rq_xprt, xdr_rpc_gss_init_args, (caddr_t)&recv_tok);
++       svc_freeargs(rqst->rq_xprt, (xdrproc_t)xdr_rpc_gss_init_args,
++                    (caddr_t)&recv_tok);
+ 
+        log_status("accept_sec_context", gr->gr_major, gr->gr_minor);
+        if (gr->gr_major != GSS_S_COMPLETE &&
+@@ -495,7 +496,8 @@ gssrpc__svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg,
+                }
+                *no_dispatch = TRUE;
+ 
+-               call_stat = svc_sendreply(rqst->rq_xprt, xdr_rpc_gss_init_res,
++               call_stat = svc_sendreply(rqst->rq_xprt,
++                                         (xdrproc_t)xdr_rpc_gss_init_res,
+                                          (caddr_t)&gr);
+ 
+                gss_release_buffer(&min_stat, &gr.gr_token);
+@@ -544,7 +546,7 @@ gssrpc__svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg,
+        }
+        retstat = AUTH_OK;
+ freegc:
+-       xdr_free(xdr_rpc_gss_cred, gc);
++       xdr_free((xdrproc_t)xdr_rpc_gss_cred, gc);
+        log_debug("returning %d from svcauth_gss()", retstat);
+        return (retstat);
+ }
+diff --git a/src/lib/rpc/svc_auth_gssapi.c b/src/lib/rpc/svc_auth_gssapi.c
+index b7ffee4..267c154 100644
+--- a/src/lib/rpc/svc_auth_gssapi.c
++++ b/src/lib/rpc/svc_auth_gssapi.c
+@@ -201,7 +201,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+      if (! xdr_authgssapi_creds(&xdrs, &creds)) {
+          PRINTF(("svcauth_gssapi: failed decoding creds\n"));
+          LOG_MISCERR("protocol error in client credentials");
+-         xdr_free(xdr_authgssapi_creds, &creds);
++         xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds);
+          XDR_DESTROY(&xdrs);
+          ret = AUTH_BADCRED;
+          goto error;
+@@ -223,7 +223,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+          if (creds.auth_msg && rqst->rq_proc == AUTH_GSSAPI_EXIT) {
+               PRINTF(("svcauth_gssapi: GSSAPI_EXIT, cleaning up\n"));
+               svc_sendreply(rqst->rq_xprt, xdr_void, NULL);
+-              xdr_free(xdr_authgssapi_creds, &creds);
++              xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds);
+               cleanup();
+               exit(0);
+          }
+@@ -306,7 +306,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+ 
+          /* call is for us, deserialize arguments */
+          memset(&call_arg, 0, sizeof(call_arg));
+-         if (! svc_getargs(rqst->rq_xprt, xdr_authgssapi_init_arg,
++         if (! svc_getargs(rqst->rq_xprt, (xdrproc_t)xdr_authgssapi_init_arg,
+                            &call_arg)) {
+               PRINTF(("svcauth_gssapi: cannot decode args\n"));
+               LOG_MISCERR("protocol error in procedure arguments");
+@@ -446,7 +446,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+          minor_stat = call_res.gss_minor;
+ 
+          /* done with call args */
+-         xdr_free(xdr_authgssapi_init_arg, &call_arg);
++         xdr_free((xdrproc_t)xdr_authgssapi_init_arg, &call_arg);
+ 
+          PRINTF(("svcauth_gssapi: accept_sec_context returned %#x %#x\n",
+                  call_res.gss_major, call_res.gss_minor));
+@@ -459,7 +459,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+               badauth(call_res.gss_major, call_res.gss_minor, rqst->rq_xprt);
+ 
+               gss_release_buffer(&minor_stat, &output_token);
+-              svc_sendreply(rqst->rq_xprt, xdr_authgssapi_init_res,
++              svc_sendreply(rqst->rq_xprt, (xdrproc_t)xdr_authgssapi_init_res,
+                             (caddr_t) &call_res);
+               *no_dispatch = TRUE;
+               ret = AUTH_OK;
+@@ -492,7 +492,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+          }
+ 
+          PRINTF(("svcauth_gssapi: sending reply\n"));
+-         svc_sendreply(rqst->rq_xprt, xdr_authgssapi_init_res,
++         svc_sendreply(rqst->rq_xprt, (xdrproc_t)xdr_authgssapi_init_res,
+                        (caddr_t) &call_res);
+          *no_dispatch = TRUE;
+ 
+@@ -583,11 +583,13 @@ enum auth_stat gssrpc__svcauth_gssapi(
+               case AUTH_GSSAPI_MSG:
+                    PRINTF(("svcauth_gssapi: GSSAPI_MSG, getting args\n"));
+                    memset(&call_arg, 0, sizeof(call_arg));
+-                   if (! svc_getargs(rqst->rq_xprt, xdr_authgssapi_init_arg,
++                   if (! svc_getargs(rqst->rq_xprt,
++                                     (xdrproc_t)xdr_authgssapi_init_arg,
+                                      &call_arg)) {
+                         PRINTF(("svcauth_gssapi: cannot decode args\n"));
+                         LOG_MISCERR("protocol error in call arguments");
+-                        xdr_free(xdr_authgssapi_init_arg, &call_arg);
++                        xdr_free((xdrproc_t)xdr_authgssapi_init_arg,
++                                 &call_arg);
+                         ret = AUTH_BADCRED;
+                         goto error;
+                    }
+@@ -598,7 +600,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+                                                        &call_arg.token);
+ 
+                    /* done with call args */
+-                   xdr_free(xdr_authgssapi_init_arg, &call_arg);
++                   xdr_free((xdrproc_t)xdr_authgssapi_init_arg, &call_arg);
+ 
+                    if (gssstat != GSS_S_COMPLETE) {
+                         AUTH_GSSAPI_DISPLAY_STATUS(("processing token",
+@@ -641,7 +643,7 @@ enum auth_stat gssrpc__svcauth_gssapi(
+      if (creds.client_handle.length != 0) {
+          PRINTF(("svcauth_gssapi: freeing client_handle len %d\n",
+                  (int) creds.client_handle.length));
+-         xdr_free(xdr_authgssapi_creds, &creds);
++         xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds);
+      }
+ 
+      PRINTF(("\n"));
+@@ -651,7 +653,7 @@ error:
+      if (creds.client_handle.length != 0) {
+          PRINTF(("svcauth_gssapi: freeing client_handle len %d\n",
+                  (int) creds.client_handle.length));
+-         xdr_free(xdr_authgssapi_creds, &creds);
++         xdr_free((xdrproc_t)xdr_authgssapi_creds, &creds);
+      }
+ 
+      PRINTF(("\n"));
+@@ -1079,7 +1081,7 @@ void svcauth_gssapi_set_log_miscerr_func(
+ static bool_t svc_auth_gssapi_wrap(
+      SVCAUTH *auth,
+      XDR *out_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      OM_uint32 gssstat, minor_stat;
+@@ -1102,7 +1104,7 @@ static bool_t svc_auth_gssapi_wrap(
+ static bool_t svc_auth_gssapi_unwrap(
+      SVCAUTH *auth,
+      XDR *in_xdrs,
+-     bool_t (*xdr_func)(),
++     xdrproc_t xdr_func,
+      caddr_t xdr_ptr)
+ {
+      svc_auth_gssapi_data *client_data = SVCAUTH_PRIVATE(auth);
+diff --git a/src/lib/rpc/svc_simple.c b/src/lib/rpc/svc_simple.c
+index 315275f..aa6c0a6 100644
+--- a/src/lib/rpc/svc_simple.c
++++ b/src/lib/rpc/svc_simple.c
+@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
+ #include <netdb.h>
+ 
+ static struct proglst {
+-       char *(*p_progname)();
++       char *(*p_progname)(void *);
+        int  p_prognum;
+        int  p_procnum;
+        xdrproc_t p_inproc, p_outproc;
+@@ -62,7 +62,7 @@ registerrpc(
+        rpcprog_t prognum,
+        rpcvers_t versnum,
+        rpcproc_t procnum,
+-       char *(*progname)(),
++       char *(*progname)(void *),
+        xdrproc_t inproc,
+        xdrproc_t outproc)
+ {
+diff --git a/src/lib/rpc/unit-test/client.c b/src/lib/rpc/unit-test/client.c
+index c9a812b..9b907bc 100644
+--- a/src/lib/rpc/unit-test/client.c
++++ b/src/lib/rpc/unit-test/client.c
+@@ -42,7 +42,7 @@ char *whoami;
+ #ifdef __GNUC__
+ __attribute__((noreturn))
+ #endif
+-static void usage()
++static void usage(void)
+ {
+      fprintf(stderr, "usage: %s {-t|-u} [-a] [-s num] [-m num] host service [count]\n",
+             whoami);
+@@ -50,9 +50,7 @@ static void usage()
+ }
+ 
+ int
+-main(argc, argv)
+-   int argc;
+-   char **argv;
++main(int argc, char **argv)
+ {
+      char        *host, *port, *target, *echo_arg, **echo_resp, buf[BIG_BUF];
+      CLIENT      *clnt;
+@@ -172,7 +170,7 @@ main(argc, argv)
+              strcmp(echo_arg, (*echo_resp) + 6) != 0)
+               fprintf(stderr, "RPC_TEST_ECHO call %d response wrong: "
+                       "arg = %s, resp = %s\n", i, echo_arg, *echo_resp);
+-         gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++         gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+      }
+ 
+      /*
+@@ -194,7 +192,7 @@ main(argc, argv)
+               clnt_perror(clnt, whoami);
+      } else {
+          fprintf(stderr, "bad seq didn't cause failure\n");
+-         gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++         gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+      }
+ 
+      AUTH_PRIVATE(clnt->cl_auth)->seq_num -= 3;
+@@ -207,7 +205,7 @@ main(argc, argv)
+      if (echo_resp == NULL)
+          clnt_perror(clnt, "Sequence number improperly reset");
+      else
+-         gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++         gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+ 
+      /*
+       * Now simulate a lost server response, and see if
+@@ -219,7 +217,7 @@ main(argc, argv)
+      if (echo_resp == NULL)
+          clnt_perror(clnt, "Auto-resynchronization failed");
+      else
+-         gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++         gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+ 
+      /*
+       * Now make sure auto-resyncrhonization actually worked
+@@ -229,7 +227,7 @@ main(argc, argv)
+      if (echo_resp == NULL)
+          clnt_perror(clnt, "Auto-resynchronization did not work");
+      else
+-         gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++         gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+ 
+      if (! auth_once) {
+          tmp_auth = clnt->cl_auth;
+@@ -259,7 +257,7 @@ main(argc, argv)
+                   strcmp(echo_arg, (*echo_resp) + 6) != 0)
+                    fprintf(stderr,
+                            "RPC_TEST_LENGTHS call %d response wrong\n", i);
+-              gssrpc_xdr_free(xdr_wrapstring, echo_resp);
++              gssrpc_xdr_free((xdrproc_t)xdr_wrapstring, echo_resp);
+          }
+ 
+          /* cycle from 1 to 255 */
+diff --git a/src/lib/rpc/unit-test/rpc_test_clnt.c b/src/lib/rpc/unit-test/rpc_test_clnt.c
+index 4e4a18a..b914167 100644
+--- a/src/lib/rpc/unit-test/rpc_test_clnt.c
++++ b/src/lib/rpc/unit-test/rpc_test_clnt.c
+@@ -5,9 +5,7 @@
+ static struct timeval TIMEOUT = { 25, 0 };
+ 
+ char **
+-rpc_test_echo_1(argp, clnt)
+-       char **argp;
+-       CLIENT *clnt;
++rpc_test_echo_1(char **argp, CLIENT *clnt)
+ {
+        static char *clnt_res;
+ 
+diff --git a/src/lib/rpc/unit-test/rpc_test_svc.c b/src/lib/rpc/unit-test/rpc_test_svc.c
+index c54c081..3aa7674 100644
+--- a/src/lib/rpc/unit-test/rpc_test_svc.c
++++ b/src/lib/rpc/unit-test/rpc_test_svc.c
+@@ -14,16 +14,14 @@ static int _rpcsvcstate = _IDLE;    /* Set when a request is serviced */
+ static int _rpcsvccount = 0;           /* Number of requests being serviced */
+ 
+ void
+-rpc_test_prog_1_svc(rqstp, transp)
+-       struct svc_req *rqstp;
+-       SVCXPRT *transp;
++rpc_test_prog_1_svc(struct svc_req *rqstp, SVCXPRT *transp)
+ {
+        union {
+                char *rpc_test_echo_1_arg;
+        } argument;
+        char *result;
+-       bool_t (*xdr_argument)(), (*xdr_result)();
+-       char *(*local)();
++       xdrproc_t xdr_argument, xdr_result;
++       char *(*local)(char *, struct svc_req *);
+ 
+        _rpcsvccount++;
+        switch (rqstp->rq_proc) {
+@@ -35,9 +33,9 @@ rpc_test_prog_1_svc(rqstp, transp)
+                return;
+ 
+        case RPC_TEST_ECHO:
+-               xdr_argument = xdr_wrapstring;
+-               xdr_result = xdr_wrapstring;
+-               local = (char *(*)()) rpc_test_echo_1_svc;
++               xdr_argument = (xdrproc_t)xdr_wrapstring;
++               xdr_result = (xdrproc_t)xdr_wrapstring;
++               local = (char *(*)(char *, struct svc_req *)) rpc_test_echo_1_svc;
+                break;
+ 
+        default:
+@@ -53,7 +51,7 @@ rpc_test_prog_1_svc(rqstp, transp)
+                _rpcsvcstate = _SERVED;
+                return;
+        }
+-       result = (*local)(&argument, rqstp);
++       result = (*local)((char *)&argument, rqstp);
+        if (result != NULL && !svc_sendreply(transp, xdr_result, result)) {
+                svcerr_systemerr(transp);
+        }
+diff --git a/src/lib/rpc/unit-test/server.c b/src/lib/rpc/unit-test/server.c
+index c3bbcbf..4400b96 100644
+--- a/src/lib/rpc/unit-test/server.c
++++ b/src/lib/rpc/unit-test/server.c
+@@ -40,7 +40,7 @@ static void rpc_test_badverf(gss_name_t client, gss_name_t server,
+ #define SERVICE_NAME "host"
+ #endif
+ 
+-static void usage()
++static void usage(void)
+ {
+      fprintf(stderr, "Usage: server {-t|-u} [svc-debug] [misc-debug]\n");
+      exit(1);
+diff --git a/src/lib/rpc/xdr.c b/src/lib/rpc/xdr.c
+index 24c3de4..49c31b3 100644
+--- a/src/lib/rpc/xdr.c
++++ b/src/lib/rpc/xdr.c
+@@ -579,14 +579,14 @@ xdr_union(
+         */
+        for (; choices->proc != NULL_xdrproc_t; choices++) {
+                if (choices->value == dscm)
+-                       return ((*(choices->proc))(xdrs, unp, LASTUNSIGNED));
++                       return choices->proc(xdrs, unp);
+        }
+ 
+        /*
+         * no match - execute the default xdr routine if there is one
+         */
+        return ((dfault == NULL_xdrproc_t) ? FALSE :
+-           (*dfault)(xdrs, unp, LASTUNSIGNED));
++           (*dfault)(xdrs, unp));
+ }
+ 
+ 
+diff --git a/src/lib/rpc/xdr_array.c b/src/lib/rpc/xdr_array.c
+index aeaa7f2..3507d53 100644
+--- a/src/lib/rpc/xdr_array.c
++++ b/src/lib/rpc/xdr_array.c
+@@ -113,7 +113,7 @@ xdr_array(
+         * now we xdr each element of array
+         */
+        for (i = 0; (i < c) && stat; i++) {
+-               stat = (*elproc)(xdrs, target, LASTUNSIGNED);
++               stat = (*elproc)(xdrs, target);
+                target += elsize;
+        }
+ 
+@@ -150,7 +150,7 @@ xdr_vector(
+ 
+        elptr = basep;
+        for (i = 0; i < nelem; i++) {
+-               if (! (*xdr_elem)(xdrs, elptr, LASTUNSIGNED)) {
++               if (! (*xdr_elem)(xdrs, elptr)) {
+                        return(FALSE);
+                }
+                elptr += elemsize;
+diff --git a/src/lib/rpc/xdr_rec.c b/src/lib/rpc/xdr_rec.c
+index 1f6a776..1852540 100644
+--- a/src/lib/rpc/xdr_rec.c
++++ b/src/lib/rpc/xdr_rec.c
+@@ -99,7 +99,7 @@ typedef struct rec_strm {
+        /*
+         * out-goung bits
+         */
+-       int (*writeit)();
++       int (*writeit)(caddr_t, caddr_t, int);
+        caddr_t out_base;       /* output buffer (points to frag header) */
+        caddr_t out_finger;     /* next output position */
+        caddr_t out_boundry;    /* data cannot up to this address */
+@@ -108,7 +108,7 @@ typedef struct rec_strm {
+        /*
+         * in-coming bits
+         */
+-       int (*readit)();
++       int (*readit)(caddr_t, caddr_t, int);
+        uint32_t in_size;       /* fixed size of the input buffer */
+        caddr_t in_base;
+        caddr_t in_finger;      /* location of next byte to be had */
+@@ -140,8 +140,10 @@ xdrrec_create(
+        u_int sendsize,
+        u_int recvsize,
+        caddr_t tcp_handle,
+-       int (*readit)(), /* like read, but pass it a tcp_handle, not sock */
+-       int (*writeit)() /* like write, but pass it a tcp_handle, not sock */
++       /* like read, but pass it a tcp_handle, not sock */
++       int (*readit)(caddr_t, caddr_t, int),
++        /* like write, but pass it a tcp_handle, not sock */
++       int (*writeit)(caddr_t, caddr_t, int)
+        )
+ {
+        RECSTREAM *rstrm = mem_alloc(sizeof(RECSTREAM));
+@@ -528,8 +530,7 @@ get_input_bytes(RECSTREAM *rstrm, caddr_t addr, int len)
+ }
+ 
+ static bool_t  /* next four bytes of input stream are treated as a header */
+-set_input_fragment(rstrm)
+-       RECSTREAM *rstrm;
++set_input_fragment(RECSTREAM *rstrm)
+ {
+        uint32_t header;
+ 
+diff --git a/src/lib/rpc/xdr_reference.c b/src/lib/rpc/xdr_reference.c
+index eff279d..f3d4b7d 100644
+--- a/src/lib/rpc/xdr_reference.c
++++ b/src/lib/rpc/xdr_reference.c
+@@ -47,8 +47,6 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
+ #include <gssrpc/types.h>
+ #include <gssrpc/xdr.h>
+ 
+-#define LASTUNSIGNED   ((u_int)0-1)
+-
+ /*
+  * XDR an indirect pointer
+  * xdr_reference is for recursively translating a structure that is
+@@ -88,7 +86,7 @@ xdr_reference(
+                        break;
+        }
+ 
+-       stat = (*proc)(xdrs, loc, LASTUNSIGNED);
++       stat = (*proc)(xdrs, loc);
+ 
+        if (xdrs->x_op == XDR_FREE) {
+                mem_free(loc, size);
+diff --git a/src/lib/rpc/xdr_sizeof.c b/src/lib/rpc/xdr_sizeof.c
+index 5b77fa6..0c460e7 100644
+--- a/src/lib/rpc/xdr_sizeof.c
++++ b/src/lib/rpc/xdr_sizeof.c
+@@ -43,9 +43,7 @@
+ 
+ /* ARGSUSED */
+ static bool_t
+-x_putlong(xdrs, longp)
+-       XDR *xdrs;
+-       long *longp;
++x_putlong(XDR *xdrs, long *longp)
+ {
+        xdrs->x_handy += BYTES_PER_XDR_UNIT;
+        return (TRUE);
+@@ -53,10 +51,7 @@ x_putlong(xdrs, longp)
+ 
+ /* ARGSUSED */
+ static bool_t
+-x_putbytes(xdrs, bp, len)
+-       XDR *xdrs;
+-       char  *bp;
+-       int len;
++x_putbytes(XDR *xdrs, char *bp, u_int len)
+ {
+        xdrs->x_handy += len;
+ 
+@@ -64,26 +59,21 @@ x_putbytes(xdrs, bp, len)
+ }
+ 
+ static u_int
+-x_getpostn(xdrs)
+-       XDR *xdrs;
++x_getpostn(XDR *xdrs)
+ {
+        return (xdrs->x_handy);
+ }
+ 
+ /* ARGSUSED */
+ static bool_t
+-x_setpostn(xdrs, pos)
+-       XDR *xdrs;
+-       u_int pos;
++x_setpostn(XDR *xdrs, u_int pos)
+ {
+        /* This is not allowed */
+        return (FALSE);
+ }
+ 
+ static rpc_inline_t *
+-x_inline(xdrs, len)
+-       XDR *xdrs;
+-       int len;
++x_inline(XDR *xdrs, int len)
+ {
+        if (len == 0) {
+                return (NULL);
+@@ -110,15 +100,14 @@ x_inline(xdrs, len)
+ }
+ 
+ static int
+-harmless()
++harmless(void)
+ {
+        /* Always return FALSE/NULL, as the case may be */
+        return (0);
+ }
+ 
+ static void
+-x_destroy(xdrs)
+-       XDR *xdrs;
++x_destroy(XDR *xdrs)
+ {
+        xdrs->x_handy = 0;
+        xdrs->x_private = NULL;
+@@ -130,9 +119,7 @@ x_destroy(xdrs)
+ }
+ 
+ unsigned long
+-xdr_sizeof(func, data)
+-       xdrproc_t func;
+-       void *data;
++xdr_sizeof(xdrproc_t func, void *data)
+ {
+        XDR x;
+        struct xdr_ops ops;
+diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c
+index 7cf8aa4..9b75f34 100644
+--- a/src/plugins/kdb/db2/db2_exp.c
++++ b/src/plugins/kdb/db2/db2_exp.c
+@@ -68,7 +68,7 @@ k5_mutex_t *krb5_db2_mutex;
+         return result;                                  \
+     }                                                   \
+     /* hack: decl to allow a following ";" */           \
+-    static TYPE wrap_##NAME ()
++    static TYPE wrap_##NAME ARGLIST
+ 
+ /* Two special cases: void (can't assign result), and krb5_error_code
+    (return error from locking code).  */
+@@ -81,7 +81,7 @@ k5_mutex_t *krb5_db2_mutex;
+         k5_mutex_unlock (krb5_db2_mutex);               \
+     }                                                   \
+     /* hack: decl to allow a following ";" */           \
+-    static void wrap_##NAME ()
++    static void wrap_##NAME ARGLIST
+ 
+ #define WRAP_K(NAME,ARGLIST,ARGNAMES)                   \
+     WRAP(NAME,krb5_error_code,ARGLIST,ARGNAMES)
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_close.c b/src/plugins/kdb/db2/libdb2/btree/bt_close.c
+index 11be134..f12d74b 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_close.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_close.c
+@@ -61,8 +61,7 @@ static int bt_meta __P((BTREE *));
+  *     RET_ERROR, RET_SUCCESS
+  */
+ int
+-__bt_close(dbp)
+-       DB *dbp;
++__bt_close(DB *dbp)
+ {
+        BTREE *t;
+        int fd;
+@@ -116,9 +115,7 @@ __bt_close(dbp)
+  *     RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__bt_sync(dbp, flags)
+-       const DB *dbp;
+-       u_int flags;
++__bt_sync(const DB *dbp, u_int flags)
+ {
+        BTREE *t;
+        int status;
+@@ -160,8 +157,7 @@ __bt_sync(dbp, flags)
+  *     RET_ERROR, RET_SUCCESS
+  */
+ static int
+-bt_meta(t)
+-       BTREE *t;
++bt_meta(BTREE *t)
+ {
+        BTMETA m;
+        void *p;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_conv.c b/src/plugins/kdb/db2/libdb2/btree/bt_conv.c
+index c0644ed..99c4af5 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_conv.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_conv.c
+@@ -59,10 +59,7 @@ static void mswap __P((PAGE *));
+  *     h:      page to convert
+  */
+ void
+-__bt_pgin(t, pg, pp)
+-       void *t;
+-       db_pgno_t pg;
+-       void *pp;
++__bt_pgin(void *t, db_pgno_t pg, void *pp)
+ {
+        PAGE *h;
+        indx_t i, top;
+@@ -128,10 +125,7 @@ __bt_pgin(t, pg, pp)
+ }
+ 
+ void
+-__bt_pgout(t, pg, pp)
+-       void *t;
+-       db_pgno_t pg;
+-       void *pp;
++__bt_pgout(void *t, db_pgno_t pg, void *pp)
+ {
+        PAGE *h;
+        indx_t i, top;
+@@ -203,8 +197,7 @@ __bt_pgout(t, pg, pp)
+  *     p:      page to convert
+  */
+ static void
+-mswap(pg)
+-       PAGE *pg;
++mswap(PAGE *pg)
+ {
+        char *p;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_delete.c b/src/plugins/kdb/db2/libdb2/btree/bt_delete.c
+index 28cc24d..f8dd59e 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_delete.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_delete.c
+@@ -59,10 +59,7 @@ static int __bt_stkacq __P((BTREE *, PAGE **, CURSOR *));
+  * Return RET_SPECIAL if the key is not found.
+  */
+ int
+-__bt_delete(dbp, key, flags)
+-       const DB *dbp;
+-       const DBT *key;
+-       u_int flags;
++__bt_delete(const DB *dbp, const DBT *key, u_int flags)
+ {
+        BTREE *t;
+        CURSOR *c;
+@@ -140,10 +137,7 @@ __bt_delete(dbp, key, flags)
+  *     0 on success, 1 on failure
+  */
+ static int
+-__bt_stkacq(t, hp, c)
+-       BTREE *t;
+-       PAGE **hp;
+-       CURSOR *c;
++__bt_stkacq(BTREE *t, PAGE **hp, CURSOR *c)
+ {
+        BINTERNAL *bi;
+        EPG *e;
+@@ -288,9 +282,7 @@ ret:        mpool_put(t->bt_mp, h, 0);
+  *     RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
+  */
+ static int
+-__bt_bdelete(t, key)
+-       BTREE *t;
+-       const DBT *key;
++__bt_bdelete(BTREE *t, const DBT *key)
+ {
+        EPG *e;
+        PAGE *h;
+@@ -375,9 +367,7 @@ loop:       if ((e = __bt_search(t, key, &exact)) == NULL)
+  *     mpool_put's the page
+  */
+ static int
+-__bt_pdelete(t, h)
+-       BTREE *t;
+-       PAGE *h;
++__bt_pdelete(BTREE *t, PAGE *h)
+ {
+        BINTERNAL *bi;
+        PAGE *pg;
+@@ -471,11 +461,7 @@ __bt_pdelete(t, h)
+  *     RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__bt_dleaf(t, key, h, idx)
+-       BTREE *t;
+-       const DBT *key;
+-       PAGE *h;
+-       u_int idx;
++__bt_dleaf(BTREE *t, const DBT *key, PAGE *h, u_int idx)
+ {
+        BLEAF *bl;
+        indx_t cnt, *ip, offset;
+@@ -536,11 +522,7 @@ __bt_dleaf(t, key, h, idx)
+  *     RET_SUCCESS, RET_ERROR.
+  */
+ static int
+-__bt_curdel(t, key, h, idx)
+-       BTREE *t;
+-       const DBT *key;
+-       PAGE *h;
+-       u_int idx;
++__bt_curdel(BTREE *t, const DBT *key, PAGE *h, u_int idx)
+ {
+        CURSOR *c;
+        EPG e;
+@@ -635,9 +617,7 @@ dup2:                               c->pg.pgno = e.page->pgno;
+  *     h:      page to be deleted
+  */
+ int
+-__bt_relink(t, h)
+-       BTREE *t;
+-       PAGE *h;
++__bt_relink(BTREE *t, PAGE *h)
+ {
+        PAGE *pg;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_get.c b/src/plugins/kdb/db2/libdb2/btree/bt_get.c
+index b631821..012a341 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_get.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_get.c
+@@ -60,11 +60,7 @@ static char sccsid[] = "@(#)bt_get.c 8.6 (Berkeley) 7/20/94";
+  *     RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
+  */
+ int
+-__bt_get(dbp, key, data, flags)
+-       const DB *dbp;
+-       const DBT *key;
+-       DBT *data;
+-       u_int flags;
++__bt_get(const DB *dbp, const DBT *key, DBT *data, u_int flags)
+ {
+        BTREE *t;
+        EPG *e;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_open.c b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
+index 2977b17..0bb19d7 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_open.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
+@@ -89,10 +89,8 @@ static int tmp __P((void));
+  *
+  */
+ DB *
+-__bt_open(fname, flags, mode, openinfo, dflags)
+-       const char *fname;
+-       int flags, mode, dflags;
+-       const BTREEINFO *openinfo;
++__bt_open(const char *fname, int flags, int mode, const BTREEINFO *openinfo,
++         int dflags)
+ {
+        struct stat sb;
+        BTMETA m;
+@@ -352,8 +350,7 @@ err:        if (t) {
+  *     RET_ERROR, RET_SUCCESS
+  */
+ static int
+-nroot(t)
+-       BTREE *t;
++nroot(BTREE *t)
+ {
+        PAGE *meta, *root;
+        db_pgno_t npg;
+@@ -458,8 +455,7 @@ byteorder()
+ }
+ 
+ int
+-__bt_fd(dbp)
+-        const DB *dbp;
++__bt_fd(const DB *dbp)
+ {
+        BTREE *t;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c b/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c
+index 8b1f597..8301b5d 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c
+@@ -77,12 +77,7 @@ static char sccsid[] = "@(#)bt_overflow.c    8.5 (Berkeley) 7/16/94";
+  *     RET_ERROR, RET_SUCCESS
+  */
+ int
+-__ovfl_get(t, p, ssz, buf, bufsz)
+-       BTREE *t;
+-       void *p;
+-       size_t *ssz;
+-       void **buf;
+-       size_t *bufsz;
++__ovfl_get(BTREE *t, void *p, size_t *ssz, void **buf, size_t *bufsz)
+ {
+        PAGE *h;
+        db_pgno_t pg;
+@@ -136,10 +131,7 @@ __ovfl_get(t, p, ssz, buf, bufsz)
+  *     RET_ERROR, RET_SUCCESS
+  */
+ int
+-__ovfl_put(t, dbt, pg)
+-       BTREE *t;
+-       const DBT *dbt;
+-       db_pgno_t *pg;
++__ovfl_put(BTREE *t, const DBT *dbt, db_pgno_t *pg)
+ {
+        PAGE *h, *last;
+        void *p;
+@@ -190,9 +182,7 @@ __ovfl_put(t, dbt, pg)
+  *     RET_ERROR, RET_SUCCESS
+  */
+ int
+-__ovfl_delete(t, p)
+-       BTREE *t;
+-       void *p;
++__ovfl_delete(BTREE *t, void *p)
+ {
+        PAGE *h;
+        db_pgno_t pg;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_page.c b/src/plugins/kdb/db2/libdb2/btree/bt_page.c
+index 3663cf7..38aa39a 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_page.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_page.c
+@@ -57,9 +57,7 @@ static char sccsid[] = "@(#)bt_page.c 8.4 (Berkeley) 11/2/95";
+  *     mpool_put's the page.
+  */
+ int
+-__bt_free(t, h)
+-       BTREE *t;
+-       PAGE *h;
++__bt_free(BTREE *t, PAGE *h)
+ {
+        /* Insert the page at the head of the free list. */
+        h->prevpg = P_INVALID;
+@@ -83,9 +81,7 @@ __bt_free(t, h)
+  *     Pointer to a page, NULL on error.
+  */
+ PAGE *
+-__bt_new(t, npg)
+-       BTREE *t;
+-       db_pgno_t *npg;
++__bt_new(BTREE *t, db_pgno_t *npg)
+ {
+        PAGE *h;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_put.c b/src/plugins/kdb/db2/libdb2/btree/bt_put.c
+index 7d65928..1303c0b 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_put.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_put.c
+@@ -64,11 +64,7 @@ static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));
+  *     tree and R_NOOVERWRITE specified.
+  */
+ int
+-__bt_put(dbp, key, data, flags)
+-       const DB *dbp;
+-       DBT *key;
+-       const DBT *data;
+-       u_int flags;
++__bt_put(const DB *dbp, DBT *key, const DBT *data, u_int flags)
+ {
+        BTREE *t;
+        DBT tkey, tdata;
+@@ -272,10 +268,7 @@ u_long bt_cache_hit, bt_cache_miss;
+  *     EPG for new record or NULL if not found.
+  */
+ static EPG *
+-bt_fast(t, key, data, exactp)
+-       BTREE *t;
+-       const DBT *key, *data;
+-       int *exactp;
++bt_fast(BTREE *t, const DBT *key, const DBT *data, int *exactp)
+ {
+        PAGE *h;
+        u_int32_t nbytes;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_search.c b/src/plugins/kdb/db2/libdb2/btree/bt_search.c
+index c633d14..ed512cc 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_search.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_search.c
+@@ -63,10 +63,7 @@ static int __bt_sprev __P((BTREE *, PAGE *, const DBT *, int *));
+  *     the bt_cur field of the tree.  A pointer to the field is returned.
+  */
+ EPG *
+-__bt_search(t, key, exactp)
+-       BTREE *t;
+-       const DBT *key;
+-       int *exactp;
++__bt_search(BTREE *t, const DBT *key, int *exactp)
+ {
+        PAGE *h;
+        indx_t base, idx, lim;
+@@ -148,11 +145,7 @@ next:              BT_PUSH(t, h->pgno, idx);
+  *     If an exact match found.
+  */
+ static int
+-__bt_snext(t, h, key, exactp)
+-       BTREE *t;
+-       PAGE *h;
+-       const DBT *key;
+-       int *exactp;
++__bt_snext(BTREE *t, PAGE *h, const DBT *key, int *exactp)
+ {
+        BINTERNAL *bi;
+        EPG e;
+@@ -228,11 +221,7 @@ __bt_snext(t, h, key, exactp)
+  *     If an exact match found.
+  */
+ static int
+-__bt_sprev(t, h, key, exactp)
+-       BTREE *t;
+-       PAGE *h;
+-       const DBT *key;
+-       int *exactp;
++__bt_sprev(BTREE *t, PAGE *h, const DBT *key, int *exactp)
+ {
+        BINTERNAL *bi;
+        EPG e;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_seq.c b/src/plugins/kdb/db2/libdb2/btree/bt_seq.c
+index 2c8c2de..97db44a 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_seq.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_seq.c
+@@ -102,10 +102,7 @@ static int bt_rseq_prev(BTREE *, EPG *);
+  *     RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
+  */
+ int
+-__bt_seq(dbp, key, data, flags)
+-       const DB *dbp;
+-       DBT *key, *data;
+-       u_int flags;
++__bt_seq(const DB *dbp, DBT *key, DBT *data, u_int flags)
+ {
+        BTREE *t;
+        EPG e;
+@@ -179,11 +176,7 @@ __bt_seq(dbp, key, data, flags)
+  *     RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
+  */
+ static int
+-__bt_seqset(t, ep, key, flags)
+-       BTREE *t;
+-       EPG *ep;
+-       DBT *key;
+-       int flags;
++__bt_seqset(BTREE *t, EPG *ep, DBT *key, int flags)
+ {
+        PAGE *h;
+        db_pgno_t pg;
+@@ -273,10 +266,7 @@ __bt_seqset(t, ep, key, flags)
+  *     RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
+  */
+ static int
+-__bt_seqadv(t, ep, flags)
+-       BTREE *t;
+-       EPG *ep;
+-       int flags;
++__bt_seqadv(BTREE *t, EPG *ep, int flags)
+ {
+        CURSOR *c;
+        PAGE *h;
+@@ -495,11 +485,7 @@ bt_rseq_prev(BTREE *t, EPG *ep)
+  *     or RET_SPECIAL if no such key exists.
+  */
+ static int
+-__bt_first(t, key, erval, exactp)
+-       BTREE *t;
+-       const DBT *key;
+-       EPG *erval;
+-       int *exactp;
++__bt_first(BTREE *t, const DBT *key, EPG *erval, int *exactp)
+ {
+        PAGE *h, *hprev;
+        EPG *ep, save;
+@@ -596,10 +582,7 @@ __bt_first(t, key, erval, exactp)
+  *  index:     page index
+  */
+ void
+-__bt_setcur(t, pgno, idx)
+-       BTREE *t;
+-       db_pgno_t pgno;
+-       u_int idx;
++__bt_setcur(BTREE *t, db_pgno_t pgno, u_int idx)
+ {
+        /* Lose any already deleted key. */
+        if (t->bt_cursor.key.data != NULL) {
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_split.c b/src/plugins/kdb/db2/libdb2/btree/bt_split.c
+index c7e4e72..8901bd6 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_split.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_split.c
+@@ -79,13 +79,8 @@ u_long       bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved;
+  *     RET_ERROR, RET_SUCCESS
+  */
+ int
+-__bt_split(t, sp, key, data, flags, ilen, argskip)
+-       BTREE *t;
+-       PAGE *sp;
+-       const DBT *key, *data;
+-       int flags;
+-       size_t ilen;
+-       u_int32_t argskip;
++__bt_split(BTREE *t, PAGE *sp, const DBT *key, const DBT *data, int flags,
++          size_t ilen, u_int32_t argskip)
+ {
+        BINTERNAL *bi = NULL;
+        BLEAF *bl = NULL, *tbl;
+@@ -345,11 +340,7 @@ err2:      mpool_put(t->bt_mp, l, 0);
+  *     Pointer to page in which to insert or NULL on error.
+  */
+ static PAGE *
+-bt_page(t, h, lp, rp, skip, ilen)
+-       BTREE *t;
+-       PAGE *h, **lp, **rp;
+-       indx_t *skip;
+-       size_t ilen;
++bt_page(BTREE *t, PAGE *h, PAGE **lp, PAGE **rp, indx_t *skip, size_t ilen)
+ {
+        PAGE *l, *r, *tp;
+        db_pgno_t npg;
+@@ -450,11 +441,7 @@ bt_page(t, h, lp, rp, skip, ilen)
+  *     Pointer to page in which to insert or NULL on error.
+  */
+ static PAGE *
+-bt_root(t, h, lp, rp, skip, ilen)
+-       BTREE *t;
+-       PAGE *h, **lp, **rp;
+-       indx_t *skip;
+-       size_t ilen;
++bt_root(BTREE *t, PAGE *h, PAGE **lp, PAGE **rp, indx_t *skip, size_t ilen)
+ {
+        PAGE *l, *r, *tp;
+        db_pgno_t lnpg, rnpg;
+@@ -497,9 +484,7 @@ bt_root(t, h, lp, rp, skip, ilen)
+  *     RET_ERROR, RET_SUCCESS
+  */
+ static int
+-bt_rroot(t, h, l, r)
+-       BTREE *t;
+-       PAGE *h, *l, *r;
++bt_rroot(BTREE *t, PAGE *h, PAGE *l, PAGE *r)
+ {
+        char *dest;
+ 
+@@ -537,9 +522,7 @@ bt_rroot(t, h, l, r)
+  *     RET_ERROR, RET_SUCCESS
+  */
+ static int
+-bt_broot(t, h, l, r)
+-       BTREE *t;
+-       PAGE *h, *l, *r;
++bt_broot(BTREE *t, PAGE *h, PAGE *l, PAGE *r)
+ {
+        BINTERNAL *bi;
+        BLEAF *bl;
+@@ -617,11 +600,7 @@ bt_broot(t, h, l, r)
+  *     Pointer to page in which to insert.
+  */
+ static PAGE *
+-bt_psplit(t, h, l, r, pskip, ilen)
+-       BTREE *t;
+-       PAGE *h, *l, *r;
+-       indx_t *pskip;
+-       size_t ilen;
++bt_psplit(BTREE *t, PAGE *h, PAGE *l, PAGE *r, indx_t *pskip, size_t ilen)
+ {
+        BINTERNAL *bi;
+        BLEAF *bl;
+@@ -796,9 +775,7 @@ bt_psplit(t, h, l, r, pskip, ilen)
+  *     RET_SUCCESS, RET_ERROR.
+  */
+ static int
+-bt_preserve(t, pg)
+-       BTREE *t;
+-       db_pgno_t pg;
++bt_preserve(BTREE *t, db_pgno_t pg)
+ {
+        PAGE *h;
+ 
+@@ -824,8 +801,7 @@ bt_preserve(t, pg)
+  * all the way back to bt_split/bt_rroot and it's not very clean.
+  */
+ static recno_t
+-rec_total(h)
+-       PAGE *h;
++rec_total(PAGE *h)
+ {
+        recno_t recs;
+        indx_t nxt, top;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_utils.c b/src/plugins/kdb/db2/libdb2/btree/bt_utils.c
+index be2f24f..13d1f2c 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_utils.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_utils.c
+@@ -64,11 +64,8 @@ static char sccsid[] = "@(#)bt_utils.c       8.8 (Berkeley) 7/20/94";
+  *     RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__bt_ret(t, e, key, rkey, data, rdata, copy)
+-       BTREE *t;
+-       EPG *e;
+-       DBT *key, *rkey, *data, *rdata;
+-       int copy;
++__bt_ret(BTREE *t, EPG *e, DBT *key, DBT *rkey, DBT *data, DBT *rdata,
++        int copy)
+ {
+        BLEAF *bl;
+        void *p;
+@@ -150,10 +147,7 @@ dataonly:
+  *     > 0 if k1 is > record
+  */
+ int
+-__bt_cmp(t, k1, e)
+-       BTREE *t;
+-       const DBT *k1;
+-       EPG *e;
++__bt_cmp(BTREE *t, const DBT *k1, EPG *e)
+ {
+        BINTERNAL *bi;
+        BLEAF *bl;
+@@ -213,8 +207,7 @@ __bt_cmp(t, k1, e)
+  *     > 0 if a is > b
+  */
+ int
+-__bt_defcmp(a, b)
+-       const DBT *a, *b;
++__bt_defcmp(const DBT *a, const DBT *b)
+ {
+        size_t len;
+        u_char *p1, *p2;
+@@ -243,8 +236,7 @@ __bt_defcmp(a, b)
+  *     Number of bytes needed to distinguish b from a.
+  */
+ size_t
+-__bt_defpfx(a, b)
+-       const DBT *a, *b;
++__bt_defpfx(const DBT *a, const DBT *b)
+ {
+        u_char *p1, *p2;
+        size_t cnt, len;
+diff --git a/src/plugins/kdb/db2/libdb2/db/db.c b/src/plugins/kdb/db2/libdb2/db/db.c
+index fba7795..f85484f 100644
+--- a/src/plugins/kdb/db2/libdb2/db/db.c
++++ b/src/plugins/kdb/db2/libdb2/db/db.c
+@@ -45,11 +45,8 @@ static char sccsid[] = "@(#)db.c     8.4 (Berkeley) 2/21/94";
+ #include "db-int.h"
+ 
+ DB *
+-kdb2_dbopen(fname, flags, mode, type, openinfo)
+-       const char *fname;
+-       int flags, mode;
+-       DBTYPE type;
+-       const void *openinfo;
++kdb2_dbopen(const char *fname, int flags, int mode, DBTYPE type,
++           const void *openinfo)
+ {
+ 
+ #define        DB_FLAGS        (DB_LOCK | DB_SHMEM | DB_TXN)
+@@ -74,7 +71,7 @@ kdb2_dbopen(fname, flags, mode, type, openinfo)
+ }
+ 
+ static int
+-__dberr()
++__dberr(void)
+ {
+        return (RET_ERROR);
+ }
+@@ -86,14 +83,15 @@ __dberr()
+  *     dbp:    pointer to the DB structure.
+  */
+ void
+-__dbpanic(dbp)
+-       DB *dbp;
++__dbpanic(DB *dbp)
+ {
+        /* The only thing that can succeed is a close. */
+-       dbp->del = (int (*)())__dberr;
+-       dbp->fd = (int (*)())__dberr;
+-       dbp->get = (int (*)())__dberr;
+-       dbp->put = (int (*)())__dberr;
+-       dbp->seq = (int (*)())__dberr;
+-       dbp->sync = (int (*)())__dberr;
++       dbp->del = (int (*)(const struct __db *, const DBT *, u_int))__dberr;
++       dbp->fd = (int (*)(const struct __db *))__dberr;
++       dbp->get = (int (*)(const struct __db *, const DBT *, DBT *,
++                           u_int))__dberr;
++       dbp->put = (int (*)(const struct __db *, DBT *, const DBT *,
++                           u_int))__dberr;
++       dbp->seq = (int (*)(const struct __db *, DBT *, DBT *, u_int))__dberr;
++       dbp->sync = (int (*)(const struct __db *, u_int))__dberr;
+ }
+diff --git a/src/plugins/kdb/db2/libdb2/hash/dbm.c b/src/plugins/kdb/db2/libdb2/hash/dbm.c
+index 4878cbc..2dca256 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/dbm.c
++++ b/src/plugins/kdb/db2/libdb2/hash/dbm.c
+@@ -69,8 +69,7 @@ static DBM *__cur_db;
+ static void no_open_db __P((void));
+ 
+ int
+-kdb2_dbminit(file)
+-       char *file;
++kdb2_dbminit(char *file)
+ {
+        if (__cur_db != NULL)
+                (void)kdb2_dbm_close(__cur_db);
+@@ -82,8 +81,7 @@ kdb2_dbminit(file)
+ }
+ 
+ datum
+-kdb2_fetch(key)
+-       datum key;
++kdb2_fetch(datum key)
+ {
+        datum item;
+ 
+@@ -111,8 +109,7 @@ kdb2_firstkey()
+ }
+ 
+ datum
+-kdb2_nextkey(key)
+-       datum key;
++kdb2_nextkey(datum key)
+ {
+        datum item;
+ 
+@@ -126,8 +123,7 @@ kdb2_nextkey(key)
+ }
+ 
+ int
+-kdb2_delete(key)
+-       datum key;
++kdb2_delete(datum key)
+ {
+        if (__cur_db == NULL) {
+                no_open_db();
+@@ -137,8 +133,7 @@ kdb2_delete(key)
+ }
+ 
+ int
+-kdb2_store(key, dat)
+-       datum key, dat;
++kdb2_store(datum key, datum dat)
+ {
+        if (__cur_db == NULL) {
+                no_open_db();
+@@ -159,9 +154,7 @@ no_open_db()
+  *      NULL on failure
+  */
+ DBM *
+-kdb2_dbm_open(file, flags, mode)
+-       const char *file;
+-       int flags, mode;
++kdb2_dbm_open(const char *file, int flags, int mode)
+ {
+        HASHINFO info;
+        char path[MAXPATHLEN];
+@@ -183,8 +176,7 @@ kdb2_dbm_open(file, flags, mode)
+  *     Nothing.
+  */
+ void
+-kdb2_dbm_close(db)
+-       DBM *db;
++kdb2_dbm_close(DBM *db)
+ {
+        (void)(db->close)(db);
+ }
+@@ -195,9 +187,7 @@ kdb2_dbm_close(db)
+  *     NULL on failure
+  */
+ datum
+-kdb2_dbm_fetch(db, key)
+-       DBM *db;
+-       datum key;
++kdb2_dbm_fetch(DBM *db, datum key)
+ {
+        datum retval;
+        int status;
+@@ -226,8 +216,7 @@ kdb2_dbm_fetch(db, key)
+  *     NULL on failure
+  */
+ datum
+-kdb2_dbm_firstkey(db)
+-       DBM *db;
++kdb2_dbm_firstkey(DBM *db)
+ {
+        int status;
+        datum retkey;
+@@ -254,8 +243,7 @@ kdb2_dbm_firstkey(db)
+  *     NULL on failure
+  */
+ datum
+-kdb2_dbm_nextkey(db)
+-       DBM *db;
++kdb2_dbm_nextkey(DBM *db)
+ {
+        int status;
+        datum retkey;
+@@ -282,9 +270,7 @@ kdb2_dbm_nextkey(db)
+  *     <0 failure
+  */
+ int
+-kdb2_dbm_delete(db, key)
+-       DBM *db;
+-       datum key;
++kdb2_dbm_delete(DBM *db, datum key)
+ {
+        int status;
+ 
+@@ -310,10 +296,7 @@ kdb2_dbm_delete(db, key)
+  *      1 if DBM_INSERT and entry exists
+  */
+ int
+-kdb2_dbm_store(db, key, content, flags)
+-       DBM *db;
+-       datum key, content;
+-       int flags;
++kdb2_dbm_store(DBM *db, datum key, datum content, int flags)
+ {
+ #ifdef NEED_COPY
+        DBT k, c;
+@@ -331,8 +314,7 @@ kdb2_dbm_store(db, key, content, flags)
+ }
+ 
+ int
+-kdb2_dbm_error(db)
+-       DBM *db;
++kdb2_dbm_error(DBM *db)
+ {
+        HTAB *hp;
+ 
+@@ -341,8 +323,7 @@ kdb2_dbm_error(db)
+ }
+ 
+ int
+-kdb2_dbm_clearerr(db)
+-       DBM *db;
++kdb2_dbm_clearerr(DBM *db)
+ {
+        HTAB *hp;
+ 
+@@ -352,8 +333,7 @@ kdb2_dbm_clearerr(db)
+ }
+ 
+ int
+-kdb2_dbm_dirfno(db)
+-       DBM *db;
++kdb2_dbm_dirfno(DBM *db)
+ {
+        return(((HTAB *)db->internal)->fp);
+ }
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hash.c b/src/plugins/kdb/db2/libdb2/hash/hash.c
+index 862dbb1..7c3e951 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hash.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hash.c
+@@ -94,10 +94,8 @@ u_int32_t hash_accesses, hash_collisions, hash_expansions, hash_overflows,
+ /* OPEN/CLOSE */
+ 
+ extern DB *
+-__kdb2_hash_open(file, flags, mode, info, dflags)
+-       const char *file;
+-       int flags, mode, dflags;
+-       const HASHINFO *info;   /* Special directives for create */
++__kdb2_hash_open(const char *file, int flags, int mode, const HASHINFO *info,
++                int dflags)
+ {
+        struct stat statbuf;
+        DB *dbp;
+@@ -260,8 +258,7 @@ error0:
+ }
+ 
+ static int32_t
+-hash_close(dbp)
+-       DB *dbp;
++hash_close(DB *dbp)
+ {
+        HTAB *hashp;
+        int32_t retval;
+@@ -276,8 +273,7 @@ hash_close(dbp)
+ }
+ 
+ static int32_t
+-hash_fd(dbp)
+-       const DB *dbp;
++hash_fd(const DB *dbp)
+ {
+        HTAB *hashp;
+ 
+@@ -294,10 +290,7 @@ hash_fd(dbp)
+ 
+ /************************** LOCAL CREATION ROUTINES **********************/
+ static HTAB *
+-init_hash(hashp, file, info)
+-       HTAB *hashp;
+-       const char *file;
+-       const HASHINFO *info;
++init_hash(HTAB *hashp, const char *file, const HASHINFO *info)
+ {
+        struct stat statbuf;
+ 
+@@ -349,9 +342,7 @@ init_hash(hashp, file, info)
+  * Returns 0 on No Error
+  */
+ static int32_t
+-init_htab(hashp, nelem)
+-       HTAB *hashp;
+-       int32_t nelem;
++init_htab(HTAB *hashp, int32_t nelem)
+ {
+        int32_t l2, nbuckets;
+ 
+@@ -403,9 +394,7 @@ init_htab(hashp, nelem)
+  * Functions to get/put hash header.  We access the file directly.
+  */
+ static u_int32_t
+-hget_header(hashp, page_size)
+-       HTAB *hashp;
+-       u_int32_t page_size;
++hget_header(HTAB *hashp, u_int32_t page_size)
+ {
+        u_int32_t num_copied;
+        u_int8_t *hdr_dest;
+@@ -431,8 +420,7 @@ hget_header(hashp, page_size)
+ }
+ 
+ static void
+-hput_header(hashp)
+-       HTAB *hashp;
++hput_header(HTAB *hashp)
+ {
+        HASHHDR *whdrp;
+ #if DB_BYTE_ORDER == DB_LITTLE_ENDIAN
+@@ -462,8 +450,7 @@ hput_header(hashp)
+  * structure, freeing all allocated space.
+  */
+ static int32_t
+-hdestroy(hashp)
+-       HTAB *hashp;
++hdestroy(HTAB *hashp)
+ {
+        int32_t save_errno;
+ 
+@@ -549,9 +536,7 @@ hdestroy(hashp)
+  *     -1 ERROR
+  */
+ static int32_t
+-hash_sync(dbp, flags)
+-       const DB *dbp;
+-       u_int32_t flags;
++hash_sync(const DB *dbp, u_int32_t flags)
+ {
+        HTAB *hashp;
+ 
+@@ -570,8 +555,7 @@ hash_sync(dbp, flags)
+  *     -1 indicates that errno should be set
+  */
+ static int32_t
+-flush_meta(hashp)
+-       HTAB *hashp;
++flush_meta(HTAB *hashp)
+ {
+        int32_t i;
+ 
+@@ -607,11 +591,7 @@ flush_meta(hashp)
+ /* *** make sure this is true! */
+ 
+ static int32_t
+-hash_get(dbp, key, data, flag)
+-       const DB *dbp;
+-       const DBT *key;
+-       DBT *data;
+-       u_int32_t flag;
++hash_get(const DB *dbp, const DBT *key, DBT *data, u_int32_t flag)
+ {
+        HTAB *hashp;
+ 
+@@ -624,11 +604,7 @@ hash_get(dbp, key, data, flag)
+ }
+ 
+ static int32_t
+-hash_put(dbp, key, data, flag)
+-       const DB *dbp;
+-       DBT *key;
+-       const DBT *data;
+-       u_int32_t flag;
++hash_put(const DB *dbp, DBT *key, const DBT *data, u_int32_t flag)
+ {
+        HTAB *hashp;
+ 
+@@ -646,10 +622,7 @@ hash_put(dbp, key, data, flag)
+ }
+ 
+ static int32_t
+-hash_delete(dbp, key, flag)
+-       const DB *dbp;
+-       const DBT *key;
+-       u_int32_t flag;         /* Ignored */
++hash_delete(const DB *dbp, const DBT *key, u_int32_t flag)
+ {
+        HTAB *hashp;
+ 
+@@ -670,11 +643,7 @@ hash_delete(dbp, key, flag)
+  * Assume that hashp has been set in wrapper routine.
+  */
+ static int32_t
+-hash_access(hashp, action, key, val)
+-       HTAB *hashp;
+-       ACTION action;
+-       const DBT *key;
+-       DBT *val;
++hash_access(HTAB *hashp, ACTION action, const DBT *key, DBT *val)
+ {
+        DBT page_key, page_val;
+        CURSOR cursor;
+@@ -791,8 +760,7 @@ found:      __get_item_done(hashp, &cursor);
+ 
+ /* ****************** CURSORS ********************************** */
+ CURSOR *
+-__cursor_creat(dbp)
+-       const DB *dbp;
++__cursor_creat(const DB *dbp)
+ {
+        CURSOR *new_curs;
+        HTAB *hashp;
+@@ -823,11 +791,7 @@ __cursor_creat(dbp)
+ }
+ 
+ static int32_t
+-cursor_get(dbp, cursorp, key, val, flags)
+-       const DB *dbp;
+-       CURSOR *cursorp;
+-       DBT *key, *val;
+-       u_int32_t flags;
++cursor_get(const DB *dbp, CURSOR *cursorp, DBT *key, DBT *val, u_int32_t flags)
+ {
+        HTAB *hashp;
+        ITEM_INFO item_info;
+@@ -896,10 +860,7 @@ cursor_get(dbp, cursorp, key, val, flags)
+ }
+ 
+ static int32_t
+-cursor_delete(dbp, cursor, flags)
+-       const DB *dbp;
+-       CURSOR *cursor;
+-       u_int32_t flags;
++cursor_delete(const DB *dbp, CURSOR *cursor, u_int32_t flags)
+ {
+        /* XXX this is empirically determined, so it might not be completely
+           correct, but it seems to work.  At the very least it fixes
+@@ -912,10 +873,7 @@ cursor_delete(dbp, cursor, flags)
+ }
+ 
+ static int32_t
+-hash_seq(dbp, key, val, flag)
+-       const DB *dbp;
+-       DBT *key, *val;
+-       u_int32_t flag;
++hash_seq(const DB *dbp, DBT *key, DBT *val, u_int32_t flag)
+ {
+        HTAB *hashp;
+ 
+@@ -939,8 +897,7 @@ hash_seq(dbp, key, val, flag)
+  *     -1 ==> Error
+  */
+ int32_t
+-__expand_table(hashp)
+-       HTAB *hashp;
++__expand_table(HTAB *hashp)
+ {
+        u_int32_t old_bucket, new_bucket;
+        int32_t spare_ndx;
+@@ -979,10 +936,7 @@ __expand_table(hashp)
+ }
+ 
+ u_int32_t
+-__call_hash(hashp, k, len)
+-       HTAB *hashp;
+-       int8_t *k;
+-       int32_t len;
++__call_hash(HTAB *hashp, int8_t *k, int32_t len)
+ {
+        u_int32_t n, bucket;
+ 
+@@ -998,8 +952,7 @@ __call_hash(hashp, k, len)
+  * Hashp->hdr needs to be byteswapped.
+  */
+ static void
+-swap_header_copy(srcp, destp)
+-       HASHHDR *srcp, *destp;
++swap_header_copy(HASHHDR *srcp, HASHHDR *destp)
+ {
+        int32_t i;
+ 
+@@ -1024,8 +977,7 @@ swap_header_copy(srcp, destp)
+ }
+ 
+ static void
+-swap_header(hashp)
+-       HTAB *hashp;
++swap_header(HTAB *hashp)
+ {
+        HASHHDR *hdrp;
+        int32_t i;
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c b/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c
+index 4b95278..6befb7a 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c
+@@ -83,10 +83,7 @@ static int32_t collect_data __P((HTAB *, PAGE16 *, int32_t));
+  *     -1 ==> ERROR
+  */
+ int32_t
+-__big_insert(hashp, pagep, key, val)
+-       HTAB *hashp;
+-       PAGE16 *pagep;
+-       const DBT *key, *val;
++__big_insert(HTAB *hashp, PAGE16 *pagep, const DBT *key, const DBT *val)
+ {
+        size_t  key_size, val_size;
+        indx_t  key_move_bytes, val_move_bytes;
+@@ -185,11 +182,7 @@ __big_delete(hashp, pagep, ndx)
+  *     -1 error
+  */
+ int32_t
+-__find_bigpair(hashp, cursorp, key, size)
+-       HTAB *hashp;
+-       CURSOR *cursorp;
+-       int8_t *key;
+-       int32_t size;
++__find_bigpair(HTAB *hashp, CURSOR *cursorp, int8_t *key, int32_t size)
+ {
+        PAGE16 *pagep, *hold_pagep;
+        db_pgno_t  next_pgno;
+@@ -257,11 +250,7 @@ __find_bigpair(hashp, cursorp, key, size)
+  * Fill in the key and data for this big pair.
+  */
+ int32_t
+-__big_keydata(hashp, pagep, key, val, ndx)
+-       HTAB *hashp;
+-       PAGE16 *pagep;
+-       DBT *key, *val;
+-       int32_t ndx;
++__big_keydata(HTAB *hashp, PAGE16 *pagep, DBT *key, DBT *val, int32_t ndx)
+ {
+        ITEM_INFO ii;
+        PAGE16 *key_pagep;
+@@ -315,11 +304,8 @@ __get_bigkey(hashp, pagep, ndx, key)
+  * Return the big key and data indicated in item_info.
+  */
+ int32_t
+-__big_return(hashp, item_info, val, on_bigkey_page)
+-       HTAB *hashp;
+-       ITEM_INFO *item_info;
+-       DBT *val;
+-       int32_t on_bigkey_page;
++__big_return(HTAB *hashp, ITEM_INFO *item_info, DBT *val,
++            int32_t on_bigkey_page)
+ {
+        PAGE16 *pagep;
+        db_pgno_t next_pgno;
+@@ -366,11 +352,7 @@ __big_return(hashp, item_info, val, on_bigkey_page)
+  * Return total length of data; -1 if error.
+  */
+ static int32_t
+-collect_key(hashp, pagep, len, last_page)
+-       HTAB *hashp;
+-       PAGE16 *pagep;
+-       int32_t len;
+-       db_pgno_t *last_page;
++collect_key(HTAB *hashp, PAGE16 *pagep, int32_t len, db_pgno_t *last_page)
+ {
+        PAGE16 *next_pagep;
+        int32_t totlen, retval;
+@@ -434,10 +416,7 @@ collect_key(hashp, pagep, len, last_page)
+  * Return total length of data; -1 if error.
+  */
+ static int32_t
+-collect_data(hashp, pagep, len)
+-       HTAB *hashp;
+-       PAGE16 *pagep;
+-       int32_t len;
++collect_data(HTAB *hashp, PAGE16 *pagep, int32_t len)
+ {
+        PAGE16 *next_pagep;
+        int32_t totlen, retval;
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_func.c b/src/plugins/kdb/db2/libdb2/hash/hash_func.c
+index 1dee694..f169be6 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hash_func.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hash_func.c
+@@ -66,9 +66,7 @@ u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4;
+ 
+ #if 0
+ static u_int32_t
+-hash1(key, len)
+-       const void *key;
+-       size_t len;
++hash1(const void *key, size_t len)
+ {
+        u_int32_t h;
+        u_int8_t *k;
+@@ -88,9 +86,7 @@ hash1(key, len)
+ #define dcharhash(h, c)        ((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c))
+ 
+ static u_int32_t
+-hash2(key, len)
+-       const void *key;
+-       size_t len;
++hash2(const void *key, size_t len)
+ {
+        u_int32_t h;
+        u_int8_t *e, c, *k;
+@@ -116,9 +112,7 @@ hash2(key, len)
+  * Ozan Yigit's original sdbm hash.
+  */
+ static u_int32_t
+-hash3(key, len)
+-       const void *key;
+-       size_t len;
++hash3(const void *key, size_t len)
+ {
+        u_int32_t n, loop;
+        u_int8_t *k;
+@@ -159,9 +153,7 @@ hash3(key, len)
+ 
+ /* Chris Torek's hash function. */
+ static u_int32_t
+-hash4(key, len)
+-       const void *key;
+-       size_t len;
++hash4(const void *key, size_t len)
+ {
+        u_int32_t h, loop;
+        const u_int8_t *k;
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_log2.c b/src/plugins/kdb/db2/libdb2/hash/hash_log2.c
+index 8c710e5..7fdfd85 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hash_log2.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hash_log2.c
+@@ -44,8 +44,7 @@ static char sccsid[] = "@(#)hash_log2.c       8.4 (Berkeley) 11/7/95";
+ #include "extern.h"
+ 
+ u_int32_t
+-__kdb2_log2(num)
+-       u_int32_t num;
++__kdb2_log2(u_int32_t num)
+ {
+        u_int32_t i, limit;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_page.c b/src/plugins/kdb/db2/libdb2/hash/hash_page.c
+index 0da3571..dba29e0 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hash_page.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hash_page.c
+@@ -84,11 +84,8 @@ static void   account_page(HTAB *, db_pgno_t, int);
+ #endif
+ 
+ u_int32_t
+-__get_item(hashp, cursorp, key, val, item_info)
+-       HTAB *hashp;
+-       CURSOR *cursorp;
+-       DBT *key, *val;
+-       ITEM_INFO *item_info;
++__get_item(HTAB *hashp, CURSOR *cursorp, DBT *key, DBT *val,
++          ITEM_INFO *item_info)
+ {
+        db_pgno_t next_pgno;
+        int32_t i;
+@@ -159,9 +156,7 @@ __get_item(hashp, cursorp, key, val, item_info)
+ }
+ 
+ u_int32_t
+-__get_item_reset(hashp, cursorp)
+-       HTAB *hashp;
+-       CURSOR *cursorp;
++__get_item_reset(HTAB *hashp, CURSOR *cursorp)
+ {
+        if (cursorp->pagep)
+                __put_page(hashp, cursorp->pagep, A_RAW, 0);
+@@ -174,9 +169,7 @@ __get_item_reset(hashp, cursorp)
+ }
+ 
+ u_int32_t
+-__get_item_done(hashp, cursorp)
+-       HTAB *hashp;
+-       CURSOR *cursorp;
++__get_item_done(HTAB *hashp, CURSOR *cursorp)
+ {
+        if (cursorp->pagep)
+                __put_page(hashp, cursorp->pagep, A_RAW, 0);
+@@ -190,11 +183,8 @@ __get_item_done(hashp, cursorp)
+ }
+ 
+ u_int32_t
+-__get_item_first(hashp, cursorp, key, val, item_info)
+-       HTAB *hashp;
+-       CURSOR *cursorp;
+-       DBT *key, *val;
+-       ITEM_INFO *item_info;
++__get_item_first(HTAB *hashp, CURSOR *cursorp, DBT *key, DBT *val,
++                ITEM_INFO *item_info)
+ {
+        __get_item_reset(hashp, cursorp);
+        cursorp->bucket = 0;
+@@ -206,11 +196,8 @@ __get_item_first(hashp, cursorp, key, val, item_info)
+  * just returns the page number and index of the bigkey pointer pair.
+  */
+ u_int32_t
+-__get_item_next(hashp, cursorp, key, val, item_info)
+-       HTAB *hashp;
+-       CURSOR *cursorp;
+-       DBT *key, *val;
+-       ITEM_INFO *item_info;
++__get_item_next(HTAB *hashp, CURSOR *cursorp, DBT *key, DBT *val,
++               ITEM_INFO *item_info)
+ {
+        int status;
+ 
+@@ -224,9 +211,7 @@ __get_item_next(hashp, cursorp, key, val, item_info)
+  * Put a non-big pair on a page.
+  */
+ static void
+-putpair(p, key, val)
+-       PAGE8 *p;
+-       const DBT *key, *val;
++putpair(PAGE8 *p, const DBT *key, const DBT *val)
+ {
+        u_int16_t *pagep, n, off;
+ 
+@@ -275,10 +260,7 @@ prev_realkey(pagep, n)
+  *      -1 error
+  */
+ extern int32_t
+-__delpair(hashp, cursorp, item_info)
+-       HTAB *hashp;
+-       CURSOR *cursorp;
+-       ITEM_INFO *item_info;
++__delpair(HTAB *hashp, CURSOR *cursorp, ITEM_INFO *item_info)
+ {
+        PAGE16 *pagep;
+        indx_t ndx;
+@@ -412,9 +394,7 @@ __delpair(hashp, cursorp, item_info)
+ }
+ 
+ extern int32_t
+-__split_page(hashp, obucket, nbucket)
+-       HTAB *hashp;
+-       u_int32_t obucket, nbucket;
++__split_page(HTAB *hashp, u_int32_t obucket, u_int32_t nbucket)
+ {
+        DBT key, val;
+        ITEM_INFO old_ii, new_ii;
+@@ -661,9 +641,7 @@ add_bigptr(hashp, item_info, big_pgno)
+  *      NULL on error
+  */
+ extern PAGE16 *
+-__add_ovflpage(hashp, pagep)
+-       HTAB *hashp;
+-       PAGE16 *pagep;
++__add_ovflpage(HTAB *hashp, PAGE16 *pagep)
+ {
+        PAGE16 *new_pagep;
+        u_int16_t ovfl_num;
+@@ -768,10 +746,7 @@ page_init(hashp, pagep, pgno, type)
+ }
+ 
+ int32_t
+-__new_page(hashp, addr, addr_type)
+-       HTAB *hashp;
+-       u_int32_t addr;
+-       int32_t addr_type;
++__new_page(HTAB *hashp, u_int32_t addr, int32_t addr_type)
+ {
+        db_pgno_t paddr;
+        PAGE16 *pagep;
+@@ -804,10 +779,7 @@ __new_page(hashp, addr, addr_type)
+ }
+ 
+ int32_t
+-__delete_page(hashp, pagep, page_type)
+-       HTAB *hashp;
+-       PAGE16 *pagep;
+-       int32_t page_type;
++__delete_page(HTAB *hashp, PAGE16 *pagep, int32_t page_type)
+ {
+        if (page_type == A_OVFL)
+                __free_ovflpage(hashp, pagep);
+@@ -815,9 +787,7 @@ __delete_page(hashp, pagep, page_type)
+ }
+ 
+ static u_int8_t
+-is_bitmap_pgno(hashp, pgno)
+-       HTAB *hashp;
+-       db_pgno_t pgno;
++is_bitmap_pgno(HTAB *hashp, db_pgno_t pgno)
+ {
+        int32_t i;
+ 
+@@ -828,10 +798,7 @@ is_bitmap_pgno(hashp, pgno)
+ }
+ 
+ void
+-__pgin_routine(pg_cookie, pgno, page)
+-       void *pg_cookie;
+-       db_pgno_t pgno;
+-       void *page;
++__pgin_routine(void *pg_cookie, db_pgno_t pgno, void *page)
+ {
+        HTAB *hashp;
+        PAGE16 *pagep;
+@@ -868,10 +835,7 @@ __pgin_routine(pg_cookie, pgno, page)
+ }
+ 
+ void
+-__pgout_routine(pg_cookie, pgno, page)
+-       void *pg_cookie;
+-       db_pgno_t pgno;
+-       void *page;
++__pgout_routine(void *pg_cookie, db_pgno_t pgno, void *page)
+ {
+        HTAB *hashp;
+        PAGE16 *pagep;
+@@ -905,10 +869,7 @@ __pgout_routine(pg_cookie, pgno, page)
+  *      -1 ==>failure
+  */
+ extern int32_t
+-__put_page(hashp, pagep, addr_type, is_dirty)
+-       HTAB *hashp;
+-       PAGE16 *pagep;
+-       int32_t addr_type, is_dirty;
++__put_page(HTAB *hashp, PAGE16 *pagep, int32_t addr_type, int32_t is_dirty)
+ {
+ #if DEBUG_SLOW
+        account_page(hashp,
+@@ -924,10 +885,7 @@ __put_page(hashp, pagep, addr_type, is_dirty)
+  *      -1 indicates FAILURE
+  */
+ extern PAGE16 *
+-__get_page(hashp, addr, addr_type)
+-       HTAB *hashp;
+-       u_int32_t addr;
+-       int32_t addr_type;
++__get_page(HTAB *hashp, u_int32_t addr, int32_t addr_type)
+ {
+        PAGE16 *pagep;
+        db_pgno_t paddr;
+@@ -958,8 +916,7 @@ __get_page(hashp, addr, addr_type)
+ }
+ 
+ static void
+-swap_page_header_in(pagep)
+-       PAGE16 *pagep;
++swap_page_header_in(PAGE16 *pagep)
+ {
+        u_int32_t i;
+ 
+@@ -977,8 +934,7 @@ swap_page_header_in(pagep)
+ }
+ 
+ static void
+-swap_page_header_out(pagep)
+-       PAGE16 *pagep;
++swap_page_header_out(PAGE16 *pagep)
+ {
+        u_int32_t i;
+ 
+@@ -1001,9 +957,7 @@ swap_page_header_out(pagep)
+  * once they are read in.
+  */
+ extern int32_t
+-__ibitmap(hashp, pnum, nbits, ndx)
+-       HTAB *hashp;
+-       int32_t pnum, nbits, ndx;
++__ibitmap(HTAB *hashp, int32_t pnum, int32_t nbits, int32_t ndx)
+ {
+        u_int32_t *ip;
+        int32_t clearbytes, clearints;
+@@ -1027,8 +981,7 @@ __ibitmap(hashp, pnum, nbits, ndx)
+ }
+ 
+ static u_int32_t
+-first_free(map)
+-       u_int32_t map;
++first_free(u_int32_t map)
+ {
+        u_int32_t i, mask;
+ 
+@@ -1044,8 +997,7 @@ first_free(map)
+  * returns 0 on error
+  */
+ static u_int16_t
+-overflow_page(hashp)
+-       HTAB *hashp;
++overflow_page(HTAB *hashp)
+ {
+        u_int32_t *freep;
+        u_int32_t bit, first_page, free_bit, free_page, i, in_use_bits, j;
+@@ -1206,9 +1158,7 @@ found:
+ 
+ #ifdef DEBUG
+ int
+-bucket_to_page(hashp, n)
+-       HTAB *hashp;
+-       int n;
++bucket_to_page(HTAB *hashp, int n)
+ {
+        int ret_val;
+ 
+@@ -1219,9 +1169,7 @@ bucket_to_page(hashp, n)
+ }
+ 
+ int32_t
+-oaddr_to_page(hashp, n)
+-       HTAB *hashp;
+-       int n;
++oaddr_to_page(HTAB *hashp, int n)
+ {
+        int ret_val, temp;
+ 
+@@ -1234,9 +1182,7 @@ oaddr_to_page(hashp, n)
+ #endif /* DEBUG */
+ 
+ static indx_t
+-page_to_oaddr(hashp, pgno)
+-       HTAB *hashp;
+-       db_pgno_t pgno;
++page_to_oaddr(HTAB *hashp, db_pgno_t pgno)
+ {
+        int32_t sp, ret_val;
+ 
+@@ -1268,9 +1214,7 @@ page_to_oaddr(hashp, pgno)
+  * Mark this overflow page as free.
+  */
+ extern void
+-__free_ovflpage(hashp, pagep)
+-       HTAB *hashp;
+-       PAGE16 *pagep;
++__free_ovflpage(HTAB *hashp, PAGE16 *pagep)
+ {
+        u_int32_t *freep;
+        u_int32_t bit_address, free_page, free_bit;
+@@ -1307,9 +1251,7 @@ __free_ovflpage(hashp, pagep)
+ }
+ 
+ static u_int32_t *
+-fetch_bitmap(hashp, ndx)
+-       HTAB *hashp;
+-       int32_t ndx;
++fetch_bitmap(HTAB *hashp, int32_t ndx)
+ {
+        if (ndx >= hashp->nmaps)
+                return (NULL);
+@@ -1322,10 +1264,7 @@ fetch_bitmap(hashp, ndx)
+ 
+ #ifdef DEBUG_SLOW
+ static void
+-account_page(hashp, pgno, inout)
+-       HTAB *hashp;
+-       db_pgno_t pgno;
+-       int inout;
++account_page(HTAB *hashp, db_pgno_t pgno, int inout)
+ {
+        static struct {
+                db_pgno_t pgno;
+diff --git a/src/plugins/kdb/db2/libdb2/hash/hsearch.c b/src/plugins/kdb/db2/libdb2/hash/hsearch.c
+index 02ff7ef..ffcdfcf 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/hsearch.c
++++ b/src/plugins/kdb/db2/libdb2/hash/hsearch.c
+@@ -50,8 +50,7 @@ static DB *dbp = NULL;
+ static ENTRY retval;
+ 
+ extern int
+-hcreate(nel)
+-       u_int nel;
++hcreate(u_int nel)
+ {
+        HASHINFO info;
+ 
+@@ -66,9 +65,7 @@ hcreate(nel)
+ }
+ 
+ extern ENTRY *
+-hsearch(item, action)
+-       ENTRY item;
+-       ACTION action;
++hsearch(ENTRY item, ACTION action)
+ {
+        DBT key, val;
+        int status;
+@@ -98,7 +95,7 @@ hsearch(item, action)
+ }
+ 
+ extern void
+-hdestroy()
++hdestroy(void)
+ {
+        if (dbp) {
+                (void)(dbp->close)(dbp);
+diff --git a/src/plugins/kdb/db2/libdb2/mpool/mpool.c b/src/plugins/kdb/db2/libdb2/mpool/mpool.c
+index 0fcfd4a..028fb18 100644
+--- a/src/plugins/kdb/db2/libdb2/mpool/mpool.c
++++ b/src/plugins/kdb/db2/libdb2/mpool/mpool.c
+@@ -56,10 +56,7 @@ static int  mpool_write __P((MPOOL *, BKT *));
+  *     Initialize a memory pool.
+  */
+ MPOOL *
+-mpool_open(key, fd, pagesize, maxcache)
+-       void *key;
+-       int fd;
+-       db_pgno_t pagesize, maxcache;
++mpool_open(void *key, int fd, db_pgno_t pagesize, db_pgno_t maxcache)
+ {
+        struct stat sb;
+        MPOOL *mp;
+@@ -96,11 +93,8 @@ mpool_open(key, fd, pagesize, maxcache)
+  *     Initialize input/output filters.
+  */
+ void
+-mpool_filter(mp, pgin, pgout, pgcookie)
+-       MPOOL *mp;
+-       void (*pgin) __P((void *, db_pgno_t, void *));
+-       void (*pgout) __P((void *, db_pgno_t, void *));
+-       void *pgcookie;
++mpool_filter(MPOOL *mp, void (*pgin) __P((void *, db_pgno_t, void *)),
++            void (*pgout) __P((void *, db_pgno_t, void *)), void *pgcookie)
+ {
+        mp->pgin = pgin;
+        mp->pgout = pgout;
+@@ -112,10 +106,7 @@ mpool_filter(mp, pgin, pgout, pgcookie)
+  *     Get a new page of memory.
+  */
+ void *
+-mpool_new(mp, pgnoaddr, flags)
+-       MPOOL *mp;
+-       db_pgno_t *pgnoaddr;
+-       u_int flags;
++mpool_new(MPOOL *mp, db_pgno_t *pgnoaddr, u_int flags)
+ {
+        struct _hqh *head;
+        BKT *bp;
+@@ -149,9 +140,7 @@ mpool_new(mp, pgnoaddr, flags)
+ }
+ 
+ int
+-mpool_delete(mp, page)
+-       MPOOL *mp;
+-       void *page;
++mpool_delete(MPOOL *mp, void *page)
+ {
+        struct _hqh *head;
+        BKT *bp;
+@@ -180,10 +169,7 @@ mpool_delete(mp, page)
+  *     Get a page.
+  */
+ void *
+-mpool_get(mp, pgno, flags)
+-       MPOOL *mp;
+-       db_pgno_t pgno;
+-       u_int flags;                            /* XXX not used? */
++mpool_get(MPOOL *mp, db_pgno_t pgno, u_int flags)
+ {
+        struct _hqh *head;
+        BKT *bp;
+@@ -278,10 +264,7 @@ mpool_get(mp, pgno, flags)
+  *     Return a page.
+  */
+ int
+-mpool_put(mp, page, flags)
+-       MPOOL *mp;
+-       void *page;
+-       u_int flags;
++mpool_put(MPOOL *mp, void *page, u_int flags)
+ {
+        BKT *bp;
+ 
+@@ -307,8 +290,7 @@ mpool_put(mp, page, flags)
+  *     Close the buffer pool.
+  */
+ int
+-mpool_close(mp)
+-       MPOOL *mp;
++mpool_close(MPOOL *mp)
+ {
+        BKT *bp;
+ 
+@@ -328,8 +310,7 @@ mpool_close(mp)
+  *     Sync the pool to disk.
+  */
+ int
+-mpool_sync(mp)
+-       MPOOL *mp;
++mpool_sync(MPOOL *mp)
+ {
+        BKT *bp;
+ 
+@@ -348,8 +329,7 @@ mpool_sync(mp)
+  *     Get a page from the cache (or create one).
+  */
+ static BKT *
+-mpool_bkt(mp)
+-       MPOOL *mp;
++mpool_bkt(MPOOL *mp)
+ {
+        struct _hqh *head;
+        BKT *bp;
+@@ -407,9 +387,7 @@ new:        if ((bp = (BKT *)malloc(sizeof(BKT) + mp->pagesize)) == NULL)
+  *     Write a page to disk.
+  */
+ static int
+-mpool_write(mp, bp)
+-       MPOOL *mp;
+-       BKT *bp;
++mpool_write(MPOOL *mp, BKT *bp)
+ {
+        off_t off;
+ 
+@@ -451,9 +429,7 @@ mpool_write(mp, bp)
+  *     Lookup a page in the cache.
+  */
+ static BKT *
+-mpool_look(mp, pgno)
+-       MPOOL *mp;
+-       db_pgno_t pgno;
++mpool_look(MPOOL *mp, db_pgno_t pgno)
+ {
+        struct _hqh *head;
+        BKT *bp;
+@@ -478,8 +454,7 @@ mpool_look(mp, pgno)
+  *     Print out cache statistics.
+  */
+ void
+-mpool_stat(mp)
+-       MPOOL *mp;
++mpool_stat(MPOOL *mp)
+ {
+        BKT *bp;
+        int cnt;
+@@ -520,8 +495,7 @@ mpool_stat(mp)
+ }
+ #else
+ void
+-mpool_stat(mp)
+-       MPOOL *mp;
++mpool_stat(MPOOL *mp)
+ {
+ }
+ #endif
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_close.c b/src/plugins/kdb/db2/libdb2/recno/rec_close.c
+index 4ef4dd1..b858e5c 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_close.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_close.c
+@@ -59,8 +59,7 @@ static char sccsid[] = "@(#)rec_close.c       8.9 (Berkeley) 11/18/94";
+  *     RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_close(dbp)
+-       DB *dbp;
++__rec_close(DB *dbp)
+ {
+        BTREE *t;
+        int status;
+@@ -108,9 +107,7 @@ __rec_close(dbp)
+  *     RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__rec_sync(dbp, flags)
+-       const DB *dbp;
+-       u_int flags;
++__rec_sync(const DB *dbp, u_int flags)
+ {
+        struct iovec iov[2];
+        BTREE *t;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_delete.c b/src/plugins/kdb/db2/libdb2/recno/rec_delete.c
+index b69c9ad..7e574df 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_delete.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_delete.c
+@@ -61,10 +61,7 @@ static int rec_rdelete __P((BTREE *, recno_t));
+  *     RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
+  */
+ int
+-__rec_delete(dbp, key, flags)
+-       const DB *dbp;
+-       const DBT *key;
+-       u_int flags;
++__rec_delete(const DB *dbp, const DBT *key, u_int flags)
+ {
+        BTREE *t;
+        recno_t nrec;
+@@ -117,9 +114,7 @@ einval:             errno = EINVAL;
+  *     RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
+  */
+ static int
+-rec_rdelete(t, nrec)
+-       BTREE *t;
+-       recno_t nrec;
++rec_rdelete(BTREE *t, recno_t nrec)
+ {
+        EPG *e;
+        PAGE *h;
+@@ -151,10 +146,7 @@ rec_rdelete(t, nrec)
+  *     RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__rec_dleaf(t, h, idx)
+-       BTREE *t;
+-       PAGE *h;
+-       u_int32_t idx;
++__rec_dleaf(BTREE *t, PAGE *h, u_int32_t idx)
+ {
+        RLEAF *rl;
+        indx_t *ip, cnt, offset;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_get.c b/src/plugins/kdb/db2/libdb2/recno/rec_get.c
+index 230b2d4..c89cb55 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_get.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_get.c
+@@ -60,11 +60,7 @@ static char sccsid[] = "@(#)rec_get.c        8.9 (Berkeley) 8/18/94";
+  *     RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
+  */
+ int
+-__rec_get(dbp, key, data, flags)
+-       const DB *dbp;
+-       const DBT *key;
+-       DBT *data;
+-       u_int flags;
++__rec_get(const DB *dbp, const DBT *key, DBT *data, u_int flags)
+ {
+        BTREE *t;
+        EPG *e;
+@@ -119,9 +115,7 @@ __rec_get(dbp, key, data, flags)
+  *     RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_fpipe(t, top)
+-       BTREE *t;
+-       recno_t top;
++__rec_fpipe(BTREE *t, recno_t top)
+ {
+        DBT data;
+        recno_t nrec;
+@@ -175,9 +169,7 @@ __rec_fpipe(t, top)
+  *     RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_vpipe(t, top)
+-       BTREE *t;
+-       recno_t top;
++__rec_vpipe(BTREE *t, recno_t top)
+ {
+        DBT data;
+        recno_t nrec;
+@@ -232,9 +224,7 @@ __rec_vpipe(t, top)
+  *     RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_fmap(t, top)
+-       BTREE *t;
+-       recno_t top;
++__rec_fmap(BTREE *t, recno_t top)
+ {
+        DBT data;
+        recno_t nrec;
+@@ -282,9 +272,7 @@ __rec_fmap(t, top)
+  *     RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_vmap(t, top)
+-       BTREE *t;
+-       recno_t top;
++__rec_vmap(BTREE *t, recno_t top)
+ {
+        DBT data;
+        u_char *sp, *ep;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_open.c b/src/plugins/kdb/db2/libdb2/recno/rec_open.c
+index d8b26e7..acbf03d 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_open.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_open.c
+@@ -55,10 +55,8 @@ static char sccsid[] = "@(#)rec_open.c       8.12 (Berkeley) 11/18/94";
+ #include "recno.h"
+ 
+ DB *
+-__rec_open(fname, flags, mode, openinfo, dflags)
+-       const char *fname;
+-       int flags, mode, dflags;
+-       const RECNOINFO *openinfo;
++__rec_open(const char *fname, int flags, int mode, const RECNOINFO *openinfo,
++          int dflags)
+ {
+        BTREE *t;
+        BTREEINFO btopeninfo;
+@@ -226,8 +224,7 @@ err:        sverrno = errno;
+ }
+ 
+ int
+-__rec_fd(dbp)
+-       const DB *dbp;
++__rec_fd(const DB *dbp)
+ {
+        BTREE *t;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_put.c b/src/plugins/kdb/db2/libdb2/recno/rec_put.c
+index c53c957..8456f1d 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_put.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_put.c
+@@ -59,11 +59,7 @@ static char sccsid[] = "@(#)rec_put.c        8.7 (Berkeley) 8/18/94";
+  *     already in the tree and R_NOOVERWRITE specified.
+  */
+ int
+-__rec_put(dbp, key, data, flags)
+-       const DB *dbp;
+-       DBT *key;
+-       const DBT *data;
+-       u_int flags;
++__rec_put(const DB *dbp, DBT *key, const DBT *data, u_int flags)
+ {
+        BTREE *t;
+        DBT fdata, tdata;
+@@ -187,11 +183,7 @@ einval:            errno = EINVAL;
+  *     RET_ERROR, RET_SUCCESS
+  */
+ int
+-__rec_iput(t, nrec, data, flags)
+-       BTREE *t;
+-       recno_t nrec;
+-       const DBT *data;
+-       u_int flags;
++__rec_iput(BTREE *t, recno_t nrec, const DBT *data, u_int flags)
+ {
+        DBT tdata;
+        EPG *e;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_search.c b/src/plugins/kdb/db2/libdb2/recno/rec_search.c
+index 244d79f..55e5ba8 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_search.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_search.c
+@@ -61,10 +61,7 @@ static char sccsid[] = "@(#)rec_search.c     8.4 (Berkeley) 7/14/94";
+  *     the bt_cur field of the tree.  A pointer to the field is returned.
+  */
+ EPG *
+-__rec_search(t, recno, op)
+-       BTREE *t;
+-       recno_t recno;
+-       enum SRCHOP op;
++__rec_search(BTREE *t, recno_t recno, enum SRCHOP op)
+ {
+        indx_t idx;
+        PAGE *h;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_seq.c b/src/plugins/kdb/db2/libdb2/recno/rec_seq.c
+index 8af1378..cf48ea2 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_seq.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_seq.c
+@@ -58,10 +58,7 @@ static char sccsid[] = "@(#)rec_seq.c        8.3 (Berkeley) 7/14/94";
+  *     RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
+  */
+ int
+-__rec_seq(dbp, key, data, flags)
+-       const DB *dbp;
+-       DBT *key, *data;
+-       u_int flags;
++__rec_seq(const DB *dbp, DBT *key, DBT *data, u_int flags)
+ {
+        BTREE *t;
+        EPG *e;
+diff --git a/src/plugins/kdb/db2/libdb2/recno/rec_utils.c b/src/plugins/kdb/db2/libdb2/recno/rec_utils.c
+index f757a72..2eaa39b 100644
+--- a/src/plugins/kdb/db2/libdb2/recno/rec_utils.c
++++ b/src/plugins/kdb/db2/libdb2/recno/rec_utils.c
+@@ -59,11 +59,7 @@ static char sccsid[] = "@(#)rec_utils.c      8.6 (Berkeley) 7/16/94";
+  *     RET_SUCCESS, RET_ERROR.
+  */
+ int
+-__rec_ret(t, e, nrec, key, data)
+-       BTREE *t;
+-       EPG *e;
+-       recno_t nrec;
+-       DBT *key, *data;
++__rec_ret(BTREE *t, EPG *e, recno_t nrec, DBT *key, DBT *data)
+ {
+        RLEAF *rl;
+        void *p;
+diff --git a/src/plugins/kdb/db2/libdb2/test/dbtest.c b/src/plugins/kdb/db2/libdb2/test/dbtest.c
+index 5d76b1d..04bf34b 100644
+--- a/src/plugins/kdb/db2/libdb2/test/dbtest.c
++++ b/src/plugins/kdb/db2/libdb2/test/dbtest.c
+@@ -121,9 +121,7 @@ DB *XXdbp;                          /* Global for gdb. */
+ u_long XXlineno;                       /* Fast breakpoint for gdb. */
+ 
+ int
+-main(argc, argv)
+-       int argc;
+-       char *argv[];
++main(int argc, char *argv[])
+ {
+        extern int optind;
+        extern char *optarg;
+@@ -380,8 +378,7 @@ lkey:                       switch (command) {
+ #define        NOOVERWRITE     "put failed, would overwrite key\n"
+ 
+ void
+-compare(db1, db2)
+-       DBT *db1, *db2;
++compare(DBT *db1, DBT *db2)
+ {
+        size_t len;
+        u_char *p1, *p2;
+@@ -402,9 +399,7 @@ compare(db1, db2)
+ }
+ 
+ void
+-get(dbp, kp)
+-       DB *dbp;
+-       DBT *kp;
++get(DB *dbp, DBT *kp)
+ {
+        DBT data;
+ 
+@@ -437,9 +432,7 @@ get(dbp, kp)
+ }
+ 
+ void
+-getdata(dbp, kp, dp)
+-       DB *dbp;
+-       DBT *kp, *dp;
++getdata(DB *dbp, DBT *kp, DBT *dp)
+ {
+        switch (dbp->get(dbp, kp, dp, flags)) {
+        case 0:
+@@ -454,9 +447,7 @@ getdata(dbp, kp, dp)
+ }
+ 
+ void
+-put(dbp, kp, dp)
+-       DB *dbp;
+-       DBT *kp, *dp;
++put(DB *dbp, DBT *kp, DBT *dp)
+ {
+        switch (dbp->put(dbp, kp, dp, flags)) {
+        case 0:
+@@ -473,9 +464,7 @@ put(dbp, kp, dp)
+ }
+ 
+ void
+-rem(dbp, kp)
+-       DB *dbp;
+-       DBT *kp;
++rem(DB *dbp, DBT *kp)
+ {
+        switch (dbp->del(dbp, kp, flags)) {
+        case 0:
+@@ -502,8 +491,7 @@ rem(dbp, kp)
+ }
+ 
+ void
+-synk(dbp)
+-       DB *dbp;
++synk(DB *dbp)
+ {
+        switch (dbp->sync(dbp, flags)) {
+        case 0:
+@@ -515,9 +503,7 @@ synk(dbp)
+ }
+ 
+ void
+-seq(dbp, kp)
+-       DB *dbp;
+-       DBT *kp;
++seq(DB *dbp, DBT *kp)
+ {
+        DBT data;
+ 
+@@ -551,10 +537,7 @@ seq(dbp, kp)
+ }
+ 
+ void
+-dump(dbp, rev, recurse)
+-       DB *dbp;
+-       int rev;
+-       int recurse;
++dump(DB *dbp, int rev, int recurse)
+ {
+        DBT key, data;
+        int lflags, nflags;
+@@ -588,8 +571,7 @@ done:       return;
+ }
+ 
+ void
+-unlinkpg(dbp)
+-       DB *dbp;
++unlinkpg(DB *dbp)
+ {
+        BTREE *t = dbp->internal;
+        PAGE *h = NULL;
+@@ -623,8 +605,7 @@ cleanup:
+ }
+ 
+ u_int
+-setflags(s)
+-       char *s;
++setflags(char *s)
+ {
+        char *p;
+ 
+@@ -648,8 +629,7 @@ setflags(s)
+ }
+ 
+ char *
+-sflags(lflags)
+-       int lflags;
++sflags(int lflags)
+ {
+        switch (lflags) {
+        case R_CURSOR:          return ("R_CURSOR");
+@@ -667,8 +647,7 @@ sflags(lflags)
+ }
+ 
+ DBTYPE
+-dbtype(s)
+-       char *s;
++dbtype(char *s)
+ {
+        if (!strcmp(s, "btree"))
+                return (DB_BTREE);
+@@ -681,9 +660,7 @@ dbtype(s)
+ }
+ 
+ void *
+-setinfo(db_type, s)
+-       DBTYPE db_type;
+-       char *s;
++setinfo(DBTYPE db_type, char *s)
+ {
+        static BTREEINFO ib;
+        static HASHINFO ih;
+@@ -777,9 +754,7 @@ setinfo(db_type, s)
+ }
+ 
+ void *
+-rfile(name, lenp)
+-       char *name;
+-       size_t *lenp;
++rfile(char *name, size_t *lenp)
+ {
+        struct stat sb;
+        void *p;
+@@ -806,9 +781,7 @@ rfile(name, lenp)
+ }
+ 
+ void *
+-xmalloc(text, len)
+-       char *text;
+-       size_t len;
++xmalloc(char *text, size_t len)
+ {
+        void *p;
+ 
+diff --git a/src/plugins/kdb/db2/pol_xdr.c b/src/plugins/kdb/db2/pol_xdr.c
+index e857633..448d4b0 100644
+--- a/src/plugins/kdb/db2/pol_xdr.c
++++ b/src/plugins/kdb/db2/pol_xdr.c
+@@ -82,7 +82,7 @@ xdr_osa_policy_ent_rec(XDR *xdrs, osa_policy_ent_t objp)
+         if (!xdr_short(xdrs, &objp->n_tl_data))
+             return (FALSE);
+         if (!xdr_nulltype(xdrs, (void **) &objp->tl_data,
+-                          xdr_krb5_tl_data))
++                         (xdrproc_t)xdr_krb5_tl_data))
+             return FALSE;
+     }
+     return (TRUE);
+diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
+index 0b56ba8..7ddea92 100644
+--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
++++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
+@@ -186,8 +186,8 @@ static struct _cmd_table {
+  * The function cmd_lookup returns the structure matching the
+  * command name and returns NULL if nothing matches.
+  */
+-static struct _cmd_table *cmd_lookup(name)
+-    char *name;
++static struct _cmd_table *
++cmd_lookup(const char *name)
+ {
+     int i;
+ 
+diff --git a/src/plugins/kdb/lmdb/kdb_lmdb.c b/src/plugins/kdb/lmdb/kdb_lmdb.c
+index bd288e2..dbab796 100644
+--- a/src/plugins/kdb/lmdb/kdb_lmdb.c
++++ b/src/plugins/kdb/lmdb/kdb_lmdb.c
+@@ -468,13 +468,13 @@ error:
+ }
+ 
+ static krb5_error_code
+-klmdb_lib_init()
++klmdb_lib_init(void)
+ {
+     return 0;
+ }
+ 
+ static krb5_error_code
+-klmdb_lib_cleanup()
++klmdb_lib_cleanup(void)
+ {
+     return 0;
+ }
+diff --git a/src/plugins/kdb/test/kdb_test.c b/src/plugins/kdb/test/kdb_test.c
+index f4d4380..8d14091 100644
+--- a/src/plugins/kdb/test/kdb_test.c
++++ b/src/plugins/kdb/test/kdb_test.c
+@@ -312,13 +312,13 @@ make_strings(char **stringattrs, krb5_db_entry *ent)
+ }
+ 
+ static krb5_error_code
+-test_init()
++test_init(void)
+ {
+     return 0;
+ }
+ 
+ static krb5_error_code
+-test_cleanup()
++test_cleanup(void)
+ {
+     return 0;
+ }
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index cb9c796..4c81256 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -3450,7 +3450,7 @@ load_pkcs11_module(krb5_context context, const char *modname,
+     CK_RV (*getflist)(CK_FUNCTION_LIST_PTR_PTR);
+     struct errinfo einfo = EMPTY_ERRINFO;
+     const char *errmsg = NULL;
+-    void (*sym)();
++    void (*sym)(void);
+     long err;
+     CK_RV rv;
+ 
+@@ -3469,7 +3469,7 @@ load_pkcs11_module(krb5_context context, const char *modname,
+         goto error;
+     }
+ 
+-    getflist = (CK_RV (*)())sym;
++    getflist = (CK_RV (*)(CK_FUNCTION_LIST_PTR_PTR))sym;
+     rv = (*getflist)(p11p);
+     if (rv != CKR_OK) {
+         TRACE_PKINIT_PKCS11_GETFLIST_FAILED(context, pkcs11err(rv));
+diff --git a/src/plugins/preauth/spake/t_vectors.c b/src/plugins/preauth/spake/t_vectors.c
+index 2279202..983b305 100644
+--- a/src/plugins/preauth/spake/t_vectors.c
++++ b/src/plugins/preauth/spake/t_vectors.c
+@@ -464,7 +464,7 @@ run_test(const struct test *t)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     size_t i;
+ 
+diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
+index 926aa94..2fa6dce 100644
+--- a/src/tests/asn.1/krb5_decode_test.c
++++ b/src/tests/asn.1/krb5_decode_test.c
+@@ -54,9 +54,8 @@ static void ktest_free_reply_key_pack(krb5_context context,
+ static void ktest_free_kkdcp_message(krb5_context context,
+                                      krb5_kkdcp_message *val);
+ 
+-int main(argc, argv)
+-    int argc;
+-    char **argv;
++int
++main(int argc, char **argv)
+ {
+     krb5_data code;
+     krb5_error_code retval;
+diff --git a/src/tests/asn.1/krb5_encode_test.c b/src/tests/asn.1/krb5_encode_test.c
+index 26c064e..f4e754b 100644
+--- a/src/tests/asn.1/krb5_encode_test.c
++++ b/src/tests/asn.1/krb5_encode_test.c
+@@ -37,7 +37,7 @@ krb5_context test_context;
+ int error_count = 0;
+ int do_trval = 0;
+ int first_trval = 1;
+-int trval2();
++int trval2(FILE *, unsigned char *, int, int, int *);
+ 
+ static void
+ encoder_print_results(krb5_data *code, char *typestring, char *description)
+@@ -51,7 +51,7 @@ encoder_print_results(krb5_data *code, char *typestring, char *description)
+         else
+             printf("\n");
+         printf("encode_krb5_%s%s:\n", typestring, description);
+-        r = trval2(stdout, code->data, code->length, 0, &rlen);
++        r = trval2(stdout, (uint8_t *)code->data, code->length, 0, &rlen);
+         printf("\n");
+         if (rlen < 0 || (unsigned int) rlen != code->length) {
+             printf("Error: length mismatch: was %d, parsed %d\n",
+@@ -72,9 +72,8 @@ encoder_print_results(krb5_data *code, char *typestring, char *description)
+     ktest_destroy_data(&code);
+ }
+ 
+-static void PRS(argc, argv)
+-    int argc;
+-    char        **argv;
++static void
++PRS(int argc, char **argv)
+ {
+     extern char *optarg;
+     int optchar;
+@@ -107,9 +106,7 @@ static void PRS(argc, argv)
+ }
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char        **argv;
++main(int argc, char **argv)
+ {
+     krb5_data *code;
+     krb5_error_code retval;
+diff --git a/src/tests/asn.1/t_trval.c b/src/tests/asn.1/t_trval.c
+index 57d8253..009ed5b 100644
+--- a/src/tests/asn.1/t_trval.c
++++ b/src/tests/asn.1/t_trval.c
+@@ -36,7 +36,8 @@
+    -DSTANDALONE code.  */
+ #include "trval.c"
+ 
+-static void usage()
++static void
++usage(void)
+ {
+     fprintf(stderr, "Usage: trval [--types] [--krb5] [--krb5decode] [--hex] [-notypebytes] [file]\n");
+     exit(1);
+@@ -46,10 +47,8 @@ static void usage()
+  * Returns true if the option was selected.  Allow "-option" and
+  * "--option" syntax, since we used to accept only "-option"
+  */
+-static
+-int check_option(word, option)
+-    char *word;
+-    char *option;
++static int
++check_option(char *word, char *option)
+ {
+     if (word[0] != '-')
+         return 0;
+@@ -60,9 +59,8 @@ int check_option(word, option)
+     return 1;
+ }
+ 
+-int main(argc, argv)
+-    int argc;
+-    char **argv;
++int
++main(int argc, char **argv)
+ {
+     int optflg = 1;
+     FILE *fp;
+diff --git a/src/tests/asn.1/trval.c b/src/tests/asn.1/trval.c
+index c14bcde..e0e58cc 100644
+--- a/src/tests/asn.1/trval.c
++++ b/src/tests/asn.1/trval.c
+@@ -120,7 +120,8 @@ int trval2 (FILE *, unsigned char *, int, int, int *);
+ 
+ /****************************************************************************/
+ 
+-static int convert_nibble(int ch)
++static int
++convert_nibble(int ch)
+ {
+     if (isdigit(ch))
+         return (ch - '0');
+@@ -131,9 +132,8 @@ static int convert_nibble(int ch)
+     return -1;
+ }
+ 
+-int trval(fin, fout)
+-    FILE        *fin;
+-    FILE        *fout;
++int
++trval(FILE *fin, FILE *fout)
+ {
+     unsigned char *p;
+     unsigned int maxlen;
+@@ -169,12 +169,8 @@ int trval(fin, fout)
+     return(r);
+ }
+ 
+-int trval2(fp, enc, len, lev, rlen)
+-    FILE *fp;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
+-    int *rlen;
++int
++trval2(FILE *fp, unsigned char *enc, int len, int lev, int *rlen)
+ {
+     int l, eid, elen, xlen, r, rlen2 = 0;
+     int rlen_ext = 0;
+@@ -248,10 +244,8 @@ context_restart:
+     return(r);
+ }
+ 
+-int decode_len(fp, enc, len)
+-    FILE *fp;
+-    unsigned char *enc;
+-    int len;
++int
++decode_len(FILE *fp, unsigned char *enc, int len)
+ {
+     int rlen;
+     int i;
+@@ -270,12 +264,8 @@ int decode_len(fp, enc, len)
+ /*
+  * This is the printing function for bit strings
+  */
+-int do_prim_bitstring(fp, tag, enc, len, lev)
+-    FILE *fp;
+-    int tag;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
++int
++do_prim_bitstring(FILE *fp, int tag, unsigned char *enc, int len, int lev)
+ {
+     int i;
+     long        num = 0;
+@@ -297,12 +287,8 @@ int do_prim_bitstring(fp, tag, enc, len, lev)
+ /*
+  * This is the printing function for integers
+  */
+-int do_prim_int(fp, tag, enc, len, lev)
+-    FILE *fp;
+-    int tag;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
++int
++do_prim_int(FILE *fp, int tag, unsigned char *enc, int len, int lev)
+ {
+     int i;
+     long        num = 0;
+@@ -327,12 +313,8 @@ int do_prim_int(fp, tag, enc, len, lev)
+  * This is the printing function which we use if it's a string or
+  * other other type which is best printed as a string
+  */
+-int do_prim_string(fp, tag, enc, len, lev)
+-    FILE *fp;
+-    int tag;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
++int
++do_prim_string(FILE *fp, int tag, unsigned char *enc, int len, int lev)
+ {
+     int i;
+ 
+@@ -349,12 +331,8 @@ int do_prim_string(fp, tag, enc, len, lev)
+     return 1;
+ }
+ 
+-int do_prim(fp, tag, enc, len, lev)
+-    FILE *fp;
+-    int tag;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
++int
++do_prim(FILE *fp, int tag, unsigned char *enc, int len, int lev)
+ {
+     int n;
+     int i;
+@@ -396,12 +374,8 @@ int do_prim(fp, tag, enc, len, lev)
+     return(OK);
+ }
+ 
+-int do_cons(fp, enc, len, lev, rlen)
+-    FILE *fp;
+-    unsigned char *enc;
+-    int len;
+-    int lev;
+-    int *rlen;
++int
++do_cons(FILE *fp, unsigned char *enc, int len, int lev, int *rlen)
+ {
+     int n;
+     int r = 0;
+@@ -430,9 +404,8 @@ struct typestring_table {
+     int new_appl;
+ };
+ 
+-static char *lookup_typestring(table, key1, key2)
+-    struct typestring_table *table;
+-    int key1, key2;
++static char *
++lookup_typestring(struct typestring_table *table, int key1, int key2)
+ {
+     struct typestring_table *ent;
+ 
+@@ -700,10 +673,8 @@ struct typestring_table krb5_fields[] = {
+ };
+ #endif
+ 
+-void print_tag_type(fp, eid, lev)
+-    FILE *fp;
+-    int     eid;
+-    int     lev;
++void
++print_tag_type(FILE *fp, int eid, int lev)
+ {
+     int tag = eid & ID_TAG;
+     int do_space = 1;
+diff --git a/src/tests/conccache.c b/src/tests/conccache.c
+index 7b0ca63..9fe5305 100644
+--- a/src/tests/conccache.c
++++ b/src/tests/conccache.c
+@@ -110,7 +110,7 @@ refresh_cache(krb5_context context)
+ }
+ 
+ static pid_t
+-spawn_cred_subprocess()
++spawn_cred_subprocess(void)
+ {
+     krb5_context context;
+     pid_t pid;
+@@ -133,7 +133,7 @@ spawn_cred_subprocess()
+ }
+ 
+ static pid_t
+-spawn_refresh_subprocess()
++spawn_refresh_subprocess(void)
+ {
+     krb5_context context;
+     pid_t pid;
+diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c
+index 7c06666..61ca9f6 100644
+--- a/src/tests/create/kdb5_mkdums.c
++++ b/src/tests/create/kdb5_mkdums.c
+@@ -56,9 +56,7 @@ struct mblock {
+ int set_dbname_help (char *, char *);
+ 
+ static void
+-usage(who, status)
+-    char *who;
+-    int status;
++usage(char *who, int status)
+ {
+     fprintf(stderr,
+             "usage: %s -p prefix -n num_to_create [-d dbpathname] [-r realmname]\n",
+@@ -83,9 +81,7 @@ static krb5_boolean manual_mkey = FALSE;
+ void add_princ (krb5_context, char *);
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char *argv[];
++main(int argc, char *argv[])
+ {
+     extern char *optarg;
+     int optchar, i, n;
+@@ -209,9 +205,7 @@ main(argc, argv)
+ }
+ 
+ void
+-add_princ(context, str_newprinc)
+-    krb5_context          context;
+-    char                * str_newprinc;
++add_princ(krb5_context context, char *str_newprinc)
+ {
+     krb5_error_code       retval;
+     krb5_principal        newprinc;
+@@ -317,9 +311,7 @@ error: /* Do cleanup of newentry regardless of error */
+ }
+ 
+ int
+-set_dbname_help(pname, dbname)
+-    char *pname;
+-    char *dbname;
++set_dbname_help(char *pname, char *dbname)
+ {
+     krb5_error_code retval;
+     krb5_data pwd, scratch;
+diff --git a/src/tests/forward.c b/src/tests/forward.c
+index 7327cc9..90f359a 100644
+--- a/src/tests/forward.c
++++ b/src/tests/forward.c
+@@ -51,7 +51,7 @@ check(krb5_error_code code)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_ccache cc;
+     krb5_creds mcred, tgt, *fcred;
+diff --git a/src/tests/gss-threads/gss-client.c b/src/tests/gss-threads/gss-client.c
+index c0cf25d..8c006c2 100644
+--- a/src/tests/gss-threads/gss-client.c
++++ b/src/tests/gss-threads/gss-client.c
+@@ -68,7 +68,7 @@
+ static int verbose = 1;
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, "Usage: gss-client [-port port] [-mech mechanism] [-d]\n");
+     fprintf(stderr, "       [-seq] [-noreplay] [-nomutual]");
+@@ -134,7 +134,7 @@ get_server_info(char *host, u_short port)
+  * displayed and -1 is returned.
+  */
+ static int
+-connect_to_server()
++connect_to_server(void)
+ {
+     int s;
+ 
+diff --git a/src/tests/gss-threads/gss-server.c b/src/tests/gss-threads/gss-server.c
+index a9f980e..e0a3773 100644
+--- a/src/tests/gss-threads/gss-server.c
++++ b/src/tests/gss-threads/gss-server.c
+@@ -74,7 +74,7 @@
+ #endif
+ 
+ static void
+-usage()
++usage(void)
+ {
+     fprintf(stderr, "Usage: gss-server [-port port] [-verbose] [-once]");
+ #ifdef _WIN32
+diff --git a/src/tests/gssapi/reload.c b/src/tests/gssapi/reload.c
+index 4fe3565..00bda32 100644
+--- a/src/tests/gssapi/reload.c
++++ b/src/tests/gssapi/reload.c
+@@ -64,7 +64,7 @@ load_gssapi(void)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     void *support;
+ 
+diff --git a/src/tests/gssapi/t_add_cred.c b/src/tests/gssapi/t_add_cred.c
+index 68b37e3..7ab52d6 100644
+--- a/src/tests/gssapi/t_add_cred.c
++++ b/src/tests/gssapi/t_add_cred.c
+@@ -43,7 +43,7 @@
+ #include "common.h"
+ 
+ int
+-main()
++main(void)
+ {
+     OM_uint32 minor, major;
+     gss_cred_id_t cred1, cred2;
+diff --git a/src/tests/gssapi/t_enctypes.c b/src/tests/gssapi/t_enctypes.c
+index 3fd31e2..3325db7 100644
+--- a/src/tests/gssapi/t_enctypes.c
++++ b/src/tests/gssapi/t_enctypes.c
+@@ -47,7 +47,7 @@
+  */
+ 
+ static void
+-usage()
++usage(void)
+ {
+     errout("Usage: t_enctypes [-i initenctypes] [-a accenctypes] "
+            "targetname");
+diff --git a/src/tests/gssapi/t_invalid.c b/src/tests/gssapi/t_invalid.c
+index 882e163..c4a5a99 100644
+--- a/src/tests/gssapi/t_invalid.c
++++ b/src/tests/gssapi/t_invalid.c
+@@ -559,7 +559,7 @@ try_accept(void *value, size_t len)
+ 
+ /* Accept contexts using superficially valid but truncated encapsulations. */
+ static void
+-test_short_encapsulation()
++test_short_encapsulation(void)
+ {
+     /* Include just the initial application tag, to see if we overrun reading
+      * the sequence length. */
+diff --git a/src/tests/gssapi/t_oid.c b/src/tests/gssapi/t_oid.c
+index 1c9d394..6425313 100644
+--- a/src/tests/gssapi/t_oid.c
++++ b/src/tests/gssapi/t_oid.c
+@@ -129,7 +129,7 @@ oid_equal(gss_OID o1, gss_OID o2)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     size_t i;
+     OM_uint32 major, minor;
+diff --git a/src/tests/gssapi/t_spnego.c b/src/tests/gssapi/t_spnego.c
+index 2483228..4091739 100644
+--- a/src/tests/gssapi/t_spnego.c
++++ b/src/tests/gssapi/t_spnego.c
+@@ -195,7 +195,7 @@ test_mskrb_oid(gss_name_t tname, gss_cred_id_t acred)
+ /* Check that we return a compatibility NegTokenInit2 message containing
+  * NegHints for an empty initiator token. */
+ static void
+-test_neghints()
++test_neghints(void)
+ {
+     OM_uint32 major, minor;
+     gss_buffer_desc itok = GSS_C_EMPTY_BUFFER, atok;
+diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c
+index 8220fd9..76ef527 100644
+--- a/src/tests/hammer/kdc5_hammer.c
++++ b/src/tests/hammer/kdc5_hammer.c
+@@ -68,9 +68,7 @@ int get_tgt
+                   krb5_ccache);
+ 
+ static void
+-usage(who, status)
+-char *who;
+-int status;
++usage(char *who, int status)
+ {
+     fprintf(stderr,
+            "usage: %s -p prefix -n num_to_check [-c cachename] [-r realmname]\n",
+@@ -100,9 +98,7 @@ struct h_timer tgs_req_times = { 0.0, 1000000.0, -1.0, 0 };
+                                     tstart_time.tv_usec))/1000000.0)))
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char **argv;
++main(int argc, char **argv)
+ {
+     krb5_ccache ccache = NULL;
+     char *cache_name = NULL;           /* -f option */
+@@ -271,11 +267,8 @@ main(argc, argv)
+ 
+ 
+ static krb5_error_code
+-get_server_key(context, server, enctype, key)
+-    krb5_context context;
+-    krb5_principal server;
+-    krb5_enctype enctype;
+-    krb5_keyblock ** key;
++get_server_key(krb5_context context, krb5_principal server,
++              krb5_enctype enctype, krb5_keyblock **key)
+ {
+     krb5_error_code retval;
+     krb5_encrypt_block eblock;
+@@ -311,15 +304,10 @@ cleanup_salt:
+     return retval;
+ }
+ 
+-int verify_cs_pair(context, p_client_str, p_client, service, hostname,
+-                  p_num, c_depth, s_depth, ccache)
+-    krb5_context context;
+-    char *p_client_str;
+-    krb5_principal p_client;
+-    char * service;
+-    char * hostname;
+-    int p_num, c_depth, s_depth;
+-    krb5_ccache ccache;
++int
++verify_cs_pair(krb5_context context, char *p_client_str,
++              krb5_principal p_client, char *service, char *hostname,
++              int p_num, int c_depth, int s_depth, krb5_ccache ccache)
+ {
+     krb5_error_code      retval;
+     krb5_creds                   creds;
+@@ -433,11 +421,9 @@ cleanup:
+     return retval;
+ }
+ 
+-int get_tgt (context, p_client_str, p_client, ccache)
+-    krb5_context context;
+-    char *p_client_str;
+-    krb5_principal *p_client;
+-    krb5_ccache ccache;
++int
++get_tgt(krb5_context context, char *p_client_str, krb5_principal *p_client,
++       krb5_ccache ccache)
+ {
+     long lifetime = KRB5_DEFAULT_LIFE; /* -l option */
+     krb5_error_code code;
+diff --git a/src/tests/kdbtest.c b/src/tests/kdbtest.c
+index 3f61f3e..6459c33 100644
+--- a/src/tests/kdbtest.c
++++ b/src/tests/kdbtest.c
+@@ -271,7 +271,7 @@ iter_pol_handler(void *data, osa_policy_ent_t pol)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_db_entry *ent;
+     osa_policy_ent_t pol;
+diff --git a/src/tests/misc/test_getpw.c b/src/tests/misc/test_getpw.c
+index 6031e15..59ff5d3 100644
+--- a/src/tests/misc/test_getpw.c
++++ b/src/tests/misc/test_getpw.c
+@@ -32,7 +32,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ 
+-int main()
++int main(void)
+ {
+     uid_t my_uid;
+     struct passwd *pwd, pwx;
+diff --git a/src/tests/plugorder.c b/src/tests/plugorder.c
+index e1245e4..a2b7e34 100644
+--- a/src/tests/plugorder.c
++++ b/src/tests/plugorder.c
+@@ -77,7 +77,7 @@ blt3(krb5_context context, int maj_ver, int min_ver, krb5_plugin_vtable vtable)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     krb5_plugin_initvt_fn *modules = NULL, *mod;
+     struct krb5_pwqual_vtable_st vt;
+diff --git a/src/tests/shlib/t_loader.c b/src/tests/shlib/t_loader.c
+index 29481a7..203f023 100644
+--- a/src/tests/shlib/t_loader.c
++++ b/src/tests/shlib/t_loader.c
+@@ -180,7 +180,7 @@ static void do_close(void *libhandle)
+ 
+ #endif
+ 
+-int main()
++int main(void)
+ {
+     void *celib, *k5lib, *gsslib, *celib2;
+ 
+diff --git a/src/tests/softpkcs11/main.c b/src/tests/softpkcs11/main.c
+index 82b05ff..908f926 100644
+--- a/src/tests/softpkcs11/main.c
++++ b/src/tests/softpkcs11/main.c
+@@ -860,7 +860,7 @@ func_not_supported(void)
+ }
+ 
+ static char *
+-get_rcfilename()
++get_rcfilename(void)
+ {
+     struct passwd *pw;
+     const char *home = NULL;
+diff --git a/src/tests/t_inetd.c b/src/tests/t_inetd.c
+index d22cf31..3790467 100644
+--- a/src/tests/t_inetd.c
++++ b/src/tests/t_inetd.c
+@@ -59,16 +59,15 @@
+ 
+ char *progname;
+ 
+-static void usage()
++static void
++usage(void)
+ {
+     fprintf(stderr, "%s: port program argv0 argv1 ...\n", progname);
+     exit(1);
+ }
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char **argv;
++main(int argc, char **argv)
+ {
+     unsigned short port;
+     char *path;
+diff --git a/src/tests/test1.c b/src/tests/test1.c
+index aed656e..b213a34 100644
+--- a/src/tests/test1.c
++++ b/src/tests/test1.c
+@@ -31,7 +31,7 @@ unsigned char key_two[8] = { 0xea, 0x89, 0x57, 0x76, 0x5b, 0xcd, 0x0d, 0x34 };
+ 
+ extern void dump_data();
+ 
+-tkt_test_1()
++tkt_test_1(void)
+ {
+     krb5_data *data;
+     krb5_ticket tk_in, *tk_out;
+@@ -185,7 +185,7 @@ tkt_test_1()
+ 
+ 
+ 
+-main()
++main(void)
+ {
+     krb5_init_ets();
+     tkt_test_1();
+diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c
+index 3b152ba..d53e92a 100644
+--- a/src/tests/verify/kdb5_verify.c
++++ b/src/tests/verify/kdb5_verify.c
+@@ -50,9 +50,7 @@ struct mblock {
+ int set_dbname_help (krb5_context, char *, char *);
+ 
+ static void
+-usage(who, status)
+-    char *who;
+-    int status;
++usage(char *who, int status)
+ {
+     fprintf(stderr,
+             "usage: %s -p prefix -n num_to_check [-d dbpathname] [-r realmname]\n",
+@@ -78,9 +76,7 @@ static krb5_boolean manual_mkey = FALSE;
+ int check_princ (krb5_context, char *);
+ 
+ int
+-main(argc, argv)
+-    int argc;
+-    char *argv[];
++main(int argc, char *argv[])
+ {
+     extern char *optarg;
+     int optchar, i, n;
+@@ -221,9 +217,7 @@ main(argc, argv)
+ }
+ 
+ int
+-check_princ(context, str_princ)
+-    krb5_context context;
+-    char * str_princ;
++check_princ(krb5_context context, char *str_princ)
+ {
+     krb5_error_code retval;
+     krb5_db_entry *kdbe = NULL;
+@@ -343,10 +337,7 @@ out:
+ }
+ 
+ int
+-set_dbname_help(context, pname, dbname)
+-    krb5_context context;
+-    char *pname;
+-    char *dbname;
++set_dbname_help(krb5_context context, char *pname, char *dbname)
+ {
+     krb5_error_code retval;
+     krb5_data pwd, scratch;
+diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c
+index 7dc02a3..13ad3af 100644
+--- a/src/util/et/error_message.c
++++ b/src/util/et/error_message.c
+@@ -82,7 +82,7 @@ void com_err_terminate(void)
+ #endif
+ 
+ static char *
+-get_thread_buffer ()
++get_thread_buffer(void)
+ {
+     char *cp;
+     cp = k5_getspecific(K5_KEY_COM_ERR);
+diff --git a/src/util/et/test_et.c b/src/util/et/test_et.c
+index 9faf10f..2002e5f 100644
+--- a/src/util/et/test_et.c
++++ b/src/util/et/test_et.c
+@@ -17,7 +17,8 @@ extern const char *error_table_name (errcode_t);
+ extern int sys_nerr;
+ #endif
+ 
+-int main()
++int
++main(void)
+ {
+     printf("Before initiating error table:\n\n");
+ #ifndef EXPORT_LIST
+diff --git a/src/util/profile/prof_init.c b/src/util/profile/prof_init.c
+index cc92248..077c852 100644
+--- a/src/util/profile/prof_init.c
++++ b/src/util/profile/prof_init.c
+@@ -103,7 +103,7 @@ init_load_module(const char *modspec, profile_t *ret_profile)
+     struct errinfo einfo = { 0 };
+     prf_lib_handle_t lib_handle = NULL;
+     struct plugin_file_handle *plhandle = NULL;
+-    void *cbdata = NULL, (*fptr)();
++    void *cbdata = NULL, (*fptr)(void);
+     int have_lock = 0, have_cbdata = 0;
+     struct profile_vtable vtable = { 1 };  /* Set minor_ver to 1, rest null. */
+     errcode_t err;
+diff --git a/src/util/profile/t_profile.c b/src/util/profile/t_profile.c
+index b0e715b..bffd115 100644
+--- a/src/util/profile/t_profile.c
++++ b/src/util/profile/t_profile.c
+@@ -72,7 +72,7 @@ write_file(const char *name, int nlines, ...)
+ /* Regression test for #2685 (profile iterator breaks when modifications
+  * made) */
+ static void
+-test_iterate()
++test_iterate(void)
+ {
+     profile_t p;
+     void *iter;
+@@ -129,7 +129,7 @@ test_iterate()
+  * global shared profiles list.
+  */
+ static void
+-test_shared()
++test_shared(void)
+ {
+     profile_t a, b;
+     struct utimbuf times;
+@@ -164,7 +164,7 @@ test_shared()
+ /* Regression test for #2950 (profile_clear_relation not reflected within
+  * handle where deletion is performed) */
+ static void
+-test_clear()
++test_clear(void)
+ {
+     profile_t p;
+     const char *names[] = { "test section 1", "quux", NULL };
+@@ -183,7 +183,7 @@ test_clear()
+ }
+ 
+ static void
+-test_include()
++test_include(void)
+ {
+     profile_t p;
+     const char *names[] = { "test section 1", "bar", NULL };
+@@ -237,7 +237,7 @@ test_include()
+ 
+ /* Test syntactic independence of included profile files. */
+ static void
+-test_independence()
++test_independence(void)
+ {
+     profile_t p;
+     const char *names1[] = { "sec1", "var", "a", NULL };
+@@ -264,7 +264,7 @@ test_independence()
+ 
+ /* Regression test for #7971 (deleted sections should not be iterable) */
+ static void
+-test_delete_section()
++test_delete_section(void)
+ {
+     profile_t p;
+     const char *sect[] = { "test section 1", NULL };
+@@ -290,7 +290,7 @@ test_delete_section()
+ /* Regression test for #7971 (profile_clear_relation() error with deleted node
+  * at end of value set) */
+ static void
+-test_delete_clear_relation()
++test_delete_clear_relation(void)
+ {
+     profile_t p;
+     const char *names[] = { "test section 1", "testkey", NULL };
+@@ -305,7 +305,7 @@ test_delete_clear_relation()
+ 
+ /* Test that order of relations is preserved if some relations are deleted. */
+ static void
+-test_delete_ordering()
++test_delete_ordering(void)
+ {
+     profile_t p;
+     const char *names[] = { "test section 1", "testkey", NULL };
+@@ -329,7 +329,7 @@ test_delete_ordering()
+ /* Regression test for #8431 (profile_flush_to_file erroneously changes flag
+  * state on source object) */
+ static void
+-test_flush_to_file()
++test_flush_to_file(void)
+ {
+     profile_t p;
+ 
+@@ -349,7 +349,7 @@ test_flush_to_file()
+ /* Regression test for #7863 (multiply-specified subsections should
+  * be merged) */
+ static void
+-test_merge_subsections()
++test_merge_subsections(void)
+ {
+     profile_t p;
+     const char *n1[] = { "test section 2", "child_section2", "child", NULL };
+@@ -374,7 +374,7 @@ test_merge_subsections()
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     test_iterate();
+     test_shared();
+diff --git a/src/util/profile/test_load.c b/src/util/profile/test_load.c
+index cb870ef..fe2d1e3 100644
+--- a/src/util/profile/test_load.c
++++ b/src/util/profile/test_load.c
+@@ -29,7 +29,7 @@
+ #include "prof_int.h"
+ 
+ int
+-main()
++main(void)
+ {
+     profile_t pr, pr2;
+     const char *files[] = { "./modtest.conf", NULL };
+diff --git a/src/util/profile/test_parse.c b/src/util/profile/test_parse.c
+index 9f2631e..0532254 100644
+--- a/src/util/profile/test_parse.c
++++ b/src/util/profile/test_parse.c
+@@ -11,9 +11,8 @@
+ 
+ void dump_profile (struct profile_node *root, int level);
+ 
+-int main(argc, argv)
+-    int     argc;
+-    char    **argv;
++int
++main(int argc, char **argv)
+ {
+     struct profile_node *root;
+     unsigned long retval;
+diff --git a/src/util/profile/test_profile.c b/src/util/profile/test_profile.c
+index 6f6fcc7..31b1063 100644
+--- a/src/util/profile/test_profile.c
++++ b/src/util/profile/test_profile.c
+@@ -19,8 +19,8 @@ const char *program_name = "test_profile";
+ #define PRINT_VALUE     1
+ #define PRINT_VALUES    2
+ 
+-static void do_batchmode(profile)
+-    profile_t       profile;
++static void
++do_batchmode(profile_t profile)
+ {
+     errcode_t       retval;
+     int             argc, ret;
+@@ -108,10 +108,8 @@ static void do_batchmode(profile)
+ 
+ }
+ 
+-
+-int main(argc, argv)
+-    int         argc;
+-    char        **argv;
++int
++main(int argc, char **argv)
+ {
+     profile_t   profile;
+     long        retval;
+diff --git a/src/util/profile/test_vtable.c b/src/util/profile/test_vtable.c
+index 9a0b227..a7b6f54 100644
+--- a/src/util/profile/test_vtable.c
++++ b/src/util/profile/test_vtable.c
+@@ -232,7 +232,8 @@ struct profile_vtable full_vtable = {
+     full_flush
+ };
+ 
+-int main()
++int
++main(void)
+ {
+     profile_t profile;
+     char **values, *str, *name, *value;
+diff --git a/src/util/ss/error.c b/src/util/ss/error.c
+index b5768a6..e5cd1b2 100644
+--- a/src/util/ss/error.c
++++ b/src/util/ss/error.c
+@@ -33,8 +33,8 @@
+ #include "com_err.h"
+ #include "copyright.h"
+ 
+-char * ss_name(sci_idx)
+-    int sci_idx;
++char *
++ss_name(int sci_idx)
+ {
+     ss_data *infop;
+ 
+@@ -50,7 +50,8 @@ char * ss_name(sci_idx)
+     }
+ }
+ 
+-void ss_error (int sci_idx, long code, const char * fmt, ...)
++void
++ss_error(int sci_idx, long code, const char *fmt, ...)
+ {
+     char *whoami;
+     va_list pvar;
+@@ -61,10 +62,8 @@ void ss_error (int sci_idx, long code, const char * fmt, ...)
+     va_end(pvar);
+ }
+ 
+-void ss_perror (sci_idx, code, msg) /* for compatibility */
+-    int sci_idx;
+-    long code;
+-    char const *msg;
++void
++ss_perror(int sci_idx, long code, char const *msg) /* for compatibility */
+ {
+     ss_error (sci_idx, code, "%s", msg);
+ }
+diff --git a/src/util/ss/execute_cmd.c b/src/util/ss/execute_cmd.c
+index c06ee56..065c241 100644
+--- a/src/util/ss/execute_cmd.c
++++ b/src/util/ss/execute_cmd.c
+@@ -52,11 +52,9 @@
+  * Notes:
+  */
+ 
+-static int check_request_table (rqtbl, argc, argv, sci_idx)
+-    ss_request_table *rqtbl;
+-    int argc;
+-    char *argv[];
+-    int sci_idx;
++static int
++check_request_table(ss_request_table *rqtbl, int argc, char *argv[],
++                    int sci_idx)
+ {
+     ss_request_entry *request;
+     ss_data *info;
+@@ -101,10 +99,8 @@ static int check_request_table (rqtbl, argc, argv, sci_idx)
+  * Notes:
+  */
+ 
+-static int really_execute_command (sci_idx, argc, argv)
+-    int sci_idx;
+-    int argc;
+-    char **argv[];
++static int
++really_execute_command(int sci_idx, int argc, char **argv[])
+ {
+     ss_request_table **rqtbl;
+     ss_data *info;
+@@ -135,9 +131,7 @@ static int really_execute_command (sci_idx, argc, argv)
+  */
+ 
+ int
+-ss_execute_command(sci_idx, argv)
+-    int sci_idx;
+-    char *argv[];
++ss_execute_command(int sci_idx, char *argv[])
+ {
+     unsigned int i, argc;
+     char **argp;
+@@ -172,9 +166,8 @@ ss_execute_command(sci_idx, argv)
+  * Notes:
+  */
+ 
+-int ss_execute_line (sci_idx, line_ptr)
+-    int sci_idx;
+-    char *line_ptr;
++int
++ss_execute_line(int sci_idx, char *line_ptr)
+ {
+     char **argv;
+     int argc, ret;
+diff --git a/src/util/ss/help.c b/src/util/ss/help.c
+index 6d333c9..747fde5 100644
+--- a/src/util/ss/help.c
++++ b/src/util/ss/help.c
+@@ -15,11 +15,8 @@
+ #include "copyright.h"
+ 
+ 
+-void ss_help (argc, argv, sci_idx, info_ptr)
+-    int argc;
+-    char const * const *argv;
+-    int sci_idx;
+-    pointer info_ptr;
++void
++ss_help(int argc, char const * const *argv, int sci_idx, pointer info_ptr)
+ {
+     char buffer[MAXPATHLEN];
+     char const *request_name;
+@@ -81,15 +78,11 @@ got_it:
+         ss_page_stdin();
+     default:
+         (void) close(fd); /* what can we do if it fails? */
+-#ifdef WAIT_USES_INT
+-        while (wait((int *)NULL) != child) {
+-#else
+-            while (wait((union wait *)NULL) != child) {
+-#endif
+-                /* do nothing if wrong pid */
+-            };
+-        }
++        while (wait(NULL) != child) {
++            /* do nothing if wrong pid */
++        };
+     }
++}
+ 
+ #ifndef USE_DIRENT_H
+ #include <sys/dir.h>
+@@ -97,60 +90,56 @@ got_it:
+ #include <dirent.h>
+ #endif
+ 
+-    void ss_add_info_dir(sci_idx, info_dir, code_ptr)
+-        int sci_idx;
+-    char *info_dir;
+-    int *code_ptr;
+-    {
+-        ss_data *info;
+-        DIR *d;
+-        int n_dirs;
+-        char **dirs;
++void
++ss_add_info_dir(int sci_idx, char *info_dir, int *code_ptr)
++{
++    ss_data *info;
++    DIR *d;
++    int n_dirs;
++    char **dirs;
+ 
+-        info = ss_info(sci_idx);
+-        if ((info_dir == NULL) || (*info_dir == '\0')) {
+-            *code_ptr = SS_ET_NO_INFO_DIR;
+-            return;
+-        }
+-        if ((d = opendir(info_dir)) == (DIR *)NULL) {
+-            *code_ptr = errno;
+-            return;
+-        }
+-        closedir(d);
+-        dirs = info->info_dirs;
+-        for (n_dirs = 0; dirs[n_dirs] != (char *)NULL; n_dirs++)
+-            ;               /* get number of non-NULL dir entries */
+-        dirs = (char **)realloc((char *)dirs,
+-                                (unsigned)(n_dirs + 2)*sizeof(char *));
+-        if (dirs == (char **)NULL) {
+-            info->info_dirs = (char **)NULL;
+-            *code_ptr = errno;
+-            return;
+-        }
+-        info->info_dirs = dirs;
+-        dirs[n_dirs + 1] = (char *)NULL;
+-        dirs[n_dirs] = strdup(info_dir);
+-        *code_ptr = 0;
++    info = ss_info(sci_idx);
++    if ((info_dir == NULL) || (*info_dir == '\0')) {
++        *code_ptr = SS_ET_NO_INFO_DIR;
++        return;
++    }
++    if ((d = opendir(info_dir)) == (DIR *)NULL) {
++        *code_ptr = errno;
++        return;
+     }
++    closedir(d);
++    dirs = info->info_dirs;
++    for (n_dirs = 0; dirs[n_dirs] != (char *)NULL; n_dirs++)
++        ;               /* get number of non-NULL dir entries */
++    dirs = (char **)realloc((char *)dirs,
++                            (unsigned)(n_dirs + 2)*sizeof(char *));
++    if (dirs == (char **)NULL) {
++        info->info_dirs = (char **)NULL;
++        *code_ptr = errno;
++        return;
++    }
++    info->info_dirs = dirs;
++    dirs[n_dirs + 1] = (char *)NULL;
++    dirs[n_dirs] = strdup(info_dir);
++    *code_ptr = 0;
++}
+ 
+-    void ss_delete_info_dir(sci_idx, info_dir, code_ptr)
+-        int sci_idx;
+-    char *info_dir;
+-    int *code_ptr;
+-    {
+-        char **i_d;
+-        char **info_dirs;
++void
++ss_delete_info_dir(int sci_idx, char *info_dir, int *code_ptr)
++{
++    char **i_d;
++    char **info_dirs;
+ 
+-        info_dirs = ss_info(sci_idx)->info_dirs;
+-        for (i_d = info_dirs; *i_d; i_d++) {
+-            if (!strcmp(*i_d, info_dir)) {
+-                while (*i_d) {
+-                    *i_d = *(i_d+1);
+-                    i_d++;
+-                }
+-                *code_ptr = 0;
+-                return;
++    info_dirs = ss_info(sci_idx)->info_dirs;
++    for (i_d = info_dirs; *i_d; i_d++) {
++        if (!strcmp(*i_d, info_dir)) {
++            while (*i_d) {
++                *i_d = *(i_d+1);
++                i_d++;
+             }
++            *code_ptr = 0;
++            return;
+         }
+-        *code_ptr = SS_ET_NO_INFO_DIR;
+     }
++    *code_ptr = SS_ET_NO_INFO_DIR;
++}
+diff --git a/src/util/ss/invocation.c b/src/util/ss/invocation.c
+index 378bc3e..7736c95 100644
+--- a/src/util/ss/invocation.c
++++ b/src/util/ss/invocation.c
+@@ -36,12 +36,10 @@
+    _ss_table[sci_idx], make sure you change the allocation routine to
+    not assume there are no null pointers in the middle of the
+    array.  */
+-int ss_create_invocation(subsystem_name, version_string, info_ptr,
+-                         request_table_ptr, code_ptr)
+-    char *subsystem_name, *version_string;
+-    char *info_ptr;
+-    ss_request_table *request_table_ptr;
+-    int *code_ptr;
++int
++ss_create_invocation(char *subsystem_name, char *version_string,
++                     char *info_ptr, ss_request_table *request_table_ptr,
++                     int *code_ptr)
+ {
+     int sci_idx;
+     ss_data *new_table;
+@@ -115,8 +113,7 @@ int ss_create_invocation(subsystem_name, version_string, info_ptr,
+ }
+ 
+ void
+-ss_delete_invocation(sci_idx)
+-    int sci_idx;
++ss_delete_invocation(int sci_idx)
+ {
+     ss_data *t;
+     int ignored_code;
+diff --git a/src/util/ss/list_rqs.c b/src/util/ss/list_rqs.c
+index c0882bf..8376e21 100644
+--- a/src/util/ss/list_rqs.c
++++ b/src/util/ss/list_rqs.c
+@@ -21,15 +21,8 @@ static char const twentyfive_spaces[26] =
+ static char const NL[2] = "\n";
+ 
+ void
+-ss_list_requests(argc, argv, sci_idx, info_ptr)
+-    int argc;
+-    const char * const *argv;
+-    int sci_idx;
+-#ifdef __STDC__
+-    void *info_ptr;
+-#else
+-    char *info_ptr;
+-#endif
++ss_list_requests(int argc, const char * const *argv, int sci_idx,
++                 void *info_ptr)
+ {
+     ss_request_entry *entry;
+     char const *const *name;
+diff --git a/src/util/ss/listen.c b/src/util/ss/listen.c
+index fe18475..79f258f 100644
+--- a/src/util/ss/listen.c
++++ b/src/util/ss/listen.c
+@@ -28,7 +28,8 @@ static jmp_buf listen_jmpb;
+ 
+ #ifdef NO_READLINE
+ /* Dumb replacement for readline when we don't have support for a real one. */
+-static char *readline(const char *prompt)
++static char *
++readline(const char *prompt)
+ {
+     struct termios termbuf;
+     char input[BUFSIZ];
+@@ -49,20 +50,21 @@ static char *readline(const char *prompt)
+ }
+ 
+ /* No-op replacement for add_history() when we have no readline support. */
+-static void add_history(const char *line)
++static void
++add_history(const char *line)
+ {
+ }
+ #endif
+ 
+-static void listen_int_handler(signo)
+-    int signo;
++static void
++listen_int_handler(int signo)
+ {
+     putc('\n', stdout);
+     longjmp(listen_jmpb, 1);
+ }
+ 
+-int ss_listen (sci_idx)
+-    int sci_idx;
++int
++ss_listen(int sci_idx)
+ {
+     char *cp;
+     ss_data *info;
+@@ -83,12 +85,12 @@ int ss_listen (sci_idx)
+     info->abort = 0;
+ 
+ #ifdef POSIX_SIGNALS
+-    csig.sa_handler = (void (*)())0;
++    csig.sa_handler = (void (*)(int))0;
+     sigemptyset(&nmask);
+     sigaddset(&nmask, SIGINT);
+     sigprocmask(SIG_BLOCK, &nmask, &omask);
+ #else
+-    sig_cont = (void (*)())0;
++    sig_cont = (void (*)(int))0;
+     mask = sigblock(sigmask(SIGINT));
+ #endif
+ 
+@@ -115,7 +117,7 @@ int ss_listen (sci_idx)
+         nsig.sa_handler = listen_int_handler;   /* fgets is not signal-safe */
+         osig = csig;
+         sigaction(SIGCONT, &nsig, &csig);
+-        if ((void (*)())csig.sa_handler==(void (*)())listen_int_handler)
++        if ((void (*)(int))csig.sa_handler==(void (*)(int))listen_int_handler)
+             csig = osig;
+ #else
+         old_sig_cont = sig_cont;
+@@ -166,20 +168,16 @@ egress:
+     return code;
+ }
+ 
+-void ss_abort_subsystem(sci_idx, code)
+-    int sci_idx;
+-    int code;
++void
++ss_abort_subsystem(int sci_idx, int code)
+ {
+     ss_info(sci_idx)->abort = 1;
+     ss_info(sci_idx)->exit_status = code;
+ 
+ }
+ 
+-void ss_quit(argc, argv, sci_idx, infop)
+-    int argc;
+-    char const * const *argv;
+-    int sci_idx;
+-    pointer infop;
++void
++ss_quit(int argc, char const * const *argv, int sci_idx, pointer infop)
+ {
+     ss_abort_subsystem(sci_idx, 0);
+ }
+diff --git a/src/util/ss/pager.c b/src/util/ss/pager.c
+index 3e47ed3..255c721 100644
+--- a/src/util/ss/pager.c
++++ b/src/util/ss/pager.c
+@@ -10,13 +10,13 @@
+ #include "copyright.h"
+ #include <errno.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <signal.h>
+ 
+ static char MORE[] = "more";
+ extern char *_ss_pager_name;
+-extern char *getenv();
+ 
+ /*
+  * this needs a *lot* of work....
+@@ -25,10 +25,10 @@ extern char *getenv();
+  * handle SIGINT sensibly
+  * allow finer control -- put-page-break-here
+  */
+-void ss_page_stdin();
++void ss_page_stdin(void);
+ 
+ #ifndef NO_FORK
+-int ss_pager_create()
++int ss_pager_create(void)
+ {
+     int filedes[2];
+ 
+@@ -56,7 +56,7 @@ int ss_pager_create()
+     }
+ }
+ #else /* don't fork */
+-int ss_pager_create()
++int ss_pager_create(void)
+ {
+     int fd;
+     fd = open("/dev/tty", O_WRONLY, 0);
+@@ -66,7 +66,7 @@ int ss_pager_create()
+ }
+ #endif
+ 
+-void ss_page_stdin()
++void ss_page_stdin(void)
+ {
+     int i;
+ #ifdef POSIX_SIGNALS
+diff --git a/src/util/ss/parse.c b/src/util/ss/parse.c
+index 78a831b..6fb031c 100644
+--- a/src/util/ss/parse.c
++++ b/src/util/ss/parse.c
+@@ -53,10 +53,8 @@ enum parse_mode { WHITESPACE, TOKEN, QUOTED_STRING };
+ #define NEW_ARGV(old,n) (char **)realloc((char *)old,                   \
+                                          (unsigned)(n+2)*sizeof(char*))
+ 
+-char **ss_parse (sci_idx, line_ptr, argc_ptr)
+-    int sci_idx;
+-    char *line_ptr;
+-    int *argc_ptr;
++char **
++ss_parse(int sci_idx, char *line_ptr, int *argc_ptr)
+ {
+     char **argv, *cp;
+     char **newargv;
+diff --git a/src/util/ss/prompt.c b/src/util/ss/prompt.c
+index 5aa2ad6..48e57d6 100644
+--- a/src/util/ss/prompt.c
++++ b/src/util/ss/prompt.c
+@@ -11,16 +11,13 @@
+ #include "ss_internal.h"
+ 
+ void
+-ss_set_prompt(sci_idx, new_prompt)
+-    int sci_idx;
+-    char *new_prompt;
++ss_set_prompt(int sci_idx, char *new_prompt)
+ {
+     ss_info(sci_idx)->prompt = new_prompt;
+ }
+ 
+ char *
+-ss_get_prompt(sci_idx)
+-    int sci_idx;
++ss_get_prompt(int sci_idx)
+ {
+     return(ss_info(sci_idx)->prompt);
+ }
+diff --git a/src/util/ss/request_tbl.c b/src/util/ss/request_tbl.c
+index 03cde1b..fc4461b 100644
+--- a/src/util/ss/request_tbl.c
++++ b/src/util/ss/request_tbl.c
+@@ -11,11 +11,7 @@
+ #define ssrt ss_request_table   /* for some readable code... */
+ 
+ void
+-ss_add_request_table(sci_idx, rqtbl_ptr, position, code_ptr)
+-    int sci_idx;
+-    ssrt *rqtbl_ptr;
+-    int position;           /* 1 -> becomes second... */
+-    int *code_ptr;
++ss_add_request_table(int sci_idx, ssrt *rqtbl_ptr, int position, int *code_ptr)
+ {
+     ss_data *info;
+     int i, size;
+@@ -44,10 +40,7 @@ ss_add_request_table(sci_idx, rqtbl_ptr, position, code_ptr)
+ }
+ 
+ void
+-ss_delete_request_table(sci_idx, rqtbl_ptr, code_ptr)
+-    int sci_idx;
+-    ssrt *rqtbl_ptr;
+-    int *code_ptr;
++ss_delete_request_table(int sci_idx, ssrt *rqtbl_ptr, int *code_ptr)
+ {
+     ss_data *info;
+     ssrt **rt1, **rt2;
+diff --git a/src/util/ss/requests.c b/src/util/ss/requests.c
+index aa6752f..651f220 100644
+--- a/src/util/ss/requests.c
++++ b/src/util/ss/requests.c
+@@ -9,7 +9,7 @@
+ #include <stdio.h>
+ #include "ss_internal.h"
+ 
+-#define DECLARE(name)   void name(argc,argv,sci_idx,info_ptr)int argc,sci_idx;const char * const *argv; pointer info_ptr;
++#define DECLARE(name)   void name(int argc, const char *const *argv, int sci_idx, pointer info_ptr)
+ 
+ /*
+  * ss_self_identify -- assigned by default to the "." request
+diff --git a/src/util/ss/ss.h b/src/util/ss/ss.h
+index 38d8974..faac0d9 100644
+--- a/src/util/ss/ss.h
++++ b/src/util/ss/ss.h
+@@ -48,7 +48,6 @@ typedef struct _ss_rp_options { /* DEFAULT VALUES */
+ void ss_help __SS_PROTO;
+ void ss_list_requests __SS_PROTO;
+ void ss_quit __SS_PROTO;
+-char *ss_current_request();
+ char *ss_name(int);
+ void ss_error (int, long, char const *, ...)
+ #if !defined(__cplusplus) && (__GNUC__ > 2)
+diff --git a/src/util/ss/ss_internal.h b/src/util/ss/ss_internal.h
+index 1f5ddff..cdd88af 100644
+--- a/src/util/ss/ss_internal.h
++++ b/src/util/ss/ss_internal.h
+@@ -84,8 +84,7 @@ typedef struct _ss_data {       /* init values */
+ #define ss_info(sci_idx)        (_ss_table[sci_idx])
+ #define ss_current_request(sci_idx,code_ptr)            \
+     (*code_ptr=0,ss_info(sci_idx)->current_request)
+-void ss_unknown_function();
+-void ss_delete_info_dir();
++void ss_delete_info_dir(int, char *, int *);
+ char **ss_parse (int, char *, int *);
+ ss_abbrev_info *ss_abbrev_initialize (char *, int *);
+ void ss_page_stdin (void);
+diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c
+index 0850565..253b118 100644
+--- a/src/util/support/plugins.c
++++ b/src/util/support/plugins.c
+@@ -240,13 +240,13 @@ krb5int_get_plugin_data(struct plugin_file_handle *h, const char *csymname,
+ 
+ long KRB5_CALLCONV
+ krb5int_get_plugin_func(struct plugin_file_handle *h, const char *csymname,
+-                        void (**sym_out)(), struct errinfo *ep)
++                        void (**sym_out)(void), struct errinfo *ep)
+ {
+     void *dptr = NULL;
+     long ret = get_sym(h, csymname, &dptr, ep);
+ 
+     if (!ret)
+-        *sym_out = (void (*)())dptr;
++        *sym_out = (void (*)(void))dptr;
+     return ret;
+ }
+ 
+@@ -552,7 +552,7 @@ krb5int_get_plugin_dir_func (struct plugin_dir_handle *dirhandle,
+                              struct errinfo *ep)
+ {
+     long err = 0;
+-    void (**p)() = NULL;
++    void (**p)(void) = NULL;
+     size_t count = 0;
+ 
+     /* XXX Do we need to add a leading "_" to the symbol name on any
+@@ -569,10 +569,10 @@ krb5int_get_plugin_dir_func (struct plugin_dir_handle *dirhandle,
+         int i = 0;
+ 
+         for (i = 0; !err && (dirhandle->files[i] != NULL); i++) {
+-            void (*sym)() = NULL;
++            void (*sym)(void) = NULL;
+ 
+             if (krb5int_get_plugin_func (dirhandle->files[i], symname, &sym, ep) == 0) {
+-                void (**newp)() = NULL;
++                void (**newp)(void) = NULL;
+ 
+                 count++;
+                 newp = realloc (p, ((count + 1) * sizeof (*p))); /* +1 for NULL */
+diff --git a/src/util/support/t_hashtab.c b/src/util/support/t_hashtab.c
+index f51abc4..d90d5d9 100644
+--- a/src/util/support/t_hashtab.c
++++ b/src/util/support/t_hashtab.c
+@@ -104,7 +104,7 @@ const uint64_t vectors[64] = {
+ };
+ 
+ static void
+-test_siphash()
++test_siphash(void)
+ {
+     uint8_t seq[64];
+     uint64_t k0, k1, hval;
+@@ -122,7 +122,7 @@ test_siphash()
+ }
+ 
+ static void
+-test_hashtab()
++test_hashtab(void)
+ {
+     int st;
+     struct k5_hashtab *ht;
+@@ -168,7 +168,7 @@ test_hashtab()
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     test_siphash();
+     test_hashtab();
+diff --git a/src/util/support/t_hex.c b/src/util/support/t_hex.c
+index a586a1b..40e6aa2 100644
+--- a/src/util/support/t_hex.c
++++ b/src/util/support/t_hex.c
+@@ -137,7 +137,8 @@ struct {
+     { "F8F9FAFBFCFDFEFF", "\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF", 8, 1 },
+ };
+ 
+-int main()
++int
++main(void)
+ {
+     size_t i;
+     char *hex;
+diff --git a/src/util/support/t_json.c b/src/util/support/t_json.c
+index 1f22924..bacca6f 100644
+--- a/src/util/support/t_json.c
++++ b/src/util/support/t_json.c
+@@ -86,7 +86,7 @@ check(int pred, const char *str)
+ }
+ 
+ static void
+-test_array()
++test_array(void)
+ {
+     k5_json_string v1;
+     k5_json_number v2;
+diff --git a/src/util/support/t_k5buf.c b/src/util/support/t_k5buf.c
+index 734b272..18e7e9b 100644
+--- a/src/util/support/t_k5buf.c
++++ b/src/util/support/t_k5buf.c
+@@ -54,7 +54,7 @@ check_buf(struct k5buf *buf, const char *name)
+ }
+ 
+ static void
+-test_basic()
++test_basic(void)
+ {
+     struct k5buf buf;
+     char storage[1024];
+@@ -76,7 +76,7 @@ test_basic()
+ }
+ 
+ static void
+-test_realloc()
++test_realloc(void)
+ {
+     struct k5buf buf;
+     char data[1024];
+@@ -132,7 +132,7 @@ test_realloc()
+ }
+ 
+ static void
+-test_overflow()
++test_overflow(void)
+ {
+     struct k5buf buf;
+     char storage[10];
+@@ -153,7 +153,7 @@ test_overflow()
+ }
+ 
+ static void
+-test_error()
++test_error(void)
+ {
+     struct k5buf buf;
+     char storage[1];
+@@ -173,7 +173,7 @@ test_error()
+ }
+ 
+ static void
+-test_truncate()
++test_truncate(void)
+ {
+     struct k5buf buf;
+ 
+@@ -188,7 +188,7 @@ test_truncate()
+ }
+ 
+ static void
+-test_binary()
++test_binary(void)
+ {
+     struct k5buf buf;
+     char data[] = { 'a', 0, 'b' }, *s;
+@@ -205,7 +205,7 @@ test_binary()
+ }
+ 
+ static void
+-test_fmt()
++test_fmt(void)
+ {
+     struct k5buf buf;
+     char storage[10], data[1024];
+@@ -246,7 +246,7 @@ test_fmt()
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     test_basic();
+     test_realloc();
+diff --git a/src/util/support/t_unal.c b/src/util/support/t_unal.c
+index f67cd31..6d097f0 100644
+--- a/src/util/support/t_unal.c
++++ b/src/util/support/t_unal.c
+@@ -2,7 +2,8 @@
+ #undef NDEBUG
+ #include "k5-platform.h"
+ 
+-int main ()
++int
++main(void)
+ {
+     /* Test some low-level assumptions the Kerberos code depends
+        on.  */
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-more-non-prototype-functions.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-more-non-prototype-functions.patch
new file mode 100644
index 0000000000..d4267b3bf7
--- /dev/null
+++ b/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-more-non-prototype-functions.patch
@@ -0,0 +1,862 @@
+From 5a9aa1607ff2bc94369c89f4c99725125b923977 Mon Sep 17 00:00:00 2001
+From: Arjun <pkillarjun@protonmail.com>
+Date: Thu, 9 May 2024 20:47:08 +0530
+Subject: [PATCH 1/2] Fix more non-prototype functions
+
+Add "void" designations to more function declarations and definitions
+not changed by commits 3ae9244cd021a75eba909d872a92c25db490714d and
+4b9d7f7c107f01a61600fddcd8cde3812d0366a2.
+
+[ghudson@mit.edu: change additional functions; split into two commits;
+rewrote commit message]
+
+Upstream-Status: Backport [https://github.com/krb5/krb5/commit/623d649ba852839ba4822934bad9f97c184bf3ab]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/ccapi/common/win/OldCC/ccutils.c          |  2 +-
+ src/ccapi/common/win/OldCC/ccutils.h          |  2 +-
+ src/ccapi/common/win/OldCC/util.h             |  2 +-
+ src/ccapi/common/win/win-utils.c              |  2 +-
+ src/ccapi/common/win/win-utils.h              |  4 +-
+ src/ccapi/lib/ccapi_context.h                 |  2 +-
+ src/ccapi/lib/win/dllmain.h                   |  2 +-
+ src/ccapi/server/ccs_server.c                 |  2 +-
+ src/ccapi/server/ccs_server.h                 |  2 +-
+ src/ccapi/server/win/WorkQueue.h              |  8 +--
+ src/ccapi/test/pingtest.c                     |  2 +-
+ src/include/gssrpc/netdb.h                    |  4 +-
+ src/include/port-sockets.h                    |  2 +-
+ src/kadmin/cli/getdate.y                      |  2 +-
+ src/kadmin/dbutil/kdb5_util.c                 |  2 +-
+ src/kprop/kprop.c                             |  2 +-
+ src/lib/crypto/crypto_tests/t_pkcs5.c         |  4 +-
+ src/lib/crypto/crypto_tests/vectors.c         | 10 ++--
+ src/lib/gssapi/generic/maptest.c              |  2 +-
+ src/lib/krb5/ccache/ccapi/stdcc.c             |  6 +-
+ src/lib/krb5/ccache/ccapi/winccld.c           |  9 ++-
+ src/lib/krb5/ccache/ccbase.c                  |  2 +-
+ src/lib/krb5/krb/bld_princ.c                  |  4 +-
+ src/lib/krb5/krb/conv_creds.c                 |  2 +-
+ src/lib/krb5/krb/init_ctx.c                   |  2 +-
+ src/lib/krb5/os/dnsglue.c                     |  4 +-
+ src/lib/krb5/os/localaddr.c                   |  6 +-
+ src/lib/rpc/getrpcent.c                       |  6 +-
+ src/lib/win_glue.c                            |  8 +--
+ src/plugins/kdb/db2/kdb_db2.c                 |  4 +-
+ src/plugins/kdb/db2/libdb2/hash/dbm.c         |  2 +-
+ .../kdb/ldap/libkdb_ldap/kdb_ldap_conn.c      |  4 +-
+ src/tests/threads/gss-perf.c                  |  4 +-
+ src/tests/threads/init_ctx.c                  |  2 +-
+ src/tests/threads/profread.c                  |  2 +-
+ src/tests/threads/t_rcache.c                  |  2 +-
+ src/util/et/com_err.c                         |  4 +-
+ src/util/et/error_message.c                   |  2 +-
+ src/util/profile/prof_file.c                  |  4 +-
+ src/util/support/secure_getenv.c              |  2 +-
+ src/windows/include/leashwin.h                | 60 +++++++++----------
+ 41 files changed, 100 insertions(+), 99 deletions(-)
+
+diff --git a/src/ccapi/common/win/OldCC/ccutils.c b/src/ccapi/common/win/OldCC/ccutils.c
+index 403c67e..7abaefa 100644
+--- a/src/ccapi/common/win/OldCC/ccutils.c
++++ b/src/ccapi/common/win/OldCC/ccutils.c
+@@ -30,7 +30,7 @@
+ #include "cci_debugging.h"
+ #include "util.h"
+ 
+-BOOL isNT() {
++BOOL isNT(void) {
+     OSVERSIONINFO osvi;
+     DWORD   status              = 0;
+     BOOL    bSupportedVersion   = FALSE;
+diff --git a/src/ccapi/common/win/OldCC/ccutils.h b/src/ccapi/common/win/OldCC/ccutils.h
+index 9da3d87..0fb7e14 100644
+--- a/src/ccapi/common/win/OldCC/ccutils.h
++++ b/src/ccapi/common/win/OldCC/ccutils.h
+@@ -33,7 +33,7 @@ extern "C" {
+ #define REPLY_SUFFIX    (char*)"reply"
+ #define LISTEN_SUFFIX   (char*)"listen"
+ 
+-BOOL    isNT();
++BOOL    isNT(void);
+ char*   allocEventName   (char* uuid, char* suffix);
+ HANDLE  createThreadEvent(char* uuid, char* suffix);
+ HANDLE  openThreadEvent  (char* uuid, char* suffix);
+diff --git a/src/ccapi/common/win/OldCC/util.h b/src/ccapi/common/win/OldCC/util.h
+index 45e069a..7ee5319 100644
+--- a/src/ccapi/common/win/OldCC/util.h
++++ b/src/ccapi/common/win/OldCC/util.h
+@@ -30,7 +30,7 @@
+ extern "C" {
+ #endif
+ 
+-BOOL isNT();
++BOOL isNT(void);
+ 
+ void*
+ user_allocate(
+diff --git a/src/ccapi/common/win/win-utils.c b/src/ccapi/common/win/win-utils.c
+index b49cca8..d9018a6 100644
+--- a/src/ccapi/common/win/win-utils.c
++++ b/src/ccapi/common/win/win-utils.c
+@@ -60,7 +60,7 @@ char* serverEndpoint(const char* user) {
+     return _serverEndpoint;
+     }
+ 
+-char* timestamp() {
++char* timestamp(void) {
+     SYSTEMTIME  _stime;
+     GetSystemTime(&_stime);
+     GetTimeFormat(LOCALE_SYSTEM_DEFAULT, 0, &_stime, "HH:mm:ss", _ts, sizeof(_ts)-1);
+diff --git a/src/ccapi/common/win/win-utils.h b/src/ccapi/common/win/win-utils.h
+index 41cab24..94d0a9f 100644
+--- a/src/ccapi/common/win/win-utils.h
++++ b/src/ccapi/common/win/win-utils.h
+@@ -50,6 +50,6 @@ char*                   clientEndpoint(const char* UUID);
+ char*                   serverEndpoint(const char* UUID);
+ extern unsigned char*   pszProtocolSequence;
+ 
+-char* timestamp();
++char* timestamp(void);
+ 
+-#endif // _win_utils_h
+\ No newline at end of file
++#endif // _win_utils_h
+diff --git a/src/ccapi/lib/ccapi_context.h b/src/ccapi/lib/ccapi_context.h
+index 51b8982..88f0ee8 100644
+--- a/src/ccapi/lib/ccapi_context.h
++++ b/src/ccapi/lib/ccapi_context.h
+@@ -79,7 +79,7 @@ cc_int32 ccapi_context_compare (cc_context_t  in_context,
+                                 cc_uint32    *out_equal);
+ 
+ #ifdef WIN32
+-void cci_thread_init__auxinit();
++void cci_thread_init__auxinit(void);
+ #endif
+ 
+ 
+diff --git a/src/ccapi/lib/win/dllmain.h b/src/ccapi/lib/win/dllmain.h
+index 8238566..28ca34e 100644
+--- a/src/ccapi/lib/win/dllmain.h
++++ b/src/ccapi/lib/win/dllmain.h
+@@ -32,7 +32,7 @@
+ extern "C" {          // we need to export the C interface
+ #endif
+ 
+-DWORD GetTlsIndex();
++DWORD GetTlsIndex(void);
+ 
+ #ifdef __cplusplus
+ }
+diff --git a/src/ccapi/server/ccs_server.c b/src/ccapi/server/ccs_server.c
+index 1fc8d2c..de74b71 100644
+--- a/src/ccapi/server/ccs_server.c
++++ b/src/ccapi/server/ccs_server.c
+@@ -402,7 +402,7 @@ cc_int32 ccs_server_send_reply (ccs_pipe_t     in_reply_pipe,
+ 
+ /* ------------------------------------------------------------------------ */
+ 
+-cc_uint64 ccs_server_client_count ()
++cc_uint64 ccs_server_client_count (void)
+ {
+     return ccs_client_array_count (g_client_array);
+ }
+diff --git a/src/ccapi/server/ccs_server.h b/src/ccapi/server/ccs_server.h
+index e920ad9..f71ab06 100644
+--- a/src/ccapi/server/ccs_server.h
++++ b/src/ccapi/server/ccs_server.h
+@@ -48,6 +48,6 @@ cc_int32 ccs_server_send_reply (ccs_pipe_t     in_reply_pipe,
+                                 cc_int32       in_reply_err,
+                                 k5_ipc_stream   in_reply_data);
+ 
+-cc_uint64 ccs_server_client_count ();
++cc_uint64 ccs_server_client_count (void);
+ 
+ #endif /* CCS_SERVER_H */
+diff --git a/src/ccapi/server/win/WorkQueue.h b/src/ccapi/server/win/WorkQueue.h
+index 68aa8b1..66a2960 100644
+--- a/src/ccapi/server/win/WorkQueue.h
++++ b/src/ccapi/server/win/WorkQueue.h
+@@ -29,14 +29,14 @@
+ #include "windows.h"
+ #include "ccs_pipe.h"
+ 
+-EXTERN_C    int worklist_initialize();
++EXTERN_C    int worklist_initialize(void);
+ 
+-EXTERN_C    int worklist_cleanup();
++EXTERN_C    int worklist_cleanup(void);
+ 
+ /* Wait for work to be added to the list (via worklist_add) from another thread */
+-EXTERN_C    void worklist_wait();
++EXTERN_C    void worklist_wait(void);
+ 
+-EXTERN_C    BOOL worklist_isEmpty();
++EXTERN_C    BOOL worklist_isEmpty(void);
+ 
+ EXTERN_C    int worklist_add(  const long          rpcmsg,
+                                 const ccs_pipe_t    pipe,
+diff --git a/src/ccapi/test/pingtest.c b/src/ccapi/test/pingtest.c
+index 0ffc15e..24327c2 100644
+--- a/src/ccapi/test/pingtest.c
++++ b/src/ccapi/test/pingtest.c
+@@ -23,7 +23,7 @@ extern cc_int32 cci_os_ipc_msg( cc_int32        in_launch_server,
+ 
+ static DWORD    dwTlsIndex;
+ 
+-DWORD GetTlsIndex()    {return dwTlsIndex;}
++DWORD GetTlsIndex(void)    {return dwTlsIndex;}
+ 
+ RPC_STATUS send_test(char* endpoint) {
+     unsigned char*  pszNetworkAddress   = NULL;
+diff --git a/src/include/gssrpc/netdb.h b/src/include/gssrpc/netdb.h
+index f933fbb..2f62edf 100644
+--- a/src/include/gssrpc/netdb.h
++++ b/src/include/gssrpc/netdb.h
+@@ -53,6 +53,8 @@ struct rpcent {
+ };
+ #endif /*STRUCT_RPCENT_IN_RPC_NETDB_H*/
+ 
+-struct rpcent *getrpcbyname(), *getrpcbynumber(), *getrpcent();
++struct rpcent *getrpcbyname(const char *name);
++struct rpcent *getrpcbynumber(int number);
++struct rpcent *getrpcent(void);
+ 
+ #endif
+diff --git a/src/include/port-sockets.h b/src/include/port-sockets.h
+index 57e5d1d..228e4cf 100644
+--- a/src/include/port-sockets.h
++++ b/src/include/port-sockets.h
+@@ -111,7 +111,7 @@ static __inline void TranslatedWSASetLastError(int posix_error)
+  * Translate Winsock errors to their POSIX counterparts.  This is necessary for
+  * MSVC 2010+, where both Winsock and POSIX errors are defined.
+  */
+-static __inline int TranslatedWSAGetLastError()
++static __inline int TranslatedWSAGetLastError(void)
+ {
+     int err = WSAGetLastError();
+     switch (err) {
+diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y
+index 3d69f0b..b69e26e 100644
+--- a/src/kadmin/cli/getdate.y
++++ b/src/kadmin/cli/getdate.y
+@@ -775,7 +775,7 @@ LookupWord(char *buff)
+ 
+ 
+ static int
+-yylex()
++yylex(void)
+ {
+     char               c;
+     char               *p;
+diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
+index 55d529f..3a07fd5 100644
+--- a/src/kadmin/dbutil/kdb5_util.c
++++ b/src/kadmin/dbutil/kdb5_util.c
+@@ -74,7 +74,7 @@ int exit_status = 0;
+ krb5_context util_context;
+ kadm5_config_params global_params;
+ 
+-void usage()
++void usage(void)
+ {
+     fprintf(stderr,
+             _("Usage: kdb5_util [-r realm] [-d dbname] "
+diff --git a/src/kprop/kprop.c b/src/kprop/kprop.c
+index 8f9fd69..e8f7feb 100644
+--- a/src/kprop/kprop.c
++++ b/src/kprop/kprop.c
+@@ -80,7 +80,7 @@ static void send_error(krb5_context context, krb5_creds *my_creds, int fd,
+                        char *err_text, krb5_error_code err_code);
+ static void update_last_prop_file(char *hostname, char *file_name);
+ 
+-static void usage()
++static void usage(void)
+ {
+     fprintf(stderr, _("\nUsage: %s [-r realm] [-f file] [-d] [-P port] "
+                       "[-s keytab] replica_host\n\n"), progname);
+diff --git a/src/lib/crypto/crypto_tests/t_pkcs5.c b/src/lib/crypto/crypto_tests/t_pkcs5.c
+index 8e87a80..f4bb33e 100644
+--- a/src/lib/crypto/crypto_tests/t_pkcs5.c
++++ b/src/lib/crypto/crypto_tests/t_pkcs5.c
+@@ -38,7 +38,7 @@ static void printdata (krb5_data *d) {
+     printhex (d->length, d->data);
+ }
+ 
+-static void test_pbkdf2_rfc3211()
++static void test_pbkdf2_rfc3211(void)
+ {
+     char x[100];
+     krb5_error_code err;
+@@ -92,7 +92,7 @@ static void test_pbkdf2_rfc3211()
+     }
+ }
+ 
+-int main ()
++int main(void)
+ {
+     test_pbkdf2_rfc3211();
+     return 0;
+diff --git a/src/lib/crypto/crypto_tests/vectors.c b/src/lib/crypto/crypto_tests/vectors.c
+index bcf5c91..314d5c7 100644
+--- a/src/lib/crypto/crypto_tests/vectors.c
++++ b/src/lib/crypto/crypto_tests/vectors.c
+@@ -56,7 +56,7 @@ static void printdata (krb5_data *d) { printhex (d->length, d->data); }
+ 
+ static void printkey (krb5_keyblock *k) { printhex (k->length, k->contents); }
+ 
+-static void test_nfold ()
++static void test_nfold (void)
+ {
+     int i;
+     static const struct {
+@@ -96,7 +96,7 @@ static void test_nfold ()
+    so try to generate them. */
+ 
+ static void
+-test_mit_des_s2k ()
++test_mit_des_s2k (void)
+ {
+     static const struct {
+         const char *pass;
+@@ -190,7 +190,7 @@ test_s2k (krb5_enctype enctype)
+     }
+ }
+ 
+-static void test_des3_s2k () { test_s2k (ENCTYPE_DES3_CBC_SHA1); }
++static void test_des3_s2k (void) { test_s2k (ENCTYPE_DES3_CBC_SHA1); }
+ 
+ static void
+ keyToData (krb5_keyblock *k, krb5_data *d)
+@@ -227,7 +227,7 @@ void DR (krb5_data *out, krb5_keyblock *in, const krb5_data *usage) {
+ #define KEYBYTES  21
+ #define KEYLENGTH 24
+ 
+-void test_dr_dk ()
++void test_dr_dk (void)
+ {
+     static const struct {
+         unsigned char keydata[KEYLENGTH];
+@@ -371,7 +371,7 @@ static void printk(const char *descr, krb5_keyblock *k) {
+ 
+ 
+ static void
+-test_pbkdf2()
++test_pbkdf2(void)
+ {
+     static struct {
+         int count;
+diff --git a/src/lib/gssapi/generic/maptest.c b/src/lib/gssapi/generic/maptest.c
+index 566d88c..ab3ed90 100644
+--- a/src/lib/gssapi/generic/maptest.c
++++ b/src/lib/gssapi/generic/maptest.c
+@@ -42,7 +42,7 @@ static void intprt(int v, FILE *f)
+ 
+ foo foo1;
+ 
+-int main ()
++int main (void)
+ {
+     elt v1 = { 1, 2 }, v2 = { 3, 4 };
+     const elt *vp;
+diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c
+index 427b329..9cd2ad3 100644
+--- a/src/lib/krb5/ccache/ccapi/stdcc.c
++++ b/src/lib/krb5/ccache/ccapi/stdcc.c
+@@ -101,7 +101,7 @@ krb5_cc_ops krb5_cc_stdcc_ops = {
+  * changes made.  We register a unique message type with which
+  * we'll communicate to all other processes.
+  */
+-static void cache_changed()
++static void cache_changed(void)
+ {
+     static unsigned int message = 0;
+ 
+@@ -112,7 +112,7 @@ static void cache_changed()
+ }
+ #else /* _WIN32 */
+ 
+-static void cache_changed()
++static void cache_changed(void)
+ {
+     return;
+ }
+@@ -242,7 +242,7 @@ static krb5_error_code stdccv3_setup (krb5_context context,
+ }
+ 
+ /* krb5_stdcc_shutdown is exported; use the old name */
+-void krb5_stdcc_shutdown()
++void krb5_stdcc_shutdown(void)
+ {
+     if (gCntrlBlock) { cc_context_release(gCntrlBlock); }
+     gCntrlBlock = NULL;
+diff --git a/src/lib/krb5/ccache/ccapi/winccld.c b/src/lib/krb5/ccache/ccapi/winccld.c
+index 8b2e90c..62b1bd7 100644
+--- a/src/lib/krb5/ccache/ccapi/winccld.c
++++ b/src/lib/krb5/ccache/ccapi/winccld.c
+@@ -18,8 +18,8 @@ extern const krb5_cc_ops krb5_fcc_ops;
+ 
+ static int krb5_win_ccdll_loaded = 0;
+ 
+-extern void krb5_win_ccdll_load();
+-extern int krb5_is_ccdll_loaded();
++extern void krb5_win_ccdll_load(krb5_context context);
++extern int krb5_is_ccdll_loaded(void);
+ 
+ /*
+  * return codes
+@@ -81,8 +81,7 @@ static int LoadFuncs(const char* dll_name, FUNC_INFO fi[],
+     return LF_OK;
+ }
+ 
+-void krb5_win_ccdll_load(context)
+-    krb5_context    context;
++void krb5_win_ccdll_load(krb5_context context)
+ {
+     krb5_cc_register(context, &krb5_fcc_ops, 0);
+     if (krb5_win_ccdll_loaded)
+@@ -93,7 +92,7 @@ void krb5_win_ccdll_load(context)
+     krb5_cc_dfl_ops = &krb5_cc_stdcc_ops; /* Use stdcc! */
+ }
+ 
+-int krb5_is_ccdll_loaded()
++int krb5_is_ccdll_loaded(void)
+ {
+     return krb5_win_ccdll_loaded;
+ }
+diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
+index 5a01320..696b681 100644
+--- a/src/lib/krb5/ccache/ccbase.c
++++ b/src/lib/krb5/ccache/ccbase.c
+@@ -614,7 +614,7 @@ k5_cccol_unlock(krb5_context context)
+ 
+ /* necessary to make reentrant locks play nice with krb5int_cc_finalize */
+ void
+-k5_cccol_force_unlock()
++k5_cccol_force_unlock(void)
+ {
+     /* sanity check */
+     if ((&cccol_lock)->refcount == 0) {
+diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c
+index ff8265a..701454f 100644
+--- a/src/lib/krb5/krb/bld_princ.c
++++ b/src/lib/krb5/krb/bld_princ.c
+@@ -170,13 +170,13 @@ const krb5_principal_data anon_princ = {
+ };
+ 
+ const krb5_data * KRB5_CALLCONV
+-krb5_anonymous_realm()
++krb5_anonymous_realm(void)
+ {
+     return &anon_realm_data;
+ }
+ 
+ krb5_const_principal KRB5_CALLCONV
+-krb5_anonymous_principal()
++krb5_anonymous_principal(void)
+ {
+     return &anon_princ;
+ }
+diff --git a/src/lib/krb5/krb/conv_creds.c b/src/lib/krb5/krb/conv_creds.c
+index 6f46088..8d0a317 100644
+--- a/src/lib/krb5/krb/conv_creds.c
++++ b/src/lib/krb5/krb/conv_creds.c
+@@ -55,7 +55,7 @@ krb524_convert_creds_kdc(krb5_context context, krb5_creds *v5creds,
+     return KRB524_KRB4_DISABLED;
+ }
+ 
+-void KRB5_CALLCONV krb524_init_ets ()
++void KRB5_CALLCONV krb524_init_ets (void)
+ {
+ }
+ #endif
+diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
+index a6c2bbe..8fd9403 100644
+--- a/src/lib/krb5/krb/init_ctx.c
++++ b/src/lib/krb5/krb/init_ctx.c
+@@ -66,7 +66,7 @@ static krb5_enctype default_enctype_list[] = {
+ };
+ 
+ #if (defined(_WIN32))
+-extern krb5_error_code krb5_vercheck();
++extern krb5_error_code krb5_vercheck(void);
+ extern void krb5_win_ccdll_load(krb5_context context);
+ #endif
+ 
+diff --git a/src/lib/krb5/os/dnsglue.c b/src/lib/krb5/os/dnsglue.c
+index 668a7a6..5da550c 100644
+--- a/src/lib/krb5/os/dnsglue.c
++++ b/src/lib/krb5/os/dnsglue.c
+@@ -439,7 +439,7 @@ cleanup:
+ }
+ 
+ char *
+-k5_primary_domain()
++k5_primary_domain(void)
+ {
+     return NULL;
+ }
+@@ -497,7 +497,7 @@ errout:
+ }
+ 
+ char *
+-k5_primary_domain()
++k5_primary_domain(void)
+ {
+     char *domain;
+     DECLARE_HANDLE(h);
+diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
+index 92d765f..4e9d07f 100644
+--- a/src/lib/krb5/os/localaddr.c
++++ b/src/lib/krb5/os/localaddr.c
+@@ -363,7 +363,7 @@ struct linux_ipv6_addr_list {
+     struct linux_ipv6_addr_list *next;
+ };
+ static struct linux_ipv6_addr_list *
+-get_linux_ipv6_addrs ()
++get_linux_ipv6_addrs (void)
+ {
+     struct linux_ipv6_addr_list *lst = 0;
+     FILE *f;
+@@ -1082,7 +1082,7 @@ static int print_addr (/*@unused@*/ void *dataptr, struct sockaddr *sa)
+     return 0;
+ }
+ 
+-int main ()
++int main (void)
+ {
+     int r;
+ 
+@@ -1417,7 +1417,7 @@ get_localaddrs (krb5_context context, krb5_address ***addr, int use_profile)
+  * by Robert Quinn
+  */
+ #if defined(_WIN32)
+-static struct hostent *local_addr_fallback_kludge()
++static struct hostent *local_addr_fallback_kludge(void)
+ {
+     static struct hostent   host;
+     static SOCKADDR_IN      addr;
+diff --git a/src/lib/rpc/getrpcent.c b/src/lib/rpc/getrpcent.c
+index ad6793f..b3d94bc 100644
+--- a/src/lib/rpc/getrpcent.c
++++ b/src/lib/rpc/getrpcent.c
+@@ -56,10 +56,10 @@ struct rpcdata {
+        char    line[BUFSIZ+1];
+        char    *domain;
+ } *rpcdata;
+-static struct rpcdata *get_rpcdata();
++static struct rpcdata *get_rpcdata(void);
+ 
+-static struct rpcent *interpret();
+-struct hostent *gethostent();
++static struct rpcent *interpret(void);
++struct hostent *gethostent(void);
+ 
+ static char RPCDB[] = "/etc/rpc";
+ 
+diff --git a/src/lib/win_glue.c b/src/lib/win_glue.c
+index d650cc3..011acda 100644
+--- a/src/lib/win_glue.c
++++ b/src/lib/win_glue.c
+@@ -6,7 +6,7 @@
+ #include "asn1_err.h"
+ #include "kdb5_err.h"
+ #include "profile.h"
+-extern void krb5_stdcc_shutdown();
++extern void krb5_stdcc_shutdown(void);
+ #endif
+ #ifdef GSSAPI
+ #include "gssapi/generic/gssapi_err_generic.h"
+@@ -233,7 +233,7 @@ static int CallVersionServer(app_title, app_version, app_ini, code_cover)
+ #endif
+ 
+ #ifdef TIMEBOMB
+-static krb5_error_code do_timebomb()
++static krb5_error_code do_timebomb(void)
+ {
+        char buf[1024];
+        long timeleft;
+@@ -276,7 +276,7 @@ static krb5_error_code do_timebomb()
+  * doesn't allow you to make messaging calls from LibMain.  So, we now
+  * do the timebomb/version server stuff from krb5_init_context().
+  */
+-krb5_error_code krb5_vercheck()
++krb5_error_code krb5_vercheck(void)
+ {
+        static int verchecked = 0;
+        if (verchecked)
+@@ -314,7 +314,7 @@ krb5_error_code krb5_vercheck()
+ 
+ static HINSTANCE hlibinstance;
+ 
+-HINSTANCE get_lib_instance()
++HINSTANCE get_lib_instance(void)
+ {
+     return hlibinstance;
+ }
+diff --git a/src/plugins/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c
+index 2c163d9..381228e 100644
+--- a/src/plugins/kdb/db2/kdb_db2.c
++++ b/src/plugins/kdb/db2/kdb_db2.c
+@@ -1165,13 +1165,13 @@ krb5_db2_set_lockmode(krb5_context context, krb5_boolean mode)
+  *     DAL API functions
+  */
+ krb5_error_code
+-krb5_db2_lib_init()
++krb5_db2_lib_init(void)
+ {
+     return 0;
+ }
+ 
+ krb5_error_code
+-krb5_db2_lib_cleanup()
++krb5_db2_lib_cleanup(void)
+ {
+     /* right now, no cleanup required */
+     return 0;
+diff --git a/src/plugins/kdb/db2/libdb2/hash/dbm.c b/src/plugins/kdb/db2/libdb2/hash/dbm.c
+index 2dca256..8e23d4c 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/dbm.c
++++ b/src/plugins/kdb/db2/libdb2/hash/dbm.c
+@@ -95,7 +95,7 @@ kdb2_fetch(datum key)
+ }
+ 
+ datum
+-kdb2_firstkey()
++kdb2_firstkey(void)
+ {
+        datum item;
+ 
+diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
+index cee4b7b..5e77d5e 100644
+--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
++++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
+@@ -314,13 +314,13 @@ krb5_ldap_rebind(krb5_ldap_context *ldap_context,
+  *     DAL API functions
+  */
+ krb5_error_code
+-krb5_ldap_lib_init()
++krb5_ldap_lib_init(void)
+ {
+     return 0;
+ }
+ 
+ krb5_error_code
+-krb5_ldap_lib_cleanup()
++krb5_ldap_lib_cleanup(void)
+ {
+     /* right now, no cleanup required */
+     return 0;
+diff --git a/src/tests/threads/gss-perf.c b/src/tests/threads/gss-perf.c
+index f3630c2..0ca6d84 100644
+--- a/src/tests/threads/gss-perf.c
++++ b/src/tests/threads/gss-perf.c
+@@ -78,7 +78,7 @@ static void usage (void) __attribute__((noreturn));
+ static void set_target (char *);
+ 
+ static void
+-usage ()
++usage (void)
+ {
+     fprintf (stderr, "usage: %s [ options ] service-name\n", prog);
+     fprintf (stderr, "  service-name\tGSSAPI host-based service name (e.g., 'host@FQDN')\n");
+@@ -249,7 +249,7 @@ do_accept (gss_buffer_desc *msg, int iter)
+ }
+ 
+ static gss_buffer_desc
+-do_init ()
++do_init (void)
+ {
+     OM_uint32 maj_stat, min_stat;
+     gss_ctx_id_t ctx = GSS_C_NO_CONTEXT;
+diff --git a/src/tests/threads/init_ctx.c b/src/tests/threads/init_ctx.c
+index 42619a9..dc3d417 100644
+--- a/src/tests/threads/init_ctx.c
++++ b/src/tests/threads/init_ctx.c
+@@ -57,7 +57,7 @@ static int do_pause;
+ static void usage (void) __attribute__((noreturn));
+ 
+ static void
+-usage ()
++usage (void)
+ {
+     fprintf (stderr, "usage: %s [ options ]\n", prog);
+     fprintf (stderr, "options:\n");
+diff --git a/src/tests/threads/profread.c b/src/tests/threads/profread.c
+index be28ba4..69bdb05 100644
+--- a/src/tests/threads/profread.c
++++ b/src/tests/threads/profread.c
+@@ -59,7 +59,7 @@ static int do_pause;
+ static void usage (void) __attribute__((noreturn));
+ 
+ static void
+-usage ()
++usage (void)
+ {
+     fprintf (stderr, "usage: %s [ options ]\n", prog);
+     fprintf (stderr, "options:\n");
+diff --git a/src/tests/threads/t_rcache.c b/src/tests/threads/t_rcache.c
+index 07c45cc..8121429 100644
+--- a/src/tests/threads/t_rcache.c
++++ b/src/tests/threads/t_rcache.c
+@@ -51,7 +51,7 @@ int n_threads = DEFAULT_N_THREADS;
+ int interval = DEFAULT_INTERVAL;
+ int *ip;
+ 
+-static void wait_for_tick ()
++static void wait_for_tick (void)
+ {
+     time_t now, next;
+     now = time(0);
+diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c
+index c1e3be7..2e74a4f 100644
+--- a/src/util/et/com_err.c
++++ b/src/util/et/com_err.c
+@@ -35,7 +35,7 @@ static /*@null@*/ et_old_error_hook_func com_err_hook = 0;
+ k5_mutex_t com_err_hook_lock = K5_MUTEX_PARTIAL_INITIALIZER;
+ 
+ #if defined(_WIN32)
+-BOOL  isGuiApp() {
++BOOL  isGuiApp(void) {
+     DWORD mypid;
+     HANDLE myprocess;
+     mypid = GetCurrentProcessId();
+@@ -161,7 +161,7 @@ et_old_error_hook_func set_com_err_hook (et_old_error_hook_func new_proc)
+     return x;
+ }
+ 
+-et_old_error_hook_func reset_com_err_hook ()
++et_old_error_hook_func reset_com_err_hook (void)
+ {
+     et_old_error_hook_func x;
+ 
+diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c
+index 13ad3af..94445a9 100644
+--- a/src/util/et/error_message.c
++++ b/src/util/et/error_message.c
+@@ -303,7 +303,7 @@ remove_error_table(const struct error_table *et)
+     return ENOENT;
+ }
+ 
+-int com_err_finish_init()
++int com_err_finish_init(void)
+ {
+     return CALL_INIT_FUNCTION(com_err_initialize);
+ }
+diff --git a/src/util/profile/prof_file.c b/src/util/profile/prof_file.c
+index aa951df..c10a368 100644
+--- a/src/util/profile/prof_file.c
++++ b/src/util/profile/prof_file.c
+@@ -509,11 +509,11 @@ void profile_dereference_data_locked(prf_data_t data)
+         profile_free_file_data(data);
+ }
+ 
+-void profile_lock_global()
++void profile_lock_global(void)
+ {
+     k5_mutex_lock(&g_shared_trees_mutex);
+ }
+-void profile_unlock_global()
++void profile_unlock_global(void)
+ {
+     k5_mutex_unlock(&g_shared_trees_mutex);
+ }
+diff --git a/src/util/support/secure_getenv.c b/src/util/support/secure_getenv.c
+index 6df0591..c9b34b6 100644
+--- a/src/util/support/secure_getenv.c
++++ b/src/util/support/secure_getenv.c
+@@ -68,7 +68,7 @@ static int elevated_privilege = 0;
+ MAKE_INIT_FUNCTION(k5_secure_getenv_init);
+ 
+ int
+-k5_secure_getenv_init()
++k5_secure_getenv_init(void)
+ {
+     int saved_errno = errno;
+ 
+diff --git a/src/windows/include/leashwin.h b/src/windows/include/leashwin.h
+index 08b9c7d..c85e6df 100644
+--- a/src/windows/include/leashwin.h
++++ b/src/windows/include/leashwin.h
+@@ -160,51 +160,51 @@ void Leash_reset_defaults(void);
+ #define GOOD_TICKETS 1
+ 
+ /* Leash Configuration functions - alters Current User Registry */
+-DWORD Leash_get_default_lifetime();
++DWORD Leash_get_default_lifetime(void);
+ DWORD Leash_set_default_lifetime(DWORD minutes);
+-DWORD Leash_reset_default_lifetime();
+-DWORD Leash_get_default_renew_till();
++DWORD Leash_reset_default_lifetime(void);
++DWORD Leash_get_default_renew_till(void);
+ DWORD Leash_set_default_renew_till(DWORD minutes);
+-DWORD Leash_reset_default_renew_till();
+-DWORD Leash_get_default_renewable();
++DWORD Leash_reset_default_renew_till(void);
++DWORD Leash_get_default_renewable(void);
+ DWORD Leash_set_default_renewable(DWORD onoff);
+-DWORD Leash_reset_default_renewable();
+-DWORD Leash_get_default_forwardable();
++DWORD Leash_reset_default_renewable(void);
++DWORD Leash_get_default_forwardable(void);
+ DWORD Leash_set_default_forwardable(DWORD onoff);
+-DWORD Leash_reset_default_forwardable();
+-DWORD Leash_get_default_noaddresses();
++DWORD Leash_reset_default_forwardable(void);
++DWORD Leash_get_default_noaddresses(void);
+ DWORD Leash_set_default_noaddresses(DWORD onoff);
+-DWORD Leash_reset_default_noaddresses();
+-DWORD Leash_get_default_proxiable();
++DWORD Leash_reset_default_noaddresses(void);
++DWORD Leash_get_default_proxiable(void);
+ DWORD Leash_set_default_proxiable(DWORD onoff);
+-DWORD Leash_reset_default_proxiable();
+-DWORD Leash_get_default_publicip();
++DWORD Leash_reset_default_proxiable(void);
++DWORD Leash_get_default_publicip(void);
+ DWORD Leash_set_default_publicip(DWORD ipv4addr);
+-DWORD Leash_reset_default_publicip();
+-DWORD Leash_get_hide_kinit_options();
++DWORD Leash_reset_default_publicip(void);
++DWORD Leash_get_hide_kinit_options(void);
+ DWORD Leash_set_hide_kinit_options(DWORD onoff);
+-DWORD Leash_reset_hide_kinit_options();
+-DWORD Leash_get_default_life_min();
++DWORD Leash_reset_hide_kinit_options(void);
++DWORD Leash_get_default_life_min(void);
+ DWORD Leash_set_default_life_min(DWORD minutes);
+-DWORD Leash_reset_default_life_min();
+-DWORD Leash_get_default_life_max();
++DWORD Leash_reset_default_life_min(void);
++DWORD Leash_get_default_life_max(void);
+ DWORD Leash_set_default_life_max(DWORD minutes);
+-DWORD Leash_reset_default_life_max();
+-DWORD Leash_get_default_renew_min();
++DWORD Leash_reset_default_life_max(void);
++DWORD Leash_get_default_renew_min(void);
+ DWORD Leash_set_default_renew_min(DWORD minutes);
+-DWORD Leash_reset_default_renew_min();
+-DWORD Leash_get_default_renew_max();
++DWORD Leash_reset_default_renew_min(void);
++DWORD Leash_get_default_renew_max(void);
+ DWORD Leash_set_default_renew_max(DWORD minutes);
+-DWORD Leash_reset_default_renew_max();
+-DWORD Leash_get_default_uppercaserealm();
++DWORD Leash_reset_default_renew_max(void);
++DWORD Leash_get_default_uppercaserealm(void);
+ DWORD Leash_set_default_uppercaserealm(DWORD onoff);
+-DWORD Leash_reset_default_uppercaserealm();
+-DWORD Leash_get_default_mslsa_import();
++DWORD Leash_reset_default_uppercaserealm(void);
++DWORD Leash_get_default_mslsa_import(void);
+ DWORD Leash_set_default_mslsa_import(DWORD onoffmatch);
+-DWORD Leash_reset_default_mslsa_import();
+-DWORD Leash_get_default_preserve_kinit_settings();
++DWORD Leash_reset_default_mslsa_import(void);
++DWORD Leash_get_default_preserve_kinit_settings(void);
+ DWORD Leash_set_default_preserve_kinit_settings(DWORD onoff);
+-DWORD Leash_reset_default_preserve_kinit_settings();
++DWORD Leash_reset_default_preserve_kinit_settings(void);
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0002-Avoid-strict-prototype-compiler-errors.patch b/meta-oe/recipes-connectivity/krb5/krb5/0002-Avoid-strict-prototype-compiler-errors.patch
new file mode 100644
index 0000000000..63072c790c
--- /dev/null
+++ b/meta-oe/recipes-connectivity/krb5/krb5/0002-Avoid-strict-prototype-compiler-errors.patch
@@ -0,0 +1,379 @@
+From 422c63a716a55da5c750396c0f215b5be9e060b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Steffen=20Kie=C3=9F?=
+ <steffen.kiess@cis.iti.uni-stuttgart.de>
+Date: Tue, 13 Feb 2024 18:39:27 +0100
+Subject: [PATCH 2/2] Avoid strict-prototype compiler errors
+
+Commit 4b9d7f7c107f01a61600fddcd8cde3812d0366a2 added the
+-Werror=strict-prototypes parameter to the build process, but left
+behind 28 function definitions using "()" instead of "(void)".  Most
+of these definitions could not cause compiler errors for various
+reasons (such as an accompanying prototype), but a few could cause
+errors in gcc depending on the build configuration.
+
+For consistency and safety, add "(void)" to all 28 definitions.
+
+[ghudson@mit.edu: rewrote commit message]
+
+Upstream-Status: Backport [https://github.com/krb5/krb5/commit/3ae9244cd021a75eba909d872a92c25db490714d]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/clients/kcpytkt/kcpytkt.c                      | 2 +-
+ src/clients/kdeltkt/kdeltkt.c                      | 2 +-
+ src/clients/kinit/kinit.c                          | 4 ++--
+ src/clients/kinit/kinit_kdb.c                      | 2 +-
+ src/clients/klist/klist.c                          | 4 ++--
+ src/kadmin/cli/kadmin.c                            | 2 +-
+ src/kadmin/dbutil/kdb5_util.c                      | 4 ++--
+ src/kdc/main.c                                     | 2 +-
+ src/kprop/kpropd.c                                 | 4 ++--
+ src/lib/crypto/builtin/enc_provider/aes.c          | 2 +-
+ src/lib/crypto/openssl/hmac.c                      | 2 +-
+ src/lib/krb5/ccache/t_memory.c                     | 4 ++--
+ src/lib/krb5/ccache/t_stdio.c                      | 4 ++--
+ src/plugins/kdb/db2/libdb2/btree/bt_debug.c        | 2 +-
+ src/plugins/kdb/db2/libdb2/btree/bt_open.c         | 4 ++--
+ src/plugins/kdb/db2/libdb2/hash/dbm.c              | 2 +-
+ src/plugins/kdb/db2/libdb2/test/btree.tests/main.c | 2 +-
+ src/plugins/kdb/db2/libdb2/test/dbtest.c           | 2 +-
+ src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 2 +-
+ src/plugins/tls/k5tls/openssl.c                    | 2 +-
+ src/tests/asn.1/make-vectors.c                     | 2 +-
+ 21 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/src/clients/kcpytkt/kcpytkt.c b/src/clients/kcpytkt/kcpytkt.c
+index 0b88022..f1d50e5 100644
+--- a/src/clients/kcpytkt/kcpytkt.c
++++ b/src/clients/kcpytkt/kcpytkt.c
+@@ -10,7 +10,7 @@ static char *prog;
+ static int quiet = 0;
+ 
+ static void
+-xusage()
++xusage(void)
+ {
+     fprintf(stderr, "xusage: %s [-c from_ccache] [-e etype] [-f flags] "
+             "dest_ccache service1 service2 ...\n", prog);
+diff --git a/src/clients/kdeltkt/kdeltkt.c b/src/clients/kdeltkt/kdeltkt.c
+index cd0bf63..66a32a8 100644
+--- a/src/clients/kdeltkt/kdeltkt.c
++++ b/src/clients/kdeltkt/kdeltkt.c
+@@ -10,7 +10,7 @@ static char *prog;
+ static int quiet = 0;
+ 
+ static void
+-xusage()
++xusage(void)
+ {
+     fprintf(stderr, "xusage: %s [-c ccache] [-e etype] [-f flags] service1 "
+             "service2 ...\n", prog);
+diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
+index 7a33ffa..b27b723 100644
+--- a/src/clients/kinit/kinit.c
++++ b/src/clients/kinit/kinit.c
+@@ -55,7 +55,7 @@ get_name_from_os(void)
+ #else /* HAVE_PWD_H */
+ #ifdef _WIN32
+ static char *
+-get_name_from_os()
++get_name_from_os(void)
+ {
+     static char name[1024];
+     DWORD name_size = sizeof(name);
+@@ -69,7 +69,7 @@ get_name_from_os()
+ }
+ #else /* _WIN32 */
+ static char *
+-get_name_from_os()
++get_name_from_os(void)
+ {
+     return NULL;
+ }
+diff --git a/src/clients/kinit/kinit_kdb.c b/src/clients/kinit/kinit_kdb.c
+index fbd174b..4e7cd50 100644
+--- a/src/clients/kinit/kinit_kdb.c
++++ b/src/clients/kinit/kinit_kdb.c
+@@ -69,7 +69,7 @@ kinit_kdb_init(krb5_context *pcontext, char *realm)
+ }
+ 
+ void
+-kinit_kdb_fini()
++kinit_kdb_fini(void)
+ {
+     kadm5_destroy(server_handle);
+ }
+diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
+index c797b16..27cf0ee 100644
+--- a/src/clients/klist/klist.c
++++ b/src/clients/klist/klist.c
+@@ -359,7 +359,7 @@ do_keytab(const char *name)
+ }
+ 
+ static void
+-list_all_ccaches()
++list_all_ccaches(void)
+ {
+     krb5_error_code ret;
+     krb5_ccache cache;
+@@ -451,7 +451,7 @@ show_all_ccaches(void)
+ }
+ 
+ static void
+-do_ccache()
++do_ccache(void)
+ {
+     krb5_error_code ret;
+     krb5_ccache cache;
+diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
+index 23b64b0..c1256f7 100644
+--- a/src/kadmin/cli/kadmin.c
++++ b/src/kadmin/cli/kadmin.c
+@@ -607,7 +607,7 @@ kadmin_startup(int argc, char *argv[], char **request_out, char ***args_out)
+ }
+ 
+ int
+-quit()
++quit(void)
+ {
+     kadm5_ret_t retval;
+ 
+diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
+index 3a07fd5..187428e 100644
+--- a/src/kadmin/dbutil/kdb5_util.c
++++ b/src/kadmin/dbutil/kdb5_util.c
+@@ -367,7 +367,7 @@ main(int argc, char *argv[])
+  * program is run).
+  */
+ static int
+-open_db_and_mkey()
++open_db_and_mkey(void)
+ {
+     krb5_error_code retval;
+     krb5_data scratch, pwd, seed;
+@@ -489,7 +489,7 @@ open_db_and_mkey()
+ #endif
+ 
+ int
+-quit()
++quit(void)
+ {
+     krb5_error_code retval;
+     static krb5_boolean finished = 0;
+diff --git a/src/kdc/main.c b/src/kdc/main.c
+index bfdfef5..ad1d1bf 100644
+--- a/src/kdc/main.c
++++ b/src/kdc/main.c
+@@ -854,7 +854,7 @@ write_pid_file(const char *path)
+ }
+ 
+ static void
+-finish_realms()
++finish_realms(void)
+ {
+     int i;
+ 
+diff --git a/src/kprop/kpropd.c b/src/kprop/kpropd.c
+index 1b530fc..b11f3a9 100644
+--- a/src/kprop/kpropd.c
++++ b/src/kprop/kpropd.c
+@@ -376,7 +376,7 @@ get_wildcard_addr(struct addrinfo **res)
+ }
+ 
+ static void
+-do_standalone()
++do_standalone(void)
+ {
+     struct sockaddr_in frominet;
+     struct addrinfo *res;
+@@ -630,7 +630,7 @@ full_resync(CLIENT *clnt)
+  * Returns non-zero on failure due to errors.
+  */
+ krb5_error_code
+-do_iprop()
++do_iprop(void)
+ {
+     kadm5_ret_t retval;
+     krb5_principal iprop_svc_principal = NULL;
+diff --git a/src/lib/crypto/builtin/enc_provider/aes.c b/src/lib/crypto/builtin/enc_provider/aes.c
+index 7fa9449..39e2a84 100644
+--- a/src/lib/crypto/builtin/enc_provider/aes.c
++++ b/src/lib/crypto/builtin/enc_provider/aes.c
+@@ -69,7 +69,7 @@ void k5_iEnc256_CBC(struct aes_data *data);
+ void k5_iDec256_CBC(struct aes_data *data);
+ 
+ static krb5_boolean
+-aesni_supported_by_cpu()
++aesni_supported_by_cpu(void)
+ {
+     unsigned int a, b, c, d;
+ 
+diff --git a/src/lib/crypto/openssl/hmac.c b/src/lib/crypto/openssl/hmac.c
+index bf12b8d..799d700 100644
+--- a/src/lib/crypto/openssl/hmac.c
++++ b/src/lib/crypto/openssl/hmac.c
+@@ -70,7 +70,7 @@
+ 
+ #define HMAC_CTX_new compat_hmac_ctx_new
+ static HMAC_CTX *
+-compat_hmac_ctx_new()
++compat_hmac_ctx_new(void)
+ {
+     HMAC_CTX *ctx;
+ 
+diff --git a/src/lib/krb5/ccache/t_memory.c b/src/lib/krb5/ccache/t_memory.c
+index 6d103a0..0f94e82 100644
+--- a/src/lib/krb5/ccache/t_memory.c
++++ b/src/lib/krb5/ccache/t_memory.c
+@@ -85,7 +85,7 @@ krb5_creds test_creds = {
+ };
+ 
+ void
+-init_test_cred()
++init_test_cred(void)
+ {
+     test_creds.client = (krb5_principal) malloc(sizeof(krb5_data *)*3);
+     test_creds.client[0] = &client1;
+@@ -104,7 +104,7 @@ init_test_cred()
+     };
+ 
+ void
+-mcc_test()
++mcc_test(void)
+ {
+     krb5_ccache id;
+     krb5_creds creds;
+diff --git a/src/lib/krb5/ccache/t_stdio.c b/src/lib/krb5/ccache/t_stdio.c
+index 15185e3..06a9c2d 100644
+--- a/src/lib/krb5/ccache/t_stdio.c
++++ b/src/lib/krb5/ccache/t_stdio.c
+@@ -98,7 +98,7 @@ krb5_creds test_creds = {
+ };
+ 
+ void
+-init_test_cred()
++init_test_cred(void)
+ {
+     test_creds.client = (krb5_principal) malloc(sizeof(krb5_data *)*3);
+     test_creds.client[0] = &client1;
+@@ -118,7 +118,7 @@ init_test_cred()
+ 
+ int flags = 0;
+ void
+-scc_test()
++scc_test(void)
+ {
+     krb5_ccache id;
+     krb5_creds creds;
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_debug.c b/src/plugins/kdb/db2/libdb2/btree/bt_debug.c
+index bc71076..5a955e0 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_debug.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_debug.c
+@@ -56,7 +56,7 @@ static FILE *tracefp;
+  *     initialize debugging.
+  */
+ static void
+-__bt_dinit()
++__bt_dinit(void)
+ {
+        static int first = 1;
+ 
+diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_open.c b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
+index 0bb19d7..56bab19 100644
+--- a/src/plugins/kdb/db2/libdb2/btree/bt_open.c
++++ b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
+@@ -390,7 +390,7 @@ nroot(BTREE *t)
+ }
+ 
+ static int
+-tmp()
++tmp(void)
+ {
+ #ifdef SIG_BLOCK
+        sigset_t set, oset;
+@@ -437,7 +437,7 @@ tmp()
+ }
+ 
+ static int
+-byteorder()
++byteorder(void)
+ {
+        u_int32_t x;
+        u_char *p;
+diff --git a/src/plugins/kdb/db2/libdb2/hash/dbm.c b/src/plugins/kdb/db2/libdb2/hash/dbm.c
+index 8e23d4c..6e5e96b 100644
+--- a/src/plugins/kdb/db2/libdb2/hash/dbm.c
++++ b/src/plugins/kdb/db2/libdb2/hash/dbm.c
+@@ -143,7 +143,7 @@ kdb2_store(datum key, datum dat)
+ }
+ 
+ static void
+-no_open_db()
++no_open_db(void)
+ {
+        (void)fprintf(stderr, "dbm: no open database.\n");
+ }
+diff --git a/src/plugins/kdb/db2/libdb2/test/btree.tests/main.c b/src/plugins/kdb/db2/libdb2/test/btree.tests/main.c
+index 088f903..eec843d 100644
+--- a/src/plugins/kdb/db2/libdb2/test/btree.tests/main.c
++++ b/src/plugins/kdb/db2/libdb2/test/btree.tests/main.c
+@@ -908,7 +908,7 @@ keydata(key, data)
+ }
+ 
+ void
+-usage()
++usage(void)
+ {
+        (void)fprintf(stderr,
+            "usage: %s [-bdluw] [-c cache] [-i file] [-p page] [file]\n",
+diff --git a/src/plugins/kdb/db2/libdb2/test/dbtest.c b/src/plugins/kdb/db2/libdb2/test/dbtest.c
+index 04bf34b..a2866b4 100644
+--- a/src/plugins/kdb/db2/libdb2/test/dbtest.c
++++ b/src/plugins/kdb/db2/libdb2/test/dbtest.c
+@@ -792,7 +792,7 @@ xmalloc(char *text, size_t len)
+ }
+ 
+ void
+-usage()
++usage(void)
+ {
+        (void)fprintf(stderr,
+            "usage: dbtest [-l] [-f file] [-i info] [-o file] type script\n");
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index 4c81256..4a8b6d9 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -3075,7 +3075,7 @@ cleanup:
+ }
+ 
+ int
+-pkinit_openssl_init()
++pkinit_openssl_init(void)
+ {
+     /* Initialize OpenSSL. */
+     ERR_load_crypto_strings();
+diff --git a/src/plugins/tls/k5tls/openssl.c b/src/plugins/tls/k5tls/openssl.c
+index 99fda7f..aab67c0 100644
+--- a/src/plugins/tls/k5tls/openssl.c
++++ b/src/plugins/tls/k5tls/openssl.c
+@@ -49,7 +49,7 @@ static int ex_handle_id = -1;
+ MAKE_INIT_FUNCTION(init_openssl);
+ 
+ int
+-init_openssl()
++init_openssl(void)
+ {
+     SSL_library_init();
+     SSL_load_error_strings();
+diff --git a/src/tests/asn.1/make-vectors.c b/src/tests/asn.1/make-vectors.c
+index 2fc8546..6f2b7dd 100644
+--- a/src/tests/asn.1/make-vectors.c
++++ b/src/tests/asn.1/make-vectors.c
+@@ -224,7 +224,7 @@ printbuf(void)
+ }
+ 
+ int
+-main()
++main(void)
+ {
+     /* Initialize values which can't use static initializers. */
+     asn_long2INTEGER(&otp_format, 2);  /* Alphanumeric */
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch b/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch
new file mode 100644
index 0000000000..46eb6aa96c
--- /dev/null
+++ b/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch
@@ -0,0 +1,207 @@
+From c5f9c816107f70139de11b38aa02db2f1774ee0d Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Tue, 5 Mar 2024 19:53:07 -0500
+Subject: [PATCH] Fix two unlikely memory leaks
+
+In gss_krb5int_make_seal_token_v3(), one of the bounds checks (which
+could probably never be triggered) leaks plain.data.  Fix this leak
+and use current practices for cleanup throughout the function.
+
+In xmt_rmtcallres() (unused within the tree and likely elsewhere),
+store port_ptr into crp->port_ptr as soon as it is allocated;
+otherwise it could leak if the subsequent xdr_u_int32() operation
+fails.
+
+CVE: CVE-2024-26458 CVE-2024-26461
+Upstream-Status: Backport [https://github.com/krb5/krb5/commit/c5f9c816107f70139de11b38aa02db2f1774ee0d]
+
+Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
+---
+ src/lib/gssapi/krb5/k5sealv3.c | 56 +++++++++++++++-------------------
+ src/lib/rpc/pmap_rmt.c         |  9 +++---
+ 2 files changed, 29 insertions(+), 36 deletions(-)
+
+diff --git a/src/lib/gssapi/krb5/k5sealv3.c b/src/lib/gssapi/krb5/k5sealv3.c
+index 1fcbdfb..d3210c1 100644
+--- a/src/lib/gssapi/krb5/k5sealv3.c
++++ b/src/lib/gssapi/krb5/k5sealv3.c
+@@ -65,7 +65,7 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+                                 int conf_req_flag, int toktype)
+ {
+     size_t bufsize = 16;
+-    unsigned char *outbuf = 0;
++    unsigned char *outbuf = NULL;
+     krb5_error_code err;
+     int key_usage;
+     unsigned char acceptor_flag;
+@@ -75,9 +75,13 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+ #endif
+     size_t ec;
+     unsigned short tok_id;
+-    krb5_checksum sum;
++    krb5_checksum sum = { 0 };
+     krb5_key key;
+     krb5_cksumtype cksumtype;
++    krb5_data plain = empty_data();
++
++    token->value = NULL;
++    token->length = 0;
+
+     acceptor_flag = ctx->initiate ? 0 : FLAG_SENDER_IS_ACCEPTOR;
+     key_usage = (toktype == KG_TOK_WRAP_MSG
+@@ -107,14 +111,15 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+ #endif
+
+     if (toktype == KG_TOK_WRAP_MSG && conf_req_flag) {
+-        krb5_data plain;
+         krb5_enc_data cipher;
+         size_t ec_max;
+         size_t encrypt_size;
+
+         /* 300: Adds some slop.  */
+-        if (SIZE_MAX - 300 < message->length)
+-            return ENOMEM;
++        if (SIZE_MAX - 300 < message->length) {
++            err = ENOMEM;
++            goto cleanup;
++        }
+         ec_max = SIZE_MAX - message->length - 300;
+         if (ec_max > 0xffff)
+             ec_max = 0xffff;
+@@ -126,20 +131,20 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+ #endif
+         err = alloc_data(&plain, message->length + 16 + ec);
+         if (err)
+-            return err;
++            goto cleanup;
+
+         /* Get size of ciphertext.  */
+         encrypt_size = krb5_encrypt_size(plain.length, key->keyblock.enctype);
+         if (encrypt_size > SIZE_MAX / 2) {
+             err = ENOMEM;
+-            goto error;
++            goto cleanup;
+         }
+         bufsize = 16 + encrypt_size;
+         /* Allocate space for header plus encrypted data.  */
+         outbuf = gssalloc_malloc(bufsize);
+         if (outbuf == NULL) {
+-            free(plain.data);
+-            return ENOMEM;
++            err = ENOMEM;
++            goto cleanup;
+         }
+
+         /* TOK_ID */
+@@ -164,11 +169,8 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+         cipher.ciphertext.length = bufsize - 16;
+         cipher.enctype = key->keyblock.enctype;
+         err = krb5_k_encrypt(context, key, key_usage, 0, &plain, &cipher);
+-        zap(plain.data, plain.length);
+-        free(plain.data);
+-        plain.data = 0;
+         if (err)
+-            goto error;
++            goto cleanup;
+
+         /* Now that we know we're returning a valid token....  */
+         ctx->seq_send++;
+@@ -181,7 +183,6 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+         /* If the rotate fails, don't worry about it.  */
+ #endif
+     } else if (toktype == KG_TOK_WRAP_MSG && !conf_req_flag) {
+-        krb5_data plain;
+         size_t cksumsize;
+
+         /* Here, message is the application-supplied data; message2 is
+@@ -193,21 +194,19 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+     wrap_with_checksum:
+         err = alloc_data(&plain, message->length + 16);
+         if (err)
+-            return err;
++            goto cleanup;
+
+         err = krb5_c_checksum_length(context, cksumtype, &cksumsize);
+         if (err)
+-            goto error;
++            goto cleanup;
+
+         assert(cksumsize <= 0xffff);
+
+         bufsize = 16 + message2->length + cksumsize;
+         outbuf = gssalloc_malloc(bufsize);
+         if (outbuf == NULL) {
+-            free(plain.data);
+-            plain.data = 0;
+             err = ENOMEM;
+-            goto error;
++            goto cleanup;
+         }
+
+         /* TOK_ID */
+@@ -239,23 +238,15 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+         if (message2->length)
+             memcpy(outbuf + 16, message2->value, message2->length);
+
+-        sum.contents = outbuf + 16 + message2->length;
+-        sum.length = cksumsize;
+-
+         err = krb5_k_make_checksum(context, cksumtype, key,
+                                    key_usage, &plain, &sum);
+-        zap(plain.data, plain.length);
+-        free(plain.data);
+-        plain.data = 0;
+         if (err) {
+             zap(outbuf,bufsize);
+-            goto error;
++            goto cleanup;
+         }
+         if (sum.length != cksumsize)
+             abort();
+         memcpy(outbuf + 16 + message2->length, sum.contents, cksumsize);
+-        krb5_free_checksum_contents(context, &sum);
+-        sum.contents = 0;
+         /* Now that we know we're actually generating the token...  */
+         ctx->seq_send++;
+
+@@ -285,12 +276,13 @@ gss_krb5int_make_seal_token_v3 (krb5_context context,
+
+     token->value = outbuf;
+     token->length = bufsize;
+-    return 0;
++    outbuf = NULL;
++    err = 0;
+
+-error:
++cleanup:
++    krb5_free_checksum_contents(context, &sum);
++    zapfree(plain.data, plain.length);
+     gssalloc_free(outbuf);
+-    token->value = NULL;
+-    token->length = 0;
+     return err;
+ }
+
+diff --git a/src/lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c
+index 8c7e30c..522cb20 100644
+--- a/src/lib/rpc/pmap_rmt.c
++++ b/src/lib/rpc/pmap_rmt.c
+@@ -160,11 +160,12 @@ xdr_rmtcallres(
+        caddr_t port_ptr;
+
+        port_ptr = (caddr_t)(void *)crp->port_ptr;
+-       if (xdr_reference(xdrs, &port_ptr, sizeof (uint32_t),
+-           xdr_u_int32) && xdr_u_int32(xdrs, &crp->resultslen)) {
+-               crp->port_ptr = (uint32_t *)(void *)port_ptr;
++        if (!xdr_reference(xdrs, &port_ptr, sizeof (uint32_t),
++                          (xdrproc_t)xdr_u_int32))
++               return (FALSE);
++       crp->port_ptr = (uint32_t *)(void *)port_ptr;
++       if (xdr_u_int32(xdrs, &crp->resultslen))
+                return ((*(crp->xdr_results))(xdrs, crp->results_ptr));
+-       }
+        return (FALSE);
+ }
+
+--
+2.40.0
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/CVE-2025-24528.patch b/meta-oe/recipes-connectivity/krb5/krb5/CVE-2025-24528.patch
new file mode 100644
index 0000000000..ac6039edf1
--- /dev/null
+++ b/meta-oe/recipes-connectivity/krb5/krb5/CVE-2025-24528.patch
@@ -0,0 +1,68 @@
+From 78ceba024b64d49612375be4a12d1c066b0bfbd0 Mon Sep 17 00:00:00 2001
+From: Zoltan Borbely <Zoltan.Borbely@morganstanley.com>
+Date: Tue, 28 Jan 2025 16:39:25 -0500
+Subject: [PATCH] Prevent overflow when calculating ulog block size
+
+In kdb_log.c:resize(), log an error and fail if the update size is
+larger than the largest possible block size (2^16-1).
+
+CVE-2025-24528:
+
+In MIT krb5 release 1.7 and later with incremental propagation
+enabled, an authenticated attacker can cause kadmind to write beyond
+the end of the mapped region for the iprop log file, likely causing a
+process crash.
+
+[ghudson@mit.edu: edited commit message and added CVE description]
+
+ticket: 9159 (new)
+tags: pullup
+target_version: 1.21-next
+
+CVE: CVE-2025-24528
+
+Upstream-Status: Backport [https://github.com/krb5/krb5/commit/78ceba024b64d49612375be4a12d1c066b0bfbd0]
+
+Signed-off-by: Divya Chellam <divya.chellam@windriver.com>
+---
+ src/lib/kdb/kdb_log.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/kdb/kdb_log.c b/src/lib/kdb/kdb_log.c
+index 2659a25..68fae91 100644
+--- a/src/lib/kdb/kdb_log.c
++++ b/src/lib/kdb/kdb_log.c
+@@ -183,7 +183,7 @@ extend_file_to(int fd, unsigned int new_size)
+  */
+ static krb5_error_code
+ resize(kdb_hlog_t *ulog, uint32_t ulogentries, int ulogfd,
+-       unsigned int recsize)
++       unsigned int recsize, const kdb_incr_update_t *upd)
+ {
+     unsigned int new_block, new_size;
+ 
+@@ -195,6 +195,12 @@ resize(kdb_hlog_t *ulog, uint32_t ulogentries, int ulogfd,
+     new_block *= ULOG_BLOCK;
+     new_size += ulogentries * new_block;
+ 
++    if (new_block > UINT16_MAX) {
++        syslog(LOG_ERR, _("ulog overflow caused by principal %.*s"),
++               upd->kdb_princ_name.utf8str_t_len,
++               upd->kdb_princ_name.utf8str_t_val);
++        return KRB5_LOG_ERROR;
++    }
+     if (new_size > MAXLOGLEN)
+         return KRB5_LOG_ERROR;
+ 
+@@ -291,7 +297,7 @@ store_update(kdb_log_context *log_ctx, kdb_incr_update_t *upd)
+     recsize = sizeof(kdb_ent_header_t) + upd_size;
+ 
+     if (recsize > ulog->kdb_block) {
+-        retval = resize(ulog, ulogentries, log_ctx->ulogfd, recsize);
++        retval = resize(ulog, ulogentries, log_ctx->ulogfd, recsize, upd);
+         if (retval)
+             return retval;
+     }
+-- 
+2.40.0
+
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.21.3.bb
index ed12fee94c..c042dba5a7 100644
--- a/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb
+++ b/meta-oe/recipes-connectivity/krb5/krb5_1.21.3.bb
@@ -14,13 +14,16 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n
 HOMEPAGE = "http://web.mit.edu/Kerberos/"
 SECTION = "console/network"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=32cb3a99207053d9f5c1ef177c4d6e34"
+LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=71c06694263581762668e88b7b77a1a5"
 
 inherit autotools-brokensep binconfig perlnative systemd update-rc.d pkgconfig
 
 SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \
            file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \
+           file://0001-Eliminate-old-style-function-declarations.patch;patchdir=.. \
+           file://0001-Fix-more-non-prototype-functions.patch;patchdir=.. \
+           file://0002-Avoid-strict-prototype-compiler-errors.patch;patchdir=.. \
            file://crosscompile_nm.patch \
            file://etc/init.d/krb5-kdc \
            file://etc/init.d/krb5-admin-server \
@@ -28,14 +31,16 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \
            file://etc/default/krb5-admin-server \
            file://krb5-kdc.service \
            file://krb5-admin-server.service \
+           file://CVE-2024-26458_CVE-2024-26461.patch;striplevel=2 \
+           file://CVE-2025-24528.patch;striplevel=2 \
 "
 
-SRC_URI[sha256sum] = "9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491"
+SRC_URI[sha256sum] = "b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35"
 
 CVE_PRODUCT = "kerberos"
 CVE_VERSION = "5-${PV}"
 
-S = "${WORKDIR}/${BP}/src"
+S = "${UNPACKDIR}/${BP}/src"
 
 DEPENDS = "bison-native ncurses util-linux e2fsprogs e2fsprogs-native openssl"
 
diff --git a/meta-oe/recipes-connectivity/libev/libev_4.33.bb b/meta-oe/recipes-connectivity/libev/libev_4.33.bb
index 346e78b1de..6d29900a48 100644
--- a/meta-oe/recipes-connectivity/libev/libev_4.33.bb
+++ b/meta-oe/recipes-connectivity/libev/libev_4.33.bb
@@ -5,7 +5,6 @@ LICENSE = "BSD-2-Clause | GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d6ad416afd040c90698edcdf1cbee347"
 
 SRC_URI = "http://dist.schmorp.de/libev/Attic/${BP}.tar.gz"
-SRC_URI[md5sum] = "a3433f23583167081bf4acdd5b01b34f"
 SRC_URI[sha256sum] = "507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea"
 
 inherit autotools
diff --git a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.2.0.bb b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.3.2.bb
index c9e9c90d7d..8b7306b598 100644
--- a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.2.0.bb
+++ b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.3.2.bb
@@ -8,8 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/"
 
 DEPENDS = "libplist"
 
-SRCREV = "fde8946a3988790fd5d3f01fc0a1fd43609ab1d1"
+SRCREV = "aef2bf0f5bfe961ad83d224166462d87b1df2b00"
 SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb
index b8d7e8872b..3c93c9a37b 100644
--- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb
+++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb
@@ -14,7 +14,6 @@ SRCREV = "860ffb707af3af94467d2ece4ad258dda957c6cd"
 SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https;branch=master \
            file://0001-include-unistd.h-for-usleep.patch"
 
-S = "${WORKDIR}/git"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = " --without-cython "
diff --git a/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.0.bb b/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.1.bb
index 29f67d39d8..6049369290 100644
--- a/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.0.bb
+++ b/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.1.bb
@@ -8,8 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/"
 
 DEPENDS = "libimobiledevice-glue libusb1 readline"
 
-SRCREV = "2254dab893ec439f9a73235ea07194afa77399db"
+SRCREV = "2fb767d784c01269a0ded5bacd5539aee3768c35"
 SRC_URI = "git://github.com/libimobiledevice/libirecovery;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-connectivity/libmbim/libmbim_1.30.0.bb b/meta-oe/recipes-connectivity/libmbim/libmbim_1.33.1.bb
index a227124498..27d28d71cb 100644
--- a/meta-oe/recipes-connectivity/libmbim/libmbim_1.30.0.bb
+++ b/meta-oe/recipes-connectivity/libmbim/libmbim_1.33.1.bb
@@ -11,10 +11,9 @@ DEPENDS = "glib-2.0 glib-2.0-native libgudev"
 
 inherit meson pkgconfig bash-completion gobject-introspection upstream-version-is-even
 
-SRCREV = "8415687e4f30ae5e36f407f179c8147f1529725c"
-SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libmbim.git;protocol=https;branch=mbim-1-30"
+SRCREV = "e10df4b6b3edfe6a46d93f7f5f5cab31c29a7091"
+SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libmbim.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMESON = " \
     -Dgtk_doc=false \
diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp/0002-util-mtp-hotplug.c-Enable-stack-memory-protection.patch b/meta-oe/recipes-connectivity/libmtp/libmtp/0002-util-mtp-hotplug.c-Enable-stack-memory-protection.patch
new file mode 100644
index 0000000000..9cd4b2fbd6
--- /dev/null
+++ b/meta-oe/recipes-connectivity/libmtp/libmtp/0002-util-mtp-hotplug.c-Enable-stack-memory-protection.patch
@@ -0,0 +1,33 @@
+From 0644188a537a06bc6d04483b21e23b80987eb497 Mon Sep 17 00:00:00 2001
+From: Hieu Van Nguyen <hieu2.nguyen@lge.com>
+Date: Fri, 11 Oct 2024 04:21:21 +0000
+Subject: [PATCH] util/mtp-hotplug.c: Enable stack memory protection
+
+Use "return 0" instead of "exit(0)" at the end of main()
+function to enable checking for Stack Overflow at Runtime.
+
+Use "return 0" to let the program exit normally by returning from
+the main function. This allows the compiler to perform necessary
+cleanup operations, including stack canary checks.
+
+__stack_chk_fail function isn't being invoked when using exit(0) at
+the end of the main function
+$ objdump -T ./util/.libs/mtp-hotplug | grep __stack_chk_fail
+This return empty.
+---
+Upstream-Status: Backport [https://github.com/libmtp/libmtp/commit/e89dbb6ecf244936acc9a52aa4af9635bda5926a]
+
+ util/mtp-hotplug.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/mtp-hotplug.c b/util/mtp-hotplug.c
+index b5bc6da40f..db75cb38a1 100644
+--- a/util/mtp-hotplug.c
++++ b/util/mtp-hotplug.c
+@@ -301,5 +301,5 @@ int main (int argc, char **argv)
+     printf("\n");
+   }
+ 
+-  exit (0);
++  return 0;
+ }
diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb
index 94cbef8fc1..69dff50cd7 100644
--- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb
+++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb
@@ -18,9 +18,13 @@ DEPENDS = "libusb1 gettext-native"
 DEPENDS:append:class-target = " ${BPN}-native"
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz"
-SRC_URI:append:class-target = " file://0001-Use-native-mtp-hotplug.patch"
+SRC_URI:append:class-target = " file://0001-Use-native-mtp-hotplug.patch \
+                                file://0002-util-mtp-hotplug.c-Enable-stack-memory-protection.patch"
 SRC_URI[sha256sum] = "f4c1ceb3df020a6cb851110f620c14fe399518c494ed252039cbfb4e34335135"
 
+UPSTREAM_CHECK_URI = "https://github.com/libmtp/libmtp/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
 inherit autotools pkgconfig lib_package
 
 EXTRA_OECONF += " \
diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb b/meta-oe/recipes-connectivity/libndp/libndp_1.9.bb
index 80946317e4..fdf5694e9f 100644
--- a/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb
+++ b/meta-oe/recipes-connectivity/libndp/libndp_1.9.bb
@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \
            file://0001-libndp-Fix-signature-of-sendto-API.patch \
            "
 # tag for v1.8
-SRCREV = "009ce9cd9b950ffa1f4f94c9436027b936850d0c"
-S = "${WORKDIR}/git"
+SRCREV = "2730638bf88984b09531813974f9bd14e1a50165"
 
 inherit autotools
diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb
index b4648832f1..0594b2485e 100644
--- a/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb
+++ b/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/libnet/libnet.git;protocol=https;branch=master"
 SRC_URI[sha256sum] = "1e9e9054d688b059bcbaf878d8c4fbf69bfc0c9386cd4e7779fbb53339050d2e"
 SRCREV = "deaebdfe2743e8a6f04d3c307d9272afeeecfade"
 
-S = "${WORKDIR}/git"
 
 inherit autotools binconfig multilib_script
 MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/libnet-config"
diff --git a/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch b/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch
index 978f38d019..ffb6bfbea8 100644
--- a/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch
+++ b/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch
@@ -1,4 +1,4 @@
-From 95708ff427c12b58e53fab225a08c811ca358394 Mon Sep 17 00:00:00 2001
+From 0d5d6a14f6e9c2ff8998ebb3acbefcad6221952f Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Wed, 3 May 2023 22:27:10 +0200
 Subject: [PATCH] CMakeLists.txt: respect ${CMAKE_INSTALL_LIBDIR} for multilib
@@ -29,11 +29,11 @@ Upstream-Status: Pending
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5be774d..6b4fd25 100644
+index 1b94d2e..a295403 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -7,11 +7,11 @@ project(libnfs
- set(SOVERSION 11.2.0 CACHE STRING "" FORCE)
+ set(SOVERSION 16.2.0 CACHE STRING "" FORCE)
  
  set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for binaries")
 -set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
@@ -48,10 +48,10 @@ index 5be774d..6b4fd25 100644
  option(BUILD_SHARED_LIBS "Build shared libraries" ON)
  option(ENABLE_TESTS "Build and run test programs" OFF)
 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 88ba7b8..5ff89dc 100644
+index 987b735..9b2032f 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -23,5 +23,5 @@ set_target_properties(nfs PROPERTIES
+@@ -24,5 +24,5 @@ set_target_properties(nfs PROPERTIES
  
  install(TARGETS nfs EXPORT libnfs
                      RUNTIME DESTINATION bin
diff --git a/meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch b/meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch
deleted file mode 100644
index de3ab82292..0000000000
--- a/meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From d0fa719d49f38777911a8e99717f2d4b30811080 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 12 Feb 2024 19:24:54 -0800
-Subject: [PATCH] cmake: Test for sys/uio.h
-
-writev() API is used in few places and it will need including sys/uio.h
-for getting the funciton signature
-
-Upstream-Status: Submitted [https://github.com/sahlberg/libnfs/pull/440]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- cmake/ConfigureChecks.cmake | 1 +
- cmake/config.h.cmake        | 3 +++
- 2 files changed, 4 insertions(+)
-
-diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
-index 0258fc8..c26a02d 100644
---- a/cmake/ConfigureChecks.cmake
-+++ b/cmake/ConfigureChecks.cmake
-@@ -22,6 +22,7 @@ check_include_file("sys/stat.h" HAVE_SYS_STAT_H)
- check_include_file("sys/sysmacros.h" HAVE_SYS_SYSMACROS_H)
- check_include_file("sys/time.h" HAVE_SYS_TIME_H)
- check_include_file("sys/types.h" HAVE_SYS_TYPES_H)
-+check_include_file("sys/uio.h" HAVE_SYS_UIO_H)
- check_include_file("sys/vfs.h" HAVE_SYS_VFS_H)
- check_include_file("unistd.h" HAVE_UNISTD_H)
- check_include_file("utime.h" HAVE_UTIME_H)
-diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
-index 4016c6c..6263896 100644
---- a/cmake/config.h.cmake
-+++ b/cmake/config.h.cmake
-@@ -90,6 +90,9 @@
- /* Define to 1 if you have the <sys/types.h> header file. */
- #cmakedefine HAVE_SYS_TYPES_H
- 
-+/* Define to 1 if you have the <sys/uio.h> header file. */
-+#cmakedefine HAVE_SYS_UIO_H
-+
- /* Define to 1 if you have the <sys/vfs.h> header file. */
- #cmakedefine HAVE_SYS_VFS_H
- 
--- 
-2.43.1
-
diff --git a/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb b/meta-oe/recipes-connectivity/libnfs/libnfs_6.0.2.bb
index a6eabc6095..83f32d3a07 100644
--- a/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.3.bb
+++ b/meta-oe/recipes-connectivity/libnfs/libnfs_6.0.2.bb
@@ -3,13 +3,12 @@ HOMEPAGE = "https://github.com/sahlberg/libnfs"
 LICENSE = "LGPL-2.1-only & BSD-2-Clause & GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=825301ba17efc9d188ee0abd4b924ada"
 
-SRC_URI = " \
-        git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \
-        file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \
-        file://0001-cmake-Test-for-sys-uio.h.patch \
-"
-SRCREV = "4379837536d9eac537810dc7b13071136049b22a"
-S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \
+           file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \
+           "
+SRCREV = "18c5c73ee88bb7dc8da0d55dc95164bb77e49dc6"
+
+DEPENDS += "gnutls"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.34.0.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.34.0.bb
index 94164a0b5a..8dc7ec3773 100644
--- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.34.0.bb
+++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.34.0.bb
@@ -15,7 +15,6 @@ inherit meson pkgconfig bash-completion gobject-introspection upstream-version-i
 SRCREV = "3f07d6e5b4677558543b3b4484ea88ad92257e92"
 SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-34"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "udev mbim"
 PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,libgudev"
diff --git a/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb b/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb
index 3549cac568..f195008650 100644
--- a/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb
+++ b/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git;protoc
 PV = "1.2.2+git"
 SRCREV = "8991f0e93713ebf4da48ae4f23940ead42f64c8c"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig gobject-introspection
 
diff --git a/meta-oe/recipes-connectivity/libtorrent-rasterbar/libtorrent-rasterbar_2.0.10.bb b/meta-oe/recipes-connectivity/libtorrent-rasterbar/libtorrent-rasterbar_2.0.10.bb
index f2de1f468d..6bfcbec25f 100644
--- a/meta-oe/recipes-connectivity/libtorrent-rasterbar/libtorrent-rasterbar_2.0.10.bb
+++ b/meta-oe/recipes-connectivity/libtorrent-rasterbar/libtorrent-rasterbar_2.0.10.bb
@@ -7,13 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8b6cb42d66e6b3c47a909c3ce678a7b"
 DEPENDS = "boost openssl"
 
 SRC_URI = "git://github.com/arvidn/libtorrent.git;branch=master;protocol=https \
-        git://github.com/arvidn/try_signal.git;branch=master;protocol=https;destsuffix=git/deps/try_signal;name=try_signal"
+        git://github.com/arvidn/try_signal.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/try_signal;name=try_signal"
 
 SRCREV = "74bc93a37a5e31c78f0aa02037a68fb9ac5deb41"
 SRCREV_try_signal = "105cce59972f925a33aa6b1c3109e4cd3caf583d"
 SRCREV_FORMAT .= "_try_signal"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig python3targetconfig
 
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.14.0.bb
index c7a0562db4..220bb62c64 100644
--- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb
+++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.14.0.bb
@@ -6,16 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 DEPENDS = "zlib libsigc++-2.0 openssl cppunit"
 
-PV = "0.13.8+git"
-
 SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https"
-SRCREV = "e60f222241319aaae482789517ad00ae9344bd13"
+SRCREV = "08fb6635ba249665cb08a4de1b955288d25c21e1"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 CVE_STATUS[CVE-2009-1760] = "backported-patch: patched in our product"
 
-S = "${WORKDIR}/git"
 
 CVE_PRODUCT = ""
 
diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-sll_protocol-may-be-be16.patch b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-sll_protocol-may-be-be16.patch
new file mode 100644
index 0000000000..c27644ef7d
--- /dev/null
+++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-sll_protocol-may-be-be16.patch
@@ -0,0 +1,29 @@
+From 99e3ad14c60599e5d73e4d5597c95c3b91780547 Mon Sep 17 00:00:00 2001
+From: Andy Green <andy@warmcat.com>
+Date: Wed, 22 Jan 2025 10:08:55 +0000
+Subject: [PATCH] sll_protocol may be be16
+
+Google's fuzzer platform blows a warning
+
+/src/libwebsockets/lib/plat/unix/unix-sockets.c:497:21: warning: implicit conversion loses integer precision: 'uint32_t' (aka 'unsigned int') to '__be16' (aka 'unsigned short') [-Wimplicit-int-conversion]
+  497 |         sll.sll_protocol = (uint32_t)(htons((uint16_t)0x800));
+
+Upstream-Status: Backport [https://github.com/warmcat/libwebsockets/commit/2ffb8c6d5eaab509a133f3a6d922e170ae95dd59]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/plat/unix/unix-sockets.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/plat/unix/unix-sockets.c b/lib/plat/unix/unix-sockets.c
+index 1a40c9cf..61292ff8 100644
+--- a/lib/plat/unix/unix-sockets.c
++++ b/lib/plat/unix/unix-sockets.c
+@@ -453,7 +453,7 @@ lws_plat_rawudp_broadcast(uint8_t *p, const uint8_t *canned, size_t canned_len,
+ 
+        memset(&sll, 0, sizeof(sll));
+        sll.sll_family = AF_PACKET;
+-       sll.sll_protocol = (uint32_t)(htons((uint16_t)0x800));
++       sll.sll_protocol = (uint16_t)(htons((uint16_t)0x800));
+        sll.sll_halen = 6;
+        sll.sll_ifindex = (int)if_nametoindex(iface);
+        memset(sll.sll_addr, 0xff, 6);
diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.5.bb
index 3170d37f5b..0751cff178 100644
--- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb
+++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.5.bb
@@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=382bfdf329e774859fd401eaf850d29b"
 DEPENDS = "zlib"
 DEPENDS:append:class-native = " libcap-native"
 
-S = "${WORKDIR}/git"
-SRCREV = "4415e84c095857629863804e941b9e1c2e9347ef"
-SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.3-stable"
+SRCREV = "ab9df9cfc39de7a49967f18387b6b76310947442"
+SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.3-stable \
+           file://0001-sll_protocol-may-be-be16.patch \
+           "
 
 UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch
deleted file mode 100644
index b117dcf670..0000000000
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6120cee594c543d17ae015bc601012debcf57177 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 23 Oct 2023 10:43:42 +0100
-Subject: [PATCH] include string.h for strncpy()
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport [master: 6120cee594c543d17ae015bc601012debcf57177]
----
- interface.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/interface.c b/interface.c
-index 29229ad6f53d..9a83c36933e7 100644
---- a/interface.c
-+++ b/interface.c
-@@ -5,6 +5,7 @@
-  * @note SPDX-License-Identifier: GPL-2.0+
-  */
- #include <stdlib.h>
-+#include <string.h>
- #include "interface.h"
- 
- struct interface {
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch
deleted file mode 100644
index 3cf3a63b94..0000000000
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From cffb4807ac0b9ff7aea2aa4f3842985b5363d184 Mon Sep 17 00:00:00 2001
-From: Luca Fancellu <luca.fancellu@arm.com>
-Date: Mon, 23 Oct 2023 10:43:43 +0100
-Subject: [PATCH] linuxptp: Use ${CC} in incdefs.sh
-
-The Makefile is defining CC and incdefs.sh is using
-${CROSS_COMPILE}cpp inside it, allowing both to use different
-compilers depending on what the user pass during make invocation
-as CC.
-
-Align them using ${CC} also inside incdefs.sh.
-
-Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
-Upstream-Status: Backport [master: cffb4807ac0b9ff7aea2aa4f3842985b5363d184]
----
- incdefs.sh | 2 +-
- makefile   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/incdefs.sh b/incdefs.sh
-index a9e94f777f6b..391e63c7fac6 100755
---- a/incdefs.sh
-+++ b/incdefs.sh
-@@ -27,7 +27,7 @@ user_flags()
-        printf " -D_GNU_SOURCE"
- 
-        # Get list of directories searched for header files.
--       dirs=$(echo "" | ${CROSS_COMPILE}cpp -Wp,-v 2>&1 >/dev/null | grep ^" /")
-+       dirs=$(${CC} -E -Wp,-v -xc /dev/null 2>&1 >/dev/null | grep ^" /")
- 
-        # Look for clock_adjtime().
-        for d in $dirs; do
-diff --git a/makefile b/makefile
-index 3e3b8b35fc96..7fc5f6fb8fa8 100644
---- a/makefile
-+++ b/makefile
-@@ -39,7 +39,7 @@ OBJECTS       = $(OBJ) hwstamp_ctl.o nsm.o phc2sys.o phc_ctl.o pmc.o pmc_agent.o \
- SRC    = $(OBJECTS:.o=.c)
- DEPEND = $(OBJECTS:.o=.d)
- srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
--incdefs := $(shell $(srcdir)/incdefs.sh)
-+incdefs := $(shell CC="$(CC)" $(srcdir)/incdefs.sh)
- version := $(shell $(srcdir)/version.sh $(srcdir))
- VPATH  = $(srcdir)
- 
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.4.bb
index d1a73841a1..421113cdfc 100644
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb
+++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.4.bb
@@ -5,27 +5,19 @@ HOMEPAGE = "http://linuxptp.sourceforge.net/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-LINUXPTP_SRC_URI = "http://sourceforge.net/projects/linuxptp"
-
-SRC_URI = "${LINUXPTP_SRC_URI}/files/v4.1/linuxptp-${PV}.tgz \
-           file://0001-include-string.h-for-strncpy.patch \
-           file://0002-linuxptp-Use-CC-in-incdefs.sh.patch \
+SRC_URI = "https://downloads.nwtime.org/linuxptp/linuxptp-${PV}.tgz \
            file://systemd/phc2sys@.service.in \
            file://systemd/ptp4l@.service.in \
            "
 
-SRC_URI[md5sum] = "1db8699fc155965341759be5e5aad938"
-SRC_URI[sha256sum] = "e1743d44f8208897e30895da3579e670ff919b914feb4b5a949f3e421ddde535"
+SRC_URI[sha256sum] = "61757bc0a58d789b8fcbdddf56c88a0230597184a70dcb2ac05b4c6b619f7d5c"
 
 inherit systemd
 
-UPSTREAM_CHECK_URI = "${LINUXPTP_SRC_URI}/files/"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
-
 EXTRA_OEMAKE = "CC='${CC}' EXTRA_CFLAGS='${CFLAGS}' mandir='${mandir}' \
     sbindir='${sbindir}'"
 
-export KBUILD_OUTPUT="${RECIPE_SYSROOT}"
+export KBUILD_OUTPUT = "${RECIPE_SYSROOT}"
 
 LINUXPTP_SYSTEMD_SERVICES = "phc2sys@.service ptp4l@.service"
 
diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb
index 6b4336eb80..82cc1167e2 100644
--- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb
+++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb
@@ -14,7 +14,6 @@ DEPENDS = "glib-2.0 libgudev libxslt-native dbus"
 SRCREV = "03f786ce66360d67c669f4f122f8aa458e6f01ea"
 SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-22"
 
-S = "${WORKDIR}/git"
 
 # strict, permissive
 MODEMMANAGER_POLKIT_TYPE ??= "permissive"
diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb
index 693ec12d3c..bea22b18e2 100644
--- a/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb
+++ b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb
@@ -48,3 +48,4 @@ RDEPENDS:${PN}-server += "openssh-sshd"
 ARM_INSTRUCTION_SET = "arm"
 
 CXXFLAGS:append = " -std=c++17"
+LDFLAGS:append:riscv32 = " -latomic"
diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
index 7348274948..be8482ab50 100644
--- a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
+++ b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
@@ -12,10 +12,12 @@ DEPENDS:append:class-target = " bluez5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}-Source.tar.gz \
 "
-SRC_URI[md5sum] = "f6e0b6cb7dcfd731460a7e9a91429a3a"
 SRC_URI[sha256sum] = "158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc"
 
-S = "${WORKDIR}/${BP}-Source"
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/openobex/files/openobex/"
+UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)"
+
+S = "${UNPACKDIR}/${BP}-Source"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb
index f7a98fb61e..30326e89ef 100644
--- a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb
+++ b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb
@@ -11,9 +11,11 @@ SRC_URI = "http://downloads.sourceforge.net/openobex/${BP}-Source.tar.gz \
            file://0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch \
            file://make_fuse_swig_optional.patch \
 "
-SRC_URI[md5sum] = "157a9d1b2ed220203f7084db906de73c"
 SRC_URI[sha256sum] = "d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1c989a3"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/openobex/files/obexftp/"
+UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)"
+
 inherit cmake pkgconfig
 
 OECMAKE_GENERATOR = "Unix Makefiles"
@@ -25,7 +27,7 @@ PACKAGECONFIG[swig] = "-DENABLE_SWIG=ON,-DENABLE_SWIG=OFF,swig"
 
 DEPENDS:remove:class-native = "fuse-native"
 
-S = "${WORKDIR}/${BP}-Source"
+S = "${UNPACKDIR}/${BP}-Source"
 
 EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=ON \
                   -DENABLE_PERL=OFF -DENABLE_PYTHON=OFF \
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c/0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c/0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch
new file mode 100644
index 0000000000..4215f698c7
--- /dev/null
+++ b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c/0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch
@@ -0,0 +1,37 @@
+From 02fa96d0d59211e64483273e5253ca45c4395154 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 9 Apr 2025 19:05:55 +0900
+Subject: [PATCH] Fix build error due to bool keyword with gcc-15
+
+* gcc-15 uses gnu23 for c.
+  'bool' is a keyword.
+TOPDIR/tmp/work/core2-64-oe-linux/paho-mqtt-c/1.3.14/git/src/MQTTPacket.h:31:22: error: 'bool' cannot be defined via 'typedef'
+   31 | typedef unsigned int bool;
+      |                      ^~~~
+TOPDIR/tmp/work/core2-64-oe-linux/paho-mqtt-c/1.3.14/git/src/MQTTPacket.h:31:22: note: 'bool' is a keyword with '-std=c23' onwards
+TOPDIR/tmp/work/core2-64-oe-linux/paho-mqtt-c/1.3.14/git/src/MQTTPacket.h:31:1: warning: useless type name in empty declaration
+   31 | typedef unsigned int bool;
+      | ^~~~~~~
+
+Upstream-Status: Submitted [https://github.com/eclipse-paho/paho.mqtt.c/pull/1595]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+Signed-off-by: markyang92 <pllpokko@alumni.kaist.ac.kr>
+
+---
+ src/MQTTPacket.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/MQTTPacket.h b/src/MQTTPacket.h
+index fd384ae9..0c64a0f4 100644
+--- a/src/MQTTPacket.h
++++ b/src/MQTTPacket.h
+@@ -28,7 +28,9 @@
+ #include "LinkedList.h"
+ #include "Clients.h"
+ 
++#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L
+ typedef unsigned int bool;
++#endif
+ typedef void* (*pf)(int, unsigned char, char*, size_t);
+ 
+ #include "MQTTProperties.h"
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.13.bb b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.14.bb
index 6f229001f6..ad6637ed88 100644
--- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.13.bb
+++ b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.14.bb
@@ -10,13 +10,15 @@ LIC_FILES_CHKSUM = " \
     file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
 "
 
-SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=https;branch=master"
+SRC_URI = " \
+    git://github.com/eclipse/paho.mqtt.c;protocol=https;branch=master \
+    file://0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch \
+"
 
-SRCREV = "07a875788d8cc6f5833b12581d6e3e349b34d719"
+SRCREV = "2150ba29d9df24ad1733c460eb099f292af84ee5"
 
 DEPENDS = "openssl"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch
deleted file mode 100644
index fba9a8767f..0000000000
--- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 2a0dd2b300242230faa92cf8e26ccd70231bc9ef Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 19 Mar 2022 23:37:58 -0700
-Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_BINDIR
-
-This ensures the install paths are not hardcoded.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
----
- cmake/CMakeLists.txt       | 4 ++--
- src/samples/CMakeLists.txt | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index a9f8908..7eadc60 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -11,7 +11,7 @@ export(EXPORT ${package_name}
-     FILE "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Targets.cmake"
-     NAMESPACE ${package_name}::)
- 
--install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name}
-+install(EXPORT ${package_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}
-     FILE ${package_name}Targets.cmake
-     NAMESPACE ${package_name}::)
- 
-@@ -19,4 +19,4 @@ install(FILES
-     "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake"
-     FindPahoMqttC.cmake
-     "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake"
--    DESTINATION lib/cmake/${package_name})
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name})
-diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt
-index 3ca0a75..c915cd5 100644
---- a/src/samples/CMakeLists.txt
-+++ b/src/samples/CMakeLists.txt
-@@ -71,7 +71,7 @@ endforeach()
- 
- ## install binaries
- install(TARGETS ${EXECUTABLES} EXPORT PahoMqttCppSamples
--  RUNTIME DESTINATION bin
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
- 
- ## Build the SSL/TLS samples, if selected
-@@ -89,7 +89,7 @@ if(PAHO_WITH_SSL)
-   endforeach()
- 
-   install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples
--    RUNTIME DESTINATION bin
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-   )
- endif()
- 
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.5.3.bb
index 1b2e51c3ac..5b4aed3001 100644
--- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb
+++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.5.3.bb
@@ -5,20 +5,17 @@ SECTION = "console/network"
 LICENSE = "EPL-2.0 | EDL-1.0"
 
 LIC_FILES_CHKSUM = " \
-    file://src/mqtt/message.h;beginline=9;endline=18;md5=c5ceecf5ab99d44dcfaaabdce289071b \
+    file://LICENSE;md5=c0fa3a632eea67f4079c54df781d1441 \
     file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \
     file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
 "
 
-SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.3.x \
-           file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \
-           "
-SRCREV = "5e0d1bf37b4826d680ec066ec42afd133851a681"
+SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "17ff3dc0270738adc710667be44847eebc038ae0"
 
 DEPENDS = "openssl paho-mqtt-c"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
-EXTRA_OECMAKE += "-DPAHO_WITH_SSL=ON"
+EXTRA_OECMAKE += "-DPAHO_WITH_SSL=ON -DPAHO_BUILD_EXAMPLES=OFF"
diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Remove-whitespace-in-operator-_json.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Remove-whitespace-in-operator-_json.patch
new file mode 100644
index 0000000000..fb793548a2
--- /dev/null
+++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Remove-whitespace-in-operator-_json.patch
@@ -0,0 +1,52 @@
+From 16974cb6a9f10fbd08db964ee0d9f074ef430db6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 7 Mar 2025 11:55:12 -0800
+Subject: [PATCH] Remove whitespace in operator"" _json
+
+Clang 20+ errors about this whitespace.
+
+Fixes
+git/3rdParty/json/include/json.hpp:24428:58: error: identifier '_json' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator]
+ 24428 |     using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+       |                                              ~~~~~~~~~~~~^~~~~
+       |                                              operator""_json
+
+Upstream-Status: Backport [ Its fixed in json import post 2024.9 release ]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ 3rdParty/json/include/json.hpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/3rdParty/json/include/json.hpp b/3rdParty/json/include/json.hpp
+index 60ba1df..6eceb7c 100644
+--- a/3rdParty/json/include/json.hpp
++++ b/3rdParty/json/include/json.hpp
+@@ -24353,7 +24353,7 @@ inline namespace json_literals
+ /// @brief user-defined string literal for JSON values
+ /// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
+ JSON_HEDLEY_NON_NULL(1)
+-inline nlohmann::json operator "" _json(const char* s, std::size_t n)
++inline nlohmann::json operator ""_json(const char* s, std::size_t n)
+ {
+     return nlohmann::json::parse(s, s + n);
+ }
+@@ -24361,7 +24361,7 @@ inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+ /// @brief user-defined string literal for JSON pointer
+ /// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/
+ JSON_HEDLEY_NON_NULL(1)
+-inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
++inline nlohmann::json::json_pointer operator ""_json_pointer(const char* s, std::size_t n)
+ {
+     return nlohmann::json::json_pointer(std::string(s, n));
+ }
+@@ -24425,8 +24425,8 @@ inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC
+ }  // namespace std
+ 
+ #if JSON_USE_GLOBAL_UDLS
+-    using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+-    using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
++    using nlohmann::literals::json_literals::operator ""_json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
++    using nlohmann::literals::json_literals::operator ""_json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+ #endif
+ 
+ // #include <nlohmann/detail/macro_unscope.hpp>
diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch
deleted file mode 100644
index f2e210fc67..0000000000
--- a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 298dec6f87061914c85049faca3d0ff3310d1794 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 6 May 2024 12:15:30 -0700
-Subject: [PATCH] initialize timespec variable
-
-Fixes build warnings with GCC14
-
-/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp: In constructor 'pcpp::RawPacket::RawPacket(const uint8_t*, int, timeval, bool, pcpp::LinkLayerType)':
-/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: error: 'nsec_time.timespec::<anonymous>' is used uninitialized [-Werror=uninitialized]
-   23 |         timespec nsec_time;
-      |                  ^~~~~~~~~
-cc1plus: all warnings being treated as errors
-
-Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1389]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Packet++/src/RawPacket.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp
-index 8ad52d52..07dbbbe2 100644
---- a/Packet++/src/RawPacket.cpp
-+++ b/Packet++/src/RawPacket.cpp
-@@ -20,7 +20,7 @@ void RawPacket::init(bool deleteRawDataAtDestructor)
- 
- RawPacket::RawPacket(const uint8_t* pRawData, int rawDataLen, timeval timestamp, bool deleteRawDataAtDestructor, LinkLayerType layerType)
- {
--       timespec nsec_time;
-+       timespec nsec_time = {};
-        TIMEVAL_TO_TIMESPEC(&timestamp, &nsec_time);
-        init(deleteRawDataAtDestructor);
-        setRawData(pRawData, rawDataLen, nsec_time, layerType);
--- 
-2.45.0
-
diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch
deleted file mode 100644
index b6389e0e3f..0000000000
--- a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 742f564ee80749e9f1f3363092775545e37c0f87 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 9 May 2024 17:02:09 -0700
-Subject: [PATCH] packet++: Initialize m_ExternalRawData in IDnsResource
- constructor
-
-Fixes following warning with GCC-14
-
-Packet++/src/DnsResource.cpp:29:24: error: '*this.pcpp::IDnsResource::m_ExternalRawData' may be used uninitialized [-Werror=maybe-uninitialized]
-   29 |                 return m_ExternalRawData;
-      |                        ^~~~~~~~~~~~~~~~~
-
-Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1391]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Packet++/src/DnsResource.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp
-index fec1bf05..c1f97041 100644
---- a/Packet++/src/DnsResource.cpp
-+++ b/Packet++/src/DnsResource.cpp
-@@ -10,7 +10,7 @@ namespace pcpp
- {
- 
- IDnsResource::IDnsResource(DnsLayer* dnsLayer, size_t offsetInLayer)
--       : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr)
-+       : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr), m_ExternalRawData(nullptr)
- {
-        char decodedName[4096];
-        m_NameLength = decodeName((const char*)getRawData(), decodedName);
--- 
-2.45.0
-
diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_24.09.bb
index 9db0222172..a04102aa42 100644
--- a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb
+++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_24.09.bb
@@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f"
 DEPENDS = "libpcap"
 
 SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master \
-           file://0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch \
-           file://0001-initialize-timespec-variable.patch"
+           file://0001-Remove-whitespace-in-operator-_json.patch \
+          "
+SRCREV = "4af4b8b04e6d5dd40b8e69cc30c5c1f62e7fe368"
 
-SRCREV = "4cf8ed44f9dd145f874dc1dd747dfefcfcab75be"
-
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch b/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch
deleted file mode 100644
index dfd1f98759..0000000000
--- a/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-CVE: CVE-2023-35789
-Upstream-Status: Backport [ https://github.com/alanxz/rabbitmq-c/commit/463054383fbeef889b409a7f843df5365288e2a0 ]
-Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
-
-From 463054383fbeef889b409a7f843df5365288e2a0 Mon Sep 17 00:00:00 2001
-From: Christian Kastner <ckk@kvr.at>
-Date: Tue, 13 Jun 2023 14:21:52 +0200
-Subject: [PATCH] Add option to read username/password from file (#781)
-
-* Add option to read username/password from file
----
- tools/common.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 66 insertions(+)
-
-diff --git a/tools/common.c b/tools/common.c
-index 73b47e25..7efe557b 100644
---- a/tools/common.c
-+++ b/tools/common.c
-@@ -18,6 +18,11 @@
- #include "compat.h"
- #endif
- 
-+/* For when reading auth data from a file */
-+#define MAXAUTHTOKENLEN 128
-+#define USERNAMEPREFIX "username:"
-+#define PASSWORDPREFIX "password:"
-+
- void die(const char *fmt, ...) {
-   va_list ap;
-   va_start(ap, fmt);
-@@ -125,6 +130,7 @@ static char *amqp_vhost;
- static char *amqp_username;
- static char *amqp_password;
- static int amqp_heartbeat = 0;
-+static char *amqp_authfile;
- #ifdef WITH_SSL
- static int amqp_ssl = 0;
- static char *amqp_cacert = "/etc/ssl/certs/cacert.pem";
-@@ -147,6 +153,8 @@ struct poptOption connect_options[] = {
-      "the password to login with", "password"},
-     {"heartbeat", 0, POPT_ARG_INT, &amqp_heartbeat, 0,
-      "heartbeat interval, set to 0 to disable", "heartbeat"},
-+    {"authfile", 0, POPT_ARG_STRING, &amqp_authfile, 0,
-+     "path to file containing username/password for authentication", "file"},
- #ifdef WITH_SSL
-     {"ssl", 0, POPT_ARG_NONE, &amqp_ssl, 0, "connect over SSL/TLS", NULL},
-     {"cacert", 0, POPT_ARG_STRING, &amqp_cacert, 0,
-@@ -158,6 +166,50 @@ struct poptOption connect_options[] = {
- #endif /* WITH_SSL */
-     {NULL, '\0', 0, NULL, 0, NULL, NULL}};
- 
-+void read_authfile(const char *path) {
-+  size_t n;
-+  FILE *fp = NULL;
-+  char token[MAXAUTHTOKENLEN];
-+
-+  if ((amqp_username = malloc(MAXAUTHTOKENLEN)) == NULL ||
-+      (amqp_password = malloc(MAXAUTHTOKENLEN)) == NULL) {
-+    die("Out of memory");
-+  } else if ((fp = fopen(path, "r")) == NULL) {
-+    die("Could not read auth data file %s", path);
-+  }
-+
-+  if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL ||
-+      strncmp(token, USERNAMEPREFIX, strlen(USERNAMEPREFIX))) {
-+    die("Malformed auth file (missing username)");
-+  }
-+  strncpy(amqp_username, &token[strlen(USERNAMEPREFIX)], MAXAUTHTOKENLEN);
-+  /* Missing newline means token was cut off */
-+  n = strlen(amqp_username);
-+  if (amqp_username[n - 1] != '\n') {
-+    die("Username too long");
-+  } else {
-+    amqp_username[n - 1] = '\0';
-+  }
-+
-+  if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL ||
-+      strncmp(token, PASSWORDPREFIX, strlen(PASSWORDPREFIX))) {
-+    die("Malformed auth file (missing password)");
-+  }
-+  strncpy(amqp_password, &token[strlen(PASSWORDPREFIX)], MAXAUTHTOKENLEN);
-+  /* Missing newline means token was cut off */
-+  n = strlen(amqp_password);
-+  if (amqp_password[n - 1] != '\n') {
-+    die("Password too long");
-+  } else {
-+    amqp_password[n - 1] = '\0';
-+  }
-+
-+  (void)fgetc(fp);
-+  if (!feof(fp)) {
-+    die("Malformed auth file (trailing data)");
-+  }
-+}
-+
- static void init_connection_info(struct amqp_connection_info *ci) {
-   ci->user = NULL;
-   ci->password = NULL;
-@@ -237,6 +289,8 @@ static void init_connection_info(struct amqp_connection_info *ci) {
-   if (amqp_username) {
-     if (amqp_url) {
-       die("--username and --url options cannot be used at the same time");
-+    } else if (amqp_authfile) {
-+      die("--username and --authfile options cannot be used at the same time");
-     }
- 
-     ci->user = amqp_username;
-@@ -245,11 +299,23 @@ static void init_connection_info(struct amqp_connection_info *ci) {
-   if (amqp_password) {
-     if (amqp_url) {
-       die("--password and --url options cannot be used at the same time");
-+    } else if (amqp_authfile) {
-+      die("--password and --authfile options cannot be used at the same time");
-     }
- 
-     ci->password = amqp_password;
-   }
- 
-+  if (amqp_authfile) {
-+    if (amqp_url) {
-+      die("--authfile and --url options cannot be used at the same time");
-+    }
-+
-+    read_authfile(amqp_authfile);
-+    ci->user = amqp_username;
-+    ci->password = amqp_password;
-+  }
-+
-   if (amqp_vhost) {
-     if (amqp_url) {
-       die("--vhost and --url options cannot be used at the same time");
diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.15.0.bb
index ea80ec3344..4fd6302f2c 100644
--- a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb
+++ b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.15.0.bb
@@ -4,12 +4,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7e12f6e40e662e039e2f02b4893011ec"
 LICENSE = "MIT"
 
 SRC_URI = "git://github.com/alanxz/rabbitmq-c.git;branch=master;protocol=https \
-           file://CVE-2023-35789.patch \
 "
-# v0.13.0-master
-SRCREV = "974d71adceae6d742ae20a4c880d99c131f1460a"
+SRCREV = "84b81cd97a1b5515d3d4b304796680da24c666d8"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "popt openssl"
 
diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.10.0.bb
index d9cca404d7..02a97cd6e3 100644
--- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
+++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.10.0.bb
@@ -6,11 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses"
 
 SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https"
-SRCREV = "d067bd802e44f0e6a747aabcc311ada2175fd550"
+SRCREV = "a88cab6d2e764e22cac232ef8d5af039d41b8280"
 
-PV = "0.9.8+git"
-
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 
diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.2.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.5.bb
index f23692816c..59322dae09 100644
--- a/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.2.bb
+++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.5.bb
@@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz \
     file://ser2net.service \
 "
 
-SRC_URI[sha256sum] = "63bafcd65bb9270a93b7d5cdde58ccf4d279603ff6d044ac4b484a257cda82ce"
+SRC_URI[sha256sum] = "96dfc3fd06b1bf4d7c1f46d7e8cc1eff555de64f419d76f57bd0346e000f9781"
 
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net"
 
diff --git a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb
index 9e54968633..e5a3f88867 100644
--- a/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb
+++ b/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb
@@ -11,11 +11,10 @@ SRC_URI = "http://smstools3.kekekasvi.com/packages/${BP}.tar.gz \
            file://0001-Make-extern-declarations-to-avoid-duplicate-var-defi.patch \
            "
 
-SRC_URI[md5sum] = "6a9f038fb38a49cc3a4f8f14a88fb8af"
 SRC_URI[sha256sum] = "a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084"
 
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 EXTRA_OEMAKE += "LFLAGS='${LDFLAGS}'"
 
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb
index e083039232..56af002d0b 100644
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb
+++ b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb
@@ -5,7 +5,6 @@ DEPENDS = "glib-2.0 dbus hostpython-runtime-native dbus-native dbus-glib libxslt
 LICENSE = "LGPL-2.1-or-later"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BP}.tar.gz"
-SRC_URI[md5sum] = "cbeb0a24acc26e7f095be281c324da69"
 SRC_URI[sha256sum] = "9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7f7d5eb"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e"
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch b/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch
deleted file mode 100644
index 2cd2c78c31..0000000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---- a/extensions/Makefile.am
-+++ b/extensions/Makefile.am
-@@ -37,8 +37,8 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
-                --xinclude $(tools_dir)/identity.xsl \
-                $< > $@
- 
--extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
-+extensions.html _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/doc-generator.xsl
-        $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
-                $(tools_dir)/doc-generator.xsl \
-                $< > $@
- 
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb
deleted file mode 100644
index 039cfc3a89..0000000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Telepathy IRC connection manager"
-DESCRIPTION = "Telepathy implementation of the Internet Relay Chat protocols."
-HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
-DEPENDS = "glib-2.0 dbus telepathy-glib openssl libxslt-native"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9"
-
-SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
-           file://fix-svc-gtk-doc.h-target.patch"
-SRC_URI[md5sum] = "92a2de5198284cbd3c430b0d1a971a86"
-SRC_URI[sha256sum] = "3013ad4b38d14ee630b8cc8ada5e95ccaa849b9a6fe15d2eaf6d0717d76f2fab"
-
-inherit autotools pkgconfig ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
-
-FILES:${PN} += "${datadir}/telepathy \
-                ${datadir}/dbus-1"
-
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.22.0.bb
index 23db052b9e..9c50317eff 100644
--- a/meta-oe/recipes-connectivity/thrift/thrift_0.20.0.bb
+++ b/meta-oe/recipes-connectivity/thrift/thrift_0.22.0.bb
@@ -9,8 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c40a383cb3f747e0c7abbf1482f194f0 \
 DEPENDS = "thrift-native boost flex-native bison-native openssl zlib"
 
 SRC_URI = "https://downloads.apache.org/${BPN}/${PV}/${BP}.tar.gz \
-           file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch"
-SRC_URI[sha256sum] = "b5d8311a779470e1502c027f428a1db542f5c051c8e1280ccd2163fa935ff2d6"
+           file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \
+           "
+SRC_URI[sha256sum] = "794a0e455787960d9f27ab92c38e34da27e8deeda7a5db0e59dc64a00df8a1e5"
 
 BBCLASSEXTEND = "native nativesdk"
 
diff --git a/meta-oe/recipes-connectivity/transmission/transmission_4.0.5.bb b/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb
index b9ed3d925d..5d0dd6a389 100644
--- a/meta-oe/recipes-connectivity/transmission/transmission_4.0.5.bb
+++ b/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://transmissionbt.com/"
 LICENSE = "MIT & GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ba8199e739948e198310093de27175fa"
 
-DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native"
+DEPENDS = "curl libevent libpsl gnutls openssl libtool intltool-native glib-2.0-native"
 RDEPENDS:${PN}-web = "${PN}"
 
 SRC_URI = " \
@@ -12,14 +12,15 @@ SRC_URI = " \
         file://transmission-daemon \
 "
 
-# Transmission release 4.0.5
-SRCREV = "a6fe2a64aa7eca089f96006cf082a12f0cde937f"
+# Transmission release 4.0.6
+SRCREV = "38c164933e9f77c110b48fe745861c3b98e3d83e"
 
-S = "${WORKDIR}/git"
 
 inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg
 
-PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
+LDFLAGS:append:riscv32 = " -latomic"
+
+PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gtk', '', d)} \
                  ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
 
 PACKAGECONFIG[gtk] = "-DENABLE_GTK=ON,-DENABLE_GTK=OFF,gtk4 gtkmm4,"
diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
index 569d6a41cf..5a880ed6d2 100644
--- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
+++ b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
@@ -14,7 +14,6 @@ PV = "1.1.2+git"
 SRCREV = "01c94c77f59404924f1c46d99c4e5e0c7817281b"
 SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += "--without-preflight"
 
diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-wfa_cmdproc-Store-return-value-into-location.patch b/meta-oe/recipes-connectivity/wifi-test-suite/files/0005-wfa_cmdproc-Store-return-value-into-location.patch
index 074f0fe7bb..074f0fe7bb 100644
--- a/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-wfa_cmdproc-Store-return-value-into-location.patch
+++ b/meta-oe/recipes-connectivity/wifi-test-suite/files/0005-wfa_cmdproc-Store-return-value-into-location.patch
diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/files/0006-make-CFLAGS-appendable.patch b/meta-oe/recipes-connectivity/wifi-test-suite/files/0006-make-CFLAGS-appendable.patch
new file mode 100644
index 0000000000..9d20403866
--- /dev/null
+++ b/meta-oe/recipes-connectivity/wifi-test-suite/files/0006-make-CFLAGS-appendable.patch
@@ -0,0 +1,60 @@
+From ef4ead927f69452c95b80e5bf042f67897f67e9d Mon Sep 17 00:00:00 2001
+From: Alper Ak <alperyasinak1@gmail.com>
+Date: Mon, 23 Jun 2025 15:46:37 +0300
+Subject: [PATCH] Allow extra CFLAGS via EXTRA_CFLAGS variable
+
+This patch introduces an EXTRA_CFLAGS variable to the Makefile, which is
+appended to CFLAGS. This allows users or external build systems to pass
+their additional compiler flags.
+
+Upstream-Status: Submitted [https://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT/pull/61]
+
+Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
+---
+ Makefile.inc | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.inc b/Makefile.inc
+index 0094bdf..76729b9 100644
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -22,28 +22,29 @@ UCC=ucc
+ CON=console_src
+ WTG=WTGService
+ MAKE?=make
++EXTRA_CFLAGS ?=
+ 
+ # This is for WMM-PS
+ #for Ext TG
+-#CFLAGS = -g -O2 -D_REENTRANT -DWFA_WMM_PS_EXT -Wall -I../inc
++#CFLAGS = -g -O2 -D_REENTRANT -DWFA_WMM_PS_EXT -Wall -I../inc ${EXTRA_CFLAGS}
+ 
+ ## for WMM-AC, WMM-PS, Voice, PMF, TDLS Test-Bed 
+-#CFLAGS = -g -O2 -D_REENTRANT  -DWFA_WMM_PS_EXT -DWFA_WMM_AC -DWFA_VOICE_EXT -DWFA_STA_TB -Wall -I../inc
++#CFLAGS = -g -O2 -D_REENTRANT  -DWFA_WMM_PS_EXT -DWFA_WMM_AC -DWFA_VOICE_EXT -DWFA_STA_TB -Wall -I../inc ${EXTRA_CFLAGS}
+ 
+ ## for WMM-AC, WMM-PS Test-Bed
+-#CFLAGS = -g -O2 -D_REENTRANT  -DWFA_WMM_PS_EXT -DWFA_WMM_AC -DWFA_STA_TB -Wall -I../inc
++#CFLAGS = -g -O2 -D_REENTRANT  -DWFA_WMM_PS_EXT -DWFA_WMM_AC -DWFA_STA_TB -Wall -I../inc ${EXTRA_CFLAGS}
+ 
+ ## for non-Test-Bed WMM-AC, WMM-PS and Voice
+-#CFLAGS = -g -O2 -D_REENTRANT  -DWFA_WMM_PS_EXT -DWFA_WMM_AC -DWFA_VOICE_EXT -Wall -I../inc
++#CFLAGS = -g -O2 -D_REENTRANT  -DWFA_WMM_PS_EXT -DWFA_WMM_AC -DWFA_VOICE_EXT -Wall -I../inc ${EXTRA_CFLAGS}
+ 
+ ## for PC-ENDPOINT
+-#CFLAGS = -g -O2 -D_REENTRANT  -DWFA_WMM_PS_EXT -DWFA_WMM_AC -DWFA_VOICE_EXT -DWFA_PC_CONSOLE -Wall -I../inc
++#CFLAGS = -g -O2 -D_REENTRANT  -DWFA_WMM_PS_EXT -DWFA_WMM_AC -DWFA_VOICE_EXT -DWFA_PC_CONSOLE -Wall -I../inc ${EXTRA_CFLAGS}
+ 
+ ## for PC-ENDPOINT No Voice
+-#CFLAGS = -g -O2 -D_REENTRANT  -DWFA_WMM_PS_EXT -DWFA_WMM_AC -DWFA_PC_CONSOLE -DWFA_STA_TB -Wall -I../inc
++#CFLAGS = -g -O2 -D_REENTRANT  -DWFA_WMM_PS_EXT -DWFA_WMM_AC -DWFA_PC_CONSOLE -DWFA_STA_TB -Wall -I../inc ${EXTRA_CFLAGS}
+ 
+ # This is for WPA2 as default
+-CFLAGS = -g -O2 -D_REENTRANT -Wall -I../inc
++CFLAGS = -g -O2 -D_REENTRANT -Wall -I../inc ${EXTRA_CFLAGS}
+ 
+ DUTLIBS = ../lib/libwfa_dut.a -lpthread
+ CALIBS = ../lib/libwfa_ca.a -lpthread
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb
index eda01ca388..357789ad88 100644
--- a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb
+++ b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb
@@ -7,7 +7,6 @@ LICENSE  = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0542427ed5c315ca34aa09ae7a85ed32"
 SECTION = "test"
 
-S = "${WORKDIR}/git"
 SRCREV = "12e85fbeca8ca21a632d18e55089a8a7606d64aa"
 SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git;branch=master;protocol=https \
         file://0001-Use-toolchain-from-environment-variables.patch \
@@ -15,7 +14,8 @@ SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git;branch=m
         file://0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch \
         file://0004-run-ranlib-per-library-and-use-AR.patch \
         file://fno-common.patch \
-        file://0001-wfa_cmdproc-Store-return-value-into-location.patch \
+        file://0005-wfa_cmdproc-Store-return-value-into-location.patch \
+        file://0006-make-CFLAGS-appendable.patch \
 "
 
 # to avoid host path QA error
@@ -38,3 +38,10 @@ do_install () {
 }
 
 RDEPENDS:${PN} = "wpa-supplicant"
+
+# http://errors.yoctoproject.org/Errors/Details/766893/
+# wfa_cmdproc.c:467:68: error: passing argument 3 of 'strtok_r' from incompatible pointer type [-Wincompatible-pointer-types]
+# wfa_cs.c:4175:57: error: initialization of 'caStaGetEventDetails_t *' {aka 'struct ca_sta_get_event_details *'} from incompatible pointer type 'caStaMngServ_t *' {aka 'struct ca_sta_manage_service *'} [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
+
+export EXTRA_CFLAGS = "${CFLAGS}"
diff --git a/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb
index 99e3ccacac..165872e2b1 100644
--- a/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb
+++ b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb
@@ -13,12 +13,15 @@ SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.
            file://typo_pon.wvdial.1.patch \
            file://musl-support.patch \
           "
-SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de"
 SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82"
 
+# code.google.com/archive page is generated by javascript from JSON and does not
+# allow devtool to find the latest version
+UPSTREAM_VERSION_UNKNOWN = "1"
+
 COMPATIBLE_HOST:libc-musl = "null"
 EXTRA_OEMAKE = ""
-export WVLINK="${LD}"
+export WVLINK = "${LD}"
 
 PARALLEL_MAKE = ""
 
diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
index 3453f3e964..4bb4c11d6f 100644
--- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
+++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
@@ -25,9 +25,12 @@ SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.
            file://0001-Fix-narrowing-conversion-error.patch \
            "
 
-SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
 SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633"
 
+# The code.google.com/archive page is generated using Javascript from a JSON file and does not 
+# allow devtool to find the latest version
+UPSTREAM_VERSION_UNKNOWN = "1"
+
 COMPATIBLE_HOST:libc-musl = "null"
 
 inherit autotools-brokensep pkgconfig
diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix/0001-initialize-msghdr-portably.patch b/meta-oe/recipes-connectivity/zabbix/zabbix/0001-initialize-msghdr-portably.patch
deleted file mode 100644
index a7a1dc1986..0000000000
--- a/meta-oe/recipes-connectivity/zabbix/zabbix/0001-initialize-msghdr-portably.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 37b662cf44e14b33e93759d4b129d23095b41372 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 31 Aug 2022 23:55:02 -0700
-Subject: [PATCH] initialize msghdr portably
-
-on linux we have musl as an option for system C library and current
-initialization assumes the structure to be same as glibc, therefore
-initialize the elements of structure instead, so it can work on both
-glibc and musl.
-
-Fixes
-net.c:115:79: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' [-Wint-conversion]
-        struct msghdr           s_msg = { (void *)&s_sa, sizeof(struct sockaddr_nl), s_io, 1, NULL, 0, 0};
-                                                                                              ^~~~
-
-Upstream-Status: Submitted [https://github.com/zabbix/zabbix/pull/77]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/libs/zbxsysinfo/linux/net.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/libs/zbxsysinfo/linux/net.c b/src/libs/zbxsysinfo/linux/net.c
-index 1425a3604d..98f03de0dd 100644
---- a/src/libs/zbxsysinfo/linux/net.c
-+++ b/src/libs/zbxsysinfo/linux/net.c
-@@ -114,13 +114,21 @@ static int        find_tcp_port_by_state_nl(unsigned short port, int state, int *found)
- 
-        struct sockaddr_nl      s_sa = { AF_NETLINK, 0, 0, 0 };
-        struct iovec            s_io[1] = { { &request, sizeof(request) } };
--       struct msghdr           s_msg = { (void *)&s_sa, sizeof(struct sockaddr_nl), s_io, 1, NULL, 0, 0};
-+       struct msghdr           s_msg = { 0 };
-+       s_msg.msg_name          = (void *)&s_sa;
-+       s_msg.msg_namelen       = sizeof(struct sockaddr_nl);
-+       s_msg.msg_iov           = s_io;
-+       s_msg.msg_iovlen        = 1;
- 
-        char                    buffer[BUFSIZ] = { 0 };
- 
-        struct sockaddr_nl      r_sa = { AF_NETLINK, 0, 0, 0 };
-        struct iovec            r_io[1] = { { buffer, BUFSIZ } };
--       struct msghdr           r_msg = { (void *)&r_sa, sizeof(struct sockaddr_nl), r_io, 1, NULL, 0, 0};
-+       struct msghdr           r_msg = { 0 };
-+       r_msg.msg_name          = (void *)&r_sa;
-+       r_msg.msg_namelen       = sizeof(struct sockaddr_nl);
-+       r_msg.msg_iov           = r_io;
-+       r_msg.msg_iovlen        = 1;
- 
-        struct nlmsghdr         *r_hdr;
- 
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.9.bb
index 46c09a02a5..a7c5478b64 100644
--- a/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb
+++ b/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.9.bb
@@ -17,18 +17,17 @@ organisations with a few servers and for large companies with a \
 multitude of servers."
 HOMEPAGE = "http://www.zabbix.com/"
 SECTION = "Applications/Internet"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=300e938ad303147fede2294ed78fe02e"
+LICENSE = "AGPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb1e647870add0502f8f010b19de32af"
 DEPENDS  = "libevent libpcre openldap virtual/libiconv zlib"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRC_URI = "https://cdn.zabbix.com/zabbix/sources/stable/6.2/${BPN}-${PV}.tar.gz \
+SRC_URI = "https://cdn.zabbix.com/zabbix/sources/stable/7.0/${BPN}-${PV}.tar.gz \
     file://0001-Fix-configure.ac.patch \
-    file://0001-initialize-msghdr-portably.patch \
     file://zabbix-agent.service \
 "
-SRC_URI[sha256sum] = "6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d"
+SRC_URI[sha256sum] = "8d7755576f30b5d6099ff5e3574549fc248229c017f9753828565174125069f6"
 
 inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd
 
diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_4.10.0.bb b/meta-oe/recipes-connectivity/zeromq/cppzmq_4.11.0.bb
index dcea339dfd..012dbe5f57 100644
--- a/meta-oe/recipes-connectivity/zeromq/cppzmq_4.10.0.bb
+++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_4.11.0.bb
@@ -4,17 +4,15 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94"
 DEPENDS = "zeromq"
 
-SRCREV = "c94c20743ed7d4aa37835a5c46567ab0790d4acc"
+SRCREV = "3bcbd9dad2f57180aacd4b4aea292a74f0de7ef4"
 
 SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
 EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF"
 
-PACKAGES = "${PN}-dev"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS:${PN}-dev = "zeromq-dev zeromq-staticdev"
-DEV_PKG_DEPENDENCY = ""
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb
index 5ae72df862..33a339f5c3 100644
--- a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb
+++ b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb
@@ -6,10 +6,10 @@ DEPENDS = "zeromq"
 
 SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "471e9ec120fc66a2fe2aae14359e3cfa"
 SRC_URI[sha256sum] = "5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377daa6ac39"
 
 UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb
index 555458217a..7569d3200d 100644
--- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb
+++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb
@@ -13,6 +13,7 @@ SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}
 SRC_URI[sha256sum] = "6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases"
+UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+\.\d+\.\d+)"
 
 inherit cmake ptest pkgconfig
 
diff --git a/meta-oe/recipes-core/basu/basu_0.2.1.bb b/meta-oe/recipes-core/basu/basu_0.2.1.bb
index 1b4d5a0fe5..330fe1c607 100644
--- a/meta-oe/recipes-core/basu/basu_0.2.1.bb
+++ b/meta-oe/recipes-core/basu/basu_0.2.1.bb
@@ -8,7 +8,6 @@ SRC_URI = "git://git.sr.ht/~emersion/basu;protocol=https;branch=master"
 
 DEPENDS += "gperf-native"
 
-S = "${WORKDIR}/git"
 PV = "0.2.1+git"
 SRCREV = "a08cf5a575325435040d35710dbac3d0c32b1676"
 
diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb
deleted file mode 100644
index e89d1327e8..0000000000
--- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "D-Bus wrapper in C++ for dbus"
-HOMEPAGE = "https://dbus-cxx.github.io/"
-BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues"
-SECTION = "base"
-LICENSE = "LGPL-3.0-or-later | BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308"
-
-SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https"
-SRCREV = "732a5becb4349e02ffce407a3fd4d75cc3d82421"
-
-DEPENDS = "\
-        dbus \
-        libsigc++-3 \
-"
-
-RDEPENDS:${PN} = "\
-        dbus \
-        libsigc++-3 \
-"
-
-S = "${WORKDIR}/git"
-
-inherit pkgconfig cmake
-
-OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb
new file mode 100644
index 0000000000..0908409e1e
--- /dev/null
+++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb
@@ -0,0 +1,42 @@
+SUMMARY = "D-Bus implementation in C++"
+HOMEPAGE = "https://dbus-cxx.github.io/"
+BUGTRACKER = "https://github.com/dbus-cxx/dbus-cxx/issues"
+SECTION = "base"
+LICENSE = "LGPL-3.0-or-later | BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308"
+
+SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https"
+SRCREV = "f2637e726207ecfbdaaf02744e1b36e54f929c9d"
+
+DEPENDS = "libsigc++-3"
+
+RDEPENDS:${PN}:class-target = "${VIRTUAL-RUNTIME_dbus}"
+
+
+inherit pkgconfig cmake
+
+OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
+EXTRA_OECMAKE = "-DBUILD_TESTING=OFF -DTOOLS_BUNDLED_CPPGENERATE=OFF"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG:class-native ?= "tools"
+PACKAGECONFIG:class-nativesdk ?= "tools"
+
+PACKAGECONFIG[tools] = "-DENABLE_TOOLS=ON,-DENABLE_TOOLS=OFF,popt cppgenerate dbus"
+PACKAGECONFIG[glib] = "-DENABLE_GLIB_SUPPORT=ON,-DENABLE_GLIB_SUPPORT=OFF,glib-2.0"
+PACKAGECONFIG[uv] = "-DENABLE_UV_SUPPORT=ON,-DENABLE_UV_SUPPORT=OFF,libuv"
+
+PACKAGES =+ " ${PN}-tools ${PN}-glib ${PN}-uv ${PN}-glib-dev ${PN}-uv-dev "
+FILES:${PN}-tools = "${bindir}/dbus-cxx-xml2cpp ${bindir}/dbus-cxx-introspect"
+FILES:${PN}-glib = "${libdir}/libdbus-cxx-glib.so.* "
+FILES:${PN}-glib-dev = "${includedir}/dbus-cxx-glib-2.0/* \
+  ${libdir}/pkgconfig/dbus-cxx-glib-2.0.pc \
+  ${libdir}/libdbus-cxx-glib.so \
+  "
+FILES:${PN}-uv = "${libdir}/libdbus-cxx-uv.so.* "
+FILES:${PN}-uv-dev = "${includedir}/dbus-cxx-uv-2.0/* \
+  ${libdir}/pkgconfig/dbus-cxx-uv-2.0.pc\
+  ${libdir}/libdbus-cxx-uv.so \
+  "
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-core/dbus/dbus-broker_32.bb b/meta-oe/recipes-core/dbus/dbus-broker_32.bb
deleted file mode 100644
index 900b5e3ac8..0000000000
--- a/meta-oe/recipes-core/dbus/dbus-broker_32.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "dbus broker"
-DESCRIPTION = "Drop-in replacement for dbus-daemon."
-
-SECTION = "base"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8"
-
-SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz"
-SRC_URI[sha256sum] = "bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de"
-
-UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases"
-
-inherit meson pkgconfig systemd features_check
-
-DEPENDS = "expat systemd"
-DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux (>= 3.2)', '', d)}"
-DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit (>= 3.0)', '', d)}"
-
-RDEPENDS:${PN} += "dbus-common"
-
-REQUIRED_DISTRO_FEATURES = "systemd"
-
-SYSTEMD_SERVICE:${PN} = "${BPN}.service"
-
-FILES:${PN} += "${systemd_system_unitdir}"
-FILES:${PN} += "${systemd_user_unitdir}"
-FILES:${PN} += "${nonarch_libdir}/systemd/catalog"
-
-EXTRA_OEMESON += " -Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
-EXTRA_OEMESON += " -Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
-
diff --git a/meta-oe/recipes-core/dbus/dbus-broker_36.bb b/meta-oe/recipes-core/dbus/dbus-broker_36.bb
new file mode 100644
index 0000000000..8c8f2d2469
--- /dev/null
+++ b/meta-oe/recipes-core/dbus/dbus-broker_36.bb
@@ -0,0 +1,38 @@
+SUMMARY = "dbus broker"
+DESCRIPTION = "Drop-in replacement for dbus-daemon."
+SECTION = "base"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8"
+DEPENDS = "\
+    expat \
+    systemd \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit (>= 3.0)', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux (>= 3.2)', '', d)} \
+"
+
+SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/${BP}.tar.xz"
+SRC_URI[sha256sum] = "d333d99bd2688135b6d6961e7ad1360099d186078781c87102230910ea4e162b"
+
+UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+)"
+
+SYSTEMD_SERVICE:${PN} = "${BPN}.service"
+
+inherit meson pkgconfig systemd features_check
+
+EXTRA_OEMESON += "-Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
+EXTRA_OEMESON += "-Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}"
+
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+do_install:append() {
+    install -d ${D}${sysconfdir}/systemd/user
+    ln -s ${systemd_user_unitdir}/dbus-broker.service ${D}${sysconfdir}/systemd/user/dbus.service
+}
+
+RCONFLICTS:${PN} = "dbus"
+RDEPENDS:${PN} += "dbus-common"
+
+FILES:${PN} += "${nonarch_libdir}/systemd/catalog"
+FILES:${PN} += "${systemd_system_unitdir}"
+FILES:${PN} += "${systemd_user_unitdir}"
diff --git a/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb
index cbe82d42e7..e99bf28ce5 100644
--- a/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb
+++ b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb
@@ -8,7 +8,10 @@ PV = "0.0.0+git"
 SRC_URI = "git://github.com/alban/dbus-daemon-proxy;branch=master;protocol=https \
            file://0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch \
            "
-S = "${WORKDIR}/git"
+
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb b/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb
index 8e8f544e8e..e24ebe447a 100644
--- a/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb
+++ b/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb
@@ -15,9 +15,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/dbus-cplusplus/dbus-c++/${PV}/${BP}.tar
            file://0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch \
            file://0001-pipe.c-Use-a-string-instead-of-char.patch \
            "
-SRC_URI[md5sum] = "e752116f523fa88ef041e63d3dee4de2"
 SRC_URI[sha256sum] = "bc11ac297b3cb010be904c72789695543ee3fdf3d75cdc8225fd371385af4e61"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/dbus-cplusplus/files"
+UPSTREAM_CHECK_REGEX = "libdbus-c---(?P<pver>\d+(\.\d+)+)"
+
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-ecore --disable-examples --disable-tests"
diff --git a/meta-oe/recipes-core/emlog/emlog.inc b/meta-oe/recipes-core/emlog/emlog.inc
index 631e52f388..ff2a106c6e 100644
--- a/meta-oe/recipes-core/emlog/emlog.inc
+++ b/meta-oe/recipes-core/emlog/emlog.inc
@@ -4,9 +4,11 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master"
+SRC_URI += "file://0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch"
 SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca"
 PV = "0.70+git"
-S = "${WORKDIR}/git"
+
+CVE_PRODUCT = "nicupavel:emlog"
 
 EXTRA_OEMAKE += " \
     CFLAGS='${TARGET_CFLAGS}' \
diff --git a/meta-oe/recipes-core/emlog/emlog/0001-Remove-modules_clean-from-clean-target.patch b/meta-oe/recipes-core/emlog/files/0001-Remove-modules_clean-from-clean-target.patch
index beba528b33..beba528b33 100644
--- a/meta-oe/recipes-core/emlog/emlog/0001-Remove-modules_clean-from-clean-target.patch
+++ b/meta-oe/recipes-core/emlog/files/0001-Remove-modules_clean-from-clean-target.patch
diff --git a/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch b/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch
new file mode 100644
index 0000000000..86f719b0bb
--- /dev/null
+++ b/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch
@@ -0,0 +1,32 @@
+From dca01ea62833249d78ac3bdf277b73424bf93e89 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 14 Dec 2024 09:55:10 -0800
+Subject: [PATCH] emlog: Do not use no_llseek with kernel 6.12.0+
+
+no_llseek is finally gone with 6.12-rc1 [1]
+
+[1] https://github.com/torvalds/linux/commit/cb787f4ac0c2e439ea8d7e6387b925f74576bdf8
+
+Upstream-Status: Submitted [https://github.com/nicupavel/emlog/pull/16]
+---
+ emlog.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/emlog.c b/emlog.c
+index 2ead738..b45c72d 100644
+--- a/emlog.c
++++ b/emlog.c
+@@ -464,7 +464,12 @@ static const struct file_operations emlog_fops = {
+     .open = emlog_open,
+     .release = emlog_release,
+     .poll = emlog_poll,
+-    .llseek = no_llseek,        /* no_llseek by default introduced at v2.6.37-rc1 */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
++    /* no_llseek by default introduced at v2.6.37-rc1 and
++     * removed in 6.12.0
++     */
++    .llseek = no_llseek,
++#endif
+     .owner = THIS_MODULE,
+ };
+ 
diff --git a/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch b/meta-oe/recipes-core/emlog/files/Drop-use-of-error-h.patch
index 4c5a191ac4..4c5a191ac4 100644
--- a/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch
+++ b/meta-oe/recipes-core/emlog/files/Drop-use-of-error-h.patch
diff --git a/meta-oe/recipes-core/emlog/emlog/emlog.initd b/meta-oe/recipes-core/emlog/files/emlog.initd
index 361cf8029e..361cf8029e 100644
--- a/meta-oe/recipes-core/emlog/emlog/emlog.initd
+++ b/meta-oe/recipes-core/emlog/files/emlog.initd
diff --git a/meta-oe/recipes-core/glfw/glfw_3.3.8.bb b/meta-oe/recipes-core/glfw/glfw_3.3.8.bb
index 684355ef3e..8abb13b580 100644
--- a/meta-oe/recipes-core/glfw/glfw_3.3.8.bb
+++ b/meta-oe/recipes-core/glfw/glfw_3.3.8.bb
@@ -14,7 +14,6 @@ PV .= "+git"
 SRCREV = "7482de6071d21db77a7236155da44c172a7f6c9e"
 SRC_URI = "git://github.com/glfw/glfw.git;branch=3.3-stable;protocol=https"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_DOCS=OFF"
 
diff --git a/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb b/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb
index ebcc2b267b..97a5592f94 100644
--- a/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb
+++ b/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI = "git://gitlab.gnome.org/pwithnall/libglib-testing.git;protocol=https;branch=main"
 
 PV = "0.1.1"
-S = "${WORKDIR}/git"
 SRCREV = "e326f73a7139c5e54fcf926896ae6e4cc899a1a7"
 
 inherit  meson pkgconfig
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb
index a45d31edc2..48a1a2a624 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb
@@ -14,7 +14,7 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
 SRC_URI[archive.sha256sum] = "539b0a29e15a96676c4f0594541250566c5ca44da5d4d87a3732fa2d07909e4a"
 
-S = "${WORKDIR}/${GNOMEBN}-${PV}"
+S = "${UNPACKDIR}/${GNOMEBN}-${PV}"
 
 FILES:${PN} = "${libdir}/lib*.so.*"
 FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/${BPN}/include/ ${libdir}/${BPN}/proc/ ${libdir}/giomm-2.68/include/"
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb
index c78dd55ca6..7c7a3fafb7 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb
@@ -12,7 +12,7 @@ inherit gnomebase
 
 SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
-SRC_URI[archive.sha256sum] = "b2a4cd7b9ae987794cbb5a1becc10cecb65182b9bb841868625d6bbb123edb1d"
+SRC_URI[archive.sha256sum] = "fe02c1e5f5825940d82b56b6ec31a12c06c05c1583cfe62f934d0763e1e542b3"
 
 FILES:${PN} = "${libdir}/lib*.so.*"
 FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/"
@@ -24,7 +24,7 @@ EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross -Dmaintainer-mode=fa
 do_write_config:append() {
     cat >${WORKDIR}/meson-${PN}.cross <<EOF
 [binaries]
-m4 = '${bindir}/m4'
-perl = '${bindir}/perl'
+m4 = '${bindir_native}/m4'
+perl = '${bindir_native}/perl'
 EOF
 }
diff --git a/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb b/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb
index da942e8bee..e8e1750b0e 100644
--- a/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb
+++ b/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb
@@ -9,7 +9,7 @@ REQUIRED_DISTRO_FEATURES = "ptest"
 require conf/include/ptest-packagelists-meta-oe.inc
 
 # Include the full set of ptests
-PTESTS_META_OE = "${PTESTS_FAST_META_OE} ${PTESTS_SLOW_META_OE} ${PTESTS_PROBLEMS_META_OE}"
+PTESTS_META_OE = "${PTESTS_FAST_META_OE} ${PTESTS_SLOW_META_OE}"
 
 do_testimage[noexec] = "1"
 do_testimage[depends] = "${@' '.join(['meta-oe-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_OE').split()])}"
diff --git a/meta-oe/recipes-core/libnfc/libnfc_git.bb b/meta-oe/recipes-core/libnfc/libnfc_git.bb
index a97a2841f7..ac3a0d85a4 100644
--- a/meta-oe/recipes-core/libnfc/libnfc_git.bb
+++ b/meta-oe/recipes-core/libnfc/libnfc_git.bb
@@ -9,7 +9,6 @@ inherit autotools pkgconfig
 
 PV = "1.8.0+git"
 
-S = "${WORKDIR}/git"
 SRCREV = "f02ff51449240102c27a97173dc495e8e7789046"
 SRC_URI = "git://github.com/nfc-tools/libnfc.git;branch=master;protocol=https"
 
diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb
index b2eb5dd094..3496220fe1 100644
--- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb
+++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb
@@ -5,10 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 
 DEPENDS = "mm-common"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.12/libsigc++-${PV}.tar.xz"
+SRC_URI = "${GNOME_MIRROR}/libsigc++/2.12/libsigc++-${PV}.tar.xz"
 SRC_URI[sha256sum] = "a9dbee323351d109b7aee074a9cb89ca3e7bcf8ad8edef1851f4cf359bd50843"
 
-S = "${WORKDIR}/libsigc++-${PV}"
+UPSTREAM_CHECK_URI = "https://download.gnome.org/sources/libsigc++/2.12/"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
+S = "${UNPACKDIR}/libsigc++-${PV}"
 
 inherit meson
 
diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb
index 0753457c9d..0bfe55fd93 100644
--- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb
+++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb
@@ -5,15 +5,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=959bffe2993816eb32ec4bc1ec1d5875"
 
 DEPENDS = "mm-common"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.6/libsigc++-${PV}.tar.xz"
+SRC_URI = "${GNOME_MIRROR}/libsigc++/3.6/libsigc++-${PV}.tar.xz"
 SRC_URI[sha256sum] = "c3d23b37dfd6e39f2e09f091b77b1541fbfa17c4f0b6bf5c89baef7229080e17"
 
-S = "${WORKDIR}/libsigc++-${PV}"
+UPSTREAM_CHECK_URI = "https://download.gnome.org/sources/libsigc++/3.6/"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
+S = "${UNPACKDIR}/libsigc++-${PV}"
 
 inherit setuptools3 meson
 
 FILES:${PN}-dev += "${libdir}/sigc++-*/"
 FILES:${PN}-doc += "${datadir}/devhelp"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
 SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
diff --git a/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb b/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb
index ada0199476..58c2697b9a 100644
--- a/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb
+++ b/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb
@@ -11,9 +11,11 @@ DEPENDS = "libxml2 glibmm"
 GNOMEBN = "libxml++"
 inherit gnomebase ptest
 
-S = "${WORKDIR}/libxml++-${PV}"
+S = "${UNPACKDIR}/libxml++-${PV}"
 
 SRC_URI[archive.sha256sum] = "15c38307a964fa6199f4da6683a599eb7e63cc89198545b36349b87cf9aa0098"
 
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
 FILES:${PN}-doc += "${datadir}/devhelp"
 FILES:${PN}-dev += "${libdir}/libxml++-${@gnome_verdir("${PV}")}/include/libxml++config.h"
diff --git a/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-oe/recipes-core/mdbus2/mdbus2_git.bb
index a7ac358f27..948d50b471 100644
--- a/meta-oe/recipes-core/mdbus2/mdbus2_git.bb
+++ b/meta-oe/recipes-core/mdbus2/mdbus2_git.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=https;branch=maste
            "
 SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig vala
 
diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch b/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch
new file mode 100644
index 0000000000..c471b098d4
--- /dev/null
+++ b/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch
@@ -0,0 +1,35 @@
+From 469beab0747549599959a30188deb3b27df3a346 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Wed, 2 Apr 2025 11:19:54 +0800
+Subject: [PATCH] crypt.h: Remove register keyword
+
+Fixes:
+ | In file included from /buildarea/tmp/work/core2-64-poky-linux/minizip-ng/4.0.8/git/test/test_compat.cc:17:
+ | /buildarea/tmp/work/core2-64-poky-linux/minizip-ng/4.0.8/git/compat/crypt.h:62:9: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
+ |    62 |         register int keyshift = (int)((*(pkeys + 1)) >> 24);
+ |       |         ^~~~~~~~
+ | 1 error generated.
+
+Upstream-Status: Submitted [https://github.com/zlib-ng/minizip-ng/pull/853]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ compat/crypt.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compat/crypt.h b/compat/crypt.h
+index 41c6454..ccdd83a 100644
+--- a/compat/crypt.h
++++ b/compat/crypt.h
+@@ -59,7 +59,7 @@ static int update_keys(unsigned long *pkeys, const z_crc_t *pcrc_32_tab, int c)
+     (*(pkeys + 1)) += (*(pkeys + 0)) & 0xff;
+     (*(pkeys + 1)) = (*(pkeys + 1)) * 134775813L + 1;
+     {
+-        register int keyshift = (int)((*(pkeys + 1)) >> 24);
++        int keyshift = (int)((*(pkeys + 1)) >> 24);
+         (*(pkeys + 2)) = CRC32((*(pkeys + 2)), keyshift);
+     }
+     return c;
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest b/meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest
new file mode 100644
index 0000000000..9c2dc81e35
--- /dev/null
+++ b/meta-oe/recipes-core/minizip-ng/minizip-ng/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd tests && ./gtest_minizip --gtest_print_time=0 | sed -E  '/^\[ RUN/d ; s/\[       OK \]/PASS: / ; s/\[ DISABLED \]/SKIP: / ; s/\[ FAILED \]/FAIL: /'
diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb
new file mode 100644
index 0000000000..cf98c0cf2e
--- /dev/null
+++ b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb
@@ -0,0 +1,44 @@
+SUMMARY = "Zlib manipulation Library"
+DESCRIPTION = "minizip-ng is a zip manipulation library written in C that is supported \
+on Windows, macOS, and Linux."
+HOMEPAGE = "https://github.com/zlib-ng/minizip-ng"
+SECTION = "libs"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f"
+
+SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \
+           file://0001-crypt.h-Remove-register-keyword.patch \
+           file://run-ptest \
+"
+
+SRCREV = "55db144e03027b43263e5ebcb599bf0878ba58de"
+
+
+RCONFLICTS:${PN} += "minizip"
+
+DEPENDS = "xz openssl bzip2"
+
+inherit cmake pkgconfig ptest
+
+EXTRA_OECMAKE = "-DMZ_FORCE_FETCH_LIBS=OFF \
+                 -DBUILD_SHARED_LIBS=ON \
+"
+
+PACKAGECONFIG ??= "zlib ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'test', '', d)}"
+PACKAGECONFIG[zlib] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib"
+PACKAGECONFIG[zlib-ng] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib-ng"
+PACKAGECONFIG[test] = "-DMZ_BUILD_TESTS=ON -DMZ_BUILD_UNIT_TESTS=ON, -DMZ_BUILD_TESTS=OFF -DMZ_BUILD_UNIT_TESTS=OFF, googletest"
+
+
+do_install:append () {
+    # remove absolute paths
+    sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/minizip/minizip.cmake
+}
+
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    cp ${B}/test/gtest_minizip ${D}${PTEST_PATH}/tests
+    # encrypt and stream test need the LICENSE file
+    cp ${S}/LICENSE ${D}${PTEST_PATH}/tests
+}
+
diff --git a/meta-oe/recipes-core/minizip/minizip_1.3.1.bb b/meta-oe/recipes-core/minizip/minizip_1.3.1.bb
new file mode 100644
index 0000000000..56cd28c9ae
--- /dev/null
+++ b/meta-oe/recipes-core/minizip/minizip_1.3.1.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Minizip Compression Library"
+DESCRIPTION = "Minizip is a general-purpose, patent-free, lossless data compression \
+library which is used by many different programs."
+HOMEPAGE = "http://www.winimage.com/zLibDll/minizip.html"
+SECTION = "libs"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=8eaa8535a3a1a2296b303f40f75385e7"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.gz"
+UPSTREAM_CHECK_URI = "http://zlib.net/"
+
+S = "${UNPACKDIR}/zlib-${PV}/contrib/minizip"
+
+SRC_URI[sha256sum] = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23"
+
+PACKAGECONFIG ??= "demos"
+PACKAGECONFIG[demos] = "--enable-demos=yes,,,"
+
+RCONFLICTS:${PN} += "minizip-ng"
+
+DEPENDS = "zlib"
+
+inherit autotools
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch
deleted file mode 100644
index 4866a5fbe0..0000000000
--- a/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 4 Nov 2019 19:19:47 +0100
-Subject: [PATCH] meson.build: do not ask for python installation / version
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Even by adding python3-setuptools-native the following error is not fixed so
-just ask for python3 executable.
-
-| meson.build:9:0: ERROR: <ExternalProgram 'python3' -> ['<...>/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
-rebase for 1.0.4
-Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
-
----
- meson.build | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 8a18c36..34fd546 100644
---- a/meson.build
-+++ b/meson.build
-@@ -7,12 +7,7 @@ project('mm-common',
-                               # and meson.add_install_script(python3, ...)
- )
- 
--python3 = import('python').find_installation()
--python_version = python3.language_version()
--python_version_req = '>= 3.5'
--if not python_version.version_compare(python_version_req)
--  error('Requires Python @0@, found @1@.'.format(python_version_req, python_version))
--endif
-+python3 = import('python3').find_python()
- 
- # Use these instead of meson.source_root() and meson.build_root().
- # source_root() and build_root() are not useful, if this is a subproject.
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb b/meta-oe/recipes-core/mm-common/mm-common_1.0.7.bb
index 56f7b5af6f..cb1b710954 100644
--- a/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb
+++ b/meta-oe/recipes-core/mm-common/mm-common_1.0.7.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Common GNOME build files for C++ bindings"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce"
 
 
 inherit gnomebase
@@ -8,10 +8,9 @@ inherit gnomebase
 # All the recipe does is stage python and shell script, some autotools files; nothing is compiled.
 inherit allarch
 
-SRC_URI[archive.sha256sum] = "e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8"
-SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch"
+SRC_URI[archive.sha256sum] = "494abfce781418259b1e9d8888c73af4de4b6f3be36cc75d9baa8baa0f2a7a39"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
 
 # These files aren't very usefull on target image, package them all in nnPN-dev
 FILES:${PN} = ""
diff --git a/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb b/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb
index 0bb45b8eaf..9c4db7efec 100644
--- a/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb
+++ b/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb
@@ -7,6 +7,8 @@ SRC_URI = "gitsm://github.com/pullmoll/musl-rpmatch.git;protocol=https;branch=ma
 PV = "1.0+git"
 SRCREV = "46267b154987d3e1f25d3a75423faa62bb5ee342"
 
+# Upstream repo has not made releases/tags after 1.0
+UPSTREAM_CHECK_COMMITS = "1"
+
 inherit autotools
 
-S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-core/ndctl/ndctl_v79.bb b/meta-oe/recipes-core/ndctl/ndctl_v79.bb
index 9a4bc49d12..4014e3bca6 100644
--- a/meta-oe/recipes-core/ndctl/ndctl_v79.bb
+++ b/meta-oe/recipes-core/ndctl/ndctl_v79.bb
@@ -18,14 +18,13 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>v\d+(\.\d+)*)"
 
 DEPENDS = "kmod udev json-c keyutils iniparser libtraceevent libtracefs"
 
-S = "${WORKDIR}/git"
 
-EXTRA_OEMESON += "-Ddestructive=enabled -Diniparserdir=${STAGING_INCDIR}/iniparser"
+EXTRA_OEMESON += "-Diniparserdir=${STAGING_INCDIR}/iniparser"
 
 PACKAGECONFIG ??= "tests ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
 PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
-PACKAGECONFIG[tests] = "-Dtest=enabled, -Dtest=disabled,"
-PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=enabled,-Ddocs=disabled -Dasciidoctor=disabled, asciidoc-native"
+PACKAGECONFIG[tests] = "-Dtest=enabled -Ddestructive=enabled, -Dtest=disabled,"
+PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=disabled,-Ddocs=disabled, asciidoc-native xmlto-native"
 
 SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
 SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service daxdev-reconfigure@.service"
diff --git a/meta-oe/recipes-core/opencl/clpeak_1.1.5.bb b/meta-oe/recipes-core/opencl/clpeak_1.1.5.bb
new file mode 100644
index 0000000000..a765f1530f
--- /dev/null
+++ b/meta-oe/recipes-core/opencl/clpeak_1.1.5.bb
@@ -0,0 +1,14 @@
+SUMMARY  = "OpenCL synthetic benchmarking tool"
+DESCRIPTION = "OpenCL benchmarking tool to measure peak capabilities"
+
+SRC_URI = "git://github.com/krrishnarraj/clpeak.git;protocol=https;branch=master"
+
+LICENSE  = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+SRCREV = "b2e647ffb8f42aa22ce4b0194d6ef6d16d5002b0"
+
+
+inherit cmake
+
+DEPENDS += "opencl-clhpp virtual/opencl-icd"
diff --git a/meta-oe/recipes-core/opencl/files/0001-Command-buffer-supported-queue-properties-265.patch b/meta-oe/recipes-core/opencl/files/0001-Command-buffer-supported-queue-properties-265.patch
new file mode 100644
index 0000000000..1654bf48c6
--- /dev/null
+++ b/meta-oe/recipes-core/opencl/files/0001-Command-buffer-supported-queue-properties-265.patch
@@ -0,0 +1,42 @@
+From 85888592e178c7923cd1bc1d69cee530906c80a4 Mon Sep 17 00:00:00 2001
+From: Ewan Crawford <ewan@codeplay.com>
+Date: Tue, 14 Jan 2025 17:14:29 +0000
+Subject: [PATCH] Command-buffer supported queue properties (#265)
+
+Header update generated from OpenCL-Docs PR XML change
+https://github.com/KhronosGroup/OpenCL-Docs/pull/850
+
+Upstream-Status: Backport [https://github.com/KhronosGroup/OpenCL-Headers/commit/d32c5bb219d7ba90ad4f251cf0bb903c08f8e5db]
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
+---
+ CL/cl_ext.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CL/cl_ext.h b/CL/cl_ext.h
+index 1a48985e167b..be5b473ff150 100644
+--- a/CL/cl_ext.h
++++ b/CL/cl_ext.h
+@@ -52,7 +52,7 @@ extern "C" {
+     "cl_khr_command_buffer"
+ 
+ 
+-#define CL_KHR_COMMAND_BUFFER_EXTENSION_VERSION CL_MAKE_VERSION(0, 9, 5)
++#define CL_KHR_COMMAND_BUFFER_EXTENSION_VERSION CL_MAKE_VERSION(0, 9, 6)
+ 
+ typedef cl_bitfield         cl_device_command_buffer_capabilities_khr;
+ typedef struct _cl_command_buffer_khr* cl_command_buffer_khr;
+@@ -66,13 +66,13 @@ typedef struct _cl_mutable_command_khr* cl_mutable_command_khr;
+ 
+ /* cl_device_info */
+ #define CL_DEVICE_COMMAND_BUFFER_CAPABILITIES_KHR           0x12A9
++#define CL_DEVICE_COMMAND_BUFFER_SUPPORTED_QUEUE_PROPERTIES_KHR 0x129A
+ #define CL_DEVICE_COMMAND_BUFFER_REQUIRED_QUEUE_PROPERTIES_KHR 0x12AA
+ 
+ /* cl_device_command_buffer_capabilities_khr - bitfield */
+ #define CL_COMMAND_BUFFER_CAPABILITY_KERNEL_PRINTF_KHR      (1 << 0)
+ #define CL_COMMAND_BUFFER_CAPABILITY_DEVICE_SIDE_ENQUEUE_KHR (1 << 1)
+ #define CL_COMMAND_BUFFER_CAPABILITY_SIMULTANEOUS_USE_KHR   (1 << 2)
+-#define CL_COMMAND_BUFFER_CAPABILITY_OUT_OF_ORDER_KHR       (1 << 3)
+ 
+ /* cl_command_buffer_properties_khr */
+ #define CL_COMMAND_BUFFER_FLAGS_KHR                         0x1293
diff --git a/meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch b/meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch
new file mode 100644
index 0000000000..2e8b52d794
--- /dev/null
+++ b/meta-oe/recipes-core/opencl/files/0001-Ignore-Compiler-Warnings.patch
@@ -0,0 +1,43 @@
+From 082ce10dd191f036f5a6e1fb31134e9736ba3643 Mon Sep 17 00:00:00 2001
+From: Antonios Christidis <a-christidis@ti.com>
+Date: Fri, 17 Jan 2025 15:05:39 -0600
+Subject: [PATCH] Create CMake option ENABLE_WERROR
+
+This creates an option that can be toggled on or off when configuring the project.
+By default, it's set to ON
+
+Upstream-Status: Pending
+Signed-off-by: Antonios Christidis <a-christidis@ti.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,6 +19,16 @@ add_definitions(-DCL_USE_DEPRECATED_OPEN
+ add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_0_APIS=1)
+ add_definitions(-DCL_NO_EXTENSION_PROTOTYPES)
+ 
++option(ENABLE_WERROR "Enable warnings as errors" ON)
++
++if(ENABLE_WERROR)
++  if(MSVC)
++    add_compile_options(/WX)
++  else()
++    add_compile_options(-Werror)
++  endif()
++endif()
++
+ option(USE_CL_EXPERIMENTAL "Use Experimental definitions" OFF)
+ if(USE_CL_EXPERIMENTAL)
+   add_definitions(-DCL_EXPERIMENTAL)
+@@ -99,7 +109,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C
+     add_cxx_flag_if_supported(-Wmisleading-indentation)
+     add_cxx_flag_if_supported(-Wunused-function)
+     add_cxx_flag_if_supported(-Wunused-variable)
+-    add_cxx_flag_if_supported(-Werror)
+     if(NOT CMAKE_BUILD_TYPE MATCHES "Release|RelWithDebInfo|MinSizeRel")
+         # Enable more warnings if not doing a release build.
+         add_cxx_flag_if_supported(-Wall)
diff --git a/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb b/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
index d43ea281ae..9e32242e31 100644
--- a/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
+++ b/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https;branch=master"
 
 SRCREV = "fdde6677b21329432db8b481e2637cd10f7d3cb2"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-oe/recipes-core/opencl/opencl-clhpp_2024.10.24.bb
index 7ae0362d37..7335712d6f 100644
--- a/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb
+++ b/meta-oe/recipes-core/opencl/opencl-clhpp_2024.10.24.bb
@@ -1,23 +1,25 @@
 SUMMARY  = "OpenCL API C++ bindings"
 DESCRIPTION = "OpenCL API C++ bindings from Khronos"
 
-SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=main"
-
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-PV = "2.0.16+git"
-SRCREV = "1df82b9749739f2681081092ae163bb0f0d40f66"
+DEPENDS = "opencl-headers"
+
+SRCREV = "c7b4aded1cab9560b226041dd962f63375a9a384"
+
+SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
 EXTRA_OECMAKE = " \
                   -DBUILD_DOCS=OFF \
                   -DBUILD_EXAMPLES=OFF \
-                  -DBUILD_TESTS=OFF \
+                  -DBUILD_TESTING=OFF \
                   "
 
 # Headers only so PN is empty
 RDEPENDS:${PN}-dev = ""
+
+BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb b/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb
new file mode 100644
index 0000000000..c766a66640
--- /dev/null
+++ b/meta-oe/recipes-core/opencl/opencl-cts_2025.01.22.bb
@@ -0,0 +1,30 @@
+SUMMARY = "OpenCL CTS"
+DESCRIPTION = "OpenCL CTS test suite"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+inherit pkgconfig cmake
+
+DEPENDS += "opencl-headers opencl-icd-loader"
+RDEPENDS:${PN} += "python3-core python3-io"
+
+
+SRC_URI = "git://github.com/KhronosGroup/OpenCL-CTS.git;protocol=https;branch=main;lfs=0 \
+           file://0001-Ignore-Compiler-Warnings.patch"
+
+SRCREV = "5b3518096ca7b82854daadb2b2fae704fe2d9cb5"
+
+EXTRA_OECMAKE:append = " -DENABLE_WERROR=OFF -DCL_INCLUDE_DIR=${STAGING_INCDIR} -DCL_LIB_DIR=${STAGING_LIBDIR} -DOPENCL_LIBRARIES=OpenCL"
+
+SECURITY_STRINGFORMAT:remove = "-Werror=format-security"
+
+do_install() {
+        install -d ${D}${bindir}/opencl_test_conformance
+        cp -r ${B}/test_conformance/* ${D}${bindir}/opencl_test_conformance
+        sed -i 's:/usr/bin/python:/usr/bin/python3:g' ${D}${bindir}/opencl_test_conformance/run_conformance.py
+         find "${D}${bindir}/opencl_test_conformance" -name cmake_install.cmake -type f -delete
+        find "${D}${bindir}/opencl_test_conformance" -name CMakeFiles -type d -exec rm -rf "{}" \; -depth
+}
+
+COMPATIBLE_HOST:riscv64 = "null"
+COMPATIBLE_HOST:riscv32 = "null"
diff --git a/meta-oe/recipes-core/opencl/opencl-headers_2024.05.08.bb b/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb
index 01e83c812c..0ec2fe5f33 100644
--- a/meta-oe/recipes-core/opencl/opencl-headers_2024.05.08.bb
+++ b/meta-oe/recipes-core/opencl/opencl-headers_2024.10.24.bb
@@ -4,16 +4,15 @@ LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SECTION = "base"
 
-S = "${WORKDIR}/git"
-SRCREV = "8275634cf9ec31b6484c2e6be756237cb583999d"
-SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https"
+SRCREV = "4ea6df132107e3b4b9407f903204b5522fdffcd6"
+SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https \
+           file://0001-Command-buffer-supported-queue-properties-265.patch \
+           "
+
+inherit cmake
+
+EXTRA_OECMAKE = "-DBUILD_TESTING=OFF"
 
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
 ALLOW_EMPTY:${PN} = "1"
 
-do_install () {
-        install -d ${D}${includedir}/CL/
-        install -m 0644 ${S}/CL/*.h ${D}${includedir}/CL
-}
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
index 38db7a2453..7cfc75f5ed 100644
--- a/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
+++ b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
@@ -11,7 +11,6 @@ DEPENDS += "opencl-headers"
 PROVIDES = "virtual/opencl-icd"
 RPROVIDES:${PN} = "virtual-opencl-icd"
 
-S = "${WORKDIR}/git"
 
 SRCREV = "861b68b290e76d08e7241608479c16431f529945"
 SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=main;protocol=https"
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index bc40f56b99..2055a0ff91 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -7,24 +7,20 @@ PROVIDES = "${PACKAGES}"
 PACKAGES = "\
     packagegroup-meta-oe \
     packagegroup-meta-oe-benchmarks \
+    packagegroup-meta-oe-bsp \
     packagegroup-meta-oe-connectivity \
-    packagegroup-meta-oe-connectivity-python2 \
     packagegroup-meta-oe-core \
     packagegroup-meta-oe-crypto \
-    packagegroup-meta-oe-bsp \
     packagegroup-meta-oe-dbs \
-    packagegroup-meta-oe-dbs-python2 \
     packagegroup-meta-oe-devtools \
     packagegroup-meta-oe-extended \
-    packagegroup-meta-oe-extended-python2 \
     packagegroup-meta-oe-kernel \
     packagegroup-meta-oe-multimedia \
     packagegroup-meta-oe-navigation \
     packagegroup-meta-oe-printing \
-    packagegroup-meta-oe-shells \
     packagegroup-meta-oe-security \
+    packagegroup-meta-oe-shells \
     packagegroup-meta-oe-support \
-    packagegroup-meta-oe-support-python2 \
     packagegroup-meta-oe-test \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \
@@ -36,14 +32,11 @@ RDEPENDS:packagegroup-meta-oe = "\
     packagegroup-meta-oe-benchmarks \
     packagegroup-meta-oe-bsp \
     packagegroup-meta-oe-connectivity \
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-connectivity-python2", "", d)} \
     packagegroup-meta-oe-core \
     packagegroup-meta-oe-crypto \
     packagegroup-meta-oe-dbs \
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-dbs-python2", "", d)} \
     packagegroup-meta-oe-devtools \
     packagegroup-meta-oe-extended \
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-extended-python2", "", d)} \
     packagegroup-meta-oe-kernel \
     packagegroup-meta-oe-multimedia \
     packagegroup-meta-oe-navigation \
@@ -51,7 +44,6 @@ RDEPENDS:packagegroup-meta-oe = "\
     packagegroup-meta-oe-security \
     packagegroup-meta-oe-shells \
     packagegroup-meta-oe-support \
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-support-python2", "", d)} \
     packagegroup-meta-oe-test \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \
@@ -94,7 +86,7 @@ RDEPENDS:packagegroup-meta-oe-benchmarks:remove:mips64el = "tinymembench"
 RDEPENDS:packagegroup-meta-oe-benchmarks:remove:riscv64 = "libhugetlbfs"
 RDEPENDS:packagegroup-meta-oe-benchmarks:remove:riscv32 = "libhugetlbfs"
 
-RDEPENDS:packagegroup-meta-oe-bsp ="\
+RDEPENDS:packagegroup-meta-oe-bsp = "\
     acpitool \
     cpufrequtils \
     edac-utils \
@@ -103,10 +95,10 @@ RDEPENDS:packagegroup-meta-oe-bsp ="\
     fwupd \
     fwupd-efi \
     irda-utils \
+    lmsensors \
     lmsensors-config-cgi \
     lmsensors-config-fancontrol \
     lmsensors-config-sensord \
-    lmsensors \
     lsscsi \
     nvme-cli \
     pcmciautils \
@@ -123,8 +115,9 @@ RDEPENDS:packagegroup-meta-oe-bsp:remove:powerpc64le = "efivar efibootmgr fwupd
 RDEPENDS:packagegroup-meta-oe-bsp:remove:riscv64 = "efivar efibootmgr fwupd fwupd-efi"
 RDEPENDS:packagegroup-meta-oe-bsp:remove:riscv32 = "efivar efibootmgr fwupd fwupd-efi"
 
-RDEPENDS:packagegroup-meta-oe-connectivity ="\
+RDEPENDS:packagegroup-meta-oe-connectivity = "\
     cyrus-sasl \
+    czmq \
     gammu \
     gattlib \
     gensio \
@@ -148,8 +141,8 @@ RDEPENDS:packagegroup-meta-oe-connectivity ="\
     modemmanager \
     mosh \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obex-data-server", "", d)} \
-    openobex \
     obexftp \
+    openobex \
     packagegroup-tools-bluetooth \
     paho-mqtt-c \
     paho-mqtt-cpp \
@@ -163,45 +156,40 @@ RDEPENDS:packagegroup-meta-oe-connectivity ="\
     usbmuxd \
     wifi-test-suite \
     zabbix \
-    czmq \
     zeromq \
 "
 
 RDEPENDS:packagegroup-meta-oe-connectivity:append:libc-glibc = " wvstreams wvdial"
 
-RDEPENDS:packagegroup-meta-oe-connectivity-python2 = "\
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "telepathy-idle", "", d)} \
-"
-
 # dracut needs dracut
 RDEPENDS:packagegroup-meta-oe-core = "\
-    ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dbus-broker", "", d)} \
+    ${@bb.utils.filter('VIRTUAL-RUNTIME_dbus', 'dbus-broker', d)} \
+    dbus-cxx \
     dbus-daemon-proxy \
-    libdbus-c++ \
+    distro-feed-configs \
     emlog \
-    kernel-module-emlog \
     glibmm \
+    kernel-module-emlog \
+    libdbus-c++ \
     libnfc \
     libsigc++-2.0 \
     libsigc++-3 \
     mdbus2 \
-    distro-feed-configs \
     mm-common \
     ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "ndctl", "", d)} \
     pim435 \
     proxy-libintl \
     safec \
-    sdbus-c++-tools \
     sdbus-c++ \
+    sdbus-c++-tools \
     toybox \
     usleep \
-    dbus-cxx \
 "
 RDEPENDS:packagegroup-meta-oe-core:append:libc-glibc = " ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "glfw", "", d)}"
 RDEPENDS:packagegroup-meta-oe-core:remove:riscv64 = "safec"
 RDEPENDS:packagegroup-meta-oe-core:remove:riscv32 = "safec"
 
-RDEPENDS:packagegroup-meta-oe-crypto ="\
+RDEPENDS:packagegroup-meta-oe-crypto = "\
     botan \
     cryptsetup \
     fsverity-utils \
@@ -212,8 +200,7 @@ RDEPENDS:packagegroup-meta-oe-crypto ="\
 "
 RDEPENDS:packagegroup-meta-oe-crypto:remove:riscv32 = "botan"
 
-RDEPENDS:packagegroup-meta-oe-dbs ="\
-    influxdb \
+RDEPENDS:packagegroup-meta-oe-dbs = "\
     leveldb \
     libdbi \
     lmdb \
@@ -225,94 +212,89 @@ RDEPENDS:packagegroup-meta-oe-dbs ="\
 "
 RDEPENDS:packagegroup-meta-oe-dbs:remove:libc-musl:powerpc = "rocksdb"
 
-RDEPENDS:packagegroup-meta-oe-dbs-python2 ="\
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'mysql-python', '', d), "", d)} \
-"
-
-RDEPENDS:packagegroup-meta-oe-devtools ="\
+RDEPENDS:packagegroup-meta-oe-devtools = "\
     abseil-cpp \
+    android-tools \
+    android-tools-conf \
     apitrace \
     breakpad \
-    android-tools-conf \
-    android-tools \
-    concurrencykit \
+    capnproto-compiler \
     cgdb \
-    ctags \
-    debootstrap \
     cjson \
     cloc \
-    icon-slicer \
+    concurrencykit \
     cscope \
+    ctags \
     dbd-mariadb \
+    debootstrap \
     dmalloc \
     ${@bb.utils.contains("PACKAGE_CLASSES", "package_rpm", "dnf-plugin-tui", "", d)} \
     doxygen \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany-plugins geany", "", d)} \
-    jemalloc \
-    lemon \
     flatbuffers \
-    heaptrack \
-    libparse-yapp-perl \
-    libubox \
-    ltrace \
-    luajit \
-    mcpp \
-    memstat \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany-plugins geany", "", d)} \
     giflib \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "glade", "", d)} \
     grpc \
     guider \
-    php \
+    heaptrack \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "icon-slicer", "", d)} \
+    ipc-run \
     iptraf-ng \
+    jemalloc \
     jq \
-    json-spirit \
-    serialcheck \
-    tclap \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "tk", "", d)} \
-    uw-imap \
     jsoncpp \
     jsonrpc \
-    yajl \
-    yajl \
+    json-schema-validator \
+    json-spirit \
     kconfig-frontends \
+    lemon \
+    libdbi-perl \
+    libdev-checklib-perl \
     libgee \
+    libio-pty-perl \
+    libjson-perl \
+    libparse-yapp-perl \
+    libperlio-gzip-perl \
     libsombok3 \
+    libubox \
+    libxerces-c \
     lshw \
+    ltrace \
+    luajit \
     luaposix \
-    capnproto-compiler \
+    mcpp \
+    memstat \
+    mercurial \
+    microsoft-gsl \
     mpich \
     msgpack-c \
     msgpack-cpp \
-    mercurial \
     nodejs \
     openocd \
     pax-utils \
-    ipc-run \
-    libdbi-perl \
-    libdev-checklib-perl \
-    libio-pty-perl \
-    libjson-perl \
-    libperlio-gzip-perl \
+    php \
     ply \
-    protobuf-c \
+    poke \
     protobuf \
+    protobuf-c \
     pugixml \
     python3-distutils-extra \
     python3-pycups \
     rapidjson \
+    serialcheck \
     squashfs-tools-ng \
+    tclap \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "tk", "", d)} \
     uftrace \
+    uw-imap \
     valijson \
-    libxerces-c \
     xerces-c-samples \
     xmlrpc-c \
+    yajl \
     yasm \
-    json-schema-validator \
-    poke \
-    microsoft-gsl \
 "
-RDEPENDS:packagegroup-meta-oe-devtools:append:x86 = " cpuid msr-tools pahole pmtools"
-RDEPENDS:packagegroup-meta-oe-devtools:append:x86-64 = " cpuid msr-tools pahole pcimem pmtools"
+RDEPENDS:packagegroup-meta-oe-devtools:append:x86 = " cpuid msr-tools pahole"
+RDEPENDS:packagegroup-meta-oe-devtools:append:x86-64 = " cpuid msr-tools pahole pcimem"
 RDEPENDS:packagegroup-meta-oe-devtools:append:riscv64 = " pcimem"
 RDEPENDS:packagegroup-meta-oe-devtools:append:arm = " pcimem"
 RDEPENDS:packagegroup-meta-oe-devtools:append:aarch64 = " pahole pcimem"
@@ -332,111 +314,111 @@ RDEPENDS:packagegroup-meta-oe-devtools:remove:libc-musl:riscv32 = "php"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:aarch64 = "concurrencykit"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:x86 = "ply"
 
-RDEPENDS:packagegroup-meta-oe-extended ="\
+RDEPENDS:packagegroup-meta-oe-extended = "\
     bitwise \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \
     brotli \
     byacc \
+    can-utils \
+    canutils \
     cmatrix \
     cmpi-bindings \
     collectd \
     ddrescue \
     dialog \
-    duktape \
-    enscript \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnuplot", "", d)} \
     dlt-daemon \
     docopt.cpp \
-    iotop \
+    duktape \
     dumb-init \
-    konkretcmpi \
+    enscript \
     figlet \
-    libcec \
-    libdivecomputer \
     fluentbit \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libgxim", "", d)} \
-    liblognorm \
-    libmodbus \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnuplot", "", d)} \
     haveged \
     hexedit \
     hiredis \
     hplip \
     hwloc \
-    libleak \
-    libuio \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \
-    libyang \
-    lprng \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "icewm", "", d)} \
-    md5deep \
     indent \
-    jansson \
-    nana \
-    nicstat \
-    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "openwsman", "", d)} \
-    p7zip \
+    iotop \
     isomd5sum \
+    jansson \
     jpnevulator \
-    ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-group-rule-datetime polkit-group-rule-network polkit", "", d)} \
-    rarpd \
-    redis \
-    libfastjson \
-    librelp \
-    sblim-cmpi-devel \
-    sblim-sfc-common \
-    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sblim-sfcb ", "", d)} \
-    sblim-sfcc \
+    konkretcmpi \
     libblockdev \
-    sgpio \
-    smartmontools \
-    can-utils \
-    canutils \
-    libsocketcan \
+    libcec \
     libconfig \
-    linuxconsole \
-    uml-utilities \
+    libdivecomputer \
+    libfastjson \
+    libfile-fnmatch-perl \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libgxim", "", d)} \
     libidn \
-    libqb \
-    wipe \
-    libzip \
-    zram \
-    libplist \
-    libusbmuxd \
+    libleak \
     liblockfile \
     liblogging \
+    liblognorm \
+    libmodbus \
+    libplist \
     libpwquality \
+    libqb \
+    librelp \
     ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "libreport", "", d)} \
     libserialport \
+    libsigrok \
+    libsigrokdecode \
+    libsocketcan \
     libstatgrab \
+    libuio \
+    libusbmuxd \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \
+    libyang \
+    libzip \
+    linuxconsole \
     lockfile-progs \
     logwatch \
+    lprng \
+    md5deep \
     mraa \
+    nana \
+    nicstat \
+    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "openwsman", "", d)} \
     ostree \
+    7zip \
     ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-plugin-ccreds pam-plugin-ldapdb pam-ssh-agent-auth", "", d)} \
     pegtl \
-    libfile-fnmatch-perl \
+    ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-group-rule-datetime polkit-group-rule-network polkit", "", d)} \
+    rarpd \
+    redis \
+    redis-plus-plus \
     rrdtool \
     sanlock \
+    sblim-cmpi-devel \
+    ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sblim-sfcb ", "", d)} \
+    sblim-sfcc \
+    sblim-sfc-common \
     scsirastools \
     sedutil \
-    libsigrok \
-    libsigrokdecode \
-    s-nail \
+    sgpio \
     sigrok-cli \
+    smartmontools \
+    s-nail \
     snappy \
     tipcutils \
     tiptop \
     tmate \
     tmux \
     triggerhappy \
+    uml-utilities \
     upm \
     vlock \
     volume-key \
+    wipe \
     wxwidgets \
     zlog \
+    zram \
     zstd \
     zsync-curl \
-    redis-plus-plus \
 "
 RDEPENDS:packagegroup-meta-oe-extended:append:libc-musl = " libexecinfo"
 RDEPENDS:packagegroup-meta-oe-extended:append:x86-64 = " pmdk libx86-1"
@@ -451,170 +433,175 @@ RDEPENDS:packagegroup-meta-oe-extended:remove:powerpc64le = "upm mraa sysdig"
 RDEPENDS:packagegroup-meta-oe-extended:remove:riscv64 = "upm libleak mraa sysdig tiptop"
 RDEPENDS:packagegroup-meta-oe-extended:remove:riscv32 = "upm libleak mraa sysdig tiptop"
 
-RDEPENDS:packagegroup-meta-oe-extended-python2 ="\
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'openlmi-tools', '', d), "", d)} \
-"
-
-RDEPENDS:packagegroup-meta-oe-gnome ="\
+RDEPENDS:packagegroup-meta-oe-gnome = "\
     atkmm \
     gcab \
-    gnome-common \
     gmime \
-    libjcat \
+    gnome-common \
+    gnome-theme-adwaita \
     gtk+ \
-    gtkmm3 \
     gtkmm \
-    ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "libpeas", "", d)} \
+    gtkmm3 \
+    libjcat \
     pyxdg \
-    gnome-theme-adwaita \
 "
 
-RDEPENDS:packagegroup-meta-oe-graphics ="\
+RDEPENDS:packagegroup-meta-oe-graphics = "\
+    bdftopcf \
     cairomm \
-    directfb-examples \
-    directfb \
-    fbgrab \
+    deqp-runner \
     dietsplash \
+    directfb \
+    directfb-examples \
     ${@bb.utils.contains("PACKAGE_CLASSES", "package_rpm", "dnfdragora", "", d)} \
-    fontforge \
+    fbgrab \
     fbida \
     feh \
+    font-adobe-100dpi \
+    font-adobe-utopia-100dpi \
+    font-bh-100dpi \
+    font-bh-lucidatypewriter-100dpi \
+    font-bitstream-100dpi \
+    font-cursor-misc \
+    fontforge \
+    font-misc-misc \
     ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "freeglut", "", d)} \
     ftgl \
     fvwm \
-    gtkperf \
     gphoto2 \
-    imlib2 \
-    libgphoto2 \
     graphviz \
+    gtkperf \
     gtkwave \
+    iceauth \
+    imlib2 \
     jasper \
-    libforms \
-    lxdm \
-    numlockx \
-    nyancat \
-    obconf \
-    openbox \
-    packagegroup-fonts-truetype \
-    qrencode \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "st", "", d)} \
     leptonica \
-    libvncserver \
+    libforms \
+    libgphoto2 \
     libmng \
+    libsdl \
+    libsdl2-image \
+    libsdl2-mixer \
+    libsdl2-net \
+    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \
     libsdl-gfx \
     libsdl-image \
     libsdl-mixer \
     libsdl-net \
     libsdl-ttf \
-    libsdl2-image \
-    libsdl2-mixer \
-    libsdl2-net \
-    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \
-    libsdl \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libvdpau vdpauinfo", "", d)} \
+    libvncserver \
+    libxaw6 \
+    libxpresent \
+    libyui \
+    libyui-ncurses \
     lvgl \
-    ttf-arphic-uming \
-    ttf-droid-sans ttf-droid-sans-mono ttf-droid-sans-fallback ttf-droid-sans-japanese ttf-droid-serif \
-    ttf-abyssinica \
+    lxdm \
+    numlockx \
+    nyancat \
+    obconf \
+    openbox \
+    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \
+    openjpeg \
+    packagegroup-fonts-truetype \
+    pangomm \
+    parallel-deqp-runner \
+    qrencode \
+    sessreg \
+    setxkbmap \
+    source-code-pro-fonts \
     source-han-sans-cn-fonts \
     source-han-sans-jp-fonts \
     source-han-sans-kr-fonts \
     source-han-sans-tw-fonts \
-    source-code-pro-fonts \
+    spirv-shader-generator \
+    spirv-tools \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "st", "", d)} \
+    stalonetray \
+    surf \
+    terminus-font-consolefonts \
+    terminus-font-pcf \
+    tesseract \
+    tesseract-lang \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \
+    tslib \
+    ttf-abyssinica \
+    ttf-arphic-uming \
+    ttf-dejavu-common \
+    ttf-dejavu-mathtexgyre \
     ttf-dejavu-sans \
     ttf-dejavu-sans-condensed \
     ttf-dejavu-sans-mono \
     ttf-dejavu-serif \
     ttf-dejavu-serif-condensed \
-    ttf-dejavu-mathtexgyre \
-    ttf-dejavu-common \
+    ttf-droid-sans \
+    ttf-droid-sans-fallback \
+    ttf-droid-sans-japanese \
+    ttf-droid-sans-mono \
+    ttf-droid-serif \
     ttf-gentium \
     ttf-hunky-sans \
     ttf-hunky-serif \
-    ttf-ipag ttf-ipagp ttf-ipamp ttf-ipam \
-    ttf-lohit \
     ttf-inconsolata \
-    ttf-liberation-sans-narrow \
+    ttf-ipag \
+    ttf-ipagp \
+    ttf-ipam \
+    ttf-ipamp \
     ttf-liberation-mono \
     ttf-liberation-sans \
+    ttf-liberation-sans-narrow \
     ttf-liberation-serif \
     ttf-lklug \
+    ttf-lohit \
     ttf-noto-emoji-color \
     ttf-noto-emoji-regular \
+    ttf-pt-sans \
+    ttf-roboto \
     ttf-sazanami-gothic \
     ttf-sazanami-mincho \
-    ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho \
+    ttf-takao-gothic \
+    ttf-takao-mincho \
+    ttf-takao-pgothic \
+    ttf-takao-pmincho \
     ttf-tlwg \
-    ttf-roboto \
-    ttf-wqy-zenhei \
-    ttf-pt-sans \
-    ttf-vlgothic \
     ttf-ubuntu-mono \
     ttf-ubuntu-sans \
-    libyui-ncurses \
-    libyui \
-    x11vnc \
-    terminus-font-consolefonts \
-    terminus-font-pcf \
-    xdotool \
-    xkbevd \
-    bdftopcf \
-    iceauth \
-    sessreg \
-    xgamma \
-    setxkbmap \
-    xkbutils \
+    ttf-vlgothic \
+    ttf-wqy-zenhei \
     twm \
+    unclutter-xfixes \
+    ${@bb.utils.contains("DISTRO_FEATURES", "opengl vulkan", "vulkan-cts", "", d)} \
+    x11vnc \
+    xcb-util-cursor \
     xclock \
+    xcursorgen \
+    xdotool \
+    xf86-input-tslib \
+    xf86-input-void \
+    xf86-video-armsoc \
+    xf86-video-ati \
     xfontsel \
+    xgamma \
+    xkbevd \
     xkbprint \
+    xkbutils \
     xlsatoms \
     xlsclients \
     xlsfonts \
     xmag \
     xmessage \
+    xorg-fonts-100dpi \
+    xorg-sgml-doctools \
     xrdb \
     xrefresh \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \
     xsetroot \
     xstdcmap \
     xterm \
     xwd \
     xwud \
-    xorg-sgml-doctools \
-    xf86-input-tslib \
-    xf86-input-void \
-    xf86-video-armsoc \
-    xf86-video-ati \
-    font-adobe-100dpi \
-    font-adobe-utopia-100dpi \
-    font-bh-100dpi \
-    font-bh-lucidatypewriter-100dpi \
-    font-bitstream-100dpi \
-    font-cursor-misc \
-    font-misc-misc \
-    xorg-fonts-100dpi \
-    libxaw6 \
-    libxpresent \
-    xcb-util-cursor \
-    xserver-common \
-    openjpeg \
-    pangomm \
-    spirv-shader-generator \
-    spirv-tools \
-    stalonetray \
-    surf \
-    tesseract-lang \
-    tesseract \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \
-    tslib \
-    unclutter-xfixes \
-    libvdpau \
-    xcursorgen \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \
     yad \
     ydotool \
-    parallel-deqp-runner \
-    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \
-    ${@bb.utils.contains("DISTRO_FEATURES", "opengl vulkan", "vulkan-cts", "", d)} \
 "
 RDEPENDS:packagegroup-meta-oe-graphics:append:x86 = " renderdoc xf86-video-nouveau xf86-video-mga"
 RDEPENDS:packagegroup-meta-oe-graphics:append:x86-64 = " renderdoc xf86-video-nouveau xf86-video-mga"
@@ -623,12 +610,12 @@ RDEPENDS:packagegroup-meta-oe-graphics:append:aarch64 = " renderdoc"
 
 RDEPENDS:packagegroup-meta-oe-graphics:remove:libc-musl = "renderdoc"
 
-RDEPENDS:packagegroup-meta-oe-kernel ="\
+RDEPENDS:packagegroup-meta-oe-kernel = "\
     agent-proxy \
-    crash \
+    broadcom-bt-firmware \
     cpupower \
+    crash \
     ipmitool \
-    broadcom-bt-firmware \
     kernel-selftest \
     minicoredumper \
     oprofile \
@@ -645,282 +632,274 @@ RDEPENDS:packagegroup-meta-oe-kernel:append:powerpc64 = " libpfm4"
 RDEPENDS:packagegroup-meta-oe-kernel:remove = "kernel-selftest"
 RDEPENDS:packagegroup-meta-oe-kernel:remove:libc-musl = "bpftool crash intel-speed-select kernel-selftest minicoredumper turbostat"
 
-RDEPENDS:packagegroup-meta-oe-kernel:remove:mipsarcho32 = "makedumpfile"
 RDEPENDS:packagegroup-meta-oe-kernel:remove:mips64 = "crash"
 RDEPENDS:packagegroup-meta-oe-kernel:remove:mips64el = "crash"
 
 RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv64 = "crash oprofile"
-RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv32 = "crash makedumpfile oprofile"
+RDEPENDS:packagegroup-meta-oe-kernel:remove:riscv32 = "crash oprofile"
 
-RDEPENDS:packagegroup-meta-oe-multimedia ="\
-    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faad2", "", d)} \
+RDEPENDS:packagegroup-meta-oe-multimedia = "\
+    a2jmidid \
+    audiofile \
     dirsplit \
+    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faad2", "", d)} \
     genisoimage \
     icedax \
-    wodim \
     id3lib \
-    audiofile \
-    a2jmidid \
     jack-server \
     jack-utils \
     libass \
-    libcdio-paranoia \
     libcdio \
+    libcdio-paranoia \
+    libdvdread \
     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libmad", "", d)} \
+    libmikmod \
     libmms \
-    libdvdread \
+    libmodplug \
     libopus \
+    libopusenc \
+    libvpx \
     live555-examples \
     live555-mediaserver \
-    libmikmod \
-    libmodplug \
+    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "mpv", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \
     sound-theme-freedesktop \
-    yavta \
     v4l-utils \
     wavpack \
-    libvpx \
+    wodim \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xsp", "", d)} \
-    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "mpv", "", d)} \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol", "", d)} \
-    libopusenc \
+    yavta \
 "
 
-RDEPENDS:packagegroup-meta-oe-navigation ="\
+RDEPENDS:packagegroup-meta-oe-navigation = "\
+    geoclue \
     geos \
     ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd-machine-conf gpsd", "", d)} \
-    geoclue \
     libspatialite \
     proj \
 "
 
-RDEPENDS:packagegroup-meta-oe-printing ="\
+RDEPENDS:packagegroup-meta-oe-printing = "\
     cups-filters \
     gutenprint \
     qpdf \
 "
 
-RDEPENDS:packagegroup-meta-oe-security ="\
+RDEPENDS:packagegroup-meta-oe-security = "\
+    auditd \
     keyutils \
     nmap \
     ${@bb.utils.contains("DISTRO_FEATURES", "pam", "passwdqc", "", d)} \
     softhsm \
     tomoyo-tools \
-    auditd \
 "
 
-RDEPENDS:packagegroup-meta-oe-shells ="\
+RDEPENDS:packagegroup-meta-oe-shells = "\
     dash \
     mksh \
     tcsh \
     zsh \
 "
 
-RDEPENDS:packagegroup-meta-oe-support ="\
-    anthy \
-    atop \
+RDEPENDS:packagegroup-meta-oe-support = "\
     ace-cloud-editor \
-    ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "driverctl", "", d)} \
-    frame \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis", "", d)} \
-    grail \
+    anthy \
     asio \
+    atop \
     augeas \
     avro-c \
     bdwgc \
     c-ares \
+    ccid \
+    ckermit \
+    clinfo \
     cmark \
     ${@bb.utils.contains("DISTRO_FEATURES", "polkit gobject-introspection-data", "colord", "", d)} \
     consolation \
-    cpprest \
+    c-periphery \
     ctapi-common \
+    daemonize \
+    daemontools \
+    devmem2 \
     dfu-util \
     dhex \
     digitemp \
     dool \
+    ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "driverctl", "", d)} \
+    eject \
+    emacs \
+    enca \
+    epeg \
     espeak \
     evemu-tools \
     exiv2 \
-    libnice \
-    c-periphery \
+    fbset \
+    fbset-modes \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "fltk", "", d)} \
+    frame \
+    freerdp \
     function2 \
+    funyahoo-plusplus \
     gd \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis", "", d)} \
+    gengetopt \
     gflags \
     glog \
+    googlebenchmark \
     gperftools \
     gpm \
+    gradm \
+    grail \
+    gsl \
     gsoap \
+    hddtemp \
     hdf5 \
+    hidapi \
     hstr \
     htop \
-    hunspell-dictionaries \
     hunspell \
-    hwdata \
-    iksemel \
-    gengetopt \
-    googlebenchmark \
+    hunspell-dictionaries \
+    icyque \
     imagemagick \
+    imapfilter \
     iniparser \
     inotify-tools \
     joe \
     lcms \
     lcov \
-    imapfilter \
+    libatasmart \
     libbytesize \
+    libcanberra \
+    libcereal \
     libcyusbserial \
+    libdevmapper \
     libestr \
     libfann \
     libftdi \
-    libjs-jquery-globalize \
-    libjs-jquery-cookie \
-    ccid \
-    zchunk \
-    libgpiod \
-    libmanette \
-    ckermit \
-    libcereal \
-    daemontools \
-    libiio \
-    devmem2 \
     libgit2 \
+    libgpiod \
+    libgusb \
     libharu \
-    eject \
-    enca \
-    epeg \
+    libiio \
+    libinih \
+    libjs-jquery-cookie \
+    libjs-jquery-globalize \
+    libjs-jquery-icheck \
+    libjs-sizzle \
+    libmanette \
+    libmicrohttpd \
+    libmimetic \
     libmxml \
-    fbset-modes \
-    fbset \
+    libnice \
+    liboauth \
     liboop \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "fltk", "", d)} \
-    freerdp \
-    libgusb \
-    emacs \
+    libotr \
     libp11 \
     libraw1394 \
-    gradm \
-    gsl \
     librsync \
-    hddtemp \
-    hidapi \
+    libsass \
+    libsmi \
     libsoc \
-    libmimetic \
-    libinih \
+    libssh \
+    libssh2 \
     libtar \
     libteam \
+    libtinyxml \
+    libtinyxml2 \
+    liburing \
     libusb-compat \
-    libatasmart \
-    libcanberra \
-    libssh \
-    libssh2 \
-    libee \
-    libusbgx-config \
+    libusbg \
     libusbgx \
+    libusbgx-config \
+    libutempter \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "links-x11", "links", d)} \
     lockdev \
+    log4c \
+    log4cpp \
     logwarn \
-    libjs-sizzle \
-    liblinebreak \
+    lvm2 \
     mailcap \
-    liboauth \
+    mbuffer \
     mg \
+    mime-support \
+    minini \
     monit \
     mscgen \
-    libsmi \
-    remmina \
+    multipath-tools \
+    nano \
     neon \
     nmon \
-    libjs-jquery-icheck \
-    libtinyxml \
-    libusbg \
-    libutempter \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "links-x11", "links", d)} \
-    log4c \
-    log4cpp \
     nspr \
-    libdevmapper \
-    lvm2 \
     nss \
-    mbuffer \
-    onig \
-    mime-support \
-    minini \
-    multipath-tools \
     numactl \
-    clinfo \
-    opencv \
-    opensc \
+    onig \
     openct \
+    opencv \
     openldap \
-    wbxml2 \
+    opensc \
     p910nd \
-    libtinyxml2 \
+    pcp \
+    pcsc-lite \
+    pcsc-tools \
     picocom \
-    funyahoo-plusplus \
-    icyque \
-    libotr \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pidgin-otr", "", d)} \
     pidgin \
-    purple-skypeweb \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pidgin-otr", "", d)} \
     pidgin-sipe \
     pngcheck \
     poco \
-    poppler-data \
     poppler \
+    poppler-data \
     portaudio-v19 \
+    pps-tools \
     procmail \
-    pxaregs \
+    purple-skypeweb \
     pv \
-    rsnapshot \
-    pps-tools \
+    pxaregs \
     raptor2 \
     rdfind \
     re2 \
+    read-edid \
+    remmina \
+    rsnapshot \
+    sassc \
+    satyr \
     sdmon \
     sdparm \
     serial-forward \
-    read-edid \
-    spitools \
-    libsass \
-    sassc \
+    sg3-utils \
+    sharutils \
     smarty \
+    spitools \
+    srecord \
+    ssiapi \
+    stm32flash \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "synergy", "", d)} \
     syslog-ng \
-    system-config-keyboard \
     tbb \
-    satyr \
-    pcp \
-    pcsc-lite \
-    pcsc-tools \
-    sharutils \
-    sg3-utils \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "uim", "", d)} \
-    uchardet \
-    srecord \
-    ssiapi \
+    tokyocabinet \
     tree \
-    utouch-evemu \
-    utouch-frame \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "utouch-mtview", "", d)} \
+    uchardet \
     ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks2", "", d)} \
-    stm32flash \
-    tokyocabinet \
-    xmlstarlet \
-    thin-provisioning-tools \
     uhubctl \
-    zile \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "uim", "", d)} \
+    unicode-ucd \
     unixodbc \
-    daemonize \
     upower \
-    unicode-ucd \
-    xdelta3 \
     uriparser \
-    nano \
+    usb-modeswitch \
+    usb-modeswitch-data \
+    utouch-evemu \
+    utouch-frame \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "utouch-mtview", "", d)} \
+    wbxml2 \
+    xdelta3 \
     xdg-user-dirs \
     xmlsec1 \
-    usb-modeswitch-data \
-    usb-modeswitch \
-    liburing \
-    zbar \
-    libmicrohttpd \
+    xmlstarlet \
     yaml-cpp \
+    zbar \
+    zchunk \
+    zile \
 "
 RDEPENDS:packagegroup-meta-oe-support:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}"
 RDEPENDS:packagegroup-meta-oe-support:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}"
@@ -928,11 +907,7 @@ RDEPENDS:packagegroup-meta-oe-support:append:aarch64 = " ne10"
 RDEPENDS:packagegroup-meta-oe-support:append:x86 = " mcelog mce-inject mce-test vboxguestdrivers"
 RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = " mcelog mce-inject mce-test vboxguestdrivers"
 
-RDEPENDS:packagegroup-meta-oe-support-python2 ="\
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'lio-utils', '', d), "", d)} \
-"
-
-RDEPENDS:packagegroup-meta-oe-support:remove:arm ="numactl"
+RDEPENDS:packagegroup-meta-oe-support:remove:arm = "numactl"
 RDEPENDS:packagegroup-meta-oe-support:remove:mipsarch = "gperftools"
 RDEPENDS:packagegroup-meta-oe-support:remove:riscv64 = "gperftools uim"
 RDEPENDS:packagegroup-meta-oe-support:remove:riscv32 = "gperftools uim"
@@ -941,7 +916,7 @@ RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "libcereal ssiapi"
 RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl = "pcp"
 RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl:powerpc = "gsl"
 
-RDEPENDS:packagegroup-meta-oe-test ="\
+RDEPENDS:packagegroup-meta-oe-test = "\
     bats \
     cmocka \
     cppunit \
@@ -964,19 +939,18 @@ RDEPENDS:packagegroup-meta-oe-test:remove:riscv64 = "fwts"
 RDEPENDS:packagegroup-meta-oe-test:remove:riscv32 = "fwts"
 
 RDEPENDS:packagegroup-meta-oe-ptest-packages = "\
-    zeromq-ptest \
+    cmocka-ptest \
+    hiredis-ptest \
     leveldb-ptest \
-    psqlodbc-ptest \
+    libteam-ptest \
+    minicoredumper-ptest \
+    oprofile-ptest \
+    poco-ptest \
     protobuf-ptest \
+    psqlodbc-ptest \
     rsyslog-ptest \
-    oprofile-ptest \
-    libteam-ptest \
     uthash-ptest \
-    libee-ptest \
-    poco-ptest \
-    cmocka-ptest \
-    minicoredumper-ptest \
-    hiredis-ptest \
+    zeromq-ptest \
 "
 RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86 = " mcelog-ptest"
 RDEPENDS:packagegroup-meta-oe-ptest-packages:append:x86-64 = " mcelog-ptest"
diff --git a/meta-oe/recipes-core/pim435/pim435_git.bb b/meta-oe/recipes-core/pim435/pim435_git.bb
index 80e3cc6298..a18e889683 100644
--- a/meta-oe/recipes-core/pim435/pim435_git.bb
+++ b/meta-oe/recipes-core/pim435/pim435_git.bb
@@ -11,7 +11,10 @@ LIC_FILES_CHKSUM = "file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663
 
 SRC_URI = "git://gitlab.eclipse.org/eclipse/oniro-blueprints/core/pim435;protocol=https;branch=main"
 SRCREV = "445ed623ec8d3ecbb1d566900b4ef3fb3031d689"
-S = "${WORKDIR}/git"
+
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 DEPENDS = "i2c-tools"
 
diff --git a/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch b/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch
deleted file mode 100644
index 58838500bf..0000000000
--- a/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f270f80d4c36a22a0f7b8de8fb6b1abef6f7b183 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Tue, 15 Feb 2022 16:23:10 +0800
-Subject: [PATCH] plymouth : Add the retain-splash option
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Adding the "retain-splash” option to tell plymouth to keep the boot
-splash’s contents on screen even after plymouth exits to make the
-splash screen show more friendly on the system which boots so fast.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- systemd-units/plymouth-quit.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systemd-units/plymouth-quit.service.in b/systemd-units/plymouth-quit.service.in
-index ed9f9b9..147e9ee 100644
---- a/systemd-units/plymouth-quit.service.in
-+++ b/systemd-units/plymouth-quit.service.in
-@@ -3,7 +3,7 @@ Description=Terminate Plymouth Boot Screen
- After=rc-local.service plymouth-start.service systemd-user-sessions.service
- 
- [Service]
--ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit
-+ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash
- Type=oneshot
- RemainAfterExit=yes
- TimeoutSec=20
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch b/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch
deleted file mode 100644
index 7ba1034e93..0000000000
--- a/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 658eac007d14d836cb002a5675487bac63d50324 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Mon, 7 Feb 2022 03:22:12 +0000
-Subject: [PATCH] plymouth-start.service.in: add related kernel parameter
-
-Add extra kernel parameter to make the plymouth splash screen
-display during boot.
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/plymouth/plymouth/-/merge_requests/156]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- systemd-units/plymouth-start.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in
-index 830a62d..c20aabe 100644
---- a/systemd-units/plymouth-start.service.in
-+++ b/systemd-units/plymouth-start.service.in
-@@ -9,7 +9,7 @@ ConditionVirtualization=!container
- IgnoreOnIsolate=true
- 
- [Service]
--ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
-+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot  --kernel-command-line="splash plymouth.ignore-serial-consoles" --pid-file=@plymouthruntimedir@/pid --attach-to-session
- ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
- Type=forking
- RemainAfterExit=yes
--- 
-2.31.1
-
diff --git a/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb b/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb
index cdf24477a7..05fe5c51e7 100644
--- a/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb
+++ b/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb
@@ -11,8 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRC_URI = " \
     http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \
     file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \
-    file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \
-    file://0001-plymouth-Add-the-retain-splash-option.patch \
     file://0001-Drop-libdl-references.patch \
     file://0001-Avoid-linking-to-plymouth_logo_file.patch \
     file://0001-Make-themes-build-optional.patch \
diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
index 86a2331bd3..c56160571a 100644
--- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
+++ b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Proxy libintl"
-HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/"
+HOMEPAGE = "https://download.gnome.org/binaries/win32/dependencies/"
 SECTION = "libs"
 LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/src/proxy-libintl/COPYING.LIB.txt;md5=bc400bc21422f9a92e76ec2c5167ca2e"
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://${UNPACKDIR}/src/proxy-libintl/COPYING.LIB.txt;md5=bc
 PROVIDES = "virtual/libintl"
 
 SRC_URI = " \
-    http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${BPN}-dev_${PV}_win32.zip \
+    https://download.gnome.org/binaries/win32/dependencies/${BPN}-dev_${PV}_win32.zip \
 "
-SRC_URI[md5sum] = "aef407c2b97ee829383aadd867c61d1e"
 SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356f9ae91"
 
+UPSTREAM_CHECK_REGEX = "${BPN}-dev_(?P<pver>\d+)_win32\.zip"
+
 PACKAGES = "${PN} ${PN}-dev"
 FILES:${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a"
 INSANE_SKIP:${PN}-dev = "staticdev"
diff --git a/meta-oe/recipes-core/safec/safec_3.7.1.bb b/meta-oe/recipes-core/safec/safec_3.7.1.bb
index 9dd6f1c7cc..a2f66e9a1a 100644
--- a/meta-oe/recipes-core/safec/safec_3.7.1.bb
+++ b/meta-oe/recipes-core/safec/safec_3.7.1.bb
@@ -6,7 +6,6 @@ SECTION = "lib"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/git"
 SRCREV = "f9add9245b97c7bda6e28cceb0ee37fb7e254fd8"
 SRC_URI = "git://github.com/rurban/safeclib.git;branch=master;protocol=https \
            file://0001-strpbrk_s-Remove-unused-variable-len.patch \
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb
index ceb422325c..9c39d40d23 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb
@@ -55,7 +55,6 @@ CFLAGS:append:libc-musl = " -D__UAPI_DEF_ETHHDR=0 "
 
 EXTRA_OEMESON += "-Dstatic-libsystemd=pic"
 
-S = "${WORKDIR}/git"
 
 RDEPENDS:${PN}-dev = ""
 
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_2.0.0.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_2.1.0.bb
index af112ced88..0467c834b8 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_2.0.0.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_2.1.0.bb
@@ -8,9 +8,9 @@ inherit cmake
 
 DEPENDS += "expat"
 
-SRCREV = "e62472b210d9e7f06a5e611c23471d414c99a99c"
-SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;subpath=tools"
+SRCREV = "0261d0ec60b68c1f0a6ec9acf63d1379f7d569f8"
+SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;tag=v${PV};subpath=tools"
 
-S = "${WORKDIR}/tools"
+S = "${UNPACKDIR}/tools"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.0.0.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.1.0.bb
index 2b6bb1011a..62b30e9894 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.0.0.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.1.0.bb
@@ -16,16 +16,14 @@ PACKAGECONFIG[with-tests] = "-DSDBUSCPP_BUILD_TESTS=ON -DSDBUSCPP_INSTALL_TESTS=
 
 DEPENDS += "expat"
 
-PV .= "+git"
-SRCREV = "e62472b210d9e7f06a5e611c23471d414c99a99c"
-SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \
+SRCREV = "0261d0ec60b68c1f0a6ec9acf63d1379f7d569f8"
+SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;tag=v${PV} \
            file://run-ptest"
 
 EXTRA_OECMAKE = "-DSDBUSCPP_BUILD_CODEGEN=OFF \
                  -DSDBUSCPP_BUILD_DOCS=ON \
                  -DSDBUSCPP_BUILD_DOXYGEN_DOCS=OFF"
 
-S = "${WORKDIR}/git"
 
 # Link libatomic on architectures without 64bit atomics fixes
 # libsdbus-c++.so.1.1.0: undefined reference to `__atomic_load_8'
@@ -46,6 +44,6 @@ do_install_ptest() {
 FILES:${PN}-ptest =+ "${sysconfdir}/dbus-1/system.d/"
 FILES:${PN}-dev += "${bindir}/sdbus-c++-xml2cpp"
 
-RDEPENDS:${PN}-ptest += "dbus"
+RDEPENDS:${PN}-ptest += "${VIRTUAL-RUNTIME_dbus}"
 # It adds -isystem which is spurious, no idea where it gets it from
 CCACHE_DISABLE = "1"
diff --git a/meta-oe/recipes-core/systemd/systemd-repart-native_257.6.bb b/meta-oe/recipes-core/systemd/systemd-repart-native_257.6.bb
new file mode 100644
index 0000000000..15b60af02e
--- /dev/null
+++ b/meta-oe/recipes-core/systemd/systemd-repart-native_257.6.bb
@@ -0,0 +1,59 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright Leica Geosystems AG
+#
+
+SUMMARY = "systemd-repart"
+DESCRIPTION = "systemd-repart grows and adds partitions to a partition table, based on the configuration files described in repart.d(5), or generates a Discoverable Disk Image (DDI) for a system extension (sysext, see systemd-sysext(8))."
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE = "GPL-2.0-only & LGPL-2.1-or-later"
+LICENSE:libsystemd = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
+                    file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
+
+SRCREV = "00a12c234e2506f5cab683460199575f13c454db"
+SRCBRANCH = "v257-stable"
+SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH}"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = " \
+    cryptsetup-native \
+    gperf-native \
+    libcap \
+    python3-jinja2-native \
+    util-linux \
+"
+
+inherit meson pkgconfig gettext native
+
+MESON_TARGET = "systemd-repart"
+
+# Helper variables to clarify locations. This mirrors the logic in systemd's
+# build system.
+rootprefix ?= "${root_prefix}"
+rootlibdir ?= "${base_libdir}"
+rootlibexecdir = "${rootprefix}/lib"
+
+EXTRA_OEMESON += "-Dnobody-user=nobody \
+    -Dnobody-group=nogroup \
+    -Drootlibdir=${rootlibdir} \
+    -Drootprefix=${rootprefix} \
+    -Ddefault-locale=C \
+    -Dmode=release \
+    -Dsystem-alloc-uid-min=101 \
+    -Dsystem-uid-max=999 \
+    -Dsystem-alloc-gid-min=101 \
+    -Dsystem-gid-max=999 \
+"
+
+do_install() {
+    install -d ${D}${bindir}/
+    install -m 0755 ${B}/systemd-repart ${D}${bindir}/systemd-repart
+    install -d ${D}${libdir}/
+    install -m 0644 ${B}/src/shared/libsystemd-shared-257.so ${D}${libdir}/libsystemd-shared-257.so
+
+    install -d ${D}${libdir}/systemd/repart/
+    cp -r ${S}/src/repart/definitions ${D}${libdir}/systemd/repart/
+}
diff --git a/meta-oe/recipes-core/toybox/toybox_0.8.11.bb b/meta-oe/recipes-core/toybox/toybox_0.8.12.bb
index db071a1995..7281bb5684 100644
--- a/meta-oe/recipes-core/toybox/toybox_0.8.11.bb
+++ b/meta-oe/recipes-core/toybox/toybox_0.8.12.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=78659a599b9325da368f2f1eb88f19c7"
 inherit cml1 update-alternatives
 
 SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz"
-SRC_URI[sha256sum] = "15aa3f832f4ec1874db761b9950617f99e1e38144c22da39a71311093bfe67dc"
+SRC_URI[sha256sum] = "ad88a921133ae2231d9f2df875ec0bd42af4429145caea7d7db9e02208a6fd2e"
 
 SECTION = "base"
 
diff --git a/meta-oe/recipes-core/usleep/usleep_1.2.bb b/meta-oe/recipes-core/usleep/usleep_1.2.bb
index 882ac2c2ff..530104e964 100644
--- a/meta-oe/recipes-core/usleep/usleep_1.2.bb
+++ b/meta-oe/recipes-core/usleep/usleep_1.2.bb
@@ -3,8 +3,7 @@ SECTION = "base"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 DEPENDS = "popt"
 
 SRC_URI = "file://usleep.c \
@@ -32,3 +31,7 @@ ALTERNATIVE_LINK_NAME[usleep] = "${base_bindir}/usleep"
 
 ALTERNATIVE:${PN}-doc = "usleep.1"
 ALTERNATIVE_LINK_NAME[usleep.1] = "${mandir}/man1/usleep.1"
+
+# http://errors.yoctoproject.org/Errors/Details/766900/
+# usleep.c:47:43: error: passing argument 3 of 'poptGetContext' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc
index 3a5bee7cee..ca88d426a7 100644
--- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc
+++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc
@@ -2,587 +2,1041 @@
 
 # from Cargo.lock
 SRC_URI += " \
-    crate://crates.io/adler/1.0.2 \
-    crate://crates.io/ahash/0.7.8 \
-    crate://crates.io/aho-corasick/1.0.4 \
+    crate://crates.io/adler2/2.0.0 \
+    crate://crates.io/aho-corasick/1.1.3 \
+    crate://crates.io/allocator-api2/0.2.21 \
     crate://crates.io/android-tzdata/0.1.1 \
     crate://crates.io/android_system_properties/0.1.5 \
-    crate://crates.io/anstream/0.5.0 \
-    crate://crates.io/anstyle/1.0.0 \
-    crate://crates.io/anstyle-parse/0.2.0 \
-    crate://crates.io/anstyle-query/1.0.0 \
-    crate://crates.io/anstyle-wincon/2.1.0 \
-    crate://crates.io/arbitrary/1.3.2 \
-    crate://crates.io/arrayref/0.3.6 \
-    crate://crates.io/arrayvec/0.7.4 \
-    crate://crates.io/autocfg/1.1.0 \
-    crate://crates.io/bigdecimal/0.4.0 \
+    crate://crates.io/ansi-width/0.1.0 \
+    crate://crates.io/anstream/0.6.18 \
+    crate://crates.io/anstyle/1.0.10 \
+    crate://crates.io/anstyle-parse/0.2.6 \
+    crate://crates.io/anstyle-query/1.1.2 \
+    crate://crates.io/anstyle-wincon/3.0.7 \
+    crate://crates.io/arbitrary/1.4.1 \
+    crate://crates.io/arrayref/0.3.9 \
+    crate://crates.io/arrayvec/0.7.6 \
+    crate://crates.io/autocfg/1.4.0 \
+    crate://crates.io/bigdecimal/0.4.8 \
     crate://crates.io/binary-heap-plus/0.5.0 \
-    crate://crates.io/bindgen/0.63.0 \
+    crate://crates.io/bincode/2.0.1 \
+    crate://crates.io/bincode_derive/2.0.1 \
+    crate://crates.io/bindgen/0.71.1 \
     crate://crates.io/bitflags/1.3.2 \
-    crate://crates.io/bitflags/2.4.2 \
+    crate://crates.io/bitflags/2.9.0 \
     crate://crates.io/bitvec/1.0.1 \
-    crate://crates.io/blake2b_simd/1.0.2 \
-    crate://crates.io/blake3/1.5.1 \
-    crate://crates.io/block-buffer/0.10.3 \
-    crate://crates.io/bstr/1.9.1 \
-    crate://crates.io/bumpalo/3.11.1 \
+    crate://crates.io/blake2b_simd/1.0.3 \
+    crate://crates.io/blake3/1.8.2 \
+    crate://crates.io/block-buffer/0.10.4 \
+    crate://crates.io/bstr/1.12.0 \
+    crate://crates.io/bumpalo/3.17.0 \
     crate://crates.io/bytecount/0.6.8 \
     crate://crates.io/byteorder/1.5.0 \
-    crate://crates.io/cc/1.0.79 \
+    crate://crates.io/cc/1.2.16 \
     crate://crates.io/cexpr/0.6.0 \
     crate://crates.io/cfg-if/1.0.0 \
-    crate://crates.io/cfg_aliases/0.1.1 \
-    crate://crates.io/chrono/0.4.38 \
-    crate://crates.io/clang-sys/1.4.0 \
-    crate://crates.io/clap/4.4.2 \
-    crate://crates.io/clap_builder/4.4.2 \
-    crate://crates.io/clap_complete/4.4.0 \
-    crate://crates.io/clap_lex/0.5.0 \
-    crate://crates.io/clap_mangen/0.2.9 \
-    crate://crates.io/colorchoice/1.0.0 \
+    crate://crates.io/cfg_aliases/0.2.1 \
+    crate://crates.io/chrono/0.4.41 \
+    crate://crates.io/chrono-tz/0.10.3 \
+    crate://crates.io/chrono-tz-build/0.4.0 \
+    crate://crates.io/clang-sys/1.8.1 \
+    crate://crates.io/clap/4.5.38 \
+    crate://crates.io/clap_builder/4.5.38 \
+    crate://crates.io/clap_complete/4.5.50 \
+    crate://crates.io/clap_lex/0.7.4 \
+    crate://crates.io/clap_mangen/0.2.26 \
+    crate://crates.io/colorchoice/1.0.3 \
     crate://crates.io/compare/0.1.0 \
-    crate://crates.io/console/0.15.8 \
-    crate://crates.io/const-random/0.1.16 \
+    crate://crates.io/console/0.15.11 \
+    crate://crates.io/const-random/0.1.18 \
     crate://crates.io/const-random-macro/0.1.16 \
-    crate://crates.io/constant_time_eq/0.3.0 \
-    crate://crates.io/core-foundation-sys/0.8.3 \
+    crate://crates.io/constant_time_eq/0.3.1 \
+    crate://crates.io/convert_case/0.7.1 \
+    crate://crates.io/core-foundation-sys/0.8.7 \
     crate://crates.io/coz/0.1.3 \
-    crate://crates.io/cpp/0.5.9 \
-    crate://crates.io/cpp_build/0.5.9 \
-    crate://crates.io/cpp_common/0.5.9 \
-    crate://crates.io/cpp_macros/0.5.9 \
-    crate://crates.io/cpufeatures/0.2.5 \
-    crate://crates.io/crc32fast/1.4.0 \
-    crate://crates.io/crossbeam-channel/0.5.10 \
-    crate://crates.io/crossbeam-deque/0.8.4 \
-    crate://crates.io/crossbeam-epoch/0.9.17 \
-    crate://crates.io/crossbeam-utils/0.8.19 \
-    crate://crates.io/crossterm/0.27.0 \
+    crate://crates.io/cpp/0.5.10 \
+    crate://crates.io/cpp_build/0.5.10 \
+    crate://crates.io/cpp_common/0.5.10 \
+    crate://crates.io/cpp_macros/0.5.10 \
+    crate://crates.io/cpufeatures/0.2.17 \
+    crate://crates.io/crc32fast/1.4.2 \
+    crate://crates.io/crossbeam-deque/0.8.6 \
+    crate://crates.io/crossbeam-epoch/0.9.18 \
+    crate://crates.io/crossbeam-utils/0.8.21 \
+    crate://crates.io/crossterm/0.29.0 \
     crate://crates.io/crossterm_winapi/0.9.1 \
-    crate://crates.io/crunchy/0.2.2 \
+    crate://crates.io/crunchy/0.2.3 \
     crate://crates.io/crypto-common/0.1.6 \
-    crate://crates.io/ctrlc/3.4.4 \
-    crate://crates.io/data-encoding/2.5.0 \
-    crate://crates.io/data-encoding-macro/0.1.14 \
-    crate://crates.io/data-encoding-macro-internal/0.1.12 \
-    crate://crates.io/derive_arbitrary/1.3.2 \
+    crate://crates.io/ctor/0.4.2 \
+    crate://crates.io/ctor-proc-macro/0.0.5 \
+    crate://crates.io/ctrlc/3.4.7 \
+    crate://crates.io/data-encoding/2.9.0 \
+    crate://crates.io/data-encoding-macro/0.1.18 \
+    crate://crates.io/data-encoding-macro-internal/0.1.16 \
+    crate://crates.io/deranged/0.4.0 \
+    crate://crates.io/derive_arbitrary/1.4.1 \
+    crate://crates.io/derive_more/2.0.1 \
+    crate://crates.io/derive_more-impl/2.0.1 \
     crate://crates.io/diff/0.1.13 \
     crate://crates.io/digest/0.10.7 \
-    crate://crates.io/dlv-list/0.5.0 \
+    crate://crates.io/displaydoc/0.2.5 \
+    crate://crates.io/dlv-list/0.5.2 \
     crate://crates.io/dns-lookup/2.0.4 \
-    crate://crates.io/dunce/1.0.4 \
-    crate://crates.io/either/1.8.0 \
-    crate://crates.io/encode_unicode/0.3.6 \
-    crate://crates.io/env_logger/0.8.4 \
-    crate://crates.io/errno/0.3.8 \
+    crate://crates.io/document-features/0.2.11 \
+    crate://crates.io/dtor/0.0.6 \
+    crate://crates.io/dtor-proc-macro/0.0.5 \
+    crate://crates.io/dunce/1.0.5 \
+    crate://crates.io/either/1.15.0 \
+    crate://crates.io/encode_unicode/1.0.0 \
+    crate://crates.io/equivalent/1.0.2 \
+    crate://crates.io/errno/0.3.10 \
     crate://crates.io/exacl/0.12.0 \
-    crate://crates.io/fastrand/2.0.1 \
+    crate://crates.io/fastrand/2.3.0 \
     crate://crates.io/file_diff/1.0.0 \
-    crate://crates.io/filedescriptor/0.8.2 \
-    crate://crates.io/filetime/0.2.23 \
-    crate://crates.io/flate2/1.0.28 \
+    crate://crates.io/filedescriptor/0.8.3 \
+    crate://crates.io/filetime/0.2.25 \
+    crate://crates.io/flate2/1.1.1 \
+    crate://crates.io/fluent/0.17.0 \
+    crate://crates.io/fluent-bundle/0.16.0 \
+    crate://crates.io/fluent-langneg/0.13.0 \
+    crate://crates.io/fluent-syntax/0.12.0 \
     crate://crates.io/fnv/1.0.7 \
+    crate://crates.io/foldhash/0.1.4 \
     crate://crates.io/fs_extra/1.3.0 \
     crate://crates.io/fsevent-sys/4.1.0 \
-    crate://crates.io/fts-sys/0.2.4 \
-    crate://crates.io/fundu/2.0.0 \
-    crate://crates.io/fundu-core/0.3.0 \
+    crate://crates.io/fts-sys/0.2.16 \
     crate://crates.io/funty/2.0.0 \
-    crate://crates.io/futures/0.3.28 \
-    crate://crates.io/futures-channel/0.3.28 \
-    crate://crates.io/futures-core/0.3.28 \
-    crate://crates.io/futures-executor/0.3.28 \
-    crate://crates.io/futures-io/0.3.28 \
-    crate://crates.io/futures-macro/0.3.28 \
-    crate://crates.io/futures-sink/0.3.28 \
-    crate://crates.io/futures-task/0.3.28 \
-    crate://crates.io/futures-timer/3.0.2 \
-    crate://crates.io/futures-util/0.3.28 \
+    crate://crates.io/futures-core/0.3.31 \
+    crate://crates.io/futures-macro/0.3.31 \
+    crate://crates.io/futures-task/0.3.31 \
+    crate://crates.io/futures-timer/3.0.3 \
+    crate://crates.io/futures-util/0.3.31 \
     crate://crates.io/gcd/2.3.0 \
-    crate://crates.io/generic-array/0.14.6 \
-    crate://crates.io/getrandom/0.2.9 \
-    crate://crates.io/glob/0.3.1 \
-    crate://crates.io/half/2.4.0 \
-    crate://crates.io/hashbrown/0.12.3 \
-    crate://crates.io/hashbrown/0.14.3 \
-    crate://crates.io/hermit-abi/0.3.2 \
+    crate://crates.io/generic-array/0.14.7 \
+    crate://crates.io/getrandom/0.2.15 \
+    crate://crates.io/getrandom/0.3.1 \
+    crate://crates.io/glob/0.3.2 \
+    crate://crates.io/half/2.6.0 \
+    crate://crates.io/hashbrown/0.14.5 \
+    crate://crates.io/hashbrown/0.15.2 \
     crate://crates.io/hex/0.4.3 \
-    crate://crates.io/hex-literal/0.4.1 \
-    crate://crates.io/hostname/0.4.0 \
-    crate://crates.io/iana-time-zone/0.1.53 \
+    crate://crates.io/hex-literal/1.0.0 \
+    crate://crates.io/hostname/0.4.1 \
+    crate://crates.io/iana-time-zone/0.1.63 \
     crate://crates.io/iana-time-zone-haiku/0.1.2 \
-    crate://crates.io/indicatif/0.17.3 \
-    crate://crates.io/inotify/0.9.6 \
+    crate://crates.io/indexmap/2.7.1 \
+    crate://crates.io/indicatif/0.17.11 \
+    crate://crates.io/inotify/0.11.0 \
     crate://crates.io/inotify-sys/0.1.5 \
-    crate://crates.io/io-lifetimes/1.0.11 \
-    crate://crates.io/itertools/0.12.1 \
-    crate://crates.io/itoa/1.0.4 \
-    crate://crates.io/js-sys/0.3.64 \
-    crate://crates.io/keccak/0.1.4 \
-    crate://crates.io/kqueue/1.0.7 \
-    crate://crates.io/kqueue-sys/1.0.3 \
-    crate://crates.io/lazy_static/1.4.0 \
-    crate://crates.io/lazycell/1.3.0 \
-    crate://crates.io/libc/0.2.153 \
-    crate://crates.io/libloading/0.7.4 \
-    crate://crates.io/libm/0.2.7 \
-    crate://crates.io/linux-raw-sys/0.3.8 \
-    crate://crates.io/linux-raw-sys/0.4.12 \
-    crate://crates.io/lock_api/0.4.9 \
-    crate://crates.io/log/0.4.20 \
-    crate://crates.io/lru/0.7.8 \
-    crate://crates.io/lscolors/0.16.0 \
+    crate://crates.io/intl-memoizer/0.5.3 \
+    crate://crates.io/intl_pluralrules/7.0.2 \
+    crate://crates.io/is_terminal_polyfill/1.70.1 \
+    crate://crates.io/itertools/0.13.0 \
+    crate://crates.io/itertools/0.14.0 \
+    crate://crates.io/itoa/1.0.15 \
+    crate://crates.io/js-sys/0.3.77 \
+    crate://crates.io/keccak/0.1.5 \
+    crate://crates.io/kqueue/1.0.8 \
+    crate://crates.io/kqueue-sys/1.0.4 \
+    crate://crates.io/lazy_static/1.5.0 \
+    crate://crates.io/libc/0.2.172 \
+    crate://crates.io/libloading/0.8.6 \
+    crate://crates.io/libm/0.2.11 \
+    crate://crates.io/libredox/0.1.3 \
+    crate://crates.io/libz-rs-sys/0.5.0 \
+    crate://crates.io/linux-raw-sys/0.4.15 \
+    crate://crates.io/linux-raw-sys/0.9.4 \
+    crate://crates.io/litrs/0.4.1 \
+    crate://crates.io/lock_api/0.4.12 \
+    crate://crates.io/lockfree-object-pool/0.1.6 \
+    crate://crates.io/log/0.4.26 \
+    crate://crates.io/lru/0.12.5 \
+    crate://crates.io/lscolors/0.20.0 \
     crate://crates.io/md-5/0.10.6 \
-    crate://crates.io/memchr/2.7.1 \
-    crate://crates.io/memmap2/0.9.0 \
+    crate://crates.io/memchr/2.7.4 \
+    crate://crates.io/memmap2/0.9.5 \
     crate://crates.io/minimal-lexical/0.2.1 \
-    crate://crates.io/miniz_oxide/0.7.2 \
-    crate://crates.io/mio/0.8.11 \
-    crate://crates.io/nix/0.28.0 \
+    crate://crates.io/miniz_oxide/0.8.5 \
+    crate://crates.io/mio/1.0.3 \
+    crate://crates.io/nix/0.30.1 \
     crate://crates.io/nom/7.1.3 \
-    crate://crates.io/notify/6.0.1 \
-    crate://crates.io/nu-ansi-term/0.49.0 \
-    crate://crates.io/num-bigint/0.4.4 \
-    crate://crates.io/num-integer/0.1.45 \
+    crate://crates.io/nom/8.0.0 \
+    crate://crates.io/notify/8.0.0 \
+    crate://crates.io/notify-types/2.0.0 \
+    crate://crates.io/nu-ansi-term/0.50.1 \
+    crate://crates.io/num-bigint/0.4.6 \
+    crate://crates.io/num-conv/0.1.0 \
+    crate://crates.io/num-integer/0.1.46 \
     crate://crates.io/num-modular/0.5.1 \
-    crate://crates.io/num-prime/0.4.3 \
-    crate://crates.io/num-traits/0.2.18 \
-    crate://crates.io/num_threads/0.1.6 \
+    crate://crates.io/num-prime/0.4.4 \
+    crate://crates.io/num-traits/0.2.19 \
+    crate://crates.io/num_threads/0.1.7 \
     crate://crates.io/number_prefix/0.4.0 \
-    crate://crates.io/once_cell/1.19.0 \
-    crate://crates.io/onig/6.4.0 \
-    crate://crates.io/onig_sys/69.8.1 \
+    crate://crates.io/once_cell/1.20.3 \
+    crate://crates.io/onig/6.5.1 \
+    crate://crates.io/onig_sys/69.9.1 \
     crate://crates.io/ordered-multimap/0.7.3 \
-    crate://crates.io/os_display/0.1.3 \
-    crate://crates.io/parking_lot/0.12.1 \
-    crate://crates.io/parking_lot_core/0.9.9 \
-    crate://crates.io/parse_datetime/0.5.0 \
-    crate://crates.io/peeking_take_while/0.1.2 \
-    crate://crates.io/phf/0.11.2 \
-    crate://crates.io/phf_codegen/0.11.2 \
-    crate://crates.io/phf_generator/0.11.1 \
-    crate://crates.io/phf_shared/0.11.2 \
-    crate://crates.io/pin-project-lite/0.2.9 \
+    crate://crates.io/os_display/0.1.4 \
+    crate://crates.io/parking_lot/0.12.3 \
+    crate://crates.io/parking_lot_core/0.9.10 \
+    crate://crates.io/parse-zoneinfo/0.3.1 \
+    crate://crates.io/parse_datetime/0.9.0 \
+    crate://crates.io/phf/0.11.3 \
+    crate://crates.io/phf_codegen/0.11.3 \
+    crate://crates.io/phf_generator/0.11.3 \
+    crate://crates.io/phf_shared/0.11.3 \
+    crate://crates.io/pin-project-lite/0.2.16 \
     crate://crates.io/pin-utils/0.1.0 \
-    crate://crates.io/pkg-config/0.3.26 \
-    crate://crates.io/platform-info/2.0.3 \
-    crate://crates.io/portable-atomic/0.3.15 \
-    crate://crates.io/ppv-lite86/0.2.17 \
-    crate://crates.io/pretty_assertions/1.4.0 \
-    crate://crates.io/proc-macro2/1.0.63 \
-    crate://crates.io/procfs/0.16.0 \
-    crate://crates.io/procfs-core/0.16.0 \
+    crate://crates.io/pkg-config/0.3.32 \
+    crate://crates.io/platform-info/2.0.5 \
+    crate://crates.io/portable-atomic/1.11.0 \
+    crate://crates.io/powerfmt/0.2.0 \
+    crate://crates.io/ppv-lite86/0.2.20 \
+    crate://crates.io/pretty_assertions/1.4.1 \
+    crate://crates.io/prettyplease/0.2.30 \
+    crate://crates.io/proc-macro-crate/3.3.0 \
+    crate://crates.io/proc-macro2/1.0.95 \
+    crate://crates.io/procfs/0.17.0 \
+    crate://crates.io/procfs-core/0.17.0 \
     crate://crates.io/quick-error/2.0.1 \
-    crate://crates.io/quickcheck/1.0.3 \
-    crate://crates.io/quote/1.0.29 \
+    crate://crates.io/quote/1.0.40 \
     crate://crates.io/radium/0.7.0 \
     crate://crates.io/rand/0.8.5 \
+    crate://crates.io/rand/0.9.1 \
     crate://crates.io/rand_chacha/0.3.1 \
+    crate://crates.io/rand_chacha/0.9.0 \
     crate://crates.io/rand_core/0.6.4 \
-    crate://crates.io/rand_pcg/0.3.1 \
+    crate://crates.io/rand_core/0.9.3 \
     crate://crates.io/rayon/1.10.0 \
     crate://crates.io/rayon-core/1.12.1 \
-    crate://crates.io/redox_syscall/0.4.1 \
-    crate://crates.io/redox_syscall/0.5.0 \
-    crate://crates.io/reference-counted-singleton/0.1.2 \
-    crate://crates.io/regex/1.10.4 \
-    crate://crates.io/regex-automata/0.4.4 \
-    crate://crates.io/regex-syntax/0.8.2 \
-    crate://crates.io/relative-path/1.8.0 \
-    crate://crates.io/rlimit/0.10.1 \
-    crate://crates.io/roff/0.2.1 \
-    crate://crates.io/rstest/0.19.0 \
-    crate://crates.io/rstest_macros/0.19.0 \
-    crate://crates.io/rust-ini/0.21.0 \
+    crate://crates.io/redox_syscall/0.5.10 \
+    crate://crates.io/regex/1.11.1 \
+    crate://crates.io/regex-automata/0.4.9 \
+    crate://crates.io/regex-syntax/0.8.5 \
+    crate://crates.io/relative-path/1.9.3 \
+    crate://crates.io/rlimit/0.10.2 \
+    crate://crates.io/roff/0.2.2 \
+    crate://crates.io/rstest/0.25.0 \
+    crate://crates.io/rstest_macros/0.25.0 \
+    crate://crates.io/rust-ini/0.21.1 \
     crate://crates.io/rustc-hash/1.1.0 \
-    crate://crates.io/rustc_version/0.4.0 \
-    crate://crates.io/rustix/0.37.26 \
-    crate://crates.io/rustix/0.38.31 \
+    crate://crates.io/rustc-hash/2.1.1 \
+    crate://crates.io/rustc_version/0.4.1 \
+    crate://crates.io/rustix/0.38.44 \
+    crate://crates.io/rustix/1.0.1 \
+    crate://crates.io/rustversion/1.0.20 \
     crate://crates.io/same-file/1.0.6 \
     crate://crates.io/scopeguard/1.2.0 \
-    crate://crates.io/self_cell/1.0.3 \
-    crate://crates.io/selinux/0.4.0 \
-    crate://crates.io/selinux-sys/0.6.2 \
-    crate://crates.io/semver/1.0.14 \
-    crate://crates.io/serde/1.0.193 \
-    crate://crates.io/serde_derive/1.0.193 \
+    crate://crates.io/self_cell/1.2.0 \
+    crate://crates.io/selinux/0.5.1 \
+    crate://crates.io/selinux-sys/0.6.14 \
+    crate://crates.io/semver/1.0.26 \
+    crate://crates.io/serde/1.0.219 \
+    crate://crates.io/serde-big-array/0.5.1 \
+    crate://crates.io/serde_derive/1.0.219 \
     crate://crates.io/sha1/0.10.6 \
-    crate://crates.io/sha2/0.10.8 \
+    crate://crates.io/sha2/0.10.9 \
     crate://crates.io/sha3/0.10.8 \
     crate://crates.io/shlex/1.3.0 \
-    crate://crates.io/signal-hook/0.3.17 \
-    crate://crates.io/signal-hook-mio/0.2.3 \
-    crate://crates.io/signal-hook-registry/1.4.1 \
-    crate://crates.io/siphasher/0.3.10 \
-    crate://crates.io/slab/0.4.7 \
+    crate://crates.io/signal-hook/0.3.18 \
+    crate://crates.io/signal-hook-mio/0.2.4 \
+    crate://crates.io/signal-hook-registry/1.4.2 \
+    crate://crates.io/simd-adler32/0.3.7 \
+    crate://crates.io/siphasher/1.0.1 \
+    crate://crates.io/slab/0.4.9 \
     crate://crates.io/sm3/0.4.2 \
-    crate://crates.io/smallvec/1.13.1 \
-    crate://crates.io/smawk/0.3.1 \
-    crate://crates.io/socket2/0.5.3 \
-    crate://crates.io/strsim/0.10.0 \
-    crate://crates.io/syn/1.0.109 \
-    crate://crates.io/syn/2.0.32 \
+    crate://crates.io/smallvec/1.15.0 \
+    crate://crates.io/smawk/0.3.2 \
+    crate://crates.io/socket2/0.5.8 \
+    crate://crates.io/strsim/0.11.1 \
+    crate://crates.io/syn/2.0.99 \
     crate://crates.io/tap/1.0.1 \
-    crate://crates.io/tempfile/3.10.1 \
-    crate://crates.io/terminal_size/0.2.6 \
-    crate://crates.io/terminal_size/0.3.0 \
-    crate://crates.io/textwrap/0.16.1 \
-    crate://crates.io/thiserror/1.0.37 \
-    crate://crates.io/thiserror-impl/1.0.37 \
-    crate://crates.io/time/0.3.20 \
-    crate://crates.io/time-core/0.1.0 \
-    crate://crates.io/time-macros/0.2.8 \
+    crate://crates.io/tempfile/3.20.0 \
+    crate://crates.io/terminal_size/0.4.2 \
+    crate://crates.io/textwrap/0.16.2 \
+    crate://crates.io/thiserror/1.0.69 \
+    crate://crates.io/thiserror/2.0.12 \
+    crate://crates.io/thiserror-impl/1.0.69 \
+    crate://crates.io/thiserror-impl/2.0.12 \
+    crate://crates.io/time/0.3.41 \
+    crate://crates.io/time-core/0.1.4 \
+    crate://crates.io/time-macros/0.2.22 \
     crate://crates.io/tiny-keccak/2.0.2 \
+    crate://crates.io/tinystr/0.8.1 \
+    crate://crates.io/toml_datetime/0.6.8 \
+    crate://crates.io/toml_edit/0.22.24 \
     crate://crates.io/trim-in-place/0.1.7 \
-    crate://crates.io/typenum/1.15.0 \
-    crate://crates.io/unicode-ident/1.0.5 \
+    crate://crates.io/type-map/0.5.0 \
+    crate://crates.io/typenum/1.18.0 \
+    crate://crates.io/unic-langid/0.9.6 \
+    crate://crates.io/unic-langid-impl/0.9.6 \
+    crate://crates.io/unicode-ident/1.0.18 \
     crate://crates.io/unicode-linebreak/0.1.5 \
-    crate://crates.io/unicode-segmentation/1.11.0 \
-    crate://crates.io/unicode-width/0.1.11 \
-    crate://crates.io/unicode-xid/0.2.4 \
-    crate://crates.io/unindent/0.2.1 \
-    crate://crates.io/utf8parse/0.2.1 \
-    crate://crates.io/uuid/1.7.0 \
-    crate://crates.io/uutils_term_grid/0.3.0 \
-    crate://crates.io/version_check/0.9.4 \
+    crate://crates.io/unicode-segmentation/1.12.0 \
+    crate://crates.io/unicode-width/0.1.14 \
+    crate://crates.io/unicode-width/0.2.0 \
+    crate://crates.io/unicode-xid/0.2.6 \
+    crate://crates.io/unindent/0.2.4 \
+    crate://crates.io/unty/0.0.4 \
+    crate://crates.io/utf8parse/0.2.2 \
+    crate://crates.io/utmp-classic/0.1.6 \
+    crate://crates.io/utmp-classic-raw/0.1.3 \
+    crate://crates.io/uuid/1.15.1 \
+    crate://crates.io/uutils_term_grid/0.7.0 \
+    crate://crates.io/version_check/0.9.5 \
+    crate://crates.io/virtue/0.0.18 \
     crate://crates.io/walkdir/2.5.0 \
     crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
-    crate://crates.io/wasm-bindgen/0.2.87 \
-    crate://crates.io/wasm-bindgen-backend/0.2.87 \
-    crate://crates.io/wasm-bindgen-macro/0.2.87 \
-    crate://crates.io/wasm-bindgen-macro-support/0.2.87 \
-    crate://crates.io/wasm-bindgen-shared/0.2.87 \
-    crate://crates.io/which/4.3.0 \
+    crate://crates.io/wasi/0.13.3+wasi-0.2.2 \
+    crate://crates.io/wasm-bindgen/0.2.100 \
+    crate://crates.io/wasm-bindgen-backend/0.2.100 \
+    crate://crates.io/wasm-bindgen-macro/0.2.100 \
+    crate://crates.io/wasm-bindgen-macro-support/0.2.100 \
+    crate://crates.io/wasm-bindgen-shared/0.2.100 \
+    crate://crates.io/web-time/1.1.0 \
     crate://crates.io/wild/2.2.1 \
     crate://crates.io/winapi/0.3.9 \
     crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-    crate://crates.io/winapi-util/0.1.8 \
+    crate://crates.io/winapi-util/0.1.9 \
     crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
-    crate://crates.io/windows/0.52.0 \
-    crate://crates.io/windows-core/0.52.0 \
-    crate://crates.io/windows-sys/0.45.0 \
+    crate://crates.io/windows-core/0.60.1 \
+    crate://crates.io/windows-implement/0.59.0 \
+    crate://crates.io/windows-interface/0.59.1 \
+    crate://crates.io/windows-link/0.1.1 \
+    crate://crates.io/windows-result/0.3.1 \
+    crate://crates.io/windows-strings/0.3.1 \
     crate://crates.io/windows-sys/0.48.0 \
     crate://crates.io/windows-sys/0.52.0 \
-    crate://crates.io/windows-targets/0.42.2 \
-    crate://crates.io/windows-targets/0.48.0 \
-    crate://crates.io/windows-targets/0.52.0 \
-    crate://crates.io/windows_aarch64_gnullvm/0.42.2 \
-    crate://crates.io/windows_aarch64_gnullvm/0.48.0 \
-    crate://crates.io/windows_aarch64_gnullvm/0.52.0 \
-    crate://crates.io/windows_aarch64_msvc/0.42.2 \
-    crate://crates.io/windows_aarch64_msvc/0.48.0 \
-    crate://crates.io/windows_aarch64_msvc/0.52.0 \
-    crate://crates.io/windows_i686_gnu/0.42.2 \
-    crate://crates.io/windows_i686_gnu/0.48.0 \
-    crate://crates.io/windows_i686_gnu/0.52.0 \
-    crate://crates.io/windows_i686_msvc/0.42.2 \
-    crate://crates.io/windows_i686_msvc/0.48.0 \
-    crate://crates.io/windows_i686_msvc/0.52.0 \
-    crate://crates.io/windows_x86_64_gnu/0.42.2 \
-    crate://crates.io/windows_x86_64_gnu/0.48.0 \
-    crate://crates.io/windows_x86_64_gnu/0.52.0 \
-    crate://crates.io/windows_x86_64_gnullvm/0.42.2 \
-    crate://crates.io/windows_x86_64_gnullvm/0.48.0 \
-    crate://crates.io/windows_x86_64_gnullvm/0.52.0 \
-    crate://crates.io/windows_x86_64_msvc/0.42.2 \
-    crate://crates.io/windows_x86_64_msvc/0.48.0 \
-    crate://crates.io/windows_x86_64_msvc/0.52.0 \
+    crate://crates.io/windows-sys/0.59.0 \
+    crate://crates.io/windows-targets/0.48.5 \
+    crate://crates.io/windows-targets/0.52.6 \
+    crate://crates.io/windows_aarch64_gnullvm/0.48.5 \
+    crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
+    crate://crates.io/windows_aarch64_msvc/0.48.5 \
+    crate://crates.io/windows_aarch64_msvc/0.52.6 \
+    crate://crates.io/windows_i686_gnu/0.48.5 \
+    crate://crates.io/windows_i686_gnu/0.52.6 \
+    crate://crates.io/windows_i686_gnullvm/0.52.6 \
+    crate://crates.io/windows_i686_msvc/0.48.5 \
+    crate://crates.io/windows_i686_msvc/0.52.6 \
+    crate://crates.io/windows_x86_64_gnu/0.48.5 \
+    crate://crates.io/windows_x86_64_gnu/0.52.6 \
+    crate://crates.io/windows_x86_64_gnullvm/0.48.5 \
+    crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
+    crate://crates.io/windows_x86_64_msvc/0.48.5 \
+    crate://crates.io/windows_x86_64_msvc/0.52.6 \
+    crate://crates.io/winnow/0.7.3 \
+    crate://crates.io/wit-bindgen-rt/0.33.0 \
     crate://crates.io/wyz/0.5.1 \
-    crate://crates.io/xattr/1.3.1 \
-    crate://crates.io/yansi/0.5.1 \
-    crate://crates.io/z85/3.0.5 \
-    crate://crates.io/zip/1.1.1 \
+    crate://crates.io/xattr/1.5.0 \
+    crate://crates.io/yansi/1.0.1 \
+    crate://crates.io/z85/3.0.6 \
+    crate://crates.io/zerocopy/0.7.35 \
+    crate://crates.io/zerocopy-derive/0.7.35 \
+    crate://crates.io/zerofrom/0.1.6 \
+    crate://crates.io/zerovec/0.11.2 \
+    crate://crates.io/zip/4.0.0 \
+    crate://crates.io/zlib-rs/0.5.0 \
+    crate://crates.io/zopfli/0.8.1 \
 "
 
-SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-SRC_URI[ahash-0.7.8.sha256sum] = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
-SRC_URI[aho-corasick-1.0.4.sha256sum] = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
+SRC_URI[adler2-2.0.0.sha256sum] = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+SRC_URI[allocator-api2-0.2.21.sha256sum] = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
 SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-SRC_URI[anstream-0.5.0.sha256sum] = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
-SRC_URI[anstyle-1.0.0.sha256sum] = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
-SRC_URI[anstyle-parse-0.2.0.sha256sum] = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
-SRC_URI[anstyle-query-1.0.0.sha256sum] = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
-SRC_URI[anstyle-wincon-2.1.0.sha256sum] = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
-SRC_URI[arbitrary-1.3.2.sha256sum] = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
-SRC_URI[arrayref-0.3.6.sha256sum] = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-SRC_URI[arrayvec-0.7.4.sha256sum] = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-SRC_URI[bigdecimal-0.4.0.sha256sum] = "5274a6b6e0ee020148397245b973e30163b7bffbc6d473613f850cb99888581e"
+SRC_URI[ansi-width-0.1.0.sha256sum] = "219e3ce6f2611d83b51ec2098a12702112c29e57203a6b0a0929b2cddb486608"
+SRC_URI[anstream-0.6.18.sha256sum] = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+SRC_URI[anstyle-1.0.10.sha256sum] = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+SRC_URI[anstyle-parse-0.2.6.sha256sum] = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+SRC_URI[anstyle-query-1.1.2.sha256sum] = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+SRC_URI[anstyle-wincon-3.0.7.sha256sum] = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+SRC_URI[arbitrary-1.4.1.sha256sum] = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+SRC_URI[arrayref-0.3.9.sha256sum] = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+SRC_URI[arrayvec-0.7.6.sha256sum] = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+SRC_URI[autocfg-1.4.0.sha256sum] = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+SRC_URI[bigdecimal-0.4.8.sha256sum] = "1a22f228ab7a1b23027ccc6c350b72868017af7ea8356fbdf19f8d991c690013"
 SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296"
-SRC_URI[bindgen-0.63.0.sha256sum] = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
+SRC_URI[bincode-2.0.1.sha256sum] = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740"
+SRC_URI[bincode_derive-2.0.1.sha256sum] = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09"
+SRC_URI[bindgen-0.71.1.sha256sum] = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
 SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+SRC_URI[bitflags-2.9.0.sha256sum] = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 SRC_URI[bitvec-1.0.1.sha256sum] = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-SRC_URI[blake2b_simd-1.0.2.sha256sum] = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
-SRC_URI[blake3-1.5.1.sha256sum] = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
-SRC_URI[block-buffer-0.10.3.sha256sum] = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
-SRC_URI[bstr-1.9.1.sha256sum] = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
-SRC_URI[bumpalo-3.11.1.sha256sum] = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+SRC_URI[blake2b_simd-1.0.3.sha256sum] = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99"
+SRC_URI[blake3-1.8.2.sha256sum] = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
+SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+SRC_URI[bstr-1.12.0.sha256sum] = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
+SRC_URI[bumpalo-3.17.0.sha256sum] = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 SRC_URI[bytecount-0.6.8.sha256sum] = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
 SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+SRC_URI[cc-1.2.16.sha256sum] = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
 SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-SRC_URI[cfg_aliases-0.1.1.sha256sum] = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-SRC_URI[chrono-0.4.38.sha256sum] = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-SRC_URI[clang-sys-1.4.0.sha256sum] = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
-SRC_URI[clap-4.4.2.sha256sum] = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6"
-SRC_URI[clap_builder-4.4.2.sha256sum] = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
-SRC_URI[clap_complete-4.4.0.sha256sum] = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5"
-SRC_URI[clap_lex-0.5.0.sha256sum] = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
-SRC_URI[clap_mangen-0.2.9.sha256sum] = "bb0f09a0ca8f0dd8ac92c546b426f466ef19828185c6d504c80c48c9c2768ed9"
-SRC_URI[colorchoice-1.0.0.sha256sum] = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+SRC_URI[chrono-0.4.41.sha256sum] = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+SRC_URI[chrono-tz-0.10.3.sha256sum] = "efdce149c370f133a071ca8ef6ea340b7b88748ab0810097a9e2976eaa34b4f3"
+SRC_URI[chrono-tz-build-0.4.0.sha256sum] = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7"
+SRC_URI[clang-sys-1.8.1.sha256sum] = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+SRC_URI[clap-4.5.38.sha256sum] = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
+SRC_URI[clap_builder-4.5.38.sha256sum] = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
+SRC_URI[clap_complete-4.5.50.sha256sum] = "c91d3baa3bcd889d60e6ef28874126a0b384fd225ab83aa6d8a801c519194ce1"
+SRC_URI[clap_lex-0.7.4.sha256sum] = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+SRC_URI[clap_mangen-0.2.26.sha256sum] = "724842fa9b144f9b89b3f3d371a89f3455eea660361d13a554f68f8ae5d6c13a"
+SRC_URI[colorchoice-1.0.3.sha256sum] = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3"
-SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-SRC_URI[const-random-0.1.16.sha256sum] = "11df32a13d7892ec42d51d3d175faba5211ffe13ed25d4fb348ac9e9ce835593"
+SRC_URI[console-0.15.11.sha256sum] = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
+SRC_URI[const-random-0.1.18.sha256sum] = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
 SRC_URI[const-random-macro-0.1.16.sha256sum] = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
-SRC_URI[constant_time_eq-0.3.0.sha256sum] = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
-SRC_URI[core-foundation-sys-0.8.3.sha256sum] = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+SRC_URI[constant_time_eq-0.3.1.sha256sum] = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+SRC_URI[convert_case-0.7.1.sha256sum] = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
+SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 SRC_URI[coz-0.1.3.sha256sum] = "cef55b3fe2f5477d59e12bc792e8b3c95a25bd099eadcfae006ecea136de76e2"
-SRC_URI[cpp-0.5.9.sha256sum] = "bfa65869ef853e45c60e9828aa08cdd1398cb6e13f3911d9cb2a079b144fcd64"
-SRC_URI[cpp_build-0.5.9.sha256sum] = "0e361fae2caf9758164b24da3eedd7f7d7451be30d90d8e7b5d2be29a2f0cf5b"
-SRC_URI[cpp_common-0.5.9.sha256sum] = "3e1a2532e4ed4ea13031c13bc7bc0dbca4aae32df48e9d77f0d1e743179f2ea1"
-SRC_URI[cpp_macros-0.5.9.sha256sum] = "47ec9cc90633446f779ef481a9ce5a0077107dd5b87016440448d908625a83fd"
-SRC_URI[cpufeatures-0.2.5.sha256sum] = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-SRC_URI[crc32fast-1.4.0.sha256sum] = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
-SRC_URI[crossbeam-channel-0.5.10.sha256sum] = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2"
-SRC_URI[crossbeam-deque-0.8.4.sha256sum] = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751"
-SRC_URI[crossbeam-epoch-0.9.17.sha256sum] = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d"
-SRC_URI[crossbeam-utils-0.8.19.sha256sum] = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
-SRC_URI[crossterm-0.27.0.sha256sum] = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
+SRC_URI[cpp-0.5.10.sha256sum] = "f36bcac3d8234c1fb813358e83d1bb6b0290a3d2b3b5efc6b88bfeaf9d8eec17"
+SRC_URI[cpp_build-0.5.10.sha256sum] = "27f8638c97fbd79cc6fc80b616e0e74b49bac21014faed590bbc89b7e2676c90"
+SRC_URI[cpp_common-0.5.10.sha256sum] = "25fcfea2ee05889597d35e986c2ad0169694320ae5cc8f6d2640a4bb8a884560"
+SRC_URI[cpp_macros-0.5.10.sha256sum] = "d156158fe86e274820f5a53bc9edb0885a6e7113909497aa8d883b69dd171871"
+SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+SRC_URI[crc32fast-1.4.2.sha256sum] = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+SRC_URI[crossterm-0.29.0.sha256sum] = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
 SRC_URI[crossterm_winapi-0.9.1.sha256sum] = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-SRC_URI[crunchy-0.2.2.sha256sum] = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+SRC_URI[crunchy-0.2.3.sha256sum] = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
 SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-SRC_URI[ctrlc-3.4.4.sha256sum] = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345"
-SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
-SRC_URI[data-encoding-macro-0.1.14.sha256sum] = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e"
-SRC_URI[data-encoding-macro-internal-0.1.12.sha256sum] = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3"
-SRC_URI[derive_arbitrary-1.3.2.sha256sum] = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+SRC_URI[ctor-0.4.2.sha256sum] = "a4735f265ba6a1188052ca32d461028a7d1125868be18e287e756019da7607b5"
+SRC_URI[ctor-proc-macro-0.0.5.sha256sum] = "4f211af61d8efdd104f96e57adf5e426ba1bc3ed7a4ead616e15e5881fd79c4d"
+SRC_URI[ctrlc-3.4.7.sha256sum] = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73"
+SRC_URI[data-encoding-2.9.0.sha256sum] = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+SRC_URI[data-encoding-macro-0.1.18.sha256sum] = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d"
+SRC_URI[data-encoding-macro-internal-0.1.16.sha256sum] = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976"
+SRC_URI[deranged-0.4.0.sha256sum] = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+SRC_URI[derive_arbitrary-1.4.1.sha256sum] = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+SRC_URI[derive_more-2.0.1.sha256sum] = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+SRC_URI[derive_more-impl-2.0.1.sha256sum] = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-SRC_URI[dlv-list-0.5.0.sha256sum] = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73"
+SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+SRC_URI[dlv-list-0.5.2.sha256sum] = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
 SRC_URI[dns-lookup-2.0.4.sha256sum] = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc"
-SRC_URI[dunce-1.0.4.sha256sum] = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
-SRC_URI[either-1.8.0.sha256sum] = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
-SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
-SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+SRC_URI[document-features-0.2.11.sha256sum] = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
+SRC_URI[dtor-0.0.6.sha256sum] = "97cbdf2ad6846025e8e25df05171abfb30e3ababa12ee0a0e44b9bbe570633a8"
+SRC_URI[dtor-proc-macro-0.0.5.sha256sum] = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055"
+SRC_URI[dunce-1.0.5.sha256sum] = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+SRC_URI[encode_unicode-1.0.0.sha256sum] = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+SRC_URI[equivalent-1.0.2.sha256sum] = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+SRC_URI[errno-0.3.10.sha256sum] = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 SRC_URI[exacl-0.12.0.sha256sum] = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8"
-SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 SRC_URI[file_diff-1.0.0.sha256sum] = "31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5"
-SRC_URI[filedescriptor-0.8.2.sha256sum] = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e"
-SRC_URI[filetime-0.2.23.sha256sum] = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
-SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+SRC_URI[filedescriptor-0.8.3.sha256sum] = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d"
+SRC_URI[filetime-0.2.25.sha256sum] = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+SRC_URI[flate2-1.1.1.sha256sum] = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+SRC_URI[fluent-0.17.0.sha256sum] = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f112d30cb0cd4a78670477"
+SRC_URI[fluent-bundle-0.16.0.sha256sum] = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4"
+SRC_URI[fluent-langneg-0.13.0.sha256sum] = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94"
+SRC_URI[fluent-syntax-0.12.0.sha256sum] = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198"
 SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+SRC_URI[foldhash-0.1.4.sha256sum] = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
 SRC_URI[fs_extra-1.3.0.sha256sum] = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 SRC_URI[fsevent-sys-4.1.0.sha256sum] = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
-SRC_URI[fts-sys-0.2.4.sha256sum] = "9a66c0a21e344f20c87b4ca12643cf4f40a7018f132c98d344e989b959f49dd1"
-SRC_URI[fundu-2.0.0.sha256sum] = "6c04cb831a8dccadfe3774b07cba4574a1ec24974d761510e65d8a543c2d7cb4"
-SRC_URI[fundu-core-0.3.0.sha256sum] = "76a889e633afd839fb5b04fe53adfd588cefe518e71ec8d3c929698c6daf2acd"
+SRC_URI[fts-sys-0.2.16.sha256sum] = "43119ec0f2227f8505c8bb6c60606b5eefc328607bfe1a421e561c4decfa02ab"
 SRC_URI[funty-2.0.0.sha256sum] = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-SRC_URI[futures-0.3.28.sha256sum] = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
-SRC_URI[futures-channel-0.3.28.sha256sum] = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
-SRC_URI[futures-core-0.3.28.sha256sum] = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
-SRC_URI[futures-executor-0.3.28.sha256sum] = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
-SRC_URI[futures-io-0.3.28.sha256sum] = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
-SRC_URI[futures-macro-0.3.28.sha256sum] = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
-SRC_URI[futures-sink-0.3.28.sha256sum] = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
-SRC_URI[futures-task-0.3.28.sha256sum] = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
-SRC_URI[futures-timer-3.0.2.sha256sum] = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-SRC_URI[futures-util-0.3.28.sha256sum] = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+SRC_URI[futures-core-0.3.31.sha256sum] = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+SRC_URI[futures-macro-0.3.31.sha256sum] = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+SRC_URI[futures-task-0.3.31.sha256sum] = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+SRC_URI[futures-timer-3.0.3.sha256sum] = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+SRC_URI[futures-util-0.3.31.sha256sum] = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 SRC_URI[gcd-2.3.0.sha256sum] = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a"
-SRC_URI[generic-array-0.14.6.sha256sum] = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
-SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-SRC_URI[half-2.4.0.sha256sum] = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e"
-SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-SRC_URI[hermit-abi-0.3.2.sha256sum] = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+SRC_URI[getrandom-0.2.15.sha256sum] = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+SRC_URI[getrandom-0.3.1.sha256sum] = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+SRC_URI[glob-0.3.2.sha256sum] = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+SRC_URI[half-2.6.0.sha256sum] = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
+SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+SRC_URI[hashbrown-0.15.2.sha256sum] = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-SRC_URI[hex-literal-0.4.1.sha256sum] = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
-SRC_URI[hostname-0.4.0.sha256sum] = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba"
-SRC_URI[iana-time-zone-0.1.53.sha256sum] = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+SRC_URI[hex-literal-1.0.0.sha256sum] = "bcaaec4551594c969335c98c903c1397853d4198408ea609190f420500f6be71"
+SRC_URI[hostname-0.4.1.sha256sum] = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65"
+SRC_URI[iana-time-zone-0.1.63.sha256sum] = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-SRC_URI[indicatif-0.17.3.sha256sum] = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729"
-SRC_URI[inotify-0.9.6.sha256sum] = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+SRC_URI[indexmap-2.7.1.sha256sum] = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+SRC_URI[indicatif-0.17.11.sha256sum] = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
+SRC_URI[inotify-0.11.0.sha256sum] = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 SRC_URI[inotify-sys-0.1.5.sha256sum] = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-SRC_URI[io-lifetimes-1.0.11.sha256sum] = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-SRC_URI[itertools-0.12.1.sha256sum] = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-SRC_URI[itoa-1.0.4.sha256sum] = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
-SRC_URI[js-sys-0.3.64.sha256sum] = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
-SRC_URI[keccak-0.1.4.sha256sum] = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
-SRC_URI[kqueue-1.0.7.sha256sum] = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98"
-SRC_URI[kqueue-sys-1.0.3.sha256sum] = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587"
-SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
-SRC_URI[libloading-0.7.4.sha256sum] = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-SRC_URI[libm-0.2.7.sha256sum] = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
-SRC_URI[linux-raw-sys-0.3.8.sha256sum] = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-SRC_URI[linux-raw-sys-0.4.12.sha256sum] = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
-SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
-SRC_URI[lru-0.7.8.sha256sum] = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
-SRC_URI[lscolors-0.16.0.sha256sum] = "ab0b209ec3976527806024406fe765474b9a1750a0ed4b8f0372364741f50e7b"
+SRC_URI[intl-memoizer-0.5.3.sha256sum] = "310da2e345f5eb861e7a07ee182262e94975051db9e4223e909ba90f392f163f"
+SRC_URI[intl_pluralrules-7.0.2.sha256sum] = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972"
+SRC_URI[is_terminal_polyfill-1.70.1.sha256sum] = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+SRC_URI[itertools-0.14.0.sha256sum] = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+SRC_URI[itoa-1.0.15.sha256sum] = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+SRC_URI[js-sys-0.3.77.sha256sum] = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+SRC_URI[keccak-0.1.5.sha256sum] = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+SRC_URI[kqueue-1.0.8.sha256sum] = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+SRC_URI[kqueue-sys-1.0.4.sha256sum] = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+SRC_URI[libc-0.2.172.sha256sum] = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+SRC_URI[libloading-0.8.6.sha256sum] = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+SRC_URI[libm-0.2.11.sha256sum] = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+SRC_URI[libredox-0.1.3.sha256sum] = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+SRC_URI[libz-rs-sys-0.5.0.sha256sum] = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
+SRC_URI[linux-raw-sys-0.4.15.sha256sum] = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+SRC_URI[linux-raw-sys-0.9.4.sha256sum] = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+SRC_URI[litrs-0.4.1.sha256sum] = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
+SRC_URI[lock_api-0.4.12.sha256sum] = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+SRC_URI[lockfree-object-pool-0.1.6.sha256sum] = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+SRC_URI[log-0.4.26.sha256sum] = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+SRC_URI[lru-0.12.5.sha256sum] = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+SRC_URI[lscolors-0.20.0.sha256sum] = "61183da5de8ba09a58e330d55e5ea796539d8443bd00fdeb863eac39724aa4ab"
 SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
-SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
-SRC_URI[memmap2-0.9.0.sha256sum] = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
+SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+SRC_URI[memmap2-0.9.5.sha256sum] = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
 SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
-SRC_URI[mio-0.8.11.sha256sum] = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-SRC_URI[nix-0.28.0.sha256sum] = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+SRC_URI[miniz_oxide-0.8.5.sha256sum] = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+SRC_URI[mio-1.0.3.sha256sum] = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-SRC_URI[notify-6.0.1.sha256sum] = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51"
-SRC_URI[nu-ansi-term-0.49.0.sha256sum] = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68"
-SRC_URI[num-bigint-0.4.4.sha256sum] = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
-SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+SRC_URI[nom-8.0.0.sha256sum] = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+SRC_URI[notify-8.0.0.sha256sum] = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
+SRC_URI[notify-types-2.0.0.sha256sum] = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
+SRC_URI[nu-ansi-term-0.50.1.sha256sum] = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+SRC_URI[num-conv-0.1.0.sha256sum] = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 SRC_URI[num-modular-0.5.1.sha256sum] = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119"
-SRC_URI[num-prime-0.4.3.sha256sum] = "5f4e3bc495f6e95bc15a6c0c55ac00421504a5a43d09e3cc455d1fea7015581d"
-SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
-SRC_URI[num_threads-0.1.6.sha256sum] = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+SRC_URI[num-prime-0.4.4.sha256sum] = "e238432a7881ec7164503ccc516c014bf009be7984cde1ba56837862543bdec3"
+SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+SRC_URI[num_threads-0.1.7.sha256sum] = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
 SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-SRC_URI[onig-6.4.0.sha256sum] = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
-SRC_URI[onig_sys-69.8.1.sha256sum] = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
+SRC_URI[once_cell-1.20.3.sha256sum] = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+SRC_URI[onig-6.5.1.sha256sum] = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0"
+SRC_URI[onig_sys-69.9.1.sha256sum] = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc"
 SRC_URI[ordered-multimap-0.7.3.sha256sum] = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
-SRC_URI[os_display-0.1.3.sha256sum] = "7a6229bad892b46b0dcfaaeb18ad0d2e56400f5aaea05b768bde96e73676cf75"
-SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
-SRC_URI[parse_datetime-0.5.0.sha256sum] = "3bbf4e25b13841080e018a1e666358adfe5e39b6d353f986ca5091c210b586a1"
-SRC_URI[peeking_take_while-0.1.2.sha256sum] = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-SRC_URI[phf-0.11.2.sha256sum] = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-SRC_URI[phf_codegen-0.11.2.sha256sum] = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
-SRC_URI[phf_generator-0.11.1.sha256sum] = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
-SRC_URI[phf_shared-0.11.2.sha256sum] = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+SRC_URI[os_display-0.1.4.sha256sum] = "ad5fd71b79026fb918650dde6d125000a233764f1c2f1659a1c71118e33ea08f"
+SRC_URI[parking_lot-0.12.3.sha256sum] = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+SRC_URI[parking_lot_core-0.9.10.sha256sum] = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+SRC_URI[parse-zoneinfo-0.3.1.sha256sum] = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
+SRC_URI[parse_datetime-0.9.0.sha256sum] = "2fd3830b49ee3a0dcc8fdfadc68c6354c97d00101ac1cac5b2eee25d35c42066"
+SRC_URI[phf-0.11.3.sha256sum] = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
+SRC_URI[phf_codegen-0.11.3.sha256sum] = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
+SRC_URI[phf_generator-0.11.3.sha256sum] = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+SRC_URI[phf_shared-0.11.3.sha256sum] = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+SRC_URI[pin-project-lite-0.2.16.sha256sum] = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-SRC_URI[platform-info-2.0.3.sha256sum] = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217"
-SRC_URI[portable-atomic-0.3.15.sha256sum] = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16"
-SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
-SRC_URI[proc-macro2-1.0.63.sha256sum] = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
-SRC_URI[procfs-0.16.0.sha256sum] = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
-SRC_URI[procfs-core-0.16.0.sha256sum] = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
+SRC_URI[pkg-config-0.3.32.sha256sum] = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+SRC_URI[platform-info-2.0.5.sha256sum] = "7539aeb3fdd8cb4f6a331307cf71a1039cee75e94e8a71725b9484f4a0d9451a"
+SRC_URI[portable-atomic-1.11.0.sha256sum] = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+SRC_URI[ppv-lite86-0.2.20.sha256sum] = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+SRC_URI[pretty_assertions-1.4.1.sha256sum] = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+SRC_URI[prettyplease-0.2.30.sha256sum] = "f1ccf34da56fc294e7d4ccf69a85992b7dfb826b7cf57bac6a70bba3494cc08a"
+SRC_URI[proc-macro-crate-3.3.0.sha256sum] = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+SRC_URI[proc-macro2-1.0.95.sha256sum] = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+SRC_URI[procfs-0.17.0.sha256sum] = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f"
+SRC_URI[procfs-core-0.17.0.sha256sum] = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
 SRC_URI[quick-error-2.0.1.sha256sum] = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
-SRC_URI[quote-1.0.29.sha256sum] = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
+SRC_URI[quote-1.0.40.sha256sum] = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+SRC_URI[rand-0.9.1.sha256sum] = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
 SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-SRC_URI[rand_pcg-0.3.1.sha256sum] = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e"
+SRC_URI[rand_core-0.9.3.sha256sum] = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 SRC_URI[rayon-1.10.0.sha256sum] = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 SRC_URI[rayon-core-1.12.1.sha256sum] = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-SRC_URI[redox_syscall-0.5.0.sha256sum] = "13c178f952cc7eac391f3124bd9851d1ac0bdbc4c9de2d892ccd5f0d8b160e96"
-SRC_URI[reference-counted-singleton-0.1.2.sha256sum] = "f1bfbf25d7eb88ddcbb1ec3d755d0634da8f7657b2cb8b74089121409ab8228f"
-SRC_URI[regex-1.10.4.sha256sum] = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
-SRC_URI[regex-automata-0.4.4.sha256sum] = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a"
-SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-SRC_URI[relative-path-1.8.0.sha256sum] = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698"
-SRC_URI[rlimit-0.10.1.sha256sum] = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8"
-SRC_URI[roff-0.2.1.sha256sum] = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316"
-SRC_URI[rstest-0.19.0.sha256sum] = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330"
-SRC_URI[rstest_macros-0.19.0.sha256sum] = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25"
-SRC_URI[rust-ini-0.21.0.sha256sum] = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41"
+SRC_URI[redox_syscall-0.5.10.sha256sum] = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+SRC_URI[regex-automata-0.4.9.sha256sum] = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+SRC_URI[relative-path-1.9.3.sha256sum] = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
+SRC_URI[rlimit-0.10.2.sha256sum] = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a"
+SRC_URI[roff-0.2.2.sha256sum] = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3"
+SRC_URI[rstest-0.25.0.sha256sum] = "6fc39292f8613e913f7df8fa892b8944ceb47c247b78e1b1ae2f09e019be789d"
+SRC_URI[rstest_macros-0.25.0.sha256sum] = "1f168d99749d307be9de54d23fd226628d99768225ef08f6ffb52e0182a27746"
+SRC_URI[rust-ini-0.21.1.sha256sum] = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f"
 SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-SRC_URI[rustix-0.37.26.sha256sum] = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995"
-SRC_URI[rustix-0.38.31.sha256sum] = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+SRC_URI[rustc-hash-2.1.1.sha256sum] = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+SRC_URI[rustc_version-0.4.1.sha256sum] = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+SRC_URI[rustix-0.38.44.sha256sum] = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+SRC_URI[rustix-1.0.1.sha256sum] = "dade4812df5c384711475be5fcd8c162555352945401aed22a35bffeab61f657"
+SRC_URI[rustversion-1.0.20.sha256sum] = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
 SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-SRC_URI[self_cell-1.0.3.sha256sum] = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba"
-SRC_URI[selinux-0.4.0.sha256sum] = "a00576725d21b588213fbd4af84cd7e4cc4304e8e9bd6c0f5a1498a3e2ca6a51"
-SRC_URI[selinux-sys-0.6.2.sha256sum] = "806d381649bb85347189d2350728817418138d11d738e2482cb644ec7f3c755d"
-SRC_URI[semver-1.0.14.sha256sum] = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
-SRC_URI[serde-1.0.193.sha256sum] = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
-SRC_URI[serde_derive-1.0.193.sha256sum] = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+SRC_URI[self_cell-1.2.0.sha256sum] = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"
+SRC_URI[selinux-0.5.1.sha256sum] = "e37f432dfe840521abd9a72fefdf88ed7ad0f43bbea7d9d1d3d80383e9f4ad13"
+SRC_URI[selinux-sys-0.6.14.sha256sum] = "280da3df1236da180be5ac50a893b26a1d3c49e3a44acb2d10d1f082523ff916"
+SRC_URI[semver-1.0.26.sha256sum] = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+SRC_URI[serde-1.0.219.sha256sum] = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+SRC_URI[serde-big-array-0.5.1.sha256sum] = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f"
+SRC_URI[serde_derive-1.0.219.sha256sum] = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-SRC_URI[signal-hook-0.3.17.sha256sum] = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-SRC_URI[signal-hook-mio-0.2.3.sha256sum] = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
-SRC_URI[signal-hook-registry-1.4.1.sha256sum] = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-SRC_URI[siphasher-0.3.10.sha256sum] = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
-SRC_URI[slab-0.4.7.sha256sum] = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+SRC_URI[signal-hook-0.3.18.sha256sum] = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
+SRC_URI[signal-hook-mio-0.2.4.sha256sum] = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
+SRC_URI[signal-hook-registry-1.4.2.sha256sum] = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+SRC_URI[simd-adler32-0.3.7.sha256sum] = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+SRC_URI[siphasher-1.0.1.sha256sum] = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+SRC_URI[slab-0.4.9.sha256sum] = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860"
-SRC_URI[smallvec-1.13.1.sha256sum] = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
-SRC_URI[smawk-0.3.1.sha256sum] = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
-SRC_URI[socket2-0.5.3.sha256sum] = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
-SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-SRC_URI[syn-2.0.32.sha256sum] = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2"
+SRC_URI[smallvec-1.15.0.sha256sum] = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+SRC_URI[smawk-0.3.2.sha256sum] = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
+SRC_URI[socket2-0.5.8.sha256sum] = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+SRC_URI[syn-2.0.99.sha256sum] = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2"
 SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-SRC_URI[tempfile-3.10.1.sha256sum] = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
-SRC_URI[terminal_size-0.2.6.sha256sum] = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
-SRC_URI[terminal_size-0.3.0.sha256sum] = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
-SRC_URI[textwrap-0.16.1.sha256sum] = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
-SRC_URI[thiserror-1.0.37.sha256sum] = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
-SRC_URI[thiserror-impl-1.0.37.sha256sum] = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
-SRC_URI[time-0.3.20.sha256sum] = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
-SRC_URI[time-core-0.1.0.sha256sum] = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
-SRC_URI[time-macros-0.2.8.sha256sum] = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
+SRC_URI[tempfile-3.20.0.sha256sum] = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+SRC_URI[terminal_size-0.4.2.sha256sum] = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
+SRC_URI[textwrap-0.16.2.sha256sum] = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
+SRC_URI[thiserror-1.0.69.sha256sum] = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+SRC_URI[thiserror-2.0.12.sha256sum] = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+SRC_URI[thiserror-impl-1.0.69.sha256sum] = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+SRC_URI[thiserror-impl-2.0.12.sha256sum] = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+SRC_URI[time-0.3.41.sha256sum] = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+SRC_URI[time-core-0.1.4.sha256sum] = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+SRC_URI[time-macros-0.2.22.sha256sum] = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+SRC_URI[tinystr-0.8.1.sha256sum] = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+SRC_URI[toml_datetime-0.6.8.sha256sum] = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+SRC_URI[toml_edit-0.22.24.sha256sum] = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
 SRC_URI[trim-in-place-0.1.7.sha256sum] = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc"
-SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-SRC_URI[unicode-ident-1.0.5.sha256sum] = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+SRC_URI[type-map-0.5.0.sha256sum] = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f"
+SRC_URI[typenum-1.18.0.sha256sum] = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+SRC_URI[unic-langid-0.9.6.sha256sum] = "a28ba52c9b05311f4f6e62d5d9d46f094bd6e84cb8df7b3ef952748d752a7d05"
+SRC_URI[unic-langid-impl-0.9.6.sha256sum] = "dce1bf08044d4b7a94028c93786f8566047edc11110595914de93362559bc658"
+SRC_URI[unicode-ident-1.0.18.sha256sum] = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
-SRC_URI[unicode-xid-0.2.4.sha256sum] = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-SRC_URI[unindent-0.2.1.sha256sum] = "5aa30f5ea51ff7edfc797c6d3f9ec8cbd8cfedef5371766b7181d33977f4814f"
-SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-SRC_URI[uuid-1.7.0.sha256sum] = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
-SRC_URI[uutils_term_grid-0.3.0.sha256sum] = "b389452a568698688dda38802068378a16c15c4af9b153cdd99b65391292bbc7"
-SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+SRC_URI[unicode-segmentation-1.12.0.sha256sum] = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+SRC_URI[unicode-width-0.1.14.sha256sum] = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+SRC_URI[unicode-width-0.2.0.sha256sum] = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+SRC_URI[unicode-xid-0.2.6.sha256sum] = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+SRC_URI[unindent-0.2.4.sha256sum] = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
+SRC_URI[unty-0.0.4.sha256sum] = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
+SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+SRC_URI[utmp-classic-0.1.6.sha256sum] = "e24c654e19afaa6b8f3877ece5d3bed849c2719c56f6752b18ca7da4fcc6e85a"
+SRC_URI[utmp-classic-raw-0.1.3.sha256sum] = "22c226537a3d6e01c440c1926ca0256dbee2d19b2229ede6fc4863a6493dd831"
+SRC_URI[uuid-1.15.1.sha256sum] = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
+SRC_URI[uutils_term_grid-0.7.0.sha256sum] = "fcba141ce511bad08e80b43f02976571072e1ff4286f7d628943efbd277c6361"
+SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+SRC_URI[virtue-0.0.18.sha256sum] = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1"
 SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-SRC_URI[wasm-bindgen-0.2.87.sha256sum] = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
-SRC_URI[wasm-bindgen-backend-0.2.87.sha256sum] = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
-SRC_URI[wasm-bindgen-macro-0.2.87.sha256sum] = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
-SRC_URI[wasm-bindgen-macro-support-0.2.87.sha256sum] = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
-SRC_URI[wasm-bindgen-shared-0.2.87.sha256sum] = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
-SRC_URI[which-4.3.0.sha256sum] = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
+SRC_URI[wasi-0.13.3+wasi-0.2.2.sha256sum] = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+SRC_URI[wasm-bindgen-0.2.100.sha256sum] = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+SRC_URI[wasm-bindgen-backend-0.2.100.sha256sum] = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+SRC_URI[wasm-bindgen-macro-0.2.100.sha256sum] = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+SRC_URI[wasm-bindgen-macro-support-0.2.100.sha256sum] = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+SRC_URI[wasm-bindgen-shared-0.2.100.sha256sum] = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+SRC_URI[web-time-1.1.0.sha256sum] = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1"
 SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-SRC_URI[winapi-util-0.1.8.sha256sum] = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+SRC_URI[winapi-util-0.1.9.sha256sum] = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-SRC_URI[windows-0.52.0.sha256sum] = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-SRC_URI[windows-core-0.52.0.sha256sum] = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+SRC_URI[windows-core-0.60.1.sha256sum] = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247"
+SRC_URI[windows-implement-0.59.0.sha256sum] = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
+SRC_URI[windows-interface-0.59.1.sha256sum] = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+SRC_URI[windows-link-0.1.1.sha256sum] = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+SRC_URI[windows-result-0.3.1.sha256sum] = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189"
+SRC_URI[windows-strings-0.3.1.sha256sum] = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
 SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-SRC_URI[windows-targets-0.48.0.sha256sum] = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
-SRC_URI[windows-targets-0.52.0.sha256sum] = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
-SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-SRC_URI[windows_aarch64_gnullvm-0.48.0.sha256sum] = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
-SRC_URI[windows_aarch64_gnullvm-0.52.0.sha256sum] = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
-SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-SRC_URI[windows_aarch64_msvc-0.48.0.sha256sum] = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
-SRC_URI[windows_aarch64_msvc-0.52.0.sha256sum] = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-SRC_URI[windows_i686_gnu-0.48.0.sha256sum] = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
-SRC_URI[windows_i686_gnu-0.52.0.sha256sum] = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
-SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-SRC_URI[windows_i686_msvc-0.48.0.sha256sum] = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
-SRC_URI[windows_i686_msvc-0.52.0.sha256sum] = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
-SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-SRC_URI[windows_x86_64_gnu-0.48.0.sha256sum] = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
-SRC_URI[windows_x86_64_gnu-0.52.0.sha256sum] = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
-SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-SRC_URI[windows_x86_64_gnullvm-0.48.0.sha256sum] = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
-SRC_URI[windows_x86_64_gnullvm-0.52.0.sha256sum] = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
-SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
-SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+SRC_URI[winnow-0.7.3.sha256sum] = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
+SRC_URI[wit-bindgen-rt-0.33.0.sha256sum] = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-SRC_URI[xattr-1.3.1.sha256sum] = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
-SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-SRC_URI[z85-3.0.5.sha256sum] = "2a599daf1b507819c1121f0bf87fa37eb19daac6aff3aefefd4e6e2e0f2020fc"
-SRC_URI[zip-1.1.1.sha256sum] = "f2655979068a1f8fa91cb9e8e5b9d3ee54d18e0ddc358f2f4a395afc0929a84b"
+SRC_URI[xattr-1.5.0.sha256sum] = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
+SRC_URI[yansi-1.0.1.sha256sum] = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+SRC_URI[z85-3.0.6.sha256sum] = "9b3a41ce106832b4da1c065baa4c31cf640cf965fa1483816402b7f6b96f0a64"
+SRC_URI[zerocopy-0.7.35.sha256sum] = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+SRC_URI[zerocopy-derive-0.7.35.sha256sum] = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+SRC_URI[zerofrom-0.1.6.sha256sum] = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+SRC_URI[zerovec-0.11.2.sha256sum] = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+SRC_URI[zip-4.0.0.sha256sum] = "153a6fff49d264c4babdcfa6b4d534747f520e56e8f0f384f3b808c4b64cc1fd"
+SRC_URI[zlib-rs-0.5.0.sha256sum] = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
+SRC_URI[zopfli-0.8.1.sha256sum] = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+# from fuzz/Cargo.lock
+SRC_URI += " \
+    crate://crates.io/aho-corasick/1.1.3 \
+    crate://crates.io/android-tzdata/0.1.1 \
+    crate://crates.io/android_system_properties/0.1.5 \
+    crate://crates.io/anstream/0.6.18 \
+    crate://crates.io/anstyle/1.0.10 \
+    crate://crates.io/anstyle-parse/0.2.6 \
+    crate://crates.io/anstyle-query/1.1.2 \
+    crate://crates.io/anstyle-wincon/3.0.8 \
+    crate://crates.io/arbitrary/1.4.1 \
+    crate://crates.io/arrayref/0.3.9 \
+    crate://crates.io/arrayvec/0.7.6 \
+    crate://crates.io/autocfg/1.4.0 \
+    crate://crates.io/bigdecimal/0.4.8 \
+    crate://crates.io/binary-heap-plus/0.5.0 \
+    crate://crates.io/bitflags/2.9.1 \
+    crate://crates.io/blake2b_simd/1.0.3 \
+    crate://crates.io/blake3/1.8.2 \
+    crate://crates.io/block-buffer/0.10.4 \
+    crate://crates.io/bstr/1.12.0 \
+    crate://crates.io/bumpalo/3.17.0 \
+    crate://crates.io/bytecount/0.6.8 \
+    crate://crates.io/cc/1.2.23 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/cfg_aliases/0.2.1 \
+    crate://crates.io/chrono/0.4.41 \
+    crate://crates.io/chrono-tz/0.10.3 \
+    crate://crates.io/chrono-tz-build/0.4.1 \
+    crate://crates.io/clap/4.5.38 \
+    crate://crates.io/clap_builder/4.5.38 \
+    crate://crates.io/clap_lex/0.7.4 \
+    crate://crates.io/colorchoice/1.0.3 \
+    crate://crates.io/compare/0.1.0 \
+    crate://crates.io/console/0.15.11 \
+    crate://crates.io/const-random/0.1.18 \
+    crate://crates.io/const-random-macro/0.1.16 \
+    crate://crates.io/constant_time_eq/0.3.1 \
+    crate://crates.io/core-foundation-sys/0.8.7 \
+    crate://crates.io/cpufeatures/0.2.17 \
+    crate://crates.io/crc32fast/1.4.2 \
+    crate://crates.io/crossbeam-deque/0.8.6 \
+    crate://crates.io/crossbeam-epoch/0.9.18 \
+    crate://crates.io/crossbeam-utils/0.8.21 \
+    crate://crates.io/crunchy/0.2.3 \
+    crate://crates.io/crypto-common/0.1.6 \
+    crate://crates.io/ctrlc/3.4.7 \
+    crate://crates.io/data-encoding/2.9.0 \
+    crate://crates.io/data-encoding-macro/0.1.18 \
+    crate://crates.io/data-encoding-macro-internal/0.1.16 \
+    crate://crates.io/digest/0.10.7 \
+    crate://crates.io/displaydoc/0.2.5 \
+    crate://crates.io/dlv-list/0.5.2 \
+    crate://crates.io/dunce/1.0.5 \
+    crate://crates.io/either/1.15.0 \
+    crate://crates.io/encode_unicode/1.0.0 \
+    crate://crates.io/errno/0.3.12 \
+    crate://crates.io/fastrand/2.3.0 \
+    crate://crates.io/fluent/0.17.0 \
+    crate://crates.io/fluent-bundle/0.16.0 \
+    crate://crates.io/fluent-langneg/0.13.0 \
+    crate://crates.io/fluent-syntax/0.12.0 \
+    crate://crates.io/fnv/1.0.7 \
+    crate://crates.io/generic-array/0.14.7 \
+    crate://crates.io/getrandom/0.2.16 \
+    crate://crates.io/getrandom/0.3.3 \
+    crate://crates.io/glob/0.3.2 \
+    crate://crates.io/hashbrown/0.14.5 \
+    crate://crates.io/hex/0.4.3 \
+    crate://crates.io/iana-time-zone/0.1.63 \
+    crate://crates.io/iana-time-zone-haiku/0.1.2 \
+    crate://crates.io/intl-memoizer/0.5.3 \
+    crate://crates.io/intl_pluralrules/7.0.2 \
+    crate://crates.io/is_terminal_polyfill/1.70.1 \
+    crate://crates.io/itertools/0.14.0 \
+    crate://crates.io/jobserver/0.1.33 \
+    crate://crates.io/js-sys/0.3.77 \
+    crate://crates.io/keccak/0.1.5 \
+    crate://crates.io/libc/0.2.172 \
+    crate://crates.io/libfuzzer-sys/0.4.9 \
+    crate://crates.io/libm/0.2.15 \
+    crate://crates.io/linux-raw-sys/0.9.4 \
+    crate://crates.io/log/0.4.27 \
+    crate://crates.io/md-5/0.10.6 \
+    crate://crates.io/memchr/2.7.4 \
+    crate://crates.io/nix/0.30.1 \
+    crate://crates.io/nom/8.0.0 \
+    crate://crates.io/num-bigint/0.4.6 \
+    crate://crates.io/num-integer/0.1.46 \
+    crate://crates.io/num-traits/0.2.19 \
+    crate://crates.io/number_prefix/0.4.0 \
+    crate://crates.io/once_cell/1.21.3 \
+    crate://crates.io/once_cell_polyfill/1.70.1 \
+    crate://crates.io/onig/6.5.1 \
+    crate://crates.io/onig_sys/69.9.1 \
+    crate://crates.io/ordered-multimap/0.7.3 \
+    crate://crates.io/os_display/0.1.4 \
+    crate://crates.io/parse-zoneinfo/0.3.1 \
+    crate://crates.io/parse_datetime/0.9.0 \
+    crate://crates.io/phf/0.11.3 \
+    crate://crates.io/phf_codegen/0.11.3 \
+    crate://crates.io/phf_generator/0.11.3 \
+    crate://crates.io/phf_shared/0.11.3 \
+    crate://crates.io/pkg-config/0.3.32 \
+    crate://crates.io/ppv-lite86/0.2.21 \
+    crate://crates.io/proc-macro2/1.0.95 \
+    crate://crates.io/quote/1.0.40 \
+    crate://crates.io/r-efi/5.2.0 \
+    crate://crates.io/rand/0.8.5 \
+    crate://crates.io/rand/0.9.1 \
+    crate://crates.io/rand_chacha/0.9.0 \
+    crate://crates.io/rand_core/0.6.4 \
+    crate://crates.io/rand_core/0.9.3 \
+    crate://crates.io/rayon/1.10.0 \
+    crate://crates.io/rayon-core/1.12.1 \
+    crate://crates.io/regex/1.11.1 \
+    crate://crates.io/regex-automata/0.4.9 \
+    crate://crates.io/regex-syntax/0.8.5 \
+    crate://crates.io/rust-ini/0.21.1 \
+    crate://crates.io/rustc-hash/1.1.0 \
+    crate://crates.io/rustc-hash/2.1.1 \
+    crate://crates.io/rustix/1.0.7 \
+    crate://crates.io/rustversion/1.0.20 \
+    crate://crates.io/self_cell/1.2.0 \
+    crate://crates.io/serde/1.0.219 \
+    crate://crates.io/serde_derive/1.0.219 \
+    crate://crates.io/sha1/0.10.6 \
+    crate://crates.io/sha2/0.10.9 \
+    crate://crates.io/sha3/0.10.8 \
+    crate://crates.io/shlex/1.3.0 \
+    crate://crates.io/similar/2.7.0 \
+    crate://crates.io/siphasher/1.0.1 \
+    crate://crates.io/sm3/0.4.2 \
+    crate://crates.io/smallvec/1.15.0 \
+    crate://crates.io/strsim/0.11.1 \
+    crate://crates.io/syn/2.0.101 \
+    crate://crates.io/tempfile/3.20.0 \
+    crate://crates.io/terminal_size/0.4.2 \
+    crate://crates.io/thiserror/2.0.12 \
+    crate://crates.io/thiserror-impl/2.0.12 \
+    crate://crates.io/tiny-keccak/2.0.2 \
+    crate://crates.io/tinystr/0.8.1 \
+    crate://crates.io/trim-in-place/0.1.7 \
+    crate://crates.io/type-map/0.5.0 \
+    crate://crates.io/typenum/1.18.0 \
+    crate://crates.io/unic-langid/0.9.6 \
+    crate://crates.io/unic-langid-impl/0.9.6 \
+    crate://crates.io/unicode-ident/1.0.18 \
+    crate://crates.io/unicode-width/0.2.0 \
+    crate://crates.io/utf8parse/0.2.2 \
+    crate://crates.io/version_check/0.9.5 \
+    crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
+    crate://crates.io/wasi/0.14.2+wasi-0.2.4 \
+    crate://crates.io/wasm-bindgen/0.2.100 \
+    crate://crates.io/wasm-bindgen-backend/0.2.100 \
+    crate://crates.io/wasm-bindgen-macro/0.2.100 \
+    crate://crates.io/wasm-bindgen-macro-support/0.2.100 \
+    crate://crates.io/wasm-bindgen-shared/0.2.100 \
+    crate://crates.io/wild/2.2.1 \
+    crate://crates.io/winapi-util/0.1.9 \
+    crate://crates.io/windows-core/0.61.2 \
+    crate://crates.io/windows-implement/0.60.0 \
+    crate://crates.io/windows-interface/0.59.1 \
+    crate://crates.io/windows-link/0.1.1 \
+    crate://crates.io/windows-result/0.3.4 \
+    crate://crates.io/windows-strings/0.4.2 \
+    crate://crates.io/windows-sys/0.59.0 \
+    crate://crates.io/windows-targets/0.52.6 \
+    crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
+    crate://crates.io/windows_aarch64_msvc/0.52.6 \
+    crate://crates.io/windows_i686_gnu/0.52.6 \
+    crate://crates.io/windows_i686_gnullvm/0.52.6 \
+    crate://crates.io/windows_i686_msvc/0.52.6 \
+    crate://crates.io/windows_x86_64_gnu/0.52.6 \
+    crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
+    crate://crates.io/windows_x86_64_msvc/0.52.6 \
+    crate://crates.io/wit-bindgen-rt/0.39.0 \
+    crate://crates.io/z85/3.0.6 \
+    crate://crates.io/zerocopy/0.8.25 \
+    crate://crates.io/zerocopy-derive/0.8.25 \
+    crate://crates.io/zerofrom/0.1.6 \
+    crate://crates.io/zerovec/0.11.2 \
+"
+
+SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+SRC_URI[anstream-0.6.18.sha256sum] = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+SRC_URI[anstyle-1.0.10.sha256sum] = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+SRC_URI[anstyle-parse-0.2.6.sha256sum] = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+SRC_URI[anstyle-query-1.1.2.sha256sum] = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+SRC_URI[anstyle-wincon-3.0.8.sha256sum] = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa"
+SRC_URI[arbitrary-1.4.1.sha256sum] = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+SRC_URI[arrayref-0.3.9.sha256sum] = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+SRC_URI[arrayvec-0.7.6.sha256sum] = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+SRC_URI[autocfg-1.4.0.sha256sum] = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+SRC_URI[bigdecimal-0.4.8.sha256sum] = "1a22f228ab7a1b23027ccc6c350b72868017af7ea8356fbdf19f8d991c690013"
+SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296"
+SRC_URI[bitflags-2.9.1.sha256sum] = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+SRC_URI[blake2b_simd-1.0.3.sha256sum] = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99"
+SRC_URI[blake3-1.8.2.sha256sum] = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
+SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+SRC_URI[bstr-1.12.0.sha256sum] = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
+SRC_URI[bumpalo-3.17.0.sha256sum] = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+SRC_URI[bytecount-0.6.8.sha256sum] = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
+SRC_URI[cc-1.2.23.sha256sum] = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+SRC_URI[chrono-0.4.41.sha256sum] = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+SRC_URI[chrono-tz-0.10.3.sha256sum] = "efdce149c370f133a071ca8ef6ea340b7b88748ab0810097a9e2976eaa34b4f3"
+SRC_URI[chrono-tz-build-0.4.1.sha256sum] = "8f10f8c9340e31fc120ff885fcdb54a0b48e474bbd77cab557f0c30a3e569402"
+SRC_URI[clap-4.5.38.sha256sum] = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
+SRC_URI[clap_builder-4.5.38.sha256sum] = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
+SRC_URI[clap_lex-0.7.4.sha256sum] = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+SRC_URI[colorchoice-1.0.3.sha256sum] = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3"
+SRC_URI[console-0.15.11.sha256sum] = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
+SRC_URI[const-random-0.1.18.sha256sum] = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+SRC_URI[const-random-macro-0.1.16.sha256sum] = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+SRC_URI[constant_time_eq-0.3.1.sha256sum] = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+SRC_URI[crc32fast-1.4.2.sha256sum] = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+SRC_URI[crunchy-0.2.3.sha256sum] = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+SRC_URI[ctrlc-3.4.7.sha256sum] = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73"
+SRC_URI[data-encoding-2.9.0.sha256sum] = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+SRC_URI[data-encoding-macro-0.1.18.sha256sum] = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d"
+SRC_URI[data-encoding-macro-internal-0.1.16.sha256sum] = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976"
+SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+SRC_URI[dlv-list-0.5.2.sha256sum] = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
+SRC_URI[dunce-1.0.5.sha256sum] = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+SRC_URI[encode_unicode-1.0.0.sha256sum] = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+SRC_URI[errno-0.3.12.sha256sum] = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
+SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+SRC_URI[fluent-0.17.0.sha256sum] = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f112d30cb0cd4a78670477"
+SRC_URI[fluent-bundle-0.16.0.sha256sum] = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4"
+SRC_URI[fluent-langneg-0.13.0.sha256sum] = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94"
+SRC_URI[fluent-syntax-0.12.0.sha256sum] = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198"
+SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+SRC_URI[getrandom-0.2.16.sha256sum] = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+SRC_URI[getrandom-0.3.3.sha256sum] = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+SRC_URI[glob-0.3.2.sha256sum] = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+SRC_URI[iana-time-zone-0.1.63.sha256sum] = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+SRC_URI[intl-memoizer-0.5.3.sha256sum] = "310da2e345f5eb861e7a07ee182262e94975051db9e4223e909ba90f392f163f"
+SRC_URI[intl_pluralrules-7.0.2.sha256sum] = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972"
+SRC_URI[is_terminal_polyfill-1.70.1.sha256sum] = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+SRC_URI[itertools-0.14.0.sha256sum] = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+SRC_URI[jobserver-0.1.33.sha256sum] = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+SRC_URI[js-sys-0.3.77.sha256sum] = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+SRC_URI[keccak-0.1.5.sha256sum] = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+SRC_URI[libc-0.2.172.sha256sum] = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+SRC_URI[libfuzzer-sys-0.4.9.sha256sum] = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75"
+SRC_URI[libm-0.2.15.sha256sum] = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+SRC_URI[linux-raw-sys-0.9.4.sha256sum] = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+SRC_URI[log-0.4.27.sha256sum] = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+SRC_URI[nom-8.0.0.sha256sum] = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+SRC_URI[once_cell_polyfill-1.70.1.sha256sum] = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+SRC_URI[onig-6.5.1.sha256sum] = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0"
+SRC_URI[onig_sys-69.9.1.sha256sum] = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc"
+SRC_URI[ordered-multimap-0.7.3.sha256sum] = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
+SRC_URI[os_display-0.1.4.sha256sum] = "ad5fd71b79026fb918650dde6d125000a233764f1c2f1659a1c71118e33ea08f"
+SRC_URI[parse-zoneinfo-0.3.1.sha256sum] = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
+SRC_URI[parse_datetime-0.9.0.sha256sum] = "2fd3830b49ee3a0dcc8fdfadc68c6354c97d00101ac1cac5b2eee25d35c42066"
+SRC_URI[phf-0.11.3.sha256sum] = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
+SRC_URI[phf_codegen-0.11.3.sha256sum] = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
+SRC_URI[phf_generator-0.11.3.sha256sum] = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+SRC_URI[phf_shared-0.11.3.sha256sum] = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+SRC_URI[pkg-config-0.3.32.sha256sum] = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+SRC_URI[ppv-lite86-0.2.21.sha256sum] = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+SRC_URI[proc-macro2-1.0.95.sha256sum] = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+SRC_URI[quote-1.0.40.sha256sum] = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+SRC_URI[r-efi-5.2.0.sha256sum] = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+SRC_URI[rand-0.9.1.sha256sum] = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+SRC_URI[rand_core-0.9.3.sha256sum] = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+SRC_URI[rayon-1.10.0.sha256sum] = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+SRC_URI[rayon-core-1.12.1.sha256sum] = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+SRC_URI[regex-automata-0.4.9.sha256sum] = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+SRC_URI[rust-ini-0.21.1.sha256sum] = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f"
+SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+SRC_URI[rustc-hash-2.1.1.sha256sum] = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+SRC_URI[rustix-1.0.7.sha256sum] = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+SRC_URI[rustversion-1.0.20.sha256sum] = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+SRC_URI[self_cell-1.2.0.sha256sum] = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"
+SRC_URI[serde-1.0.219.sha256sum] = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+SRC_URI[serde_derive-1.0.219.sha256sum] = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+SRC_URI[similar-2.7.0.sha256sum] = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
+SRC_URI[siphasher-1.0.1.sha256sum] = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860"
+SRC_URI[smallvec-1.15.0.sha256sum] = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+SRC_URI[syn-2.0.101.sha256sum] = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+SRC_URI[tempfile-3.20.0.sha256sum] = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+SRC_URI[terminal_size-0.4.2.sha256sum] = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
+SRC_URI[thiserror-2.0.12.sha256sum] = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+SRC_URI[thiserror-impl-2.0.12.sha256sum] = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+SRC_URI[tinystr-0.8.1.sha256sum] = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+SRC_URI[trim-in-place-0.1.7.sha256sum] = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc"
+SRC_URI[type-map-0.5.0.sha256sum] = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f"
+SRC_URI[typenum-1.18.0.sha256sum] = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+SRC_URI[unic-langid-0.9.6.sha256sum] = "a28ba52c9b05311f4f6e62d5d9d46f094bd6e84cb8df7b3ef952748d752a7d05"
+SRC_URI[unic-langid-impl-0.9.6.sha256sum] = "dce1bf08044d4b7a94028c93786f8566047edc11110595914de93362559bc658"
+SRC_URI[unicode-ident-1.0.18.sha256sum] = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+SRC_URI[unicode-width-0.2.0.sha256sum] = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+SRC_URI[wasi-0.14.2+wasi-0.2.4.sha256sum] = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+SRC_URI[wasm-bindgen-0.2.100.sha256sum] = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+SRC_URI[wasm-bindgen-backend-0.2.100.sha256sum] = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+SRC_URI[wasm-bindgen-macro-0.2.100.sha256sum] = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+SRC_URI[wasm-bindgen-macro-support-0.2.100.sha256sum] = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+SRC_URI[wasm-bindgen-shared-0.2.100.sha256sum] = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1"
+SRC_URI[winapi-util-0.1.9.sha256sum] = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+SRC_URI[windows-core-0.61.2.sha256sum] = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+SRC_URI[windows-implement-0.60.0.sha256sum] = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+SRC_URI[windows-interface-0.59.1.sha256sum] = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+SRC_URI[windows-link-0.1.1.sha256sum] = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+SRC_URI[windows-result-0.3.4.sha256sum] = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+SRC_URI[windows-strings-0.4.2.sha256sum] = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+SRC_URI[wit-bindgen-rt-0.39.0.sha256sum] = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+SRC_URI[z85-3.0.6.sha256sum] = "9b3a41ce106832b4da1c065baa4c31cf640cf965fa1483816402b7f6b96f0a64"
+SRC_URI[zerocopy-0.8.25.sha256sum] = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
+SRC_URI[zerocopy-derive-0.8.25.sha256sum] = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
+SRC_URI[zerofrom-0.1.6.sha256sum] = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+SRC_URI[zerovec-0.11.2.sha256sum] = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils/0001-do-not-compile-stdbuf.patch b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils/0001-do-not-compile-stdbuf.patch
new file mode 100644
index 0000000000..e4f5627f12
--- /dev/null
+++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils/0001-do-not-compile-stdbuf.patch
@@ -0,0 +1,39 @@
+From 5c08d92aae49f83e3b52ae58e566ef48c749f3c7 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Fri, 7 Mar 2025 16:39:33 +0100
+Subject: [PATCH] do not compile stdbuf
+
+Due to including the host version of libstdbuf.so, stdbuf does not work when cross-compiled. See https://github.com/uutils/coreutils/issues/6591#issuecomment-2706575853 for details
+
+Upstream-Status: Inappropriate [OE-Specific]
+
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ Cargo.toml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index ea87ccea79..e218719363 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -154,7 +154,7 @@ feat_os_macos = [
+ feat_os_unix = [
+   "feat_Tier1",
+   #
+-  "feat_require_crate_cpp",
++  # don't compile feature_require_crate_cpp per default (which contains only stdbuf). "feat_require_crate_cpp",
+   "feat_require_unix",
+   "feat_require_unix_utmpx",
+   "feat_require_unix_hostid",
+@@ -189,7 +189,7 @@ feat_os_unix_android = [
+ # ** NOTE: these `feat_require_...` sets should be minimized as much as possible to encourage cross-platform availability of utilities
+ #
+ # "feat_require_crate_cpp" == set of utilities requiring the `cpp` crate (which fail to compile on several platforms; as of 2020-04-23)
+-feat_require_crate_cpp = ["stdbuf"]
++feat_require_crate_cpp = []
+ # "feat_require_unix" == set of utilities requiring support which is only available on unix platforms (as of 2020-04-23)
+ feat_require_unix = [
+   "chgrp",
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils/0002-Bump-onig-from-6.4.0-to-6.5.1.patch b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils/0002-Bump-onig-from-6.4.0-to-6.5.1.patch
new file mode 100644
index 0000000000..65f60386af
--- /dev/null
+++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils/0002-Bump-onig-from-6.4.0-to-6.5.1.patch
@@ -0,0 +1,131 @@
+From a0cf06ea8c3b698bda57dfdb181274078a489cf0 Mon Sep 17 00:00:00 2001
+From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
+Date: Sat, 24 May 2025 07:43:10 +0200
+Subject: [PATCH] Bump onig from 6.4.0 to 6.5.1
+
+Upstream-Status: Backport [https://github.com/uutils/coreutils/commit/04e7de1546c0f1e6908416fd09f0e2153ec95901]
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ Cargo.lock      | 10 +++++-----
+ Cargo.toml      |  2 +-
+ fuzz/Cargo.lock | 22 ++++++++--------------
+ 3 files changed, 14 insertions(+), 20 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 63ec9c208..5a6fac168 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1620,11 +1620,11 @@ checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+ 
+ [[package]]
+ name = "onig"
+-version = "6.4.0"
++version = "6.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
++checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0"
+ dependencies = [
+- "bitflags 1.3.2",
++ "bitflags 2.9.0",
+  "libc",
+  "once_cell",
+  "onig_sys",
+@@ -1632,9 +1632,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "onig_sys"
+-version = "69.8.1"
++version = "69.9.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
++checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc"
+ dependencies = [
+  "cc",
+  "pkg-config",
+diff --git a/Cargo.toml b/Cargo.toml
+index a4c9d3200..9d1b732be 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -318,7 +318,7 @@ num-bigint = "0.4.4"
+ num-prime = "0.4.4"
+ num-traits = "0.2.19"
+ number_prefix = "0.4"
+-onig = { version = "~6.4", default-features = false }
++onig = { version = "~6.5.1", default-features = false }
+ parse_datetime = "0.9.0"
+ phf = "0.11.2"
+ phf_codegen = "0.11.2"
+diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
+index 06faf0f5f..c946c3225 100644
+--- a/fuzz/Cargo.lock
++++ b/fuzz/Cargo.lock
+@@ -122,12 +122,6 @@ dependencies = [
+  "compare",
+ ]
+ 
+-[[package]]
+-name = "bitflags"
+-version = "1.3.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+-
+ [[package]]
+ name = "bitflags"
+ version = "2.9.1"
+@@ -660,7 +654,7 @@ version = "0.30.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+ dependencies = [
+- "bitflags 2.9.1",
++ "bitflags",
+  "cfg-if",
+  "cfg_aliases",
+  "libc",
+@@ -723,11 +717,11 @@ checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+ 
+ [[package]]
+ name = "onig"
+-version = "6.4.0"
++version = "6.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
++checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0"
+ dependencies = [
+- "bitflags 1.3.2",
++ "bitflags",
+  "libc",
+  "once_cell",
+  "onig_sys",
+@@ -735,9 +729,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "onig_sys"
+-version = "69.8.1"
++version = "69.9.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
++checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc"
+ dependencies = [
+  "cc",
+  "pkg-config",
+@@ -969,7 +963,7 @@ version = "1.0.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+ dependencies = [
+- "bitflags 2.9.1",
++ "bitflags",
+  "errno",
+  "libc",
+  "linux-raw-sys",
+@@ -1632,7 +1626,7 @@ version = "0.39.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+ dependencies = [
+- "bitflags 2.9.1",
++ "bitflags",
+ ]
+ 
+ [[package]]
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.26.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.1.0.bb
index 5668aaac5b..fb95a2de5c 100644
--- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.26.bb
+++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.1.0.bb
@@ -7,14 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e74349878141b240070458d414ab3b64"
 
 inherit cargo cargo-update-recipe-crates
 
-SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main"
+SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main \
+    file://0001-do-not-compile-stdbuf.patch \
+    file://0002-Bump-onig-from-6.4.0-to-6.5.1.patch \
+"
 
-# musl not supported because the libc crate does not support functions like "endutxent" at the moment,
-# so src/uucore/src/lib/features.rs disables utmpx when targetting musl.
-COMPATIBLE_HOST:libc-musl = "null"
-
-SRCREV = "f95f363096610d7e5e1556d6d0a32b5018065c4c"
-S = "${WORKDIR}/git"
+SRCREV = "18b963ed6f612ac30ebca92426280cf4c1451f6a"
 
 require ${BPN}-crates.inc
 
@@ -22,21 +20,13 @@ PROVIDES = "coreutils"
 RPROVIDES:${PN} = "coreutils"
 
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
-
-PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
+PACKAGECONFIG[selinux] = "--features feat_selinux,,clang-native libselinux-native libselinux"
 
 CARGO_BUILD_FLAGS += "--features unix"
-CARGO_BUILD_FLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'selinux', '--features feat_selinux', '', d)}"
-
-DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'selinux', 'clang-native libselinux-native', '', d)}"
-
-export LIBCLANG_PATH = "${WORKDIR}/recipe-sysroot-native${libdir}"
-export SELINUX_LIB_DIR = "${WORKDIR}/recipe-sysroot-native${libdir}"
-export SELINUX_INCLUDE_DIR = "${WORKDIR}/recipe-sysroot-native${includedir}"
 
 # The code which follows is strongly inspired from the GNU coreutils bitbake recipe:
 
-# [ df mktemp nice printenv base64 gets a special treatment and is not included in this
+# df mktemp nice printenv base32 base64 get a special treatment and are not included in this
 bindir_progs = "[ arch basename cksum comm csplit cut dir dircolors dirname du \
                 env expand expr factor fmt fold groups head hostid id install \
                 join link logname md5sum mkfifo nl nohup nproc od paste pathchk \
@@ -49,7 +39,7 @@ bindir_progs += "${@bb.utils.contains('PACKAGECONFIG', 'selinux', 'chcon runcon'
 base_bindir_progs = "cat chgrp chmod chown cp date dd echo false hostname kill ln ls mkdir \
                      mknod mv pwd rm rmdir sleep stty sync touch true uname stat"
 
-sbindir_progs= "chroot"
+sbindir_progs = "chroot"
 
 inherit update-alternatives
 
@@ -71,3 +61,8 @@ python __anonymous() {
     for prog in d.getVar('sbindir_progs').split():
         d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog))
 }
+
+do_compile:prepend() {
+    # In principle this is supposed to be exported by the project's .cargo/config.toml file, but for some reason it's not working
+    export PROJECT_NAME_FOR_VERSION_STRING="uutils coreutils"
+}
diff --git a/meta-oe/recipes-crypto/botan/botan_3.4.0.bb b/meta-oe/recipes-crypto/botan/botan_3.7.1.bb
index 8cd1aa64cc..74f895cf3c 100644
--- a/meta-oe/recipes-crypto/botan/botan_3.4.0.bb
+++ b/meta-oe/recipes-crypto/botan/botan_3.7.1.bb
@@ -1,13 +1,13 @@
 SUMMARY = "Crypto and TLS for C++11"
 HOMEPAGE = "https://botan.randombit.net"
 LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://license.txt;md5=f5254d3abe90ec5bb82c5694ff751546"
+LIC_FILES_CHKSUM = "file://license.txt;md5=3f911cecfc74a2d9f1ead9a07bd92a6e"
 SECTION = "libs"
 
 SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz"
-SRC_URI[sha256sum] = "71843afcc0a2c585f8f33fa304f0b58ae4b9c5d8306f894667b3746044277557"
+SRC_URI[sha256sum] = "fc0620463461caaea8e60f06711d7e437a3ad1eebd6de4ac29c14bbd901ccd1b"
 
-S = "${WORKDIR}/Botan-${PV}"
+S = "${UNPACKDIR}/Botan-${PV}"
 
 inherit python3native siteinfo lib_package
 
@@ -18,8 +18,8 @@ CPU:armv7ve = "armv7"
 
 do_configure() {
         python3 ${S}/configure.py \
-        --prefix="${D}${exec_prefix}" \
-        --libdir="${D}${libdir}" \
+        --prefix="${exec_prefix}" \
+        --libdir="${libdir}" \
         --cpu="${CPU}" \
         --cc-bin="${CXX}" \
         --cxxflags="${CXXFLAGS}" \
@@ -39,14 +39,27 @@ do_compile() {
         oe_runmake
 }
 do_install() {
-        oe_runmake install
-        sed -i -e "s|${D}||g" ${D}${libdir}/pkgconfig/botan-3.pc
+        oe_runmake DESTDIR=${D} install
+        sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${D}${includedir}/botan-3/botan/build.h
+        
+        # Add botan binary and test tool
+        install -d ${D}${bindir}
+        install -d ${D}${datadir}/${PN}/tests/data
+        install -m 0755 ${B}/botan-test  ${D}${bindir}
+        cp -R --no-dereference --preserve=mode,links -v ${B}/src/tests/data/*  ${D}${datadir}/${PN}/tests/data/
 }
 
-PACKAGES += "${PN}-python3"
+PACKAGES += "${PN}-test ${PN}-python3"
 
 FILES:${PN}-python3 = "${libdir}/python3"
 
 RDEPENDS:${PN}-python3 += "python3"
-
+RDEPENDS:${PN}-bin  += "${PN}"
+RDEPENDS:${PN}-test += "${PN}"
+FILES:${PN}:remove   = "${bindir}/*"
+FILES:${PN}-bin:remove   = "${bindir}/*"
+FILES:${PN}-bin   = "${bindir}/botan"
+FILES:${PN}-test = "${bindir}/botan-test  ${datadir}/${PN}/tests/data"
 COMPATIBLE_HOST:riscv32 = "null"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.2.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb
index 504c718b96..91ea446851 100644
--- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.2.bb
+++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb
@@ -20,7 +20,7 @@ DEPENDS:append:libc-musl = " argp-standalone"
 LDFLAGS:append:libc-musl = " -largp"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "219ebf74e8eddf96624a0376477e5a6f8f350a67aaf36e7dadb114d94b3afef4"
+SRC_URI[sha256sum] = "d2be4395b8f503b0ebf4b2d81db90c35a97050a358ee21fe62a0dfb66e5d5522"
 
 inherit autotools gettext pkgconfig
 
@@ -53,7 +53,7 @@ PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup"
 PACKAGECONFIG[luks2-reencryption] = "--enable-luks2-reencryption,--disable-luks2-reencryption"
 PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux"
-PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev lvm2-udevrules"
+PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,,udev lvm2"
 PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto"
 # gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't
 # recognized.
diff --git a/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb b/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.6.bb
index 1c2c6e21e0..840c04e52e 100644
--- a/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb
+++ b/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.6.bb
@@ -9,10 +9,9 @@ SECTION = "console"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220"
 
-SRCREV = "20e87c13075a8e5660a8d69fd6c93d4f7c5f01a5"
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git;branch=master"
+SRCREV = "2543e6e5037c0b1b448282c2793f8a6ce8b12d71"
+SRC_URI = "git://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git;branch=master"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "openssl"
 
diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb
index a34614dd9d..7d27081964 100644
--- a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb
+++ b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "https://www.chronox.de/libkcapi/index.html"
 LICENSE = "BSD-3-Clause | GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3d8a091d797491204567185a6efce70f"
 
-S = "${WORKDIR}/git"
 SRCREV = "fc937358e71253a6efaa3ba74885364976b040ea"
 SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https \
           "
diff --git a/meta-oe/recipes-crypto/libmcrypt/libmcrypt/0001-fix-parameter-related-unexpected-error-in-gcc-15.0.1.patch b/meta-oe/recipes-crypto/libmcrypt/libmcrypt/0001-fix-parameter-related-unexpected-error-in-gcc-15.0.1.patch
new file mode 100644
index 0000000000..5e2afbab9d
--- /dev/null
+++ b/meta-oe/recipes-crypto/libmcrypt/libmcrypt/0001-fix-parameter-related-unexpected-error-in-gcc-15.0.1.patch
@@ -0,0 +1,119 @@
+From 046d1474a9a367d4b7772233e026855f1b55d58c Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Tue, 1 Apr 2025 17:58:49 +0900
+Subject: [PATCH] fix parameter-related unexpected error in gcc 15.0.1
+
+* see more details: http://errors.yoctoproject.org/Errors/Details/850150/
+    des.c:199:9: error: too many arguments to function 'spinit'; expected 0, have 1
+    199 |         spinit(key);
+        |         ^~~~~~ ~~~
+    des.c:38:56: note: declared here
+    38 | static void permute_ip(), permute_fp(), perminit_ip(), spinit(),
+        |                                                        ^~~~~~
+
+* Move function forward declarations to .h file to fix the following errors:
+    tripledes.c: In function '_mcrypt_desinit':
+    tripledes.c:198:18: error: passing argument 1 of 'perminit' from incompatible pointer type [-Wincompatible-pointer-types]
+    198 |         perminit(&key->iperm, ip);
+        |                  ^~~~~~~~~~~
+        |                  |
+        |                  char (*)[16][16][8]
+    In file included from tripledes.c:23:
+    tripledes.h:11:27: note: expected 'char (*)[16][8]' but argument is of type 'char (*)[16][16][8]'
+    11 | static void perminit(char perm[][16][8], char p[64]);
+        |                      ~~~~~^~~~~~~~~~~~~
+    tripledes.c:199:18: error: passing argument 1 of 'perminit' from incompatible pointer type [-Wincompatible-pointer-types]
+    199 |         perminit(&key->fperm, fp);
+        |                  ^~~~~~~~~~~
+        |                  |
+        |                  char (*)[16][16][8]
+    tripledes.h:11:27: note: expected 'char (*)[16][8]' but argument is of type 'char (*)[16][16][8]'
+    11 | static void perminit(char perm[][16][8], char p[64]);
+        |                      ~~~~~^~~~~~~~~~~~~
+
+        Changed parameter from &key to key
+        perminit(key->iperm, ip);
+        perminit(key->fperm, fp);
+
+Signed-off-by: mark.yang <mark.yang@lge.com>
+
+Upstream-Status: Pending
+---
+ modules/algorithms/des.c       | 5 -----
+ modules/algorithms/des.h       | 6 ++++++
+ modules/algorithms/tripledes.c | 8 ++------
+ modules/algorithms/tripledes.h | 5 +++++
+ 4 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/modules/algorithms/des.c b/modules/algorithms/des.c
+index 5810811..695e740 100644
+--- a/modules/algorithms/des.c
++++ b/modules/algorithms/des.c
+@@ -35,11 +35,6 @@
+ 
+ /* #define     NULL    0 */
+ 
+-static void permute_ip(), permute_fp(), perminit_ip(), spinit(),
+-perminit_fp();
+-static word32 f();
+-
+-
+ /* Tables defined in the Data Encryption Standard documents */
+ 
+ /* initial permutation IP */
+diff --git a/modules/algorithms/des.h b/modules/algorithms/des.h
+index c333c5b..65dba63 100644
+--- a/modules/algorithms/des.h
++++ b/modules/algorithms/des.h
+@@ -5,3 +5,9 @@ typedef struct des_key {
+        char fperm[16][16][8];
+ } DES_KEY;
+ 
++static void permute_ip(char *inblock, DES_KEY * key, char *outblock);
++static void permute_fp(char *inblock, DES_KEY * key, char *outblock);
++static void perminit_ip(DES_KEY * key);
++static void spinit(DES_KEY * key);
++static void perminit_fp(DES_KEY * key);
++static word32 f(DES_KEY * key, register word32 r, register char *subkey);
+diff --git a/modules/algorithms/tripledes.c b/modules/algorithms/tripledes.c
+index 7b3c324..67985db 100644
+--- a/modules/algorithms/tripledes.c
++++ b/modules/algorithms/tripledes.c
+@@ -36,10 +36,6 @@
+ 
+ /* #define     NULL    0 */
+ 
+-static void permute(), perminit(), spinit();
+-static word32 f();
+-
+-
+ /* Tables defined in the Data Encryption Standard documents */
+ 
+ /* initial permutation IP */
+@@ -199,8 +195,8 @@ static int _mcrypt_desinit(TRIPLEDES_KEY * key)
+        spinit(key, 0);
+        spinit(key, 1);
+        spinit(key, 2);
+-       perminit(&key->iperm, ip);
+-       perminit(&key->fperm, fp);
++       perminit(key->iperm, ip);
++       perminit(key->fperm, fp);
+ 
+ 
+        return 0;
+diff --git a/modules/algorithms/tripledes.h b/modules/algorithms/tripledes.h
+index dec7682..10c7bc6 100644
+--- a/modules/algorithms/tripledes.h
++++ b/modules/algorithms/tripledes.h
+@@ -7,3 +7,8 @@ typedef struct triple_des_key {
+ 
+ } TRIPLEDES_KEY;
+ 
++static void permute(char *inblock, char perm[16][16][8], char *outblock);
++static void perminit(char perm[16][16][8], char p[64]);
++static void spinit(TRIPLEDES_KEY * key, int pos);
++static word32 f(TRIPLEDES_KEY * key, int pos, register word32 r, register char *subkey);
++
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb b/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
index cfa056d71d..c55a01d3b9 100644
--- a/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
+++ b/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
@@ -4,9 +4,11 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
 DEPENDS = "libtool"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/mcrypt/Libmcrypt/${PV}/libmcrypt-${PV}.tar.gz"
+SRC_URI = " \
+    ${SOURCEFORGE_MIRROR}/project/mcrypt/Libmcrypt/${PV}/libmcrypt-${PV}.tar.gz \
+    file://0001-fix-parameter-related-unexpected-error-in-gcc-15.0.1.patch \
+"
 
-SRC_URI[md5sum] = "0821830d930a86a5c69110837c55b7da"
 SRC_URI[sha256sum] = "e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d27a373e"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mcrypt/files/Libmcrypt/"
diff --git a/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb b/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb
index 5479007d92..a9a147c35b 100644
--- a/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb
+++ b/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/libtom/libtomcrypt.git;protocol=https;branch=master
 
 SRCREV = "7e7eb695d581782f04b24dc444cbfde86af59853"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb b/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb
index 813c6ec4c8..a601d88e7c 100644
--- a/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb
+++ b/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb
@@ -11,7 +11,7 @@ SRC_URI[sha512sum] = "bf275d4c53ff94af6cdc723a4e002e9f080f4d1436c86c76bb37870b34
 
 MIRRORS = "https://.*/.* https://github.com/LoupVaillant/Monocypher/releases/download/${PV}/${BPN}-${PV}.tar.gz "
 
-S = "${WORKDIR}/${BPN}-${PV}"
+S = "${UNPACKDIR}/${BPN}-${PV}"
 
 CFLAGS += "-pedantic -Wall -Wextra -O3"
 EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'CFLAGS=${CFLAGS}' 'LIBDIR=${libdir}'"
diff --git a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb
index d3922cf79e..15d0aefc36 100644
--- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb
+++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb
@@ -17,7 +17,6 @@ LIC_FILES_CHKSUM = " \
 "
 SRC_URI = "git://github.com/OpenSC/${BPN}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 # master
 SRCREV = "8bed16034f629a0361fa8ff89deed2b43dc45d8b"
 PV .= "+1.30.0+git"
diff --git a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb
index 9506d0e55d..580b92b3b3 100644
--- a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb
+++ b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb
@@ -38,7 +38,7 @@ USERADD_PACKAGES = "${PN}"
 USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb"
 
 do_install:prepend() {
-    test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py 
+    test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py
     test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh
     rm -rf ${B}/src/${GO_IMPORT}/Dockerfile*
 
@@ -75,3 +75,6 @@ INITSCRIPT_NAME = "influxdb"
 INITSCRIPT_PARAMS = "defaults"
 
 SYSTEMD_SERVICE:${PN} = "influxdb.service"
+
+CVE_STATUS[CVE-2019-10329] = "cpe-incorrect: Version does not match and only the Jenkins plugin is affected."
+SKIP_RECIPE[influxdb] ?= "QA Issue: task do_compile has network enabled"
diff --git a/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb b/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb
index 60b486df78..9cefc528ae 100644
--- a/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb
+++ b/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb
@@ -11,7 +11,6 @@ SRC_URI = "gitsm://github.com/google/${BPN}.git;branch=main;protocol=https \
 "
 
 SRCREV = "068d5ee1a3ac40dabd00d211d5013af44be55bea"
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 PACKAGECONFIG ??= ""
diff --git a/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb b/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb
index 7322916499..9623ef7f19 100644
--- a/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb
+++ b/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb
@@ -1,5 +1,4 @@
 require ${PN}.inc
 
 
-SRC_URI[md5sum] = "05e2ceeac4bc85fbe40de8b4b22d9ab3"
 SRC_URI[sha256sum] = "dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503"
diff --git a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb
index b2f1920f6b..065c8559ff 100644
--- a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb
+++ b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb
@@ -18,7 +18,7 @@ SRCREV = "ce201088de95d26fc0da36ba805bf2ddc2ba74ff"
 
 inherit ptest
 
-S = "${WORKDIR}/git/libraries/liblmdb"
+S = "${UNPACKDIR}/${BP}/libraries/liblmdb"
 
 do_compile() {
     oe_runmake CC="${CC}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" XCFLAGS="${CFLAGS}"
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.6.bb
index 578357b480..578357b480 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb
+++ b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.6.bb
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 4bfa1c9caa..13e55ebacd 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -17,26 +17,26 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
            file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \
            file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \
            file://ssize_t.patch \
-           file://mm_malloc.patch \
            file://sys_futex.patch \
            file://cross-compiling.patch \
            file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
            file://lfs64.patch \
            file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
-           file://0001-Remove-the-compile_time_assert-lines.patch \
-           file://0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch \
+           file://0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch \
+           file://riscv32.patch \
           "
-SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
-SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157"
+SRC_URI[sha256sum] = "1b26c0bb2d025dbfac3b9852d2b7eafda56a171b67ac2e27831ec0414fb7df07"
 
-UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
+UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags"
 
 BINCONFIG_GLOB = "mysql_config"
 
-inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig
+inherit cmake gettext binconfig update-rc.d systemd multilib_script multilib_header pkgconfig
 
 MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \
-                    ${PN}-setupdb:${bindir}/mariadb-install-db"
+                    ${PN}-setupdb:${bindir}/mariadb-install-db \
+                    libmysqlclient-dev:${bindir}/mysql_config \
+                    "
 
 INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb"
 INITSCRIPT_NAME:${PN}-server = "mysqld"
@@ -63,20 +63,14 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} lz4 openssl"
 EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
 
 PACKAGECONFIG:class-native = ""
-PACKAGECONFIG[pam] = "-DPLUGIN_AUTH_PAM=YES,-DPLUGIN_AUTH_PAM=NO,libpam"
+PACKAGECONFIG[pam] = "-DPLUGIN_AUTH_PAM=YES -DINSTALL_PAMDIR=${base_libdir}/security,-DPLUGIN_AUTH_PAM=NO,libpam"
 PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind"
 PACKAGECONFIG[krb5] = ", ,krb5"
 PACKAGECONFIG[lz4] = ", ,lz4"
 PACKAGECONFIG[openssl] = "-DWITH_SSL='system',-DWITH_SSL='bundled',openssl"
 
-# MariaDB doesn't link properly with gold
-# https://mariadb.atlassian.net/browse/MDEV-5982
-TARGET_CFLAGS += "-fuse-ld=bfd"
 LDFLAGS += " -pthread"
 
-BUILD_CFLAGS += "-fuse-ld=bfd"
-BUILD_CXXFLAGS += "-fuse-ld=bfd"
-
 LDFLAGS:x86:toolchain-clang = "-latomic"
 LDFLAGS:riscv32:toolchain-clang = "-latomic"
 
@@ -93,11 +87,14 @@ EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \
                  -DINSTALL_DOCDIR:PATH=${datadir}/doc/${BPN} \
                  -DINSTALL_LIBDIR:PATH=${baselib} \
                  -DINSTALL_PLUGINDIR:PATH=${baselib}/plugin \
+                 -DINSTALL_PCDIR:PATH=${baselib}/pkgconfig \
                  -DINSTALL_SYSCONFDIR:PATH=${sysconfdir} \
                  -DMYSQL_DATADIR:PATH=/var/mysql \
                  -DCAT_EXECUTABLE=`which cat` \
-                 -DSTACK_DIRECTION=1 \
                  -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 \
+                 -DLSTAT_FOLLOWS_SLASHED_SYMLINK_EXITCODE=0 \
+                 -DSTAT_EMPTY_STRING_BUG_EXITCODE=0 \
+                 -DMASK_LONGDOUBLE_EXITCODE=0 \
                  -DCMAKE_AR:FILEPATH=${AR}"
 
 
@@ -160,6 +157,7 @@ mariadb_sysroot_preprocess () {
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
+    oe_multilib_header mysql/mariadb_version.h mysql/server/my_config.h mysql/server/private/config.h
 
     install -d ${D}/${sysconfdir}/init.d
     install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/
@@ -182,16 +180,8 @@ do_install() {
     # mini-benchmark used for Gitlab-CI to run on every commit to catch
     # if there are severe performance regressions.
     # remove it to avoid introducing bash dependency
-    if [ -f ${D}${datadir}/mysql/mini-benchmark ]; then
-        rm -rf ${D}${datadir}/mysql/mini-benchmark
-    fi
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
-        pam_so=$(find ${D} -name pam_user_map.so)
-        if [ x"${pam_so}" != x ]; then
-            pam_dir=$(dirname ${pam_so})
-            mv ${pam_dir} ${D}/${libdir}
-            rmdir --ignore-fail-on-non-empty ${pam_dir%security}
-        fi
+    if [ -f ${D}${datadir}/mariadb/mini-benchmark ]; then
+        rm -rf ${D}${datadir}/mariadb/mini-benchmark
     fi
 }
 
@@ -343,9 +333,9 @@ FILES:${PN}-server = "\
     ${sbindir}/mysqld \
     ${sbindir}/mariadbd \
     ${libdir}/plugin/*.so \
-    ${libdir}/security/*.so \
+    ${base_libdir}/security/*.so \
     ${libdir}/plugin/auth_pam_tool_dir/auth_pam_tool \
-    ${datadir}/mysql/ \
+    ${datadir}/mariadb/ \
     ${localstatedir}/mysql/ \
     ${sysconfdir}/init.d/mysqld \
     ${sysconfdir}/my.cnf \
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
index f8ccb998be..bc1b992919 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
@@ -1,4 +1,4 @@
-From 68100b1f2243304289b9a9a35e8fb0e1bb0cf70f Mon Sep 17 00:00:00 2001
+From ef47f8f41722b90a86ace86f0f509b4775c2f725 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 24 Jan 2023 21:40:43 -0800
 Subject: [PATCH] Add missing includes <cstdint> and <cstdio>
@@ -11,27 +11,14 @@ Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
- .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h   | 1 +
- storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h   | 1 +
- .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h    | 1 +
- storage/rocksdb/rocksdb/util/slice.cc                            | 1 +
- storage/rocksdb/rocksdb/util/string_util.h                       | 1 +
- 5 files changed, 5 insertions(+)
+ storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h  | 1 +
+ .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h   | 1 +
+ storage/rocksdb/rocksdb/util/slice.cc                           | 2 +-
+ storage/rocksdb/rocksdb/util/string_util.h                      | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-index 963c1d8e..73487edd 100644
---- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-@@ -5,6 +5,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include "rocksdb/rocksdb_namespace.h"
- 
- struct CompactionIterationStats {
 diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
-index c7f93b4c..3c2ab805 100644
+index 7fb9d489..f7b4e6f0 100644
 --- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
 +++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
 @@ -8,6 +8,7 @@
@@ -55,30 +42,29 @@ index f356395f..32152217 100644
  #include <vector>
  
 diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc
-index 6db11cc9..c26b6a21 100644
+index 3c3656de..b18d7f5d 100644
 --- a/storage/rocksdb/rocksdb/util/slice.cc
 +++ b/storage/rocksdb/rocksdb/util/slice.cc
-@@ -8,6 +8,7 @@
- // found in the LICENSE file. See the AUTHORS file for names of contributors.
+@@ -12,7 +12,7 @@
+ #include <stdio.h>
  
  #include <algorithm>
+-
 +#include <cstdint>
+ #include "rocksdb/convenience.h"
  #include "rocksdb/slice_transform.h"
- #include "rocksdb/slice.h"
- #include "util/string_util.h"
-
-diff --git a/util/string_util.h b/util/string_util.h
-index 55d106fff02..11178fd1d7b 100644
+ #include "rocksdb/utilities/object_registry.h"
+diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h
+index 7794dbb0..b480177e 100644
 --- a/storage/rocksdb/rocksdb/util/string_util.h
 +++ b/storage/rocksdb/rocksdb/util/string_util.h
 @@ -6,6 +6,7 @@
-
+ 
  #pragma once
-
+ 
 +#include <cstdint>
  #include <sstream>
  #include <string>
  #include <unordered_map>
--- 
-2.25.1
-
+--
+2.40.0
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch
new file mode 100644
index 0000000000..2a1c74a68c
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch
@@ -0,0 +1,41 @@
+From 0b1ba174bd5148c0675b335fcebde767a56e10bb Mon Sep 17 00:00:00 2001
+From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
+Date: Mon, 2 Dec 2024 02:18:46 +0000
+Subject: [PATCH] Ensure compatibility with ARMv9 by updating .arch directive
+
+The pmem_cvap() function currently uses the '.arch armv8.2-a' directive
+for the 'dc cvap' instruction. This will cause build errors below when
+compiling for ARMv9 systems. Update the '.arch' directive to 'armv9.4-a'
+to ensure compatibility with ARMv9 architectures.
+
+{standard input}: Assembler messages:
+{standard input}:169: Error: selected processor does not support `retaa'
+{standard input}:286: Error: selected processor does not support `retaa'
+make[2]: *** [storage/innobase/CMakeFiles/innobase_embedded.dir/build.make:
+1644: storage/innobase/CMakeFiles/innobase_embedded.dir/sync/cache.cc.o]
+Error 1
+
+Upstream-Status: Submitted
+
+Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
+---
+ storage/innobase/sync/cache.cc | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/storage/innobase/sync/cache.cc b/storage/innobase/sync/cache.cc
+index 43d642d0..c5e67709 100644
+--- a/storage/innobase/sync/cache.cc
++++ b/storage/innobase/sync/cache.cc
+@@ -82,7 +82,12 @@ static void pmem_cvap(const void* buf, size_t size)
+   for (uintptr_t u= uintptr_t(buf) & ~(CPU_LEVEL1_DCACHE_LINESIZE),
+          end= uintptr_t(buf) + size;
+        u < end; u+= CPU_LEVEL1_DCACHE_LINESIZE)
++#if defined __ARM_ARCH && __ARM_ARCH == 9
++    __asm__ __volatile__(".arch armv9.4-a\n dc cvap, %0" :: "r"(u) : "memory");
++#else
+     __asm__ __volatile__(".arch armv8.2-a\n dc cvap, %0" :: "r"(u) : "memory");
++#endif
++
+   __asm__ __volatile__("dmb ishst" ::: "memory");
+ }
+ 
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
index d8671b76b0..8105d3d785 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
@@ -1,18 +1,17 @@
-From f15fbdf1244ca9ce01c5507660a86d685ed88bcf Mon Sep 17 00:00:00 2001
+From 2e64c0c22f630cbc301d385e46021853116f9c75 Mon Sep 17 00:00:00 2001
 From: Sumit Garg <sumit.garg@linaro.org>
 Date: Mon, 21 Mar 2022 15:08:40 +0800
 Subject: [PATCH] Fix library LZ4 lookup.
 
+Upstream-Status: Pending
 Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
-Upstream-Status: Pending
-
  cmake/FindLZ4.cmake | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake
-index eebd859..094241c 100644
+index eebd8596..094241ce 100644
 --- a/cmake/FindLZ4.cmake
 +++ b/cmake/FindLZ4.cmake
 @@ -1,5 +1,10 @@
@@ -28,6 +27,3 @@ index eebd859..094241c 100644
  
  if(LZ4_INCLUDE_DIRS AND EXISTS "${LZ4_INCLUDE_DIRS}/lz4.h")
    file(STRINGS "${LZ4_INCLUDE_DIRS}/lz4.h" LZ4_H REGEX "^#define LZ4_VERSION_[MR]")
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch
deleted file mode 100644
index 3e42535dad..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From dae52f5916ef59434c93f0b716270f59dd0c3a94 Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar@gmail.com>
-Date: Sun, 7 Jan 2024 10:19:54 +0100
-Subject: [PATCH] MDEV-33439 Fix build with libxml2 2.12
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-libxml2 2.12.0 made `xmlGetLastError()` return `const` pointer:
-
-https://gitlab.gnome.org/GNOME/libxml2/-/commit/61034116d0a3c8b295c6137956adc3ae55720711
-
-Clang 16 does not like this:
-
-    error: assigning to 'xmlErrorPtr' (aka '_xmlError *') from 'const xmlError *' (aka 'const _xmlError *') discards qualifiers
-    error: cannot initialize a variable of type 'xmlErrorPtr' (aka '_xmlError *') with an rvalue of type 'const xmlError *' (aka 'const _xmlError *')
-
-Let’s update the variables to `const`.
-For older versions, it will be automatically converted.
-
-But then `xmlResetError(xmlError*)` will not like the `const` pointer:
-
-    error: no matching function for call to 'xmlResetError'
-    note: candidate function not viable: 1st argument ('const xmlError *' (aka 'const _xmlError *')) would lose const qualifier
-
-Let’s replace it with `xmlResetLastError()`.
-
-ALso remove `LIBXMLDOC::Xerr` protected member property.
-It was introduced in 65b0e5455b547a3d574fa77b34cce23ae3bea0a0
-along with the `xmlResetError` calls.
-It does not appear to be used for anything.
-
-Upstream-Status: Backport [https://github.com/MariaDB/server/pull/2983]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- storage/connect/libdoc.cpp | 39 +++++++++++++++++++-------------------
- 1 file changed, 19 insertions(+), 20 deletions(-)
-
-diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp
-index 67f22ce2..ab588dd4 100644
---- a/storage/connect/libdoc.cpp
-+++ b/storage/connect/libdoc.cpp
-@@ -93,7 +93,6 @@ class LIBXMLDOC : public XMLDOCUMENT {
-   xmlXPathContextPtr Ctxp;
-   xmlXPathObjectPtr  Xop;
-   xmlXPathObjectPtr  NlXop;
--  xmlErrorPtr        Xerr;
-   char              *Buf;                  // Temporary
-   bool               Nofreelist;
- }; // end of class LIBXMLDOC
-@@ -327,7 +326,6 @@ LIBXMLDOC::LIBXMLDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp)
-   Ctxp = NULL;
-   Xop = NULL;
-   NlXop = NULL;
--  Xerr = NULL;
-   Buf = NULL;
-   Nofreelist = false;
-   } // end of LIBXMLDOC constructor
-@@ -365,8 +363,8 @@ bool LIBXMLDOC::ParseFile(PGLOBAL g, char *fn)
-       Encoding = (char*)Docp->encoding;
- 
-     return false;
--  } else if ((Xerr = xmlGetLastError()))
--    xmlResetError(Xerr);
-+  } else if (xmlGetLastError())
-+    xmlResetLastError();
- 
-   return true;
-   } // end of ParseFile
-@@ -505,9 +503,9 @@ int LIBXMLDOC::DumpDoc(PGLOBAL g, char *ofn)
- #if 1
-   // This function does not crash (
-   if (xmlSaveFormatFileEnc((const char *)ofn, Docp, Encoding, 0) < 0) {
--    xmlErrorPtr err = xmlGetLastError();
-+    const xmlError *err = xmlGetLastError();
-     strcpy(g->Message, (err) ? err->message : "Error saving XML doc");
--    xmlResetError(Xerr);
-+    xmlResetLastError();
-     rc = -1;
-     } // endif Save
- //  rc = xmlDocDump(of, Docp);
-@@ -546,8 +544,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
-     if (Nlist) {
-       xmlXPathFreeNodeSet(Nlist);
- 
--      if ((Xerr = xmlGetLastError()))
--        xmlResetError(Xerr);
-+      if (xmlGetLastError())
-+        xmlResetLastError();
- 
-       Nlist = NULL;
-       } // endif Nlist
-@@ -555,8 +553,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
-     if (Xop) {
-       xmlXPathFreeObject(Xop);
- 
--      if ((Xerr = xmlGetLastError()))
--        xmlResetError(Xerr);
-+      if (xmlGetLastError())
-+        xmlResetLastError();
- 
-       Xop = NULL;
-       } // endif Xop
-@@ -564,8 +562,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
-     if (NlXop) {
-       xmlXPathFreeObject(NlXop);
- 
--      if ((Xerr = xmlGetLastError()))
--        xmlResetError(Xerr);
-+      if (xmlGetLastError())
-+        xmlResetLastError();
- 
-       NlXop = NULL;
-       } // endif NlXop
-@@ -573,8 +571,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
-     if (Ctxp) {
-       xmlXPathFreeContext(Ctxp);
- 
--      if ((Xerr = xmlGetLastError()))
--        xmlResetError(Xerr);
-+      if (xmlGetLastError())
-+        xmlResetLastError();
- 
-       Ctxp = NULL;
-       } // endif Ctxp
-@@ -590,6 +588,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
- /******************************************************************/
- xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp)
-   {
-+  const xmlError *xerr;
-   xmlNodeSetPtr nl;
- 
-   if (trace(1))
-@@ -649,11 +648,11 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp)
-     } else
-       xmlXPathFreeObject(Xop);            // Caused node not found
- 
--    if ((Xerr = xmlGetLastError())) {
--      strcpy(g->Message, Xerr->message);
--      xmlResetError(Xerr);
-+    if ((xerr = xmlGetLastError())) {
-+      strcpy(g->Message, xerr->message);
-+      xmlResetLastError();
-       return NULL;
--      } // endif Xerr
-+      } // endif xerr
- 
-     } // endif Xop
- 
-@@ -1079,7 +1078,7 @@ void XML2NODE::AddText(PGLOBAL g, PCSZ txtp)
- /******************************************************************/
- void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp)
-   {
--  xmlErrorPtr xerr;
-+  const xmlError *xerr;
- 
-   if (trace(1))
-     htrc("DeleteChild: node=%p\n", dnp);
-@@ -1122,7 +1121,7 @@ void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp)
-   if (trace(1))
-     htrc("DeleteChild: errmsg=%-.256s\n", xerr->message);
- 
--  xmlResetError(xerr);
-+  xmlResetLastError();
-   } // end of DeleteChild
- 
- /* -------------------- class XML2NODELIST ---------------------- */
--- 
-2.44.0
-
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch
deleted file mode 100644
index 9a6e28297b..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cc5f1d0759b367265a1a000287e2ec15c31eb518 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Mon, 26 Feb 2024 14:56:02 +0800
-Subject: [PATCH] Remove the compile_time_assert lines
-
-Remove the problematic compile_time_assert lines to fix the below build
-failure on 32-bit arm.
- In file included from TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_test.c:38:
- TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_fw.c:1438:3: error: 'compile_time_assert' declared as an array with a negative size
-  1438 |   compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);
-       |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Upstream-Status: Inappropriate [Upstream will bring the asset back
-                                in a new way [1]]
-[1] https://jira.mariadb.org/browse/MDEV-33429
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- tests/mysql_client_fw.c | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c
-index c9e64678..5c0c7ce2 100644
---- a/tests/mysql_client_fw.c
-+++ b/tests/mysql_client_fw.c
-@@ -1430,14 +1430,6 @@ int main(int argc, char **argv)
-     tests_to_run[i]= NULL;
-   }
- 
--#ifdef _WIN32
--  /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */
--  compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728);
--#else
--  /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */
--  compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);
--#endif
--
-   if (mysql_server_init(embedded_server_arg_count,
-                         embedded_server_args,
-                         (char**) embedded_server_groups))
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch
index aba9b9d966..eddfdaaf77 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch
@@ -1,4 +1,4 @@
-From 0a3222338efc108c831fbdd719a47d35f4b0adcd Mon Sep 17 00:00:00 2001
+From f9f019049a9bb09471e8303d4510afae07f225c8 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 18 Aug 2021 06:49:25 +0000
 Subject: [PATCH] aio_linux: Check if syscall exists before using it
@@ -10,19 +10,17 @@ tpool/aio_linux.cc:63:20: error: '__NR_io_getevents' was not declared in this sc
       |                    ^~~~~~~~~~~~~~~~~
       |                    io_getevents
 
-Upstream-Staus: Pending
+Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
-Upstream-Status: Pending
-
  tpool/aio_linux.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc
-index 4abc213..da75411 100644
+index 507c6b92..a6adf1af 100644
 --- a/tpool/aio_linux.cc
 +++ b/tpool/aio_linux.cc
-@@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
+@@ -59,6 +59,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
  */
  static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev)
  {
@@ -30,7 +28,7 @@ index 4abc213..da75411 100644
    int saved_errno= errno;
    int ret= syscall(__NR_io_getevents, reinterpret_cast<long>(ctx),
                     min_nr, nr, ev, 0);
-@@ -67,6 +68,9 @@ static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev)
+@@ -68,6 +69,9 @@ static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev)
      errno= saved_errno;
    }
    return ret;
@@ -40,6 +38,3 @@ index 4abc213..da75411 100644
  }
  
  
--- 
-2.29.2
-
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch
index 0a2eed44f4..bfcd45b64b 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch
@@ -1,4 +1,4 @@
-From d611f78198dee64bb6a05933d200b544e2510b76 Mon Sep 17 00:00:00 2001
+From 3a29c2f7afe10bf0bc0529b5d9ea44866946ac5a Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 14 Nov 2020 14:37:13 -0800
 Subject: [PATCH] innobase: Define __NR_futex if it does not exist
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/storage/innobase/log/log0sync.cc b/storage/innobase/log/log0sync.cc
-index 7799e605..4fab8f74 100644
+index 0de283ca..265ab691 100644
 --- a/storage/innobase/log/log0sync.cc
 +++ b/storage/innobase/log/log0sync.cc
 @@ -66,6 +66,9 @@ Note that if write operation is very fast, a) or b) can be fine as alternative.
@@ -32,6 +32,3 @@ index 7799e605..4fab8f74 100644
  #endif
  
  #include <atomic>
--- 
-2.29.2
-
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch
index 456a2bad64..1475bb1a51 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch
@@ -1,4 +1,4 @@
-From f92f657973997df30afdb0032c88ad3a14ead46b Mon Sep 17 00:00:00 2001
+From 360d41c1dd2d28d5102d66179095cedacaf5dc3a Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Fri, 23 Sep 2022 15:48:21 +0800
 Subject: [PATCH] sql/CMakeLists.txt: fix gen_lex_hash not found
@@ -15,10 +15,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  1 file changed, 22 insertions(+), 8 deletions(-)
 
 diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
-index 241b482..27a3991 100644
+index 0195555e..507136cb 100644
 --- a/sql/CMakeLists.txt
 +++ b/sql/CMakeLists.txt
-@@ -60,11 +60,18 @@ ${CMAKE_BINARY_DIR}/sql
+@@ -64,11 +64,18 @@ ${CMAKE_BINARY_DIR}/sql
  ${CMAKE_SOURCE_DIR}/tpool
  )
  
@@ -41,7 +41,7 @@ index 241b482..27a3991 100644
  
  FIND_PACKAGE(BISON 2.4)
  
-@@ -372,11 +379,18 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+@@ -405,11 +412,18 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
    ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
  ENDIF()
  
@@ -64,6 +64,3 @@ index 241b482..27a3991 100644
  
  MYSQL_ADD_EXECUTABLE(mariadb-tzinfo-to-sql tztime.cc)
  SET_TARGET_PROPERTIES(mariadb-tzinfo-to-sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL")
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch b/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
index ac94279585..2841a59a73 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
@@ -1,4 +1,4 @@
-From 24e2b0edc2612acefcc48414bb6f0aeb086061a9 Mon Sep 17 00:00:00 2001
+From c24181245bc502a384635d7f7f48f12863f84c2f Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Tue, 26 Feb 2019 23:57:06 -0800
 Subject: [PATCH] configure.cmake: fix valgrind
@@ -16,16 +16,15 @@ Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
-
 ---
  configure.cmake | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/configure.cmake b/configure.cmake
-index 3cfc4b31..d017b3b3 100644
+index 61f30a75..3e730082 100644
 --- a/configure.cmake
 +++ b/configure.cmake
-@@ -930,10 +930,9 @@ HAVE_GCC_C11_ATOMICS)
+@@ -881,10 +881,9 @@ ENDIF()
  
  IF(WITH_VALGRIND)
    SET(HAVE_valgrind 1)
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch
index d0d6e3c730..dc34c07d31 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch
@@ -1,4 +1,4 @@
-From 80be37351d995654f86b838f6b5ed47e8a90261b Mon Sep 17 00:00:00 2001
+From b6d8dbb7e930f5caa9e3e3c71706b0cf9eea7bb3 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Fri, 23 Sep 2022 12:05:17 +0800
 Subject: [PATCH] CMakeLists.txt: not include import_executables.cmake
@@ -14,10 +14,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  1 file changed, 5 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f9e2b1b..34924ba 100644
+index 3828420c..ee38615a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -394,11 +394,6 @@ CHECK_LIBFMT()
+@@ -428,11 +428,6 @@ CHECK_LIBFMT()
  ADD_SUBDIRECTORY(tpool)
  CHECK_SYSTEMD()
  
@@ -29,6 +29,3 @@ index f9e2b1b..34924ba 100644
  #
  # Setup maintainer mode options. Platform checks are
  # not run with the warning options as to not perturb fragile checks
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch
index 05b0cf8ff7..39b7fad983 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch
@@ -1,4 +1,4 @@
-From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From af4247cd24eab2d728fb3592f6e125ef5290361b Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Thu, 9 Apr 2020 14:07:19 +0800
 Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
@@ -16,10 +16,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
-index d7895b0..3bcd52a 100644
+index e89dbfc0..acc6b48e 100644
 --- a/storage/rocksdb/build_rocksdb.cmake
 +++ b/storage/rocksdb/build_rocksdb.cmake
-@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+@@ -490,6 +490,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
  
  ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
  target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
@@ -29,6 +29,3 @@ index d7895b0..3bcd52a 100644
  IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
    set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
  endif()
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch b/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch
index 7a685a6521..d53eb99e4c 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/lfs64.patch
@@ -1,5 +1,15 @@
+From 24667f728fabe141a92d4de828ab24d9fe953b08 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 25 Dec 2022 19:23:17 -0800
+Subject: [PATCH] mariadb: Alias lseek64/open64/ftruncate64 on musl systems
+
 Upstream-Status: Pending
+---
+ storage/connect/os.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
+diff --git a/storage/connect/os.h b/storage/connect/os.h
+index 7d0d5cab..10da630f 100644
 --- a/storage/connect/os.h
 +++ b/storage/connect/os.h
 @@ -2,13 +2,15 @@
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch b/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch
deleted file mode 100644
index 6aa6c84882..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Pending
-
---- a/storage/rocksdb/rocksdb/port/jemalloc_helper.h
-+++ b/storage/rocksdb/rocksdb/port/jemalloc_helper.h
-@@ -5,7 +5,7 @@
- 
- #pragma once
- 
--#if defined(__clang__)
-+#if defined(__clang__) && defined(__GLIBC__)
- // glibc's `posix_memalign()` declaration specifies `throw()` while clang's
- // declaration does not. There is a hack in clang to make its re-declaration
- // compatible with glibc's if they are declared consecutively. That hack breaks
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start b/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start
index 189c02021d..b7ae09a4f7 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start
+++ b/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start
@@ -34,7 +34,7 @@ install_db () {
     [ -d "$datadir/mysql" ] && exit 0
 
     # Create initial db
-    /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
+    /usr/bin/mariadb-install-db --rpm --datadir="$datadir" --user=mysql
     exit 0
 }
 
@@ -51,7 +51,7 @@ pinger () {
 
     while /bin/true ; do
         sleep 1
-        mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break
+        mariadb-admin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break
     done
     exit 0
 }
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service b/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service
index d88361703d..9c47fede1c 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service
+++ b/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service
@@ -13,7 +13,7 @@ Group=mysql
 PermissionsStartOnly=true
 
 # Start main service
-ExecStart=@BINDIR@/mysqld_safe --basedir=@PREFIX@
+ExecStart=@BINDIR@/mariadbd-safe --basedir=@PREFIX@
 
 # Don't signal startup success before a ping works
 ExecStartPost=@BINDIR@/mysql-systemd-start post
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch b/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch
deleted file mode 100644
index 3787b74ad1..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Upstream-Status: Pending
-
-Remove glibc specific function dependencies
-
-Sourced from: https://git.alpinelinux.org/aports/tree/main/mariadb/ppc-remove-glibc-dep.patch
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-diff --git a/include/my_cpu.h b/include/my_cpu.h
-index f2e26fca..94599b74 100644
---- a/include/my_cpu.h
-+++ b/include/my_cpu.h
-@@ -24,17 +24,16 @@
- */
-
- #ifdef _ARCH_PWR8
--#include <sys/platform/ppc.h>
- /* Very low priority */
--#define HMT_very_low() __ppc_set_ppr_very_low()
-+#define HMT_very_low() asm volatile("or 31,31,31")
- /* Low priority */
--#define HMT_low() __ppc_set_ppr_low()
-+#define HMT_low() asm volatile ("or 1,1,1")
- /* Medium low priority */
--#define HMT_medium_low() __ppc_set_ppr_med_low()
-+#define HMT_medium_low() asm volatile ("or 6,6,6")
- /* Medium priority */
--#define HMT_medium() __ppc_set_ppr_med()
-+#define HMT_medium() asm volatile ("or 2,2,2")
- /* Medium high priority */
--#define HMT_medium_high() __ppc_set_ppr_med_high()
-+#define HMT_medium_high() asm volatile("or 5,5,5")
- /* High priority */
- #define HMT_high() asm volatile("or 3,3,3")
- #else
-@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
-   __asm__ __volatile__ ("pause");
- #endif
- #elif defined(_ARCH_PWR8)
--  __ppc_get_timebase();
-+  __builtin_ppc_get_timebase();
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
-   /* Mainly, prevent the compiler from optimizing away delay loops */
-   __asm__ __volatile__ ("":::"memory");
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/riscv32.patch b/meta-oe/recipes-dbs/mysql/mariadb/riscv32.patch
new file mode 100644
index 0000000000..24b86584e3
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/riscv32.patch
@@ -0,0 +1,19 @@
+Do not use static_cast in C sources
+
+C compiler does not recognise static_cast which is a C++ keyword
+and bails out compiling mysys/my_rdtsc.c, use traditional typecast
+instead
+
+Upstream-Status: Submitted [https://github.com/MariaDB/server/pull/1981/files#r2032207090]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/include/my_rdtsc.h
++++ b/include/my_rdtsc.h
+@@ -226,7 +226,7 @@ static inline ulonglong my_timer_cycles(
+         "sub %0, zero, %0\n"
+         "and %1, %1, %0\n"
+         : "=r"(result_hi0), "=r"(result_lo), "=r"(result_hi1));
+-    return (static_cast<ulonglong>(result_hi1) << 32) | result_lo;
++    return ((ulonglong)result_hi1 << 32) | result_lo;
+ # else
+     ulonglong result;
+     __asm __volatile__("rdtime %0" : "=r"(result));
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch b/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch
index 4e499d4137..819b65f041 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/ssize_t.patch
@@ -1,7 +1,16 @@
-ssize_t comes from sys/types.h therefore include it
+From cfa843c91a036d0926c76c6dec6fd2a1f38e4843 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 31 May 2021 21:55:00 -0700
+Subject: [PATCH] ssize_t comes from sys/types.h therefore include it
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ wsrep-lib/include/wsrep/gtid.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wsrep-lib/include/wsrep/gtid.hpp b/wsrep-lib/include/wsrep/gtid.hpp
+index 0d49c58d..d61a6585 100644
 --- a/wsrep-lib/include/wsrep/gtid.hpp
 +++ b/wsrep-lib/include/wsrep/gtid.hpp
 @@ -25,7 +25,7 @@
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch b/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch
index 233d9e6af6..30c9e2452a 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/support-files-CMakeLists.txt-fix-do_populate_sysroot.patch
@@ -1,4 +1,4 @@
-From 4ac5b555d058d4d489f25a3806a787b7b2465d09 Mon Sep 17 00:00:00 2001
+From 34713c3bba68cb94b373b750c1c8fcc0b04b2c45 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Wed, 27 Feb 2019 22:41:26 -0800
 Subject: [PATCH] support-files/CMakeLists.txt: fix do_populate_sysroot issue
@@ -10,16 +10,15 @@ ERROR: mariadb-native-10.3.13-r0 do_populate_sysroot: sstate found an absolute p
 Upstream-Status: Inappropriate [oe build specific]
 
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
-
 ---
  support-files/CMakeLists.txt | 7 -------
  1 file changed, 7 deletions(-)
 
 diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
-index b5767432..56733de1 100644
+index ee1d420e..a99c0605 100644
 --- a/support-files/CMakeLists.txt
 +++ b/support-files/CMakeLists.txt
-@@ -165,12 +165,5 @@ IF(UNIX)
+@@ -245,12 +245,5 @@ IF(UNIX AND NOT WITHOUT_SERVER)
        INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR}
                COMPONENT IniFiles)
      ENDIF()
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch b/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch
index 3244ab8da2..3840472213 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch
@@ -1,14 +1,22 @@
-Use SYS_futex for syscall
+From 166811dfcfc61e7646275aa993d7d7f4b02d1f49 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 3 Apr 2021 12:40:14 -0700
+Subject: [PATCH] Use SYS_futex for syscall
 
 glibc defines SYS_futex and on newer 32bit CPUs like RISCV-32, arc there
 is no 32bit time_t therefore define SYS_futex in terms of SYS_futex_time64
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ storage/innobase/sync/srw_lock.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
+diff --git a/storage/innobase/sync/srw_lock.cc b/storage/innobase/sync/srw_lock.cc
+index 28b586de..3ee71142 100644
 --- a/storage/innobase/sync/srw_lock.cc
 +++ b/storage/innobase/sync/srw_lock.cc
-@@ -210,6 +210,12 @@ void ssux_lock_low::wake() { WakeByAddre
+@@ -226,6 +226,12 @@ void ssux_lock_impl<spinloop>::wake() noexcept { WakeByAddressSingle(&readers);
  #  ifdef __linux__
  #   include <linux/futex.h>
  #   include <sys/syscall.h>
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb b/meta-oe/recipes-dbs/mysql/mariadb_11.4.6.bb
index b1d1355e2b..b1d1355e2b 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb
+++ b/meta-oe/recipes-dbs/mysql/mariadb_11.4.6.bb
diff --git a/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch b/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch
deleted file mode 100644
index 173241ea5c..0000000000
--- a/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 45436592aa64308b2ab46f84c6107c6d7de0a3ec Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Wed, 6 Mar 2019 00:16:17 -0800
-Subject: [PATCH] _mysql.c: fix compilation with MariaDB 10.3.13
-
-Use standard API function MYSQL_OPT_RECONNECT
-instead of direct modification of internal structures
-which does not work for MariaDB.
-
-Upstream-Status: Pending
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- _mysql.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
---- a/_mysql.c
-+++ b/_mysql.c
-@@ -2002,7 +2002,14 @@ _mysql_ConnectionObject_ping(
-        int r, reconnect = -1;

-        if (!PyArg_ParseTuple(args, "|I", &reconnect)) return NULL;

-        check_connection(self);

--       if ( reconnect != -1 ) self->connection.reconnect = reconnect;

-+       if ( reconnect != -1 ) {

-+#if MYSQL_VERSION_ID >= 50013

-+               my_bool recon = reconnect;

-+               mysql_options(&self->connection, MYSQL_OPT_RECONNECT, &recon);

-+#else

-+               self->connection.reconnect = reconnect;

-+#endif

-+        }

-        Py_BEGIN_ALLOW_THREADS

-        r = mysql_ping(&(self->connection));

-        Py_END_ALLOW_THREADS

diff --git a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
deleted file mode 100644
index 15f6b6fb9a..0000000000
--- a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Python interface to MySQL"
-HOMEPAGE = "https://github.com/farcepest/MySQLdb1"
-SECTION = "devel/python"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-DEPENDS = "mysql5"
-
-SRCNAME = "MySQL-python"
-
-SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip \
-           file://0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch \
-"
-SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c"
-SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-SKIP_RECIPE[mysql-python] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}"
-
-inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)}
-
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch b/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch
new file mode 100644
index 0000000000..89a509087f
--- /dev/null
+++ b/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch
@@ -0,0 +1,26 @@
+From f0d8240dbf594e6dfab31fd7d70ce340ac365a65 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 3 Nov 2024 15:50:50 -0800
+Subject: [PATCH] tcl.m4: Recognize tclsh9
+
+Add missing support to recognize tclsh9 as supported
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ config/tcl.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/tcl.m4 b/config/tcl.m4
+index 9de31a5..568fd45 100644
+--- a/config/tcl.m4
++++ b/config/tcl.m4
+@@ -4,7 +4,7 @@
+ 
+ 
+ AC_DEFUN([PGAC_PATH_TCLSH],
+-[PGAC_PATH_PROGS(TCLSH, [tclsh tcl tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84])
++[PGAC_PATH_PROGS(TCLSH, [tclsh tcl tclsh9.0 tclsh90 tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84])
+ AC_ARG_VAR(TCLSH, [Tcl interpreter program (tclsh)])dnl
+ if test x"$TCLSH" = x""; then
+   AC_MSG_ERROR([Tcl shell not found])
diff --git a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch
index 9df4d073ff..4382741da9 100644
--- a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch
+++ b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch
@@ -1,7 +1,7 @@
-From 30b1b37d309f67ba6d58f2197bd917107bc7d56c Mon Sep 17 00:00:00 2001
+From 84febaf9330fe99802f75bcd0606ac7d86c35b25 Mon Sep 17 00:00:00 2001
 From: Yi Fan Yu <yifan.yu@windriver.com>
 Date: Fri, 5 Feb 2021 17:15:42 -0500
-Subject: [PATCH 3/5] configure.ac: bypass autoconf 2.69 version check
+Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check
 
 for upgrade to autoconf 2.71
 
@@ -13,20 +13,17 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
  1 file changed, 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 401ce30..27f382d 100644
+index 493d5cd..f0fa973 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
  
- AC_INIT([PostgreSQL], [16.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
+ AC_INIT([PostgreSQL], [17.5], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not
 -recommended.  You can remove the check from 'configure.ac' but it is then
 -your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2023, PostgreSQL Global Development Group])
+ AC_COPYRIGHT([Copyright (c) 1996-2024, PostgreSQL Global Development Group])
  AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
  AC_CONFIG_AUX_DIR(config)
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch b/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch
index ff0582ab80..d94f028036 100644
--- a/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch
+++ b/meta-oe/recipes-dbs/postgresql/files/0004-config_info.c-not-expose-build-info.patch
@@ -1,7 +1,7 @@
-From 5be3ffdf767c1efcbfd2d1be87aa83f2e37e348e Mon Sep 17 00:00:00 2001
+From 62733bdc9346651637d9e5ac7cbf8d7311ef5d97 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Mon, 1 Aug 2022 15:44:38 +0800
-Subject: [PATCH 4/5] config_info.c: not expose build info
+Subject: [PATCH] config_info.c: not expose build info
 
 Don't collect the build information to fix the buildpaths issue.
 
@@ -14,10 +14,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  2 files changed, 2 insertions(+), 70 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 27f382d..3dd6bb1 100644
+index f0fa973..8ccd8bc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2023, PostgreSQL Global Development Group])
+@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2024, PostgreSQL Global Development Group])
  AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
  AC_CONFIG_AUX_DIR(config)
  AC_PREFIX_DEFAULT(/usr/local/pgsql)
@@ -27,7 +27,7 @@ index 27f382d..3dd6bb1 100644
  [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`]
  [PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`]
 diff --git a/src/common/config_info.c b/src/common/config_info.c
-index 09e78a6..86e4230 100644
+index 89c1ccb..a2206de 100644
 --- a/src/common/config_info.c
 +++ b/src/common/config_info.c
 @@ -38,7 +38,7 @@ get_configdata(const char *my_exec_path, size_t *configdata_len)
@@ -114,6 +114,3 @@ index 09e78a6..86e4230 100644
         configdata[i].name = pstrdup("VERSION");
         configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION);
         i++;
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch b/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch
index af36da4927..8219fc80e9 100644
--- a/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch
+++ b/meta-oe/recipes-dbs/postgresql/files/0005-postgresql-fix-ptest-failure-of-sysviews.patch
@@ -1,7 +1,7 @@
-From 1a8b94140988d2ee5ff987b0bb3e7c3e936b8c01 Mon Sep 17 00:00:00 2001
+From d1fb37569b5a8c21968f69164e8bc6e4bb0185eb Mon Sep 17 00:00:00 2001
 From: Manoj Saun <manojsingh.saun@windriver.com>
 Date: Wed, 22 Mar 2023 08:07:26 +0000
-Subject: [PATCH 5/5] postgresql: fix ptest failure of sysviews
+Subject: [PATCH] postgresql: fix ptest failure of sysviews
 
 The patch "0001-config_info.c-not-expose-build-info.patch" hides the debug info
 in pg_config table which reduces the count of rows from pg_config and leads to
@@ -19,12 +19,12 @@ Signed-off-by: Manoj Saun <manojsingh.saun@windriver.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/test/regress/expected/sysviews.out b/src/test/regress/expected/sysviews.out
-index 001c6e7..8256898 100644
+index 2176a54..a84bc27 100644
 --- a/src/test/regress/expected/sysviews.out
 +++ b/src/test/regress/expected/sysviews.out
-@@ -29,7 +29,7 @@ select name, ident, parent, level, total_bytes >= free_bytes
- (1 row)
+@@ -52,7 +52,7 @@ from pg_backend_memory_contexts where name = 'Caller tuples';
  
+ rollback;
  -- At introduction, pg_config had 23 entries; it may grow
 -select count(*) > 20 as ok from pg_config;
 +select count(*) > 13 as ok from pg_config;
@@ -32,11 +32,11 @@ index 001c6e7..8256898 100644
  ----
   t
 diff --git a/src/test/regress/sql/sysviews.sql b/src/test/regress/sql/sysviews.sql
-index 351e469..84c113e 100644
+index b047fb5..d1e3999 100644
 --- a/src/test/regress/sql/sysviews.sql
 +++ b/src/test/regress/sql/sysviews.sql
-@@ -18,7 +18,7 @@ select name, ident, parent, level, total_bytes >= free_bytes
-   from pg_backend_memory_contexts where level = 0;
+@@ -33,7 +33,7 @@ from pg_backend_memory_contexts where name = 'Caller tuples';
+ rollback;
  
  -- At introduction, pg_config had 23 entries; it may grow
 -select count(*) > 20 as ok from pg_config;
@@ -45,5 +45,5 @@ index 351e469..84c113e 100644
  -- We expect no cursors in this test; see also portals.sql
  select count(*) = 0 as ok from pg_cursors;
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch
index 1f735f322b..a2f0500a8c 100644
--- a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch
+++ b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch
@@ -1,4 +1,4 @@
-From 56b830edecff1cac5f8a8a956e7a7eeef2aa7c17 Mon Sep 17 00:00:00 2001
+From 1a9416bae71aa935797add3fa11407732ad010c0 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Tue, 27 Nov 2018 13:25:15 +0800
 Subject: [PATCH] not check libperl under cross compiling
@@ -20,10 +20,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index fba79ee..7170f26 100644
+index f398184..493d5cd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2297,7 +2297,7 @@ Use --without-tcl to disable building PL/Tcl.])
+@@ -2336,7 +2336,7 @@ Use --without-tcl to disable building PL/Tcl.])
  fi
  
  # check for <perl.h>
@@ -32,6 +32,3 @@ index fba79ee..7170f26 100644
    ac_save_CPPFLAGS=$CPPFLAGS
    CPPFLAGS="$CPPFLAGS $perl_includespec"
    AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])],
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc
index 2dd7dd6fda..040b3d5e34 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql.inc
+++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc
@@ -19,7 +19,7 @@ DESCRIPTION = "\
 "
 HOMEPAGE = "http://www.postgresql.com"
 LICENSE = "0BSD"
-DEPENDS = "libnsl2 readline tzcode-native"
+DEPENDS = "libnsl2 tzcode-native perl bison-native"
 
 ARM_INSTRUCTION_SET = "arm"
 
@@ -37,9 +37,9 @@ LEAD_SONAME = "libpq.so"
 export LDFLAGS_SL = "${LDFLAGS}"
 export LDFLAGS_EX_BE = "-Wl,--export-dynamic"
 
-inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext cpan-base multilib_header
+inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext perl-version multilib_header
 
-CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6"
+CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR}"
 
 SYSTEMD_SERVICE:${PN} = "postgresql.service"
 SYSTEMD_AUTO_ENABLE:${PN} = "disable"
@@ -55,7 +55,7 @@ pkg_postinst:${PN} () {
 
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \
-    openssl python uuid libxml tcl perl zlib icu \
+    openssl python uuid libxml perl zlib icu readline \
 "
 PACKAGECONFIG[tcl] = "--with-tcl --with-tclconfig=${STAGING_BINDIR_CROSS},--without-tcl,tcl tcl-native,"
 PACKAGECONFIG[perl] = "--with-perl,--without-perl,perl,perl"
@@ -71,8 +71,9 @@ PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
 PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4"
 PACKAGECONFIG[openssl] = "--with-ssl=openssl,ac_cv_file__dev_urandom=yes,openssl"
 PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu,icu"
+PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
 
-EXTRA_OECONF += "--enable-thread-safety --disable-rpath \
+EXTRA_OECONF += "--disable-rpath \
     --datadir=${datadir}/${BPN} \
     --sysconfdir=${sysconfdir}/${BPN} \
 "
@@ -122,10 +123,18 @@ python populate_packages:prepend() {
 
 }
 
+# Same as the function in cpan-base.bbclass (but without the perl RDEPENDS)
+def is_target(d):
+    if not bb.data.inherits_class('native', d):
+        return "yes"
+    return "no"
+
 # This will make native perl use target settings (for include dirs etc.)
 export PERLCONFIGTARGET = "${@is_target(d)}"
 export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}"
 
+EXTRA_AUTORECONF += "-I config"
+
 do_configure() {
     # do_configure
     autotools_do_configure
@@ -168,6 +177,11 @@ do_configure() {
 
 do_compile:append() {
     oe_runmake -C contrib all
+
+    for f in `find ${B} -name "*.[c|h]"`;
+    do
+        sed -i -e 's,${B}/../,,' $f
+    done
 }
 
 # server needs to configure user and group
@@ -235,7 +249,7 @@ postgresql_fix_sources () {
         for f in ${PKGD}${TARGET_DBGSRC_DIR}/src/pl/plperl/Util.c \
                         ${PKGD}${TARGET_DBGSRC_DIR}/src/pl/plperl/SPI.c; do
                 if [ -e $f ]; then
-                        sed -i -e 's#${B}/../${P}#${TARGET_DBGSRC_DIR}#g' $f
+                        sed -i -e 's#${B}/../${BP}#${TARGET_DBGSRC_DIR}#g' $f
                 fi
         done
 }
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb b/meta-oe/recipes-dbs/postgresql/postgresql_17.5.bb
index 6df719cd98..b7fce886f8 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb
+++ b/meta-oe/recipes-dbs/postgresql/postgresql_17.5.bb
@@ -1,6 +1,6 @@
 require postgresql.inc
 
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=89afbb2d7716371015101c2b2cb4297a"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d5dd73e90ee1a572679460ee67233fcc"
 
 SRC_URI += "\
    file://not-check-libperl.patch \
@@ -9,8 +9,9 @@ SRC_URI += "\
    file://0003-configure.ac-bypass-autoconf-2.69-version-check.patch \
    file://0004-config_info.c-not-expose-build-info.patch \
    file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \
+   file://0001-tcl.m4-Recognize-tclsh9.patch \
 "
 
-SRC_URI[sha256sum] = "331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585"
+SRC_URI[sha256sum] = "fcb7ab38e23b264d1902cb25e6adafb4525a6ebcbd015434aeef9eda80f528d8"
 
 CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it."
diff --git a/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch b/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch
new file mode 100644
index 0000000000..9cc5ad9b86
--- /dev/null
+++ b/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch
@@ -0,0 +1,45 @@
+From 5bfa9f1cd0523a0cad70cacf5ecf8c1aeb06c4d0 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Tue, 22 Apr 2025 17:47:02 +0000
+Subject: [PATCH] configure: make sure to call AC_CHECK_HEADER_STDBOOL
+
+before using ac_cv_sizeof_bool
+
+It was called after this conditional, so PG_USE_STDBOOL wasn't set
+even when it should be as shown in at the end of config.log:
+
+  ac_cv_header_stdbool_h=yes
+  ac_cv_sizeof_bool=1
+  ac_cv_type__Bool=yes
+  #define SIZEOF_BOOL 1
+  #define HAVE__BOOL 1
+  #define HAVE_STDBOOL_H 1
+
+* fixes:
+  https://github.com/postgresql-interfaces/psqlodbc/issues/110
+  https://github.com/postgresql-interfaces/psqlodbc/issues/94
+
+Upstream-Status: Submitted [https://github.com/postgresql-interfaces/psqlodbc/pull/112]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f35c825..ea363ca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,9 +28,11 @@ AC_CHECK_SIZEOF([bool], [],
+ #include <stdbool.h>
+ #endif])
+ 
++AC_CHECK_HEADER_STDBOOL()
++
+ dnl We use <stdbool.h> if we have it and it declares type bool as having
+ dnl size 1.  Otherwise, c.h will fall back to declaring bool as unsigned char.
+-if test "$ac_cv_header_stdbool_h" = yes -a "$ac_cv_sizeof_bool" = 1; then
++if test "$ac_cv_header_stdbool_h" = yes && test "$ac_cv_sizeof_bool" = 1; then
+   AC_DEFINE([PG_USE_STDBOOL], 1,
+             [Define to 1 to use <stdbool.h> to define type bool.])
+ fi
diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
index a1ef8e75e9..dfd7f6a1e6 100644
--- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
+++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
@@ -19,10 +19,11 @@ HOMEPAGE = "https://odbc.postgresql.org/"
 LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692"
 
-SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \
+SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions.old/src/${BPN}-${PV}.tar.gz \
     file://psqlodbc-remove-some-checks-for-cross-compiling.patch \
     file://psqlodbc-donot-use-the-hardcode-libdir.patch \
     file://psqlodbc-fix-for-ptest-support.patch \
+    file://0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch \
     file://run-ptest \
 "
 
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch
new file mode 100644
index 0000000000..b0a949fe31
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch
@@ -0,0 +1,42 @@
+From 9abf6cd09c60f0be9a85c055dfdf43698f057f73 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Wed, 25 Sep 2024 13:47:37 +0800
+Subject: [PATCH] CMakeLists.txt: Make the test discovery occur on target
+
+Set DISCOVERY_MODE to PRE_TEST to delay test discovery until just
+prior to test execution on the target to fix the build failure as
+the default POST_BUILD behavior is not desirable in cross-compiling
+env.
+
+/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build/env_basic_test: error while loading shared libraries: libgflags.so.2.2: cannot open shared object file: No such file or directory
+CMake Error at /build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/recipe-sysroot-native/usr/share/cmake-3.30/Modules/GoogleTestAddTests.cmake:112 (message):
+  Error running test executable.
+
+    Path: '/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build/env_basic_test'
+    Working directory: '/build/tmp/work/core2-64-wrs-linux/rocksdb/9.0.0/build'
+    Result: 127
+    Output:
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 403ad1243..f34397798 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1502,7 +1502,7 @@ if(WITH_TESTS)
+       )
+       target_link_libraries(${exename}${ARTIFACT_SUFFIX} testutillib${ARTIFACT_SUFFIX} testharness gtest ${THIRDPARTY_LIBS} ${ROCKSDB_LIB})
+       if(NOT "${exename}" MATCHES "db_sanity_test")
+-        gtest_discover_tests(${exename} DISCOVERY_TIMEOUT 120)
++        gtest_discover_tests(${exename} DISCOVERY_TIMEOUT 120 DISCOVERY_MODE PRE_TEST)
+         add_dependencies(rocksdb_check ${exename}${ARTIFACT_SUFFIX})
+       endif()
+   endforeach(sourcefile ${TESTS})
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch
new file mode 100644
index 0000000000..168bd76ac7
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch
@@ -0,0 +1,65 @@
+From 90eba5458cb4ac2f83cac8aa550927876e6a9a09 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= <lnicola@dend.ro>
+Date: Wed, 5 Mar 2025 15:42:46 +0200
+Subject: [PATCH] Add missing include (#13365)
+
+* see more details: http://errors.yoctoproject.org/Errors/Details/851177/
+In file included from TOPDIR/tmp/work/core2-64-oe-linux/rocksdb/9.10.0/git/db/blob/blob_file_meta.cc:6:
+TOPDIR/tmp/work/core2-64-oe-linux/rocksdb/9.10.0/git/db/blob/blob_file_meta.h:28:7: error: 'uint64_t' has not been declared
+   28 |       uint64_t blob_file_number, uint64_t total_blob_count,
+      |       ^~~~~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/rocksdb/9.10.0/git/db/blob/blob_file_meta.h:15:1: note: 'uint64_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
+   14 | #include "rocksdb/rocksdb_namespace.h"
+  +++ |+#include <cstdint>
+   15 |
+TOPDIR/tmp/work/core2-64-oe-linux/rocksdb/9.10.0/git/db/blob/blob_file_meta.h:28:34: error: 'uint64_t' has not been declared
+   28 |       uint64_t blob_file_number, uint64_t total_blob_count,
+      |                                  ^~~~~~~~
+...
+
+* See also: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/13437]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ db/blob/blob_file_meta.h           | 1 +
+ include/rocksdb/trace_record.h     | 1 +
+ include/rocksdb/write_batch_base.h | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/db/blob/blob_file_meta.h b/db/blob/blob_file_meta.h
+index d7c8a1243..2e47726f8 100644
+--- a/db/blob/blob_file_meta.h
++++ b/db/blob/blob_file_meta.h
+@@ -6,6 +6,7 @@
+ #pragma once
+ 
+ #include <cassert>
++#include <cstdint>
+ #include <iosfwd>
+ #include <memory>
+ #include <string>
+diff --git a/include/rocksdb/trace_record.h b/include/rocksdb/trace_record.h
+index 8f9c3ee2f..d321f5387 100644
+--- a/include/rocksdb/trace_record.h
++++ b/include/rocksdb/trace_record.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ #include <vector>
+diff --git a/include/rocksdb/write_batch_base.h b/include/rocksdb/write_batch_base.h
+index 3334a1292..43b186029 100644
+--- a/include/rocksdb/write_batch_base.h
++++ b/include/rocksdb/write_batch_base.h
+@@ -9,6 +9,7 @@
+ #pragma once
+ 
+ #include <cstddef>
++#include <cstdint>
+ 
+ #include "rocksdb/attribute_groups.h"
+ #include "rocksdb/rocksdb_namespace.h"
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch
new file mode 100644
index 0000000000..a872be5b54
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch
@@ -0,0 +1,41 @@
+From 31012cdfa435d9203da3c3de8127b66bf018692a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 24 Jan 2023 21:40:43 -0800
+Subject: [PATCH] checkpoint.h: Add missing includes <cstdint>
+
+It uses uint64_t and it comes from <cstdint>
+This is needed with GCC 13 and newer [1]
+
+[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+* build error:
+FAILED: CMakeFiles/checkpoint_test.dir/utilities/checkpoint/checkpoint_test.cc.o 
+In file included from rocksdb/9.10.0/git/utilities/checkpoint/checkpoint_test.cc:11:
+rocksdb/9.10.0/git/include/rocksdb/utilities/checkpoint.h:49:35: error: 'uint64_t' has not been declared
+   49 |                                   uint64_t log_size_for_flush = 0,
+      |                                   ^~~~~~~~
+rocksdb/9.10.0/git/include/rocksdb/utilities/checkpoint.h:14:1: note: 'uint64_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
+   13 | #include "rocksdb/status.h"
+  +++ |+#include <cstdint>
+   14 | 
+
+Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/11137]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ include/rocksdb/utilities/checkpoint.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: git/include/rocksdb/utilities/checkpoint.h
+===================================================================
+--- git.orig/include/rocksdb/utilities/checkpoint.h
++++ git/include/rocksdb/utilities/checkpoint.h
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
diff --git a/meta-oe/recipes-dbs/rocksdb/files/run-ptest b/meta-oe/recipes-dbs/rocksdb/files/run-ptest
new file mode 100644
index 0000000000..45406fdfa1
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/run-ptest
@@ -0,0 +1,12 @@
+#!/bin/sh
+ptestdir=$(dirname "$(readlink -f "$0")")
+cd "$ptestdir"/tests || exit
+
+for test in *_test; do
+    if ./${test} >/dev/null 2>&1; then
+        echo "PASS: ${test}"
+    else
+        echo "FAIL: ${test}"
+    fi
+done
+
diff --git a/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch b/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch
new file mode 100644
index 0000000000..9a85e8db45
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch
@@ -0,0 +1,71 @@
+From 285d306494bde3e9c24c8cd6fea1eb380a304d03 Mon Sep 17 00:00:00 2001
+From: Bindu-Bhabu <bindudaniel1996@gmail.com>
+Date: Fri, 26 Jul 2024 15:14:45 +0530
+Subject: Add option to CMake for building static libraries
+
+ROCKSDB creates a STATIC library target reference by default.
+Modify the cmake so that the STATIC library is also an option
+just like creating a SHARED library and set default to ON.
+
+Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/12890]
+
+Signed-off-by: Nisha Parrakat <nisha.m.parrakat@bmw.de>
+Signed-off-by: Bindu Bhabu <bhabu.bindu@kpit.com>
+---
+ CMakeLists.txt | 29 +++++++++++++++++------------
+ 1 file changed, 17 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 93b884dd9c1..2ca925d505c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -98,6 +98,7 @@ if (WITH_WINDOWS_UTF8_FILENAMES)
+   add_definitions(-DROCKSDB_WINDOWS_UTF8_FILENAMES)
+ endif()
+ option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)
++option(ROCKSDB_BUILD_STATIC "Build static versions of the RocksDB libraries" ON)
+
+ if( NOT DEFINED CMAKE_CXX_STANDARD )
+   set(CMAKE_CXX_STANDARD 17)
+@@ -1139,11 +1140,13 @@ string(REGEX REPLACE "[^0-9: /-]+" "" GIT_DATE "${GIT_DATE}")
+ set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc)
+ configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY)
+
+-add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC})
+-target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC
+-  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
+-target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
+-  ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++if(ROCKSDB_BUILD_STATIC)
++  add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC})
++  target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC
++    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
++  target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
++    ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++endif()
+
+ if(ROCKSDB_BUILD_SHARED)
+   add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES} ${BUILD_VERSION_CC})
+@@ -1238,13 +1241,15 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
+
+   install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
+
+-  install(
+-    TARGETS ${ROCKSDB_STATIC_LIB}
+-    EXPORT RocksDBTargets
+-    COMPONENT devel
+-    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-    INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+-  )
++  if(ROCKSDB_BUILD_STATIC)
++    install(
++      TARGETS ${ROCKSDB_STATIC_LIB}
++      EXPORT RocksDBTargets
++      COMPONENT devel
++      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++      INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
++    )
++  endif()
+
+   if(ROCKSDB_BUILD_SHARED)
+     install(
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb
index 444351dbb4..5bbb010f8b 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \
                     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
 
-SRCREV = "f4441966592636253fd5ab0bb9ed44fc2697fc53"
-SRCBRANCH = "9.0.fb"
+SRCREV = "ae8fb3e5000e46d8d4c9dbf3a36019c0aaceebff"
+SRCBRANCH = "9.10.fb"
 
 SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \
            file://0001-cmake-Add-check-for-atomic-support.patch \
@@ -17,6 +17,11 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt
            file://0005-Implement-timer-implementation-for-mips-platform.patch \
            file://0006-Implement-timer-for-arm-v6.patch \
            file://0007-Fix-declaration-scope-of-LE_LOAD32-in-crc32c.patch \
+           file://static_library_as_option.patch \
+           file://0001-CMakeLists.txt-Make-the-test-discovery-occur-on-targ.patch \
+           file://run-ptest \
+           file://0001-Fix-build-error-with-gcc-13-by-adding-cstdint-header.patch \
+           file://0001-checkpoint.h-Add-missing-includes-cstdint.patch \
           "
 
 SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch"
@@ -24,9 +29,8 @@ SRC_URI:append:mips = " file://0001-replace-old-sync-with-new-atomic-builtin-equ
 SRC_URI:append:powerpc = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch"
 SRC_URI:remove:toolchain-clang:riscv32 = "file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch"
 
-S = "${WORKDIR}/git"
 
-inherit cmake
+inherit cmake ptest
 
 PACKAGECONFIG ??= "bzip2 zlib lz4 gflags"
 PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON,-DWITH_BZ2=OFF,bzip2"
@@ -39,10 +43,11 @@ PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags"
 # Tools and tests currently don't compile on armv5 so we disable them
 EXTRA_OECMAKE = "\
     -DPORTABLE=ON \
-    -DWITH_TESTS=OFF \
+    -DWITH_TESTS=${@bb.utils.contains("DISTRO_FEATURES", "ptest", "ON", "OFF", d)} \
     -DWITH_BENCHMARK_TOOLS=OFF \
     -DWITH_TOOLS=OFF \
     -DFAIL_ON_WARNINGS=OFF \
+    -DROCKSDB_BUILD_STATIC=OFF \
 "
 
 CXXFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}"
@@ -52,6 +57,21 @@ do_install:append() {
     sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/rocksdb/RocksDBTargets.cmake
 }
 
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    # only cover the basic test as all the tests need to take about 6 hours
+    # time ./run-ptest
+    # real    356m32.956s
+    # user    252m32.004s
+    # sys 178m50.246s
+    install -m 0755 ${B}/env_basic_test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/db_basic_test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/agg_merge_test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/testutil_test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/cache_test ${D}${PTEST_PATH}/tests/
+}
+
 # Need toku_time_now() implemented for ppc/musl
 # see utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
 COMPATIBLE_HOST:libc-musl:powerpc = "null"
+COMPATIBLE_HOST:armv5 = 'null'
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch
index 5242b29e06..6fecf25603 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch
@@ -1,7 +1,7 @@
-From 738549dea7a4e6c462a79962c414eaa450c2cffd Mon Sep 17 00:00:00 2001
+From 11faa06436fdeb0c9948080a11f9a99d3b5ba16c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 9 Apr 2020 13:06:27 -0700
-Subject: [PATCH 1/3] absl: always use <asm/sgidefs.h>
+Subject: [PATCH] absl: always use <asm/sgidefs.h>
 
 Fixes mips/musl build, since sgidefs.h is not present on all C libraries
 but on linux asm/sgidefs.h is there and contains same definitions, using
@@ -10,13 +10,12 @@ that makes it portable.
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
 ---
  absl/base/internal/direct_mmap.h | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h
-index e492bb0..c8a4fba 100644
+index 1beb2ee4..140b0697 100644
 --- a/absl/base/internal/direct_mmap.h
 +++ b/absl/base/internal/direct_mmap.h
 @@ -41,13 +41,9 @@
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch
deleted file mode 100644
index b92a487523..0000000000
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d25cf3b9aa873595a19e197cc29ab46c0093bff1 Mon Sep 17 00:00:00 2001
-From: Sinan Kaya <sinan.kaya@microsoft.com>
-Date: Mon, 3 Feb 2020 03:25:57 +0000
-Subject: [PATCH 2/3] Remove maes option from cross-compilation
-
----
-Upstream-Status: Pending
-
- absl/copts/GENERATED_AbseilCopts.cmake | 4 ----
- absl/copts/GENERATED_copts.bzl         | 4 ----
- 2 files changed, 8 deletions(-)
-
-diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake
-index a4ab1aa2041e..23b9253c1f00 100644
---- a/absl/copts/GENERATED_AbseilCopts.cmake
-+++ b/absl/copts/GENERATED_AbseilCopts.cmake
-@@ -158,7 +158,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS
- list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS
- )
- 
--list(APPEND ABSL_RANDOM_HWAES_X64_FLAGS
--    "-maes"
--    "-msse4.1"
--)
-diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl
-index a6efc98e11d4..1e847f769501 100644
---- a/absl/copts/GENERATED_copts.bzl
-+++ b/absl/copts/GENERATED_copts.bzl
-@@ -159,7 +159,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [
- ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [
- ]
- 
--ABSL_RANDOM_HWAES_X64_FLAGS = [
--    "-maes",
--    "-msse4.1",
--]
--- 
-2.36.1
-
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-abseil-ppc-fixes.patch
index f2ebd9f08c..a0b99dd206 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-abseil-ppc-fixes.patch
@@ -1,4 +1,7 @@
-Upstream-Status: Pending
+From 5891332fecd3bf707b58dda56b4b3f80583b5ef9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 21 Sep 2024 20:53:06 +0800
+Subject: [PATCH] abseil: ppc fixes
 
 An all-in-one patch that fixes several issues:
 
@@ -9,14 +12,24 @@ An all-in-one patch that fixes several issues:
 
 Sourced from void linux
 
+Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ absl/base/internal/unscaledcycleclock.cc       | 4 ++--
+ absl/base/internal/unscaledcycleclock_config.h | 3 ++-
+ absl/debugging/internal/examine_stack.cc       | 8 +++++++-
+ absl/debugging/internal/stacktrace_config.h    | 2 +-
+ 4 files changed, 12 insertions(+), 5 deletions(-)
 
+diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc
+index 68f92730..5dbfaab6 100644
 --- a/absl/base/internal/unscaledcycleclock.cc
 +++ b/absl/base/internal/unscaledcycleclock.cc
 @@ -20,7 +20,7 @@
  #include <intrin.h>
  #endif
-
+ 
 -#if defined(__powerpc__) || defined(__ppc__)
 +#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
  #ifdef __GLIBC__
@@ -25,30 +38,34 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 @@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() {
    return base_internal::NominalCPUFrequency();
  }
-
+ 
 -#elif defined(__powerpc__) || defined(__ppc__)
 +#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
-
+ 
  int64_t UnscaledCycleClock::Now() {
  #ifdef __GLIBC__
+diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h
+index 43a3dabe..196a8535 100644
 --- a/absl/base/internal/unscaledcycleclock_config.h
 +++ b/absl/base/internal/unscaledcycleclock_config.h
 @@ -21,7 +21,8 @@
-
+ 
  // The following platforms have an implementation of a hardware counter.
  #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
+-    defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) ||     \
 +    ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-+    defined(__riscv) ||     \
-     defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
++    defined(_M_IX86) ||     \
+     (defined(_M_X64) && !defined(_M_ARM64EC))
  #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
  #else
+diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc
+index 3dd6ba1a..f923b055 100644
 --- a/absl/debugging/internal/examine_stack.cc
 +++ b/absl/debugging/internal/examine_stack.cc
-@@ -33,6 +33,10 @@
+@@ -36,6 +36,10 @@
  #include <csignal>
  #include <cstdio>
-
+ 
 +#if defined(__powerpc__)
 +#include <asm/ptrace.h>
 +#endif
@@ -56,7 +73,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  #include "absl/base/attributes.h"
  #include "absl/base/internal/raw_logging.h"
  #include "absl/base/macros.h"
-@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) {
+@@ -177,8 +181,10 @@ void* GetProgramCounter(void* const vuc) {
      return reinterpret_cast<void*>(context->uc_mcontext.pc);
  #elif defined(__powerpc64__)
      return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
@@ -68,9 +85,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  #elif defined(__riscv)
      return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
  #elif defined(__s390__) && !defined(__s390x__)
+diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h
+index 88949fe9..4e26a6b7 100644
 --- a/absl/debugging/internal/stacktrace_config.h
 +++ b/absl/debugging/internal/stacktrace_config.h
-@@ -60,7 +60,7 @@
+@@ -67,7 +67,7 @@
  #elif defined(__i386__) || defined(__x86_64__)
  #define ABSL_STACKTRACE_INL_HEADER \
    "absl/debugging/internal/stacktrace_x86-inl.inc"
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch
deleted file mode 100644
index 1a80a428b7..0000000000
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From fb24c3e3539b5743d398a429a302a3886186f261 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@bisdn.de>
-Date: Thu, 16 Jun 2022 11:46:31 +0000
-Subject: [PATCH 3/3] Remove neon option from cross compilation
-
-Not every arm platform supports neon instructions, so do not enforce
-them.
-
-Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
----
-Upstream-Status: Pending
-
- absl/copts/GENERATED_AbseilCopts.cmake | 4 ----
- absl/copts/GENERATED_copts.bzl         | 4 ----
- 2 files changed, 8 deletions(-)
-
-diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake
-index 23b9253c1f00..5d112a97f3e4 100644
---- a/absl/copts/GENERATED_AbseilCopts.cmake
-+++ b/absl/copts/GENERATED_AbseilCopts.cmake
-@@ -147,10 +147,6 @@ list(APPEND ABSL_MSVC_TEST_FLAGS
-     "/DNOMINMAX"
- )
- 
--list(APPEND ABSL_RANDOM_HWAES_ARM32_FLAGS
--    "-mfpu=neon"
--)
--
- list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS
-     "-march=armv8-a+crypto"
- )
-diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl
-index 1e847f769501..3e10db204faf 100644
---- a/absl/copts/GENERATED_copts.bzl
-+++ b/absl/copts/GENERATED_copts.bzl
-@@ -148,10 +148,6 @@ ABSL_MSVC_TEST_FLAGS = [
-     "/DNOMINMAX",
- ]
- 
--ABSL_RANDOM_HWAES_ARM32_FLAGS = [
--    "-mfpu=neon",
--]
--
- ABSL_RANDOM_HWAES_ARM64_FLAGS = [
-     "-march=armv8-a+crypto",
- ]
--- 
-2.36.1
-
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch
deleted file mode 100644
index 461df7a608..0000000000
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001
-From: aurel32 <aurelien@aurel32.net>
-Date: Fri, 22 Mar 2024 14:21:13 -0700
-Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support
-
-Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644
-
-Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear.
-
-The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2].
-
-Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units.
-
-This fixes the testsuite on riscv64, tested on a VisionFive 2 board.
-
-[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3
-[2] https://github.com/abseil/abseil-cpp/pull/1631
-Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1
-
-Merging this change closes #1644
-
-COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71
-PiperOrigin-RevId: 618286262
-Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652
-
-Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/7335a36d]
-[Adapted to apply on top of meta-oe's patch stack]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
----
- absl/base/internal/unscaledcycleclock.cc       | 12 ------------
- absl/base/internal/unscaledcycleclock_config.h |  5 ++---
- 2 files changed, 2 insertions(+), 15 deletions(-)
-
-diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc
-index f11fecb3..103b4f6a 100644
---- a/absl/base/internal/unscaledcycleclock.cc
-+++ b/absl/base/internal/unscaledcycleclock.cc
-@@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() {
-   return aarch64_timer_frequency;
- }
- 
--#elif defined(__riscv)
--
--int64_t UnscaledCycleClock::Now() {
--  int64_t virtual_timer_value;
--  asm volatile("rdcycle %0" : "=r"(virtual_timer_value));
--  return virtual_timer_value;
--}
--
--double UnscaledCycleClock::Frequency() {
--  return base_internal::NominalCPUFrequency();
--}
--
- #elif defined(_M_IX86) || defined(_M_X64)
- 
- #pragma intrinsic(__rdtsc)
-diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h
-index 5e232c1a..83552fc5 100644
---- a/absl/base/internal/unscaledcycleclock_config.h
-+++ b/absl/base/internal/unscaledcycleclock_config.h
-@@ -22,7 +22,6 @@
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
-     ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
--    defined(__riscv) ||     \
-     defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
-@@ -54,8 +53,8 @@
- #if ABSL_USE_UNSCALED_CYCLECLOCK
- // This macro can be used to test if UnscaledCycleClock::Frequency()
- // is NominalCPUFrequency() on a particular platform.
--#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \
--     defined(_M_IX86) || defined(_M_X64))
-+#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \
-+     defined(_M_X64))
- #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY
- #endif
- #endif
--- 
-2.44.0
-
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb
index 87ab239311..4afbba963a 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb
@@ -7,17 +7,13 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915"
 
-SRCREV = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a"
-BRANCH = "lts_2024_01_16"
+SRCREV = "76bb24329e8bf5f39704eb10d21b9a80befa7c81"
+BRANCH = "lts_2025_05_12"
 SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \
-           file://0001-absl-always-use-asm-sgidefs.h.patch             \
-           file://0002-Remove-maes-option-from-cross-compilation.patch \
-           file://abseil-ppc-fixes.patch \
-           file://0003-Remove-neon-option-from-cross-compilation.patch \
-           file://0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch \
-          "
+           file://0001-absl-always-use-asm-sgidefs.h.patch \
+           file://0002-abseil-ppc-fixes.patch \
+           "
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
@@ -28,7 +24,7 @@ EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \
 
 SYSROOT_DIRS:append:class-nativesdk:mingw32 = " ${bindir}"
 
-PACKAGES_DYNAMIC = "^libabsl-*"
+PACKAGES_DYNAMIC += "^libabsl-*"
 PACKAGES_DYNAMIC:class-native = ""
 
 PACKAGESPLITFUNCS =+ "split_dynamic_packages"
diff --git a/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb b/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb
index 87c09f5118..e027b8d4aa 100644
--- a/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb
+++ b/meta-oe/recipes-devtools/aer-inject/aer-inject_1.0.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.gi
 "
 SRCREV = "9bd5e2c7886fca72f139cd8402488a2235957d41"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "bison-native"
 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
index a91229f908..342e7fd1a5 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
@@ -3,8 +3,7 @@ SECTION = "console/utils"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 SRC_URI = " \
     file://android-gadget-setup \
@@ -36,3 +35,4 @@ FILES:${PN} += " \
 
 PROVIDES += "android-tools-conf"
 RPROVIDES:${PN} = "android-tools-conf"
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
index abf21803e5..764d6b404f 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "file://android-gadget-setup"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
index ddf8d7f74e..b6661f2e39 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Android Debug Bridge
-ConditionPathExists=/var/usb-debugging-enabled
+ConditionPathExists=/etc/usb-debugging-enabled
 Before=android-system.service
 
 [Service]
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch
new file mode 100644
index 0000000000..b77c0ebc13
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch
@@ -0,0 +1,69 @@
+From c9f8cb184a7218c97ff966db44da6dd814c0e273 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Fri, 21 Mar 2025 09:49:32 +0000
+Subject: [PATCH] ext4_utils: drop unused parameter from allocate_inode()
+
+* fixes build with gcc-15:
+  http://errors.yoctoproject.org/Errors/Details/848455/
+
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c: In function 'make_directory':
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:115:29: error: too many arguments to function 'allocate_inode'; expected 0, have 1
+  115 |                 inode_num = allocate_inode(info);
+      |                             ^~~~~~~~~~~~~~ ~~~~
+In file included from TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:32:
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/allocate.h:61:5: note: declared here
+   61 | u32 allocate_inode();
+      |     ^~~~~~~~~~~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c: In function 'make_file':
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:183:21: error: too many arguments to function 'allocate_inode'; expected 0, have 1
+  183 |         inode_num = allocate_inode(info);
+      |                     ^~~~~~~~~~~~~~ ~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/allocate.h:61:5: note: declared here
+   61 | u32 allocate_inode();
+      |     ^~~~~~~~~~~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c: In function 'make_link':
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:218:21: error: too many arguments to function 'allocate_inode'; expected 0, have 1
+  218 |         inode_num = allocate_inode(info);
+      |                     ^~~~~~~~~~~~~~ ~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/allocate.h:61:5: note: declared here
+   61 | u32 allocate_inode();
+      |     ^~~~~~~~~~~~~~
+make: *** [<builtin>: contents.o] Error 1
+
+Upstream-Status: Pending [this whole code was removed in newer version android-9.0.0_r1 https://android.googlesource.com/platform/system/extras/+/7a837fcd6e9c0e0219f743052c78cc1c5988dfaf]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ ext4_utils/contents.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ext4_utils/contents.c b/ext4_utils/contents.c
+index 3144de93f..ac1b71706 100644
+--- a/ext4_utils/contents.c
++++ b/ext4_utils/contents.c
+@@ -112,7 +112,7 @@ u32 make_directory(u32 dir_inode_num, u32 entries, struct dentry *dentries,
+        len = blocks * info.block_size;
+ 
+        if (dir_inode_num) {
+-               inode_num = allocate_inode(info);
++               inode_num = allocate_inode();
+        } else {
+                dir_inode_num = EXT4_ROOT_INO;
+                inode_num = EXT4_ROOT_INO;
+@@ -180,7 +180,7 @@ u32 make_file(const char *filename, u64 len)
+        struct ext4_inode *inode;
+        u32 inode_num;
+ 
+-       inode_num = allocate_inode(info);
++       inode_num = allocate_inode();
+        if (inode_num == EXT4_ALLOCATE_FAILED) {
+                error("failed to allocate inode\n");
+                return EXT4_ALLOCATE_FAILED;
+@@ -215,7 +215,7 @@ u32 make_link(const char *link)
+        u32 inode_num;
+        u32 len = strlen(link);
+ 
+-       inode_num = allocate_inode(info);
++       inode_num = allocate_inode();
+        if (inode_num == EXT4_ALLOCATE_FAILED) {
+                error("failed to allocate inode\n");
+                return EXT4_ALLOCATE_FAILED;
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index 6343256d39..c04a1ef8c4 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -21,11 +21,11 @@ SRCREV_build = "16e987def3d7d8f7d30805eb95cef69e52a87dbc"
 
 SRCREV_FORMAT = "core_extras_libhardware_libselinux_build"
 SRC_URI = " \
-    git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=git/system/core \
-    git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras \
-    git://${ANDROID_MIRROR}/platform/hardware/libhardware;name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware \
-    git://${ANDROID_MIRROR}/platform/external/libselinux;name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux \
-    git://${ANDROID_MIRROR}/platform/build;name=build;protocol=https;nobranch=1;destsuffix=git/build \
+    git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/system/core \
+    git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/system/extras \
+    git://${ANDROID_MIRROR}/platform/hardware/libhardware;name=libhardware;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/hardware/libhardware \
+    git://${ANDROID_MIRROR}/platform/external/libselinux;name=libselinux;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/libselinux \
+    git://${ANDROID_MIRROR}/platform/build;name=build;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/build \
     file://core/0001-adb-remove-selinux-extensions.patch;patchdir=system/core \
     file://core/0002-adb-Use-local-sockets-where-appropriate.patch;patchdir=system/core \
     file://core/0003-adb-define-shell-command.patch;patchdir=system/core \
@@ -48,6 +48,7 @@ SRC_URI = " \
     file://core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch;patchdir=system/core \
     file://extras/0001-ext4_utils-remove-selinux-extensions.patch;patchdir=system/extras \
     file://extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch;patchdir=system/extras \
+    file://extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch;patchdir=system/extras \
     file://libselinux/0001-Remove-bionic-specific-calls.patch;patchdir=external/libselinux \
     file://libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch;patchdir=external/libselinux \
     file://android-tools-adbd.service \
@@ -61,7 +62,6 @@ SRC_URI = " \
 "
 
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/${BPN}"
 
 # http://errors.yoctoproject.org/Errors/Details/133881/
@@ -187,9 +187,3 @@ FILES:${PN}-fstools = "\
 "
 
 BBCLASSEXTEND = "native"
-
-android_tools_enable_devmode() {
-    touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled
-}
-
-ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}"
diff --git a/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch b/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch
new file mode 100644
index 0000000000..9ce6693061
--- /dev/null
+++ b/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch
@@ -0,0 +1,42 @@
+From 952bad1469ea747012bdc48c48993bd5f13eec04 Mon Sep 17 00:00:00 2001
+From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+Date: Fri, 21 Mar 2025 05:02:23 +0000
+Subject: [PATCH] Explicit header: stdint
+
+Fix building with GCC-15. It no longer includes it by default.
+
+Upstream-Status: Backport [https://github.com/apitrace/apitrace/commit/952bad1469ea747012bdc48c48993bd5f13eec04]
+
+Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+---
+ frametrim/ft_dependecyobject.hpp | 1 +
+ retrace/metric_writer.cpp        | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/frametrim/ft_dependecyobject.hpp b/frametrim/ft_dependecyobject.hpp
+index 2cd0b768..0f17b601 100644
+--- a/frametrim/ft_dependecyobject.hpp
++++ b/frametrim/ft_dependecyobject.hpp
+@@ -28,6 +28,7 @@
+ #pragma once
+ 
+ #include "ft_tracecall.hpp"
++#include <stdint.h>
+ 
+ namespace frametrim {
+ 
+diff --git a/retrace/metric_writer.cpp b/retrace/metric_writer.cpp
+index e923ed1d..4e4ce748 100644
+--- a/retrace/metric_writer.cpp
++++ b/retrace/metric_writer.cpp
+@@ -24,6 +24,7 @@
+  **************************************************************************/
+ 
+ #include <iostream>
++#include <stdint.h>
+ 
+ #include "metric_writer.hpp"
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb b/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
index d872c4dbb5..244d9a3c6f 100644
--- a/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
+++ b/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \
 SRCREV = "9352fc02bba106fbbeef9e8452ef34643c0d0764"
 PV .= "+11.1+git"
 SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
+           file://0001-Explicit-header-stdint.patch \
           "
 
-S = "${WORKDIR}/git"
 
 DEPENDS += "zlib libpng python3-native"
 
diff --git a/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb b/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb
deleted file mode 100644
index d0e0446eb8..0000000000
--- a/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb
+++ /dev/null
@@ -1,67 +0,0 @@
-SUMMARY = "A GNU tool that produce shell scripts to automatically configure software"
-DESCRIPTION = "Autoconf is an extensible package of M4 macros that produce shell scripts to automatically \ 
-configure software source code packages. Autoconf creates a configuration script for a package from a template \
-file that lists the operating system features that the package can use, in the form of M4 macro calls."
-SECTION = "devel"
-
-HOMEPAGE = "http://www.gnu.org/software/autoconf/"
-
-LICENSE = "GPL-3.0-only"
-LICENSE = "GPL-2.0-only & GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
-
-SRC_URI = " \
-    ${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \
-    file://0001-Add-config.guess-config.sub-install-to-destdir.patch \
-"
-
-S = "${WORKDIR}/${BPN}"
-SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711"
-SRC_URI[sha256sum] = "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e"
-
-inherit texinfo native
-
-DEPENDS += "m4-native gnu-config-native"
-RDEPENDS:${PN} = "m4-native gnu-config-native"
-
-PERL = "${USRBINPATH}/perl"
-
-CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'"
-
-CONFIGUREOPTS = " \
-    --build=${BUILD_SYS} \
-    --host=${HOST_SYS} \
-    --target=${TARGET_SYS} \
-    --prefix=${prefix} \
-    --exec_prefix=${exec_prefix} \
-    --bindir=${bindir} \
-    --sbindir=${sbindir} \
-    --libexecdir=${libexecdir} \
-    --datadir=${datadir} \
-    --sysconfdir=${sysconfdir} \
-    --sharedstatedir=${sharedstatedir} \
-    --localstatedir=${localstatedir} \
-    --libdir=${libdir} \
-    --includedir=${includedir} \
-    --oldincludedir=${includedir} \
-    --infodir=${infodir} \
-    --mandir=${mandir} \
-    --disable-silent-rules \
-"
-
-EXTRA_OECONF += "ac_cv_path_M4=m4 ac_cv_prog_TEST_EMACS=no"
-
-do_configure() {
-    ./configure ${CONFIGUREOPTS}
-}
-
-do_install() {
-        oe_runmake 'DESTDIR=${D}' install
-
-    # avoid conflicts with standard autotools
-    ver="213"
-    for file in `find ${D}${bindir} -type f`; do
-        mv $file $file$ver
-    done
-        mv ${D}${datadir}/autoconf ${D}${datadir}/autoconf213
-}
diff --git a/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13/0001-Add-config.guess-config.sub-install-to-destdir.patch b/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13/0001-Add-config.guess-config.sub-install-to-destdir.patch
deleted file mode 100644
index f6e9ecb9a0..0000000000
--- a/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13/0001-Add-config.guess-config.sub-install-to-destdir.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 3d3e23f7b14e87849405a4e109a69b76696615fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 11 Dec 2019 23:18:19 +0100
-Subject: [PATCH] Add config.guess config.sub / install to destdir
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [Configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- Makefile.in | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index a6c94d4..4b1b708 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -137,23 +137,23 @@ installcheck: all install
-        cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
- 
- installdirs:
--       $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
-+       $(SHELL) ${srcdir}/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(infodir) ${DESTDIR}$(acdatadir)
- 
- install: all $(M4FILES) acconfig.h installdirs install-info
-        for p in $(ASCRIPTS); do \
--         $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-+         $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir)/`echo $$p|sed '$(transform)'`; \
-        done
-        for i in $(M4FROZEN); do \
--         $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
-+         $(INSTALL_DATA) $$i ${DESTDIR}$(acdatadir)/$$i; \
-        done
-        for i in $(M4FILES) acconfig.h; do \
--         $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
-+         $(INSTALL_DATA) $(srcdir)/$$i ${DESTDIR}$(acdatadir)/$$i; \
-        done
-        -if test -f autoscan; then \
--       $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
-+       $(INSTALL_PROGRAM) autoscan ${DESTDIR}$(bindir)/`echo autoscan|sed '$(transform)'`; \
-        for i in acfunctions acheaders acidentifiers acprograms \
--         acmakevars; do \
--       $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
-+         acmakevars config.guess config.sub; do \
-+       $(INSTALL_DATA) $(srcdir)/$$i ${DESTDIR}$(acdatadir)/$$i; \
-        done; \
-        else :; fi
- 
-@@ -161,11 +161,11 @@ install: all $(M4FILES) acconfig.h installdirs install-info
- install-info: info installdirs
-        if test -f autoconf.info; then \
-          for i in *.info*; do \
--           $(INSTALL_DATA) $$i $(infodir)/$$i; \
-+           $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
-          done; \
-        else \
-          for i in $(srcdir)/*.info*; do \
--           $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
-+           $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
-          done; \
-        fi
- 
--- 
-2.21.0
-
diff --git a/meta-oe/recipes-devtools/b4/b4_0.14.2.bb b/meta-oe/recipes-devtools/b4/b4_0.14.2.bb
new file mode 100644
index 0000000000..794e1d24dd
--- /dev/null
+++ b/meta-oe/recipes-devtools/b4/b4_0.14.2.bb
@@ -0,0 +1,13 @@
+SUMMARY = "Utility to work with patches made available via a public-inbox archive like lore.kernel.org."
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+inherit pypi python_pep517 python_setuptools_build_meta
+
+SRC_URI[sha256sum] = "4f835b6e5ae30eff6004bb25c15fd8f4f6ecd1105596e86db1871fef7d18113d"
+
+RDEPENDS:${PN} += " \
+    python3-mailbox \
+    python3-requests \
+"
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb b/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
index 3bf4371e85..0e51289507 100644
--- a/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
+++ b/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb
@@ -27,9 +27,9 @@ SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac"
 SRCREV_lss = "9719c1e1e676814c456b55f5f070eabad6709d31"
 
 SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \
-           git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest;branch=main;protocol=https \
-           git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \
-           git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=git/src/third_party/lss;name=lss \
+           git://github.com/google/googletest.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/testing/gtest;name=gtest;branch=main;protocol=https \
+           git://github.com/protocolbuffers/protobuf.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \
+           git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/third_party/lss;name=lss \
            file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \
            file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \
            file://0001-Turn-off-sign-compare-for-musl-libc.patch \
@@ -41,7 +41,6 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=h
            file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \
            file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \
 "
-S = "${WORKDIR}/git"
 
 CXXFLAGS += "-D_GNU_SOURCE"
 LDFLAGS:append:libc-musl = " -lucontext"
diff --git a/meta-oe/recipes-devtools/capnproto/capnproto/0001-Export-binaries-only-for-native-build.patch b/meta-oe/recipes-devtools/capnproto/capnproto/0001-Export-binaries-only-for-native-build.patch
new file mode 100644
index 0000000000..7677d96b23
--- /dev/null
+++ b/meta-oe/recipes-devtools/capnproto/capnproto/0001-Export-binaries-only-for-native-build.patch
@@ -0,0 +1,53 @@
+From e654a7015f5e8f20bf7681681cc2b80082303007 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Tue, 25 Feb 2025 13:43:42 +0100
+Subject: [PATCH] Export binaries only for native build
+
+By default, the cmake configuratione exports all generated files,
+so when using the generated cmake file with a find_package command,
+it verifies that these files actually exist.
+
+When using the cross-compiled version of capnproto, the generated
+binaries are not available in RECIPE_SYSROOT (since they can be
+used as RDEPENDS only, but not usable as DEPENDS), and due to
+this the compilation fails.
+
+To avoid this, check during the compilation of capnproto if it is
+being cross-compiled, or not. If is it cross-compiled, then only
+install the generated binary files in their final location, but
+don't export them. When not cross-compiling, do the same, but also
+export the files (which is the default behavior).
+
+Upstream-Status: Inappropriate [oe specific: see above message]
+
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ c++/src/capnp/CMakeLists.txt | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/c++/src/capnp/CMakeLists.txt b/c++/src/capnp/CMakeLists.txt
+index 9980fde6..8732db93 100644
+--- a/src/capnp/CMakeLists.txt
++++ b/src/capnp/CMakeLists.txt
+@@ -210,7 +210,20 @@ if(NOT CAPNP_LITE)
+   target_link_libraries(capnpc_capnp capnp kj)
+   set_target_properties(capnpc_capnp PROPERTIES OUTPUT_NAME capnpc-capnp)
+ 
+-  install(TARGETS capnp_tool capnpc_cpp capnpc_capnp ${INSTALL_TARGETS_DEFAULT_ARGS})
++  if(NOT CMAKE_CROSSCOMPILING)
++    install(TARGETS capnp_tool capnpc_cpp capnpc_capnp ${INSTALL_TARGETS_DEFAULT_ARGS})
++  else()
++    # INSTALL_TARGETS_CROSS_COMPILED_BINARY_ARGS is identical to INSTALL_TARGETS_DEFAULT_ARGS,
++    # except that the installed files are not exported, so when the generated cmake file
++    # is used by a find_package command, it won't try to find these files.
++    set(INSTALL_TARGETS_CROSS_COMPILED_BINARY_ARGS
++      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++    )
++
++    install(TARGETS capnp_tool capnpc_cpp capnpc_capnp ${INSTALL_TARGETS_CROSS_COMPILED_BINARY_ARGS})
++  endif()
+ 
+   if(WIN32)
+     # On Windows platforms symlinks are not guaranteed to support. Also different version of CMake handle create_symlink in a different way.
diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb b/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb
index cb4aef5224..0ea243fd20 100644
--- a/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb
+++ b/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb
@@ -5,13 +5,16 @@ SECTION = "console/tools"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9"
 
-SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https"
+SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \
+           file://0001-Export-binaries-only-for-native-build.patch"
 SRCREV = "1a0e12c0a3ba1f0dbbad45ddfef555166e0a14fc"
 
-S = "${WORKDIR}/git/c++"
+S = "${UNPACKDIR}/${BP}/c++"
 
 inherit cmake
 
+CVE_PRODUCT = "capnproto capnp"
+
 CXXFLAGS:append:mips = " -latomic"
 CXXFLAGS:append:powerpc = " -latomic"
 CXXFLAGS:append:riscv32 = " -latomic"
diff --git a/meta-oe/recipes-devtools/cbindgen/cbindgen/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch b/meta-oe/recipes-devtools/cbindgen/cbindgen/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch
new file mode 100644
index 0000000000..75086aba75
--- /dev/null
+++ b/meta-oe/recipes-devtools/cbindgen/cbindgen/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch
@@ -0,0 +1,38 @@
+From 6ab6af57cbd3b3b0cd4ba04f7f65693e1ca69870 Mon Sep 17 00:00:00 2001
+From: Dan Gohman <dev@sunfishcode.online>
+Date: Sun, 6 Apr 2025 05:22:49 -0700
+Subject: [PATCH] Define more ioctl codes on riscv32gc-unknown-linux-gnu
+
+Define ioctl codes including `FICLONE` and `FS_IOC32_GETVERSION` on
+riscv32gc-unknown-linux-gnu.
+
+Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/4382]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/unix/linux_like/linux/arch/generic/mod.rs | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/unix/linux_like/linux/arch/generic/mod.rs b/src/unix/linux_like/linux/arch/generic/mod.rs
+index 2f437e1..db1f1e7 100644
+--- a/src/unix/linux_like/linux/arch/generic/mod.rs
++++ b/src/unix/linux_like/linux/arch/generic/mod.rs
+@@ -114,6 +114,7 @@ cfg_if! {
+                  target_arch = "x86_64",
+                  target_arch = "arm",
+                  target_arch = "aarch64",
++                 target_arch = "riscv32",
+                  target_arch = "riscv64",
+                  target_arch = "s390x",
+                  target_arch = "csky",
+@@ -218,7 +219,10 @@ cfg_if! {
+     // where S stands for size (int, long, struct...)
+     // where T stands for type ('f','v','X'...)
+     // where N stands for NR (NumbeR)
+-    if #[cfg(any(target_arch = "x86", target_arch = "arm", target_arch = "csky"))] {
++    if #[cfg(any(target_arch = "x86",
++                 target_arch = "arm",
++                 target_arch = "riscv32",
++                 target_arch = "csky"))] {
+         pub const FS_IOC_GETFLAGS: ::Ioctl = 0x80046601;
+         pub const FS_IOC_SETFLAGS: ::Ioctl = 0x40046602;
+         pub const FS_IOC_GETVERSION: ::Ioctl = 0x80047601;
diff --git a/meta-oe/recipes-devtools/cbindgen/cbindgen_0.28.0.bb b/meta-oe/recipes-devtools/cbindgen/cbindgen_0.28.0.bb
new file mode 100644
index 0000000000..8a6337a0d2
--- /dev/null
+++ b/meta-oe/recipes-devtools/cbindgen/cbindgen_0.28.0.bb
@@ -0,0 +1,148 @@
+SUMMARY = "cbindgen creates C/C++11 headers for Rust libraries which expose a public C API"
+HOMEPAGE = "https://github.com/mozilla/cbindgen"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
+
+SRC_URI += "git://github.com/mozilla/cbindgen.git;protocol=https;branch=master \
+            file://0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch;patchdir=${CARGO_VENDORING_DIRECTORY}/libc-0.2.155"
+SRCREV = "bd78bbe59b10eda6ef1255e4acda95c56c6d0279"
+
+inherit cargo pkgconfig
+
+SRC_URI += " \
+    crate://crates.io/anstream/0.6.15 \
+    crate://crates.io/anstyle-parse/0.2.5 \
+    crate://crates.io/anstyle-query/1.1.1 \
+    crate://crates.io/anstyle-wincon/3.0.4 \
+    crate://crates.io/anstyle/1.0.8 \
+    crate://crates.io/autocfg/1.3.0 \
+    crate://crates.io/bitflags/2.6.0 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/clap/4.5.15 \
+    crate://crates.io/clap_builder/4.5.15 \
+    crate://crates.io/clap_lex/0.7.2 \
+    crate://crates.io/colorchoice/1.0.2 \
+    crate://crates.io/dashmap/5.5.3 \
+    crate://crates.io/diff/0.1.13 \
+    crate://crates.io/equivalent/1.0.1 \
+    crate://crates.io/errno/0.3.9 \
+    crate://crates.io/fastrand/2.1.0 \
+    crate://crates.io/hashbrown/0.14.5 \
+    crate://crates.io/heck/0.4.1 \
+    crate://crates.io/indexmap/2.3.0 \
+    crate://crates.io/is_terminal_polyfill/1.70.1 \
+    crate://crates.io/itoa/1.0.11 \
+    crate://crates.io/lazy_static/1.5.0 \
+    crate://crates.io/libc/0.2.155 \
+    crate://crates.io/linux-raw-sys/0.4.14 \
+    crate://crates.io/lock_api/0.4.12 \
+    crate://crates.io/log/0.4.22 \
+    crate://crates.io/memchr/2.7.4 \
+    crate://crates.io/once_cell/1.19.0 \
+    crate://crates.io/parking_lot/0.12.3 \
+    crate://crates.io/parking_lot_core/0.9.10 \
+    crate://crates.io/pretty_assertions/1.4.0 \
+    crate://crates.io/proc-macro2/1.0.86 \
+    crate://crates.io/quote/1.0.36 \
+    crate://crates.io/redox_syscall/0.5.3 \
+    crate://crates.io/rustix/0.38.34 \
+    crate://crates.io/ryu/1.0.18 \
+    crate://crates.io/scopeguard/1.2.0 \
+    crate://crates.io/serde/1.0.205 \
+    crate://crates.io/serde_derive/1.0.205 \
+    crate://crates.io/serde_json/1.0.122 \
+    crate://crates.io/serde_spanned/0.6.7 \
+    crate://crates.io/serial_test/2.0.0 \
+    crate://crates.io/serial_test_derive/2.0.0 \
+    crate://crates.io/smallvec/1.13.2 \
+    crate://crates.io/strsim/0.11.1 \
+    crate://crates.io/syn/2.0.85 \
+    crate://crates.io/tempfile/3.12.0 \
+    crate://crates.io/toml/0.8.19 \
+    crate://crates.io/toml_datetime/0.6.8 \
+    crate://crates.io/toml_edit/0.22.20 \
+    crate://crates.io/unicode-ident/1.0.12 \
+    crate://crates.io/utf8parse/0.2.2 \
+    crate://crates.io/windows-sys/0.52.0 \
+    crate://crates.io/windows-sys/0.59.0 \
+    crate://crates.io/windows-targets/0.52.6 \
+    crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
+    crate://crates.io/windows_aarch64_msvc/0.52.6 \
+    crate://crates.io/windows_i686_gnu/0.52.6 \
+    crate://crates.io/windows_i686_gnullvm/0.52.6 \
+    crate://crates.io/windows_i686_msvc/0.52.6 \
+    crate://crates.io/windows_x86_64_gnu/0.52.6 \
+    crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
+    crate://crates.io/windows_x86_64_msvc/0.52.6 \
+    crate://crates.io/winnow/0.6.18 \
+    crate://crates.io/yansi/0.5.1 \
+"
+
+SRC_URI[anstream-0.6.15.sha256sum] = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+SRC_URI[anstyle-parse-0.2.5.sha256sum] = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+SRC_URI[anstyle-query-1.1.1.sha256sum] = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+SRC_URI[anstyle-wincon-3.0.4.sha256sum] = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+SRC_URI[anstyle-1.0.8.sha256sum] = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[clap-4.5.15.sha256sum] = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
+SRC_URI[clap_builder-4.5.15.sha256sum] = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+SRC_URI[clap_lex-0.7.2.sha256sum] = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+SRC_URI[colorchoice-1.0.2.sha256sum] = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+SRC_URI[dashmap-5.5.3.sha256sum] = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+SRC_URI[errno-0.3.9.sha256sum] = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+SRC_URI[fastrand-2.1.0.sha256sum] = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+SRC_URI[indexmap-2.3.0.sha256sum] = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
+SRC_URI[is_terminal_polyfill-1.70.1.sha256sum] = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+SRC_URI[itoa-1.0.11.sha256sum] = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+SRC_URI[linux-raw-sys-0.4.14.sha256sum] = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+SRC_URI[lock_api-0.4.12.sha256sum] = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+SRC_URI[log-0.4.22.sha256sum] = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+SRC_URI[parking_lot-0.12.3.sha256sum] = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+SRC_URI[parking_lot_core-0.9.10.sha256sum] = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+SRC_URI[redox_syscall-0.5.3.sha256sum] = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+SRC_URI[rustix-0.38.34.sha256sum] = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+SRC_URI[serde-1.0.205.sha256sum] = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150"
+SRC_URI[serde_derive-1.0.205.sha256sum] = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1"
+SRC_URI[serde_json-1.0.122.sha256sum] = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
+SRC_URI[serde_spanned-0.6.7.sha256sum] = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+SRC_URI[serial_test-2.0.0.sha256sum] = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d"
+SRC_URI[serial_test_derive-2.0.0.sha256sum] = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
+SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+SRC_URI[syn-2.0.85.sha256sum] = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+SRC_URI[tempfile-3.12.0.sha256sum] = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+SRC_URI[toml-0.8.19.sha256sum] = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+SRC_URI[toml_datetime-0.6.8.sha256sum] = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+SRC_URI[toml_edit-0.22.20.sha256sum] = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+SRC_URI[winnow-0.6.18.sha256sum] = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+
+BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb
index 922dfc7763..fbd3618b4f 100644
--- a/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb
+++ b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb
@@ -13,6 +13,8 @@ SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \
            file://0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch"
 SRC_URI[sha256sum] = "0d38b524d377257b106bad6d856d8ae3304140e1ee24085343e6ddf1b65811f1"
 
+EXTRA_AUTORECONF += "-I config"
+
 CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes"
 EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR} \
     --with-ncurses=${STAGING_LIBDIR}"
diff --git a/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb
index 5e992845a1..33c8c28531 100644
--- a/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb
+++ b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \
          "
 SRCREV = "acc76239bee01d8e9c858ae2cab296704e52d916"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig ptest
 
@@ -24,6 +23,11 @@ do_install_ptest() {
         sed s#${B}#${PTEST_PATH}# ${B}/CTestTestfile.cmake > ${D}${PTEST_PATH}/CTestTestfile.cmake
         sed s#${B}#${PTEST_PATH}# ${B}/tests/CTestTestfile.cmake > ${D}${PTEST_PATH}/tests/CTestTestfile.cmake
         sed s#${B}#${PTEST_PATH}# ${B}/fuzzing/CTestTestfile.cmake > ${D}${PTEST_PATH}/fuzzing/CTestTestfile.cmake
+        # The cmake files also contain full paths to original CMakeLists.txt file in _BACKTRACE_TRIPLES property;
+        # these are not needed for successful ptests as we don't install the CMakeLists.txt files anyway.
+        sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/CTestTestfile.cmake
+        sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/tests/CTestTestfile.cmake
+        sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/fuzzing/CTestTestfile.cmake
         # install test artifacts
         install ${B}/cJSON_test ${D}${PTEST_PATH}
         install ${B}/tests/cjson_add ${B}/tests/*_tests ${B}/tests/parse_*  ${B}/tests/print_*  ${B}/tests/readme_examples ${D}${PTEST_PATH}/tests/
diff --git a/meta-oe/recipes-devtools/cloc/cloc_1.98.bb b/meta-oe/recipes-devtools/cloc/cloc_1.98.bb
index ea5f00669f..6d349c1e58 100644
--- a/meta-oe/recipes-devtools/cloc/cloc_1.98.bb
+++ b/meta-oe/recipes-devtools/cloc/cloc_1.98.bb
@@ -1,13 +1,14 @@
 SUMMARY = "Count blank lines, comment lines, and physical lines of source code \
 in many programming languages."
 
-LICENSE="GPL-2.0-only"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2"
 
 SRC_URI = "https://github.com/AlDanial/cloc/releases/download/v${PV}/${BP}.tar.gz"
 SRC_URI[sha256sum] = "5fe0b159eb75718df7308a4f61470eaddf82170733929999e37a3fbb4651cf8a"
 
 UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
index 47a3d88853..ab4e6148e9 100644
--- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
+++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/concurrencykit/ck.git;branch=master;protocol=https \
            file://0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch \
            file://0001-build-Use-ilp32d-abi-on-riscv32-and-lp64d-on-rv64.patch"
 
-S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64|powerpc|powerpc64|riscv32|riscv64).*-linux*"
 
diff --git a/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb b/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb
new file mode 100644
index 0000000000..6e709b6e7e
--- /dev/null
+++ b/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb
@@ -0,0 +1,13 @@
+SUMMARY = "C++ Code Generator library"
+BUGTRACKER = "https://github.com/rm5248/libcppgenerate/issues"
+SECTION = "libs"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+
+SRC_URI = "git://github.com/rm5248/libcppgenerate.git;branch=master;protocol=https"
+SRCREV = "930c5503f76c877b72b9ff8546353d6f422bd010"
+
+
+inherit cmake
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb b/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb
index ed339e0160..36614ca19d 100644
--- a/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb
+++ b/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "cpuid dumps detailed information about the CPU(s) gathered \
 from the CPUID instruction, and also determines the exact model of CPU(s). \
 It supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, \
 UMC, NexGen, Rise, and SiS CPUs"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
+HOMEPAGE = "http://www.etallen.com/cpuid.html"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
@@ -17,9 +17,7 @@ COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 inherit perlnative
 
 do_install () {
-    oe_runmake DESTDIR=${D} bindir=${bindir} mandir=${mandir} install
+    oe_runmake DESTDIR=${D} bindir=${bindir} mandir=${mandir} INSTALL_STRIP="" install
 }
 
 RDEPENDS:${PN} = "perl"
-
-INSANE_SKIP:${PN} += "already-stripped"
diff --git a/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb b/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb
new file mode 100644
index 0000000000..98419a8069
--- /dev/null
+++ b/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb
@@ -0,0 +1,12 @@
+SUMMARY = "Cpuset manipulation tool"
+HOMEPAGE = "https://github.com/SUSE/cpuset"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SRC_URI = "git://github.com/SUSE/cpuset.git;protocol=https;branch=master"
+
+SRCREV = "4f80263208935f0df4f616cf9d8cb7285599a670"
+
+inherit setuptools3
+
+RDEPENDS:${PN} += "python3-core python3-logging python3-pydoc"
diff --git a/meta-oe/recipes-devtools/cscope/cscope_15.9.bb b/meta-oe/recipes-devtools/cscope/cscope_15.9.bb
index 99f3ba85de..fad885dd43 100644
--- a/meta-oe/recipes-devtools/cscope/cscope_15.9.bb
+++ b/meta-oe/recipes-devtools/cscope/cscope_15.9.bb
@@ -20,5 +20,4 @@ DEPENDS += "ncurses"
 
 SRC_URI = "http://downloads.sourceforge.net/project/cscope/cscope/v${PV}/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "16f3cce078b6c0e42299def4028eea6f"
 SRC_URI[sha256sum] = "c5505ae075a871a9cd8d9801859b0ff1c09782075df281c72c23e72115d9f159"
diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.2.20250615.0.bb
index f8add448b8..c794278f57 100644
--- a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb
+++ b/meta-oe/recipes-devtools/ctags/ctags_6.2.20250615.0.bb
@@ -14,10 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 inherit autotools-brokensep pkgconfig manpages
 
-SRCREV = "653ca9204527fe1da7ecf97c3da4308f9ab17d2c"
-SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https"
+SRCREV = "0644fb80a8250cc3ca6ba00037e490768fe4492e"
+SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https;tag=p${PV}"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
     readcmd \
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch
index 12dd238108..faa66e0268 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch
@@ -1,20 +1,20 @@
-From 87d0174e8d56e7458dc94f05f82ab7a67a5cf7d0 Mon Sep 17 00:00:00 2001
+From 6c8b0a3f9c09a7a135d95ff18038bcba22e87b86 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 8 Apr 2021 14:06:05 +0800
-Subject: [PATCH 1/2] support to override /usr/sbin and /usr/share
+Subject: [PATCH] support to override /usr/sbin and /usr/share
 
 Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55]
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
- Makefile | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
+ Makefile | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 8516803..a2d8c00 100644
+index 21a9a39..649f465 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -5,14 +5,16 @@ all:
+@@ -5,13 +5,15 @@ all:
  
  clean:
  
@@ -28,14 +28,12 @@ index 8516803..a2d8c00 100644
 +       mkdir -p $(DESTDIR)$(sbindir)
  
         cp -a scripts/* $(DSDIR)/scripts/
-        install -o root -g root -m 0644 functions $(DSDIR)/
+        install -m 0644 functions $(DSDIR)/
  
 -       sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap
--       chown root:root $(DESTDIR)/usr/sbin/debootstrap
 -       chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
 +       sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap
-+       chown root:root $(DESTDIR)$(sbindir)/debootstrap
 +       chmod 0755 $(DESTDIR)$(sbindir)/debootstrap
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch
index 69329df4ea..daec80f614 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch
@@ -1,7 +1,7 @@
-From f0420b201f2fb5286ccf5657faa6b38cd2680e10 Mon Sep 17 00:00:00 2001
+From b7a476cbcd507c03094811690d5497a7e9e15afc Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 8 Apr 2021 14:08:06 +0800
-Subject: [PATCH 2/2] support to override /usr/bin/arch-test
+Subject: [PATCH] support to override /usr/bin/arch-test
 
 Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55]
 
@@ -11,12 +11,12 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/debootstrap b/debootstrap
-index 9b9e58d..a3cf3af 100755
+index 43a7383..0cce33e 100755
 --- a/debootstrap
 +++ b/debootstrap
 @@ -51,6 +51,10 @@ INRELEASE_PATH=""
+ 
  DEF_MIRROR="http://deb.debian.org/debian"
- DEF_HTTPS_MIRROR="https://deb.debian.org/debian"
  
 +if [ -z "$ARCH_TEST" ]; then
 +       ARCH_TEST="/usr/bin/arch-test"
@@ -25,7 +25,7 @@ index 9b9e58d..a3cf3af 100755
  # set $CONTAINER
  detect_container
  
-@@ -645,12 +649,12 @@ fi
+@@ -666,12 +670,12 @@ fi
  
  ###########################################################################
  
@@ -42,6 +42,3 @@ index 9b9e58d..a3cf3af 100755
         else
                 ret=3
         fi
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch
index 2a5f233165..0c1a7a65a8 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch
@@ -1,4 +1,4 @@
-From e735fb23f46f0c3c7a1144ba6b4050bfc0015a05 Mon Sep 17 00:00:00 2001
+From 33c4bc9540d6d9aee6d885b89d530130d50b8052 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Wed, 2 Jun 2021 13:34:35 +0800
 Subject: [PATCH] do not hardcode the full path of dpkg
@@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/debootstrap b/debootstrap
-index a3cf3af..5e96c3e 100755
+index 0cce33e..7586c58 100755
 --- a/debootstrap
 +++ b/debootstrap
-@@ -538,7 +538,7 @@ fi
+@@ -553,7 +553,7 @@ fi
  
  if in_path dpkg && \
       dpkg --print-architecture >/dev/null 2>&1; then
@@ -28,6 +28,3 @@ index a3cf3af..5e96c3e 100755
  elif in_path udpkg && \
       udpkg --print-architecture >/dev/null 2>&1; then
         HOST_ARCH=$(/usr/bin/udpkg --print-architecture)
--- 
-2.27.0
-
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb
index c28a51749c..9287962ab7 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb
@@ -2,18 +2,18 @@ SUMMARY = "Install a Debian system into a subdirectory"
 HOMEPAGE = "https://wiki.debian.org/Debootstrap"
 SECTION = "devel"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608"
+LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7b45429ef05610abf91ac199fdb3a6e"
 
 SRC_URI  = "\
     ${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz \
     file://0001-support-to-override-usr-sbin-and-usr-share.patch \
     file://0002-support-to-override-usr-bin-arch-test.patch \
-    file://0001-do-not-hardcode-the-full-path-of-dpkg.patch \
+    file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \
 "
 
-SRC_URI[sha256sum] = "d963a465314ac0e8fd5392573def042e6663e8edf3d08ace4bbd0d27ee8431f7"
+SRC_URI[sha256sum] = "232ec755f4b1f445f829996885846abba6f1b6fd55d049476ab26ddd8c4b4e1b"
 
-S = "${WORKDIR}/debootstrap"
+S = "${UNPACKDIR}/debootstrap"
 
 DEPENDS = " \
     virtual/fakeroot-native \
diff --git a/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb b/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb
index 2f0d8a3400..79252f94ae 100644
--- a/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb
+++ b/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb
@@ -28,7 +28,6 @@ SRC_URI = "http://dmalloc.com/releases/dmalloc-${PV}.tgz \
            file://0001-undefined-strdup-macro.patch \
 "
 
-SRC_URI[md5sum] = "f92e5606c23a8092f3d5694e8d1c932e"
 SRC_URI[sha256sum] = "d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a"
 
 ARM_INSTRUCTION_SET = "arm"
diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb
index 599675a345..bc558b7d62 100644
--- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb
+++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb
@@ -10,7 +10,6 @@ SRC_URI:append:class-target = " file://oe-remote.repo.sample"
 
 inherit setuptools3-base
 
-S = "${WORKDIR}/git"
 
 do_install:append() {
     install -d ${D}${datadir}/dnf
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
deleted file mode 100644
index 47c8edb497..0000000000
--- a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 24650b0c7db6b213a2eaa5061b75b9f1b43f1ce9 Mon Sep 17 00:00:00 2001
-From: Bartosz Golaszewski <brgl@bgdev.pl>
-Date: Fri, 23 Nov 2018 11:44:56 +0100
-Subject: [PATCH] build: don't look for Iconv
-
-Drop the find_package() for Iconv. CMake is unable to find iconv.h in
-native build but all modern systems supply it as part of the standard
-C library. We don't need this check in meta-openembedded.
-
-Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
-Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
-
-Upstream-Status: Inappropriate
-- upstream doxygen must build on many architectures, this change is
-  too intrusive for upstream
----
- CMakeLists.txt | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 06b9696f..f30b46b8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -117,10 +117,6 @@ if (sqlite3)
-   endif()
- endif()
- 
--find_package(Iconv REQUIRED)
--include_directories(${ICONV_INCLUDE_DIR})
--
--
- #set(DOXYDOCS ${PROJECT_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs")
- set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc)
- set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS})
--- 
-2.27.0
-
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
deleted file mode 100644
index 796bc61ddc..0000000000
--- a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From daf686508f2ee4711d93e96e5b100e50bf161656 Mon Sep 17 00:00:00 2001
-From: Leon Anavi <leon.anavi@konsulko.com>
-Date: Wed, 26 Aug 2020 10:52:10 +0300
-Subject: [PATCH] doxygen: Fix Python issues for doxygen-native
-
-It fails to compile doxygen-native when /usr/bin/python is a link
-to python3 on build host:
-
-| Failed to import the site module
-| Traceback (most recent call last):
-|   File "/usr/lib64/python3.6/site.py", line 564, in <module>
-|     main()
-|   File "/usr/lib64/python3.6/site.py", line 550, in main
-|     known_paths = addusersitepackages(known_paths)
-|   File "/usr/lib64/python3.6/site.py", line 282, in addusersitepackages
-|     user_site = getusersitepackages()
-|   File "/usr/lib64/python3.6/site.py", line 258, in getusersitepackages
-|     user_base = getuserbase() # this will also set USER_BASE
-|   File "/usr/lib64/python3.6/site.py", line 248, in getuserbase
-|     USER_BASE = get_config_var('userbase')
-|   File "/usr/lib64/python3.6/sysconfig.py", line 604, in get_config_var
-|     return get_config_vars().get(name)
-|   File "/usr/lib64/python3.6/sysconfig.py", line 553, in get_config_vars
-|     _init_posix(_CONFIG_VARS)
-|   File "/usr/lib64/python3.6/sysconfig.py", line 424, in _init_posix
-|     _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
-| ModuleNotFoundError: No module named '_sysconfigdata'
-
-Replace find_package PythonInterp with Python3 to fix this issue
-that it uses python3 from python3-native. And it also replaces the
-result variable PYTHON_EXECUTABLE with Python3_EXECUTABLE.
-
-This patch is only needded by doxygen-native.
-
-Updated to apply to release 1.9.1.
-
-Upstream-Status: Inappropriate [oe specific]
-
-Co-Authored-By: Kai Kang <kai.kang@windriver.com>
-Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
-Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
-
----
- CMakeLists.txt                  |  2 +-
- addon/doxywizard/CMakeLists.txt |  6 +++---
- doc/CMakeLists.txt              |  6 +++---
- examples/CMakeLists.txt         |  4 ++--
- libmscgen/CMakeLists.txt        |  2 +-
- src/CMakeLists.txt              | 10 +++++-----
- testing/CMakeLists.txt          |  4 ++--
- 7 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2455793..28f0d83 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -105,7 +105,7 @@ else ()
- endif ()
- 
- find_program(DOT NAMES dot)
--find_package(PythonInterp REQUIRED)
-+find_package(Python3 REQUIRED)
- find_package(FLEX REQUIRED)
- find_package(BISON REQUIRED)
- if (BISON_VERSION VERSION_LESS 2.7)
-diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
-index 63ac8e3..d37d1d0 100644
---- a/addon/doxywizard/CMakeLists.txt
-+++ b/addon/doxywizard/CMakeLists.txt
-@@ -57,7 +57,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA
- 
- # generate version.cpp
- add_custom_command(
--    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
-+    COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
-     DEPENDS ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/src/version.py
-     OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp
- )
-@@ -65,7 +65,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER
- 
- # generate configdoc.cpp
- add_custom_command(
--    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
-+    COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
-     DEPENDS  ${PROJECT_SOURCE_DIR}/src/configgen.py ${PROJECT_SOURCE_DIR}/src/config.xml
-     OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp
- )
-@@ -74,7 +74,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN
- set(LEX_FILES config_doxyw)
- foreach(lex_file ${LEX_FILES})
-     add_custom_command(
--        COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
-+        COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
-         DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l
-         OUTPUT  ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
-     )
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index ec63ceb..49a2bda 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -168,7 +168,7 @@ configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1      ${PROJECT_BINARY_DIR
- 
- # doc/language.doc (see tag Doxyfile:INPUT)
- add_custom_command(
--        COMMAND ${PYTHON_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR}
-+        COMMAND ${Python3_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR}
-         DEPENDS ${PROJECT_SOURCE_DIR}/doc/maintainers.txt ${PROJECT_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES}
-         OUTPUT language.doc
-         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc
-@@ -177,7 +177,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1)
- 
- # doc/config.doc (see tag Doxyfile:INPUT)
- add_custom_command(
--        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/src/configgen.py -doc ${TOP}/src/config.xml > config.doc
-+        COMMAND ${Python3_EXECUTABLE}  ${TOP}/src/configgen.py -doc ${TOP}/src/config.xml > config.doc
-         DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py
-         OUTPUT config.doc
-         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/
-@@ -228,7 +228,7 @@ add_custom_target(docs_chm
-     COMMAND ${CMAKE_COMMAND} -E echo "    for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
-     COMMAND ${CMAKE_COMMAND} -E echo "        if file.endswith('.html') or file.endswith('.png') or file.endswith('.css') or file.endswith('.gif'):" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
-     COMMAND ${CMAKE_COMMAND} -E echo "            print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
--    COMMAND ${CMAKE_COMMAND} -E chdir  ${PROJECT_BINARY_DIR}/chm ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual.hhp
-+    COMMAND ${CMAKE_COMMAND} -E chdir  ${PROJECT_BINARY_DIR}/chm ${Python3_EXECUTABLE} ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual.hhp
-     COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/chm "${HTML_HELP_COMPILER}" doxygen_manual.hhp || echo > nul
-     COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm
-         DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 194b427..248b807 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -54,7 +54,7 @@ foreach (f_inp  ${BASIC_EXAMPLES})
-         COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/${f}
-         COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/${f}
-        COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen ${f}.cfg
--        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
-+        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
-        DEPENDS doxygen ${f}.${f_ext} ${f}.cfg ${TOP}/examples/strip_example.py
-        OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
-     )
-@@ -73,7 +73,7 @@ if (DOT)
-         COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/diagrams
-         COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/diagrams
-        COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg
--        COMMAND ${PYTHON_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex
-+        COMMAND ${Python3_EXECUTABLE}  ${TOP}/examples/strip_example.py  < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
-        DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg ${TOP}/examples/strip_example.py
-        OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex
-   )
-diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt
-index 34cf4d8..f015afc 100644
---- a/libmscgen/CMakeLists.txt
-+++ b/libmscgen/CMakeLists.txt
-@@ -7,7 +7,7 @@ include_directories(
- set(LEX_FILES mscgen_lexer) 
- foreach(lex_file ${LEX_FILES})
-     add_custom_command(
--        COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
-+        COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
-         DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l
-         OUTPUT  ${GENERATED_SRC}/${lex_file}.l.h
-     )
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0e0c5f7..c1d3ca5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -40,7 +40,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1)
- 
- # configvalues.h
- add_custom_command(
--    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maph ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.h
-+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maph ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.h
-     DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
-     OUTPUT ${GENERATED_SRC}/configvalues.h
- )
-@@ -52,7 +52,7 @@ add_custom_target(
- 
- # configvalues.cpp
- add_custom_command(
--    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maps ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.cpp
-+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maps ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.cpp
-     DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
-     OUTPUT ${GENERATED_SRC}/configvalues.cpp
- )
-@@ -60,7 +60,7 @@ set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERAT
- 
- # configoptions.cpp
- add_custom_command(
--    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -cpp ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configoptions.cpp
-+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -cpp ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configoptions.cpp
-     DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
-     OUTPUT ${GENERATED_SRC}/configoptions.cpp
- )
-@@ -95,7 +95,7 @@ endif()
- # resources.cpp
- add_custom_command(
-     COMMENT  "Generating ${GENERATED_SRC}/resources.cpp"
--    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
-+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
-     DEPENDS ${RESOURCES} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py
-     OUTPUT ${GENERATED_SRC}/resources.cpp
- )
-@@ -126,7 +126,7 @@ foreach(lex_file ${LEX_FILES})
-     set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files")
-     set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files")
-     add_custom_command(
--        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
-+        COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
-         DEPENDS ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l
-         OUTPUT  ${GENERATED_SRC}/${lex_file}.l.h
-     )
-diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
-index fd6912e..0af1865 100644
---- a/testing/CMakeLists.txt
-+++ b/testing/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # run all tests sequentially (keep for backward compatibility)
- add_custom_target(tests
-        COMMENT "Running doxygen tests..."
--       COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
-+       COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
-        DEPENDS doxygen
- )
- 
-@@ -19,6 +19,6 @@ foreach(TEST_FILE ${TEST_FILES})
-        string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*).*$" "\\1" TEST_ID "${TEST_FILE}")
-        # add a test target for each test
-        add_test(NAME ${TEST_NAME}
--                COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
-+                COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
-        )
- endforeach()
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb
index 8bd0992bd6..512a63549e 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb
+++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb
@@ -4,13 +4,16 @@ HOMEPAGE = "http://www.doxygen.org/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-DEPENDS = "flex-native bison-native"
+DEPENDS = "bison-native flex-native"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \
-           file://0001-build-don-t-look-for-Iconv.patch \
+SRC_URI = "\
+    git://github.com/doxygen/doxygen.git;branch=master;protocol=https \
 "
-SRC_URI:append:class-native = " file://doxygen-native-only-check-python3.patch"
-SRC_URI[sha256sum] = "f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0"
+
+SRCREV = "cbe58f6237b2238c9af7f51c6b7afb8bbf52c866"
+
+
+UPSTREAM_CHECK_GITTAGREGEX = "Release_(?P<pver>\d+(\_\d+)+)"
 
 inherit cmake python3native
 
@@ -18,4 +21,5 @@ EXTRA_OECMAKE += "\
     -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \
     -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \
 "
+
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb
index 2c594d229e..c6db2ef38c 100644
--- a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb
+++ b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb
@@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=38f617473e9f7373b5e79baf437accf8"
 
 SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-SRCREV = "fd8cf1e94ecf4e6e4493833f96140cf9bd17578e"
+SRCREV = "e082c947e7f7b14240195d55c060a6e1eda1b0a1"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/exprtk/exprtk_git.bb b/meta-oe/recipes-devtools/exprtk/exprtk_git.bb
index 4019f26899..bdaa39b402 100644
--- a/meta-oe/recipes-devtools/exprtk/exprtk_git.bb
+++ b/meta-oe/recipes-devtools/exprtk/exprtk_git.bb
@@ -1,13 +1,12 @@
 SUMMARY = "Expression parser"
-HOMEPAGE = "https://github.com/ArashPartow/exprtk"
+HOMEPAGE = "https://www.partow.net/programming/exprtk/index.html"
 SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-SRCREV = "f46bffcd6966d38a09023fb37ba9335214c9b959"
+SRCREV = "a4b17d543f072d2e3ba564e4bc5c3a0d2b05c338"
 
 SRC_URI = "git://github.com/ArashPartow/exprtk.git;branch=release;protocol=https"
 
-S = "${WORKDIR}/git"
 
 # other packages commonly reference the file directly as "exprtk.hpp"
 # create symlink to allow this usage
diff --git a/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb b/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb
index a4cd7ad157..83e9383d4a 100644
--- a/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb
+++ b/meta-oe/recipes-devtools/extract-cert/extract-cert_0.3.bb
@@ -7,7 +7,6 @@ DEPENDS = "openssl"
 SRC_URI = "git://git.pengutronix.de/git/extract-cert;protocol=https;branch=master;"
 SRCREV = "d652b4e8279aef2a85f58676ab472744bafeafc9"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
index 183554e2c8..c51a49ba01 100644
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
@@ -13,7 +13,6 @@ DEPENDS = "flatbuffers-native"
 RDEPENDS:${PN}-compiler = "${PN}"
 RDEPENDS:${PN}-dev += "${PN}-compiler"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += " \
     -DFLATBUFFERS_BUILD_TESTS=OFF \    
@@ -23,6 +22,11 @@ EXTRA_OECMAKE:append:class-target = " -DFLATBUFFERS_FLATC_EXECUTABLE=${STAGING_B
 
 inherit cmake python3native
 
+rm_flatc_cmaketarget_for_target() {
+    rm -f "${SYSROOT_DESTDIR}/${libdir}/cmake/flatbuffers/FlatcTargets.cmake"
+}
+SYSROOT_PREPROCESS_FUNCS:class-target += "rm_flatc_cmaketarget_for_target"
+
 FILES:${PN}-compiler = "${bindir}"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc
index 8f6c4c68f1..36b448a41c 100644
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc
@@ -1,3 +1,3 @@
-PV = "24.3.25"
-SRCREV = "595bf0007ab1929570c7671f091313c8fc20644e"
+PV = "25.2.10"
+SRCREV = "1c514626e83c20fffa8557e75641848e1e15cd5e"
 SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https"
diff --git a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
index 5d3c73fd9a..feb206f27c 100644
--- a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 require flatbuffers.inc
 
-S = "${WORKDIR}/git/python"
+S = "${UNPACKDIR}/${BP}/python"
 
 RDEPENDS:${PN} = "flatbuffers"
 
 inherit setuptools3
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/flatcc/flatcc_git.bb b/meta-oe/recipes-devtools/flatcc/flatcc_git.bb
index 2530dac526..2565e3b9bd 100644
--- a/meta-oe/recipes-devtools/flatcc/flatcc_git.bb
+++ b/meta-oe/recipes-devtools/flatcc/flatcc_git.bb
@@ -14,7 +14,6 @@ SRC_URI = " \
 "
 SRCREV = "1653ec964730ec7d9892a08a1695ada6d20f5196"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch
new file mode 100644
index 0000000000..5a0650aec1
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany-plugins/0001-projectorganizer-fix-invalid-string-comparison.patch
@@ -0,0 +1,24 @@
+From 8dfd7f2cba428f5eb232fbbe3427c64171bae0f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
+Date: Tue, 5 Mar 2024 18:36:37 +0100
+Subject: [PATCH 1/3] projectorganizer: fix invalid string comparison
+
+Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/8dfd7f2cba428f5eb232fbbe3427c64171bae0f4]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ projectorganizer/src/prjorg-sidebar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c
+index b6422f0..0139473 100644
+--- a/projectorganizer/src/prjorg-sidebar.c
++++ b/projectorganizer/src/prjorg-sidebar.c
+@@ -346,7 +346,7 @@ static gchar *get_fallback_dir_of_selection(void)
+                {
+                        locale_path = g_path_get_dirname(doc->real_path);
+ 
+-                       if (locale_path && locale_path == '.')
++                       if (locale_path && *locale_path == '.')
+                        {
+                                g_free(locale_path);
+                                locale_path = NULL;
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch
new file mode 100644
index 0000000000..c70f4d6e15
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany-plugins/0002-projectorganizer-fix-various-warnings.patch
@@ -0,0 +1,45 @@
+From 58d47e60bdcec62fe74b4a38eaf39d16a9c80d42 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
+Date: Tue, 5 Mar 2024 18:40:10 +0100
+Subject: [PATCH 2/3] projectorganizer: fix various warnings
+
+Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/58d47e60bdcec62fe74b4a38eaf39d16a9c80d42]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ projectorganizer/src/prjorg-sidebar.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c
+index 0139473..e67cce2 100644
+--- a/projectorganizer/src/prjorg-sidebar.c
++++ b/projectorganizer/src/prjorg-sidebar.c
+@@ -382,7 +382,8 @@ void on_open_file_manager(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gp
+ 
+        if (locale_path)
+        {
+-               gchar *command, *open_command;
++               const gchar *open_command;
++               gchar *command;
+ 
+                open_command = PRJORG_COMMAND_OPEN;
+                command = g_strconcat (open_command, " \"", locale_path, "\"", NULL);
+@@ -1562,7 +1563,7 @@ gchar **prjorg_sidebar_get_expanded_paths(void)
+                (GtkTreeViewMappingFunc)on_map_expanded, expanded_paths);
+        g_ptr_array_add(expanded_paths, NULL);
+ 
+-       return g_ptr_array_free(expanded_paths, FALSE);
++       return (gchar **)g_ptr_array_free(expanded_paths, FALSE);
+ }
+ 
+ 
+@@ -1587,10 +1588,6 @@ void prjorg_sidebar_update_full(gboolean reload, gchar **expanded_paths)
+ 
+        if (reload)
+        {
+-               GtkTreeSelection *treesel;
+-               GtkTreeIter iter;
+-               GtkTreeModel *model;
+-
+                expand_data->expanded_paths = expanded_paths != NULL ? expanded_paths : prjorg_sidebar_get_expanded_paths();
+                expand_data->selected_path = get_selected_path();
+ 
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch
new file mode 100644
index 0000000000..4c4e11c6cd
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany-plugins/0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch
@@ -0,0 +1,89 @@
+From a4a7c4af7f62eb55c0bd100ed1d308e6512a66ce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
+Date: Tue, 23 Apr 2024 18:43:51 +0200
+Subject: [PATCH 3/3] projectorganizer: Use g_pattern_spec_match_string() instead of g_pattern_match_string()
+
+Eliminates a warning on newer glib versions. Adds a fallback on older versions.
+
+Upstream-Status: Backport [https://github.com/geany/geany-plugins/commit/a4a7c4af7f62eb55c0bd100ed1d308e6512a66ce]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ projectorganizer/src/prjorg-project.c | 2 +-
+ projectorganizer/src/prjorg-sidebar.c | 4 ++--
+ projectorganizer/src/prjorg-utils.c   | 4 ++--
+ projectorganizer/src/prjorg-utils.h   | 5 +++++
+ 4 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/projectorganizer/src/prjorg-project.c b/projectorganizer/src/prjorg-project.c
+index a767ab8..71dc6e1 100644
+--- a/projectorganizer/src/prjorg-project.c
++++ b/projectorganizer/src/prjorg-project.c
+@@ -216,7 +216,7 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data)
+        {
+                GPatternSpec *pattern = g_pattern_spec_new(ft->pattern[j]);
+ 
+-               if (g_pattern_match_string(pattern, utf8_base_filename))
++               if (g_pattern_spec_match_string(pattern, utf8_base_filename))
+                {
+                        ret = TRUE;
+                        g_pattern_spec_free(pattern);
+diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c
+index e67cce2..b7536ee 100644
+--- a/projectorganizer/src/prjorg-sidebar.c
++++ b/projectorganizer/src/prjorg-sidebar.c
+@@ -657,7 +657,7 @@ static void find_file_recursive(GtkTreeIter *iter, gboolean case_sensitive, gboo
+                if (!case_sensitive)
+                        SETPTR(utf8_name, g_utf8_strdown(utf8_name, -1));
+ 
+-               if (g_pattern_match_string(pattern, utf8_name))
++               if (g_pattern_spec_match_string(pattern, utf8_name))
+                {
+                        gchar *utf8_base_path = get_project_base_path();
+                        gchar *utf8_path, *rel_path;
+@@ -840,7 +840,7 @@ static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gbool
+                                matches = g_strcmp0(name_case, name) == 0;
+                                break;
+                        case MATCH_PATTERN:
+-                               matches = g_pattern_match_string(pspec, name_case);
++                               matches = g_pattern_spec_match_string(pspec, name_case);
+                                break;
+                        case MATCH_PREFIX:
+                                matches = g_str_has_prefix(name_case, name);
+diff --git a/projectorganizer/src/prjorg-utils.c b/projectorganizer/src/prjorg-utils.c
+index 2a8847e..0b573e5 100644
+--- a/projectorganizer/src/prjorg-utils.c
++++ b/projectorganizer/src/prjorg-utils.c
+@@ -80,7 +80,7 @@ gboolean patterns_match(GSList *patterns, const gchar *str)
+        foreach_slist (elem, patterns)
+        {
+                GPatternSpec *pattern = elem->data;
+-               if (g_pattern_match_string(pattern, str))
++               if (g_pattern_spec_match_string(pattern, str))
+                        return TRUE;
+        }
+        return FALSE;
+@@ -269,7 +269,7 @@ gchar *try_find_header_source(gchar *utf8_file_name, gboolean is_header, GSList
+                full_name = elem->data;
+                gchar *base_name = g_path_get_basename(full_name);
+ 
+-               if (g_pattern_match_string(pattern, base_name))
++               if (g_pattern_spec_match_string(pattern, base_name))
+                {
+                        if ((is_header && patterns_match(source_patterns, base_name)) ||
+                                (!is_header && patterns_match(header_patterns, base_name)))
+diff --git a/projectorganizer/src/prjorg-utils.h b/projectorganizer/src/prjorg-utils.h
+index c3719a9..50ed123 100644
+--- a/projectorganizer/src/prjorg-utils.h
++++ b/projectorganizer/src/prjorg-utils.h
+@@ -19,6 +19,11 @@
+ #ifndef __PRJORG_UTILS_H__
+ #define __PRJORG_UTILS_H__
+ 
++
++ #if ! GLIB_CHECK_VERSION(2, 70, 0)
++ # define g_pattern_spec_match_string g_pattern_match_string
++ #endif
++ 
+ gchar *get_relative_path(const gchar *utf8_parent, const gchar *utf8_descendant);
+ 
+ gboolean patterns_match(GSList *patterns, const gchar *str);
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch b/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch
new file mode 100644
index 0000000000..563416bf92
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany-plugins/geany-plugins-2.0-gcc15.patch
@@ -0,0 +1,30 @@
+Fix build with GCC-15
+
+Upstream-Status: Backport [https://github.com/geany/geany-plugins/pull/1389]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/git-changebar/src/gcb-plugin.c
++++ b/git-changebar/src/gcb-plugin.c
+@@ -1410,9 +1410,9 @@ read_setting_boolean (GKeyFile     *kf,
+                       const gchar  *key,
+                       gpointer      value)
+ {
+-  gboolean *bool = value;
++  gboolean *boolean = value;
+   
+-  *bool = utils_get_setting_boolean (kf, group, key, *bool);
++  *boolean = utils_get_setting_boolean (kf, group, key, *boolean);
+ }
+ 
+ static void
+@@ -1421,9 +1421,9 @@ write_setting_boolean (GKeyFile      *kf,
+                        const gchar   *key,
+                        gconstpointer  value)
+ {
+-  const gboolean *bool = value;
++  const gboolean *boolean = value;
+   
+-  g_key_file_set_boolean (kf, group, key, *bool);
++  g_key_file_set_boolean (kf, group, key, *boolean);
+ }
+ 
+ /* loads @filename in @kf and return %FALSE if failed, emitting a warning
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb b/meta-oe/recipes-devtools/geany/geany-plugins_2.0.bb
index 1ed2993bf0..9a19e5dc98 100644
--- a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb
+++ b/meta-oe/recipes-devtools/geany/geany-plugins_2.0.bb
@@ -15,7 +15,7 @@ DEPENDS = " \
     fribidi \
     geany \
     libxml2 \
-    libsoup-2.4 \
+    libsoup \
     enchant2 \
     intltool-native \
     libassuan \
@@ -30,12 +30,12 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = " \
     https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \
-    file://0001-Use-pkg-config-to-find-gpgme.patch \
-    file://0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch \
-    file://0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch \
-    file://0001-scope-Use-0-instead-of-NULL-for-gboolean.patch \
+    file://geany-plugins-2.0-gcc15.patch \
+    file://0001-projectorganizer-fix-invalid-string-comparison.patch \
+    file://0002-projectorganizer-fix-various-warnings.patch \
+    file://0003-projectorganizer-Use-g_pattern_spec_match_string-ins.patch \
 "
-SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586"
+SRC_URI[sha256sum] = "9fc2ec5c99a74678fb9e8cdfbd245d3e2061a448d70fd110a6aefb62dd514705"
 
 do_configure:prepend() {
     rm -f ${S}/build/cache/glib-gettext.m4
@@ -75,8 +75,6 @@ PLUGINS += "${PN}-defineformat"
 LIC_FILES_CHKSUM += "file://defineformat/COPYING;md5=751419260aa954499f7abaabaa882bbe"
 FILES:${PN}-defineformat = "${libdir}/geany/defineformat.so"
 
-# no gnome devhelp in some common layer
-EXTRA_OECONF += "--disable-devhelp"
 #PLUGINS += "${PN}-devhelp"
 #LIC_FILES_CHKSUM += "file://devhelp/COPYING;md5=d32239bcb673463ab874e80d47fae504"
 #LICENSE:${PN}-devhelp = "GPLv3"
@@ -165,8 +163,6 @@ EXTRA_OECONF += "--disable-peg-markdown"
 #LIC_FILES_CHKSUM += "file://markdown/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 #FILES:${PN}-markdown = "${libdir}/geany/markdown.so"
 
-# | checking whether the GTK version in use is compatible with plugin multiterm... no
-EXTRA_OECONF += "--disable-multiterm"
 #PLUGINS += "${PN}-multiterm"
 #LIC_FILES_CHKSUM += "file://multiterm/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 #FILES:${PN}-multiterm = "${libdir}/geany/multiterm.so"
diff --git a/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch b/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch
index b966847195..e6db688974 100644
--- a/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch
+++ b/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch
@@ -11,12 +11,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_MACRO_DIR([m4])
+@@ -9,6 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
  AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects])
  AC_CONFIG_HEADERS([config.h])
--
-+AC_PROG_INTLTOOL
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
  
- GEANY_PREFIX
++AC_PROG_INTLTOOL
+ # Silence "AC_LINK_IFELSE before AC_USE_SYSTEM_EXTENSIONS" warnings
+ # Note: Enables _GNU_SOURCE on Linux
+ AC_USE_SYSTEM_EXTENSIONS
diff --git a/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch b/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch
new file mode 100644
index 0000000000..2886b73d22
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch
@@ -0,0 +1,146 @@
+Fix build with GCC-15
+
+Upstream-Status: Backport [https://sourceforge.net/p/scintilla/code/ci/c7ffad21b23dfad4e8e9f36bb587acc2f6e84fee/]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/scintilla/gtk/PlatGTK.cxx
++++ b/scintilla/gtk/PlatGTK.cxx
+@@ -5,6 +5,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cstring>
+ #include <cstdio>
+ #include <cmath>
+--- a/scintilla/src/AutoComplete.cxx
++++ b/scintilla/src/AutoComplete.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/CallTip.cxx
++++ b/scintilla/src/CallTip.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/CellBuffer.cxx
++++ b/scintilla/src/CellBuffer.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/ChangeHistory.cxx
++++ b/scintilla/src/ChangeHistory.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+ 
+ #include <stdexcept>
+--- a/scintilla/src/Decoration.cxx
++++ b/scintilla/src/Decoration.cxx
+@@ -6,6 +6,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cstring>
+ #include <cstdio>
+ #include <cstdarg>
+--- a/scintilla/src/Document.cxx
++++ b/scintilla/src/Document.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/Indicator.cxx
++++ b/scintilla/src/Indicator.cxx
+@@ -5,6 +5,7 @@
+ // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
++#include <cstdint>
+ #include <cmath>
+ 
+ #include <stdexcept>
+--- a/scintilla/src/KeyMap.cxx
++++ b/scintilla/src/KeyMap.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstdlib>
++#include <cstdint>
+ 
+ #include <stdexcept>
+ #include <string_view>
+--- a/scintilla/src/LineMarker.cxx
++++ b/scintilla/src/LineMarker.cxx
+@@ -5,6 +5,7 @@
+ // Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <cmath>
+ 
+--- a/scintilla/src/PerLine.cxx
++++ b/scintilla/src/PerLine.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstddef>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ 
+--- a/scintilla/src/Style.cxx
++++ b/scintilla/src/Style.cxx
+@@ -5,6 +5,8 @@
+ // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
++#include <cstdint>
++
+ #include <stdexcept>
+ #include <string_view>
+ #include <vector>
+--- a/scintilla/src/ViewStyle.cxx
++++ b/scintilla/src/ViewStyle.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstddef>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cmath>
+--- a/scintilla/src/XPM.cxx
++++ b/scintilla/src/XPM.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstdlib>
++#include <cstdint>
+ #include <cstring>
+ #include <climits>
+ 
diff --git a/meta-oe/recipes-devtools/geany/geany_1.38.bb b/meta-oe/recipes-devtools/geany/geany_2.0.bb
index d75e3b57fb..4b51195e08 100644
--- a/meta-oe/recipes-devtools/geany/geany_1.38.bb
+++ b/meta-oe/recipes-devtools/geany/geany_2.0.bb
@@ -11,8 +11,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "https://download.geany.org/${BP}.tar.bz2 \
            file://0001-configure-Upgrade-to-a-modern-Gettext.patch \
+           file://geany-2.0-gcc15.patch \
           "
-SRC_URI[sha256sum] = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546"
+SRC_URI[sha256sum] = "565b4cd2f0311c1e3a167ec71c4a32dba642e0fe554ae5bb6b8177b7a74ccc92"
 
 FILES:${PN} += "${datadir}/icons"
 
diff --git a/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch b/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch
deleted file mode 100644
index a01b28ac6d..0000000000
--- a/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Subject: Modify binary name "convert" to "convert.im7"
-
-The change is needed to resolve the below compilation error
-after giflib version upgrade. Log data follows:
-| DEBUG: Executing shell function do_compile
-| NOTE: make -j 8
-| make -C doc
-| make[1]: Entering directory '../giflib/5.2.2/giflib-5.2.2/doc'
-| convert ../pic/gifgrid.gif -resize 50x50 giflib-logo.gif
-| make[1]: convert: No such file or directory
-| make[1]: *** [Makefile:46: giflib-logo.gif] Error 127
-| make[1]: Leaving directory '../giflib/5.2.2/giflib-5.2.2/doc'
-| make: *** [Makefile:93: all] Error 2
-| ERROR: oe_runmake failed
-
-Added dependency on ImageMagick which includes "convert" utility,
-to ensure availability of required tool during compilation process.
-
-This patch updates the binary name used in Makefile from
-"convert" to "convert.im7" for resizing the logo image used in HTML
-documentation as Imagemagick installs binary in this format.
-
-Below commits justify the cause of adding the suffix to binaries
-provided by ImageMagic package:
-https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/imagemagick?id=dcbb49f707e7ad9bf755dd3275ffc442154b8144
-https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/imagemagick?id=6e0c24e9b3f9d430dec57f61f8c12c74bca5375d
-
-Signed-off-by:   Bhabu Bindu <bhabubindu@kpit.com>
-Upstream-Status: Inappropriate [OE specific]
-
-===================================================================
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -43,7 +43,7 @@
- 
- # Logo image file for HTML docs
- giflib-logo.gif: ../pic/gifgrid.gif
--       convert $^ -resize 50x50 $@
-+       convert.im7 $^ -resize 50x50 $@
- 
- # Philosophical choice: the website gets the internal manual pages
- allhtml: $(XMLALL:.xml=.html) giflib-logo.gif
diff --git a/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch b/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch
new file mode 100644
index 0000000000..dc87ed60b9
--- /dev/null
+++ b/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch
@@ -0,0 +1,34 @@
+From 7f0cd4b6b56183b0afbefd01425e5ebd2b8733b4 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Mon, 8 Jul 2024 13:18:11 +0200
+Subject: [PATCH] Makefile: fix typo in soname argument
+
+* introduced in:
+  https://sourceforge.net/p/giflib/code/ci/b65c7ac2905c0842e7977a7b51d83af4486ca7b8/
+  there is no LIBUTILMAJOR variable only LIBUTILSOMAJOR leading to:
+
+  ld: fatal error: -soname: must take a non-empty argument
+  collect2: error: ld returned 1 exit status
+
+  with some linkers like GOLD
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+Upstream-Status: Submitted [https://sourceforge.net/p/giflib/code/merge-requests/17/]
+
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 87966a9..41b149e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -109,7 +109,7 @@ $(LIBUTILSO): $(UOBJECTS) $(UHEADERS)
+ ifeq ($(UNAME), Darwin)
+        $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO)
+ else
+-       $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS)
++       $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILSOMAJOR) -o $(LIBUTILSO) $(UOBJECTS)
+ endif
+ 
+ libutil.a: $(UOBJECTS) $(UHEADERS)
diff --git a/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb b/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb
index 7d8a175fe3..aa47f93095 100644
--- a/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb
+++ b/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb
@@ -5,14 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a"
 
 CVE_PRODUCT = "giflib_project:giflib"
 
-DEPENDS = "xmlto-native imagemagick-native"
+DEPENDS = "xmlto-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz \
-           file://add_suffix_to_convert_binary_used_in_Makefile.patch"
+           https://sourceforge.net/p/giflib/code/ci/d54b45b0240d455bbaedee4be5203d2703e59967/tree/doc/giflib-logo.gif?format=raw;subdir=${BP}/doc;name=logo;downloadfilename=giflib-logo.gif \
+           file://0001-Makefile-fix-typo-in-soname-argument.patch \
+"
 
+SRC_URI[logo.sha256sum] = "1a54383986adad1521d00e003b4c482c27e8bc60690be944a1f3319c75abc2c9"
 SRC_URI[sha256sum] = "be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb"
 
-
 do_install() {
     # using autotools's default will end up in /usr/local
     oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install
diff --git a/meta-oe/recipes-devtools/glade/glade/CVE-2020-36774.patch b/meta-oe/recipes-devtools/glade/glade/CVE-2020-36774.patch
new file mode 100644
index 0000000000..ae44862ccf
--- /dev/null
+++ b/meta-oe/recipes-devtools/glade/glade/CVE-2020-36774.patch
@@ -0,0 +1,54 @@
+From 8f1ed202ad21c787ec406f531905b4cda64fb13c Mon Sep 17 00:00:00 2001
+From: Juan Pablo Ugarte <juanpablougarte@gmail.com>
+Date: Fri, 2 Oct 2020 16:08:23 -0300
+Subject: [PATCH] GladeGtkBox: fix glade_gtk_box_post_create
+
+Some widgets with contruct properties like GtkMessageDialog get
+rebuilt right after they are created on project loading so we need
+to check glade_project_is_loading() intead of GLADE_CREATE_LOAD
+and use the object ad the connect data to make sure it gets disconected
+if it was the object being rebuilt
+
+Fix issue #479 "Glade 3.36.0 segfaults when opening a file"
+
+CVE: CVE-2020-36774
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glade/-/commit/7acdd3c6f6934f47b8974ebc2190a59ea5d2ed17]
+
+Signed-off-by: Peng Zhang <peng.zhang1.cn@windriver.com>
+---
+ plugins/gtk+/glade-gtk-box.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/gtk+/glade-gtk-box.c b/plugins/gtk+/glade-gtk-box.c
+index 1153c957..c995524e 100644
+--- a/plugins/gtk+/glade-gtk-box.c
++++ b/plugins/gtk+/glade-gtk-box.c
+@@ -57,9 +57,9 @@ glade_gtk_box_create_editable (GladeWidgetAdaptor *adaptor,
+ }
+ 
+ static void
+-glade_gtk_box_parse_finished (GladeProject *project, GladeWidget *gbox)
++glade_gtk_box_parse_finished (GladeProject *project, GObject *box)
+ {
+-  GObject *box = glade_widget_get_object (gbox);
++  GladeWidget *gbox = glade_widget_get_from_gobject (box);
+ 
+   glade_widget_property_set (gbox, "use-center-child",
+                              gtk_box_get_center_widget (GTK_BOX (box)) != NULL);
+@@ -86,11 +86,11 @@ glade_gtk_box_post_create (GladeWidgetAdaptor *adaptor,
+   g_signal_connect (G_OBJECT (gwidget), "configure-end",
+                     G_CALLBACK (glade_gtk_box_configure_end), container);
+ 
+-  if (reason == GLADE_CREATE_LOAD)
++  if (glade_project_is_loading (project))
+     {
+       g_signal_connect_object (project, "parse-finished",
+                                G_CALLBACK (glade_gtk_box_parse_finished),
+-                               gwidget, 0);
++                               container, 0);
+     }
+ }
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-devtools/glade/glade_3.22.2.bb b/meta-oe/recipes-devtools/glade/glade_3.36.0.bb
index d11751a4b2..3645de3cc3 100644
--- a/meta-oe/recipes-devtools/glade/glade_3.22.2.bb
+++ b/meta-oe/recipes-devtools/glade/glade_3.36.0.bb
@@ -1,26 +1,33 @@
 SUMMARY = "Glade - A User Interface Designer"
-HOMEPAGE = "http://www.gnu.org/software/gnash"
+HOMEPAGE = "https://glade.gnome.org"
 LICENSE = "GPL-2.0-only & LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
-                    file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
-                    file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475"
-DEPENDS = "gtk+3 glib-2.0 libxml2 intltool-native \
+                    file://COPYING.GPL;md5=4641e94ec96f98fabc56ff9cc48be14b \
+                    file://COPYING.LGPL;md5=81227099add6b483afd7b1d4fc4e93b7"
+DEPENDS = "gtk+3 glib-2.0 libxml2 intltool-native itstool-native \
            gnome-common-native \
            autoconf-archive-native \
 "
 GNOMEBASEBUILDCLASS = "autotools"
-inherit features_check autotools pkgconfig gnomebase gobject-introspection mime-xdg gtk-doc
+inherit features_check autotools gettext pkgconfig gnomebase gobject-introspection mime-xdg gtk-doc
 
 # xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
 # cairo would at least needed to be built with xlib.
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade/3.22/glade-${PV}.tar.xz \
+SRC_URI = "${GNOME_MIRROR}/glade/3.36/glade-${PV}.tar.xz \
            file://remove-yelp-help-rules-var.patch \
+           file://CVE-2020-36774.patch \
           "
-SRC_URI[md5sum] = "c074fa378c8f1ad80d20133c4ae6f42d"
-SRC_URI[sha256sum] = "edefa6eb24b4d15bd52589121dc109bc08c286157c41288deb74dd9cc3f26a21"
+SRC_URI[sha256sum] = "19b546b527cc46213ccfc8022d49ec57e618fe2caa9aa51db2d2862233ea6f08"
 
 EXTRA_OECONF += "--disable-man-pages"
 
 FILES:${PN} += "${datadir}/glade ${datadir}/metainfo ${libdir}/glade/modules/libgladegtk.so"
+
+
+
+
+
+
+
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.60.1.bb b/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb
index 63c696a623..53867b8fe6 100644
--- a/meta-oe/recipes-devtools/grpc/grpc_1.60.1.bb
+++ b/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb
@@ -3,11 +3,15 @@ Provides gRPC libraries for multiple languages written on top of shared C core l
 (C++, Node.js, Python, Ruby, Objective-C, PHP, C#)"
 HOMEPAGE = "https://github.com/grpc/grpc"
 SECTION = "libs"
-LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906"
+LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0 & MIT & BSD-2-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906 \
+    file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \
+    file://third_party/xxhash/LICENSE;md5=cdfe7764d5685d8e08b3df302885d7f3 \
+"
 
-DEPENDS = "c-ares protobuf protobuf-native openssl libnsl2 abseil-cpp re2 zlib"
-DEPENDS:append:class-target = " googletest grpc-native "
+DEPENDS = "abseil-cpp c-ares openssl protobuf protobuf-native re2 zlib"
+DEPENDS:append:class-target = " grpc-native"
 DEPENDS:append:class-nativesdk = " grpc-native "
 
 PACKAGE_BEFORE_PN = "${PN}-compiler"
@@ -19,14 +23,11 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler"
 # Both dependencies are mutually exclusive
 # RDEPENDS:${PN}-dev += "${PN}-compiler"
 
-S = "${WORKDIR}/git"
-SRCREV_grpc = "e5ae3b6b44bf3b64d24bfb4b4f82556239b986db"
-BRANCH = "v1.60.x"
+SRCREV_grpc = "4e9357bca1408596663a218c0c608a4c0560a867"
+BRANCH = "v1.71.x"
 SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \
            file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \
            "
-# Fixes build with older compilers 4.8 especially on ubuntu 14.04
-CXXFLAGS:append:class-native = " -Wl,--no-as-needed"
 
 inherit cmake pkgconfig
 
@@ -52,7 +53,7 @@ PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUI
 PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF"
 PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF"
 PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF"
-PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF,protobuf-lite"
+PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF"
 PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,,"
 
 do_configure:prepend() {
diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb b/meta-oe/recipes-devtools/guider/guider_3.9.9.bb
index 0d93297a07..27f39ed1e1 100644
--- a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
+++ b/meta-oe/recipes-devtools/guider/guider_3.9.9.bb
@@ -1,16 +1,15 @@
-SUMMARY = "performance analyzer"
+SUMMARY = "unified performance analyzer"
 HOMEPAGE = "https://github.com/iipeace/guider"
 BUGTRACKER = "https://github.com/iipeace/guider/issues"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2"
 
-PV = "3.9.8+git"
+PV = "3.9.9"
 
-SRC_URI = "git://github.com/iipeace/${BPN};branch=master;protocol=https"
-SRCREV = "a502cd93b13235b7539557a91328de00b7c51bc3"
+SRC_URI = "git://github.com/iipeace/${BPN};branch=master;protocol=https;tag=versions/${PV}"
+SRCREV = "118ab61773463e56dedc78f5cf6723b97a4ad946"
 
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb
index be2c0f5394..3aca51ee3e 100644
--- a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb
+++ b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/KDE/heaptrack.git;protocol=https;branch=master \
 
 SRCREV = "bc9e3744bcc47de978673d1e382f4125a1ab5fa8"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
@@ -30,3 +29,33 @@ COMPATIBLE_HOST:riscv32 = "null"
 COMPATIBLE_HOST:riscv64 = "null"
 
 BBCLASSEXTEND = "native"
+
+# http://errors.yoctoproject.org/Errors/Details/766879/
+#     buildResult:
+#       variable: "LIBUNWIND_HAS_UNW_BACKTRACE"
+#       cached: true
+#       stdout: |
+#         Change Dir: '/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO'
+# 
+#         Run Build Command(s): ninja -v cmTC_51d86
+#         [1/2] ccache /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/aarch64-webos-linux-gcc --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -DLIBUNWIND_HAS_UNW_BACKTRACE  -mcpu=cortex-a72+crc -mbranch-protection=standard -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type  --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot  -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot=  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot=  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native= -o CMakeFiles/cmTC_51d86.dir/src.c.o -c /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO/src.c
+#         FAILED: CMakeFiles/cmTC_51d86.dir/src.c.o
+#         ccache /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/aarch64-webos-linux-gcc --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -DLIBUNWIND_HAS_UNW_BACKTRACE  -mcpu=cortex-a72+crc -mbranch-protection=standard -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type  --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot  -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot=  -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot=  -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native= -o CMakeFiles/cmTC_51d86.dir/src.c.o -c /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO/src.c
+#         src.c: In function 'main':
+#         src.c:3:43: error: passing argument 1 of 'unw_backtrace' from incompatible pointer type [-Wincompatible-pointer-types]
+#             3 | int main() { void* buf[10]; unw_backtrace(&buf, 10); return 0; }
+#               |                                           ^~~~
+#               |                                           |
+#               |                                           void * (*)[10]
+#         In file included from ../../../../recipe-sysroot/usr/include/libunwind-aarch64.h:232,
+#                          from ../../../../recipe-sysroot/usr/include/libunwind-64.h:7,
+#                          from ../../../../recipe-sysroot/usr/include/libunwind.h:27,
+#                          from src.c:2:
+#         ../../../../recipe-sysroot/usr/include/libunwind-common.h:290:27: note: expected 'void **' but argument is of type 'void * (*)[10]'
+#           290 | extern int unw_backtrace (void **, int);
+#               |                           ^~~~~~~
+#         ninja: build stopped: subcommand failed.
+# 
+#       exitCode: 1
+# 
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch b/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
new file mode 100644
index 0000000000..1f8730aba0
--- /dev/null
+++ b/meta-oe/recipes-devtools/icon-slicer/files/hotspotfix.patch
@@ -0,0 +1,27 @@
+Description: Fix hotspot y coordinate
+Author: Tim Swast <tswast@gmail.com>
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/main.c
++++ b/src/main.c
+@@ -103,7 +103,7 @@
+   if (n_channels == 3)
+     {
+       out->x = start_x;
+-      out->y = start_x;
++      out->y = start_y;
+       out->width = source->gridsize;
+       out->height = source->gridsize;
+       
+@@ -137,8 +137,8 @@
+                    {
+                      min_x = start_x + i;
+                      max_x = start_x + i + 1;
+-                     min_y = start_y + i;
+-                     max_y = start_y + i + 1;
++                     min_y = start_y + j;
++                     max_y = start_y + j + 1;
+ 
+                      found = TRUE;
+                    }
diff --git a/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb b/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
index 8e7b0ba5a0..f9ae4de0fb 100644
--- a/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
+++ b/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
@@ -1,13 +1,16 @@
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "gdk-pixbuf popt"
+DEPENDS = "gdk-pixbuf popt xcursorgen"
 
 SRC_URI = "http://freedesktop.org/software/${BPN}/releases/${BPN}-${PV}.tar.gz \
-           file://0001-Makefile.am-no-examples.patch"
-SRC_URI[md5sum] = "5c5374d4f265b0abe4daef1d03f87104"
+           file://0001-Makefile.am-no-examples.patch \
+           file://hotspotfix.patch \
+           "
 SRC_URI[sha256sum] = "05f0216dd0c25a17859de66357f64da5033375b6fbf5f31ca54867311160b64d"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig features_check
+# because of xcursorgen dependency
+REQUIRED_DISTRO_FEATURES = "x11"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
index cc21c8beae..aa1f417604 100644
--- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
+++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
@@ -20,7 +20,6 @@ SRCREV = "630434bb0ac619f7beec927569782d924c459385"
 PV_LONG := "${PV}-171-g${SRCREV}"
 PV .= "+git"
 
-S = "${WORKDIR}/git"
 
 inherit autotools ptest
 
diff --git a/meta-oe/recipes-devtools/jq/jq_1.7.1.bb b/meta-oe/recipes-devtools/jq/jq_1.8.0.bb
index 6b12335513..af35324b5f 100644
--- a/meta-oe/recipes-devtools/jq/jq_1.7.1.bb
+++ b/meta-oe/recipes-devtools/jq/jq_1.8.0.bb
@@ -6,13 +6,13 @@ HOMEPAGE = "https://jqlang.github.io/jq/"
 BUGTRACKER = "https://github.com/jqlang/jq/issues"
 SECTION = "utils"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=488f4e0b04c0456337fb70d1ac1758ba"
+LIC_FILES_CHKSUM = "file://COPYING;md5=08ffb5ac7e7e6bfc66968b89f01f512a"
 
 GITHUB_BASE_URI = "https://github.com/jqlang/${BPN}/releases/"
 SRC_URI = "${GITHUB_BASE_URI}/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
     file://run-ptest \
     "
-SRC_URI[sha256sum] = "478c9ca129fd2e3443fe27314b455e211e0d8c60bc8ff7df703873deeee580c2"
+SRC_URI[sha256sum] = "91811577f91d9a6195ff50c2bffec9b72c8429dc05ec3ea022fd95c06d2b319c"
 
 inherit autotools github-releases ptest
 
diff --git a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb
index 02dcdb2696..241fd328d8 100644
--- a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb
+++ b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=main;protocol=
 
 SRCREV = "6b17782d6a5d1dee5d2c4fc5d25ffb1123913431"
 
-S = "${WORKDIR}/git"
 
 DEPENDS += "nlohmann-json"
 
diff --git a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
index d6e42c81d5..56ddaf59a5 100644
--- a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
+++ b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
@@ -16,7 +16,7 @@ SRC_URI = "file://json_spirit_v${PV}.zip \
            file://0001-Link-to-libatomic.patch \
 "
 
-S = "${WORKDIR}/json_spirit_v${PV}"
+S = "${UNPACKDIR}/json_spirit_v${PV}"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb
index c54dc94666..f68ffd2c0f 100644
--- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb
+++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb
@@ -13,13 +13,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926"
 
 PE = "1"
 
-SRCREV = "5defb4ed1a4293b8e2bf641e16b156fb9de498cc"
+SRCREV = "89e2973c754a9c02a49974d839779b151e95afd6"
 SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
 EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DBUILD_OBJECT_LIBS=OFF -DJSONCPP_WITH_TESTS=OFF"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb
index 544922f05d..ae86e20a4a 100644
--- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb
+++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp;branch=master;protocol=http
 
 SRCREV = "ec5ce12fc9c0299e1454cc002c70218b5a6f005b"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[coverage] = "-DWITH_COVERAGE=YES,-DWITH_COVERAGE=NO,,"
@@ -25,4 +24,8 @@ EXTRA_OECMAKE += "-DCOMPILE_TESTS=NO -DCOMPILE_STUBGEN=NO -DCOMPILE_EXAMPLES=NO
                   -DCMAKE_LIBRARY_PATH=${libdir} \
 "
 
+do_install:append() {
+        sed -i -e 's#${RECIPE_SYSROOT}#\${CMAKE_SYSROOT}#g' ${D}${libdir}/libjson-rpc-cpp/cmake/libjson-rpc-cppTargets.cmake
+}
+
 FILES:${PN}-dev += "${libdir}/libjson-rpc-cpp/cmake"
diff --git a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.0.bb b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb
index 19424337f7..5ad953d260 100644
--- a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.0.bb
+++ b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8325a5ce4414c65ffdda392e0d96a9ff"
 SRC_URI = "git://github.com/Thalhammer/jwt-cpp.git;branch=master;protocol=https \
             "
 
-SRCREV = "08bcf77a687fb06e34138e9e9fa12a4ecbe12332"
+SRCREV = "e71e0c2d584baff06925bbb3aad683f677e4d498"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "openssl"
 
diff --git a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
index b894f0ba03..43a61908f5 100644
--- a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
+++ b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
@@ -20,7 +20,9 @@ SRC_URI = "git://gitlab.com/ymorin/kconfig-frontends.git;protocol=https;branch=4
 
 SRCREV = "f22fce3a308be1c7790ebefc6bbedb33c5f7c86a"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 inherit autotools pkgconfig
 do_configure:prepend () {
diff --git a/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb b/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb
deleted file mode 100644
index fef9d3a80e..0000000000
--- a/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-SUMMARY = "Linear Algebra PACKage"
-URL = "http://www.netlib.org/lapack"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d0e7a458f9fcbf0a3ba97cef3128b85d"
-
-# Recipe needs FORTRAN support (copied from conf/local.conf.sample.extended)
-# Enabling FORTRAN
-# Note this is not officially supported and is just illustrated here to
-# show an example of how it can be done
-# You'll also need your fortran recipe to depend on libgfortran
-#FORTRAN:forcevariable = ",fortran"
-#RUNTIMETARGET:append:pn-gcc-runtime = " libquadmath"
-
-DEPENDS = "libgfortran \
-           ${@bb.utils.contains('PTEST_ENABLED', '1', 'rsync-native', '', d)} \
-          "
-RDEPENDS:${PN}-ptest += "cmake"
-
-SRCREV = "04b044e020a3560ccfa9988c8a80a1fb7083fc2e"
-SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https;branch=master \
-           ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \
-          "
-S = "${WORKDIR}/git"
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[lapacke] = "-DLAPACKE=ON,-DLAPACKE=OFF"
-
-EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=ON \
-                  ${@bb.utils.contains('PTEST_ENABLED', '1', ' -DBUILD_TESTING=ON', '', d)} \
-                "
-OECMAKE_GENERATOR = "Unix Makefiles"
-
-inherit cmake pkgconfig ptest
-EXCLUDE_FROM_WORLD = "1"
-
-do_install_ptest () {
-    rsync -a ${B}/TESTING ${D}${PTEST_PATH} \
-          --exclude CMakeFiles \
-          --exclude cmake_install.cmake \
-          --exclude Makefile
-    rsync -a ${B}/BLAS ${D}${PTEST_PATH} \
-          --exclude CMakeFiles \
-          --exclude cmake_install.cmake \
-          --exclude Makefile
-    rsync -a ${B}/LAPACKE ${D}${PTEST_PATH} \
-          --exclude CMakeFiles \
-          --exclude cmake_install.cmake \
-          --exclude Makefile
-    cp -r ${B}/bin ${D}${PTEST_PATH}
-    cp -r ${B}/lapack_testing.py ${D}${PTEST_PATH}
-    cp ${B}/CTestTestfile.cmake ${D}${PTEST_PATH}
-    cp ${S}/TESTING/*.in ${S}/TESTING/runtest.cmake ${D}${PTEST_PATH}/TESTING
-    cp ${S}/BLAS/TESTING/*.in ${D}${PTEST_PATH}/BLAS/TESTING
-    sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
-    sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
-    sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
-    sed -i -e 's#${PYTHON}#/usr/bin/python3#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
-    sed -i -e 's#${WORKDIR}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
-}
diff --git a/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb b/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb
new file mode 100644
index 0000000000..63069b4b83
--- /dev/null
+++ b/meta-oe/recipes-devtools/lapack/lapack_3.12.1.bb
@@ -0,0 +1,105 @@
+SUMMARY = "Linear Algebra PACKage"
+URL = "http://www.netlib.org/lapack"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d0e7a458f9fcbf0a3ba97cef3128b85d"
+
+# Recipe needs FORTRAN support (copied from conf/local.conf.sample.extended)
+# Enabling FORTRAN
+# Note this is not officially supported and is just illustrated here to
+# show an example of how it can be done
+# You'll also need your fortran recipe to depend on libgfortran
+#FORTRAN:forcevariable = ",fortran"
+#RUNTIMETARGET:append:pn-gcc-runtime = " libquadmath"
+
+DEPENDS = "libgfortran \
+           ${@bb.utils.contains('PTEST_ENABLED', '1', 'rsync-native', '', d)} \
+          "
+RDEPENDS:${PN}-ptest += "cmake"
+
+SRCREV = "5ebe92156143a341ab7b14bf76560d30093cfc54"
+SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https;branch=master \
+           ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \
+          "
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[lapacke] = "-DLAPACKE=ON,-DLAPACKE=OFF"
+PACKAGECONFIG[cblas] = "-DCBLAS=ON,-DCBLAS=OFF"
+
+EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=ON \
+                  ${@bb.utils.contains('PTEST_ENABLED', '1', ' -DBUILD_TESTING=ON', '', d)} \
+                "
+OECMAKE_GENERATOR = "Unix Makefiles"
+
+inherit cmake pkgconfig ptest
+EXCLUDE_FROM_WORLD = "1"
+
+# The `xerbla.o` file contains an absolute path in `xerbla.f.o`, but the options
+# `-fdebug-prefix-map` and `-ffile-prefix-map` cannot be used because gfortran does
+# not support them. And we cannot easily change CMake to use relative paths, because
+# it will convert them to absolute paths when generating Unix Makefiles or Ninja:
+# https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#why-does-cmake-use-full-paths-or-can-i-copy-my-build-tree
+# https://gitlab.kitware.com/cmake/cmake/-/issues/13894
+#
+# To address this issue, we manually replace the absolute path with a relative path
+# in the generated `build.make` file.
+#
+# An issue has been reported: https://github.com/Reference-LAPACK/lapack/issues/1087,
+# requesting a fix in the source code.
+#
+# This workaround resolves the TMPDIR [buildpaths] issue by converting the absolute path
+# of `xerbla.f` to a relative path. The steps are as follows:
+#
+# 1. Locate all `build.make` files after the `do_configure` step is completed.
+# 2. Compute the relative path for various `*.f` files based on the current build directory.
+# 3. Replace the absolute path with the calculated relative path in the `build.make` files
+#
+# Additionally, when ptests are enabled, apply a simpler workaround for ptest code:
+# - Replace occurrences of `${WORKDIR}` in all `build.make` files under the TESTING directory, excluding
+#   the MATGEN subdirectory, with a relative path prefix of `"../../.."`.
+do_configure:append(){
+    for file in `find ${B} -name build.make`; do
+        # Replacing all .f files found with:
+        # for f in $(find ${S} -name \*.f -printf " %f" | sort -u); do
+        # would be more reliable with other optional PACKAGECONFIGs, but also very slow as there are
+        # ~ 3500 of them and this loop takes around 20 minutes
+        for f in xerbla.f c_cblat1.f c_cblat2.f c_cblat3.f c_dblat1.f c_dblat2.f c_dblat3.f c_sblat1.f c_sblat2.f c_sblat3.f c_zblat1.f c_zblat2.f c_zblat3.f cchkdmd.f90 dchkdmd.f90 schkdmd.f90 zchkdmd.f90; do
+            sed -i -e "s#\(.*-c \).*\(/$f \)#\1$(grep "\-c .*$f" $file | awk -F'cd ' '{print $2}'| \
+                awk "{src=\$1; sub(/.*-c /, \"\"); sub(/$f.*/, \"\"); obj=\$0; print src, obj}" | \
+                while read src obj; do echo "$(realpath --relative-to="$src" "$obj")"; done)\2#g" $file
+         done
+    done
+    if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)} ; then
+        for file in `find . -name build.make -path '*TESTING*' -not -path '*MATGEN*'`; do
+            sed -i -e "s#\(.*-c \)\(${WORKDIR}\)\(.*.[f|F] \)#\1../../..\3#g" $file
+        done
+    fi
+}
+
+do_install_ptest () {
+    rsync -a ${B}/TESTING ${D}${PTEST_PATH} \
+          --exclude CMakeFiles \
+          --exclude cmake_install.cmake \
+          --exclude Makefile
+    rsync -a ${B}/BLAS ${D}${PTEST_PATH} \
+          --exclude CMakeFiles \
+          --exclude cmake_install.cmake \
+          --exclude Makefile
+    rsync -a ${B}/LAPACKE ${D}${PTEST_PATH} \
+          --exclude CMakeFiles \
+          --exclude cmake_install.cmake \
+          --exclude Makefile \
+          --exclude lapacke.pc
+    cp -r ${B}/bin ${D}${PTEST_PATH}
+    cp -r ${B}/lapack_testing.py ${D}${PTEST_PATH}
+    cp ${B}/CTestTestfile.cmake ${D}${PTEST_PATH}
+    cp ${S}/TESTING/*.in ${S}/TESTING/runtest.cmake ${D}${PTEST_PATH}/TESTING
+    cp ${S}/BLAS/TESTING/*.in ${D}${PTEST_PATH}/BLAS/TESTING
+    sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${PYTHON}#/usr/bin/python3#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+    sed -i -e 's#${WORKDIR}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake`
+}
+
+# It needs fortran compiler and we do not enable fortran with clang yet
+TOOLCHAIN = "gcc"
diff --git a/meta-oe/recipes-devtools/ldns/ldns_1.8.3.bb b/meta-oe/recipes-devtools/ldns/ldns_1.8.4.bb
index 16816e62d8..f071f579df 100644
--- a/meta-oe/recipes-devtools/ldns/ldns_1.8.3.bb
+++ b/meta-oe/recipes-devtools/ldns/ldns_1.8.4.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34330f15b2b4abbbaaa7623f79a6a019"
 
 SRC_URI = "https://www.nlnetlabs.nl/downloads/ldns/ldns-${PV}.tar.gz"
-SRC_URI[sha256sum] = "c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860"
+SRC_URI[sha256sum] = "838b907594baaff1cd767e95466a7745998ae64bc74be038dccc62e2de2e4247"
 
 DEPENDS = "openssl"
 
@@ -19,5 +19,6 @@ do_install:append() {
     sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \
         -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
         -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \
-        -i ${D}${libdir}/pkgconfig/*.pc
+        -e 's@${RECIPE_SYSROOT}@@g' \
+        -i ${D}${libdir}/pkgconfig/*.pc ${D}${bindir}/ldns-config
 }
diff --git a/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb b/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb
index 2904a454dc..8a8491b76b 100644
--- a/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb
+++ b/meta-oe/recipes-devtools/lemon/lemon_3.44.2.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/sqlite/sqlite;protocol=https;branch=branch-3.44"
 
 SRCREV = "c8f9803dc32bfee78a9ca2b1abbe39499729219b"
 
-S = "${WORKDIR}/git"
 
 do_compile() {
     ${CC} ${CFLAGS} ${LDFLAGS} tool/lemon.c -o lemon
diff --git a/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch b/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch
new file mode 100644
index 0000000000..7c500e0b54
--- /dev/null
+++ b/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch
@@ -0,0 +1,91 @@
+From 0db4af09f1bf4456527b5f6ec60fc1305e770c4c Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Tue, 9 Jul 2024 15:19:35 +0100
+Subject: [PATCH] configure.ac: improve fts checks
+
+The current code checks explicitly for musl and if so uses pkg-config to
+find fts-standalone. This is suboptimal because musl may not be the only
+libc to need a standalone fts implementation, and fts-standalone is an
+old gentoo-specific name[1] so libabigail won't build on any other system
+against musl.
+
+Instead, use AC_SEARCH_LIBS to look for fts_open in libc then libfts. Do
+this before the check for behaviour just in case someone has a standalone
+and broken implementation.  I assume that the standalone fts is installed
+on the standard search path, which should be a fair assumption.
+
+As we're not using pkg-config anymore the required link flags are now in
+LIBS, so remove all instances of FTS_CFLAGS and FTS_LIBS.
+
+[1] https://gitweb.gentoo.org/repo/gentoo.git/commit/sys-libs/fts-standalone?id=a403fe6c61d1aaeecd58d521f3def2f6d3513449
+
+Upstream-Status: Submitted [https://sourceware.org/pipermail/libabigail/2024q3/005973.html]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ configure.ac      | 9 ++++-----
+ src/Makefile.am   | 4 ++--
+ tools/Makefile.am | 2 --
+ 3 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e118a9c0..0aff2ec2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -281,6 +281,10 @@ fi
+ 
+ AC_SUBST(VISIBILITY_FLAGS)
+ 
++# glibc and BSD include fts into their libc, but musl does not so check if we
++# need to explicitly link to the standalone musl-fts.
++AC_SEARCH_LIBS([fts_open], [fts])
++
+ dnl Older glibc had a broken fts that didn't work with Large File Systems.
+ dnl We want the version that can handler LFS, but include workaround if we
+ dnl get a bad one. Add define to CFLAGS (not AC_DEFINE it) since we need to
+@@ -295,11 +299,6 @@ AS_IF([test "x$ac_cv_bad_fts" = "xyes"],
+       [CFLAGS="$CFLAGS -DBAD_FTS=1",
+        CXXFLAGS="$CXXFLAGS -DBAD_FTS=1"])
+ 
+-dnl On musl, we need to find fts-standalone
+-AS_CASE(
+-  [${host_os}], [*-musl*], [
+-    PKG_CHECK_MODULES([FTS], [fts-standalone])
+-])
+ 
+ dnl Check for dependency: libelf, libdw, libebl (elfutils)
+ dnl Note that we need to use at least elfutils 0.159 but
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3044c136..1c98bf84 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -52,12 +52,12 @@ if BTF_READER
+ libabigail_la_SOURCES += abg-btf-reader.cc
+ endif
+ 
+-libabigail_la_LIBADD = $(DEPS_LIBS) $(FTS_LIBS)
++libabigail_la_LIBADD = $(DEPS_LIBS)
+ libabigail_la_LDFLAGS = -lpthread -Wl,--as-needed -no-undefined -version-info $(LIBABIGAIL_SO_CURRENT):$(LIBABIGAIL_SO_REVISION):$(LIBABIGAIL_SO_AGE)
+ 
+ CUSTOM_MACROS = -DABIGAIL_ROOT_SYSTEM_LIBDIR=\"${libdir}\"
+ 
+ AM_CPPFLAGS=\
+-$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) $(FTS_CFLAGS) \
++$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) \
+ -Wall -I$(abs_top_srcdir) -I$(abs_top_srcdir)/include \
+ -I$(abs_top_builddir)/include -I$(abs_top_builddir)
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index cbb5ce10..ea2d300c 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -41,8 +41,6 @@ abicompatdir = $(bindir)
+ 
+ abipkgdiff_SOURCES = abipkgdiff.cc
+ abipkgdiffdir = $(bindir)
+-abipkgdiff_CPPFLAGS = $(FTS_CFLAGS)
+-abipkgdiff_LDADD = $(FTS_LIBS)
+ abipkgdiff_LDFLAGS = $(abs_top_builddir)/src/libabigail.la -pthread
+ 
+ kmidiff_SOURCES = kmidiff.cc
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb b/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb
new file mode 100644
index 0000000000..5c262d2880
--- /dev/null
+++ b/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb
@@ -0,0 +1,17 @@
+SUMMARY = "The ABI Generic Analysis and Instrumentation Library"
+HOMEPAGE = "https://sourceware.org/libabigail/"
+
+LICENSE = "Apache-2.0-with-LLVM-exception"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab"
+
+SRC_URI = "http://mirrors.kernel.org/sourceware/${BPN}/${BP}.tar.xz \
+           file://0001-Check-for-correct-fts-module.patch \
+           "
+SRC_URI[sha256sum] = "7cfc4e9b00ae38d87fb0c63beabb32b9cbf9ce410e52ceeb5ad5b3c5beb111f3"
+
+DEPENDS = "elfutils libxml2"
+DEPENDS:append:libc-musl = " fts"
+
+inherit autotools pkgconfig lib_package
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb b/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb
deleted file mode 100644
index 4f9099ff0f..0000000000
--- a/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "libgee is a collection library providing GObject-based interfaces \
-and classes for commonly used data structures."
-HOMEPAGE = "http://live.gnome.org/Libgee"
-SECTION = "libs"
-DEPENDS = "glib-2.0"
-
-BBCLASSEXTEND = "native"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-
-GNOMEBASEBUILDCLASS = "autotools"
-inherit gnomebase vala gobject-introspection
-
-CFLAGS += "-Wno-incompatible-pointer-types"
-
-do_configure:prepend() {
-    MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
-    for i in ${MACROS}; do
-        rm -f m4/$i
-    done
-}
-
-SRC_URI[archive.sha256sum] = "1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d"
diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.20.8.bb b/meta-oe/recipes-devtools/libgee/libgee_0.20.8.bb
new file mode 100644
index 0000000000..7e29c72c02
--- /dev/null
+++ b/meta-oe/recipes-devtools/libgee/libgee_0.20.8.bb
@@ -0,0 +1,58 @@
+DESCRIPTION = "libgee is a collection library providing GObject-based interfaces \
+and classes for commonly used data structures."
+HOMEPAGE = "http://live.gnome.org/Libgee"
+SECTION = "libs"
+DEPENDS = "glib-2.0"
+
+BBCLASSEXTEND = "native"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+
+GNOMEBASEBUILDCLASS = "autotools"
+inherit gnomebase vala gobject-introspection
+
+CFLAGS += "-Wno-incompatible-pointer-types"
+
+do_configure:prepend() {
+    MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
+    for i in ${MACROS}; do
+        rm -f m4/$i
+    done
+}
+
+SRC_URI[archive.sha256sum] = "189815ac143d89867193b0c52b7dc31f3aa108a15f04d6b5dca2b6adfad0b0ee"
+
+# http://errors.yoctoproject.org/Errors/Details/766884/
+# libgee-0.20.6/gee/concurrentlist.c:1169:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:1175:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2385:194: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2438:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2460:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2469:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2481:185: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2640:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2641:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:2750:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:469:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:514:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentlist.c:713:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:3635:185: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:4950:201: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5378:201: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5428:226: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5480:218: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5530:238: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5532:234: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5623:246: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:5625:242: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:7088:194: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:7157:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:7184:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:7198:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/concurrentset.c:7215:185: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/hashmap.c:4089:30: error: assignment to 'gboolean (*)(GeeMapIterator *)' {aka 'int (*)(struct _GeeMapIterator *)'} from incompatible pointer type 'gboolean (*)(GeeHashMapNodeIterator *)' {aka 'int (*)(struct _GeeHashMapNodeIterator *)'} [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/hazardpointer.c:430:134: error: passing argument 4 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/hazardpointer.c:430:171: error: passing argument 5 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/hazardpointer.c:434:134: error: passing argument 4 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types]
+# libgee-0.20.6/gee/hazardpointer.c:434:171: error: passing argument 5 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb b/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
index 9b18269bcb..3616eb519d 100644
--- a/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
+++ b/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
@@ -16,7 +16,6 @@ inherit autotools-brokensep pkgconfig
 # sombok-2.4.0
 SRCREV = "0098d85a037ef5c99a648a3669a077781a45e8cc"
 
-S = "${WORKDIR}/git"
 
 # Disable libthai support
 EXTRA_OECONF = "--disable-libthai"
diff --git a/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch
new file mode 100644
index 0000000000..c8c9922d55
--- /dev/null
+++ b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch
@@ -0,0 +1,46 @@
+From dee78f822d8a5b985e565e5c1ef42a59557aa8fc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 7 Mar 2025 11:35:46 -0800
+Subject: [PATCH] Remove whitespace in operator""
+
+Clang 20+ errors about this whitespace.
+
+Fixes
+include/toml11/impl/../fwd/literal_fwd.hpp:22:26: error: identifier '_toml' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator]
+|    22 | ::toml::value operator"" _toml(const char* str, std::size_t len);
+|       |               ~~~~~~~~~~~^~~~~
+|       |               operator""_toml
+
+Upstream-Status: Submitted [https://github.com/ToruNiina/toml11/pull/285]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/toml11/fwd/literal_fwd.hpp   | 2 +-
+ include/toml11/impl/literal_impl.hpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/toml11/fwd/literal_fwd.hpp b/include/toml11/fwd/literal_fwd.hpp
+index e46612c..82f62b7 100644
+--- a/include/toml11/fwd/literal_fwd.hpp
++++ b/include/toml11/fwd/literal_fwd.hpp
+@@ -19,7 +19,7 @@ inline namespace literals
+ inline namespace toml_literals
+ {
+ 
+-::toml::value operator"" _toml(const char* str, std::size_t len);
++::toml::value operator""_toml(const char* str, std::size_t len);
+ 
+ #if defined(TOML11_HAS_CHAR8_T)
+ // value of u8"" literal has been changed from char to char8_t and char8_t is
+diff --git a/include/toml11/impl/literal_impl.hpp b/include/toml11/impl/literal_impl.hpp
+index e8298c2..067d4ed 100644
+--- a/include/toml11/impl/literal_impl.hpp
++++ b/include/toml11/impl/literal_impl.hpp
+@@ -115,7 +115,7 @@ inline namespace toml_literals
+ {
+ 
+ TOML11_INLINE ::toml::value
+-operator"" _toml(const char* str, std::size_t len)
++operator""_toml(const char* str, std::size_t len)
+ {
+     if(len == 0)
+     {
diff --git a/meta-oe/recipes-devtools/libtoml11/files/run-ptest b/meta-oe/recipes-devtools/libtoml11/files/run-ptest
new file mode 100755
index 0000000000..9bc480aa7f
--- /dev/null
+++ b/meta-oe/recipes-devtools/libtoml11/files/run-ptest
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+cd tests
+for atest in test_* ; do
+    rm -rf tests.log
+    ./${atest} > tests.log 2>&1
+    if [ $? = 0 ] ; then
+        echo "PASS: ${atest}"
+    else
+        echo "FAIL: ${atest}"
+    fi
+done
diff --git a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
new file mode 100644
index 0000000000..38786b79ed
--- /dev/null
+++ b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
@@ -0,0 +1,38 @@
+SUMMARY = "TOML for Modern C++"
+DESCRIPTION = "toml11 is a feature-rich TOML language library for \
+               C++11/14/17/20."
+
+HOMEPAGE = "https://github.com/ToruNiina/toml11"
+
+SECTION = "libs"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=44d1fcf70c7aa6991533c38daf7befa3"
+
+PE = "1"
+
+SRCREV = "be08ba2be2a964edcdb3d3e3ea8d100abc26f286"
+SRCREV_json = "8c391e04fe4195d8be862c97f38cfe10e2a3472e"
+SRCREV_doctest = "ae7a13539fb71f270b87eb2e874fbac80bc8dda2"
+
+SRC_URI = "git://github.com/ToruNiina/toml11;branch=main;protocol=https \
+           git://github.com/nlohmann/json;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/tests/extlib/json;name=json;branch=develop;protocol=https \
+           git://github.com/doctest/doctest;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/tests/extlib/doctest;name=doctest;branch=master;protocol=https \
+           file://0001-Remove-whitespace-in-operator.patch \
+           file://run-ptest \
+"
+SRCREV_FORMAT = "json_doctest"
+
+
+inherit cmake ptest
+
+EXTRA_OECMAKE += "-DTOML11_PRECOMPILE=ON \
+                  -DTOML11_BUILD_TESTS=${@bb.utils.contains("DISTRO_FEATURES", "ptest", "ON", "OFF", d)} \
+"
+
+ALLOW_EMPTY:${PN} = "1"
+
+do_install_ptest () {
+    install -d ${D}${PTEST_PATH}/tests
+    cp -r ${B}/tests/test_* ${D}${PTEST_PATH}/tests
+}
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-oe/recipes-devtools/libubox/libubox_git.bb
index 39e18cdafd..394cf9c000 100644
--- a/meta-oe/recipes-devtools/libubox/libubox_git.bb
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -22,7 +22,9 @@ SRC_URI = "\
 SRCREV = "07413cce72e19520af55dfcbc765484f5ab41dd9"
 PV = "1.0.1+git"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-devtools/lshw/lshw_02.20.bb b/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
index 0fb68d8684..95e2084255 100644
--- a/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
+++ b/meta-oe/recipes-devtools/lshw/lshw_02.20.bb
@@ -18,7 +18,6 @@ SRC_URI = " \
     file://0001-disable-docbook2man.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch
deleted file mode 100644
index c896e3ebb0..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 95ff340a74af16cca89fd5c5ca99890821053209 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 22 Apr 2017 00:47:16 -0700
-Subject: [PATCH] ARM code has unreachable code after switch statement move
- initialization
-
-Fixed
-sysdeps/linux-gnu/arm/trace.c:173:33: error: statement will never be executed [-Werror=switch-unreachable]
-    uint32_t operand1, operand2, result = 0;
-                                 ^~~~~~
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- sysdeps/linux-gnu/arm/trace.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c
-index 5e51e91..f974d1f 100644
---- a/sysdeps/linux-gnu/arm/trace.c
-+++ b/sysdeps/linux-gnu/arm/trace.c
-@@ -155,6 +155,8 @@ arm_get_next_pcs(struct process *proc,
-        const unsigned cond = BITS(this_instr, 28, 31);
-        const unsigned opcode = BITS(this_instr, 24, 27);
- 
-+       uint32_t operand1, operand2, result = 0;
-+
-        if (cond == COND_NV)
-                switch (opcode) {
-                        arch_addr_t addr;
-@@ -170,7 +172,6 @@ arm_get_next_pcs(struct process *proc,
-                }
-        else
-                switch (opcode) {
--                       uint32_t operand1, operand2, result = 0;
-                case 0x0:
-                case 0x1:                       /* data processing */
-                case 0x2:
--- 
-2.12.2
-
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch
deleted file mode 100644
index a599d0e191..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From 0af8ced6376f2256b9daac301c851e1c99c3b035 Mon Sep 17 00:00:00 2001
-From: Adam Trhon <adam.trhon@tbs-biometrics.com>
-Date: Fri, 12 May 2017 13:39:11 +0200
-Subject: [PATCH] Fix tautological compare warning
-
-By default, gcc ignores warning from code generated by macros
-(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80369). When
-ltrace is compiled under icecream the warning *is generated*
-(https://github.com/icecc/icecream/issues/202)
-and the compilation fails (because of -Werror).
-
-Upstream-Status: Submitted [ltrace-devel@lists.alioth.debian.org]
-
-Signed-off-by: Adam Trhon <adam.trhon@tbs-biometrics.com>
----
- filter.c                        | 4 ++--
- sysdeps/linux-gnu/arm/fetch.c   | 2 +-
- sysdeps/linux-gnu/arm/trace.c   | 2 +-
- sysdeps/linux-gnu/ia64/fetch.c  | 2 +-
- sysdeps/linux-gnu/metag/trace.c | 2 +-
- sysdeps/linux-gnu/mips/plt.c    | 2 +-
- sysdeps/linux-gnu/ppc/fetch.c   | 2 +-
- sysdeps/linux-gnu/ppc/plt.c     | 2 +-
- sysdeps/linux-gnu/ppc/trace.c   | 4 ++--
- sysdeps/linux-gnu/s390/fetch.c  | 2 +-
- sysdeps/linux-gnu/s390/trace.c  | 4 ++--
- sysdeps/linux-gnu/x86/fetch.c   | 2 +-
- sysdeps/linux-gnu/x86/trace.c   | 4 ++--
- value.c                         | 4 ++--
- 14 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/filter.c b/filter.c
-index ba50c40..a65856d 100644
---- a/filter.c
-+++ b/filter.c
-@@ -79,7 +79,7 @@ filter_lib_matcher_name_init(struct filter_lib_matcher *matcher,
- {
-        switch (type) {
-        case FLM_MAIN:
--               assert(type != type);
-+               assert(!"Unexpected value of type");
-                abort();
- 
-        case FLM_SONAME:
-@@ -137,7 +137,7 @@ matcher_matches_library(struct filter_lib_matcher *matcher, struct library *lib)
-        case FLM_MAIN:
-                return lib->type == LT_LIBTYPE_MAIN;
-        }
--       assert(matcher->type != matcher->type);
-+       assert(!"Unexpected value of matcher->type");
-        abort();
- }
- 
-diff --git a/sysdeps/linux-gnu/arm/fetch.c b/sysdeps/linux-gnu/arm/fetch.c
-index b500448..8f75fcf 100644
---- a/sysdeps/linux-gnu/arm/fetch.c
-+++ b/sysdeps/linux-gnu/arm/fetch.c
-@@ -317,7 +317,7 @@ arch_fetch_retval(struct fetch_context *ctx, enum tof type,
-                memmove(data, ctx->regs.uregs, sz);
-                return 0;
-        }
--       assert(info->type != info->type);
-+       assert(!"Unexpected value of info->type");
-        abort();
- }
- 
-diff --git a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c
-index 5e51e91..e76bf63 100644
---- a/sysdeps/linux-gnu/arm/trace.c
-+++ b/sysdeps/linux-gnu/arm/trace.c
-@@ -701,7 +701,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info)
-                return (size_t)-2;
- 
-        default:
--               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
- }
-diff --git a/sysdeps/linux-gnu/ia64/fetch.c b/sysdeps/linux-gnu/ia64/fetch.c
-index 171c7a2..ee2fbc7 100644
---- a/sysdeps/linux-gnu/ia64/fetch.c
-+++ b/sysdeps/linux-gnu/ia64/fetch.c
-@@ -409,7 +409,7 @@ arch_fetch_arg_next(struct fetch_context *ctx, enum tof type,
-        case ARGTYPE_ARRAY:
-                /* Arrays decay into pointers.  XXX Fortran?  */
-        default:
--               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
- }
-diff --git a/sysdeps/linux-gnu/metag/trace.c b/sysdeps/linux-gnu/metag/trace.c
-index ad5fffe..7a843d6 100644
---- a/sysdeps/linux-gnu/metag/trace.c
-+++ b/sysdeps/linux-gnu/metag/trace.c
-@@ -142,7 +142,7 @@ get_regval_from_unit(enum metag_unitnum unit, unsigned int reg,
-                return regs->ax[reg][0];
-        /* We really shouldn't be here.  */
-        default:
--               assert(unit != unit);
-+               assert(!"Unexpected value of unit");
-                abort();
-        }
-        return 0;
-diff --git a/sysdeps/linux-gnu/mips/plt.c b/sysdeps/linux-gnu/mips/plt.c
-index c7c10ac..ca2307d 100644
---- a/sysdeps/linux-gnu/mips/plt.c
-+++ b/sysdeps/linux-gnu/mips/plt.c
-@@ -651,7 +651,7 @@ mips_stub_bp_continue(struct breakpoint *bp, struct process *proc)
-                break;
-        }
- 
--       assert(bp->libsym->arch.type != bp->libsym->arch.type);
-+       assert(!"Unexpected value of bp->libsym->arch.type");
-        abort();
- }
- 
-diff --git a/sysdeps/linux-gnu/ppc/fetch.c b/sysdeps/linux-gnu/ppc/fetch.c
-index c6cbd71..5db5675 100644
---- a/sysdeps/linux-gnu/ppc/fetch.c
-+++ b/sysdeps/linux-gnu/ppc/fetch.c
-@@ -502,7 +502,7 @@ allocate_argument(struct fetch_context *ctx, struct process *proc,
-        case ARGTYPE_ARRAY:
-                /* Arrays decay into pointers.  XXX Fortran?  */
-        default:
--               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
- 
-diff --git a/sysdeps/linux-gnu/ppc/plt.c b/sysdeps/linux-gnu/ppc/plt.c
-index 5f81889..781da03 100644
---- a/sysdeps/linux-gnu/ppc/plt.c
-+++ b/sysdeps/linux-gnu/ppc/plt.c
-@@ -1085,7 +1085,7 @@ ppc_plt_bp_continue(struct breakpoint *bp, struct process *proc)
-                break;
-        }
- 
--       assert(bp->libsym->arch.type != bp->libsym->arch.type);
-+       assert(!"Unexpected value of bp->libsym->arch.type");
-        abort();
- }
- 
-diff --git a/sysdeps/linux-gnu/ppc/trace.c b/sysdeps/linux-gnu/ppc/trace.c
-index 5aab538..caa6035 100644
---- a/sysdeps/linux-gnu/ppc/trace.c
-+++ b/sysdeps/linux-gnu/ppc/trace.c
-@@ -217,7 +217,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info)
-                return (size_t)-2;
- 
-        default:
--               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-                break;
-        }
-@@ -231,7 +231,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info)
- 
-        switch (info->type) {
-        default:
--               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-                break;
- 
-diff --git a/sysdeps/linux-gnu/s390/fetch.c b/sysdeps/linux-gnu/s390/fetch.c
-index 4ad5951..4721c30 100644
---- a/sysdeps/linux-gnu/s390/fetch.c
-+++ b/sysdeps/linux-gnu/s390/fetch.c
-@@ -266,7 +266,7 @@ arch_fetch_arg_next(struct fetch_context *ctx, enum tof type,
-                return allocate_gpr(ctx, proc, info, valuep, sz);
- 
-        default:
--               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
-        return -1;
-diff --git a/sysdeps/linux-gnu/s390/trace.c b/sysdeps/linux-gnu/s390/trace.c
-index 78b04c3..24f7801 100644
---- a/sysdeps/linux-gnu/s390/trace.c
-+++ b/sysdeps/linux-gnu/s390/trace.c
-@@ -213,7 +213,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info)
-                return (size_t)-2;
- 
-        default:
--               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
- }
-@@ -226,7 +226,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info)
- 
-        switch (info->type) {
-        default:
--               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                break;
- 
-        case ARGTYPE_CHAR:
-diff --git a/sysdeps/linux-gnu/x86/fetch.c b/sysdeps/linux-gnu/x86/fetch.c
-index 6868101..ae2ed79 100644
---- a/sysdeps/linux-gnu/x86/fetch.c
-+++ b/sysdeps/linux-gnu/x86/fetch.c
-@@ -523,7 +523,7 @@ classify(struct process *proc, struct fetch_context *context,
- 
-        default:
-                /* Unsupported type.  */
--               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
-        abort();
-diff --git a/sysdeps/linux-gnu/x86/trace.c b/sysdeps/linux-gnu/x86/trace.c
-index 6a1a6a5..d8d2115 100644
---- a/sysdeps/linux-gnu/x86/trace.c
-+++ b/sysdeps/linux-gnu/x86/trace.c
-@@ -145,7 +145,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info)
-                return (size_t)-2;
- 
-        default:
--               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-        }
- }
-@@ -158,7 +158,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info)
- 
-        switch (info->type) {
-        default:
--               assert(info->type != info->type);
-+               assert(!"Unexpected value of info->type");
-                abort();
-                break;
- 
-diff --git a/value.c b/value.c
-index 2125ba9..30edb4e 100644
---- a/value.c
-+++ b/value.c
-@@ -363,7 +363,7 @@ value_set_word(struct value *value, long word)
-                u.u64 = word;
-                break;
-        default:
--               assert(sz != sz);
-+               assert(!"Unexpected value of sz");
-                abort();
-        }
- 
-@@ -414,7 +414,7 @@ value_extract_word(struct value *value, long *retp,
-                *retp = (long)u.u64;
-                return 0;
-        default:
--               assert(sz != sz);
-+               assert(!"Unexpected value of sz");
-                abort();
-        }
- }
--- 
-2.12.0
-
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch
deleted file mode 100644
index 9def41ca60..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 67a8fa478a4484bc4dbfb3ac74e11be1dd5af594 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 23 Dec 2019 19:35:48 -0800
-Subject: [PATCH] ensure the struct pointers are null initilized
-
-Do not delete if pointer is already null
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- expr.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/expr.c b/expr.c
-index 4059a32..5ffd0ad 100644
---- a/expr.c
-+++ b/expr.c
-@@ -189,10 +189,8 @@ int
- expr_clone(struct expr_node *retp, const struct expr_node *node)
- {
-        *retp = *node;
--
-+       struct expr_node *nlhs = 0, *nrhs = 0;
-        switch (node->kind) {
--               struct expr_node *nlhs;
--               struct expr_node *nrhs;
- 
-        case EXPR_OP_ARGNO:
-        case EXPR_OP_SELF:
-@@ -236,8 +234,10 @@ expr_clone(struct expr_node *retp, const struct expr_node *node)
-                if (expr_alloc_and_clone(&nlhs, node->lhs, node->own_lhs) < 0) {
-                        if (node->kind == EXPR_OP_CALL2
-                            && node->u.call.own_rhs) {
--                               expr_destroy(nrhs);
--                               free(nrhs);
-+                               if (nrhs) {
-+                                       expr_destroy(nrhs);
-+                                       free(nrhs);
-+                               }
-                                return -1;
-                        }
-                }
--- 
-2.24.1
-
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch
deleted file mode 100644
index 4793e561c0..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f47672bed5905ae382e80b09dafca9a8da45aa67 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 19 Apr 2022 18:44:36 -0700
-Subject: [PATCH] ppc/plt: do not free symbol libsym
-
-delete_symbol_chain() will call free as well if sybol is non-null
-it also fixes use-after-free warnings that compiler emits
-
-Upstream-Status: Submitted [https://gitlab.com/cespedes/ltrace/-/merge_requests/2]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- sysdeps/linux-gnu/ppc/plt.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/sysdeps/linux-gnu/ppc/plt.c b/sysdeps/linux-gnu/ppc/plt.c
-index 5f81889..7c1c025 100644
---- a/sysdeps/linux-gnu/ppc/plt.c
-+++ b/sysdeps/linux-gnu/ppc/plt.c
-@@ -687,7 +687,6 @@ arch_elf_add_func_entry(struct process *proc, struct ltelf *lte,
-                if (libsym == NULL
-                    || library_symbol_init(libsym, addr, full_name, 1,
-                                           LS_TOPLT_NONE) < 0) {
--                       free(libsym);
-                        delete_symbol_chain(libsym);
-                        libsym = NULL;
-                        fprintf(stderr, "Couldn't add symbol %s"
--- 
-2.36.0
-
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch
new file mode 100644
index 0000000000..3e166f0deb
--- /dev/null
+++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch
@@ -0,0 +1,34 @@
+From f2f6082cb112cf3b8a6a5bfc989e4a4f6a1bff27 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 3 Sep 2024 20:41:20 +0000
+Subject: [PATCH] proc: Make PROC_PID_FILE not use variable length array
+
+This helps in compiling with clang which is not happy about VLA
+
+| ../../../git/sysdeps/linux-gnu/proc.c:70:3: error: variable length array folded to constant array as an extension [-Werror,-Wgnu-folding-constant]
+|    70 |                 PROC_PID_FILE(proc_exe, "/proc/%d/exe", pid);
+|       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+| ../../../git/sysdeps/linux-gnu/proc.c:59:11: note: expanded from macro 'PROC_PID_FILE'
+|    59 |         char VAR[strlen(FORMAT) + 6];           \
+|       |                  ^~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ sysdeps/linux-gnu/proc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c
+index b954997..f37e4e8 100644
+--- a/sysdeps/linux-gnu/proc.c
++++ b/sysdeps/linux-gnu/proc.c
+@@ -56,7 +56,8 @@
+ #define        MAX_DELAY       100000  /* 100000 microseconds = 0.1 seconds */
+ 
+ #define PROC_PID_FILE(VAR, FORMAT, PID)                \
+-       char VAR[strlen(FORMAT) + 6];           \
++       enum { buflen_ ## VAR = strlen(FORMAT)};                \
++       char VAR[buflen_ ## VAR + 6];           \
+        sprintf(VAR, FORMAT, PID)
+ 
+ /*
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch
deleted file mode 100644
index 65c7d535eb..0000000000
--- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 64f98f84fd88797e219f9dde1ca387fee4b509f0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 24 Apr 2016 16:58:17 -0700
-Subject: [PATCH] replace readdir_r with readdir
-
-glibc 2.24 has deprecated readdir_r
-
-https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Submitted
-
- sysdeps/linux-gnu/proc.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c
-index 953fd86..edb716d 100644
---- a/sysdeps/linux-gnu/proc.c
-+++ b/sysdeps/linux-gnu/proc.c
-@@ -242,9 +242,10 @@ process_tasks(pid_t pid, pid_t **ret_tasks, size_t *ret_n)
-        size_t alloc = 0;
- 
-        while (1) {
--               struct dirent entry;
-                struct dirent *result;
--               if (readdir_r(d, &entry, &result) != 0) {
-+               errno = 0;
-+               result = readdir(d);
-+               if (errno != 0) {
-                fail:
-                        free(tasks);
-                        closedir(d);
--- 
-2.8.0
-
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
index 63971970cf..f84d989eef 100644
--- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
+++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
@@ -11,36 +11,31 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
 PE = "1"
 PV = "7.91+git"
-SRCREV = "c22d359433b333937ee3d803450dc41998115685"
+SRCREV = "8eabf684ba6b11ae7a1a843aca3c0657c6329d73"
 
 DEPENDS = "elfutils"
-SRC_URI = "git://github.com/sparkleholic/ltrace.git;protocol=https;branch=master \
+SRC_URI = "git://gitlab.com/cespedes/ltrace.git;protocol=https;branch=main \
            file://configure-allow-to-disable-selinux-support.patch \
-           file://0001-replace-readdir_r-with-readdir.patch \
            file://0001-Use-correct-enum-type.patch \
            file://0002-Fix-const-qualifier-error.patch \
-           file://0001-ARM-code-has-unreachable-code-after-switch-statement.patch \
-           file://0001-Fix-tautological-compare-warning.patch \
            file://0001-Add-support-for-mips64-n32-n64.patch \
            file://0001-configure-Recognise-linux-musl-as-a-host-OS.patch \
            file://0001-mips-plt.c-Delete-include-error.h.patch \
            file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \
            file://0001-hook-Do-not-append-int-to-std-string.patch \
            file://0001-Bug-fix-for-data-type-length-judgment.patch \
-           file://0001-ensure-the-struct-pointers-are-null-initilized.patch \
            file://0001-ppc-Remove-unused-host_powerpc64-function.patch \
            file://0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch \
-           file://0001-ppc-plt-do-not-free-symbol-libsym.patch \
            file://0001-Fix-type-of-single-bit-bitfields.patch \
+           file://0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch \
            "
 SRC_URI:append:libc-musl = " file://add_ppc64le.patch"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
-PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind"
+PACKAGECONFIG[unwind] = "--with-libunwind --without-elfutils,--without-libunwind,libunwind"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
 
 COMPATIBLE_HOST:riscv64 = "null"
diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
deleted file mode 100644
index 807cc4417f..0000000000
--- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-clang pretends to be gcc 4.2.0 which is a big lie when it comes
-to features, its same as latest gcc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
-Index: LuaJIT-2.0.5/src/lj_arch.h
-===================================================================
---- LuaJIT-2.0.5.orig/src/lj_arch.h
-+++ LuaJIT-2.0.5/src/lj_arch.h
-@@ -436,7 +436,7 @@
- #endif
- #endif
- #elif !LJ_TARGET_PS3
--#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
-+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__)
- #error "Need at least GCC 4.3 or newer"
- #endif
- #endif
diff --git a/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
index 240271d410..f4a1345ab2 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_git.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Just-In-Time Compiler for Lua"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=076b97f5c7e61532f7f6f3865f04da57"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d421a5e2a24207f5e260537399a9a38b"
 HOMEPAGE = "http://luajit.org"
 
 SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
@@ -9,9 +9,8 @@ SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
            "
 
 PV = "2.1"
-SRCREV = "c525bcb9024510cad9e170e12b6209aedb330f83"
+SRCREV = "538a82133ad6fddfd0ca64de167c4aca3bc1a2da"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig binconfig siteinfo
 
@@ -21,7 +20,7 @@ BBCLASSEXTEND = "native"
 # Host luajit needs to be compiled with the same pointer size
 # If you want to cross-compile to any 32 bit target on an x64 OS,
 # you need to install the multilib development package (e.g.
-# libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part
+# libc6-dev:i386 on Debian/Ubuntu) and build a 32 bit host part
 # (HOST_CC="gcc -m32").
 BUILD_CC_ARCH:append = " ${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}"
 
diff --git a/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb b/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb
index 1d27eb2588..59bc4dfcfe 100644
--- a/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb
+++ b/meta-oe/recipes-devtools/luaposix/luaposix_36.2.1.bb
@@ -8,7 +8,6 @@ DEPENDS += "lua-native lua virtual/crypt"
 SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release-v36.2;protocol=https \
 "
 SRCREV = "5a8d8c768fc3c51f42cb591e9523a60399efc6a1"
-S = "${WORKDIR}/git"
 LUA_VERSION = "5.4"
 
 B = "${S}"
@@ -16,7 +15,7 @@ B = "${S}"
 inherit pkgconfig
 
 do_compile() {
-    ${S}/build-aux/luke
+    ${S}/build-aux/luke LUA_INCDIR=${STAGING_INCDIR}
 }
 
 do_install() {
diff --git a/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb b/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb
index f94025dd05..57c8417f44 100644
--- a/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb
+++ b/meta-oe/recipes-devtools/makeself/makeself_2.5.0.bb
@@ -14,7 +14,6 @@ SRC_URI = "\
 
 SRCREV = "09488c50c6bdc40aec8e3a9b23a539c5054a634c"
 
-S = "${WORKDIR}/git"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb b/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
index 028a8f9e46..4590b49955 100644
--- a/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
+++ b/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
@@ -11,6 +11,5 @@ DEPENDS = "libmodbus (>=3.1.4)"
 SRC_URI = "git://github.com/epsilonrt/mbpoll;protocol=https;branch=master"
 SRCREV = "a0bd6c08d3d15b086f2104477295c0705aed366a"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig cmake
diff --git a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
index 9445856730..dfa77770a7 100644
--- a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
+++ b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
@@ -7,12 +7,21 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
            file://ice-mcpp.patch \
            file://0001-configure-Fix-checks-for-system-headers.patch \
            file://CVE-2019-14274.patch"
-SRC_URI[md5sum] = "512de48c87ab023a69250edc7a0c7b05"
 SRC_URI[sha256sum] = "3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mcpp/files/mcpp/"
+UPSTREAM_CHECK_REGEX = "${BPN}/V\.(?P<pver>\d+(\.\d+)+)"
+
 inherit autotools
 
 EXTRA_OECONF = " --enable-mcpplib "
 
 BBCLASSEXTEND = "native nativesdk"
 
+# http://errors.yoctoproject.org/Errors/Details/766883/
+# mcpp-2.7.2/src/expand.c:713:21: error: assignment to 'char *' from incompatible pointer type 'LOCATION *' {aka 'struct location *'} [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
+
+# http://errors.yoctoproject.org/Errors/Details/850149/
+# ../../mcpp-2.7.2/src/system.c:3436:15: error: expected identifier or '*' before 'true'
+CFLAGS += "-std=gnu17"
diff --git a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
index 7e0ff54dc5..a65782d017 100644
--- a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
+++ b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
@@ -8,7 +8,7 @@ SECTION = "devtool"
 
 LICENSE = "GPL-2.0-only"
 
-S = "${WORKDIR}/memstattool"
+S = "${UNPACKDIR}/memstattool"
 
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=87be186443b1ac2cfa466f475e1ee0cb"
 
@@ -16,7 +16,6 @@ SRC_URI = "http://sourceforge.net/projects/memstattool/files/memstat_${PV}.tar.g
            file://0001-Include-limits.h-for-PATH_MAX-definition.patch \
            "
 
-SRC_URI[md5sum] = "2c3acc0c62b2a18f6601b84e54aa7462"
 SRC_URI[sha256sum] = "245d5fc7fb87bcfd14486cd34917cae2856e799559ac568434af12c4852bce94"
 
 do_install:append(){
diff --git a/meta-oe/recipes-devtools/memtool/memtool/run-ptest b/meta-oe/recipes-devtools/memtool/memtool/run-ptest
new file mode 100644
index 0000000000..865da9f69e
--- /dev/null
+++ b/meta-oe/recipes-devtools/memtool/memtool/run-ptest
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH
+#
+# SPDX-License-Identifier: MIT
+
+fail_count=0
+all_count=0
+
+for test_suite in tests/test_*
+do
+    if "./$test_suite"
+    then
+        echo "PASS: $test_suite"
+    else
+        echo "FAIL: $test_suite"
+        fail_count=$((fail_count + 1))
+    fi
+    all_count=$((all_count + 1))
+done
+
+if [ $fail_count -eq 0 ]
+then
+    echo "PASS: All $all_count tests passed"
+else
+    echo "FAIL: $fail_count of $all_count tests failed"
+fi
diff --git a/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh b/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh
new file mode 100644
index 0000000000..a74975d392
--- /dev/null
+++ b/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH
+#
+# SPDX-License-Identifier: MIT
+
+# This script verifies the behavior of memtool against plain files.
+
+readonly PLAIN_FILE=$(mktemp)
+FAIL_COUNT=0
+
+setup() {
+        echo "Hello World!" >"$PLAIN_FILE"
+}
+
+teardown() {
+        rm "$PLAIN_FILE"
+}
+
+verify() {
+        ACTUAL=$1
+        EXPECTED=$2
+        TEST_NAME=$3
+
+        if [ "$ACTUAL" = "$EXPECTED" ]; then
+                echo "pass: $TEST_NAME"
+        else
+                echo "FAIL: $TEST_NAME"
+                echo "  Expected: $EXPECTED"
+                echo "  Actual: $ACTUAL"
+                FAIL_COUNT=$((FAIL_COUNT + 1))
+        fi
+}
+
+# Test Case: Verifies that the expected string of bytes is read from a plain file starting from
+# the offset 6 and reading 6 bytes.
+test_memtool_read() {
+        EXPECTED="00000006: 57 6f 72 6c 64 21                                  World!"
+        ACTUAL=$(memtool md -s "$PLAIN_FILE" -b 0x6+6)
+        verify "$ACTUAL" "$EXPECTED" "memtool read from plain file"
+}
+
+# Test Case 2: Verifies that the expected string of bytes is written to a plain file starting from
+# and then read the result.
+test_memtool_write() {
+        # Usage of 'od' ensures correct endianess.
+        readonly replace_str_bytes=$(echo "Yocto!" | od -t d4 -A n)
+
+        # shellcheck disable=SC2086 # We want to pass the bytes as separate arguments.
+        memtool mw -d "$PLAIN_FILE" 0x6+6 $replace_str_bytes
+
+        EXPECTED="00000006: 59 6f 63 74 6f 21                                  Yocto!"
+        ACTUAL=$(memtool md -s "$PLAIN_FILE" -b 0x6+6)
+        verify "$ACTUAL" "$EXPECTED" "memtool write to plain file"
+}
+
+for test_case in $(declare -F | grep test_memtool_ | cut -f 3 -d ' '); do
+        setup
+        $test_case
+        teardown
+done
+
+if [ $FAIL_COUNT -eq 0 ]; then
+        echo "Test Passed: memtool plain file read/write functionality is correct."
+        exit 0
+else
+        echo "Test FAILED: memtool plain file read/write functionality is incorrect. Check the logs."
+        exit 1
+fi
diff --git a/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb b/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb
new file mode 100644
index 0000000000..1e2e93bcd5
--- /dev/null
+++ b/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb
@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH
+#
+# SPDX-License-Identifier: MIT
+
+SUMMARY = "A tool to manipulate and read memory mapped registers"
+DESCRIPTION = "memtool is a program that allows to access memory mapped registers. This is useful \
+to inspect and modify registers from the command line. memtool can also operate on plain files, \
+and access PHY registers."
+HOMEPAGE = "https://github.com/pengutronix/memtool"
+BUGTRACKER = "https://github.com/pengutronix/memtool/issues"
+SECTION = "devtool"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRC_URI = " \
+    http://www.pengutronix.de/software/memtool/downloads/memtool-${PV}.tar.xz \
+    file://run-ptest \
+    file://test_read_write_plainfiles.sh \
+"
+
+SRC_URI[sha256sum] = "87cb7175266ff3a00a9c1f541c4c6c93693ffbe8dcc0d97a60d13c45ff860900"
+
+inherit autotools ptest
+
+do_install_ptest () {
+    install -d ${D}${PTEST_PATH}/tests
+    install -m 0755 ${UNPACKDIR}/test_* ${D}${PTEST_PATH}/tests
+}
+
+RDEPENDS:${PN}-ptest += "bash coreutils"
diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb
index 89e6744dca..a312be4aa7 100644
--- a/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb
+++ b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb
@@ -12,11 +12,11 @@ inherit python3native python3targetconfig
 SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz"
 SRC_URI[sha256sum] = "f75d6a4a75823a1b7d713a4967eca2f596f466e58fc6bc06d72642932fd7e307"
 
-S = "${WORKDIR}/mercurial-${PV}"
+S = "${UNPACKDIR}/mercurial-${PV}"
 
 BBCLASSEXTEND = "native"
 
-export LDSHARED="${CCLD} -shared"
+export LDSHARED = "${CCLD} -shared"
 
 EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
     PREFIX=${prefix}"
@@ -34,3 +34,4 @@ PACKAGES =+ "${PN}-python"
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}"
 FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}"
 
+CVE_STATUS[CVE-2022-43410] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different mercurial package compared to the one which has the CVE issue."
diff --git a/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb b/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb
index 4bb3e62d9f..73d434cba5 100644
--- a/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb
+++ b/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb
@@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c9f7c009791eaa4b9ca90dc4c9538d24"
 SRC_URI = "https://github.com/pengutronix/microcom/releases/download/v${PV}/microcom-${PV}.tar.xz"
 SRC_URI[sha256sum] = "ef42184bb35c9762b3e9c70748696f7478efacad8412a88aaf2d9a6a500231a1"
 
+UPSTREAM_CHECK_URI = "${HOMEPAGE}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
 DEPENDS = "readline"
 
 inherit autotools update-alternatives
diff --git a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb
index 6e29b2459d..2fbbf8f06a 100644
--- a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb
+++ b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/microsoft/GSL.git;protocol=https;branch=main \
 "
 SRCREV = "a3534567187d2edc428efd3f13466ff75fe5805c"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig ptest
 
@@ -43,3 +42,8 @@ FILES:${PN}-ptest = "${bindir}/gsl*_tests"
 CVE_PRODUCT = "microsoft:gsl"
 
 BBCLASSEXTEND = "native nativesdk"
+
+# This one is reproducible only on 32bit arm MACHINEs (didn't see it with qemux86 or qemux86-64 builds)
+# http://errors.yoctoproject.org/Errors/Details/766976/
+# lib32-microsoft-gsl/4.0.0/git/tests/span_tests.cpp:1275:34: error: value computed is not used [-Werror=unused-value]
+CXXFLAGS += "-Wno-error=unused-value"
diff --git a/meta-oe/recipes-devtools/mpich/mpich_4.2.1.bb b/meta-oe/recipes-devtools/mpich/mpich_4.3.0.bb
index 9fd8c3bb7b..6babba3de7 100644
--- a/meta-oe/recipes-devtools/mpich/mpich_4.2.1.bb
+++ b/meta-oe/recipes-devtools/mpich/mpich_4.3.0.bb
@@ -3,10 +3,10 @@ HOMEPAGE = "http://www.mpich.org/"
 SECTION = "devel"
 
 LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7a88f0d96d0d7396a7c66bf353235b62"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a296dfb961b957b0e8adf67d8478d3d"
 
 SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz"
-SRC_URI[sha256sum] = "23331b2299f287c3419727edc2df8922d7e7abbb9fd0ac74e03b9966f9ad42d7"
+SRC_URI[sha256sum] = "5e04132984ad83cab9cc53f76072d2b5ef5a6d24b0a9ff9047a8ff96121bcc63"
 
 RDEPENDS:${PN} += "bash perl libxml2"
 
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb
index 40d997a52c..aa7629763c 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_6.0.0.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/msgpack/msgpack-c;branch=c_master;protocol=https \
            "
 SRCREV = "8160ede5e20fd3019a77eea46d9c72cf6163f802"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.0.bb b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb
index 5f5507bc74..3457964609 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.0.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb
@@ -8,9 +8,12 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \
                    "
 
 SRC_URI = "https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/msgpack-cxx-${PV}.tar.gz"
-SRC_URI[sha256sum] = "23ede7e93c8efee343ad8c6514c28f3708207e5106af3b3e4969b3a9ed7039e7"
+SRC_URI[sha256sum] = "5fd555742e37bbd58d166199e669f01f743c7b3c6177191dd7b31fb0c37fa191"
 
-S = "${WORKDIR}/msgpack-cxx-${PV}"
+UPSTREAM_CHECK_URI = "https://github.com/msgpack/msgpack-c/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
+S = "${UNPACKDIR}/msgpack-cxx-${PV}"
 
 DEPENDS += "boost"
 
diff --git a/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb b/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
index 05220c2492..2183170ba6 100644
--- a/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
+++ b/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
@@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=11;md5=678a3928c85604242
 SECTION = "devel"
 
 SRC_URI = "https://01.org/sites/default/files/downloads/msr-tools/msr-tools-${PV}.zip"
-SRC_URI[md5sum] = "67d18527f64fd707c9b7a79f13d19fd5"
 SRC_URI[sha256sum] = "f9457b5340f5f274da4239a461f0db6b514142b40461559d9c6150f05aab1d1e"
 
-S = "${WORKDIR}/msr-tools-master"
+S = "${UNPACKDIR}/msr-tools-master"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
diff --git a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
index 82e5c3bc5e..ef2553760d 100644
--- a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
+++ b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
@@ -20,7 +20,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 inherit autotools-brokensep
 
-S = "${WORKDIR}/git"
 
 do_configure () {
     # no debug set -s flag
diff --git a/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb b/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb
index 36e46021bb..ec87535ec7 100644
--- a/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb
+++ b/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb
@@ -12,7 +12,6 @@ SRCREV = "d732aaf9a315415ae8fd7eb11e3a4c1f80e42a48"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 # nlohmann-fifo is a header only C++ library, so the main package will be empty.
 
diff --git a/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest b/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest
index 2f00267d50..d39ee6df8f 100755
--- a/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest
+++ b/meta-oe/recipes-devtools/nlohmann-json/files/run-ptest
@@ -3,7 +3,11 @@
 cd tests
 for atest in test-* ; do
     rm -rf tests.log
-    ./${atest} > tests.log 2>&1
+    if [ ${atest} = "test-locale-cpp_cpp11" ]; then
+        ./${atest} --test-case-exclude="locale-dependent test (LC_NUMERIC=de_DE)" > tests.log 2>&1
+    else
+        ./${atest} > tests.log 2>&1
+    fi
     if [ $? = 0 ] ; then
         echo "PASS: ${atest}"
     else
diff --git a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
index 194e80546e..1dfcc6ad75 100644
--- a/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.3.bb
+++ b/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.12.0.bb
@@ -2,21 +2,20 @@ SUMMARY = "JSON for modern C++"
 HOMEPAGE = "https://nlohmann.github.io/json/"
 SECTION = "libs"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588"
+LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=3b489645de9825cca5beeb9a7e18b6eb"
 
 CVE_PRODUCT = "json-for-modern-cpp"
 
-SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \
-           git://github.com/nlohmann/json_test_data.git;destsuffix=git/json_test_data;name=json-test-data;branch=master;protocol=https \
+SRC_URI = "git://github.com/nlohmann/json.git;branch=master;protocol=https \
+           git://github.com/nlohmann/json_test_data.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/json_test_data;name=json-test-data;branch=master;protocol=https \
            file://run-ptest \
 "
 
-SRCREV = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
+SRCREV = "55f93686c01528224f448c19128836e7df245f72"
 SRCREV_json-test-data = "a1375cea09d27cc1c4cadb8d00470375b421ac37"
 
 SRCREV_FORMAT .= "_json-test-data"
 
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
@@ -25,7 +24,7 @@ EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DJSON_BuildTests=
 # nlohmann-json is a header only C++ library, so the main package will be empty.
 ALLOW_EMPTY:${PN} = "1"
 RDEPENDS:${PN}-dev = ""
-RDEPENDS:${PN}-ptest = "perl"
+RDEPENDS:${PN}-ptest = "perl locale-base-de-de"
 
 BBCLASSEXTEND = "native nativesdk"
 
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.16/oe-npm-cache
index eb0f143eae..eb0f143eae 100755
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.16/oe-npm-cache
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.16.bb
index d4b818f967..1dcd1f7926 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.16.bb
@@ -8,8 +8,7 @@ SRC_URI = "\
 
 inherit native
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 B = "${WORKDIR}/build"
 
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
index 12f6cd8b96..f692eedd41 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
@@ -1,4 +1,4 @@
-From 7d94bfe53beeb2d25eb5f2ff6b1d509df7e6ab80 Mon Sep 17 00:00:00 2001
+From 689e098cbde130ecde523ae39df3567456271fda Mon Sep 17 00:00:00 2001
 From: Zuzana Svetlikova <zsvetlik@redhat.com>
 Date: Thu, 27 Apr 2017 14:25:42 +0200
 Subject: [PATCH] Disable running gyp on shared deps
@@ -28,19 +28,20 @@ python prune_sources() {
         shutil.rmtree(d.getVar('S') + '/deps/zlib')
 }
 do_unpack[postfuncs] += "prune_sources"
-
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/Makefile b/Makefile
+index dba16e5e..da4faffc 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -169,7 +169,7 @@ with-code-cache test-code-cache:
+@@ -173,7 +173,7 @@ with-code-cache test-code-cache:
         $(warning '$@' target is a noop)
  
- out/Makefile: config.gypi common.gypi node.gyp \
+ out/Makefile: config.gypi common.gypi common_node.gypi node.gyp \
 -       deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \
 +       deps/llhttp/llhttp.gyp \
-        deps/simdutf/simdutf.gyp deps/ada/ada.gyp \
-        tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
-        tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
+        deps/simdutf/simdutf.gyp deps/ada/ada.gyp deps/nbytes/nbytes.gyp \
+        tools/v8_gypfiles/toolchain.gypi \
+        tools/v8_gypfiles/features.gypi \
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Do-not-use-glob-in-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Do-not-use-glob-in-deps.patch
new file mode 100644
index 0000000000..551869523e
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Do-not-use-glob-in-deps.patch
@@ -0,0 +1,22 @@
+// Revert the patch found here https://github.com/nodejs/node/commit/fe1dd26398e1887b96b2dc51ab59371ad4d6bc20?diff=unified&w=0
+// so that the dependencies are still explicitly enumerated.  That way we
+// can pick and choose which pieces to build and which to use existing system
+// packages for.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+
+--- a/Makefile  2025-01-11 14:37:29.059536707 -0500
++++ b/Makefile  2025-01-11 14:39:52.419867046 -0500
+@@ -171,7 +171,8 @@
+        $(warning '$@' target is a noop)
+ 
+ out/Makefile: config.gypi common.gypi common_node.gypi node.gyp \
+-       deps/*/*.gyp \
++       deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \
++       deps/simdutf/simdutf.gyp deps/ada/ada.gyp deps/nbytes/nbytes.gyp \
+        tools/v8_gypfiles/toolchain.gypi \
+        tools/v8_gypfiles/features.gypi \
+        tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
+
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
deleted file mode 100644
index 39026d0742..0000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 656f6c91f1da7f1e1ffb01e2de7d9026a84958b5 Mon Sep 17 00:00:00 2001
-From: Luigi Pinca <luigipinca@gmail.com>
-Date: Wed, 8 Nov 2023 21:20:53 +0100
-Subject: [PATCH] build: fix build with Python 3.12
-
-Replace `distutils.version.StrictVersion` with
-`packaging.version.Version`.
-
-Refs: https://github.com/nodejs/node/pull/50209#issuecomment-1795852539
-PR-URL: https://github.com/nodejs/node/pull/50582
-Reviewed-By: Richard Lau <rlau@redhat.com>
-Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
-
-Upstream-Status: Backport [https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- configure.py | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/configure.py b/configure.py
-index 62f041ce..18fe7c14 100755
---- a/configure.py
-+++ b/configure.py
-@@ -14,8 +14,6 @@ import bz2
- import io
- from pathlib import Path
- 
--from distutils.version import StrictVersion
--
- # If not run from node/, cd to node/.
- os.chdir(Path(__file__).parent)
- 
-@@ -30,6 +28,7 @@ tools_path = Path('tools')
- 
- sys.path.insert(0, str(tools_path / 'gyp' / 'pylib'))
- from gyp.common import GetFlavor
-+from packaging.version import Version
- 
- # imports in tools/configure.d
- sys.path.insert(0, str(tools_path / 'configure.d'))
-@@ -1565,10 +1564,10 @@ def configure_openssl(o):
-     # supported asm compiler for AVX2. See https://github.com/openssl/openssl/
-     # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
-     openssl110_asm_supported = \
--      ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \
--      ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \
--      ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \
--      ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10'))
-+      ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \
-+      ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \
-+      ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \
-+      ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10'))
- 
-     if is_x86 and not openssl110_asm_supported:
-       error('''Did not find a new enough assembler, install one or build with
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-custom-env.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-custom-env.patch
new file mode 100644
index 0000000000..532d3c5f51
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-custom-env.patch
@@ -0,0 +1,18 @@
+From 9c1a31afdcf368f794b9f5378cb3fe759570f905 Mon Sep 17 00:00:00 2001
+From: Jason Schonberg <schonm@gmail.com>
+Date: Tue, 30 Apr 2024 21:48:33 -0400
+Subject: [PATCH] Update to nodejs 22.0.0
+
+Upstream-Status: Inappropriate [embedded specific]
+---
+ test/fixtures/run-script/node_modules/.bin/custom-env | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/fixtures/run-script/node_modules/.bin/custom-env b/test/fixtures/run-script/node_modules/.bin/custom-env
+index e6f291c6..1430f2e9 100755
+--- a/test/fixtures/run-script/node_modules/.bin/custom-env
++++ b/test/fixtures/run-script/node_modules/.bin/custom-env
+@@ -1,2 +1,2 @@
+-#!/bin/bash
++#!/bin/sh
+ echo "$CUSTOM_ENV"
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch
new file mode 100644
index 0000000000..01ae50cdc4
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-disable-io_uring-support-in-libuv.patch
@@ -0,0 +1,60 @@
+From 79af9bd6ac1040f1fe3c6cab26b2d040ad907870 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 1 Mar 2024 15:46:11 +0800
+Subject: [PATCH] deps: disable io_uring support in libuv
+
+Refer [1], Pseudo fails to intercept some of the syscalls when io_uring
+enabled. Refer [2], always disable io_uring support in libuv to fix
+issue in [1].
+
+[1] https://git.openembedded.org/meta-openembedded/commit/?id=d08453978c31ee41d28206c6ff198d7d9d701d88
+[2] https://github.com/nodejs/node/commit/686da19abb
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ deps/uv/src/unix/linux.c | 29 +----------------------------
+ 1 file changed, 1 insertion(+), 28 deletions(-)
+
+diff --git a/deps/uv/src/unix/linux.c b/deps/uv/src/unix/linux.c
+index 803a9a9d3f0..a4735f56cf0 100644
+--- a/deps/uv/src/unix/linux.c
++++ b/deps/uv/src/unix/linux.c
+@@ -465,34 +465,7 @@ static int uv__use_io_uring(void) {
+   /* See https://github.com/libuv/libuv/issues/4283. */
+   return 0; /* Random SIGSEGV in signal handler. */
+ #else
+-  /* Ternary: unknown=0, yes=1, no=-1 */
+-  static _Atomic int use_io_uring;
+-  char* val;
+-  int use;
+-
+-  use = atomic_load_explicit(&use_io_uring, memory_order_relaxed);
+-
+-  if (use == 0) {
+-    use = uv__kernel_version() >=
+-#if defined(__hppa__)
+-    /* io_uring first supported on parisc in 6.1, functional in .51 */
+-    /* https://lore.kernel.org/all/cb912694-b1fe-dbb0-4d8c-d608f3526905@gmx.de/ */
+-    /* 6.1.51 */ 0x060133
+-#else
+-    /* Older kernels have a bug where the sqpoll thread uses 100% CPU. */
+-    /* 5.10.186 */ 0x050ABA
+-#endif
+-    ? 1 : -1;
+-
+-    /* But users can still enable it if they so desire. */
+-    val = getenv("UV_USE_IO_URING");
+-    if (val != NULL)
+-      use = atoi(val) ? 1 : -1;
+-
+-    atomic_store_explicit(&use_io_uring, use, memory_order_relaxed);
+-  }
+-
+-  return use > 0;
++  return 0; /* pseudo doesn't support io_uring https://bugzilla.yoctoproject.org/show_bug.cgi?id=15244 */
+ #endif
+ }
+ 
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
deleted file mode 100644
index 9d878dfb8d..0000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From bf8c96ba6936050ed4a0de5bc8aeeaf2b3c50dc1 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Thu, 7 Dec 2023 12:54:30 +0100
-Subject: [PATCH] gyp: resolve python 3.12 issues
-
-Upstream has updated gyp wholesale in the main branch, so
-this patch can be dropped in due time.
-
-Upstream-Status: Inappropriate [issue will be fixed upstream with the next nodejs LTS update]
-
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py | 4 ++--
- tools/gyp/pylib/gyp/input.py                          | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
-index d9699a0a..173e9465 100644
---- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
-+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
-@@ -16,7 +16,7 @@ import subprocess
- import sys
- import threading
- import traceback
--from distutils.version import StrictVersion
-+from packaging.version import Version
- from gyp.common import GypError
- from gyp.common import OrderedSet
- 
-@@ -1183,7 +1183,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
-         else:
-             ast_code = compile(cond_expr_expanded, "<string>", "eval")
-             cached_conditions_asts[cond_expr_expanded] = ast_code
--        env = {"__builtins__": {}, "v": StrictVersion}
-+        env = {"__builtins__": {}, "v": Version}
-         if eval(ast_code, env, variables):
-             return true_dict
-         return false_dict
-diff --git a/tools/gyp/pylib/gyp/input.py b/tools/gyp/pylib/gyp/input.py
-index 354958bf..ab6112e5 100644
---- a/tools/gyp/pylib/gyp/input.py
-+++ b/tools/gyp/pylib/gyp/input.py
-@@ -16,7 +16,7 @@ import subprocess
- import sys
- import threading
- import traceback
--from distutils.version import StrictVersion
-+from packaging.version import Version
- from gyp.common import GypError
- from gyp.common import OrderedSet
- 
-@@ -1190,7 +1190,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
-         else:
-             ast_code = compile(cond_expr_expanded, "<string>", "eval")
-             cached_conditions_asts[cond_expr_expanded] = ast_code
--        env = {"__builtins__": {}, "v": StrictVersion}
-+        env = {"__builtins__": {}, "v": Version}
-         if eval(ast_code, env, variables):
-             return true_dict
-         return false_dict
--- 
-2.39.2
-
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch
index 5af87d866e..5e617e6554 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch
@@ -1,7 +1,7 @@
-From dc3652c0abcdf8573fd044907b19d8eda7ca1124 Mon Sep 17 00:00:00 2001
+From 33393507ba8209f0d6b85b391c525b4c70807275 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 3 Jul 2023 12:33:16 +0000
-Subject: [PATCH] [liftoff] Correct function signatures
+Subject: [PATCH] Correct function signatures
 
 Fixes builds on mips where clang reports an error
 ../deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h:661:5: error: no matching member function for call to 'Move'
@@ -13,15 +13,15 @@ Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/v8/v8/+/3
 Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
 ---
  deps/v8/src/wasm/baseline/liftoff-assembler.h               | 6 +++---
- deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | 2 +-
- deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h | 2 +-
+ .../src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h | 2 +-
+ .../src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h | 2 +-
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler.h b/deps/v8/src/wasm/baseline/liftoff-assembler.h
-index aef63c64..f2a11b01 100644
+index 7cb2f500..713d16db 100644
 --- a/deps/v8/src/wasm/baseline/liftoff-assembler.h
 +++ b/deps/v8/src/wasm/baseline/liftoff-assembler.h
-@@ -717,7 +717,7 @@ class LiftoffAssembler : public MacroAssembler {
+@@ -681,7 +681,7 @@ class LiftoffAssembler : public MacroAssembler {
    void FinishCall(const ValueKindSig*, compiler::CallDescriptor*);
  
    // Move {src} into {dst}. {src} and {dst} must be different.
@@ -30,7 +30,7 @@ index aef63c64..f2a11b01 100644
  
    // Parallel register move: For a list of tuples <dst, src, kind>, move the
    // {src} register of kind {kind} into {dst}. If {src} equals {dst}, ignore
-@@ -884,8 +884,8 @@ class LiftoffAssembler : public MacroAssembler {
+@@ -851,8 +851,8 @@ class LiftoffAssembler : public MacroAssembler {
    inline void MoveStackValue(uint32_t dst_offset, uint32_t src_offset,
                               ValueKind);
  
@@ -41,24 +41,24 @@ index aef63c64..f2a11b01 100644
  
    inline void Spill(int offset, LiftoffRegister, ValueKind);
    inline void Spill(int offset, WasmValue);
-diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
-index 96cba24c..53e1842d 100644
---- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
-+++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h
-@@ -592,7 +592,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
+diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h
+index bd59f162..56b4d70c 100644
+--- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h
++++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64-inl.h
+@@ -672,7 +672,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
      pinned.set(dst_op.rm());
-     LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned);
+     LiftoffRegister tmp = kScratchReg2;
      // Save original value.
 -    Move(tmp, src, type.value_type());
 +    Move(tmp, src, type.value_type().kind());
  
      src = tmp;
      pinned.set(tmp);
-diff --git a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h
-index 1d6ae09e..397e82b2 100644
---- a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h
-+++ b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h
-@@ -286,7 +286,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
+diff --git a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h
+index a3c94af0..456e5334 100644
+--- a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h
++++ b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64-inl.h
+@@ -452,7 +452,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
      pinned.set(dst_op.rm());
      LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned);
      // Save original value.
@@ -67,5 +67,3 @@ index 1d6ae09e..397e82b2 100644
  
      src = tmp;
      pinned.set(tmp);
---
-2.40.0
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-positional-args.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-positional-args.patch
new file mode 100644
index 0000000000..5fd6aee351
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-positional-args.patch
@@ -0,0 +1,19 @@
+From 07ee84863fa4a9e4d5f155632478587b0acbf71a Mon Sep 17 00:00:00 2001
+From: Jason Schonberg <schonm@gmail.com>
+Date: Tue, 30 Apr 2024 21:48:33 -0400
+Subject: [PATCH] Update to nodejs 22.0.0
+
+Upstream-Status: Inappropriate [embedded specific]
+---
+ test/fixtures/run-script/node_modules/.bin/positional-args | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/fixtures/run-script/node_modules/.bin/positional-args b/test/fixtures/run-script/node_modules/.bin/positional-args
+index 2d809237..3dc5314f 100755
+--- a/test/fixtures/run-script/node_modules/.bin/positional-args
++++ b/test/fixtures/run-script/node_modules/.bin/positional-args
+@@ -1,3 +1,3 @@
+-#!/bin/bash
++#!/bin/sh
+ echo "Arguments: '$@'"
+ echo "The total number of arguments are: $#"
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch
index 97ed972cee..cc920118a2 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch
@@ -1,4 +1,4 @@
-From 47ee5cc5501289205d3e8e9f27ea9daf18cebac1 Mon Sep 17 00:00:00 2001
+From afc085af7b6b935a5e14fc3f40db47df02ca3af2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net>
 Date: Sat, 9 Nov 2019 14:45:30 +0000
 Subject: [PATCH] v8: don't override ARM CFLAGS
@@ -28,10 +28,10 @@ Signed-off-by: André Draszik <git@andred.net>
  1 file changed, 2 insertions(+), 50 deletions(-)
 
 diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi
-index 264b3e478e..0b41848145 100644
+index 9d1b0987..4df15e60 100644
 --- a/tools/v8_gypfiles/toolchain.gypi
 +++ b/tools/v8_gypfiles/toolchain.gypi
-@@ -211,31 +211,7 @@
+@@ -203,31 +203,7 @@
          'target_conditions': [
            ['_toolset=="host"', {
              'conditions': [
@@ -64,7 +64,7 @@ index 264b3e478e..0b41848145 100644
                  # Host not built with an Arm CXX compiler (simulator build).
                  'conditions': [
                    [ 'arm_float_abi=="hard"', {
-@@ -254,31 +230,7 @@
+@@ -246,31 +222,7 @@
            }],  # _toolset=="host"
            ['_toolset=="target"', {
              'conditions': [
@@ -97,6 +97,3 @@ index 264b3e478e..0b41848145 100644
                  # Target not built with an Arm CXX compiler (simulator build).
                  'conditions': [
                    [ 'arm_float_abi=="hard"', {
--- 
-2.20.1
-
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
index cb0237309e..d987ac50be 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
@@ -1,21 +1,77 @@
-Link mksnapshot with libatomic on x86
+From 15e751e4b79475fb34e4b32a3ca54119b20c564a Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Sat, 17 Aug 2024 21:33:18 +0800
+Subject: [PATCH] link libatomic for clang conditionally
 
-Clang-12 on x86 emits atomic builtins
+Clang emits atomic builtin, explicitly link libatomic conditionally:
+- For target build, always link -latomic for clang as usual
+- For host build, if host and target have same bit width, cross compiling
+  is enabled, and host toolchain is gcc which does not link -latomic;
+  if host and target have different bit width, no cross compiling,
+  host build is the same with target build that requires to link
+  -latomic;
 
-Fixes
-| module-compiler.cc:(.text._ZN2v88internal4wasm12_GLOBAL__N_123ExecuteCompilationUnitsERKSt10shared_ptrINS2_22BackgroundCompileTokenEEPNS0_8CountersEiNS2_19CompileBaselineOnlyE+0x558): un
-defined reference to `__atomic_load'
+Fix:
+|tmp-glibc/work/core2-64-wrs-linux/nodejs/20.13.0/node-v20.13.0/out/Release/node_js2c: error while loading shared libraries: libatomic.so.1: cannot open shared object file: No such file or directory
 
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Inappropriate [OE specific]
 
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ node.gyp                 | 13 ++++++++++++-
+ tools/v8_gypfiles/v8.gyp | 15 ++++++++++++---
+ 2 files changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/node.gyp b/node.gyp
+index b425f443..f296f35c 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -487,7 +487,18 @@
+         ],
+       }],
+       ['OS=="linux" and clang==1', {
+-        'libraries': ['-latomic'],
++        'target_conditions': [
++           ['_toolset=="host"', {
++             'conditions': [
++               ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', {
++                 'libraries': ['-latomic'],
++               }],
++             ],
++           }],
++           ['_toolset=="target"', {
++             'libraries': ['-latomic'],
++           }],
++        ],
+       }],
+     ],
+   },
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index b23263cf..dcabf4ca 100644
 --- a/tools/v8_gypfiles/v8.gyp
 +++ b/tools/v8_gypfiles/v8.gyp
-@@ -1436,6 +1436,7 @@
-     {
-       'target_name': 'mksnapshot',
-       'type': 'executable',
-+      'libraries': [ '-latomic' ],
-       'dependencies': [
-         'v8_base_without_compiler',
-         'v8_compiler_for_mksnapshot',
+@@ -1100,9 +1100,18 @@
+         # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
+         # to implement atomic memory access
+         ['v8_current_cpu in ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', {
+-          'link_settings': {
+-            'libraries': ['-latomic', ],
+-          },
++          'target_conditions': [
++             ['_toolset=="host"', {
++               'conditions': [
++                 ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', {
++                   'libraries': ['-latomic'],
++                 }],
++               ],
++             }],
++             ['_toolset=="target"', {
++               'libraries': ['-latomic', ],
++             }],
++           ],
+         }],
+       ],
+     },  # v8_base_without_compiler
+-- 
+2.35.5
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/system-c-ares.patch b/meta-oe/recipes-devtools/nodejs/nodejs/system-c-ares.patch
index 141889ad23..6f08c71e18 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/system-c-ares.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/system-c-ares.patch
@@ -1,11 +1,19 @@
-keep nodejs compatible with c-ares 1.17.1
+From ce931ad5f5aba60e8e77f39e0af43bce7d25d287 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 4 Mar 2024 11:05:25 -0500
+Subject: [PATCH] keep nodejs compatible with c-ares 1.17.1
 
 Upstream-Status: Inappropriate [c-ares specific]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/cares_wrap.h | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
 
+diff --git a/src/cares_wrap.h b/src/cares_wrap.h
+index 021ef1c9..820c5d88 100644
 --- a/src/cares_wrap.h
 +++ b/src/cares_wrap.h
-@@ -22,7 +22,15 @@
+@@ -23,7 +23,15 @@
  # include <netdb.h>
  #endif  // __POSIX__
  
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb
index 25b59495e2..679acafabf 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb
@@ -1,15 +1,16 @@
 DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
 HOMEPAGE = "http://nodejs.org"
 LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=cef54676c547a5bbab44aa8be3be9ef7"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b4f41dcacabc8f07b9ca7dee2f188a00"
 
 CVE_PRODUCT = "nodejs node.js"
 
-DEPENDS = "openssl file-replacement-native python3-packaging-native"
-DEPENDS:append:class-target = " qemu-native"
+DEPENDS = "openssl openssl-native file-replacement-native python3-packaging-native"
 DEPENDS:append:class-native = " c-ares-native"
 
-inherit pkgconfig python3native qemu ptest
+inherit pkgconfig python3native ptest siteinfo
+inherit_defer ${@bb.utils.contains('HOST_AND_TARGET_SAME_WIDTH', '0', 'qemu', '', d)}
+
 
 COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*"
 COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*"
@@ -18,27 +19,29 @@ COMPATIBLE_MACHINE:mips64 = "(!.*mips64).*"
 COMPATIBLE_HOST:riscv64 = "null"
 COMPATIBLE_HOST:riscv32 = "null"
 COMPATIBLE_HOST:powerpc = "null"
+COMPATIBLE_HOST:powerpc64le = "null"
 
 SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
+           file://0001-Do-not-use-glob-in-deps.patch \
            file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
            file://0004-v8-don-t-override-ARM-CFLAGS.patch \
            file://system-c-ares.patch \
            file://0001-liftoff-Correct-function-signatures.patch \
+           file://libatomic.patch \
+           file://0001-deps-disable-io_uring-support-in-libuv.patch \
+           file://0001-positional-args.patch \
+           file://0001-custom-env.patch \
            file://run-ptest \
            "
-
 SRC_URI:append:class-target = " \
            file://0001-Using-native-binaries.patch \
            "
-SRC_URI:append:toolchain-clang:x86 = " \
-           file://libatomic.patch \
-           "
 SRC_URI:append:toolchain-clang:powerpc64le = " \
            file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
            "
-SRC_URI[sha256sum] = "11d229fcad7e6e10f450301223c602043f021cda51259ffafc7e55e484b37dc7"
+SRC_URI[sha256sum] = "720894f323e5c1ac24968eb2676660c90730d715cb7f090be71a668662a17c37"
 
-S = "${WORKDIR}/node-v${PV}"
+S = "${UNPACKDIR}/node-v${PV}"
 
 CVE_PRODUCT += "node.js"
 
@@ -66,28 +69,14 @@ ARCHFLAGS ?= ""
 
 PACKAGECONFIG ??= "ares brotli icu zlib"
 
-PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
-PACKAGECONFIG[brotli] = "--shared-brotli,,brotli"
-PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
+PACKAGECONFIG[ares] = "--shared-cares,,c-ares c-ares-native"
+PACKAGECONFIG[brotli] = "--shared-brotli,,brotli brotli-native"
+PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu icu-native"
 PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
 PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
 PACKAGECONFIG[shared] = "--shared"
 PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
 
-# We don't want to cross-compile during target compile,
-# and we need to use the right flags during host compile,
-# too.
-EXTRA_OEMAKE = "\
-    CC.host='${CC} -pie -fPIE' \
-    CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \
-    CXX.host='${CXX} -pie -fPIE' \
-    CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \
-    LDFLAGS.host='${LDFLAGS}' \
-    AR.host='${AR}' \
-    \
-    builddir_name=./ \
-"
-
 EXTRANATIVEPATH += "file-native"
 
 python prune_sources() {
@@ -110,16 +99,22 @@ do_unpack[postfuncs] += "prune_sources"
 # V8's JIT infrastructure requires binaries such as mksnapshot and
 # mkpeephole to be run in the host during the build. However, these
 # binaries must have the same bit-width as the target (e.g. a x86_64
-# host targeting ARMv6 needs to produce a 32-bit binary). Instead of
-# depending on a third Yocto toolchain, we just build those binaries
-# for the target and run them on the host with QEMU.
+# host targeting ARMv6 needs to produce a 32-bit binary).
+# 1. If host and target have the different bit width, run those
+#    binaries for the target and run them on the host with QEMU.
+# 2. If host and target have the same bit width, enable upstream
+#    cross compile support and no QEMU
 python do_create_v8_qemu_wrapper () {
     """Creates a small wrapper that invokes QEMU to run some target V8 binaries
     on the host."""
     qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'),
                     d.expand('${STAGING_DIR_HOST}${base_libdir}')]
-    qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'),
-                                    qemu_libdirs)
+    qemu_cmd = ""
+
+    if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "0":
+        qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'),
+                                        qemu_libdirs)
+
     wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh')
     with open(wrapper_path, 'w') as wrapper_file:
         wrapper_file.write("""#!/bin/sh
@@ -138,6 +133,14 @@ addtask create_v8_qemu_wrapper after do_configure before do_compile
 
 LDFLAGS:append:x86 = " -latomic"
 
+export CC_host
+export CFLAGS_host
+export CXX_host
+export CXXFLAGS_host
+export LDFLAGS_host
+export AR_host
+export HOST_AND_TARGET_SAME_WIDTH
+
 CROSS_FLAGS = "--cross-compiling"
 CROSS_FLAGS:class-native = "--no-cross-compiling"
 
@@ -179,4 +182,37 @@ RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \
 PACKAGES =+ "${PN}-systemtap"
 FILES:${PN}-systemtap = "${datadir}/systemtap"
 
+do_configure[prefuncs] += "set_gyp_variables"
+do_compile[prefuncs] += "set_gyp_variables"
+do_install[prefuncs] += "set_gyp_variables"
+python set_gyp_variables () {
+    if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "0":
+        # We don't want to cross-compile during target compile,
+        # and we need to use the right flags during host compile,
+        # too.
+        d.setVar("CC_host", d.getVar("CC") + " -pie -fPIE")
+        d.setVar("CFLAGS_host", d.getVar("CFLAGS"))
+        d.setVar("CXX_host", d.getVar("CXX") + " -pie -fPIE")
+        d.setVar("CXXFLAGS_host", d.getVar("CXXFLAGS"))
+        d.setVar("LDFLAGS_host", d.getVar("LDFLAGS"))
+        d.setVar("AR_host", d.getVar("AR"))
+    elif d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "1":
+        # Enable upstream cross compile support
+        d.setVar("CC_host", d.getVar("BUILD_CC"))
+        d.setVar("CFLAGS_host", d.getVar("BUILD_CFLAGS"))
+        d.setVar("CXX_host", d.getVar("BUILD_CXX"))
+        d.setVar("CXXFLAGS_host", d.getVar("BUILD_CXXFLAGS"))
+        d.setVar("LDFLAGS_host", d.getVar("BUILD_LDFLAGS"))
+        d.setVar("AR_host", d.getVar("BUILD_AR"))
+}
+
+python __anonymous () {
+    # 32 bit target and 64 bit host (x86-64 or aarch64) have different bit width
+    if d.getVar("SITEINFO_BITS") == "32" and "64" in d.getVar("BUILD_ARCH"):
+        d.setVar("HOST_AND_TARGET_SAME_WIDTH", "0")
+        d.appendVar("DEPENDS:class-target", " qemu-native")
+    else:
+        d.setVar("HOST_AND_TARGET_SAME_WIDTH", "1")
+}
+
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch
new file mode 100644
index 0000000000..a7d7552d5a
--- /dev/null
+++ b/meta-oe/recipes-devtools/openocd/openocd/0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch
@@ -0,0 +1,38 @@
+From 65969a2b73ce93db4c80f1706677351b0e57fa72 Mon Sep 17 00:00:00 2001
+From: Sofiane HAMAM <sofiane.hamam@smile.fr>
+Date: Fri, 28 Mar 2025 12:31:17 +0100
+Subject: [PATCH] Makefile.am: Use SOURCE_DATE_EPOCH environment variable
+
+This package defines PKGBLDDATE as build timestamp which makes
+it non reproducible. Use SOURCE_DATE_EPOCH if it is found, otherwise
+use build timestamp. Following best practices, see :
+https://reproducible-builds.org/docs/source-date-epoch/
+
+The patch is BSD compatible too.
+
+Change-Id: I26c1a00f2e8059ae31fe72a794b5962af5a84f44
+Co-developed-by: Yoann Congal <yoann.congal@smile.fr>
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+Signed-off-by: Sofiane HAMAM <sofiane.hamam@smile.fr>
+
+Upstream-Status: Backport [https://repo.or.cz/openocd.git?a=commit;h=6834f022b96fb1c7f5829166578e01a0ac223cb0]
+---
+ src/Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6d79cd631..9ca697407 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -30,7 +30,10 @@ if RELEASE
+ else
+ %C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
+ %C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
+-%C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`date +%F-%R`\"
++%C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`DATE_FMT=+%F-%R; \
++       SOURCE_DATE_EPOCH="$${SOURCE_DATE_EPOCH:-$$(date +%s)}"; \
++       date -u -d "@$$SOURCE_DATE_EPOCH" "$$DATE_FMT" 2>/dev/null || \
++       date -u -r "$$SOURCE_DATE_EPOCH" "$$DATE_FMT" 2>/dev/null || date -u "$$DATE_FMT"`\"
+ endif
+ 
+ # add default CPPFLAGS
diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb
index 559fe29ff8..3bbe33ca1d 100644
--- a/meta-oe/recipes-devtools/openocd/openocd_git.bb
+++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb
@@ -7,8 +7,9 @@ RDEPENDS:${PN} = "libusb1"
 SRC_URI = " \
     git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \
     git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \
-    git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=git/jimtcl;name=jimtcl;branch=master \
-    git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \
+    git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/jimtcl;name=jimtcl;branch=master \
+    git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \
+    file://0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch \
 "
 
 SRCREV_FORMAT = "openocd"
@@ -18,7 +19,6 @@ SRCREV_jimtcl = "fcbb4499a6b46ef69e7a95da53e30796e20817f0"
 SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4"
 
 PV = "0.12+git"
-S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools-brokensep gettext
 
diff --git a/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch b/meta-oe/recipes-devtools/pahole/files/0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch
index 4f7dfd4cca..7dc18d7aa2 100644
--- a/meta-oe/recipes-devtools/pahole/files/0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch
+++ b/meta-oe/recipes-devtools/pahole/files/0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch
@@ -4,7 +4,6 @@ Date: Wed, 15 Sep 2021 17:54:01 +0200
 Subject: [PATCH] Use /usr/bin/env python3 instead of just /usr/bin/python3
 
 Upstream-Status: Inappropriate [OE specific]
-
 ---
  ostra/ostra-cg        | 2 +-
  ostra/python/ostra.py | 2 +-
diff --git a/meta-oe/recipes-devtools/pahole/pahole_1.25.bb b/meta-oe/recipes-devtools/pahole/pahole_1.29.bb
index 1334c850e6..aca915bf32 100644
--- a/meta-oe/recipes-devtools/pahole/pahole_1.25.bb
+++ b/meta-oe/recipes-devtools/pahole/pahole_1.29.bb
@@ -7,17 +7,16 @@ DEPENDS = "elfutils zlib libbpf"
 
 # Depends on MACHINE_ARCH libbpf
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux"
+COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"
 
-SRCREV = "81558a5a996005df0d607dd33f74ec5b7bdb619d"
+SRCREV = "b9cc7963051b2099795129450f9b70c81950d02f"
 SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master \
-           file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch"
+           file://0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
-PACKAGECONFIG[python3] = ",,python3-core,python3-core"
+PACKAGECONFIG[python3] = ",,python3,python3-core"
 
 EXTRA_OECMAKE = "-D__LIB=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/')} -DCMAKE_BUILD_TYPE=Release -DLIBBPF_EMBEDDED=OFF"
 
diff --git a/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb b/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb
index d512c85704..4e80ca87ee 100644
--- a/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb
+++ b/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb
@@ -30,6 +30,6 @@ PACKAGECONFIG ??= ""
 
 PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap"
 PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp"
-PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, pyelftools"
+PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, python3-pyelftools"
 
 EXTRA_OECONF += "--enable-largefile"
diff --git a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb
index 85c4fa95ae..130980b0cd 100644
--- a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb
+++ b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb
@@ -10,7 +10,9 @@ COMPATIBLE_HOST = "(x86_64|aarch64|arm|riscv64)"
 SRCREV = "09724edb1783a98da2b7ae53c5aaa87493aabc9b"
 SRC_URI = "git://github.com/billfarrow/pcimem.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 do_install() {
     install -D -m 0755 ${B}/pcimem ${D}${bindir}/pcimem
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch b/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch
deleted file mode 100644
index d08721ae65..0000000000
--- a/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e63949205682bbd2a0e33e256119472d704a2549 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 29 Jan 2023 22:03:01 -0800
-Subject: [PATCH] Add missing header <cstdint> for uintXX_t types
-
-This is detected by gcc-13
-gcc 13 moved some includes around and as a result <cstdint> is no
-longer transitively included [1]. Explicitly include it for uintXX_t.
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Upstream-Status: Submitted [https://android-review.googlesource.com/c/platform/external/perfetto/+/2399128]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/perfetto/ext/base/http/sha1.h    | 1 +
- include/perfetto/ext/base/uuid.h         | 1 +
- src/traced/probes/common/cpu_freq_info.h | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/include/perfetto/ext/base/http/sha1.h b/include/perfetto/ext/base/http/sha1.h
-index c583d69d4..7e3a48c83 100644
---- a/include/perfetto/ext/base/http/sha1.h
-+++ b/include/perfetto/ext/base/http/sha1.h
-@@ -20,6 +20,7 @@
- #include <stddef.h>
- 
- #include <array>
-+#include <cstdint>
- #include <string>
- 
- namespace perfetto {
-diff --git a/include/perfetto/ext/base/uuid.h b/include/perfetto/ext/base/uuid.h
-index 1b4c53815..472042fab 100644
---- a/include/perfetto/ext/base/uuid.h
-+++ b/include/perfetto/ext/base/uuid.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
- 
- #include <array>
-+#include <cstdint>
- #include <string>
- 
- #include "perfetto/ext/base/optional.h"
-diff --git a/src/traced/probes/common/cpu_freq_info.h b/src/traced/probes/common/cpu_freq_info.h
-index 36f7f9c09..8232cbf64 100644
---- a/src/traced/probes/common/cpu_freq_info.h
-+++ b/src/traced/probes/common/cpu_freq_info.h
-@@ -17,6 +17,7 @@
- #ifndef SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_
- #define SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_
- 
-+#include <cstdint>
- #include <map>
- #include <string>
- #include <vector>
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch b/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch
new file mode 100644
index 0000000000..3b7ca951ae
--- /dev/null
+++ b/meta-oe/recipes-devtools/perfetto/files/0001-fix-musl-build.patch
@@ -0,0 +1,40 @@
+From 485c21940eb0100a33b7efea40a83e7f79e765f8 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Sun, 22 Sep 2024 20:17:52 +0200
+Subject: [PATCH] fix musl build
+
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+Upstream-Status: Pending
+
+ sdk/perfetto.cc   | 1 -
+ src/base/utils.cc | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/sdk/perfetto.cc b/sdk/perfetto.cc
+index b10dd5aa92..2eb90f0d15 100644
+--- a/sdk/perfetto.cc
++++ b/sdk/perfetto.cc
+@@ -6558,7 +6558,6 @@ std::optional<int32_t> GetTimezoneOffsetMins() {
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+-#include <linux/prctl.h>
+ #include <sys/prctl.h>
+ 
+ #ifndef PR_GET_TAGGED_ADDR_CTRL
+diff --git a/src/base/utils.cc b/src/base/utils.cc
+index 0d9318c136..419c7dbc1a 100644
+--- a/src/base/utils.cc
++++ b/src/base/utils.cc
+@@ -40,7 +40,6 @@
+ 
+ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+-#include <linux/prctl.h>
+ #include <sys/prctl.h>
+ 
+ #ifndef PR_GET_TAGGED_ADDR_CTRL
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-devtools/perfetto/libperfetto.bb b/meta-oe/recipes-devtools/perfetto/libperfetto.bb
index c8f56fd527..8383db3cc0 100644
--- a/meta-oe/recipes-devtools/perfetto/libperfetto.bb
+++ b/meta-oe/recipes-devtools/perfetto/libperfetto.bb
@@ -1,5 +1,5 @@
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f87516e0b698007e9e75a1fe1012b390"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d2572d98547d43906b53615f856a8c2d"
 
 require perfetto.inc
 
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch b/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch
index ae644747c1..719663a802 100644
--- a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch
+++ b/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch
@@ -3,21 +3,22 @@ From: Markus Volk <f_l_k@t-online.de>
 Date: Mon, 17 Oct 2022 19:20:53 +0200
 Subject: [PATCH] meson: add PC file for lib_perfetto
 
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
 ---
 Upstream-Status: Pending
 
- meson.build | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
+ meson.build | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
 
+diff --git a/meson.build b/meson.build
+index 8fb1e26275..3ef3ebf27d 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -19,9 +19,12 @@
+@@ -19,8 +19,11 @@
  project(
      'perfetto',
      ['cpp'],
--    default_options: ['cpp_std=c++17']
-+    default_options: ['cpp_std=c++17'],
-+    version: '31.0'
++    version: '47.0'
  )
  
 +soversion = meson.project_version()
@@ -25,7 +26,7 @@ Upstream-Status: Pending
  fs = import('fs')
  
  if not fs.is_dir('sdk')
-@@ -36,8 +39,9 @@ if host_machine.system() == 'android'
+@@ -35,8 +38,9 @@ if host_machine.system() == 'android'
    deps_perfetto += cpp.find_library('log')
  endif
  
@@ -36,7 +37,7 @@ Upstream-Status: Pending
      sources: 'sdk/perfetto.cc',
      dependencies: deps_perfetto,
      install: true,
-@@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.cu
+@@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.current_source_dir(),
  
  install_data(dir_perfetto_trace / 'perfetto_trace.proto')
  
@@ -47,3 +48,6 @@ Upstream-Status: Pending
  dep_perfetto = declare_dependency(
      link_with: lib_perfetto,
      include_directories: inc_perfetto,
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-oe/recipes-devtools/perfetto/perfetto.bb
index 7e9408b0b2..e284ec8d1e 100644
--- a/meta-oe/recipes-devtools/perfetto/perfetto.bb
+++ b/meta-oe/recipes-devtools/perfetto/perfetto.bb
@@ -1,46 +1,51 @@
 LICENSE = "Apache-2.0 & BSD-3-Clause & MIT & Zlib"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f87516e0b698007e9e75a1fe1012b390 \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d2572d98547d43906b53615f856a8c2d \
                     file://buildtools/libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \
                     file://buildtools/libcxxabi/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \
                     file://buildtools/libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
                     file://buildtools/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
-                    file://buildtools/zlib/LICENSE;md5=f09575dbfb09420642318b413159496f \
+                    file://buildtools/zlib/LICENSE;md5=8c75f2b4df47a77f9445315a9500cd1c \
                     file://debian/copyright;md5=4e08364c82141f181de69d0a2b89d612 \
                     file://python/LICENSE;md5=c602a632c34ade9c78a976734077bce7"
 
+# Dependencies from perfetto/tools/install-build-deps
 SRC_URI:append = " \
-           git://github.com/protocolbuffers/protobuf.git;branch=3.9.x;protocol=https;destsuffix=git/buildtools/protobuf;name=protobuf \
-           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git;protocol=https;destsuffix=git/buildtools/libcxx;branch=main;name=libcxx \
-           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git;protocol=https;destsuffix=git/buildtools/libcxxabi;branch=main;name=libcxxabi \
-           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=git/buildtools/libunwind;branch=main;name=libunwind \
-           git://android.googlesource.com/platform/system/libbase.git;branch=master;protocol=https;destsuffix=git/buildtools/android-libbase;name=libbase \
-           git://android.googlesource.com/platform/system/unwinding.git;branch=master;protocol=https;destsuffix=git/buildtools/android-unwinding;name=unwinding \
-           git://android.googlesource.com/platform/system/logging.git;branch=master;protocol=https;destsuffix=git/buildtools/android-logging;name=logging \
-           git://android.googlesource.com/platform/system/libprocinfo.git;branch=master;protocol=https;destsuffix=git/buildtools/android-libprocinfo;name=libprocinfo \
-           git://android.googlesource.com/platform/system/core.git;branch=master;protocol=https;destsuffix=git/buildtools/android-core;name=core \
-           git://android.googlesource.com/platform/bionic.git;branch=master;protocol=https;destsuffix=git/buildtools/bionic;name=bionic \
-           git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=git/buildtools/zlib;name=zlib \
-           git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=git/buildtools/lzma;name=lzma \
-           https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=git/buildtools/;name=gn \
+           git://github.com/protocolbuffers/protobuf.git;branch=main;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/protobuf;name=protobuf \
+           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/libcxx;branch=main;name=libcxx \
+           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/libcxxabi;branch=main;name=libcxxabi \
+           git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/libunwind;branch=main;name=libunwind \
+           git://android.googlesource.com/platform/system/libbase.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-libbase;name=libbase \
+           git://android.googlesource.com/platform/system/unwinding.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-unwinding;name=unwinding \
+           git://android.googlesource.com/platform/system/logging.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-logging;name=logging \
+           git://android.googlesource.com/platform/system/libprocinfo.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-libprocinfo;name=libprocinfo \
+           git://android.googlesource.com/platform/system/core.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/android-core;name=core \
+           git://android.googlesource.com/platform/bionic.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/bionic;name=bionic \
+           git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zlib;name=zlib \
+           git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/lzma;name=lzma \
+           git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/zstd;name=zstd \
+           https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/buildtools/;name=gn \
            \
            file://0001-Remove-check_build_deps-build-steps.patch \
-           file://0001-Add-missing-header-cstdint-for-uintXX_t-types.patch"
+           file://0002-traced-fix-missing-include.patch \
+           file://0001-add-missing-includes-for-the-build-with-use_libcxx_m.patch \
+           "
 
-SRCREV_bionic = "4b0e16bc72a82a63c699977376a7d6eadca1b206"
+SRCREV_bionic = "a0d0355105cb9d4a4b5384897448676133d7b8e2"
 SRCREV_core = "9e6cef7f07d8c11b3ea820938aeb7ff2e9dbaa52"
 SRCREV_lzma = "7851dce6f4ca17f5caa1c93a4e0a45686b1d56c3"
 SRCREV_libprocinfo = "fd214c13ededecae97a3b15b5fccc8925a749a84"
 SRCREV_logging = "7b36b566c9113fc703d68f76e8f40c0c2432481c"
-SRCREV_unwinding = "d66882575ebe3700d6a6b10185f3aee28acc1051"
-SRCREV_protobuf = "6a59a2ad1f61d9696092f79b6d74368b4d7970a3"
+SRCREV_unwinding = "4b59ea8471e89d01300481a92de3230b79b6d7c7"
+SRCREV_protobuf = "f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c"
 SRCREV_libbase = "78f1c2f83e625bdf66d55b48bdb3a301c20d2fb3"
-SRCREV_libcxx = "f8571eaba606bde2eb8cd34b30104ca33e7c207e"
-SRCREV_libcxxabi = "8dd405113a4f3694e910b79785dd7fb7535a888a"
-SRCREV_libunwind = "aabcd8753678f1536e15eb6385a948470debdae4"
-SRCREV_zlib = "5c85a2da4c13eda07f69d81a1579a5afddd35f59"
+SRCREV_libcxx = "852bc6746f45add53fec19f3a29280e69e358d44"
+SRCREV_libcxxabi = "a37a3aa431f132b02a58656f13984d51098330a2"
+SRCREV_libunwind = "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad"
+SRCREV_zlib = "6d3f6aa0f87c9791ca7724c279ef61384f331dfd"
+SRCREV_zstd = "77211fcc5e08c781734a386402ada93d0d18d093"
 
-SRCREV_FORMAT .="_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib"
+SRCREV_FORMAT .= "_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib_zstd"
 
 SRC_URI[gn.sha256sum] = "f706aaa0676e3e22f5fc9ca482295d7caee8535d1869f99efa2358177b64f5cd"
 
@@ -96,8 +101,8 @@ do_configure () {
 
     ARGS=$ARGS" target_os=\"linux\""
     ARGS=$ARGS" target_cpu=\"$arch\""
-    ARGS=$ARGS" target_cc=\"$CC_BIN ${TUNE_CCARGS}\""
-    ARGS=$ARGS" target_cxx=\"$CXX_BIN -std=c++11 ${TUNE_CCARGS}\""
+    ARGS=$ARGS" target_cc=\"$CC_BIN ${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}\""
+    ARGS=$ARGS" target_cxx=\"$CXX_BIN ${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}\""
     ARGS=$ARGS" target_strip=\"$STRIP_BIN\"" #
     ARGS=$ARGS" target_sysroot=\"${RECIPE_SYSROOT}\""
     ARGS=$ARGS" target_linker=\"$CC_BIN ${TUNE_CCARGS} ${LDFLAGS}\""
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.inc b/meta-oe/recipes-devtools/perfetto/perfetto.inc
index 4b06c5bf04..1c7e9144cc 100644
--- a/meta-oe/recipes-devtools/perfetto/perfetto.inc
+++ b/meta-oe/recipes-devtools/perfetto/perfetto.inc
@@ -1,10 +1,12 @@
 SUMMARY = "Perfetto - System profiling, app tracing and trace analysis."
 HOMEPAGE = "https://github.com/google/perfetto"
 
-SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1"
+# Add only patches here which are used by both perfetto and libperfetto
+SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1 \
+           file://0001-fix-musl-build.patch \
+        "
 
-SRCREV_perfetto = "b8da07095979310818f0efde2ef3c69ea70d62c5"
+SRCREV_perfetto = "c74251226a8caa0b43377902ee06d2570faa0c15"
 SRCREV_FORMAT = "perfetto"
-PV = "31.0"
+PV = "47.0"
 
-S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch b/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch
index c10400aef4..118c3aed4a 100644
--- a/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch
+++ b/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch
@@ -1,4 +1,4 @@
-From 3b7091243ec03054ca8800b51b85a1c09e7e3075 Mon Sep 17 00:00:00 2001
+From 07ddc4b9b7a6fec73cdc295baba353944857212e Mon Sep 17 00:00:00 2001
 From: Sui Chen <suichen6@gmail.com>
 Date: Mon, 13 Jun 2022 17:46:49 +0000
 Subject: [PATCH] Remove "check_build_deps" build steps
@@ -11,6 +11,7 @@ Also setting "is_cross_compiling" to true, so that the host-side tools
 rather than the Bitbake-generated one.
 
 Signed-off-by: Sui Chen <suichen6@gmail.com>
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
 ---
 Upstream-Status: Pending
 
@@ -20,10 +21,10 @@ Upstream-Status: Pending
  3 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/gn/BUILD.gn b/gn/BUILD.gn
-index 8a7ca72a8..e4a2d39f0 100644
+index ed055ee700..ea79979ec5 100644
 --- a/gn/BUILD.gn
 +++ b/gn/BUILD.gn
-@@ -111,7 +111,6 @@ group("default_deps") {
+@@ -117,7 +117,6 @@ group("default_deps") {
    deps = [ ":gen_buildflags" ]
    if (perfetto_build_standalone) {
      public_deps = [
@@ -32,10 +33,10 @@ index 8a7ca72a8..e4a2d39f0 100644
        "//gn/standalone/sanitizers:deps",
      ]
 diff --git a/gn/standalone/BUILD.gn b/gn/standalone/BUILD.gn
-index 582e9b867..9c77ac64c 100644
+index 36fb6371a5..f7bc97b1a6 100644
 --- a/gn/standalone/BUILD.gn
 +++ b/gn/standalone/BUILD.gn
-@@ -441,10 +441,10 @@ config("android_liblog") {
+@@ -469,10 +469,10 @@ config("android_liblog") {
  }
  
  # Checks that tools/install-build-deps has been run since it last changed.
@@ -53,7 +54,7 @@ index 582e9b867..9c77ac64c 100644
 +#  args = [ "--android" ]
 +#}
 diff --git a/gn/standalone/BUILDCONFIG.gn b/gn/standalone/BUILDCONFIG.gn
-index 6f32686c1..c041989b0 100644
+index 05ed548f9d..94db724b2b 100644
 --- a/gn/standalone/BUILDCONFIG.gn
 +++ b/gn/standalone/BUILDCONFIG.gn
 @@ -59,8 +59,9 @@ declare_args() {
@@ -67,7 +68,4 @@ index 6f32686c1..c041989b0 100644
 +  is_cross_compiling = true
  }
  default_configs = [
-   "//gn/standalone:debug_symbols",
--- 
-2.37.1
-
+   "//gn/standalone:default",
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto/0001-add-missing-includes-for-the-build-with-use_libcxx_m.patch b/meta-oe/recipes-devtools/perfetto/perfetto/0001-add-missing-includes-for-the-build-with-use_libcxx_m.patch
new file mode 100644
index 0000000000..225810e511
--- /dev/null
+++ b/meta-oe/recipes-devtools/perfetto/perfetto/0001-add-missing-includes-for-the-build-with-use_libcxx_m.patch
@@ -0,0 +1,105 @@
+From 3953f56f98420e2ecb0e1c4542e20bfbb81da965 Mon Sep 17 00:00:00 2001
+From: Takuto Ikuta <tikuta@google.com>
+Date: Mon, 9 Dec 2024 18:45:36 +0900
+Subject: [PATCH] add missing includes for the build with use_libcxx_modules
+
+This is to fix build error when we set use_libcxx_modules=true in
+chromium build.
+
+Bug: 40440396
+Change-Id: I0cca5190c2c3551cc62bafafd12da9283e4afdd4
+
+Upstream-Status: Backport [3953f56 add missing includes for the build with use_libcxx_modules]
+- Removed some patches for files that do not exist in the current version v47.0
+
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+
+diff --git a/include/perfetto/base/flat_set.h b/include/perfetto/base/flat_set.h
+index 9390537b39..5be590ea6b 100644
+--- a/include/perfetto/base/flat_set.h
++++ b/include/perfetto/base/flat_set.h
+@@ -17,7 +17,10 @@
+ #ifndef INCLUDE_PERFETTO_BASE_FLAT_SET_H_
+ #define INCLUDE_PERFETTO_BASE_FLAT_SET_H_
+ 
++#include <stddef.h>
++
+ #include <algorithm>
++#include <utility>
+ #include <vector>
+ 
+ // A vector-based set::set-like container.
+diff --git a/include/perfetto/base/time.h b/include/perfetto/base/time.h
+index 6436503d20..8de7648267 100644
+--- a/include/perfetto/base/time.h
++++ b/include/perfetto/base/time.h
+@@ -17,6 +17,7 @@
+ #ifndef INCLUDE_PERFETTO_BASE_TIME_H_
+ #define INCLUDE_PERFETTO_BASE_TIME_H_
+ 
++#include <stdint.h>
+ #include <time.h>
+ 
+ #include <chrono>
+diff --git a/include/perfetto/ext/base/string_utils.h b/include/perfetto/ext/base/string_utils.h
+index c8264a2fb7..3b15e55771 100644
+--- a/include/perfetto/ext/base/string_utils.h
++++ b/include/perfetto/ext/base/string_utils.h
+@@ -24,6 +24,7 @@
+ #include <cinttypes>
+ #include <optional>
+ #include <string>
++#include <system_error>
+ #include <vector>
+ 
+ #include "perfetto/ext/base/string_view.h"
+diff --git a/include/perfetto/ext/base/subprocess.h b/include/perfetto/ext/base/subprocess.h
+index 12121e0284..4075169df1 100644
+--- a/include/perfetto/ext/base/subprocess.h
++++ b/include/perfetto/ext/base/subprocess.h
+@@ -20,6 +20,7 @@
+ #include <condition_variable>
+ #include <functional>
+ #include <initializer_list>
++#include <memory>
+ #include <mutex>
+ #include <optional>
+ #include <string>
+diff --git a/include/perfetto/ext/base/waitable_event.h b/include/perfetto/ext/base/waitable_event.h
+index 0e786196f8..a4b268a2f3 100644
+--- a/include/perfetto/ext/base/waitable_event.h
++++ b/include/perfetto/ext/base/waitable_event.h
+@@ -17,6 +17,8 @@
+ #ifndef INCLUDE_PERFETTO_EXT_BASE_WAITABLE_EVENT_H_
+ #define INCLUDE_PERFETTO_EXT_BASE_WAITABLE_EVENT_H_
+ 
++#include <stdint.h>
++
+ #include <condition_variable>
+ #include <mutex>
+ 
+diff --git a/include/perfetto/ext/tracing/core/slice.h b/include/perfetto/ext/tracing/core/slice.h
+index 063043bdc6..cdabc39465 100644
+--- a/include/perfetto/ext/tracing/core/slice.h
++++ b/include/perfetto/ext/tracing/core/slice.h
+@@ -18,6 +18,7 @@
+ #define INCLUDE_PERFETTO_EXT_TRACING_CORE_SLICE_H_
+ 
+ #include <stddef.h>
++#include <stdint.h>
+ #include <string.h>
+ 
+ #include <memory>
+diff --git a/src/trace_processor/util/trace_blob_view_reader.h b/src/trace_processor/util/trace_blob_view_reader.h
+index c39ffaba7c..6ffa7ff050 100644
+--- a/src/trace_processor/util/trace_blob_view_reader.h
++++ b/src/trace_processor/util/trace_blob_view_reader.h
+@@ -19,6 +19,7 @@
+ 
+ #include <cstddef>
+ #include <optional>
++#include <vector>
+ 
+ #include "perfetto/ext/base/circular_queue.h"
+ #include "perfetto/trace_processor/trace_blob_view.h"
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch b/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch
new file mode 100644
index 0000000000..49b7989359
--- /dev/null
+++ b/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch
@@ -0,0 +1,28 @@
+From d005c0123b2f929b918359a53ffe61d7ca2212a0 Mon Sep 17 00:00:00 2001
+From: Lalit Maganti <lalitm@google.com>
+Date: Wed, 14 Aug 2024 11:56:47 +0100
+Subject: [PATCH] traced: fix missing include
+
+Change-Id: Ib9ce8ce5b057e89fa451ccef228228d607b36793
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+Upstream-Status: Backport [https://github.com/google/perfetto/commit/d005c0123b2f929b918359a53ffe61d7ca2212a0]
+
+ src/traced/probes/sys_stats/sys_stats_data_source.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/traced/probes/sys_stats/sys_stats_data_source.h b/src/traced/probes/sys_stats/sys_stats_data_source.h
+index e09cd8a2ca..7e4749bdcd 100644
+--- a/src/traced/probes/sys_stats/sys_stats_data_source.h
++++ b/src/traced/probes/sys_stats/sys_stats_data_source.h
+@@ -21,6 +21,7 @@
+ 
+ #include <map>
+ #include <memory>
++#include <optional>
+ #include <string>
+ 
+ #include "perfetto/ext/base/paged_memory.h"
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.24.bb
index 0eaf2137b6..65f2ec232a 100644
--- a/meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb
+++ b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.24.bb
@@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c"
 DEPENDS = "libdbi-perl-native libdev-checklib-perl-native libmysqlclient"
 
 SRC_URI = "${CPAN_MIRROR}/authors/id/P/PA/PALI/DBD-MariaDB-${PV}.tar.gz"
-SRC_URI[sha256sum] = "0d0c76c660ddd55570e48f3e2fdea8f621a69ac0ed48190e8cfcafcb5e9b859d"
+SRC_URI[sha256sum] = "f977a25b4116a0a95a7c8a894fd37097abe19af9a6a9ed4d800604ec17873fe4"
 
 RDEPENDS:${PN} = "libdbi-perl"
 
-S = "${WORKDIR}/DBD-MariaDB-${PV}"
+S = "${UNPACKDIR}/DBD-MariaDB-${PV}"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-devtools/perl/exiftool_12.85.bb b/meta-oe/recipes-devtools/perl/exiftool_12.89.bb
index 66e9a3b719..69a4f79815 100644
--- a/meta-oe/recipes-devtools/perl/exiftool_12.85.bb
+++ b/meta-oe/recipes-devtools/perl/exiftool_12.89.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff
 
 inherit cpan
 
-SRCREV = "405674e0c477931b60b10a78828483ef54761385"
+SRCREV = "e04534a40925354187e8432d44248229d774f34a"
 SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 RDEPENDS:${PN} = " \
     perl \
diff --git a/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb b/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb
index e28b6ea018..9cdb0a52cc 100644
--- a/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb
+++ b/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb
@@ -12,7 +12,6 @@ DEPENDS = "perl"
 SRC_URI = "git://github.com/toddr/IPC-Run.git;branch=master;protocol=https"
 SRCREV = "ad56c3b5f5a211d32bbb8ac29f180d707ee58c1b"
 
-S = "${WORKDIR}/git"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb b/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.67.bb
index b2266394d6..4886333f3a 100644
--- a/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb
+++ b/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.67.bb
@@ -8,9 +8,9 @@ SRCNAME = "Config-General"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TL/TLINDEN/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[sha256sum] = "4d6d5754be3a9f30906836f0cc10e554c8832e14e7a1341efb15b05d706fc58f"
+SRC_URI[sha256sum] = "473d65127b23dac0e8039c01e28bc4072cb9a6e93e81a1ea4893cea08c698db0"
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
 EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}"
 
diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch b/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch
deleted file mode 100644
index b41bbe0a50..0000000000
--- a/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Backport patch to fix CVE-2014-10402.
-
-CVE: CVE-2014-10402
-Upstream-Status: Backport [https://github.com/rehsack/dbi/commit/19d0fb1]
-
-Ref:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=972180#12
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
-
-From 19d0fb169eed475e1c053e99036b8668625cfa94 Mon Sep 17 00:00:00 2001
-From: Jens Rehsack <sno@netbsd.org>
-Date: Tue, 6 Oct 2020 10:22:17 +0200
-Subject: [PATCH] lib/DBD/File.pm: fix CVE-2014-10401
-
-Dig into the root cause of RT#99508 - which resulted in CVE-2014-10401 - and
-figure out that DBI->parse_dsn is the wrong helper to parse our attributes in
-DSN, since in DBD::dr::connect only the "dbname" remains from DSN which causes
-parse_dsn to bailout.
-
-Parsing on our own similar to parse_dsn shows the way out.
-
-Signed-off-by: Jens Rehsack <sno@netbsd.org>
----
- lib/DBD/File.pm | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/lib/DBD/File.pm b/lib/DBD/File.pm
-index fb14e9a..f55076f 100644
---- a/lib/DBD/File.pm
-+++ b/lib/DBD/File.pm
-@@ -109,7 +109,11 @@ sub connect
-     # We do not (yet) care about conflicting attributes here
-     # my $dbh = DBI->connect ("dbi:CSV:f_dir=test", undef, undef, { f_dir => "text" });
-     # will test here that both test and text should exist
--    if (my $attr_hash = (DBI->parse_dsn ($dbname))[3]) {
-+    #
-+    # Parsing on our own similar to parse_dsn to find attributes in 'dbname' parameter.
-+    if ($dbname) {
-+       my @attrs = split /;/ => $dbname;
-+       my $attr_hash = { map { split /\s*=>?\s*|\s*,\s*/, $_} @attrs };
-        if (defined $attr_hash->{f_dir} && ! -d $attr_hash->{f_dir}) {
-            my $msg = "No such directory '$attr_hash->{f_dir}";
-            $drh->set_err (2, $msg);
-@@ -120,7 +124,6 @@ sub connect
-     if ($attr and defined $attr->{f_dir} && ! -d $attr->{f_dir}) {
-        my $msg = "No such directory '$attr->{f_dir}";
-        $drh->set_err (2, $msg);
--       $attr->{RaiseError} and croak $msg;
-        return;
-        }
- 
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb b/meta-oe/recipes-devtools/perl/libdbi-perl_1.647.bb
index 1fee83a8fd..c128cb7154 100644
--- a/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb
+++ b/meta-oe/recipes-devtools/perl/libdbi-perl_1.647.bb
@@ -4,18 +4,15 @@ DESCRIPTION = "DBI is a database access Application Programming Interface \
 of functions, variables and conventions that provide a consistent \
 database interface independent of the actual database being used. \
 "
-HOMEPAGE = "http://search.cpan.org/dist/DBI/"
+HOMEPAGE = "https://metacpan.org/dist/DBI"
 SECTION = "libs"
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=65f65488c774efe1da488e36ad6c4a36"
 
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz \
-           file://CVE-2014-10402.patch \
-           "
-SRC_URI[md5sum] = "352f80b1e23769c116082a90905d7398"
-SRC_URI[sha256sum] = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa"
+SRC_URI = "${CPAN_MIRROR}/authors/id/H/HM/HMBRAND/DBI-${PV}.tgz"
+SRC_URI[sha256sum] = "0df16af8e5b3225a68b7b592ab531004ddb35a9682b50300ce50174ad867d9aa"
 
-S = "${WORKDIR}/DBI-${PV}"
+S = "${UNPACKDIR}/DBI-${PV}"
 
 inherit cpan ptest-perl
 
diff --git a/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb
index 74a09e7bf8..43614d55ac 100644
--- a/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb
+++ b/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.16.bb
@@ -13,7 +13,7 @@ SRC_URI = "https://cpan.metacpan.org/modules/by-module/Devel/Devel-CheckLib-${PV
 "
 SRC_URI[sha256sum] = "869d38c258e646dcef676609f0dd7ca90f085f56cf6fd7001b019a5d5b831fca"
 
-S = "${WORKDIR}/Devel-CheckLib-${PV}"
+S = "${UNPACKDIR}/Devel-CheckLib-${PV}"
 
 inherit cpan
 
@@ -25,4 +25,4 @@ do_install:append() {
            -e "/use strict;/ause warnings;" ${D}${bindir}/use-devel-checklib
 }
 
-BBCLASSEXTEND="native"
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb
index 6029b7aae9..1464a84d34 100644
--- a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb
+++ b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz"
 
 SRC_URI[sha256sum] = "b15309fc85623893289cb9b2b88dfa9ed1e69156b75f29938553a45be6d730af"
 
-S = "${WORKDIR}/IO-Tty-${PV}"
+S = "${UNPACKDIR}/IO-Tty-${PV}"
 
 inherit cpan ptest-perl
 
diff --git a/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb b/meta-oe/recipes-devtools/perl/libjson-perl_4.05000.bb
index 88d0d26d03..ded0dea0d1 100644
--- a/meta-oe/recipes-devtools/perl/libjson-perl_4.03000.bb
+++ b/meta-oe/recipes-devtools/perl/libjson-perl_4.05000.bb
@@ -11,9 +11,8 @@ DEPENDS += "perl"
 
 SRC_URI = "git://github.com/makamaka/JSON.git;protocol=https;branch=master"
 
-SRCREV = "ebbae181c5e311fa80ee4c6379b598c7a6400570"
+SRCREV = "39bc0e567c202762a575fed2844ebdb941c3ca09"
 
-S = "${WORKDIR}/git"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb b/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb
index be9704a313..a7e05922d6 100644
--- a/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb
+++ b/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://lib/Parse/Yapp.pm;beginline=508;endline=521;md5=41a45
 
 SRC_URI = "https://www.cpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "69584d5b0f0304bb2a23cffcd982c5de"
 SRC_URI[sha256sum] = "3810e998308fba2e0f4f26043035032b027ce51ce5c8a52a8b8e340ca65f13e5"
 
-S = "${WORKDIR}/Parse-Yapp-${PV}"
+S = "${UNPACKDIR}/Parse-Yapp-${PV}"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.14.bb b/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb
index ff4e1f0563..3e4137a68c 100644
--- a/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.14.bb
+++ b/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb
@@ -8,10 +8,12 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "https://cpan.metacpan.org/authors/id/W/WH/WHOM/pcsc-perl-${PV}.tar.bz2"
-SRC_URI[md5sum] = "45601505dbb7b27329811ac9bad35fab"
-SRC_URI[sha256sum] = "2722b7e5543e4faf3ba1ec6b29a7dfec6d92be1edec09d0a3191992d4d88c69d"
+SRC_URI[sha256sum] = "5cc834438739bd6e4e837fb7e10bd8befb809cd185ae6cf4b33e5fa9161f59fe"
 
-S = "${WORKDIR}/pcsc-perl-${PV}"
+UPSTREAM_CHECK_URI = "https://cpan.metacpan.org/authors/id/W/WH/WHOM/"
+UPSTREAM_CHECK_REGEX = "pcsc-perl-(?P<pver>\d+(\.\d+)+)"
+
+S = "${UNPACKDIR}/pcsc-perl-${PV}"
 
 inherit cpan pkgconfig
 
@@ -19,4 +21,4 @@ DEPENDS += "pcsc-lite"
 
 RDEPENDS:${PN} += "perl-module-carp"
 
-BBCLASSEXTEND="native"
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb b/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb
index 11f6a1ad19..981c946483 100644
--- a/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb
+++ b/meta-oe/recipes-devtools/perl/libperlio-gzip-perl_0.20.bb
@@ -11,10 +11,9 @@ DEPENDS += "perl"
 
 SRC_URI = "https://cpan.metacpan.org/authors/id/N/NW/NWCLARK/PerlIO-gzip-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "0393eae5d0b23df6cf40ed44af7d711c"
 SRC_URI[sha256sum] = "4848679a3f201e3f3b0c5f6f9526e602af52923ffa471a2a3657db786bd3bdc5"
 
-S = "${WORKDIR}/PerlIO-gzip-${PV}"
+S = "${UNPACKDIR}/PerlIO-gzip-${PV}"
 
 EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}"
 
diff --git a/meta-oe/recipes-devtools/php/php/0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch b/meta-oe/recipes-devtools/php/php/0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch
deleted file mode 100644
index 5b8c76209a..0000000000
--- a/meta-oe/recipes-devtools/php/php/0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 1eeb59366d6140a799f6051fb9f57d988b81fd5b Mon Sep 17 00:00:00 2001
-From: easyaspi314 <easyaspi314@users.noreply.github.com>
-Date: Wed, 12 Apr 2023 13:33:07 +0800
-Subject: [PATCH] Change whether to inline XXH3_hashLong_withSecret to a config
- option
-
-Change whether to inline XXH3_hashLong_withSecret to a config option to fix
-GCC 12 -Og.
-
-Upstream-Status: Submitted [https://github.com/php/php-src/pull/11062]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- ext/hash/xxhash/xxhash.h | 35 +++++++++++++++++++++++++++++++++--
- 1 file changed, 33 insertions(+), 2 deletions(-)
-
-diff --git a/ext/hash/xxhash/xxhash.h b/ext/hash/xxhash/xxhash.h
-index b5bd2864..8e816c05 100644
---- a/ext/hash/xxhash/xxhash.h
-+++ b/ext/hash/xxhash/xxhash.h
-@@ -1375,6 +1375,23 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr,
-  */
- #  define XXH_NO_INLINE_HINTS 0
- 
-+/*!
-+ * @def XXH3_INLINE_SECRET
-+ * @brief Determines whether to inline the XXH3 withSecret code.
-+ *
-+ * When the secret size is known, the compiler can improve the performance
-+ * of XXH3_64bits_withSecret() and XXH3_128bits_withSecret().
-+ *
-+ * However, if the secret size is not known, it doesn't have any benefit. This
-+ * happens when xxHash is compiled into a global symbol. Therefore, if
-+ * @ref XXH_INLINE_ALL is *not* defined, this will be defined to 0.
-+ *
-+ * Additionally, this defaults to 0 on GCC 12+, which has an issue with function pointers
-+ * that are *sometimes* force inline on -Og, and it is impossible to automatically
-+ * detect this optimization level.
-+ */
-+#  define XXH3_INLINE_SECRET 0
-+
- /*!
-  * @def XXH32_ENDJMP
-  * @brief Whether to use a jump for `XXH32_finalize`.
-@@ -1439,6 +1456,15 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr,
- #  endif
- #endif
- 
-+#ifndef XXH3_INLINE_SECRET
-+#  if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 12) \
-+     || !defined(XXH_INLINE_ALL)
-+#    define XXH3_INLINE_SECRET 0
-+#  else
-+#    define XXH3_INLINE_SECRET 1
-+#  endif
-+#endif
-+
- #ifndef XXH32_ENDJMP
- /* generally preferable for performance */
- #  define XXH32_ENDJMP 0
-@@ -1515,6 +1541,11 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size)
- #  define XXH_NO_INLINE static
- #endif
- 
-+#if XXH3_INLINE_SECRET
-+#  define XXH3_WITH_SECRET_INLINE XXH_FORCE_INLINE
-+#else
-+#  define XXH3_WITH_SECRET_INLINE XXH_NO_INLINE
-+#endif
- 
- 
- /* *************************************
-@@ -4465,7 +4496,7 @@ XXH3_hashLong_64b_internal(const void* XXH_RESTRICT input, size_t len,
-  * so that the compiler can properly optimize the vectorized loop.
-  * This makes a big performance difference for "medium" keys (<1 KB) when using AVX instruction set.
-  */
--XXH_FORCE_INLINE XXH64_hash_t
-+XXH3_WITH_SECRET_INLINE XXH64_hash_t
- XXH3_hashLong_64b_withSecret(const void* XXH_RESTRICT input, size_t len,
-                              XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen)
- {
-@@ -5263,7 +5294,7 @@ XXH3_hashLong_128b_default(const void* XXH_RESTRICT input, size_t len,
-  * It's important for performance to pass @secretLen (when it's static)
-  * to the compiler, so that it can properly optimize the vectorized loop.
-  */
--XXH_FORCE_INLINE XXH128_hash_t
-+XXH3_WITH_SECRET_INLINE XXH128_hash_t
- XXH3_hashLong_128b_withSecret(const void* XXH_RESTRICT input, size_t len,
-                               XXH64_hash_t seed64,
-                               const void* XXH_RESTRICT secret, size_t secretLen)
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-devtools/php/php/0004-configure.ac-don-t-include-build-libtool.m4.patch b/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
index 19a8bf8e4f..fae8697fd4 100644
--- a/meta-oe/recipes-devtools/php/php/0004-configure.ac-don-t-include-build-libtool.m4.patch
+++ b/meta-oe/recipes-devtools/php/php/0001-configure.ac-don-t-include-build-libtool.m4.patch
@@ -1,7 +1,7 @@
-From 41ef1121682c245b10df7de4b78c45baf9114c04 Mon Sep 17 00:00:00 2001
+From 6da78888b934dc10720a6e0e520536077cc2aac2 Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:03:46 -0500
-Subject: [PATCH 04/11] configure.ac: don't include build/libtool.m4
+Subject: [PATCH 1/5] configure.ac: don't include build/libtool.m4
 
 we delete build/libtool.m4 before do_configure,
 we will use libtool.m4 under ACLOCALDIR
@@ -17,7 +17,7 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 90c94323aa..161e7c3f53 100644
+index 9d79720a2..9353e2f6e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -6,7 +6,6 @@ dnl ----------------------------------------------------------------------------
diff --git a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch
deleted file mode 100644
index c743697469..0000000000
--- a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From 889583912ddd7abc628f2703892ec4884db6419a Mon Sep 17 00:00:00 2001
-From: Soumya Sambu <soumya.sambu@windriver.com>
-Date: Tue, 7 May 2024 08:39:16 +0000
-Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache
-
-We can't use AC_TRY_RUN to run programs in a cross compile
-environment. Set the variables directly instead since we know
-that we'd be running on latest enough linux kernel.
-
-Upstream-Status: Inappropriate [Configuration]
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-
-update patch to version 7.4.4
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
-update patch to version 8.0.12
-fix issue linking with librt
-Signed-off-by: Claude Bing <cbing@cybernetics.com>
-
-update patch to version 8.1.0
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
-
-update patch to version 8.2.18
-Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com>
----
- ext/opcache/config.m4 | 204 ++----------------------------------------
- 1 file changed, 8 insertions(+), 196 deletions(-)
-
-diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
-index 6bf07ad3..5d645b86 100644
---- a/ext/opcache/config.m4
-+++ b/ext/opcache/config.m4
-@@ -113,209 +113,21 @@ if test "$PHP_OPCACHE" != "no"; then
-   AC_CHECK_FUNCS([mprotect])
- 
-   AC_MSG_CHECKING(for sysvipc shared memory support)
--  AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#include <sys/types.h>
--#include <sys/wait.h>
--#include <sys/ipc.h>
--#include <sys/shm.h>
--#include <unistd.h>
--#include <string.h>
--
--int main(void) {
--  pid_t pid;
--  int status;
--  int ipc_id;
--  char *shm;
--  struct shmid_ds shmbuf;
--
--  ipc_id = shmget(IPC_PRIVATE, 4096, (IPC_CREAT | SHM_R | SHM_W));
--  if (ipc_id == -1) {
--    return 1;
--  }
--
--  shm = shmat(ipc_id, NULL, 0);
--  if (shm == (void *)-1) {
--    shmctl(ipc_id, IPC_RMID, NULL);
--    return 2;
--  }
--
--  if (shmctl(ipc_id, IPC_STAT, &shmbuf) != 0) {
--    shmdt(shm);
--    shmctl(ipc_id, IPC_RMID, NULL);
--    return 3;
--  }
--
--  shmbuf.shm_perm.uid = getuid();
--  shmbuf.shm_perm.gid = getgid();
--  shmbuf.shm_perm.mode = 0600;
--
--  if (shmctl(ipc_id, IPC_SET, &shmbuf) != 0) {
--    shmdt(shm);
--    shmctl(ipc_id, IPC_RMID, NULL);
--    return 4;
--  }
--
--  shmctl(ipc_id, IPC_RMID, NULL);
--
--  strcpy(shm, "hello");
--
--  pid = fork();
--  if (pid < 0) {
--    return 5;
--  } else if (pid == 0) {
--    strcpy(shm, "bye");
--    return 6;
--  }
--  if (wait(&status) != pid) {
--    return 7;
--  }
--  if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) {
--    return 8;
--  }
--  if (strcmp(shm, "bye") != 0) {
--    return 9;
--  }
--  return 0;
--}
--]])],[have_shm_ipc=yes],[have_shm_ipc=no],[have_shm_ipc=no])
--  if test "$have_shm_ipc" = "yes"; then
--    AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
--  fi
-+  AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
-+  have_shm_ipc=yes
-   AC_MSG_RESULT([$have_shm_ipc])
- 
-   AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support)
--  AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#include <sys/types.h>
--#include <sys/wait.h>
--#include <sys/mman.h>
--#include <unistd.h>
--#include <string.h>
--
--#ifndef MAP_ANON
--# ifdef MAP_ANONYMOUS
--#  define MAP_ANON MAP_ANONYMOUS
--# endif
--#endif
--#ifndef MAP_FAILED
--# define MAP_FAILED ((void*)-1)
--#endif
--
--int main(void) {
--  pid_t pid;
--  int status;
--  char *shm;
--
--  shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
--  if (shm == MAP_FAILED) {
--    return 1;
--  }
--
--  strcpy(shm, "hello");
--
--  pid = fork();
--  if (pid < 0) {
--    return 5;
--  } else if (pid == 0) {
--    strcpy(shm, "bye");
--    return 6;
--  }
--  if (wait(&status) != pid) {
--    return 7;
--  }
--  if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) {
--    return 8;
--  }
--  if (strcmp(shm, "bye") != 0) {
--    return 9;
--  }
--  return 0;
--}
--]])],[have_shm_mmap_anon=yes],[have_shm_mmap_anon=no],[
--  case $host_alias in
--    *linux*)
--      have_shm_mmap_anon=yes
--      ;;
--    *)
--      have_shm_mmap_anon=no
--      ;;
--  esac
--])
--  if test "$have_shm_mmap_anon" = "yes"; then
--    AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
--  fi
-+  AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
-+  have_shm_mmap_anon=yes
-   AC_MSG_RESULT([$have_shm_mmap_anon])
- 
-   PHP_CHECK_FUNC_LIB(shm_open, rt, root)
-   AC_MSG_CHECKING(for mmap() using shm_open() shared memory support)
--  AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#include <sys/types.h>
--#include <sys/wait.h>
--#include <sys/mman.h>
--#include <sys/stat.h>
--#include <fcntl.h>
--#include <unistd.h>
--#include <string.h>
--#include <stdlib.h>
--#include <stdio.h>
--
--#ifndef MAP_FAILED
--# define MAP_FAILED ((void*)-1)
--#endif
--
--int main(void) {
--  pid_t pid;
--  int status;
--  int fd;
--  char *shm;
--  char tmpname[4096];
--
--  sprintf(tmpname,"/opcache.test.shm.%dXXXXXX", getpid());
--  if (mktemp(tmpname) == NULL) {
--    return 1;
--  }
--  fd = shm_open(tmpname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
--  if (fd == -1) {
--    return 2;
--  }
--  if (ftruncate(fd, 4096) < 0) {
--    close(fd);
--    shm_unlink(tmpname);
--    return 3;
--  }
--
--  shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
--  if (shm == MAP_FAILED) {
--    return 4;
--  }
--  shm_unlink(tmpname);
--  close(fd);
--
--  strcpy(shm, "hello");
--
--  pid = fork();
--  if (pid < 0) {
--    return 5;
--  } else if (pid == 0) {
--    strcpy(shm, "bye");
--    return 6;
--  }
--  if (wait(&status) != pid) {
--    return 7;
--  }
--  if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) {
--    return 8;
--  }
--  if (strcmp(shm, "bye") != 0) {
--    return 9;
--  }
--  return 0;
--}
--]])],[have_shm_mmap_posix=yes],[have_shm_mmap_posix=no],[have_shm_mmap_posix=no])
--  if test "$have_shm_mmap_posix" = "yes"; then
--    AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
--    PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
--  fi
--  AC_MSG_RESULT([$have_shm_mmap_posix])
-+  AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
-+  AC_MSG_RESULT([yes])
-+  have_shm_mmap_posix=yes
-+  PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
- 
-   PHP_NEW_EXTENSION(opcache,
-        ZendAccelerator.c \
--- 
-2.40.0
-
diff --git a/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch b/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch
deleted file mode 100644
index 6183f49c28..0000000000
--- a/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1af203e8e385d46ad3e33b1c253b1c564aa99034 Mon Sep 17 00:00:00 2001
-From: Claude Bing <cbing@cybernetics.com>
-Date: Tue, 9 Nov 2021 13:01:55 -0500
-Subject: [PATCH 02/11] build/php.m4: don't unset cache variables
-
-Unsetting prevents cache variable from being passed to configure.
-
-Upstream-Status: Inappropriate [OE-specific]
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-
-update this patch to 7.4.4, acinclude.m4 move to build/php.m4
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
-update patch to 8.0.12
-Signed-off-by: Claude Bing <cbing@cybernetics.com>
----
- build/php.m4 | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/build/php.m4 b/build/php.m4
-index 9746ba28f3..93551d9ca7 100644
---- a/build/php.m4
-+++ b/build/php.m4
-@@ -1568,8 +1568,6 @@ dnl PHP_CHECK_FUNC_LIB
- dnl
- AC_DEFUN([PHP_CHECK_FUNC_LIB],[
-   ifelse($2,,:,[
--  unset ac_cv_lib_$2[]_$1
--  unset ac_cv_lib_$2[]___$1
-   unset found
-   AC_CHECK_LIB($2, $1, [found=yes], [
-     AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
-@@ -1601,8 +1599,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and
- dnl HAVE_library if found and adds the library to LIBS.
- dnl
- AC_DEFUN([PHP_CHECK_FUNC],[
--  unset ac_cv_func_$1
--  unset ac_cv_func___$1
-   unset found
- 
-   AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch b/meta-oe/recipes-devtools/php/php/0002-ext-phar-Makefile.frag-Fix-phar-packaging.patch
index acf2940839..b2c4f8840f 100644
--- a/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch
+++ b/meta-oe/recipes-devtools/php/php/0002-ext-phar-Makefile.frag-Fix-phar-packaging.patch
@@ -1,7 +1,7 @@
-From eab5babdadea487bbbef025068c553f5ba741774 Mon Sep 17 00:00:00 2001
+From f7724d7ccd157058630e6a887798ab6d3e34c6b7 Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:07:25 -0500
-Subject: [PATCH 06/11] ext/phar/Makefile.frag: Fix phar packaging
+Subject: [PATCH 2/5] ext/phar/Makefile.frag: Fix phar packaging
 
 Inherited from OE-Classic, with some additions to fix host paths leaking
 into the target package.
@@ -18,9 +18,11 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com>
  ext/phar/Makefile.frag | 17 +++--------------
  1 file changed, 3 insertions(+), 14 deletions(-)
 
+diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
+index cedde76df..09d577d73 100644
 --- a/ext/phar/Makefile.frag
 +++ b/ext/phar/Makefile.frag
-@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir
+@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
  
  PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
  PHP_PHARCMD_EXECUTABLE = ` \
@@ -44,3 +46,6 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com>
  
  $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
         -@test -d $(builddir)/phar || mkdir $(builddir)/phar
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch b/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch
index e3b8cd4707..745bc2140d 100644
--- a/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch
+++ b/meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch
@@ -1,7 +1,7 @@
-From a04aabc5b80371e579fbaffdd417627390d22722 Mon Sep 17 00:00:00 2001
+From d9fc6b314cefe010a0deb6e591719cfb0ff226a5 Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:10:33 -0500
-Subject: [PATCH 10/11] iconv: fix detection
+Subject: [PATCH] iconv: fix detection
 
 Upstream-Status: Pending
 
@@ -12,24 +12,24 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 
 update patch to version 8.0.12
 Signed-off-by: Claude Bing <cbing@cybernetics.com>
+
+update patch to version 8.4.4
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
 ---
  build/php.m4 | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/build/php.m4 b/build/php.m4
-index 93551d9ca7..dba50825fb 100644
+index d8a5cbf0..aee21924 100644
 --- a/build/php.m4
 +++ b/build/php.m4
-@@ -1919,7 +1919,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
-   unset ICONV_DIR
+@@ -1829,7 +1829,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
+     [Define to 1 if you have the 'libiconv' function.])
  
    dnl Check libc first if no path is provided in --with-iconv.
--  if test "$PHP_ICONV" = "yes"; then
+-  AS_VAR_IF([PHP_ICONV], [yes], [
 +  dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes
-+  if test "$PHP_ICONV" != "no"; then
++  AS_VAR_IF([PHP_ICONV], [no], [], [
      dnl Reset LIBS temporarily as it may have already been included -liconv in.
-     LIBS_save="$LIBS"
+     LIBS_save=$LIBS
      LIBS=
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch b/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch
deleted file mode 100644
index 9637ed9516..0000000000
--- a/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c81d0bd3491a6c6371d9df2f43956d109f984310 Mon Sep 17 00:00:00 2001
-From: Claude Bing <cbing@cybernetics.com>
-Date: Tue, 9 Nov 2021 13:02:29 -0500
-Subject: [PATCH 03/11] php: remove host specific info from header file
-
-Based on:
-https://sources.debian.org/data/main/p/php7.3/7.3.6-1/debian/patches/
-        0036-php-5.4.9-fixheader.patch
-
-Upstream-Status: Inappropriate [not author]
-
-Signed-off-by: Joe Slater <joe.slater@windriver.com>
-Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
-
-update patch to 8.0.12
-Signed-off-by: Claude Bing <cbing@cybernetics.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1eafd62a44..90c94323aa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1289,7 +1289,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS)
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
- EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
- 
--UNAME=`uname -a | xargs`
-+UNAME=`uname | xargs`
- PHP_UNAME=${PHP_UNAME:-$UNAME}
- AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
- PHP_OS=`uname | xargs`
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch b/meta-oe/recipes-devtools/php/php/0004-pear-fix-Makefile.frag-for-Yocto.patch
index 37752ef949..23641be2c6 100644
--- a/meta-oe/recipes-devtools/php/php/0005-pear-fix-Makefile.frag-for-Yocto.patch
+++ b/meta-oe/recipes-devtools/php/php/0004-pear-fix-Makefile.frag-for-Yocto.patch
@@ -1,20 +1,20 @@
-From f22958b4c1348eec3bb4c0f2cbe2d22676e0ad23 Mon Sep 17 00:00:00 2001
+From 35d7d40ac49c96b7a9a19b2f6593abb9f18ade2b Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:04:29 -0500
-Subject: [PATCH 05/11] pear: fix Makefile.frag for Yocto
+Subject: [PATCH 4/5] pear: fix Makefile.frag for Yocto
+
+Upstream-Status: Pending
 
 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 
 update patch to 8.0.12
 Signed-off-by: Claude Bing <cbing@cybernetics.com>
 ---
-Upstream-Status: Pending
-
  pear/Makefile.frag | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/pear/Makefile.frag b/pear/Makefile.frag
-index 9408757a3a..69072f39e0 100644
+index 9408757a3..69072f39e 100644
 --- a/pear/Makefile.frag
 +++ b/pear/Makefile.frag
 @@ -10,7 +10,7 @@ PEAR_SUFFIX = -ds a$(program_suffix)
diff --git a/meta-oe/recipes-devtools/php/php/0007-sapi-cli-config.m4-fix-build-directory.patch b/meta-oe/recipes-devtools/php/php/0005-sapi-cli-config.m4-fix-build-directory.patch
index 9776e7f6db..e551f19a48 100644
--- a/meta-oe/recipes-devtools/php/php/0007-sapi-cli-config.m4-fix-build-directory.patch
+++ b/meta-oe/recipes-devtools/php/php/0005-sapi-cli-config.m4-fix-build-directory.patch
@@ -1,7 +1,7 @@
-From 03aa51625e0d1aa156c2f7cd71503b1f435d35a4 Mon Sep 17 00:00:00 2001
+From 581751f8b612c381a4a7914a33bfc4130853d305 Mon Sep 17 00:00:00 2001
 From: Claude Bing <cbing@cybernetics.com>
 Date: Tue, 9 Nov 2021 13:08:06 -0500
-Subject: [PATCH 07/11] sapi/cli/config.m4: fix build directory
+Subject: [PATCH 5/5] sapi/cli/config.m4: fix build directory
 
 Upstream-Status: Inappropriate
 
@@ -10,23 +10,26 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
 
 update patch to version 8.0.12
 Signed-off-by: Claude Bing <cbing@cybernetics.com>
+
+update patch for version 8.4.4
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
 ---
  sapi/cli/config.m4 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
-index d17d531683..f2f87f9164 100644
+index 76c2d64e8..0c7436fd9 100644
 --- a/sapi/cli/config.m4
 +++ b/sapi/cli/config.m4
-@@ -47,7 +47,7 @@ if test "$PHP_CLI" != "no"; then
-   esac
+@@ -50,7 +50,7 @@ if test "$PHP_CLI" != "no"; then
+     ])
  
    dnl Set executable for tests.
 -  PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
 +  PHP_EXECUTABLE="${PHP_NATIVE_DIR}/php"
-   PHP_SUBST(PHP_EXECUTABLE)
  
-   dnl Expose to Makefile.
+   PHP_SUBST([PHP_EXECUTABLE])
+   PHP_SUBST([SAPI_CLI_PATH])
 -- 
 2.25.1
 
diff --git a/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch b/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch
deleted file mode 100644
index 78bae58e00..0000000000
--- a/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From c3c20db4415e0f6c4a601d6f9da1f3746a96b301 Mon Sep 17 00:00:00 2001
-From: Claude Bing <cbing@cybernetics.com>
-Date: Tue, 9 Nov 2021 13:08:58 -0500
-Subject: [PATCH 08/11] ext/imap/config.m4: fix include paths
-
-Upstream-Status: Pending
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-
-update patch to version 8.0.12
-Signed-off-by: Claude Bing <cbing@cybernetics.com>
----
- ext/imap/config.m4 | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
-index 5086a312d0..0e938bd544 100644
---- a/ext/imap/config.m4
-+++ b/ext/imap/config.m4
-@@ -110,7 +110,7 @@ if test "$PHP_IMAP" != "no"; then
-     PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-     AC_DEFINE(HAVE_IMAP,1,[ ])
- 
--    for i in $PHP_IMAP /usr/local /usr; do
-+    for i in $PHP_IMAP $PHP_IMAP/usr /usr/local /usr; do
-       IMAP_INC_CHK()
-       el[]IMAP_INC_CHK(/include/c-client)
-       el[]IMAP_INC_CHK(/include/imap)
-@@ -199,13 +199,7 @@ if test "$PHP_IMAP" != "no"; then
-       AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
-     fi
- 
--    if test ! -r "$IMAP_DIR/c-client/libc-client.a" && test -r "$IMAP_DIR/c-client/c-client.a" ; then
--      ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
--    elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
--      ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
--    fi
--
--    for lib in c-client4 c-client imap; do
-+    for lib in /usr/lib c-client4 c-client imap; do
-       IMAP_LIB=$lib
-       IMAP_LIB_CHK($PHP_LIBDIR)
-       IMAP_LIB_CHK(c-client)
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch b/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch
deleted file mode 100644
index b5a33cca7f..0000000000
--- a/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8707720c0aea405f0e06d67354f239232cc823cc Mon Sep 17 00:00:00 2001
-From: Claude Bing <cbing@cybernetics.com>
-Date: Tue, 9 Nov 2021 13:10:02 -0500
-Subject: [PATCH 09/11] php: don't use broken wrapper for mkdir
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-
-update patch to version 7.4.4
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
-update patch to version 8.0.12
-Signed-off-by: Claude Bing <cbing@cybernetics.com>
----
-Upstream-Status: Pending
-
- build/Makefile.global | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/Makefile.global b/build/Makefile.global
-index 6566d052de..eb39421f2a 100644
---- a/build/Makefile.global
-+++ b/build/Makefile.global
-@@ -1,4 +1,4 @@
--mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
-+mkinstalldirs = mkdir -p
- INSTALL = $(top_srcdir)/build/shtool install -c
- INSTALL_DATA = $(INSTALL) -m 644
- 
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-devtools/php/php_8.2.18.bb b/meta-oe/recipes-devtools/php/php_8.4.8.bb
index e662f6806e..f38a407968 100644
--- a/meta-oe/recipes-devtools/php/php_8.2.18.bb
+++ b/meta-oe/recipes-devtools/php/php_8.4.8.bb
@@ -1,5 +1,5 @@
 SUMMARY = "A server-side, HTML-embedded scripting language"
-HOMEPAGE = "http://www.php.net"
+HOMEPAGE = "https://www.php.net"
 SECTION = "console/network"
 
 LICENSE = "PHP-3.0"
@@ -13,28 +13,23 @@ DEPENDS:class-native = "zlib-native libxml2-native"
 PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}"
 
 SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
-           file://0002-build-php.m4-don-t-unset-cache-variables.patch \
-           file://0003-php-remove-host-specific-info-from-header-file.patch \
-           file://0004-configure.ac-don-t-include-build-libtool.m4.patch \
-           file://0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch \
-           file://0009-php-don-t-use-broken-wrapper-for-mkdir.patch \
-           file://0010-iconv-fix-detection.patch \
-           file://0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch \
+           file://0001-configure.ac-don-t-include-build-libtool.m4.patch \
+           file://0002-ext-phar-Makefile.frag-Fix-phar-packaging.patch \
           "
 
 SRC_URI:append:class-target = " \
-            file://0001-ext-opcache-config.m4-enable-opcache.patch \
-            file://0005-pear-fix-Makefile.frag-for-Yocto.patch \
-            file://0007-sapi-cli-config.m4-fix-build-directory.patch \
-            file://0008-ext-imap-config.m4-fix-include-paths.patch \
+            file://0003-iconv-fix-detection.patch \
+            file://0004-pear-fix-Makefile.frag-for-Yocto.patch \
+            file://0005-sapi-cli-config.m4-fix-build-directory.patch \
             file://php-fpm.conf \
             file://php-fpm-apache.conf \
             file://70_mod_php${PHP_MAJOR_VERSION}.conf \
             file://php-fpm.service \
           "
 
-S = "${WORKDIR}/php-${PV}"
-SRC_URI[sha256sum] = "ca0b07c254200320f518ac5b3df540a9cf14d866f3c93edc3013b52e06fac796"
+S = "${UNPACKDIR}/php-${PV}"
+
+SRC_URI[sha256sum] = "36569c64dd1499e570c436603b641eee7cde4af576af786597d0ee711b3a3a8a"
 
 CVE_STATUS_GROUPS += "CVE_STATUS_PHP"
 CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored."
@@ -43,6 +38,7 @@ CVE_STATUS_PHP = " \
     CVE-2007-3205 \
     CVE-2007-4596 \
 "
+CVE_STATUS[CVE-2022-4900] = "cpe-incorrect: The current version (8.2.20) is not affected."
 
 inherit autotools pkgconfig python3native gettext multilib_header multilib_script systemd
 
@@ -51,6 +47,8 @@ inherit autotools pkgconfig python3native gettext multilib_header multilib_scrip
 SSTATE_SCAN_FILES += "phpize"
 SSTATE_SCAN_FILES += "build-defs.h"
 
+export PHP_UNAME = "Linux"
+
 PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}"
 
 # Common EXTRA_OECONF
@@ -70,10 +68,12 @@ EXTRA_OECONF = "--enable-mbstring \
                 --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
                 --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
                 ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
-                ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \
                 ${COMMON_EXTRA_OECONF} \
 "
 
+# Set these values directly to avoid AC_RUN_IFELSE which does not work in cross compilation environment
+CACHED_CONFIGUREVARS += "ac_cv_php_cv_shm_ipc=yes ac_cv_php_cv_shm_mmap_anon=yes ac_cv_php_cv_shm_mmap_posix=yes"
+
 EXTRA_OECONF:append:riscv64 = " --with-pcre-jit=no"
 EXTRA_OECONF:append:riscv32 = " --with-pcre-jit=no"
 # Needs fibers assembly implemented for rv32
@@ -81,44 +81,36 @@ EXTRA_OECONF:append:riscv32 = " --with-pcre-jit=no"
 # see https://github.com/php/php-src/commit/70b02d75f2abe3a292d49c4a4e9e4f850c2fee68
 EXTRA_OECONF:append:riscv32:libc-musl = " --disable-fiber-asm"
 
-CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=yes"
-
 EXTRA_OECONF:class-native = " \
                 --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \
                 --without-iconv \
                 ${COMMON_EXTRA_OECONF} \
 "
 
-PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \
+PACKAGECONFIG ??= "mysql sqlite3 opcache openssl \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \
 "
 PACKAGECONFIG:class-native = ""
 
-PACKAGECONFIG[zip] = "--with-zip --with-zlib-dir=${STAGING_EXECPREFIXDIR},,libzip"
-
+PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+PACKAGECONFIG[mbregex] = "--enable-mbregex, --disable-mbregex, oniguruma"
+PACKAGECONFIG[mbstring] = "--enable-mbstring,,"
 PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \
                         --with-pdo-mysql=mysqlnd \
                         ,--without-mysqli --without-pdo-mysql \
                         ,mysql5"
-
+PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache"
+PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
+PACKAGECONFIG[pam] = ",,libpam"
+PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql"
+PACKAGECONFIG[soap] = "--enable-soap, --disable-soap, libxml2"
 PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \
                           --with-pdo-sqlite=${STAGING_LIBDIR}/.. \
                           ,--without-sqlite3 --without-pdo-sqlite \
                           ,sqlite3"
-PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql"
-PACKAGECONFIG[soap] = "--enable-soap, --disable-soap, libxml2"
-PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2"
-PACKAGECONFIG[pam] = ",,libpam"
-PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \
-                       --with-imap-ssl=${STAGING_DIR_HOST} \
-                       ,--without-imap --without-imap-ssl \
-                       ,uw-imap"
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache"
-PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
 PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind"
-PACKAGECONFIG[mbregex] = "--enable-mbregex, --disable-mbregex, oniguruma"
-PACKAGECONFIG[mbstring] = "--enable-mbstring,,"
+PACKAGECONFIG[zip] = "--with-zip --with-zlib-dir=${STAGING_EXECPREFIXDIR},,libzip"
 
 export HOSTCC = "${BUILD_CC}"
 export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
@@ -135,8 +127,6 @@ LDFLAGS:append:riscv64 = " -latomic"
 
 EXTRA_OEMAKE = "INSTALL_ROOT=${D}"
 
-acpaths = ""
-
 do_configure:prepend () {
     rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4
     find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!'
@@ -162,8 +152,11 @@ do_install:append:class-native() {
 }
 
 do_install:prepend() {
-    cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \
-        ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4
+    cat ${STAGING_DATADIR}/aclocal/libtool.m4 \
+    ${STAGING_DATADIR}/aclocal/lt~obsolete.m4 \
+    ${STAGING_DATADIR}/aclocal/ltoptions.m4 \
+    ${STAGING_DATADIR}/aclocal/ltsugar.m4 \
+    ${STAGING_DATADIR}/aclocal/ltversion.m4 > ${S}/build/libtool.m4
 }
 
 do_install:prepend:class-target() {
diff --git a/meta-oe/recipes-devtools/pistache/pistache_0.4.26.bb b/meta-oe/recipes-devtools/pistache/pistache_0.4.26.bb
new file mode 100644
index 0000000000..b0a20e3ece
--- /dev/null
+++ b/meta-oe/recipes-devtools/pistache/pistache_0.4.26.bb
@@ -0,0 +1,40 @@
+SUMMARY = "A high-performance REST toolkit written in C++"
+HOMEPAGE = "https://pistacheio.github.io/pistache"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+
+SRC_URI = "git://github.com/pistacheio/pistache.git;branch=master;protocol=https"
+# SRCREV tagged 0.4.26
+SRCREV = "ddffda861aa49012dcda28f1362d0339e718cd52"
+
+
+DEPENDS = "rapidjson"
+
+inherit pkgconfig meson
+
+PACKAGECONFIG ?= "openssl brotli deflate zstd examples"
+PACKAGECONFIG[openssl]  = "-DPISTACHE_USE_SSL=true, -DPISTACHE_USE_SSL=false, openssl"
+PACKAGECONFIG[brotli]   = "-DPISTACHE_USE_CONTENT_ENCODING_BROTLI=true, -DPISTACHE_USE_CONTENT_ENCODING_BROTLI=false, brotli"
+PACKAGECONFIG[deflate]  = "-DPISTACHE_USE_CONTENT_ENCODING_DEFLATE=true, -DPISTACHE_USE_CONTENT_ENCODING_DEFLATE=false, zlib"
+PACKAGECONFIG[zstd]     = "-DPISTACHE_USE_CONTENT_ENCODING_ZSTD=true, -DPISTACHE_USE_CONTENT_ENCODING_ZSTD=false, zstd"
+PACKAGECONFIG[examples] = "-DPISTACHE_BUILD_EXAMPLES=true, -DPISTACHE_BUILD_EXAMPLES=false"
+PACKAGECONFIG[test]     = "-DPISTACHE_BUILD_TESTS=true, -DPISTACHE_BUILD_TESTS=false, gtest curl"
+
+do_install:append () {
+    if ${@bb.utils.contains("PACKAGECONFIG", "examples", "true", "false", d)}; then
+        install -d ${D}${bindir}
+        rm -rf ${B}/examples/*.p/
+        install -m 0755 ${B}/examples/run*   ${D}${bindir}/
+    fi
+}
+
+PACKAGES += "${PN}-examples"
+FILES:${PN}:remove  = " ${bindir}/*"
+RDEPENDS:${PN}-examples += "${PN}"
+FILES:${PN}-examples = "${bindir}"
+
+RDEPENDS:${PN} += "rapidjson"
+
+COMPATIBLE_HOST:libc-musl = "null"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/ply/ply_git.bb b/meta-oe/recipes-devtools/ply/ply_git.bb
index 7793971083..916ff29118 100644
--- a/meta-oe/recipes-devtools/ply/ply_git.bb
+++ b/meta-oe/recipes-devtools/ply/ply_git.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS += "bison-native"
 
-PV = "2.3.0"
+PV = "2.4.0"
 
 SRC_URI = "git://github.com/iovisor/ply;branch=master;protocol=https"
-SRCREV = "864fac79116870df1ab7aa21e639578807e41e75"
+SRCREV = "282558cfa1c0f0e095354e3a6ec4486b524179dc"
 
-S = "${WORKDIR}/git"
 
 CACHED_CONFIGUREVARS = 'LD="${HOST_PREFIX}ld.bfd${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}"'
 
diff --git a/meta-oe/recipes-devtools/pmtools/pmtools/pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch b/meta-oe/recipes-devtools/pmtools/pmtools/pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch
deleted file mode 100644
index 3be18986fc..0000000000
--- a/meta-oe/recipes-devtools/pmtools/pmtools/pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 03a886252f6555d6b0af76b654e76459642b89da Mon Sep 17 00:00:00 2001
-From: Yunguo Wei <yunguo.wei@windriver.com>
-Date: Tue, 3 Dec 2013 18:12:50 +0800
-Subject: [PATCH] pmtools: switch to dynamic buffer for huge ACPI tables
-
-For servers like Canoe Pass or Thunder Ridge, there are much more
-entries in ACPI table, so original 1K buffer is insufficient.
-
-We switch to dynamic buffer on this situation.
-
-Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
-
-
-Upstream-Status: Pending
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
- madt/madt.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
---- a/madt/madt.c
-+++ b/madt/madt.c
-@@ -34,14 +34,16 @@ typedef unsigned long long u64;
- //#include <sys/mman.h>
- #include <stdio.h> // fread
- #include <stdlib.h> // malloc
-+#include <string.h> // memset/memcpy
- 
- #include "./tables.c"
- 
- int verbose = 0;
- /*
--/* read standard input
-+ * read standard input
-  * write decoded madt to standard output
-  */
-+size_t
- get_next_entry(acpi_table_entry_header * entry_header)
- {
-        size_t retval;
-@@ -51,9 +53,11 @@ get_next_entry(acpi_table_entry_header *
-        return retval;
- }
- 
--u8     buffer[1024];
- 
--main()
-+u8     buf[1024];
-+u8     *buffer = buf;
-+int
-+main(int argc, char *argv[])
- {
-        size_t retval;
-        struct acpi_table_madt *madt_header;
-@@ -75,6 +79,17 @@ main()
- 
-        if (verbose) printf("header.length %d\n", madt_header->header.length);
- 
-+       /* if 1K buffer is insufficient for acpi table, switch to a larger memory buffer */
-+       if(expected_length > sizeof(buf)) {
-+               buffer = malloc(expected_length);
-+               if (!buffer) {
-+                       perror("malloc");
-+                       exit(1);
-+               }
-+               memset(buffer, 0, expected_length);
-+               memcpy(buffer, buf, sizeof(struct acpi_table_madt));
-+       }
-+
-        acpi_table_print((void*)&(buffer[bytes_read]), 0);
- 
-        bytes_read = sizeof(struct acpi_table_madt);
-@@ -118,6 +133,9 @@ done:
-                printf("Checksum 0x%x != 0; 0x%x in header ERROR\n", csum,
-                         madt_header->header.checksum);
- 
-+       if(buffer != buf)
-+               free(buffer);
-+
-        return 0;
- }
- 
diff --git a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
deleted file mode 100644
index ad149de12c..0000000000
--- a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "This is a small collection of power management \
-    test and investigation tools"
-HOMEPAGE = "http://lesswatts.org/projects/acpi"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-
-PV = "20130209+git"
-
-SRC_URI = "git://github.com/anyc/pmtools.git;branch=master;protocol=https \
-    file://pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch \
-"
-SRCREV = "3ebe0e54c54061b4c627236cbe35d820de2e1168"
-
-COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
-
-S = "${WORKDIR}/git"
-
-inherit update-alternatives
-
-ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE:${PN} = "acpixtract acpidump"
-
-do_configure[noexec] = "1"
-do_compile() {
-    oe_runmake
-}
-
-do_install() {
-    install -d ${D}${bindir} ${D}${docdir}
-    install -m 755 ${S}/acpidump/acpidump ${D}${bindir}
-    install -m 755 ${S}/acpixtract/acpixtract ${D}${bindir}
-    install -m 755 ${S}/madt/madt ${D}${bindir}
-    install -m 644 ${S}/README ${D}${docdir}
-}
diff --git a/meta-oe/recipes-devtools/pocketpy/pocketpy_2.0.6.bb b/meta-oe/recipes-devtools/pocketpy/pocketpy_2.0.6.bb
new file mode 100644
index 0000000000..f3ffccf626
--- /dev/null
+++ b/meta-oe/recipes-devtools/pocketpy/pocketpy_2.0.6.bb
@@ -0,0 +1,33 @@
+SUMMARY = "A Portable Python 3.x Interpreter in Modern C."
+DESCRIPTION = "pkpy is a lightweight(~15K LOC) Python 3.x \
+              interpreter for game scripting, written in C11. \
+              It aims to be an alternative to lua for game \
+              scripting, with elegant syntax, powerful features \
+              and competitive performance.  pkpy is extremely \
+              easy to embed via a single header file pocketpy.h, \
+              without external dependencies. \
+              "
+HOMEPAGE = "https://pocketpy.dev/"
+BUGTRACKER = "https://github.com/pocketpy/pocketpy/issues"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8cdfa87bc5e09bc07f8cf64135026d91"
+
+SRC_URI = "git://github.com/pocketpy/pocketpy.git;protocol=https;branch=main"
+SRCREV = "8a3bdd7e0a43b44e3b32548543128d95e68a3802"
+
+
+inherit cmake
+
+CFLAGS += "-fPIC"
+
+do_install() {
+    install -d ${D}${libdir}
+    install -m 0644 ${B}/libpocketpy.so ${D}${libdir}/
+    install -d ${D}${includedir}/pocketpy
+    cp -r ${S}/include/* ${D}${includedir}/pocketpy/
+}
+
+FILES:${PN} = "${libdir}/libpocketpy.so"
+FILES:${PN}-dev = "${includedir}/pocketpy"
+FILES:${PN}-dbg += "${libdir}/.debug/libpocketpy.so"
diff --git a/meta-oe/recipes-devtools/poke/poke_4.1.bb b/meta-oe/recipes-devtools/poke/poke_4.2.bb
index 2963680704..0ae392947e 100644
--- a/meta-oe/recipes-devtools/poke/poke_4.1.bb
+++ b/meta-oe/recipes-devtools/poke/poke_4.2.bb
@@ -11,14 +11,9 @@ SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \
 
 DEPENDS = "flex-native bison-native bdwgc readline"
 
-SRC_URI[sha256sum] = "08ecaea41f7374acd4238e12bbf97e8cd5e572d5917e956b73b9d43026e9d740"
+SRC_URI[sha256sum] = "8aaf36e61e367a53140ea40e2559e9ec512e779c42bee34e7ac24b34ba119bde"
 
-# poke does not support using out-of-tree builds
-inherit autotools-brokensep gettext pkgconfig
-
-# The automatic m4 path detection gets confused, so force the right value from
-# the poke bootstrap script.
-acpaths = "-I ./m4"
+inherit autotools gettext pkgconfig
 
 EXTRA_OECONF = "--disable-gui \
                 --disable-libnbd \
@@ -29,5 +24,8 @@ PACKAGECONFIG[mi] = "--enable-mi,--disable-mi,json-c"
 
 PACKAGES =+ "${PN}-emacs ${PN}-vim"
 
+# Disable parallel install as it is not supported upstream
+PARALLEL_MAKEINST = "-j1"
+
 FILES:${PN}-emacs += "${datadir}/emacs/site-lisp"
 FILES:${PN}-vim += "${datadir}/vim/vimfiles"
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch
index 896a568e19..cae68e948b 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch
@@ -1,6 +1,6 @@
-From 62b2fd0a150133b6439f6537cb1762d35f5790ee Mon Sep 17 00:00:00 2001
+From ad4d22cd6b0b1237a4d50699736d38cd3c902ace Mon Sep 17 00:00:00 2001
 From: Xiangyu Chen <xiangyu.chen@windriver.com>
-Date: Fri, 31 Mar 2023 16:02:50 +0800
+Date: Wed, 12 Mar 2025 00:16:24 -0700
 Subject: [PATCH] Makefile.am: do not compile the code which was generated from
  test-full.proto in protobuf-c-native
 
@@ -11,15 +11,18 @@ the test-full.proto with latest version protobuf.
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
+
+Rebase to 1.5.1
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
  Makefile.am | 75 -----------------------------------------------------
  1 file changed, 75 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index ff12664..7412aef 100644
+index 77aa9d9..5cdd81a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -136,81 +136,6 @@ else
+@@ -138,81 +138,6 @@ else
  
  LOG_COMPILER = $(VALGRIND)
  
@@ -72,20 +75,20 @@ index ff12664..7412aef 100644
 -t_generated_code2_cxx_generate_packed_data_LDADD = \
 -       $(protobuf_LIBS)
 -
--t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto
--       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto
+-t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto
+-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto
 -
--t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto
--       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto
+-t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto
+-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto
 -
--t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto
--       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
+-t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto
+-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
 -
 -t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto
 -       $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
 -
--t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto
--       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto
+-t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto
+-       $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto
 -
 -t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT)
 -       $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc
@@ -102,5 +105,5 @@ index ff12664..7412aef 100644
         t/version/version.c
  t_version_version_LDADD = \
 -- 
-2.34.1
+2.25.1
 
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch b/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch
new file mode 100644
index 0000000000..1aae1f17b0
--- /dev/null
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch
@@ -0,0 +1,1446 @@
+From b28683f8027bf1e886b748b5603eb16d203b5a92 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 18:18:33 -0500
+Subject: [PATCH 01/11] protoc-gen-c/c_helpers.h: Move compat defines into new
+ header file compat.h
+
+Upstream-Status: Backport [https://gitlab.archlinux.org/archlinux/packaging/packages/protobuf-c/-/blob/main/protobuf-30.patch]
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+---
+ protoc-gen-c/c_field.cc           |  1 +
+ protoc-gen-c/c_helpers.cc         |  1 +
+ protoc-gen-c/c_helpers.h          | 10 -------
+ protoc-gen-c/c_message.cc         |  1 +
+ protoc-gen-c/c_primitive_field.cc |  1 +
+ protoc-gen-c/compat.h             | 46 +++++++++++++++++++++++++++++++
+ protoc-gen-c/main.cc              |  1 +
+ 7 files changed, 51 insertions(+), 10 deletions(-)
+ create mode 100644 protoc-gen-c/compat.h
+
+diff --git a/protoc-gen-c/c_field.cc b/protoc-gen-c/c_field.cc
+index 5e79967b..d6d8597e 100644
+--- a/protoc-gen-c/c_field.cc
++++ b/protoc-gen-c/c_field.cc
+@@ -74,6 +74,7 @@
+ #include "c_message_field.h"
+ #include "c_primitive_field.h"
+ #include "c_string_field.h"
++#include "compat.h"
+ 
+ namespace protobuf_c {
+ 
+diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
+index 5edcf904..c38843f8 100644
+--- a/protoc-gen-c/c_helpers.cc
++++ b/protoc-gen-c/c_helpers.cc
+@@ -73,6 +73,7 @@
+ #include <google/protobuf/stubs/common.h>
+ 
+ #include "c_helpers.h"
++#include "compat.h"
+ 
+ namespace protobuf_c {
+ 
+diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
+index 943676e9..e69504bb 100644
+--- a/protoc-gen-c/c_helpers.h
++++ b/protoc-gen-c/c_helpers.h
+@@ -186,16 +186,6 @@ inline int FieldSyntax(const google::protobuf::FieldDescriptor* field) {
+   return 2;
+ }
+ 
+-// Work around changes in protobuf >= 22.x without breaking compilation against
+-// older protobuf versions.
+-#if GOOGLE_PROTOBUF_VERSION >= 4022000
+-# define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
+-# define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
+-# define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
+-# define GOOGLE_DCHECK_GE      ABSL_DCHECK_GE
+-# define GOOGLE_LOG            ABSL_LOG
+-#endif
+-
+ }  // namespace protobuf_c
+ 
+ #endif  // PROTOBUF_C_PROTOC_GEN_C_C_HELPERS_H__
+diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
+index d4a9a01e..46413873 100644
+--- a/protoc-gen-c/c_message.cc
++++ b/protoc-gen-c/c_message.cc
+@@ -78,6 +78,7 @@
+ #include "c_extension.h"
+ #include "c_helpers.h"
+ #include "c_message.h"
++#include "compat.h"
+ 
+ namespace protobuf_c {
+ 
+diff --git a/protoc-gen-c/c_primitive_field.cc b/protoc-gen-c/c_primitive_field.cc
+index 253b00bd..588f60e6 100644
+--- a/protoc-gen-c/c_primitive_field.cc
++++ b/protoc-gen-c/c_primitive_field.cc
+@@ -67,6 +67,7 @@
+ 
+ #include "c_helpers.h"
+ #include "c_primitive_field.h"
++#include "compat.h"
+ 
+ namespace protobuf_c {
+ 
+diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
+new file mode 100644
+index 00000000..2ee78281
+--- /dev/null
++++ b/protoc-gen-c/compat.h
+@@ -0,0 +1,46 @@
++// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
++// All rights reserved.
++//
++// Redistribution and use in source and binary forms, with or without
++// modification, are permitted provided that the following conditions are
++// met:
++//
++//     * Redistributions of source code must retain the above copyright
++// notice, this list of conditions and the following disclaimer.
++//
++//     * Redistributions in binary form must reproduce the above
++// copyright notice, this list of conditions and the following disclaimer
++// in the documentation and/or other materials provided with the
++// distribution.
++//
++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++#ifndef PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
++#define PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
++
++#if GOOGLE_PROTOBUF_VERSION >= 4022000
++# define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
++# define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
++# define GOOGLE_DCHECK_GE      ABSL_DCHECK_GE
++# define GOOGLE_LOG            ABSL_LOG
++#endif
++
++namespace protobuf_c {
++
++namespace compat {
++
++}  // namespace compat
++
++}  // namespace protobuf_c
++
++#endif  // PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+diff --git a/protoc-gen-c/main.cc b/protoc-gen-c/main.cc
+index 0656c113..5ab929d3 100644
+--- a/protoc-gen-c/main.cc
++++ b/protoc-gen-c/main.cc
+@@ -32,6 +32,7 @@
+ 
+ #include "c_generator.h"
+ #include "c_helpers.h"
++#include "compat.h"
+ 
+ int main(int argc, char* argv[]) {
+   protobuf_c::CGenerator c_generator;
+
+From 1678f1fba6f2d3e5c1db2817495ddcd72bd4e87b Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:09:03 -0500
+Subject: [PATCH 02/11] protoc-gen-c/compat.h: Add `compat::StringView` type
+
+protobuf >= 30.x replaces `const std::string&` in various APIs with
+its own string view type that may actually be a `absl::string_view`.
+Introduce our own `compat::StringView` type that we can use instead
+of `const std::string&` in order to support compiling across multiple
+protobuf versions.
+---
+ protoc-gen-c/compat.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
+index 2ee78281..fe8041b5 100644
+--- a/protoc-gen-c/compat.h
++++ b/protoc-gen-c/compat.h
+@@ -28,6 +28,8 @@
+ #ifndef PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+ #define PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+ 
++#include <string>
++
+ #if GOOGLE_PROTOBUF_VERSION >= 4022000
+ # define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
+ # define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
+@@ -39,6 +41,12 @@ namespace protobuf_c {
+ 
+ namespace compat {
+ 
++#if GOOGLE_PROTOBUF_VERSION >= 6030000
++typedef google::protobuf::internal::DescriptorStringView StringView;
++#else
++typedef const std::string& StringView;
++#endif
++
+ }  // namespace compat
+ 
+ }  // namespace protobuf_c
+
+From db5252c131c82fb48ee599179b6989a577b7fbc8 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:13:44 -0500
+Subject: [PATCH 03/11] Remove some unused functions
+
+---
+ protoc-gen-c/c_helpers.cc | 64 ---------------------------------------
+ protoc-gen-c/c_helpers.h  |  3 --
+ 2 files changed, 67 deletions(-)
+
+diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
+index c38843f8..bbb4a615 100644
+--- a/protoc-gen-c/c_helpers.cc
++++ b/protoc-gen-c/c_helpers.cc
+@@ -90,14 +90,6 @@ namespace protobuf_c {
+ #pragma warning(disable:4996)
+ #endif
+ 
+-std::string DotsToUnderscores(const std::string& name) {
+-  return StringReplace(name, ".", "_", true);
+-}
+-
+-std::string DotsToColons(const std::string& name) {
+-  return StringReplace(name, ".", "::", true);
+-}
+-
+ std::string SimpleFtoa(float f) {
+   char buf[100];
+   snprintf(buf,sizeof(buf),"%.*g", FLT_DIG, f);
+@@ -333,11 +325,6 @@ std::string FilenameIdentifier(const std::string& filename) {
+   return result;
+ }
+ 
+-// Return the name of the BuildDescriptors() function for a given file.
+-std::string GlobalBuildDescriptorsName(const std::string& filename) {
+-  return "proto_BuildDescriptors_" + FilenameIdentifier(filename);
+-}
+-
+ std::string GetLabelName(google::protobuf::FieldDescriptor::Label label) {
+   switch (label) {
+     case google::protobuf::FieldDescriptor::LABEL_OPTIONAL: return "optional";
+@@ -392,57 +379,6 @@ WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *
+   }
+ }
+     
+-
+-
+-// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx
+-// XXXXXXXXX  this stuff is copied from strutils.cc !!!!   XXXXXXXXXXXXXXXXXXXXXXXXXXXXx
+-// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx
+-// ----------------------------------------------------------------------
+-// StringReplace()
+-//    Replace the "old" pattern with the "new" pattern in a string,
+-//    and append the result to "res".  If replace_all is false,
+-//    it only replaces the first instance of "old."
+-// ----------------------------------------------------------------------
+-
+-void StringReplace(const std::string& s, const std::string& oldsub,
+-                   const std::string& newsub, bool replace_all,
+-                   std::string* res) {
+-  if (oldsub.empty()) {
+-    res->append(s);  // if empty, append the given string.
+-    return;
+-  }
+-
+-  std::string::size_type start_pos = 0;
+-  std::string::size_type pos;
+-  do {
+-    pos = s.find(oldsub, start_pos);
+-    if (pos == std::string::npos) {
+-      break;
+-    }
+-    res->append(s, start_pos, pos - start_pos);
+-    res->append(newsub);
+-    start_pos = pos + oldsub.size();  // start searching again after the "old"
+-  } while (replace_all);
+-  res->append(s, start_pos, s.length() - start_pos);
+-}
+-
+-
+-// ----------------------------------------------------------------------
+-// StringReplace()
+-//    Give me a string and two patterns "old" and "new", and I replace
+-//    the first instance of "old" in the string with "new", if it
+-//    exists.  If "global" is true; call this repeatedly until it
+-//    fails.  RETURN a new string, regardless of whether the replacement
+-//    happened or not.
+-// ----------------------------------------------------------------------
+-
+-std::string StringReplace(const std::string& s, const std::string& oldsub,
+-                          const std::string& newsub, bool replace_all) {
+-  std::string ret;
+-  StringReplace(s, oldsub, newsub, replace_all, &ret);
+-  return ret;
+-}
+-
+ // ----------------------------------------------------------------------
+ // SplitStringUsing()
+ //    Split a string using a character delimiter. Append the components
+diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
+index e69504bb..377d4272 100644
+--- a/protoc-gen-c/c_helpers.h
++++ b/protoc-gen-c/c_helpers.h
+@@ -150,9 +150,6 @@ const char* DeclaredTypeMethodName(google::protobuf::FieldDescriptor::Type type)
+ // Convert a file name into a valid identifier.
+ std::string FilenameIdentifier(const std::string& filename);
+ 
+-// Return the name of the BuildDescriptors() function for a given file.
+-std::string GlobalBuildDescriptorsName(const std::string& filename);
+-
+ // return 'required', 'optional', or 'repeated'
+ std::string GetLabelName(google::protobuf::FieldDescriptor::Label label);
+ 
+
+From bc2cb66d908f016dd3f7082c8a6ad7c58bc03412 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:18:05 -0500
+Subject: [PATCH 04/11] Use `compat::StringView` type across various function
+ signatures
+
+---
+ protoc-gen-c/c_helpers.cc | 44 +++++++++++++++++++++------------------
+ protoc-gen-c/c_helpers.h  | 36 ++++++++++++++++----------------
+ 2 files changed, 42 insertions(+), 38 deletions(-)
+
+diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
+index bbb4a615..c759c8c2 100644
+--- a/protoc-gen-c/c_helpers.cc
++++ b/protoc-gen-c/c_helpers.cc
+@@ -96,6 +96,7 @@ std::string SimpleFtoa(float f) {
+   buf[sizeof(buf)-1] = 0;              /* should NOT be necessary */
+   return buf;
+ }
++
+ std::string SimpleDtoa(double d) {
+   char buf[100];
+   snprintf(buf,sizeof(buf),"%.*g", DBL_DIG, d);
+@@ -103,7 +104,7 @@ std::string SimpleDtoa(double d) {
+   return buf;
+ }
+ 
+-std::string CamelToUpper(const std::string &name) {
++std::string CamelToUpper(compat::StringView name) {
+   bool was_upper = true;               // suppress initial _
+   std::string rv = "";
+   int len = name.length();
+@@ -120,7 +121,8 @@ std::string CamelToUpper(const std::string &name) {
+   }
+   return rv;
+ }
+-std::string CamelToLower(const std::string &name) {
++
++std::string CamelToLower(compat::StringView name) {
+   bool was_upper = true;               // suppress initial _
+   std::string rv = "";
+   int len = name.length();
+@@ -138,8 +140,7 @@ std::string CamelToLower(const std::string &name) {
+   return rv;
+ }
+ 
+-
+-std::string ToUpper(const std::string &name) {
++std::string ToUpper(compat::StringView name) {
+   std::string rv = "";
+   int len = name.length();
+   for (int i = 0; i < len; i++) {
+@@ -147,7 +148,8 @@ std::string ToUpper(const std::string &name) {
+   }
+   return rv;
+ }
+-std::string ToLower(const std::string &name) {
++
++std::string ToLower(compat::StringView name) {
+   std::string rv = "";
+   int len = name.length();
+   for (int i = 0; i < len; i++) {
+@@ -155,7 +157,8 @@ std::string ToLower(const std::string &name) {
+   }
+   return rv;
+ }
+-std::string ToCamel(const std::string &name) {
++
++std::string ToCamel(compat::StringView name) {
+   std::string rv = "";
+   int len = name.length();
+   bool next_is_upper = true;
+@@ -172,7 +175,7 @@ std::string ToCamel(const std::string &name) {
+   return rv;
+ }
+ 
+-std::string OverrideFullName(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
++std::string OverrideFullName(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+   const ProtobufCFileOptions opt = file->options().GetExtension(pb_c_file);
+   if (!opt.has_c_package())
+     return full_name;
+@@ -184,7 +187,7 @@ std::string OverrideFullName(const std::string &full_name, const google::protobu
+   return new_name + full_name.substr(file->package().length());
+ }
+ 
+-std::string FullNameToLower(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
++std::string FullNameToLower(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+   std::vector<std::string> pieces;
+   SplitStringUsing(OverrideFullName(full_name, file), ".", &pieces);
+   std::string rv = "";
+@@ -195,7 +198,8 @@ std::string FullNameToLower(const std::string &full_name, const google::protobuf
+   }
+   return rv;
+ }
+-std::string FullNameToUpper(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
++
++std::string FullNameToUpper(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+   std::vector<std::string> pieces;
+   SplitStringUsing(OverrideFullName(full_name, file), ".", &pieces);
+   std::string rv = "";
+@@ -206,7 +210,8 @@ std::string FullNameToUpper(const std::string &full_name, const google::protobuf
+   }
+   return rv;
+ }
+-std::string FullNameToC(const std::string &full_name, const google::protobuf::FileDescriptor* file) {
++
++std::string FullNameToC(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+   std::vector<std::string> pieces;
+   SplitStringUsing(OverrideFullName(full_name, file), ".", &pieces);
+   std::string rv = "";
+@@ -248,7 +253,7 @@ void PrintComment(google::protobuf::io::Printer* printer, std::string comment)
+    }
+ }
+ 
+-std::string ConvertToSpaces(const std::string &input) {
++std::string ConvertToSpaces(compat::StringView input) {
+   return std::string(input.size(), ' ');
+ }
+ 
+@@ -259,8 +264,7 @@ int compare_name_indices_by_name(const void *a, const void *b)
+   return strcmp (ni_a->name, ni_b->name);
+ }
+ 
+-
+-std::string CEscape(const std::string& src);
++std::string CEscape(compat::StringView src);
+ 
+ const char* const kKeywordList[] = {
+   "and", "and_eq", "asm", "auto", "bitand", "bitor", "bool", "break", "case",
+@@ -300,7 +304,7 @@ std::string FieldDeprecated(const google::protobuf::FieldDescriptor* field) {
+   return "";
+ }
+ 
+-std::string StripProto(const std::string& filename) {
++std::string StripProto(compat::StringView filename) {
+   if (HasSuffixString(filename, ".protodevel")) {
+     return StripSuffixString(filename, ".protodevel");
+   } else {
+@@ -309,7 +313,7 @@ std::string StripProto(const std::string& filename) {
+ }
+ 
+ // Convert a file name into a valid identifier.
+-std::string FilenameIdentifier(const std::string& filename) {
++std::string FilenameIdentifier(compat::StringView filename) {
+   std::string result;
+   for (unsigned i = 0; i < filename.size(); i++) {
+     if (isalnum(filename[i])) {
+@@ -335,7 +339,7 @@ std::string GetLabelName(google::protobuf::FieldDescriptor::Label label) {
+ }
+ 
+ unsigned
+-WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, const std::string &name)
++WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, compat::StringView name)
+ {
+   std::map<std::string, std::string> vars;
+   vars["name"] = name;
+@@ -389,7 +393,7 @@ WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *
+ // ----------------------------------------------------------------------
+ template <typename ITR>
+ static inline
+-void SplitStringToIteratorUsing(const std::string& full,
++void SplitStringToIteratorUsing(compat::StringView full,
+                                 const char* delim,
+                                 ITR& result) {
+   // Optimize the common case where delim is a single character.
+@@ -422,7 +426,7 @@ void SplitStringToIteratorUsing(const std::string& full,
+   }
+ }
+ 
+-void SplitStringUsing(const std::string& full,
++void SplitStringUsing(compat::StringView full,
+                       const char* delim,
+                       std::vector<std::string>* result) {
+   std::back_insert_iterator< std::vector<std::string> > it(*result);
+@@ -435,7 +439,6 @@ char* FastHexToBuffer(int i, char* buffer)
+   return buffer;
+ }
+ 
+-
+ static int CEscapeInternal(const char* src, int src_len, char* dest,
+                            int dest_len, bool use_hex) {
+   const char* src_end = src + src_len;
+@@ -478,7 +481,8 @@ static int CEscapeInternal(const char* src, int src_len, char* dest,
+   dest[used] = '\0';   // doesn't count towards return value though
+   return used;
+ }
+-std::string CEscape(const std::string& src) {
++
++std::string CEscape(compat::StringView src) {
+   const int dest_length = src.size() * 4 + 1; // Maximum possible expansion
+   std::unique_ptr<char[]> dest(new char[dest_length]);
+   const int len = CEscapeInternal(src.data(), src.size(),
+diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
+index 377d4272..ccd39ca2 100644
+--- a/protoc-gen-c/c_helpers.h
++++ b/protoc-gen-c/c_helpers.h
+@@ -73,6 +73,8 @@
+ 
+ #include <protobuf-c/protobuf-c.pb.h>
+ 
++#include "compat.h"
++
+ namespace protobuf_c {
+ 
+ // --- Borrowed from stubs. ---
+@@ -84,11 +86,10 @@ template <typename T> std::string SimpleItoa(T n) {
+ 
+ std::string SimpleFtoa(float f);
+ std::string SimpleDtoa(double f);
+-void SplitStringUsing(const std::string &str, const char *delim, std::vector<std::string> *out);
+-std::string CEscape(const std::string& src);
+-std::string StringReplace(const std::string& s, const std::string& oldsub, const std::string& newsub, bool replace_all);
+-inline bool HasSuffixString(const std::string& str, const std::string& suffix) { return str.size() >= suffix.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0; }
+-inline std::string StripSuffixString(const std::string& str, const std::string& suffix) { if (HasSuffixString(str, suffix)) { return str.substr(0, str.size() - suffix.size()); } else { return str; } }
++void SplitStringUsing(compat::StringView str, const char *delim, std::vector<std::string> *out);
++std::string CEscape(compat::StringView src);
++inline bool HasSuffixString(compat::StringView str, compat::StringView suffix) { return str.size() >= suffix.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0; }
++inline std::string StripSuffixString(compat::StringView str, compat::StringView suffix) { if (HasSuffixString(str, suffix)) { return str.substr(0, str.size() - suffix.size()); } else { return str; } }
+ char* FastHexToBuffer(int i, char* buffer);
+ 
+ 
+@@ -110,31 +111,31 @@ inline const google::protobuf::Descriptor* FieldScope(const google::protobuf::Fi
+ 
+ // convert a CamelCase class name into an all uppercase affair
+ // with underscores separating words, e.g. MyClass becomes MY_CLASS.
+-std::string CamelToUpper(const std::string &class_name);
+-std::string CamelToLower(const std::string &class_name);
++std::string CamelToUpper(compat::StringView class_name);
++std::string CamelToLower(compat::StringView class_name);
+ 
+ // lowercased, underscored name to camel case
+-std::string ToCamel(const std::string &name);
++std::string ToCamel(compat::StringView name);
+ 
+ // lowercase the string
+-std::string ToLower(const std::string &class_name);
+-std::string ToUpper(const std::string &class_name);
++std::string ToLower(compat::StringView class_name);
++std::string ToUpper(compat::StringView class_name);
+ 
+ // full_name() to lowercase with underscores
+-std::string FullNameToLower(const std::string &full_name, const google::protobuf::FileDescriptor *file);
+-std::string FullNameToUpper(const std::string &full_name, const google::protobuf::FileDescriptor *file);
++std::string FullNameToLower(compat::StringView full_name, const google::protobuf::FileDescriptor *file);
++std::string FullNameToUpper(compat::StringView full_name, const google::protobuf::FileDescriptor *file);
+ 
+ // full_name() to c-typename (with underscores for packages, otherwise camel case)
+-std::string FullNameToC(const std::string &class_name, const google::protobuf::FileDescriptor *file);
++std::string FullNameToC(compat::StringView class_name, const google::protobuf::FileDescriptor *file);
+ 
+ // Splits, indents, formats, and prints comment lines
+ void PrintComment(google::protobuf::io::Printer* printer, std::string comment);
+ 
+ // make a string of spaces as long as input
+-std::string ConvertToSpaces(const std::string &input);
++std::string ConvertToSpaces(compat::StringView input);
+ 
+ // Strips ".proto" or ".protodevel" from the end of a filename.
+-std::string StripProto(const std::string& filename);
++std::string StripProto(compat::StringView filename);
+ 
+ // Get the C++ type name for a primitive type (e.g. "double", "::google::protobuf::int32", etc.).
+ // Note:  non-built-in type names will be qualified, meaning they will start
+@@ -148,15 +149,14 @@ const char* PrimitiveTypeName(google::protobuf::FieldDescriptor::CppType type);
+ const char* DeclaredTypeMethodName(google::protobuf::FieldDescriptor::Type type);
+ 
+ // Convert a file name into a valid identifier.
+-std::string FilenameIdentifier(const std::string& filename);
++std::string FilenameIdentifier(compat::StringView filename);
+ 
+ // return 'required', 'optional', or 'repeated'
+ std::string GetLabelName(google::protobuf::FieldDescriptor::Label label);
+ 
+-
+ // write IntRanges entries for a bunch of sorted values.
+ // returns the number of ranges there are to bsearch.
+-unsigned WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, const std::string &name);
++unsigned WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, const int *values, compat::StringView name);
+ 
+ struct NameIndex
+ {
+
+From 75f1c32cc429233a3726358c999009f9ea373b45 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:25:43 -0500
+Subject: [PATCH 05/11] Convert string views to owned strings where necessary
+
+---
+ protoc-gen-c/c_enum.cc       | 2 +-
+ protoc-gen-c/c_enum_field.cc | 2 +-
+ protoc-gen-c/c_helpers.cc    | 8 ++++----
+ protoc-gen-c/c_helpers.h     | 3 +--
+ 4 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/protoc-gen-c/c_enum.cc b/protoc-gen-c/c_enum.cc
+index 9212ab82..311e4c86 100644
+--- a/protoc-gen-c/c_enum.cc
++++ b/protoc-gen-c/c_enum.cc
+@@ -152,7 +152,7 @@ void EnumGenerator::GenerateValueInitializer(google::protobuf::io::Printer *prin
+     descriptor_->file()->options().optimize_for() ==
+     google::protobuf::FileOptions_OptimizeMode_CODE_SIZE;
+   vars["enum_value_name"] = vd->name();
+-  vars["c_enum_value_name"] = FullNameToUpper(descriptor_->full_name(), descriptor_->file()) + "__" + vd->name();
++  vars["c_enum_value_name"] = FullNameToUpper(descriptor_->full_name(), descriptor_->file()) + "__" + std::string(vd->name());
+   vars["value"] = SimpleItoa(vd->number());
+   if (optimize_code_size)
+     printer->Print(vars, "  { NULL, NULL, $value$ }, /* CODE_SIZE */\n");
+diff --git a/protoc-gen-c/c_enum_field.cc b/protoc-gen-c/c_enum_field.cc
+index 0926ae59..c3111f50 100644
+--- a/protoc-gen-c/c_enum_field.cc
++++ b/protoc-gen-c/c_enum_field.cc
+@@ -78,7 +78,7 @@ void SetEnumVariables(const google::protobuf::FieldDescriptor* descriptor,
+   (*variables)["type"] = FullNameToC(descriptor->enum_type()->full_name(), descriptor->enum_type()->file());
+   const google::protobuf::EnumValueDescriptor* default_value = descriptor->default_value_enum();
+   (*variables)["default"] = FullNameToUpper(default_value->type()->full_name(), default_value->type()->file())
+-                          + "__" + default_value->name();
++                          + "__" + std::string(default_value->name());
+   (*variables)["deprecated"] = FieldDeprecated(descriptor);
+ }
+ 
+diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
+index c759c8c2..1aecef93 100644
+--- a/protoc-gen-c/c_helpers.cc
++++ b/protoc-gen-c/c_helpers.cc
+@@ -178,13 +178,13 @@ std::string ToCamel(compat::StringView name) {
+ std::string OverrideFullName(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+   const ProtobufCFileOptions opt = file->options().GetExtension(pb_c_file);
+   if (!opt.has_c_package())
+-    return full_name;
++    return std::string(full_name);
+ 
+   std::string new_name = opt.c_package();
+   if (file->package().empty())
+     new_name += ".";
+ 
+-  return new_name + full_name.substr(file->package().length());
++  return new_name + std::string(full_name.substr(file->package().length()));
+ }
+ 
+ std::string FullNameToLower(compat::StringView full_name, const google::protobuf::FileDescriptor* file) {
+@@ -418,10 +418,10 @@ void SplitStringToIteratorUsing(compat::StringView full,
+   while (begin_index != std::string::npos) {
+     end_index = full.find_first_of(delim, begin_index);
+     if (end_index == std::string::npos) {
+-      *result++ = full.substr(begin_index);
++      *result++ = std::string(full.substr(begin_index));
+       return;
+     }
+-    *result++ = full.substr(begin_index, (end_index - begin_index));
++    *result++ = std::string(full.substr(begin_index, (end_index - begin_index)));
+     begin_index = full.find_first_not_of(delim, end_index);
+   }
+ }
+diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
+index ccd39ca2..985e4db6 100644
+--- a/protoc-gen-c/c_helpers.h
++++ b/protoc-gen-c/c_helpers.h
+@@ -89,10 +89,9 @@ std::string SimpleDtoa(double f);
+ void SplitStringUsing(compat::StringView str, const char *delim, std::vector<std::string> *out);
+ std::string CEscape(compat::StringView src);
+ inline bool HasSuffixString(compat::StringView str, compat::StringView suffix) { return str.size() >= suffix.size() && str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0; }
+-inline std::string StripSuffixString(compat::StringView str, compat::StringView suffix) { if (HasSuffixString(str, suffix)) { return str.substr(0, str.size() - suffix.size()); } else { return str; } }
++inline std::string StripSuffixString(compat::StringView str, compat::StringView suffix) { if (HasSuffixString(str, suffix)) { return std::string(str.substr(0, str.size() - suffix.size())); } else { return std::string(str); } }
+ char* FastHexToBuffer(int i, char* buffer);
+ 
+-
+ // Get the (unqualified) name that should be used for this field in C code.
+ // The name is coerced to lower-case to emulate proto1 behavior.  People
+ // should be using lowercase-with-underscores style for proto field names
+
+From 0edca93db369fb84f01cc0d4e3ee4cd6c2ad7f4f Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:39:11 -0500
+Subject: [PATCH 06/11] Convert various uses of `const char *` to
+ `compat::StringView`
+
+Also replace some uses of arrays manually allocated with new/delete with
+uses of `std::vector`.
+---
+ protoc-gen-c/c_enum.cc    | 35 ++++++++++++++++++-----------------
+ protoc-gen-c/c_helpers.cc |  2 +-
+ protoc-gen-c/c_helpers.h  |  2 +-
+ protoc-gen-c/c_message.cc | 28 ++++++++++++----------------
+ protoc-gen-c/c_service.cc | 19 +++++++++----------
+ 5 files changed, 41 insertions(+), 45 deletions(-)
+
+diff --git a/protoc-gen-c/c_enum.cc b/protoc-gen-c/c_enum.cc
+index 311e4c86..c7839edd 100644
+--- a/protoc-gen-c/c_enum.cc
++++ b/protoc-gen-c/c_enum.cc
+@@ -142,7 +142,7 @@ struct ValueIndex
+   int value;
+   unsigned index;
+   unsigned final_index;                /* index in uniqified array of values */
+-  const char *name;
++  compat::StringView name;
+ };
+ void EnumGenerator::GenerateValueInitializer(google::protobuf::io::Printer *printer, int index)
+ {
+@@ -176,7 +176,7 @@ static int compare_value_indices_by_name(const void *a, const void *b)
+ {
+   const ValueIndex *vi_a = (const ValueIndex *) a;
+   const ValueIndex *vi_b = (const ValueIndex *) b;
+-  return strcmp (vi_a->name, vi_b->name);
++  return vi_a->name.compare(vi_b->name);
+ }
+ 
+ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printer) {
+@@ -194,18 +194,20 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
+ 
+   // Sort by name and value, dropping duplicate values if they appear later.
+   // TODO: use a c++ paradigm for this!
+-  NameIndex *name_index = new NameIndex[descriptor_->value_count()];
+-  ValueIndex *value_index = new ValueIndex[descriptor_->value_count()];
+-  for (int j = 0; j < descriptor_->value_count(); j++) {
++  std::vector<ValueIndex> value_index;
++  for (unsigned j = 0; j < descriptor_->value_count(); j++) {
+     const google::protobuf::EnumValueDescriptor *vd = descriptor_->value(j);
+-    name_index[j].index = j;
+-    name_index[j].name = vd->name().c_str();
+-    value_index[j].index = j;
+-    value_index[j].value = vd->number();
+-    value_index[j].name = vd->name().c_str();
++    value_index.push_back({
++      .value = vd->number(),
++      .index = j,
++      .final_index = 0,
++      .name = vd->name(),
++    });
+   }
+-  qsort(value_index, descriptor_->value_count(),
+-       sizeof(ValueIndex), compare_value_indices_by_value_then_index);
++  qsort(&value_index[0],
++        value_index.size(),
++        sizeof(ValueIndex),
++        compare_value_indices_by_value_then_index);
+ 
+   // only record unique values
+   int n_unique_values;
+@@ -275,8 +277,10 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
+   vars["n_ranges"] = SimpleItoa(n_ranges);
+ 
+   if (!optimize_code_size) {
+-    qsort(value_index, descriptor_->value_count(),
+-        sizeof(ValueIndex), compare_value_indices_by_name);
++    qsort(&value_index[0],
++          value_index.size(),
++          sizeof(ValueIndex),
++          compare_value_indices_by_name);
+     printer->Print(vars,
+         "static const ProtobufCEnumValueIndex $lcclassname$__enum_values_by_name[$value_count$] =\n"
+         "{\n");
+@@ -319,9 +323,6 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
+         "  NULL,NULL,NULL,NULL   /* reserved[1234] */\n"
+         "};\n");
+   }
+-
+-  delete[] value_index;
+-  delete[] name_index;
+ }
+ 
+ }  // namespace protobuf_c
+diff --git a/protoc-gen-c/c_helpers.cc b/protoc-gen-c/c_helpers.cc
+index 1aecef93..dec9ce28 100644
+--- a/protoc-gen-c/c_helpers.cc
++++ b/protoc-gen-c/c_helpers.cc
+@@ -261,7 +261,7 @@ int compare_name_indices_by_name(const void *a, const void *b)
+ {
+   const NameIndex *ni_a = (const NameIndex *) a;
+   const NameIndex *ni_b = (const NameIndex *) b;
+-  return strcmp (ni_a->name, ni_b->name);
++  return ni_a->name.compare(ni_b->name);
+ }
+ 
+ std::string CEscape(compat::StringView src);
+diff --git a/protoc-gen-c/c_helpers.h b/protoc-gen-c/c_helpers.h
+index 985e4db6..69369997 100644
+--- a/protoc-gen-c/c_helpers.h
++++ b/protoc-gen-c/c_helpers.h
+@@ -160,7 +160,7 @@ unsigned WriteIntRanges(google::protobuf::io::Printer* printer, int n_values, co
+ struct NameIndex
+ {
+   unsigned index;
+-  const char *name;
++  compat::StringView name;
+ };
+ int compare_name_indices_by_name(const void*, const void*);
+ 
+diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
+index 46413873..7252923c 100644
+--- a/protoc-gen-c/c_message.cc
++++ b/protoc-gen-c/c_message.cc
+@@ -567,27 +567,26 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
+        "static const ProtobufCFieldDescriptor $lcclassname$__field_descriptors[$n_fields$] =\n"
+        "{\n");
+   printer->Indent();
+-  const google::protobuf::FieldDescriptor **sorted_fields = new const google::protobuf::FieldDescriptor *[descriptor_->field_count()];
++
++  std::vector<const google::protobuf::FieldDescriptor*> sorted_fields;
+   for (int i = 0; i < descriptor_->field_count(); i++) {
+-    sorted_fields[i] = descriptor_->field(i);
++    sorted_fields.push_back(descriptor_->field(i));
+   }
+-  qsort (sorted_fields, descriptor_->field_count(),
++  qsort(&sorted_fields[0], sorted_fields.size(),
+        sizeof(const google::protobuf::FieldDescriptor*), 
+        compare_pfields_by_number);
+-  for (int i = 0; i < descriptor_->field_count(); i++) {
+-    const google::protobuf::FieldDescriptor* field = sorted_fields[i];
++  for (auto field : sorted_fields) {
+     field_generators_.get(field).GenerateDescriptorInitializer(printer);
+   }
+   printer->Outdent();
+   printer->Print(vars, "};\n");
+ 
+   if (!optimize_code_size) {
+-    NameIndex *field_indices = new NameIndex [descriptor_->field_count()];
+-    for (int i = 0; i < descriptor_->field_count(); i++) {
+-      field_indices[i].name = sorted_fields[i]->name().c_str();
+-      field_indices[i].index = i;
++    std::vector<NameIndex> field_indices;
++    for (unsigned i = 0; i < descriptor_->field_count(); i++) {
++      field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
+     }
+-    qsort (field_indices, descriptor_->field_count(), sizeof (NameIndex),
++    qsort(&field_indices[0], field_indices.size(), sizeof(NameIndex),
+         compare_name_indices_by_name);
+     printer->Print(vars, "static const unsigned $lcclassname$__field_indices_by_name[] = {\n");
+     for (int i = 0; i < descriptor_->field_count(); i++) {
+@@ -596,19 +595,16 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
+       printer->Print(vars, "  $index$,   /* field[$index$] = $name$ */\n");
+     }
+     printer->Print("};\n");
+-    delete[] field_indices;
+   }
+ 
+   // create range initializers
+-  int *values = new int[descriptor_->field_count()];
++  std::vector<int> values;
+   for (int i = 0; i < descriptor_->field_count(); i++) {
+-    values[i] = sorted_fields[i]->number();
++    values.push_back(sorted_fields[i]->number());
+   }
+   int n_ranges = WriteIntRanges(printer,
+-                               descriptor_->field_count(), values,
++                               descriptor_->field_count(), &values[0],
+                                vars["lcclassname"] + "__number_ranges");
+-  delete [] values;
+-  delete [] sorted_fields;
+ 
+   vars["n_ranges"] = SimpleItoa(n_ranges);
+     } else {
+diff --git a/protoc-gen-c/c_service.cc b/protoc-gen-c/c_service.cc
+index ee4d4a95..2c3ddcf3 100644
+--- a/protoc-gen-c/c_service.cc
++++ b/protoc-gen-c/c_service.cc
+@@ -184,19 +184,19 @@ void ServiceGenerator::GenerateInit(google::protobuf::io::Printer* printer)
+                 "}\n");
+ }
+ 
+-struct MethodIndexAndName { unsigned i; const char *name; };
++struct MethodIndexAndName { unsigned i; compat::StringView name; };
+ static int
+ compare_method_index_and_name_by_name (const void *a, const void *b)
+ {
+   const MethodIndexAndName *ma = (const MethodIndexAndName *) a;
+   const MethodIndexAndName *mb = (const MethodIndexAndName *) b;
+-  return strcmp (ma->name, mb->name);
++  return ma->name.compare(mb->name);
+ }
+ 
+ void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer* printer)
+ {
+   int n_methods = descriptor_->method_count();
+-  MethodIndexAndName *mi_array = new MethodIndexAndName[n_methods];
++  std::vector<MethodIndexAndName> mi_array;
+ 
+   bool optimize_code_size = descriptor_->file()->options().has_optimize_for() &&
+     descriptor_->file()->options().optimize_for() ==
+@@ -205,7 +205,7 @@ void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer*
+   vars_["n_methods"] = SimpleItoa(n_methods);
+   printer->Print(vars_, "static const ProtobufCMethodDescriptor $lcfullname$__method_descriptors[$n_methods$] =\n"
+                        "{\n");
+-  for (int i = 0; i < n_methods; i++) {
++  for (unsigned i = 0; i < n_methods; i++) {
+     const google::protobuf::MethodDescriptor* method = descriptor_->method(i);
+     vars_["method"] = method->name();
+     vars_["input_descriptor"] = "&" + FullNameToLower(method->input_type()->full_name(), method->input_type()->file()) + "__descriptor";
+@@ -217,14 +217,15 @@ void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer*
+       printer->Print(vars_,
+           "  { \"$method$\", $input_descriptor$, $output_descriptor$ },\n");
+     }
+-    mi_array[i].i = i;
+-    mi_array[i].name = method->name().c_str();
++    mi_array.push_back({i, method->name()});
+   }
+   printer->Print(vars_, "};\n");
+ 
+   if (!optimize_code_size) {
+-    qsort ((void*)mi_array, n_methods, sizeof (MethodIndexAndName),
+-        compare_method_index_and_name_by_name);
++    qsort(&mi_array[0],
++          mi_array.size(),
++          sizeof(MethodIndexAndName),
++          compare_method_index_and_name_by_name);
+     printer->Print(vars_, "const unsigned $lcfullname$__method_indices_by_name[] = {\n");
+     for (int i = 0; i < n_methods; i++) {
+       vars_["i"] = SimpleItoa(mi_array[i].i);
+@@ -258,8 +259,6 @@ void ServiceGenerator::GenerateServiceDescriptor(google::protobuf::io::Printer*
+         "  $lcfullname$__method_indices_by_name\n"
+         "};\n");
+   }
+-
+-  delete[] mi_array;
+ }
+ 
+ void ServiceGenerator::GenerateCallersImplementations(google::protobuf::io::Printer* printer)
+
+From ebeddac1a746393a16d9ba4cf80e3d12c3ab7d7f Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 20:56:48 -0500
+Subject: [PATCH 07/11] Fix indentation of
+ MessageGenerator::GenerateMessageDescriptor()
+
+---
+ protoc-gen-c/c_message.cc | 321 +++++++++++++++++++-------------------
+ 1 file changed, 159 insertions(+), 162 deletions(-)
+
+diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
+index 7252923c..2a3b2a2f 100644
+--- a/protoc-gen-c/c_message.cc
++++ b/protoc-gen-c/c_message.cc
+@@ -461,199 +461,196 @@ GenerateHelperFunctionDefinitions(google::protobuf::io::Printer* printer,
+ 
+ void MessageGenerator::
+ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init) {
+-    std::map<std::string, std::string> vars;
+-    vars["fullname"] = descriptor_->full_name();
+-    vars["classname"] = FullNameToC(descriptor_->full_name(), descriptor_->file());
+-    vars["lcclassname"] = FullNameToLower(descriptor_->full_name(), descriptor_->file());
+-    vars["shortname"] = ToCamel(descriptor_->name());
+-    vars["n_fields"] = SimpleItoa(descriptor_->field_count());
+-    vars["packagename"] = descriptor_->file()->package();
+-
+-    bool optimize_code_size = descriptor_->file()->options().has_optimize_for() &&
+-        descriptor_->file()->options().optimize_for() ==
+-        google::protobuf::FileOptions_OptimizeMode_CODE_SIZE;
+-
+-    const ProtobufCMessageOptions opt =
+-           descriptor_->options().GetExtension(pb_c_msg);
+-    // Override parent settings, if needed
+-    if (opt.has_gen_init_helpers())
+-      gen_init = opt.gen_init_helpers();
+-
+-    for (int i = 0; i < descriptor_->nested_type_count(); i++) {
+-      nested_generators_[i]->GenerateMessageDescriptor(printer, gen_init);
+-    }
++  std::map<std::string, std::string> vars;
++  vars["fullname"] = descriptor_->full_name();
++  vars["classname"] = FullNameToC(descriptor_->full_name(), descriptor_->file());
++  vars["lcclassname"] = FullNameToLower(descriptor_->full_name(), descriptor_->file());
++  vars["shortname"] = ToCamel(descriptor_->name());
++  vars["n_fields"] = SimpleItoa(descriptor_->field_count());
++  vars["packagename"] = descriptor_->file()->package();
+ 
+-    for (int i = 0; i < descriptor_->enum_type_count(); i++) {
+-      enum_generators_[i]->GenerateEnumDescriptor(printer);
+-    }
++  bool optimize_code_size = descriptor_->file()->options().has_optimize_for() &&
++    descriptor_->file()->options().optimize_for() ==
++      google::protobuf::FileOptions_OptimizeMode_CODE_SIZE;
+ 
+-    for (int i = 0; i < descriptor_->field_count(); i++) {
+-      const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
+-      if (fd->has_default_value()) {
+-       field_generators_.get(fd).GenerateDefaultValueImplementations(printer);
+-      }
+-    }
++  const ProtobufCMessageOptions opt = descriptor_->options().GetExtension(pb_c_msg);
++  // Override parent settings, if needed
++  if (opt.has_gen_init_helpers()) {
++    gen_init = opt.gen_init_helpers();
++  }
+ 
+-    for (int i = 0; i < descriptor_->field_count(); i++) {
+-      const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
+-      const ProtobufCFieldOptions opt = fd->options().GetExtension(pb_c_field);
+-      if (fd->has_default_value()) {
+-
+-       bool already_defined = false;
+-       vars["name"] = fd->name();
+-       vars["lcname"] = CamelToLower(fd->name());
+-       vars["maybe_static"] = "static ";
+-       vars["field_dv_ctype_suffix"] = "";
+-       vars["default_value"] = field_generators_.get(fd).GetDefaultValue();
+-       switch (fd->cpp_type()) {
+-       case google::protobuf::FieldDescriptor::CPPTYPE_INT32:
+-         vars["field_dv_ctype"] = "int32_t";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_INT64:
+-         vars["field_dv_ctype"] = "int64_t";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_UINT32:
+-         vars["field_dv_ctype"] = "uint32_t";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_UINT64:
+-         vars["field_dv_ctype"] = "uint64_t";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_FLOAT:
+-         vars["field_dv_ctype"] = "float";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_DOUBLE:
+-         vars["field_dv_ctype"] = "double";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_BOOL:
+-         vars["field_dv_ctype"] = "protobuf_c_boolean";
+-         break;
+-         
+-       case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE:
+-         // NOTE: not supported by protobuf
+-         vars["maybe_static"] = "";
+-         vars["field_dv_ctype"] = "{ ... }";
+-         GOOGLE_LOG(FATAL) << "Messages can't have default values!";
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_STRING:
+-         if (fd->type() == google::protobuf::FieldDescriptor::TYPE_BYTES || opt.string_as_bytes())
+-         {
+-           vars["field_dv_ctype"] = "ProtobufCBinaryData";
+-         }
+-         else   /* STRING type */
+-         {
+-           already_defined = true;
+-           vars["maybe_static"] = "";
+-           vars["field_dv_ctype"] = "char";
+-           vars["field_dv_ctype_suffix"] = "[]";
+-         }
+-         break;
+-       case google::protobuf::FieldDescriptor::CPPTYPE_ENUM:
+-         {
+-           const google::protobuf::EnumValueDescriptor* vd = fd->default_value_enum();
+-           vars["field_dv_ctype"] = FullNameToC(vd->type()->full_name(), vd->type()->file());
+-           break;
+-         }
+-       default:
+-         GOOGLE_LOG(FATAL) << "Unknown CPPTYPE";
+-         break;
+-       }
+-       if (!already_defined)
+-         printer->Print(vars, "$maybe_static$const $field_dv_ctype$ $lcclassname$__$lcname$__default_value$field_dv_ctype_suffix$ = $default_value$;\n");
+-      }
+-    }
++  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
++    nested_generators_[i]->GenerateMessageDescriptor(printer, gen_init);
++  }
+ 
+-    if ( descriptor_->field_count() ) {
+-  printer->Print(vars,
+-       "static const ProtobufCFieldDescriptor $lcclassname$__field_descriptors[$n_fields$] =\n"
+-       "{\n");
+-  printer->Indent();
++  for (int i = 0; i < descriptor_->enum_type_count(); i++) {
++    enum_generators_[i]->GenerateEnumDescriptor(printer);
++  }
+ 
+-  std::vector<const google::protobuf::FieldDescriptor*> sorted_fields;
+   for (int i = 0; i < descriptor_->field_count(); i++) {
+-    sorted_fields.push_back(descriptor_->field(i));
+-  }
+-  qsort(&sorted_fields[0], sorted_fields.size(),
+-       sizeof(const google::protobuf::FieldDescriptor*), 
+-       compare_pfields_by_number);
+-  for (auto field : sorted_fields) {
+-    field_generators_.get(field).GenerateDescriptorInitializer(printer);
++    const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
++    if (fd->has_default_value()) {
++      field_generators_.get(fd).GenerateDefaultValueImplementations(printer);
++    }
+   }
+-  printer->Outdent();
+-  printer->Print(vars, "};\n");
+ 
+-  if (!optimize_code_size) {
+-    std::vector<NameIndex> field_indices;
+-    for (unsigned i = 0; i < descriptor_->field_count(); i++) {
+-      field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
++  for (int i = 0; i < descriptor_->field_count(); i++) {
++    const google::protobuf::FieldDescriptor* fd = descriptor_->field(i);
++    const ProtobufCFieldOptions opt = fd->options().GetExtension(pb_c_field);
++    if (fd->has_default_value()) {
++      bool already_defined = false;
++      vars["name"] = fd->name();
++      vars["lcname"] = CamelToLower(fd->name());
++      vars["maybe_static"] = "static ";
++      vars["field_dv_ctype_suffix"] = "";
++      vars["default_value"] = field_generators_.get(fd).GetDefaultValue();
++      switch (fd->cpp_type()) {
++      case google::protobuf::FieldDescriptor::CPPTYPE_INT32:
++        vars["field_dv_ctype"] = "int32_t";
++        break;
++      case google::protobuf::FieldDescriptor::CPPTYPE_INT64:
++        vars["field_dv_ctype"] = "int64_t";
++        break;
++      case google::protobuf::FieldDescriptor::CPPTYPE_UINT32:
++        vars["field_dv_ctype"] = "uint32_t";
++        break;
++      case google::protobuf::FieldDescriptor::CPPTYPE_UINT64:
++        vars["field_dv_ctype"] = "uint64_t";
++        break;
++      case google::protobuf::FieldDescriptor::CPPTYPE_FLOAT:
++        vars["field_dv_ctype"] = "float";
++        break;
++      case google::protobuf::FieldDescriptor::CPPTYPE_DOUBLE:
++        vars["field_dv_ctype"] = "double";
++        break;
++      case google::protobuf::FieldDescriptor::CPPTYPE_BOOL:
++        vars["field_dv_ctype"] = "protobuf_c_boolean";
++        break;
++      case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE:
++        // NOTE: not supported by protobuf
++        vars["maybe_static"] = "";
++        vars["field_dv_ctype"] = "{ ... }";
++        GOOGLE_LOG(FATAL) << "Messages can't have default values!";
++        break;
++      case google::protobuf::FieldDescriptor::CPPTYPE_STRING:
++        if (fd->type() == google::protobuf::FieldDescriptor::TYPE_BYTES || opt.string_as_bytes()) {
++          vars["field_dv_ctype"] = "ProtobufCBinaryData";
++        } else {
++          /* STRING type */
++          already_defined = true;
++          vars["maybe_static"] = "";
++          vars["field_dv_ctype"] = "char";
++          vars["field_dv_ctype_suffix"] = "[]";
++        }
++        break;
++      case google::protobuf::FieldDescriptor::CPPTYPE_ENUM: {
++        const google::protobuf::EnumValueDescriptor* vd = fd->default_value_enum();
++        vars["field_dv_ctype"] = FullNameToC(vd->type()->full_name(), vd->type()->file());
++        break;
++      }
++      default:
++        GOOGLE_LOG(FATAL) << "Unknown CPPTYPE";
++        break;
++      }
++      if (!already_defined) {
++        printer->Print(vars, "$maybe_static$const $field_dv_ctype$ $lcclassname$__$lcname$__default_value$field_dv_ctype_suffix$ = $default_value$;\n");
++      }
+     }
+-    qsort(&field_indices[0], field_indices.size(), sizeof(NameIndex),
+-        compare_name_indices_by_name);
+-    printer->Print(vars, "static const unsigned $lcclassname$__field_indices_by_name[] = {\n");
++  }
++
++  if (descriptor_->field_count()) {
++    printer->Print(vars,
++      "static const ProtobufCFieldDescriptor $lcclassname$__field_descriptors[$n_fields$] =\n"
++      "{\n");
++    printer->Indent();
++
++    std::vector<const google::protobuf::FieldDescriptor*> sorted_fields;
+     for (int i = 0; i < descriptor_->field_count(); i++) {
+-      vars["index"] = SimpleItoa(field_indices[i].index);
+-      vars["name"] = field_indices[i].name;
+-      printer->Print(vars, "  $index$,   /* field[$index$] = $name$ */\n");
++      sorted_fields.push_back(descriptor_->field(i));
+     }
+-    printer->Print("};\n");
+-  }
++    qsort(&sorted_fields[0],
++          sorted_fields.size(),
++          sizeof(const google::protobuf::FieldDescriptor*),
++          compare_pfields_by_number);
++    for (auto field : sorted_fields) {
++      field_generators_.get(field).GenerateDescriptorInitializer(printer);
++    }
++    printer->Outdent();
++    printer->Print(vars, "};\n");
+ 
+-  // create range initializers
+-  std::vector<int> values;
+-  for (int i = 0; i < descriptor_->field_count(); i++) {
+-    values.push_back(sorted_fields[i]->number());
+-  }
+-  int n_ranges = WriteIntRanges(printer,
+-                               descriptor_->field_count(), &values[0],
+-                               vars["lcclassname"] + "__number_ranges");
++    if (!optimize_code_size) {
++      std::vector<NameIndex> field_indices;
++      for (unsigned i = 0; i < descriptor_->field_count(); i++) {
++        field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
++      }
++      qsort(&field_indices[0],
++            field_indices.size(),
++            sizeof(NameIndex),
++            compare_name_indices_by_name);
++      printer->Print(vars, "static const unsigned $lcclassname$__field_indices_by_name[] = {\n");
++      for (int i = 0; i < descriptor_->field_count(); i++) {
++        vars["index"] = SimpleItoa(field_indices[i].index);
++        vars["name"] = field_indices[i].name;
++        printer->Print(vars, "  $index$,   /* field[$index$] = $name$ */\n");
++      }
++      printer->Print("};\n");
++    }
+ 
+-  vars["n_ranges"] = SimpleItoa(n_ranges);
+-    } else {
+-      /* MS compiler can't handle arrays with zero size and empty
+-       * initialization list. Furthermore it is an extension of GCC only but
+-       * not a standard. */
+-      vars["n_ranges"] = "0";
+-  printer->Print(vars,
+-        "#define $lcclassname$__field_descriptors NULL\n"
+-        "#define $lcclassname$__field_indices_by_name NULL\n"
+-        "#define $lcclassname$__number_ranges NULL\n");
++    // create range initializers
++    std::vector<int> values;
++    for (int i = 0; i < descriptor_->field_count(); i++) {
++      values.push_back(sorted_fields[i]->number());
+     }
++    int n_ranges = WriteIntRanges(printer,
++                                  descriptor_->field_count(),
++                                  &values[0],
++                                  vars["lcclassname"] + "__number_ranges");
++
++    vars["n_ranges"] = SimpleItoa(n_ranges);
++  } else {
++    /* MS compiler can't handle arrays with zero size and empty
++     * initialization list. Furthermore it is an extension of GCC only but
++     * not a standard. */
++    vars["n_ranges"] = "0";
++    printer->Print(vars,
++      "#define $lcclassname$__field_descriptors NULL\n"
++      "#define $lcclassname$__field_indices_by_name NULL\n"
++      "#define $lcclassname$__number_ranges NULL\n");
++  }
+ 
+   printer->Print(vars,
+-      "const ProtobufCMessageDescriptor $lcclassname$__descriptor =\n"
+-      "{\n"
+-      "  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,\n");
++    "const ProtobufCMessageDescriptor $lcclassname$__descriptor =\n"
++    "{\n"
++    "  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,\n");
+   if (optimize_code_size) {
+     printer->Print("  NULL,NULL,NULL,NULL, /* CODE_SIZE */\n");
+   } else {
+     printer->Print(vars,
+-        "  \"$fullname$\",\n"
+-        "  \"$shortname$\",\n"
+-        "  \"$classname$\",\n"
+-        "  \"$packagename$\",\n");
++      "  \"$fullname$\",\n"
++      "  \"$shortname$\",\n"
++      "  \"$classname$\",\n"
++      "  \"$packagename$\",\n");
+   }
+   printer->Print(vars,
+-      "  sizeof($classname$),\n"
+-      "  $n_fields$,\n"
+-      "  $lcclassname$__field_descriptors,\n");
++    "  sizeof($classname$),\n"
++    "  $n_fields$,\n"
++    "  $lcclassname$__field_descriptors,\n");
+   if (optimize_code_size) {
+     printer->Print("  NULL, /* CODE_SIZE */\n");
+   } else {
+-    printer->Print(vars,
+-        "  $lcclassname$__field_indices_by_name,\n");
++    printer->Print(vars, "  $lcclassname$__field_indices_by_name,\n");
+   }
+   printer->Print(vars,
+-      "  $n_ranges$,"
+-      "  $lcclassname$__number_ranges,\n");
++    "  $n_ranges$,"
++    "  $lcclassname$__number_ranges,\n");
+   if (gen_init) {
+-    printer->Print(vars,
+-      "  (ProtobufCMessageInit) $lcclassname$__init,\n");
++    printer->Print(vars, "  (ProtobufCMessageInit) $lcclassname$__init,\n");
+   } else {
+-    printer->Print(vars,
+-      "  NULL, /* gen_init_helpers = false */\n");
++    printer->Print(vars, "  NULL, /* gen_init_helpers = false */\n");
+   }
+   printer->Print(vars,
+-      "  NULL,NULL,NULL    /* reserved[123] */\n"
+-      "};\n");
++    "  NULL,NULL,NULL    /* reserved[123] */\n"
++    "};\n");
+ }
+ 
+ int MessageGenerator::GetOneofUnionOrder(const google::protobuf::FieldDescriptor* fd)
+
+From c59b146aee2d97091ca2adeecd3f2741cb7f0082 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 21:10:37 -0500
+Subject: [PATCH 08/11] compat: Use absl::string_view instead of
+ google::protobuf::internal::DescriptorStringView
+
+Even though google::protobuf::internal::DescriptorStringView is exposed
+in public protobuf headers, it's probably not a good idea to rely on an
+"internal" typedef.
+
+According to https://protobuf.dev/news/2024-10-02/#descriptor-apis:
+
+    v30 will update return types in descriptor (such as full_name) to be
+    absl::string_view.
+
+So `absl::string_view` is probably the right type to use here.
+---
+ protoc-gen-c/compat.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
+index fe8041b5..a70cef34 100644
+--- a/protoc-gen-c/compat.h
++++ b/protoc-gen-c/compat.h
+@@ -37,12 +37,16 @@
+ # define GOOGLE_LOG            ABSL_LOG
+ #endif
+ 
++#if GOOGLE_PROTOBUF_VERSION >= 6030000
++# include <absl/strings/string_view.h>
++#endif
++
+ namespace protobuf_c {
+ 
+ namespace compat {
+ 
+ #if GOOGLE_PROTOBUF_VERSION >= 6030000
+-typedef google::protobuf::internal::DescriptorStringView StringView;
++typedef absl::string_view StringView;
+ #else
+ typedef const std::string& StringView;
+ #endif
+
+From 9c56038fd9d3cc2552c297457d7a66efe5cbd2c7 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 21:37:30 -0500
+Subject: [PATCH 09/11] Makefile.am: Add compat.h to
+ protoc_gen_c_protoc_gen_c_SOURCES
+
+---
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 77aa9d99..26d19f16 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -102,6 +102,7 @@ protoc_gen_c_protoc_gen_c_SOURCES = \
+        protoc-gen-c/c_service.h \
+        protoc-gen-c/c_string_field.cc \
+        protoc-gen-c/c_string_field.h \
++       protoc-gen-c/compat.h \
+        protobuf-c/protobuf-c.pb.cc \
+        protobuf-c/protobuf-c.pb.h \
+        protoc-gen-c/main.cc
+
+From 4ebd5cd8238d1f2ac6291b8c8925f34e16ce2123 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 21:38:07 -0500
+Subject: [PATCH 10/11] compat: Conditionalize the include of <string>
+
+It is only needed on older protobuf versions where absl::string_view is
+not being used.
+---
+ protoc-gen-c/compat.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/protoc-gen-c/compat.h b/protoc-gen-c/compat.h
+index a70cef34..f6ace7cb 100644
+--- a/protoc-gen-c/compat.h
++++ b/protoc-gen-c/compat.h
+@@ -28,8 +28,6 @@
+ #ifndef PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+ #define PROTOBUF_C_PROTOC_GEN_C_COMPAT_H__
+ 
+-#include <string>
+-
+ #if GOOGLE_PROTOBUF_VERSION >= 4022000
+ # define GOOGLE_ARRAYSIZE      ABSL_ARRAYSIZE
+ # define GOOGLE_CHECK_EQ       ABSL_CHECK_EQ
+@@ -39,6 +37,8 @@
+ 
+ #if GOOGLE_PROTOBUF_VERSION >= 6030000
+ # include <absl/strings/string_view.h>
++#else
++# include <string>
+ #endif
+ 
+ namespace protobuf_c {
+
+From 9a6b35e1e6956fb5cb044910448049b7a5339244 Mon Sep 17 00:00:00 2001
+From: Robert Edmonds <edmonds@users.noreply.github.com>
+Date: Sat, 8 Feb 2025 21:44:42 -0500
+Subject: [PATCH 11/11] Cater to Microsoft Visual C++
+
+Apparently MSVC doesn't support designated initializers for some reason.
+---
+ protoc-gen-c/c_enum.cc    | 9 ++-------
+ protoc-gen-c/c_message.cc | 2 +-
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/protoc-gen-c/c_enum.cc b/protoc-gen-c/c_enum.cc
+index c7839edd..1940ba9d 100644
+--- a/protoc-gen-c/c_enum.cc
++++ b/protoc-gen-c/c_enum.cc
+@@ -195,14 +195,9 @@ void EnumGenerator::GenerateEnumDescriptor(google::protobuf::io::Printer* printe
+   // Sort by name and value, dropping duplicate values if they appear later.
+   // TODO: use a c++ paradigm for this!
+   std::vector<ValueIndex> value_index;
+-  for (unsigned j = 0; j < descriptor_->value_count(); j++) {
++  for (int j = 0; j < descriptor_->value_count(); j++) {
+     const google::protobuf::EnumValueDescriptor *vd = descriptor_->value(j);
+-    value_index.push_back({
+-      .value = vd->number(),
+-      .index = j,
+-      .final_index = 0,
+-      .name = vd->name(),
+-    });
++    value_index.push_back({ vd->number(), (unsigned)j, 0, vd->name() });
+   }
+   qsort(&value_index[0],
+         value_index.size(),
+diff --git a/protoc-gen-c/c_message.cc b/protoc-gen-c/c_message.cc
+index 2a3b2a2f..94889179 100644
+--- a/protoc-gen-c/c_message.cc
++++ b/protoc-gen-c/c_message.cc
+@@ -581,7 +581,7 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
+     if (!optimize_code_size) {
+       std::vector<NameIndex> field_indices;
+       for (unsigned i = 0; i < descriptor_->field_count(); i++) {
+-        field_indices.push_back({ .index = i, .name = sorted_fields[i]->name() });
++        field_indices.push_back({ i, sorted_fields[i]->name() });
+       }
+       qsort(&field_indices[0],
+             field_indices.size(),
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb
index 24de6b8119..30c9e19b16 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb
@@ -8,16 +8,17 @@ has been split out into the protobuf-c-rpc project."
 HOMEPAGE = "https://github.com/protobuf-c/protobuf-c"
 SECTION = "console/tools"
 LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d11077c6a2b5d2e64b9f32b61a9b78ba"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bd8de4f63e06b1ccc06e9f8dc5b1aa97"
 
 DEPENDS = "protobuf-native protobuf"
 
-SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https \
+           file://protobuf-30.patch \
+"
 SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch"
 
-SRCREV = "8c201f6e47a53feaab773922a743091eb6c8972a"
+SRCREV = "185beed28e65494be7505b30c1afeaf199e19b23"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
@@ -36,3 +37,6 @@ RDEPENDS:${PN}-compiler = "protobuf-compiler"
 RDEPENDS:${PN}-dev += "${PN}-compiler"
 
 BBCLASSEXTEND = "native nativesdk"
+
+# No 64bit atomics
+LDFLAGS:append:riscv32 = " -latomic"
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
index 9f6116c4c4..1f5c9127de 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
+++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
@@ -1,26 +1,34 @@
-From 08e46feb6553af670754e65d94c3bb6fcd4e0cf9 Mon Sep 17 00:00:00 2001
+From cd6c5f36c0dc38e4734b74b03923489b7bfb9aba Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 31 Oct 2021 23:39:44 -0700
+Date: Mon, 10 Mar 2025 19:59:19 -0700
 Subject: [PATCH] Fix build on mips/clang
 
-clang13 crashes on mips, until its fixed upstream disable tailcall on
+clang20 crashes on mips, until its fixed upstream disable tailcall on
 mips
 
-https://bugs.llvm.org/show_bug.cgi?id=52367
+https://github.com/llvm/llvm-project/issues/51709
 
 Upstream-Status: Inappropriate [Clang workaround]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Rebase to v5.29.4
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
- src/google/protobuf/port_def.inc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/google/protobuf/port_def.inc | 1 +
+ 1 file changed, 1 insertion(+)
 
+diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
+index 56f995e45..428d096b3 100644
 --- a/src/google/protobuf/port_def.inc
 +++ b/src/google/protobuf/port_def.inc
-@@ -255,6 +255,7 @@
+@@ -227,6 +227,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
  #error PROTOBUF_TAILCALL was previously defined
  #endif
- #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \
+ #if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) &&  \
 +    !defined(__mips__) && \
-     !defined(_ARCH_PPC) && !defined(__wasm__) &&                 \
-     !(defined(_MSC_VER) && defined(_M_IX86)) &&                  \
-     !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24)
+     !defined(_ARCH_PPC) && !defined(__wasm__) &&                      \
+     !(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__)
+ // Compilation fails on ARM32: b/195943306
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
index 7c4bf260eb..53fdf7dece 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
+++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch
@@ -1,13 +1,12 @@
-From e3fa241637ab5a7fa78c0d474802134cff75f91e Mon Sep 17 00:00:00 2001
+From f6a3554e37fb39f93e4b47a75318bbda53cfdb46 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 28 Jun 2019 13:50:52 +0000
-Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables, fix build
- with gold
+Date: Thu, 20 Mar 2025 20:33:02 -0700
+Subject: [PATCH] examples/Makefile: respect CXX,LDFLAGS variables
 
 * move pkg-config call to separate variable, so that the final version
   of the whole command so it's shown in log.do_compile_ptest_base
 * add ../src/google/protobuf/.libs/timestamp.pb.o when linking
-  add_person_cpp otherwise it fails to link with gold:
+  add_person_cpp otherwise it fails:
   i686-oe-linux-g++  -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=core2-32-oe-linux/protobuf/3.8.0-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
   /tmp/cccjSJQs.o:addressbook.pb.cc:scc_info_Person_addressbook_2eproto: error: undefined reference to 'scc_info_Timestamp_google_2fprotobuf_2ftimestamp_2eproto'
   /tmp/cccjSJQs.o:addressbook.pb.cc:descriptor_table_addressbook_2eproto_deps: error: undefined reference to 'descriptor_table_google_2fprotobuf_2ftimestamp_2eproto'
@@ -25,37 +24,39 @@ Upstream-Status: Pending
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
 
+Rebase to 5.29.4
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
  examples/Makefile | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/examples/Makefile b/examples/Makefile
-index ef7a4ef58..7206e14e1 100644
+index f7ee9b116..8cd1359e2 100644
 --- a/examples/Makefile
 +++ b/examples/Makefile
-@@ -2,6 +2,8 @@
+@@ -4,6 +4,8 @@
  
- .PHONY: all cpp java python clean
+ all: cpp java python
  
 +PROTOBUF := $(shell pkg-config --cflags --libs protobuf)
 +
- all: cpp java python
- 
  cpp:    add_person_cpp    list_people_cpp
-@@ -41,11 +43,11 @@ protoc_middleman_dart: addressbook.proto
+ dart:   add_person_dart   list_people_dart
+ go:     add_person_go     list_people_go
+@@ -46,11 +48,11 @@ protoc_middleman_ruby: addressbook.proto
  
  add_person_cpp: add_person.cc protoc_middleman
         pkg-config --cflags protobuf  # fails if protobuf is not installed
--       c++ -std=c++14 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
-+       $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp #$(CXX) -std=c++17 $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp
+-       c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
++       $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp
  
  list_people_cpp: list_people.cc protoc_middleman
         pkg-config --cflags protobuf  # fails if protobuf is not installed
--       c++ -std=c++14 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
-+       $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp #$(CXX) -std=c++17 $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp
+-       c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
++       $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp
  
  add_person_dart: add_person.dart protoc_middleman_dart
  
---
-2.34.1
+-- 
+2.25.1
 
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-protobuf-native-build-failure-with-gcc-10.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-protobuf-native-build-failure-with-gcc-10.patch
new file mode 100644
index 0000000000..2edba6b7eb
--- /dev/null
+++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-fix-protobuf-native-build-failure-with-gcc-10.patch
@@ -0,0 +1,46 @@
+From 213f29fb63473304db098b3d12a0393fd50e4914 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 17 Mar 2025 13:28:13 +0800
+Subject: [PATCH] fix protobuf-native build failure with gcc 10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Build protobuf-native failed on ubuntu 20.04 which has gcc 10
+
+protobuf-native/4.30.0/git/src/google/protobuf/port_def.inc:105:48:
+error: static assertion failed: Protobuf only supports C+
+   ↪ +17 and newer.
+   |   105 | #define PROTOBUF_CPLUSPLUS_MIN(x) (__cplusplus >= x)
+   |       |                                   ~~~~~~~~~~~~~^~~~~
+   | /home/kraj01/yoe/build/tmp/work/x86_64-linux/protobuf-native/4.30.0/git/src/google/protobuf/port_def.inc:119:15:
+note: in expansion of macro ‘PROTOBUF_CPLUSPLUS_MIN’
+   |   119 | static_assert(PROTOBUF_CPLUSPLUS_MIN(201703L),
+   |       |               ^~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e90cb8aa2..3ffac1307 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,6 +14,10 @@ endif()
+ # Project
+ project(protobuf C CXX)
+ 
++set(CMAKE_CXX_STANDARD 17)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
++
+ if(protobuf_DEPRECATED_CMAKE_SUBDIRECTORY_USAGE)
+   if(CMAKE_PROJECT_NAME STREQUAL "protobuf")
+     get_filename_component(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch
new file mode 100644
index 0000000000..e58fdc1d19
--- /dev/null
+++ b/meta-oe/recipes-devtools/protobuf/protobuf/0001-utf8_range-add-version-marker-to-library-19009.patch
@@ -0,0 +1,43 @@
+From fd020ef700dbf2d324aecd087b8fcb6ff329feb6 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Thu, 21 Nov 2024 11:30:17 -0800
+Subject: [PATCH] utf8_range: add version marker to library (#19009)
+
+Unversioned libraries / libraries without due ABI indicators are not allowed in certain Linux distributions because it precludes the concurrent presence of multiple versions.
+
+If you have both /usr/lib/libprotobuf-lite.so.28.3.0 and /usr/lib/libprotobuf-lite.so.29.0.0, both of them want libutf8_validity.so, but if the ABI is different between utf8_range 28 and utf8_range 29, that's a problem.
+
+Closes #19009
+
+COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/19009 from jengelh:master 1a5f8682be2f2b84da07fcdd32474baae8088959
+PiperOrigin-RevId: 698855702
+
+Upstream-Status: Backport [https://github.com/protocolbuffers/protobuf/commit/ced605d0e6a7ad20985375b596b2ca6720e07737]
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ third_party/utf8_range/CMakeLists.txt | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/third_party/utf8_range/CMakeLists.txt b/third_party/utf8_range/CMakeLists.txt
+index 4276b97290..e054893c63 100644
+--- a/third_party/utf8_range/CMakeLists.txt
++++ b/third_party/utf8_range/CMakeLists.txt
+@@ -19,6 +19,15 @@ add_library (utf8_range
+ # A heavier-weight C++ wrapper that supports Abseil.
+ add_library (utf8_validity utf8_validity.cc utf8_range.c)
+ 
++set_target_properties(utf8_range PROPERTIES
++  VERSION ${protobuf_VERSION}
++  OUTPUT_NAME ${LIB_PREFIX}utf8_range
++)
++set_target_properties(utf8_validity PROPERTIES
++  VERSION ${protobuf_VERSION}
++  OUTPUT_NAME ${LIB_PREFIX}utf8_validity
++)
++
+ # Load Abseil dependency.
+ if (NOT TARGET absl::strings)
+   if (NOT ABSL_ROOT_DIR)
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf_6.31.1.bb
index 4f8515471f..90be1179aa 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_6.31.1.bb
@@ -4,22 +4,28 @@ efficient yet extensible format. Google uses Protocol Buffers for almost \
 all of its internal RPC protocols and file formats."
 HOMEPAGE = "https://github.com/google/protobuf"
 SECTION = "console/tools"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
+LICENSE = "BSD-3-Clause & MIT"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
+    file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \
+"
 
-DEPENDS = "zlib abseil-cpp"
+DEPENDS = "zlib abseil-cpp jsoncpp"
 DEPENDS:append:class-target = " protobuf-native"
 
-SRCREV = "4a2aef570deb2bfb8927426558701e8bfc26f2a4"
+SRCREV = "74211c0dfc2777318ab53c2cd2c317a2ef9012de"
 
-SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol=https \
+SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=31.x;protocol=https \
            file://run-ptest \
            file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \
+           file://0001-fix-protobuf-native-build-failure-with-gcc-10.patch \
            "
-SRC_URI:append:mips:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch "
-SRC_URI:append:mipsel:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch "
+SRC_URI:append:mipsarcho32:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch "
+
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.(25\.(\d+)))"
+
 
-S = "${WORKDIR}/git"
+CVE_PRODUCT = "google:protobuf protobuf:protobuf google-protobuf protobuf-cpp"
 
 inherit cmake pkgconfig ptest
 
@@ -35,11 +41,15 @@ EXTRA_OECMAKE += "\
     -Dprotobuf_BUILD_TESTS=OFF \
     -Dprotobuf_BUILD_EXAMPLES=OFF \
     -Dprotobuf_ABSL_PROVIDER="package" \
+    -Dprotobuf_JSONCPP_PROVIDER="package" \
 "
 
 TEST_SRC_DIR = "examples"
 LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}"
 
+CXXFLAGS:append:mipsarcho32 = " -latomic"
+CXXFLAGS:append:riscv32 = " -latomic"
+
 do_compile_ptest() {
         mkdir -p "${B}/${TEST_SRC_DIR}"
 
@@ -105,15 +115,9 @@ FILES:${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}"
 SYSROOT_DIRS += "${bindir}"
 
 RDEPENDS:${PN}-compiler = "${PN}"
-RDEPENDS:${PN}-dev += "${PN}-compiler"
+RDEPENDS:${PN}-dev += "${@bb.utils.contains('PACKAGECONFIG', 'compiler', '${PN}-compiler', '', d)}"
 RDEPENDS:${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-protobuf', '', d)}"
 
 MIPS_INSTRUCTION_SET = "mips"
 
 BBCLASSEXTEND = "native nativesdk"
-
-LDFLAGS:append:arm = " -latomic"
-LDFLAGS:append:mips = " -latomic"
-LDFLAGS:append:powerpc = " -latomic"
-LDFLAGS:append:mipsel = " -latomic"
-LDFLAGS:append:riscv32 = " -latomic"
diff --git a/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb b/meta-oe/recipes-devtools/pugixml/pugixml_1.15.bb
index 458958edf5..457fa59435 100644
--- a/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb
+++ b/meta-oe/recipes-devtools/pugixml/pugixml_1.15.bb
@@ -7,12 +7,13 @@ data-driven tree queries."
 HOMEPAGE = "https://pugixml.org/"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=ad370df61d83846cf9e4726244671201"
+LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=5dbb98bbc2e5051c26ce32508b4f703e"
 
 SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015"
+SRC_URI[sha256sum] = "655ade57fa703fb421c2eb9a0113b5064bddb145d415dd1f88c79353d90d511a"
 
 UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb b/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb
index 1d54b9f6af..d5c440f413 100644
--- a/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb
+++ b/meta-oe/recipes-devtools/python/python3-apt_2.5.3.bb
@@ -7,7 +7,6 @@ SRC_URI = "git://salsa.debian.org/apt-team/python-apt.git;protocol=https;branch=
 
 SRCREV = "3252935b6224b3bd2e2250894b9559b47c61b2e1"
 
-S = "${WORKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb b/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb
index a98dfab6d9..d80eac7756 100644
--- a/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb
+++ b/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb
@@ -10,6 +10,6 @@ SRC_URI[sha256sum] = "723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae
 
 inherit setuptools3
 
-S = "${WORKDIR}/python-distutils-extra-${PV}"
+S = "${UNPACKDIR}/python-distutils-extra-${PV}"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/python/python3-pefile/run-ptest b/meta-oe/recipes-devtools/python/python3-pefile/run-ptest
deleted file mode 100644
index 95ae72306f..0000000000
--- a/meta-oe/recipes-devtools/python/python3-pefile/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake --ignore=./tests/pefile_test.py
diff --git a/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb b/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb
deleted file mode 100644
index e30b362323..0000000000
--- a/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Python PE parsing module"
-DESCRIPTION = "A multi-platform Python module to parse and work with Portable Executable (PE) files."
-HOMEPAGE = "https://github.com/erocarrera/pefile"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=38066667888b01d8118ff9cc23da1873"
-
-inherit setuptools3 ptest
-SRCREV = "1ab2807c4eec16041e791d7a6acc68cc23fd5266"
-SRC_URI = "git://github.com/erocarrera/pefile;branch=master;protocol=https \
-           file://run-ptest"
-S = "${WORKDIR}/git"
-
-BBCLASSEXTEND = "native nativesdk"
-
-do_install_ptest() {
-   install -d ${D}${PTEST_PATH}/tests
-   cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
-
-RDEPENDS:${PN} += " \
-    python3-mmap \
-    python3-netclient \
-    python3-stringold \
-"
-RDEPENDS:${PN}-ptest += "\
-    python3-pytest \
-    python3-unittest-automake-output \
-"
diff --git a/meta-oe/recipes-devtools/python/python3-psycopg_3.2.9.bb b/meta-oe/recipes-devtools/python/python3-psycopg_3.2.9.bb
new file mode 100644
index 0000000000..9be72bc4fd
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python3-psycopg_3.2.9.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Psycopg 3 is the implementation of a PostgreSQL adapter for Python."
+DESCRIPTION = "Psycopg is the most popular PostgreSQL adapter for the Python \
+programming language. Its core is a complete implementation of the Python DB \
+API 2.0 specifications. Several extensions allow access to many of the \
+features offered by PostgreSQL."
+
+LICENSE = "LGPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404"
+
+SRC_URI[sha256sum] = "2fbb46fcd17bc81f993f28c47f1ebea38d66ae97cc2dbc3cad73b37cefbff700"
+
+inherit pypi python_setuptools_build_meta
+
+RDEPENDS:${PN} = "libpq"
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
index 8519479c4d..724d329ee2 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
@@ -10,7 +10,6 @@ SRCREV = "0ccdbf364c577803e2a751f5aededce935314313"
 
 PV = "1.1.0+git"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
index 29abfe1af5..672c46055d 100644
--- a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
+++ b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
@@ -9,7 +9,6 @@ SRC_URI = " \
 
 SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.15.bb
index 1b064faf16..72ccd1d6b7 100644
--- a/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb
+++ b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.15.bb
@@ -4,9 +4,8 @@ LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
 
 BRANCH = "master"
-SRC_URI = "git://github.com/clarkwang/sexpect;branch=${BRANCH};protocol=https"
-SRCREV = "532a52d36aae442b7fe1ce20a59effd1dbc6e6fe"
+SRC_URI = "git://github.com/clarkwang/sexpect;branch=${BRANCH};protocol=https;tag=v${PV}"
+SRCREV = "d3645392424d47532be90fcbc0abf3148324785b"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
diff --git a/meta-oe/recipes-devtools/sip/sip_6.8.3.bb b/meta-oe/recipes-devtools/sip/sip_6.12.0.bb
index d12130af43..20e705f1a6 100644
--- a/meta-oe/recipes-devtools/sip/sip_6.8.3.bb
+++ b/meta-oe/recipes-devtools/sip/sip_6.12.0.bb
@@ -3,15 +3,17 @@
 
 SUMMARY = "A Python bindings generator for C/C++ libraries"
 
-HOMEPAGE = "https://www.riverbankcomputing.com/software/sip/"
-LICENSE = "GPL-2.0-or-later"
+HOMEPAGE = "https://github.com/Python-SIP/sip"
+LICENSE = "BSD-2-Clause"
 SECTION = "devel"
-LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=236276327275fdb261636fb40b18d88d"
 
-inherit pypi setuptools3 python3native
+inherit pypi python_setuptools_build_meta python3native
 
 PYPI_PACKAGE = "sip"
-SRC_URI[sha256sum] = "888547b018bb24c36aded519e93d3e513d4c6aa0ba55b7cc1affbd45cf10762c"
+SRC_URI[sha256sum] = "083ced94f85315493231119a63970b2ba42b1d38b38e730a70e02a99191a89c6"
+
+DEPENDS += "python3-setuptools-scm-native"
 
 RDEPENDS:${PN} = " \
     python3-core \
diff --git a/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb b/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb
index bf5c52fe50..ea4fc5d3dd 100644
--- a/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb
+++ b/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb
@@ -9,7 +9,6 @@ DEPENDS = "ncurses"
 SRC_URI = "git://github.com/ColinIanKing/smemstat.git;protocol=https;branch=master"
 SRCREV = "1edc560602aa116b96408110b8b9d66a4edef60e"
 
-S = "${WORKDIR}/git"
 
 inherit bash-completion
 
diff --git a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch
new file mode 100644
index 0000000000..af884808f2
--- /dev/null
+++ b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm/0001-fix-cstdint-error-with-gcc-15.0.1.patch
@@ -0,0 +1,52 @@
+From f011501e719e0042fc6ca29ac7b33e8a14562246 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Tue, 1 Apr 2025 19:45:01 +0900
+Subject: [PATCH] fix cstdint error with gcc-15.0.1
+
+* see more details:
+  http://errors.yoctoproject.org/Errors/Details/850148/
+    TOPDIR/tmp/work/core2-64-oe-linux/sqlite-orm/1.5/git/examples/synchronous.cpp:7:5: error: 'uint16_t' does not name a type
+        7 |     uint16_t src_port;
+        |     ^~~~~~~~
+    TOPDIR/tmp/work/core2-64-oe-linux/sqlite-orm/1.5/git/examples/synchronous.cpp:3:1: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
+        2 | #include <sqlite_orm/sqlite_orm.h>
+    +++ |+#include <cstdint>
+        3 | #include <string>
+
+While this was backported from 6a96d1cec4(Explicitly included <cstdint> in examples and unit tests),
+since it was a commit made in v1.9, only synchronous.cpp was modified as other files do not exist in the current version.
+
+Signed-off-by: mark.yang <mark.yang@lge.com>
+
+Upstream-Status: Backport [6a96d1c Explicitly included <cstdint> in examples and unit tests]
+---
+ examples/synchronous.cpp | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/examples/synchronous.cpp b/examples/synchronous.cpp
+index d10da13d..b103b48c 100644
+--- a/examples/synchronous.cpp
++++ b/examples/synchronous.cpp
+@@ -1,15 +1,16 @@
+ 
+ #include <sqlite_orm/sqlite_orm.h>
++#include <cstdint>
+ #include <string>
+ 
+ struct Query {
+     std::string src_ip;
+-    uint16_t src_port;
+-    uint16_t txn_id;
+-    uint32_t tv_sec;
+-    uint32_t tv_usec;
++    std::uint16_t src_port;
++    std::uint16_t txn_id;
++    std::uint32_t tv_sec;
++    std::uint32_t tv_usec;
+     std::string name;
+-    uint16_t type;
++    std::uint16_t type;
+ };
+ 
+ int main(int, char **) {
+
diff --git a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
index db90bc589e..ee203f83e2 100644
--- a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
+++ b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
@@ -8,8 +8,10 @@ inherit cmake
 DEPENDS += "sqlite3"
 
 SRCREV = "e8a9e9416f421303f4b8970caab26dadf8bae98b"
-SRC_URI = "git://github.com/fnc12/sqlite_orm;protocol=https;branch=master"
-S = "${WORKDIR}/git"
+SRC_URI = " \
+    git://github.com/fnc12/sqlite_orm;protocol=https;branch=master \
+    file://0001-fix-cstdint-error-with-gcc-15.0.1.patch \
+"
 
 EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF -DLIB_INSTALL_DIR=${libdir} \
                   -DCMAKE_INSTALL_DIR=${libdir}/cmake \
diff --git a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.1.bb b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.2.bb
index a542396d46..966d14874e 100644
--- a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.1.bb
+++ b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.2.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=a709b68f1ce8a9f10aeea6401446c1f4 \
                     file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8 \
                     "
 
-SRCREV = "8f9966c8ea3ea8a854941d041e7fcb9eb4f772fb"
+SRCREV = "667faf69cc35215e33e747b4bffdcba3643c2629"
 SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=fixes-1.3.0"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
index f9e3679590..7824ed1a68 100644
--- a/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
+++ b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
@@ -1,4 +1,4 @@
-SUMMARY="SSD1306 OLED I2C drive"
+SUMMARY = "SSD1306 OLED I2C drive"
 DESCRIPTION = "SSD1306 OLED I2C driver working in Linux"
 HOMEPAGE = "https://github.com/armlabs/ssd1306_linux"
 SECTION = "console/utils"
@@ -11,7 +11,6 @@ SRC_URI = " \
 "
 SRCREV = "34b42992a43fda69c6ba2557b718601cafe16251"
 
-S = "${WORKDIR}/git"
 
 # coreutils provides fmt which is used in the Makefile
 DEPENDS = "i2c-tools coreutils-native"
diff --git a/meta-oe/recipes-devtools/suitesparse/suitesparse/makefile-quoting.patch b/meta-oe/recipes-devtools/suitesparse/suitesparse/makefile-quoting.patch
new file mode 100644
index 0000000000..6bd2ffbb55
--- /dev/null
+++ b/meta-oe/recipes-devtools/suitesparse/suitesparse/makefile-quoting.patch
@@ -0,0 +1,32 @@
+OE's CC and CXX contain spaces and extra options which is incompatible with 
+cmake way of handling them. Remove passing the compiler options this way in
+favour of our normal cmake toolchain files added elsewhere.
+
+Upstream-Status: Pending
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -282,7 +282,7 @@ metis: include/metis.h
+ # hardcoded below.
+ include/metis.h:
+ ifeq (,$(MY_METIS_LIB))
+-       - ( cd metis-5.1.0 && $(MAKE) config shared=1 prefix=$(SUITESPARSE) cc=$(CC) )
++       - ( cd metis-5.1.0 && $(MAKE) config shared=1 prefix=$(SUITESPARSE) )
+        - ( cd metis-5.1.0 && $(MAKE) )
+        - ( cd metis-5.1.0 && $(MAKE) install )
+        - $(SO_INSTALL_NAME) $(SUITESPARSE)/lib/libmetis.dylib \
+Index: git/SuiteSparse_config/SuiteSparse_config.mk
+===================================================================
+--- git.orig/SuiteSparse_config/SuiteSparse_config.mk
++++ git/SuiteSparse_config/SuiteSparse_config.mk
+@@ -146,7 +146,7 @@ SUITESPARSE_VERSION = 5.10.1
+         endif
+     endif
+ 
+-    CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=$(CXX) -DCMAKE_C_COMPILER=$(CC)
++    #CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=$(CXX) -DCMAKE_C_COMPILER=$(CC)
+ 
+     #---------------------------------------------------------------------------
+     # CFLAGS for the C/C++ compiler
diff --git a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb
index 13e6fd066c..8effd042fb 100644
--- a/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb
+++ b/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb
@@ -4,35 +4,27 @@ SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https;branc
            file://0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch \
            file://0002-Preserve-links-when-installing-libmetis.patch \
            file://0003-Add-version-information-to-libmetis.patch \
+           file://makefile-quoting.patch \
            "
 SRCREV = "538273cfd53720a10e34a3d80d3779b607e1ac26"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "cmake-native lapack gmp mpfr chrpath-native"
 
 PROVIDES = "mongoose graphblas"
 RPROVIDES:${PN} = "mongoose graphblas"
 
-# The values of $CC, $CXX, and $LD that Bitbake uses have spaces in them which
-# causes problems when the SuiteSparse Makefiles try to pass these values on
-# the command line. To get around this problem, set these variables to only the
-# program name and prepend the rest of the value onto the corresponding FLAGS
-# variable.
-CFLAGS:prepend := "${@" ".join(d.getVar('CC').split()[1:])} "
-export CC := "${@d.getVar('CC').split()[0]}"
+inherit cmake
 
-CXXFLAGS:prepend := "${@" ".join(d.getVar('CXX').split()[1:])} "
-export CXX := "${@d.getVar('CXX').split()[0]}"
-
-LDFLAGS:prepend := "${@" ".join(d.getVar('LD').split()[1:])} "
-export LD := "${@d.getVar('LD').split()[0]}"
+B = "${S}"
 
 export CMAKE_OPTIONS = " \
     -DCMAKE_INSTALL_PREFIX=${D}${prefix} \
     -DCMAKE_INSTALL_LIBDIR=${baselib} \
 "
 
+OECMAKE_SOURCEPATH = "${S}/Mongoose ${S}/metis-5.1.0 ${S}/GraphBLAS"
+
 do_compile () {
         oe_runmake library
 }
diff --git a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb
index 3360ccf357..6c5591b461 100644
--- a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb
+++ b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb
@@ -7,8 +7,7 @@ inherit nativesdk
 
 SRC_URI = "file://systemctl"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
         install -d ${D}${bindir}
diff --git a/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch b/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch
deleted file mode 100644
index 58c9aec088..0000000000
--- a/meta-oe/recipes-devtools/tclap/files/0001-tclap-add-pkg-config-file.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 9d47d2fd45c455339759dbfe9a0d6fd24b0a0fa1 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Wed, 24 Mar 2021 15:39:36 +0800
-Subject: [PATCH] tclap: add pkg-config file
-
-The tclap switched from autotools to CMake in 1.4.0 and drop the
-pkg-config file tclap.pc. Some projects (e.g. ima-inspect) still require
-it. So add it back.
-
-Upstream-Status: Pending
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- CMakeLists.txt | 5 +++++
- tclap.pc.in    | 7 +++++++
- 2 files changed, 12 insertions(+)
- create mode 100644 tclap.pc.in
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2c9a26..b56eac7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,6 +25,11 @@ install(FILES "${PROJECT_BINARY_DIR}/tclap/TCLAPConfig.h"
-   DESTINATION include/tclap
-   )
- 
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tclap.pc.in
-+  ${CMAKE_CURRENT_BINARY_DIR}/tclap.pc @ONLY)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tclap.pc
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+
- add_subdirectory(docs)
- add_subdirectory(examples)
- add_subdirectory(tests)
-diff --git a/tclap.pc.in b/tclap.pc.in
-new file mode 100644
-index 0000000..ef51c94
---- /dev/null
-+++ b/tclap.pc.in
-@@ -0,0 +1,7 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+
-+Name: tclap
-+Description: Templatized C++ Command Line Parser
-+Version: @PROJECT_VERSION@
-+Cflags: -I${includedir}
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb b/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb
index 6d55c58526..6f452d3b93 100644
--- a/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb
+++ b/meta-oe/recipes-devtools/tclap/tclap_1.4.0.bb
@@ -10,12 +10,9 @@ compliant with the GNU or POSIX standards, it is close. \
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c64b2e8cc50917b2744a90950faa7cd"
 
-SRCREV = "799a8b1f99818e39fee19d0601030770af1221e1"
-SRC_URI = "git://git.code.sf.net/p/tclap/code;branch=1.4 \
-           file://0001-tclap-add-pkg-config-file.patch \
-"
+SRCREV = "81b3d2a0c47895c22e9bb8c577f5ab521f76e5d2"
+SRC_URI = "git://git.code.sf.net/p/tclap/code;branch=1.4"
 
-S = "${WORKDIR}/git"
 inherit cmake
 
 ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk8/confsearch.diff
index e13bf69b23..81d4735752 100644
--- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk8/confsearch.diff
@@ -7,9 +7,8 @@ Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
----
 Upstream-Status: Pending
-
+---
  unix/configure | 1 +
  unix/tcl.m4    | 2 ++
  2 files changed, 3 insertions(+)
diff --git a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk8/fix-xft.diff
index fdf3c66535..c1e2f7344e 100644
--- a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk8/fix-xft.diff
@@ -1,7 +1,7 @@
 Upstream-Status: Pending
 
---- /tmp/configure.in   2010-05-19 13:29:03.000000000 +0200
-+++ unix/configure.in   2010-05-19 13:42:05.000000000 +0200
+--- a/unix/configure.in 2010-05-19 13:29:03.000000000 +0200
++++ b/unix/configure.in 2010-05-19 13:42:05.000000000 +0200
 @@ -526,13 +526,9 @@
         found_xft="yes"
         dnl make sure package configurator (xft-config or pkg-config
diff --git a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk8/tkprivate.diff
index 62467af1d5..8cdcf20207 100644
--- a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk8/tkprivate.diff
@@ -1,9 +1,9 @@
-Upstream-Status: Pending
-
 Patch by Chris Waters sets path which are normally point to a directory
 with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tk headers there).
 
+Upstream-Status: Pending
+
 --- tk8.5-8.5.8.orig/unix/tkConfig.sh.in
 +++ tk8.5-8.5.8/unix/tkConfig.sh.in
 @@ -55,7 +55,7 @@
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb b/meta-oe/recipes-devtools/tcltk/tk8_8.6.15.bb
index 237c4e7389..8cb9f6cb5e 100644
--- a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb
+++ b/meta-oe/recipes-devtools/tcltk/tk8_8.6.15.bb
@@ -4,39 +4,43 @@ SECTION = "devel/tcltk"
 
 # http://www.tcl.tk/software/tcltk/license.html
 LICENSE = "TCL"
-LIC_FILES_CHKSUM = "file://${S}/../license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
-    file://${S}/../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+LIC_FILES_CHKSUM = "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
 "
 
-DEPENDS = "tcl virtual/libx11 libxt"
+DEPENDS = "tcl8 virtual/libx11 libxt"
 
 SRC_URI = "\
-    ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \
-    file://confsearch.diff;striplevel=2 \
-    file://tkprivate.diff;striplevel=2 \
+    ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
+    file://confsearch.diff \
+    file://tkprivate.diff \
     file://fix-xft.diff \
 "
-SRC_URI[md5sum] = "602a47ad9ecac7bf655ada729d140a94"
-SRC_URI[sha256sum] = "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386"
 
-S = "${WORKDIR}/${BPN}${PV}/unix"
+SRC_URI[sha256sum] = "550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca793fec"
 
-DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${S}/../=${TARGET_DBGSRC_DIR}/.."
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/"
+UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/"
 
-PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}"
+S = "${UNPACKDIR}/tk${PV}"
 
 # Short version format: "8.6"
 VER = "${@os.path.splitext(d.getVar('PV'))[0]}"
 
 LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib"
+CFLAGS += "-I${STAGING_INCDIR}/tcl${VER}"
 inherit autotools features_check pkgconfig
+
+AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
+EXTRA_AUTORECONF += "--exclude=aclocal"
+
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
@@ -46,7 +50,9 @@ EXTRA_OECONF = "\
     --with-tcl=${STAGING_BINDIR}/crossscripts \
     --libdir=${libdir} \
 "
-export TK_LIBRARY='${libdir}/tk${VER}'
+
+export TK_LIBRARY = '${libdir}/tk${VER}'
+
 do_install:append() {
     ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0
     oe_libinstall -so libtk${VER} ${D}${libdir}
@@ -68,7 +74,7 @@ FILES:${PN}-lib = "${libdir}/libtk${VER}.so*"
 FILES:${PN} += "${libdir}/tk*"
 
 # isn't getting picked up by shlibs code
-RDEPENDS:${PN} += "tk-lib"
+RDEPENDS:${PN} += "tk8-lib"
 RDEPENDS:${PN}:class-native = ""
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/tcltk/tk_9.0.1.bb b/meta-oe/recipes-devtools/tcltk/tk_9.0.1.bb
new file mode 100644
index 0000000000..504b40927e
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk_9.0.1.bb
@@ -0,0 +1,101 @@
+SUMMARY = "Tool Command Language ToolKit Extension"
+HOMEPAGE = "http://tcl.sourceforge.net"
+SECTION = "devel/tcltk"
+
+# http://www.tcl.tk/software/tcltk/license.html
+LICENSE = "TCL"
+LIC_FILES_CHKSUM = "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+    file://xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
+"
+
+DEPENDS = "tcl virtual/libx11 libxt zip-native"
+
+SRC_URI = "\
+    ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \
+"
+SRC_URI[sha256sum] = "d6f01a4d598bfc6398be9584e1bab828c907b0758db4bbb351a1429106aec527"
+
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/"
+UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/"
+
+S = "${UNPACKDIR}/${BPN}${PV}"
+
+# Short version format: "8.6"
+VER = "${@os.path.splitext(d.getVar('PV'))[0]}"
+
+LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib"
+
+inherit autotools features_check pkgconfig
+
+AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
+EXTRA_AUTORECONF += "--exclude=aclocal"
+
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+EXTRA_OECONF = "\
+    --with-x \
+    --with-tcl=${STAGING_BINDIR}/crossscripts \
+    --libdir=${libdir} \
+"
+
+export TK_LIBRARY = '${libdir}/tk${VER}'
+
+do_install:append() {
+    ln -sf wish${VER} ${D}${bindir}/wish
+
+    sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tkConfig.sh
+    sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tkConfig.sh
+    install -d ${D}${bindir_crossscripts}
+    install -m 0755 tkConfig.sh ${D}${bindir_crossscripts}
+}
+
+PACKAGECONFIG ??= "xft"
+PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,xft"
+PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext"
+
+PACKAGES =+ "${PN}-lib"
+
+SOLIBS = ".so"
+FILES_SOLIBSDEV = ""
+
+FILES:${PN}-lib = "${libdir}/libtcl9tk${VER}.so*"
+FILES:${PN} += "${libdir}/tk*"
+
+# isn't getting picked up by shlibs code
+RDEPENDS:${PN} += "tk-lib"
+RDEPENDS:${PN}:class-native = ""
+
+BBCLASSEXTEND = "native nativesdk"
+
+# Fix the path in sstate
+SSTATE_SCAN_FILES += "*Config.sh"
+
+inherit binconfig
+
+SYSROOT_DIRS += "${bindir_crossscripts}"
+
+# Fix some paths that might be used by Tcl extensions
+BINCONFIG_GLOB = "*Config.sh"
+
+# Cleanup host path from ${libdir}/tclConfig.sh and remove the
+# ${bindir_crossscripts}/tclConfig.sh from target
+PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess"
+tcl_package_preprocess() {
+        sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \
+               -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \
+               -e "s;${STAGING_INCDIR};${includedir};g" \
+               -e "s;--sysroot=${RECIPE_SYSROOT};;g" \
+               -e "s;${B};${libdir};g" \
+               -e "s;${WORKDIR};${TARGET_DBGSRC_DIR};g" \
+               ${PKGD}${libdir}/tkConfig.sh
+
+        rm -f ${PKGD}${bindir_crossscripts}/tkConfig.sh
+}
diff --git a/meta-oe/recipes-devtools/tomlplusplus/files/run-ptest b/meta-oe/recipes-devtools/tomlplusplus/files/run-ptest
new file mode 100755
index 0000000000..4f682c5eb2
--- /dev/null
+++ b/meta-oe/recipes-devtools/tomlplusplus/files/run-ptest
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+cd tests
+for atest in tomlplusplus_* ; do
+    rm -rf tests.log
+    ./${atest} > tests.log 2>&1
+    if [ $? = 0 ] ; then
+        echo "PASS: ${atest}"
+    else
+        echo "FAIL: ${atest}"
+    fi
+done
diff --git a/meta-oe/recipes-devtools/tomlplusplus/tomlplusplus_git.bb b/meta-oe/recipes-devtools/tomlplusplus/tomlplusplus_git.bb
new file mode 100644
index 0000000000..da8b1602be
--- /dev/null
+++ b/meta-oe/recipes-devtools/tomlplusplus/tomlplusplus_git.bb
@@ -0,0 +1,24 @@
+SUMMARY = "toml config parser and serializer for c++."
+HOMEPAGE = "https://github.com/marzer/tomlplusplus"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=90960f22c10049c117d56ed2ee5ee167"
+
+SRC_URI = "git://github.com/marzer/tomlplusplus.git;protocol=https;branch=master \
+           file://run-ptest \
+"
+
+PV = "3.4.0"
+SRCREV = "30172438cee64926dc41fdd9c11fb3ba5b2ba9de"
+
+DEPENDS = "cmake-native"
+
+inherit meson ptest pkgconfig
+
+EXTRA_OEMESON += "-Dbuild_tests=${@bb.utils.contains("DISTRO_FEATURES", "ptest", "true", "false", d)} \
+"
+
+do_install_ptest () {
+    install -d ${D}${PTEST_PATH}/tests
+    cp ${B}/tests/tomlplusplus_odr_test ${D}${PTEST_PATH}/tests
+    cp ${B}/tests/tomlplusplus_tests ${D}${PTEST_PATH}/tests
+}
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.16.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.17.bb
index 320b5a88a6..776bb014f4 100644
--- a/meta-oe/recipes-devtools/uftrace/uftrace_0.16.bb
+++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.17.bb
@@ -10,10 +10,9 @@ DEPENDS:append:libc-musl = " argp-standalone"
 
 inherit autotools
 
-SRCREV = "68aed9b0a20d3d1b5e1dc15e0f8aabba7e34735b"
+SRCREV = "b0d936107edcefb519abbc9c363ca40daaac23b3"
 SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \
            file://0001-include-libgen.h-for-basename.patch"
-S = "${WORKDIR}/git"
 
 LDFLAGS:append:libc-musl = " -largp"
 
diff --git a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb
index e37dbcd02f..3d92f59ff2 100644
--- a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb
+++ b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.9.1.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/mvo5/unattended-upgrades.git;protocol=https;branch=m
 
 SRCREV = "5aff8fa2b5b60b7c11bbfb39c884477e72d11d02"
 
-S = "${WORKDIR}/git"
 
 inherit setuptools3_legacy
 
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/CVE-2018-19518.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/CVE-2018-19518.patch
new file mode 100644
index 0000000000..d942a752b3
--- /dev/null
+++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/CVE-2018-19518.patch
@@ -0,0 +1,24 @@
+uw-imap (8:2007f~dfsg-6) unstable; urgency=medium
+
+  * [CVE-2018-19518] 2013_disable_rsh.patch (new): Disable access to IMAP
+    mailboxes through running imapd over rsh, and therefore ssh (Closes:
+    #914632). Code using the library can enable it with tcp_parameters()
+    after making sure that the IMAP server name is sanitized.
+
+ -- Magnus Holmgren <holmgren@debian.org>  Tue, 26 Feb 2019 23:35:43 +0100
+
+CVE: CVE-2018-19518
+Upstream-Status: Inactive-Upstream [lastrelease: 2007]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+
+--- a/src/osdep/unix/Makefile
++++ b/src/osdep/unix/Makefile
+@@ -988,7 +988,7 @@ onceenv:
+         -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
+         -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
+         -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+-        -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \
++        -DLOCKPGM=\"$(LOCKPGM)\" \
+         -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
+         -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
+        echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
index 7e3bddb58d..877f1d57f6 100644
--- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
+++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
@@ -17,12 +17,12 @@ SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \
            file://0001-Fix-Wincompatible-function-pointer-types.patch \
            file://uw-imap-newer-tls.patch \
            file://uw-imap-fix-incompatible-pointer-types.patch \
+           file://CVE-2018-19518.patch \
            "
 
-SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369"
 SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28"
 
-S = "${WORKDIR}/imap-${PV}"
+S = "${UNPACKDIR}/imap-${PV}"
 
 CVE_STATUS[CVE-2005-0198] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
 
@@ -53,3 +53,10 @@ ALLOW_EMPTY:${PN} = "1"
 
 PARALLEL_MAKE = ""
 
+# http://errors.yoctoproject.org/Errors/Details/766915/
+# unix.c:235:21: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types]
+# unix.c:1002:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types]
+# unix.c:1163:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types]
+# unix.c:1428:40: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types]
+# unix.c:2254:33: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-devtools/valijson/valijson_1.0.2.bb b/meta-oe/recipes-devtools/valijson/valijson_1.0.6.bb
index f531218aeb..4e5f02746c 100644
--- a/meta-oe/recipes-devtools/valijson/valijson_1.0.2.bb
+++ b/meta-oe/recipes-devtools/valijson/valijson_1.0.6.bb
@@ -3,10 +3,9 @@ HOMEPAGE = "https://github.com/tristanpenman/valijson"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5c4583a434195e4f3b418e17c8ca2daf"
 
-SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https"
-SRCREV = "0b4771e273a065d437814baf426bcfcafec0f434"
+SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https;tag=v${PV}"
+SRCREV = "4edda758546436462da479bb8c8514f8a95c35ad"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch b/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch
new file mode 100644
index 0000000000..2ad7beb51c
--- /dev/null
+++ b/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch
@@ -0,0 +1,58 @@
+From d001f12d428f7adaeaadee5263a22c797c99d67b Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Fri, 30 Aug 2024 11:42:27 +0200
+Subject: [PATCH] aclocal.m4: don't use full path of $with_curl in xerces-c.pc
+
+* fixes:
+  ERROR: QA Issue: File /usr/lib32/pkgconfig/xerces-c.pc in package lib32-libxerces-c-dev contains reference to TMPDIR [buildpaths]
+
+* xerces-c was blacklisted due to tmpdir since 2016:
+  https://git.openembedded.org/meta-openembedded/commit/?id=1af196e42c811947bb483df30bfce758adee83d1
+
+* then sed call:
+  sed -i -e 's:-L${STAGING_DIR}/lib:-L\$\{libdir\}:g' ${B}/xerces-c.pc
+  was added to do_install:append and blacklist dropped in:
+  https://git.openembedded.org/meta-openembedded/commit/?id=87b9efff79e62f569525e4760adc594d0d9ac476
+
+* sed call was adjusted in:
+  https://git.openembedded.org/meta-openembedded/commit/?id=87c9e9537dc43468a6aaf706853b784ce6de14e0
+  sed -i s:-L${STAGING_LIBDIR}::g ${B}/xerces-c.pc
+
+* but it was still failing in some cases, e.g. with multilib where libdir is /usr/lib64, so the sed call is:
+  sed -i s:-L{WORKDIR}/recipe-sysroot/usr/lib64::g ${WORKDIR}/build/xerces-c.pc
+  but the actual xerces-c.pc file still has:
+
+  Libs: -L${libdir} -lxerces-c
+  Libs.private: -L${WORKDIR}/recipe-sysroot/usr/lib -lcurl
+
+  because this aclocal was always hardcoding "lib" (appended to --with-curl
+  value which is passed together with ${prefix}) and not respecting the libdir value:
+  PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl"
+  PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu"
+
+* xerces-c supports CMake since 2017:
+  https://github.com/apache/xerces-c/commit/2606b2924c3e2bf0cf50f72b79378721b6bcf04e
+  switching from autotools to CMake would probably resolve some of this as well
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+Upstream-Status: Pending [It would be better to just switch to CMake]
+
+ m4/xerces_curl_prefix.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/m4/xerces_curl_prefix.m4 b/m4/xerces_curl_prefix.m4
+index d1d015c..7928bdc 100644
+--- a/m4/xerces_curl_prefix.m4
++++ b/m4/xerces_curl_prefix.m4
+@@ -39,8 +39,8 @@ AC_DEFUN([XERCES_CURL_PREFIX],
+                        curl_libs=`$curl_config --libs`
+                else
+                        if test -n "$with_curl"; then
+-                               curl_flags="-I$with_curl/include"
+-                               curl_libs="-L$with_curl/lib -lcurl"
++                               curl_flags=""
++                               curl_libs="-lcurl"
+                        else
+                                # Default compiler paths.
+                                #
diff --git a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb
index 1643af2546..2819366dc9 100644
--- a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb
+++ b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.3.0.bb
@@ -9,8 +9,10 @@ SECTION =  "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "1db4028c9b7f1f778efbf4a9462d65e13f9938f2c22f9e9994e12c49ba97e252"
+SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2 \
+    file://0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch \
+"
+SRC_URI[sha256sum] = "ef752578587e26013a933f16d76305c9b43ca32f869e3d3426986e03efb01d64"
 
 inherit autotools
 
@@ -18,10 +20,6 @@ PACKAGECONFIG ??= "curl icu"
 PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl"
 PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu"
 
-do_install:prepend () {
-    sed -i s:-L${STAGING_LIBDIR}::g ${B}/xerces-c.pc
-}
-
 PACKAGES = "libxerces-c \
     libxerces-c-dev \
     xerces-c-samples \
@@ -31,7 +29,7 @@ PACKAGES = "libxerces-c \
 
 RPROVIDES:${PN}-dbg += "libxerces-c-dbg xerces-c-samples-dbg"
 
-FILES:libxerces-c = "${libdir}/libxerces-c-3.2.so"
+FILES:libxerces-c = "${libdir}/libxerces-c-3.3.so"
 FILES:libxerces-c-dev = "${libdir}/lib*.la \
     ${libdir}/libxerces-c.so \
     ${libdir}/pkgconfig/xerces-c.pc \
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-bool-reserved-word-error-in-gcc-15.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-bool-reserved-word-error-in-gcc-15.patch
new file mode 100644
index 0000000000..813efbc62a
--- /dev/null
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-bool-reserved-word-error-in-gcc-15.patch
@@ -0,0 +1,50 @@
+From a811ea6af5296b89ee7c2a358dd4ffd2584429f4 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 2 Apr 2025 11:00:27 +0900
+Subject: [PATCH] fix bool reserved word error in gcc 15
+
+* Fix build error with gcc-15.0.1
+  http://errors.yoctoproject.org/Errors/Details/850147/
+    srcdir/lib/util/include/bool.h:13:5: error: cannot use keyword 'false' as enumeration constant
+    13 |     false = 0,
+        |     ^~~~~
+    srcdir/lib/util/include/bool.h:13:5: note: 'false' is a keyword with '-std=c23' onwards
+    srcdir/lib/util/include/bool.h:15:3: error: expected ';', identifier or '(' before 'bool'
+    15 | } bool;
+        |   ^~~~
+    srcdir/lib/util/include/bool.h:15:3: warning: useless type name in empty declaration
+    In file included from sleep.c:2:
+    srcdir/lib/util/include/bool.h:13:5: error: cannot use keyword 'false' as enumeration constant
+    13 |     false = 0,
+        |     ^~~~~
+    srcdir/lib/util/include/bool.h:13:5: note: 'false' is a keyword with '-std=c23' onwards
+    srcdir/lib/util/include/bool.h:15:3: error: expected ';', identifier or '(' before 'bool'
+    15 | } bool;
+        |   ^~~~
+
+  gcc-15 switched to -std=c23 by default.
+  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
+
+Upstream-Status: Submitted [https://sourceforge.net/p/xmlrpc-c/discussion/131628/thread/70e626d73a]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ stable/lib/util/include/bool.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/stable/lib/util/include/bool.h b/stable/lib/util/include/bool.h
+index 312477c4..a5e81eb6 100644
+--- a/stable/lib/util/include/bool.h
++++ b/stable/lib/util/include/bool.h
+@@ -9,10 +9,12 @@
+ /* At least the GNU compiler defines __bool_true_false_are_defined */
+ #ifndef __bool_true_false_are_defined
+ #define __bool_true_false_are_defined
++#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L
+ typedef enum {
+     false = 0,
+     true = 1
+ } bool;
+ #endif
+ #endif
++#endif
+ 
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
index be83b0166c..531f0d45fb 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch
@@ -1,6 +1,6 @@
-From dba3c5bf34ed530fd41ed50968825af2158f142e Mon Sep 17 00:00:00 2001
+From 371c59c6135f53a6892c415bf9450c32e7ca3523 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 29 Jan 2019 13:31:39 -0800
+Date: Mon, 10 Mar 2025 20:25:02 -0700
 Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++
 
 /mnt/a/yoe/workspace/sources/xmlrpc-c/test/cpp/server_abyss.cpp:87:14: error: assigning to 'int' from incompatible type '__bind<int
@@ -10,10 +10,15 @@ Subject: [PATCH] test/cpp/server_abyss: Fix build with clang/libc++
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Rebase to 1.64.0
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
- test/cpp/server_abyss.cpp | 56 +++++++++++++++++++--------------------
- 1 file changed, 28 insertions(+), 28 deletions(-)
+ test/cpp/server_abyss.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/test/cpp/server_abyss.cpp b/test/cpp/server_abyss.cpp
+index c1b44995..14faf5a5 100644
 --- a/test/cpp/server_abyss.cpp
 +++ b/test/cpp/server_abyss.cpp
 @@ -85,7 +85,7 @@ public:
@@ -25,3 +30,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
          
          if (rc != 0) {
              closesock(this->fd);
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
new file mode 100644
index 0000000000..15e088965f
--- /dev/null
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch
@@ -0,0 +1,80 @@
+From e246247aceb3ac0fd7491b1ee34a049dd44f5025 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 10 Mar 2025 20:26:29 -0700
+Subject: [PATCH] unix-common.mk: Avoid race condition between mutliple make
+ calls running in parallel
+
+With high parallel execution, it results in race condition where
+its trying to create symlink while the original symlink while rm is
+not done deleting the existing file yet.
+
+The issue is that submake for libxmlrpc_util.so is called 12 times
+which can run in parallel and then some of them will try to create
+target link at the same time (after both already finished rm call).
+
+Use -f which should be supported even by relatively old ln and
+should avoid the need for rm (and hopefully will avoid this race)
+
+For libutil++ it calls "all" and "libxmlrpc_util++.so" only once,
+but for libutil it calls "all" and then 12 times libxmlrpc_util.so
+(after-clean-j1.log is the make output with -n and -j1 instead of
+-j70), still trying to figure out why, my autofoo is rusty :).
+
+Ideally we should prevent calling it 12 times, but until we figure
+out why we can at least avoid the random build failures.
+
+Another interesting fact is that I haven't seen this issue until
+the upgrade to 1.60.03 from 1.59.01 from:
+https://lists.openembedded.org/g/openembedded-devel/message/112706
+but I don't see any changes which should cause this in the git since
+1.59.01, but the gentoo bug report is against 1.54.06 already.
+
+martin@jama /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/stable $ grep -A 1 lib/libutil++/Makefile after-clean-j1.log
+make -C libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/Makefile \
+    all
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil++/Makefile \
+    libxmlrpc_util++.so
+
+--
+make -C /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil/ -f /OE/build/oe-core/tmp/work/core2-64-oe-linux/xmlrpc-c/1.60.03/git/lib/libutil/Makefile \
+    libxmlrpc_util.so
+
+Similar error reported here [1]
+
+[1] https://bugs.gentoo.org/932835
+
+Upstream-Status: Pending
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Rebase to 1.64.0
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ unix-common.mk | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/unix-common.mk b/unix-common.mk
+index 6954faf5..e15a4f5c 100644
+--- a/unix-common.mk
++++ b/unix-common.mk
+@@ -62,14 +62,12 @@ SHLIB_CMD = $(CCLD) $(LADD) $(LDFLAGS_SHLIB) -o $@ $^
+ SHLIB_LE_TARGETS = $(call shliblefn, $(SHARED_LIBS_TO_BUILD))
+ 
+ $(SHLIB_LE_TARGETS):%:%.$(MAJ)
+-       rm -f $@
+-       $(LN_S) $< $@
++       $(LN_S) -f $< $@
+ 
+ SONAME_TARGETS = $(SHLIB_LE_TARGETS:%=%.$(MAJ))
+ 
+ $(SONAME_TARGETS):%:%.$(MIN)
+-       rm -f $@
+-       $(LN_S) $< $@
++       $(LN_S) -f $< $@
+ 
+ .PHONY: $(SHLIB_INSTALL_TARGETS)
+ .PHONY: install-shared-libraries
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
deleted file mode 100644
index 9d92e4712b..0000000000
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 14f15cb0f03defa8efb4c8e2fece58e50655be6b Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Sun, 23 Jul 2017 22:20:29 -0400
-Subject: [PATCH] src/xmlrpc_server_abyss.c: fix formatting issues
-
-Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
-|src/xmlrpc_server_abyss.c:771:13: error: format not a string literal
-and no format arguments [-Werror=format-security]
-|             xmlrpc_faultf(envP, error);
-|             ^~~~~~~~~~~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- src/xmlrpc_server_abyss.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xmlrpc_server_abyss.c b/src/xmlrpc_server_abyss.c
-index 2388652..3843f10 100644
---- a/src/xmlrpc_server_abyss.c
-+++ b/src/xmlrpc_server_abyss.c
-@@ -768,7 +768,7 @@ createServer(xmlrpc_env *                      const envP,
-         ServerInit2(abyssServerP, &error);
- 
-         if (error) {
--            xmlrpc_faultf(envP, error);
-+            xmlrpc_faultf(envP, "%s", error);
-             xmlrpc_strfree(error);
-         }
-     }
--- 
-2.8.1
-
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/no-automake.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/no-automake.patch
new file mode 100644
index 0000000000..f309cd4890
--- /dev/null
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/no-automake.patch
@@ -0,0 +1,18 @@
+This doesn't use automake so don't turn it on, as autoreconf will refuse to work.
+
+Upstream-Status: Submitted
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+diff --git i/stable/configure.in w/stable/configure.in
+index 4a9ade8c..baba1edc 100644
+--- i/configure.in
++++ w/configure.in
+@@ -8,7 +8,7 @@ dnl =======================================================================
+ 
+ dnl "x.xx" is supposed to be a version number, but is meaningless here.
+ dnl The real version number is in Makefile.version.
+-AM_INIT_AUTOMAKE(xmlrpc-c, x.xx)
++dnl AM_INIT_AUTOMAKE(xmlrpc-c, x.xx)
+ 
+ dnl Define @build@, @build_cpu@, @build_vendor@, @build_os,
+ dnl @host, @host_cpu@, @host_vender, and @host_os@ substitutions.
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
index 5d5152b834..3b923fb99e 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.64.0.bb
@@ -6,18 +6,20 @@ LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951"
 
 SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \
+           file://no-automake.patch \
            file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \
-           file://0002-fix-formatting-issues.patch \
+           file://0001-unix-common.mk-Ensuring-Sequential-Execution-of-rm-a.patch \
+           file://0001-fix-bool-reserved-word-error-in-gcc-15.patch;striplevel=2 \
            "
-#Release 1.59.01
-SRCREV = "352aeaa9ae49e90e55187cbda839f2113df06278"
+SRCREV = "8ce36bce2438df9b02fcaafd19efa90a56426601"
 
-S = "${WORKDIR}/git/stable"
+S = "${UNPACKDIR}/${BP}/advanced"
 
 inherit autotools-brokensep binconfig pkgconfig
 
 TARGET_CFLAGS += "-Wno-narrowing"
 
+# These are needed for the integrated expat
 EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \
                  LD_FOR_BUILD='${BUILD_LD}' \
                  CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' \
@@ -32,10 +34,7 @@ PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-ab
 PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus"
 PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl"
 
-do_configure() {
-        gnu-configize --verbose --force ${S}
-        autoconf
-        oe_runconf
+do_configure:prepend() {
         # license is incompatible with lib/util/getoptx.*
         rm -fv ${S}/tools/turbocharger/mod_gzip.c
 }
diff --git a/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb b/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
index 186f2c8ed0..3e569859b7 100644
--- a/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
+++ b/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/lloyd/yajl;nobranch=1;protocol=https"
 
 inherit cmake lib_package
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
 
diff --git a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
index c5b5e60027..e4434bee45 100644
--- a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
+++ b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/lloyd/yajl;branch=master;protocol=https \
            "
 SRCREV = "a0ecdde0c042b9256170f2f8890dd9451a4240aa"
 
-S = "${WORKDIR}/git"
 
 inherit cmake lib_package
 
diff --git a/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch b/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch
deleted file mode 100644
index bda90edb20..0000000000
--- a/meta-oe/recipes-devtools/yasm/yasm/0001-Do-not-use-AC_HEADER_STDC.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6b1cbe8b4dcc45103d69bc7337e5eb33d1fd21f3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 3 Feb 2021 14:22:51 -0800
-Subject: [PATCH] Do not use AC_HEADER_STDC
-
-This macro is removed in autotools 2.70+ and it can be expected that C90
-headers are always available [1]
-
-Upstream-Status: Pending
-
-[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.70/autoconf.html#index-AC_005fHEADER_005fSTDC
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 01b61097..2823ecd7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -101,14 +101,8 @@ AM_WITH_DMALLOC
- #
- # Checks for header files.
- #
--AC_HEADER_STDC
- AC_CHECK_HEADERS([strings.h libgen.h unistd.h direct.h sys/stat.h])
- 
--# REQUIRE standard C headers
--if test "$ac_cv_header_stdc" != yes; then
--       AC_MSG_ERROR([Standard (ANSI/ISO C89) header files are required.])
--fi
--
- #
- # Checks for typedefs, structures, and compiler characteristics.
- #
--- 
-2.30.0
-
diff --git a/meta-oe/recipes-devtools/yasm/yasm/0001-bitvect-fix-build-with-gcc-15.patch b/meta-oe/recipes-devtools/yasm/yasm/0001-bitvect-fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..f3f2c431d5
--- /dev/null
+++ b/meta-oe/recipes-devtools/yasm/yasm/0001-bitvect-fix-build-with-gcc-15.patch
@@ -0,0 +1,38 @@
+From 64ef740eb262f329e55eebadf2ce276b146d44e9 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Tue, 22 Apr 2025 19:06:24 +0200
+Subject: [PATCH] bitvect: fix build with gcc-15
+
+* fixes:
+libyasm/bitvect.h:86:32: error: cannot use keyword 'false' as enumeration constant
+   86 |         typedef enum boolean { false = FALSE, true = TRUE } boolean;
+      |                                ^~~~~
+../git/libyasm/bitvect.h:86:32: note: 'false' is a keyword with '-std=c23' onwards
+
+as suggested in:
+https://github.com/yasm/yasm/issues/283#issuecomment-2661108816
+
+Upstream-Status: Submitted [https://github.com/yasm/yasm/pull/287]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ libyasm/bitvect.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libyasm/bitvect.h b/libyasm/bitvect.h
+index 3aee3a53..a13470ad 100644
+--- a/libyasm/bitvect.h
++++ b/libyasm/bitvect.h
+@@ -83,7 +83,11 @@ typedef  Z_longword         *Z_longwordptr;
+     #ifdef MACOS_TRADITIONAL
+         #define boolean Boolean
+     #else
+-        typedef enum boolean { false = FALSE, true = TRUE } boolean;
++        #if __STDC_VERSION__ < 202311L
++             typedef enum boolean { false = FALSE, true = TRUE } boolean;
++        #else
++             typedef bool boolean;
++        #endif
+     #endif
+ #endif
+ 
diff --git a/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-31975.patch b/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-31975.patch
deleted file mode 100644
index ae10e99c2f..0000000000
--- a/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-31975.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b2cc5a1693b17ac415df76d0795b15994c106441 Mon Sep 17 00:00:00 2001
-From: Katsuhiko Gondow <gondow@cs.titech.ac.jp>
-Date: Tue, 13 Jun 2023 05:00:47 +0900
-Subject: [PATCH] Fix memory leak in bin-objfmt (#231)
-
-Upstream-Status: Backport [https://github.com/yasm/yasm/commit/b2cc5a1693b17ac415df76d0795b15994c106441]
-
-CVE: CVE-2023-31975
----
- modules/objfmts/bin/bin-objfmt.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/modules/objfmts/bin/bin-objfmt.c b/modules/objfmts/bin/bin-objfmt.c
-index 18026750..a38c3422 100644
---- a/modules/objfmts/bin/bin-objfmt.c
-+++ b/modules/objfmts/bin/bin-objfmt.c
-@@ -1680,6 +1680,10 @@ static void
- bin_section_data_destroy(void *data)
- {
-     bin_section_data *bsd = (bin_section_data *)data;
-+    if (bsd->align)
-+        yasm_xfree(bsd->align);
-+    if (bsd->valign)
-+        yasm_xfree(bsd->valign);
-     if (bsd->start)
-         yasm_expr_destroy(bsd->start);
-     if (bsd->vstart)
---
-2.40.0
diff --git a/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch b/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch
deleted file mode 100644
index 1ca33f0a92..0000000000
--- a/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2cd3bb50e256f5ed5f611ac611d25fe673f2cec3 Mon Sep 17 00:00:00 2001
-From: Peter Johnson <johnson.peter@gmail.com>
-Date: Fri, 11 Aug 2023 10:49:51 +0000
-Subject: [PATCH] elf.c: Fix NULL deref on bad xsize expression (#234)
-
-CVE: CVE-2023-37732
-
-Upstream-Status: Backport [https://github.com/yasm/yasm/commit/2cd3bb50e256f5ed5f611ac611d25fe673f2cec3]
-
-Signed-off-by: Soumya <soumya.sambu@windriver.com>
----
- modules/objfmts/elf/elf.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/modules/objfmts/elf/elf.c b/modules/objfmts/elf/elf.c
-index 2486bba8..bab4c9ca 100644
---- a/modules/objfmts/elf/elf.c
-+++ b/modules/objfmts/elf/elf.c
-@@ -482,15 +482,15 @@ elf_symtab_write_to_file(FILE *f, elf_symtab_head *symtab,
-
-         /* get size (if specified); expr overrides stored integer */
-         if (entry->xsize) {
--            size_intn = yasm_intnum_copy(
--                yasm_expr_get_intnum(&entry->xsize, 1));
--            if (!size_intn) {
-+            yasm_intnum *intn = yasm_expr_get_intnum(&entry->xsize, 1);
-+            if (!intn) {
-                 yasm_error_set(YASM_ERROR_VALUE,
-                                N_("size specifier not an integer expression"));
-                 yasm_errwarn_propagate(errwarns, entry->xsize->line);
--            }
-+            } else
-+                size_intn = yasm_intnum_copy(intn);
-         }
--        else
-+        if (!size_intn)
-             size_intn = yasm_intnum_create_uint(entry->size);
-
-         /* get EQU value for constants */
---
-2.40.0
diff --git a/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-oe/recipes-devtools/yasm/yasm_git.bb
index 216b777667..68895a1697 100644
--- a/meta-oe/recipes-devtools/yasm/yasm_git.bb
+++ b/meta-oe/recipes-devtools/yasm/yasm_git.bb
@@ -8,17 +8,14 @@ DEPENDS += "flex-native bison-native"
 PACKAGECONFIG[docs] = ",,xmlto-native,"
 
 PV = "1.3.0+git"
-# v1.3.0
-SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a"
+# v1.3.0-87
+SRCREV = "121ab150b3577b666c79a79f4a511798d7ad2432"
 SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \
-           file://0001-Do-not-use-AC_HEADER_STDC.patch \
-           file://CVE-2023-31975.patch \
-           file://CVE-2023-37732.patch \
            file://0001-yasm-Set-build-date-to-SOURCE_DATE_EPOCH.patch \
            file://0002-yasm-Use-BUILD_DATE-for-reproducibility.patch \
+           file://0001-bitvect-fix-build-with-gcc-15.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit autotools gettext python3native
 
@@ -33,3 +30,6 @@ do_configure:prepend() {
      sed -i -e "s/^echo \"\/\* generated \$ac_cv_stdint_message \*\/\" >>\$ac_stdint$"// ${S}/m4/ax_create_stdint_h.m4
 }
 
+CVE_STATUS_GROUPS += "CVE_STATUS_HASH_UPDATE"
+CVE_STATUS_HASH_UPDATE = "CVE-2021-33454 CVE-2023-31975 CVE-2023-37732"
+CVE_STATUS_HASH_UPDATE[status] = "fixed-version: patched in current git hash"
diff --git a/meta-oe/recipes-extended/7zip/7zip_24.09.bb b/meta-oe/recipes-extended/7zip/7zip_24.09.bb
new file mode 100644
index 0000000000..74e44c44e3
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/7zip_24.09.bb
@@ -0,0 +1,76 @@
+SUMMARY = "7-zip is a commandline utility handling 7z archives."
+HOMEPAGE = "http://www.7-zip.org/"
+LICENSE = "LGPL-2.1-or-later & unRAR & PD & BSD-2-Clause & BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://DOC/copying.txt;md5=4fbd65380cdd255951079008b364516c \
+                    file://DOC/unRarLicense.txt;md5=9c87ddde469ef94aed153b0951d088de \
+                    file://DOC/License.txt;md5=44483e232b64ffca25fe001f3d6418d0"
+
+CVE_PRODUCT = "7-zip 7zip"
+SRC_URI = "git://github.com/ip7z/7zip.git;protocol=https;branch=main \
+           file://0001-support-yocto-cross-compiling.patch \
+           file://7z_wrapper.sh \
+           "
+SRCREV = "e5431fa6f5505e385c6f9367260717e9c47dc2ee"
+
+UPSTREAM_CHECK_URI = "https://github.com/ip7z/7zip/releases/latest"
+
+
+# Support Yocto cross compiling
+CXXFLAGS:append:toolchain-clang = " -Wno-error=cast-qual -Wno-error=sign-conversion \
+                                    -Wno-error=disabled-macro-expansion \
+                                    -Wno-error=shorten-64-to-32 \
+                                    -Wno-error=cast-function-type-strict"
+
+EXTRA_OEMAKE += " \
+    CXXFLAGS_EXTRA='${CXXFLAGS}' \
+    CFLAGS_BASE2='${CFLAGS}' \
+    LDFLAGS_STATIC_3='${LDFLAGS}' \
+"
+
+# Support clang
+MAKEFILE ?= "../../cmpl_gcc.mak"
+MAKEFILE:class-target:toolchain-clang = "../../cmpl_clang.mak"
+
+do_compile() {
+    oe_runmake -C CPP/7zip/Bundles/Alone2    -f ${MAKEFILE}
+    oe_runmake -C CPP/7zip/Bundles/Format7zF -f ${MAKEFILE}
+    oe_runmake -C CPP/7zip/UI/Console        -f ${MAKEFILE}
+    oe_runmake -C CPP/7zip/Bundles/SFXCon    -f ${MAKEFILE}
+    oe_runmake -C CPP/7zip/Bundles/Alone     -f ${MAKEFILE}
+    oe_runmake -C CPP/7zip/Bundles/Alone7z   -f ${MAKEFILE}
+}
+
+FILES:${PN} += "${libdir}/*"
+
+FILES_SOLIBSDEV = ""
+INSANE_SKIP:${PN} += "dev-so"
+
+INSTALLDIR ?= "g"
+INSTALLDIR:class-target:toolchain-clang = "c"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 ${S}/CPP/7zip/Bundles/Alone/b/${INSTALLDIR}/7za ${D}${bindir}
+        install -m 0755 ${S}/CPP/7zip/Bundles/Alone7z/b/${INSTALLDIR}/7zr ${D}${bindir}
+        install -m 0755 ${S}/CPP/7zip/UI/Console/b/${INSTALLDIR}/7z ${D}${bindir}/7z.real
+        install -m 0755 ${UNPACKDIR}/7z_wrapper.sh ${D}${bindir}/7z
+
+        install -d ${D}${libdir}
+        install -m 0755 ${S}/CPP/7zip/Bundles/Format7zF/b/${INSTALLDIR}/7z.so ${D}${libdir}/lib7z.so
+        ln -rsn ${D}${libdir}/lib7z.so ${D}${bindir}/7z.so
+
+        # install headers (for development) and readme (for version information)
+        for header_file in $(find ${S}/CPP/${BPN} ${S}/CPP/Common ${S}/C -name "*.h"); do
+                header_dir=$(dirname $(echo $header_file | sed "s|${S}/||"))
+                install -d ${D}${includedir}/${BPN}/$header_dir
+                install -m 0644 $header_file ${D}${includedir}/${BPN}/$header_dir
+        done
+        install -d ${D}${includedir}/${BPN}/DOC
+        install -m 0644 ${S}/DOC/readme.txt ${D}${includedir}/${BPN}/DOC
+}
+
+PROVIDES += "p7zip"
+RPROVIDES:${PN} += "lib7z.so()(64bit) 7z lib7z.so p7zip"
+RPROVIDES:${PN}-dev += "lib7z.so()(64bit) 7z lib7z.so"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-running-tests-on-target-when-cross-compiling.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-running-tests-on-target-when-cross-compiling.patch
new file mode 100644
index 0000000000..b6e24a9519
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-running-tests-on-target-when-cross-compiling.patch
@@ -0,0 +1,45 @@
+From 9f0eed91d32ec2f310bd5c23af187f888394fcb4 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Wed, 2 Apr 2025 09:33:03 +0200
+Subject: [PATCH] Allow running tests on target when cross-compiling
+
+When bit7z is Cross-compiled, target device does not contain
+source/build directory anymore and thus path to test data is different.
+Make it possible to pass the new path to cmake.
+
+Upstream-Status: Submitted [https://github.com/rikyoz/bit7z/pull/289]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ tests/CMakeLists.txt | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 60da280..dbdff1f 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -49,6 +49,11 @@ add_executable( ${TESTS_TARGET_PUBLIC} ${SOURCE_FILES} ${PUBLIC_API_SOURCE_FILES
+ 
+ if( BIT7Z_TESTS_FILESYSTEM )
+     set( BIT7Z_TESTS_DATA_DIR ${CMAKE_CURRENT_BINARY_DIR}/data )
++    if( NOT BIT7Z_TESTS_DATA_DIR_TARGET )
++        set( BIT7Z_TESTS_DATA_DIR_TARGET ${BIT7Z_TESTS_DATA_DIR} )
++    else()
++        message( STATUS "Custom test data dir on target: ${BIT7Z_TESTS_DATA_DIR_TARGET}" )
++    endif()
+ 
+     include( FetchContent )
+     FetchContent_Declare( bit7z-test-data
+@@ -61,11 +66,11 @@ if( BIT7Z_TESTS_FILESYSTEM )
+     message( STATUS "Tests data directory: ${BIT7Z_TESTS_DATA_DIR}" )
+     target_compile_definitions( ${TESTS_TARGET} PRIVATE
+                                 BIT7Z_TESTS_FILESYSTEM
+-                                BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR}" )
++                                BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR_TARGET}" )
+     target_compile_definitions( ${TESTS_TARGET_PUBLIC} PRIVATE
+                                 BIT7Z_TESTS_PUBLIC_API_ONLY
+                                 BIT7Z_TESTS_FILESYSTEM
+-                                BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR}" )
++                                BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR_TARGET}" )
+     if( NOT EXISTS ${BIT7Z_TESTS_DATA_DIR}/test_filesystem/empty )
+         file( MAKE_DIRECTORY ${BIT7Z_TESTS_DATA_DIR}/test_filesystem/empty )
+     endif()
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-specifying-path-to-7z-library-in-tests.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-specifying-path-to-7z-library-in-tests.patch
new file mode 100644
index 0000000000..adc0d67d97
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-specifying-path-to-7z-library-in-tests.patch
@@ -0,0 +1,48 @@
+From 60137ec132951f941f2fb98cd6353717b322cbf1 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Wed, 2 Apr 2025 10:17:38 +0200
+Subject: [PATCH] Allow specifying path to 7z library in tests
+
+For instance to override path to library on Linux when using real 7-zip
+instead of pzip: /usr/lib/lib7z.so
+
+Upstream-Status: Submitted [https://github.com/rikyoz/bit7z/pull/288]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ tests/CMakeLists.txt           | 7 +++++++
+ tests/src/utils/shared_lib.hpp | 4 +++-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 60da280d..1307366a 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -103,6 +103,13 @@ message( STATUS "Use system 7-zip for tests: ${BIT7Z_TESTS_USE_SYSTEM_7ZIP}" )
+ if( BIT7Z_TESTS_USE_SYSTEM_7ZIP )
+     target_compile_definitions( ${TESTS_TARGET} PRIVATE BIT7Z_TESTS_USE_SYSTEM_7ZIP )
+     target_compile_definitions( ${TESTS_TARGET_PUBLIC} PRIVATE BIT7Z_TESTS_USE_SYSTEM_7ZIP )
++else()
++    set( BIT7Z_TESTS_7Z_LIBRARY_PATH "" CACHE STRING "The path of the 7-Zip library to be used for running the tests" )
++    if( NOT BIT7Z_TESTS_7Z_LIBRARY_PATH STREQUAL "" )
++        message( STATUS "Use custom 7-zip library for tests: ${BIT7Z_TESTS_7Z_LIBRARY_PATH}" )
++        target_compile_definitions( ${TESTS_TARGET} PRIVATE BIT7Z_TESTS_7Z_LIBRARY_PATH="${BIT7Z_TESTS_7Z_LIBRARY_PATH}" )
++        target_compile_definitions( ${TESTS_TARGET_PUBLIC} PRIVATE BIT7Z_TESTS_7Z_LIBRARY_PATH="${BIT7Z_TESTS_7Z_LIBRARY_PATH}" )
++    endif()
+ endif()
+ 
+ # Avoiding linking unnecessary libraries.
+diff --git a/tests/src/utils/shared_lib.hpp b/tests/src/utils/shared_lib.hpp
+index 41435a9b..8bc02939 100644
+--- a/tests/src/utils/shared_lib.hpp
++++ b/tests/src/utils/shared_lib.hpp
+@@ -20,7 +20,9 @@ namespace bit7z {
+ namespace test {
+ 
+ inline auto sevenzip_lib_path() -> tstring {
+-#ifdef BIT7Z_TESTS_USE_SYSTEM_7ZIP
++#ifdef BIT7Z_TESTS_7Z_LIBRARY_PATH
++    static const tstring lib_path = BIT7Z_STRING( BIT7Z_TESTS_7Z_LIBRARY_PATH );
++#elif defined( BIT7Z_TESTS_USE_SYSTEM_7ZIP )
+ #ifdef _WIN64
+     static const tstring lib_path = BIT7Z_STRING( "C:\\Program Files\\7-Zip\\7z.dll" );
+ #elif defined( _WIN32 )
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch
new file mode 100644
index 0000000000..b1bf6923f2
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch
@@ -0,0 +1,41 @@
+From d504abaf2b0a514193f52df42098bc16de4718b2 Mon Sep 17 00:00:00 2001
+From: Oz <rik20@live.it>
+Date: Fri, 17 Jan 2025 21:23:59 +0100
+Subject: [PATCH] Fix int8_t storage in BitPropVariant on Arm architectures
+
+Upstream-Status: Backport [https://github.com/rikyoz/bit7z/commit/d504abaf2b0a514193f52df42098bc16de4718b2]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ include/bit7z/bitwindows.hpp | 4 ++++
+ src/bitpropvariant.cpp       | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/include/bit7z/bitwindows.hpp b/include/bit7z/bitwindows.hpp
+index 5849b956..2f29a989 100644
+--- a/include/bit7z/bitwindows.hpp
++++ b/include/bit7z/bitwindows.hpp
+@@ -126,7 +126,11 @@ struct PROPVARIANT {
+     WORD wReserved2;
+     WORD wReserved3;
+     union {
++#if defined( __arm__ ) || defined( __aarch64__ )
++        signed char cVal;
++#else
+         char cVal;
++#endif
+         unsigned char bVal;
+         short iVal;
+         unsigned short uiVal;
+diff --git a/src/bitpropvariant.cpp b/src/bitpropvariant.cpp
+index 1e7f094f..642e1268 100644
+--- a/src/bitpropvariant.cpp
++++ b/src/bitpropvariant.cpp
+@@ -157,7 +157,7 @@ BitPropVariant::BitPropVariant( uint64_t value ) noexcept: PROPVARIANT() {
+ BitPropVariant::BitPropVariant( int8_t value ) noexcept: PROPVARIANT() {
+     vt = VT_I1;
+     wReserved1 = 0;
+-    cVal = static_cast< char >( value );
++    cVal = static_cast< decltype(cVal) >( value );
+ }
+ 
+ BitPropVariant::BitPropVariant( int16_t value ) noexcept: PROPVARIANT() {
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-reinterpret-cast-compiler-errors.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-reinterpret-cast-compiler-errors.patch
new file mode 100644
index 0000000000..08b64f4999
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-reinterpret-cast-compiler-errors.patch
@@ -0,0 +1,52 @@
+From bedeec4d57d29be7de91697277ace00ba87d3e75 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Tue, 1 Apr 2025 15:23:51 +0200
+Subject: [PATCH] Fix reinterpret-cast compiler errors
+
+Building on 32-bit arm, following warning/error occurs:
+
+src/internal/windows.cpp: In function 'bit7z::OLECHAR* AllocStringBuffer(LPCSTR, uint32_t)':
+src/internal/windows.cpp:79:6: error: cast from 'unsigned char*' to 'bstr_prefix_t*' {aka 'unsigned int*'} increases required alignment of target type [-Werror=cast-align]
+   79 |     *reinterpret_cast< bstr_prefix_t* >( bstrBuffer ) = byteLength;
+      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+git/src/internal/windows.cpp:83:19: error: cast from 'unsigned char*' to 'bit7z::BSTR' {aka 'wchar_t*'} increases required alignment of target type [-Werror=cast-align]
+   83 |     BSTR result = reinterpret_cast< BSTR >( bstrBuffer + sizeof( bstr_prefix_t ) );
+      |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+cc1plus: all warnings being treated as errors
+
+Fix it by using the desired variable size right away and thus avoid
+casting to an array with different alignment.
+
+Upstream-Status: Backport [https://github.com/rikyoz/bit7z/commit/b2789ea9b0fbb2a74dbf6764ddb72d60659a3bce]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ src/internal/windows.cpp | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/internal/windows.cpp b/src/internal/windows.cpp
+index 9304aed7..7bee5959 100644
+--- a/src/internal/windows.cpp
++++ b/src/internal/windows.cpp
+@@ -68,19 +68,18 @@ auto AllocStringBuffer( LPCSTR str, uint32_t byteLength ) -> BSTR {
+ 
+     // Allocating memory for storing the BSTR as a byte array.
+     // NOLINTNEXTLINE(cppcoreguidelines-no-malloc, cppcoreguidelines-owning-memory)
+-    auto* bstrBuffer = static_cast< byte_t* >( std::calloc( bufferSize, sizeof( byte_t ) ) );
++    auto* bstrBuffer = static_cast< bstr_prefix_t* >( std::calloc( bufferSize, sizeof( byte_t ) ) );
+ 
+     if ( bstrBuffer == nullptr ) { // Failed to allocate memory for the BSTR buffer.
+         return nullptr;
+     }
+ 
+     // Storing the number of bytes of the BSTR as a prefix of it.
+-    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+-    *reinterpret_cast< bstr_prefix_t* >( bstrBuffer ) = byteLength;
++    *bstrBuffer = byteLength;
+ 
+     // The actual BSTR must point after the byteLength prefix.
+     // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic, cppcoreguidelines-pro-type-reinterpret-cast)
+-    BSTR result = reinterpret_cast< BSTR >( bstrBuffer + sizeof( bstr_prefix_t ) );
++    BSTR result = reinterpret_cast< BSTR >( bstrBuffer + 1 );
+     if ( str != nullptr ) {
+         // Copying byte-by-byte the input string to the BSTR.
+         // Note: flawfinder warns about not checking for buffer overflows; this is a false alarm,
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-tests-with-musl.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-tests-with-musl.patch
new file mode 100644
index 0000000000..b1f3d0f2ec
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-tests-with-musl.patch
@@ -0,0 +1,51 @@
+From bc5f2e5af90854c8f84b5829493dd01facf9af84 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Mon, 7 Apr 2025 16:29:32 +0200
+Subject: [PATCH] Fix tests with musl
+
+Upstream-Status: Submitted [https://github.com/rikyoz/bit7z/pull/292]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ tests/src/test_bitexception.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/tests/src/test_bitexception.cpp b/tests/src/test_bitexception.cpp
+index 7161fcc5..d85d430d 100644
+--- a/tests/src/test_bitexception.cpp
++++ b/tests/src/test_bitexception.cpp
+@@ -49,6 +49,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays)
+     { HRESULT_WIN32_TEST( ERROR_OPEN_FAILED ),
+ #ifdef _WIN32
+       "The system cannot open the device or file specified.",
++#elif defined( __linux__ ) && !defined ( __GLIBC__ )
++      "I/O error",
+ #else
+         "Input/output error",
+ #endif
+@@ -67,6 +69,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays)
+     { HRESULT_WIN32_TEST( ERROR_SEEK ),
+ #ifdef _WIN32
+       "The drive cannot locate a specific area or track on the disk.",
++#elif defined( __linux__ ) && !defined ( __GLIBC__ )
++      "I/O error",
+ #else
+         "Input/output error",
+ #endif
+@@ -74,6 +78,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays)
+     { HRESULT_WIN32_TEST( ERROR_READ_FAULT ),
+ #ifdef _WIN32
+       "The system cannot read from the specified device.",
++#elif defined( __linux__ ) && !defined ( __GLIBC__ )
++      "I/O error",
+ #else
+         "Input/output error",
+ #endif
+@@ -81,6 +87,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays)
+     { HRESULT_WIN32_TEST( ERROR_WRITE_FAULT ),
+ #ifdef _WIN32
+       "The system cannot write to the specified device.",
++#elif defined( __linux__ ) && !defined ( __GLIBC__ )
++      "I/O error",
+ #else
+         "Input/output error",
+ #endif
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-dependency-inclusion.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-dependency-inclusion.patch
new file mode 100644
index 0000000000..1b0dfa1eb1
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-dependency-inclusion.patch
@@ -0,0 +1,29 @@
+From 5e23482b89dfbed025eb5e505aba6420512bd9c3 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Tue, 1 Apr 2025 11:31:38 +0200
+Subject: [PATCH] cmake: disable dependency inclusion
+
+In Yocto we don't download dependencies, they are satisfied from
+sysroot.
+This cmake file would try to download dependency management tool CPM
+even if all dependencies are satisfied.
+
+Upstream-Status: Inappropriate [OE-specific]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5378bb3..5916025 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -194,7 +194,7 @@ include( cmake/BuildOptions.cmake )
+ include( cmake/CompilerOptions.cmake )
+ 
+ # dependencies
+-include( cmake/Dependencies.cmake )
++#include( cmake/Dependencies.cmake )
+ 
+ # 7-zip source code
+ target_link_libraries( ${LIB_TARGET} PRIVATE 7-zip )
diff --git a/meta-oe/recipes-extended/7zip/bit7z/run-ptest b/meta-oe/recipes-extended/7zip/bit7z/run-ptest
new file mode 100644
index 0000000000..dd1776cab6
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/run-ptest
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Disabled tests:
+# "winapi: Allocating BSTR string from nullptr C strings"
+#   this test is memory hungry, it allocates 800MB chunks
+#   it succeeds when there is enough free RAM, but most machines don't have it
+
+if /usr/lib/bit7z/ptest/bit7z-tests ~"winapi: Allocating BSTR string from nullptr C strings"; then
+    echo "PASS: bit7z-tests"
+else
+    echo "FAIL: bit7z-tests"
+fi
+
+if /usr/lib/bit7z/ptest/bit7z-tests-public; then
+    echo "PASS: bit7z-tests-public"
+else
+    echo "FAIL: bit7z-tests-public"
+fi
diff --git a/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb b/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb
new file mode 100644
index 0000000000..033461d614
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb
@@ -0,0 +1,88 @@
+SUMMARY = "A C++ static library offering a clean and simple interface to the 7-Zip shared libraries"
+HOMEPAGE = "https://github.com/rikyoz/bit7z"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=48a3fe23ed1353e0995dadfda05ffdb6"
+
+SRC_URI = " \
+    git://github.com/rikyoz/bit7z.git;protocol=https;branch=master \
+    ${@bb.utils.contains('PTEST_ENABLED', '1', d.getVar('SRC_URI_PTEST'), 'file://0001-cmake-disable-dependency-inclusion.patch', d)} \
+    file://0001-Fix-reinterpret-cast-compiler-errors.patch \
+    file://0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch \
+    file://0001-Allow-running-tests-on-target-when-cross-compiling.patch \
+    file://0001-Allow-specifying-path-to-7z-library-in-tests.patch \
+    file://0001-Fix-tests-with-musl.patch \
+"
+
+SRCREV = "386e00ad3286e7a10e5bb6d05a5b41b523fce623"
+
+# ptest dependencies and their revisions
+SRC_URI_PTEST = " \
+    git://github.com/rikyoz/filesystem.git;protocol=https;branch=glibcxx_wchar_streams_workaround;name=filesystem;destsuffix=filesystem \
+    git://github.com/rikyoz/bit7z-test-data.git;protocol=https;branch=main;name=testdata;destsuffix=testdata \
+    git://github.com/catchorg/Catch2.git;protocol=https;branch=v2.x;name=catch2;destsuffix=catch2;tag=${TAG_catch2} \
+    https://github.com/cpm-cmake/CPM.cmake/releases/download/v${TAG_CPM}/CPM.cmake;downloadfilename=CPM_${TAG_CPM}.cmake \
+    file://run-ptest \
+"
+SRCREV_FORMAT = "${@bb.utils.contains('PTEST_ENABLED', '1', 'default_filesystem_testdata_catch2', 'default', d)}"
+SRCREV_filesystem = "983650f374699e3979f9cdefe13ddff60bd4ac68"
+SRCREV_testdata = "077e407b1c07b7443626b5902eeb4819388bf656"
+SRCREV_catch2 = "182c910b4b63ff587a3440e08f84f70497e49a81"
+TAG_catch2 = "v2.13.10"
+SRCHASH_CPM = "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d"
+TAG_CPM = "0.40.2"
+SRC_URI[sha256sum] = "${SRCHASH_CPM}"
+
+
+inherit cmake ptest
+
+DEPENDS = "7zip"
+
+EXTRA_OECMAKE += "-DBIT7Z_CUSTOM_7ZIP_PATH=${STAGING_INCDIR}/7zip"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
+PACKAGECONFIG[tests] = " \
+    -DBIT7Z_BUILD_TESTS=ON -DBIT7Z_DISABLE_USE_STD_FILESYSTEM=ON \
+    -DBIT7Z_TESTS_USE_SYSTEM_7ZIP=OFF -DBIT7Z_TESTS_7Z_LIBRARY_PATH=${libdir}/lib7z.so \
+    -DBIT7Z_TESTS_DATA_DIR_TARGET=${PTEST_PATH}/data \
+    -DCPM_SOURCE_CACHE=${B}/cpm_cache -DFETCHCONTENT_SOURCE_DIR_BIT7Z-TEST-DATA=${UNPACKDIR}/testdata -DFETCHCONTENT_SOURCE_DIR_CATCH2=${B}/catch2 \
+"
+
+do_configure:prepend() {
+    # verify that all dependencies have correct version
+    grep -q ${SRCREV_filesystem} ${S}/cmake/Dependencies.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_filesystem'!"
+    grep -q ${SRCREV_testdata} ${S}/tests/CMakeLists.txt || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_testdata'!"
+    grep -q ${TAG_catch2} ${S}/tests/cmake/Catch2.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_catch2'!"
+    grep -q ${SRCHASH_CPM} ${S}/cmake/Dependencies.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCHASH_CPM'!"
+
+    if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then
+        # use cache instead of download for CPM (CMake's missing package manager)
+        mkdir -p ${B}/cmake
+        cp ${UNPACKDIR}/CPM_${TAG_CPM}.cmake ${B}/cmake
+        mkdir -p ${B}/cpm_cache/ghc_filesystem
+        cp -r ${UNPACKDIR}/filesystem ${B}/cpm_cache/ghc_filesystem/fbcc9a9e94e6365273cf51294173f21ff5efdb4f
+        # avoid buildpaths issue as unpackdir is not in prefix maps
+        cp -r ${UNPACKDIR}/catch2 ${B}
+    fi
+}
+do_configure[cleandirs] += "${B}"
+
+do_install() {
+    install -d ${D}${libdir}
+    install -m 0644 ${S}/lib/*/*.a ${D}${libdir}
+
+    install -d ${D}${includedir}/${BPN}
+    install -m 0644 ${S}/include/${BPN}/*.hpp ${D}${includedir}/${BPN}
+}
+
+do_install_ptest() {
+    install -m 0755 ${S}/bin/*/* ${D}${PTEST_PATH}
+    install -d ${D}${PTEST_PATH}/data
+    cp -r ${UNPACKDIR}/testdata/test_archives ${UNPACKDIR}/testdata/test_filesystem ${B}/tests/data/test_filesystem ${D}${PTEST_PATH}/data
+}
+
+# this package contains static library so main package is empty, but ptest package rdepends on it
+ALLOW_EMPTY:${PN} = "1"
+# these are loaded via dlopen, so need explicit rdepends
+RDEPENDS:${PN}-ptest += "libstdc++ 7zip"
+# test data contains various file types with different architectures
+INSANE_SKIP:${PN}-ptest += "arch"
diff --git a/meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch b/meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch
new file mode 100644
index 0000000000..e3d0477930
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch
@@ -0,0 +1,53 @@
+From fd0d54f96576a8ff572bb7c7d28df6b097f99a30 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Wed, 18 Dec 2024 16:38:11 +0800
+Subject: [PATCH] support yocto cross compiling
+
+Remove -s from $LFLAGS_STRIP, do not strip binary to workaournd
+Yocto build warning
+...
+WARNING: 7zip-native-24.09-r0 do_populate_sysroot: File 'tmp/work/x86_64-linux/
+7zip-native/24.09/recipe-sysroot-native/usr/lib/7z.so' from 7zip-native was already stripped,
+this will prevent future debugging!
+...
+
+Apply CC, CXX from environments
+
+Upstream-Status: Inappropriate [Yocto specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ CPP/7zip/7zip_gcc.mak | 2 +-
+ CPP/7zip/var_gcc.mak  | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+--- a/CPP/7zip/7zip_gcc.mak
++++ b/CPP/7zip/7zip_gcc.mak
+@@ -45,7 +45,7 @@ CFLAGS_DEBUG = -g
+ else
+ CFLAGS_DEBUG = -DNDEBUG
+ ifneq ($(CC), $(CROSS_COMPILE)clang)
+-LFLAGS_STRIP = -s
++LFLAGS_STRIP =
+ endif
+ endif
+ 
+--- a/CPP/7zip/var_gcc.mak
++++ b/CPP/7zip/var_gcc.mak
+@@ -6,7 +6,5 @@ IS_ARM64=
+ CROSS_COMPILE=
+ MY_ARCH=
+ USE_ASM=
+-CC=$(CROSS_COMPILE)gcc
+-CXX=$(CROSS_COMPILE)g++
+ 
+ # -march=armv8-a+crc+crypto
+--- a/CPP/7zip/var_clang.mak
++++ b/CPP/7zip/var_clang.mak
+@@ -6,6 +6,4 @@ IS_ARM64=
+ CROSS_COMPILE=
+ MY_ARCH=
+ USE_ASM=
+-CC=$(CROSS_COMPILE)clang
+-CXX=$(CROSS_COMPILE)clang++
+ USE_CLANG=1
diff --git a/meta-oe/recipes-extended/7zip/files/7z_wrapper.sh b/meta-oe/recipes-extended/7zip/files/7z_wrapper.sh
new file mode 100755
index 0000000000..af5b9b393a
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/files/7z_wrapper.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+realpath=`readlink -fn $0`
+realdir=`dirname $realpath`
+exec $realdir/7z.real "$@"
diff --git a/meta-oe/recipes-extended/beep/beep_1.4.12.bb b/meta-oe/recipes-extended/beep/beep_1.4.12.bb
index a4bc10c366..a8d720d9dd 100644
--- a/meta-oe/recipes-extended/beep/beep_1.4.12.bb
+++ b/meta-oe/recipes-extended/beep/beep_1.4.12.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https;branch=master \
            file://0001-beep-library-Make-it-compatible-with-c99.patch"
 SRCREV = "11453a79f2cea81832329b06ca3a284aa7a0a52e"
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "prefix='${prefix}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
 
diff --git a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb
index 178a5eb0b5..397829c87b 100644
--- a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb
+++ b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb
@@ -18,8 +18,9 @@ SRC_URI = "https://github.com/mellowcandle/bitwise/releases/download/v${PV}/bitw
 SRC_URI[sha256sum] = "806271fa5bf31de0600315e8720004a8f529954480e991ca84a9868dc1cae97e"
 
 UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases"
+UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/${BPN}-v${PV}"
+S = "${UNPACKDIR}/${BPN}-v${PV}"
 
 DEPENDS = "ncurses readline"
 
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
index 4e35283dd2..b2cfd9b874 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
@@ -41,7 +41,6 @@ inherit gettext autotools pkgconfig features_check systemd
 
 REQUIRED_DISTRO_FEATURES += "opengl"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += "\
     --enable-libraries \
@@ -77,6 +76,10 @@ do_install:prepend() {
         mkdir -p ${D}${sysconfdir}/default
 }
 
+do_install:append() {
+        sed -i -e 's#${S}##g' ${D}${includedir}/boinc/svn_version.h
+}
+
 SYSTEMD_SERVICE:${PN} = "boinc-client.service"
 
 FILES:${PN} += "${libdir}/systemd"
diff --git a/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb b/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb
index 83f44833b6..411f8a7610 100644
--- a/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb
+++ b/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb
@@ -7,9 +7,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
 
 SRC_URI = "git://github.com/google/brotli.git;branch=master;protocol=https"
-SRCREV= "ed738e842d2fbdf2d6459e39267a633c4a9b2f5d"
+SRCREV = "ed738e842d2fbdf2d6459e39267a633c4a9b2f5d"
 
-S = "${WORKDIR}/git"
 
 inherit cmake lib_package
 
@@ -20,4 +19,4 @@ do_install:append () {
         done
 }
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
index f761ccbdc8..53aabd6035 100644
--- a/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
+++ b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
@@ -24,16 +24,19 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
 
 Update for 20210201
 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+
+Update for 20241231
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
 ---
  aclocal.m4 |   1 -
  configure  | 259 -----------------------------------------------------
  2 files changed, 260 deletions(-)
 
 diff --git a/aclocal.m4 b/aclocal.m4
-index 832d0c8..63b03f2 100644
+index 5c83bbd..ab3ffe7 100644
 --- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -1421,7 +1421,6 @@ CF_GCC_VERSION
+@@ -1762,7 +1762,6 @@ CF_GCC_VERSION
  CF_ACVERSION_CHECK(2.52,
         [AC_PROG_CC_STDC],
         [CF_ANSI_CC_REQD])
@@ -42,20 +45,20 @@ index 832d0c8..63b03f2 100644
  dnl ---------------------------------------------------------------------------
  dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19
 diff --git a/configure b/configure
-index cb47b4c..c72b6e4 100755
+index da9a5c5..65ee092 100755
 --- a/configure
 +++ b/configure
-@@ -2144,265 +2144,6 @@ esac
+@@ -2152,265 +2152,6 @@ esac
  # This should have been defined by AC_PROG_CC
  : "${CC:=cc}"
  
--echo "$as_me:2147: checking \$CFLAGS variable" >&5
+-echo "$as_me:2155: checking \$CFLAGS variable" >&5
 -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 -case "x$CFLAGS" in
 -(*-[IUD]*)
--       echo "$as_me:2151: result: broken" >&5
+-       echo "$as_me:2159: result: broken" >&5
 -echo "${ECHO_T}broken" >&6
--       { echo "$as_me:2153: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+-       { echo "$as_me:2161: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
 -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
 -       cf_flags="$CFLAGS"
 -       CFLAGS=
@@ -163,22 +166,22 @@ index cb47b4c..c72b6e4 100755
 -       done
 -       ;;
 -(*)
--       echo "$as_me:2261: result: ok" >&5
+-       echo "$as_me:2269: result: ok" >&5
 -echo "${ECHO_T}ok" >&6
 -       ;;
 -esac
 -
--echo "$as_me:2266: checking \$CC variable" >&5
+-echo "$as_me:2274: checking \$CC variable" >&5
 -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 -case "$CC" in
 -(*[\ \ ]-*)
--       echo "$as_me:2270: result: broken" >&5
+-       echo "$as_me:2278: result: broken" >&5
 -echo "${ECHO_T}broken" >&6
--       { echo "$as_me:2272: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+-       { echo "$as_me:2280: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 -       # humor him...
 -       cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
--       cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
+-       cf_flags=`echo "$CC" | sed -e "s%^$cf_prog%%"`
 -       CC="$cf_prog"
 -       for cf_arg in $cf_flags
 -       do
@@ -291,26 +294,26 @@ index cb47b4c..c72b6e4 100755
 -       done
 -       test -n "$verbose" && echo "    resulting CC: '$CC'" 1>&6
 -
--echo "${as_me:-configure}:2389: testing resulting CC: '$CC' ..." 1>&5
+-echo "${as_me:-configure}:2397: testing resulting CC: '$CC' ..." 1>&5
 -
 -       test -n "$verbose" && echo "    resulting CFLAGS: '$CFLAGS'" 1>&6
 -
--echo "${as_me:-configure}:2393: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+-echo "${as_me:-configure}:2401: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 -
 -       test -n "$verbose" && echo "    resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 -
--echo "${as_me:-configure}:2397: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+-echo "${as_me:-configure}:2405: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 -
 -       ;;
 -(*)
--       echo "$as_me:2401: result: ok" >&5
+-       echo "$as_me:2409: result: ok" >&5
 -echo "${ECHO_T}ok" >&6
 -       ;;
 -esac
 -
- echo "$as_me:2406: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ echo "$as_me:2414: checking whether ${MAKE-make} sets \${MAKE}" >&5
  echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 -- 
-2.34.1
+2.43.0
 
diff --git a/meta-oe/recipes-extended/byacc/byacc_20230219.bb b/meta-oe/recipes-extended/byacc/byacc_20241231.bb
index 614bcaf646..8d74dbb83e 100644
--- a/meta-oe/recipes-extended/byacc/byacc_20230219.bb
+++ b/meta-oe/recipes-extended/byacc/byacc_20241231.bb
@@ -4,7 +4,7 @@
 # Setting to PD as this is what the upstream has it as.
 
 LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=b56b7454f5f865de2e6e35ee2185b461"
+LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=6a728308869d7a7901618a5bcb970f7e"
 require byacc.inc
 
-SRC_URI[sha256sum] = "36b972a6d4ae97584dd186925fbbc397d26cb20632a76c2f52ac7653cd081b58"
+SRC_URI[sha256sum] = "192c2fae048d4e7f514ba451627f9c4e612765099f819c19191f9fde3e609673"
diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb
new file mode 100644
index 0000000000..26c80195b0
--- /dev/null
+++ b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb
@@ -0,0 +1,29 @@
+
+SUMMARY = "CANopenTerm is a versatile software tool to analyse and \
+          configure CANopen devices. \
+          "
+DESCRIPTION = "CANopenTerm is an open-source software tool designed for the \
+              development, testing, and analysis of CANopen CC networks and \
+              devices.  It extends its capabilities to support other CAN CC \
+              protocols, including SAE J1939 and OBD-II. \
+              "
+HOMEPAGE = "https://canopenterm.de"
+BUGTRACKER = "https://github.com/CANopenTerm/CANopenTerm/issues"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=10e84ea70e8c3a1fbc462f5424806474"
+
+DEPENDS = "cjson libinih virtual/libsdl2 lua libsocketcan pocketpy"
+
+SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main"
+
+SRCREV  = "e0760b2e9657907e691be4df384ca7617109635d"
+
+
+inherit cmake ptest
+
+EXTRA_OECMAKE += "-DBUILD_YOCTO=ON"
+
+FILES:${PN} += "${bindir}/CANopenTerm ${bindir}/codb2json ${datadir}"
+
+RDEPENDS:${PN} = "cjson libinih libsdl2 lua libsocketcan pocketpy"
diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.5.bb
index 68d4042554..1baacac03d 100644
--- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.0.bb
+++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.5.bb
@@ -22,12 +22,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bb843e794feb6890f7697637b461c36e"
 
 SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
            "
-#SRC_URI[md5sum] = "5df2f85c75efc351ffadebcc11046a98"
-SRC_URI[sha256sum] = "013ebe68599915cedb4bf753b471713d91901a991623358b9a967d9a779bcc16"
+SRC_URI[sha256sum] = "0adcfcf36d47317776ad64331058a4d2e3669683314716ddb885f8a13309f47d"
+
+UPSTREAM_CHECK_URI = "https://github.com/cfengine/masterfiles/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit autotools
 
-export EXPLICIT_VERSION="${PV}"
+export EXPLICIT_VERSION = "${PV}"
 
 EXTRA_OECONF = "--prefix=${datadir}/cfengine"
 
diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb
index 6fa5d2743a..de20f585b0 100644
--- a/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb
+++ b/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb
@@ -22,12 +22,11 @@ SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BPN}-commu
            file://0001-Fixed-with-libxml2-no-case-in-configure.ac.patch \
            file://set-path-of-default-config-file.patch \
            "
-#SRC_URI[md5sum] = "5318e40702bc66a3ece44ec4ad77712b"
 SRC_URI[sha256sum] = "911778ddb0a4e03a3ddfc8fc0f033136e1551849ea2dcbdb3f0f14359dfe3126"
 
 inherit autotools-brokensep systemd
 
-export EXPLICIT_VERSION="${PV}"
+export EXPLICIT_VERSION = "${PV}"
 
 SYSTEMD_SERVICE:${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \
                          cf-runalerts.service cf-execd.service \
diff --git a/meta-oe/recipes-extended/cmatrix/cmatrix/0001-reproducibility-Prevent-configuration-from-reading-h.patch b/meta-oe/recipes-extended/cmatrix/cmatrix/0001-reproducibility-Prevent-configuration-from-reading-h.patch
new file mode 100644
index 0000000000..1353728dd5
--- /dev/null
+++ b/meta-oe/recipes-extended/cmatrix/cmatrix/0001-reproducibility-Prevent-configuration-from-reading-h.patch
@@ -0,0 +1,58 @@
+From 0a49ed8e949adda11c6268f36a10ac12074cd377 Mon Sep 17 00:00:00 2001
+From: Yoann Congal <yoann.congal@smile.fr>
+Date: Tue, 1 Apr 2025 23:42:39 +0200
+Subject: [PATCH] reproducibility: Prevent configuration from reading host
+ directories
+
+Current code choose where to install fonts based on what directory
+exists on build host. This is not reproducible.
+
+Remove the existence check and change the lists to the one matching
+OpenEmbedded paths.
+
+Upstream-Status: Inappropriate [embedded specific]
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+---
+ CMakeLists.txt | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5548b3..a2f8b4d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,8 +7,8 @@ set(VERSION "2.0")
+ 
+ # These are relative to CMAKE_INSTALL_PREFIX
+ # which by default is "/usr/local"
+-set(CONSOLE_FONTS_DIRS "share/consolefonts" "lib/kbd/consolefonts")
+-set(X_FONTS_DIRS "lib/X11/fonts/misc" "X11R6/lib/X11/fonts/misc" "share/fonts/X11/misc")
++set(CONSOLE_FONTS_DIRS "${CMAKE_INSTALL_DATAROOTDIR}/consolefonts")
++set(X_FONTS_DIRS "${CMAKE_INSTALL_LIBDIR}/X11/fonts/misc" "${CMAKE_INSTALL_DATAROOTDIR}/fonts/X11/misc")
+ 
+ set(MKFONTDIR "/usr/bin/mkfontdir")
+ 
+@@ -47,16 +47,13 @@ install(TARGETS cmatrix DESTINATION bin)
+ 
+ if     (UNIX)
+        foreach    (CONSOLE_FONTS_DIR ${CONSOLE_FONTS_DIRS})
+-               if     (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CONSOLE_FONTS_DIR}")
+                        message(STATUS "Installing matrix console fonts to ${CMAKE_INSTALL_PREFIX}/${CONSOLE_FONTS_DIR}")
+                        install(FILES
+                                "${CMAKE_SOURCE_DIR}/matrix.fnt"
+                                "${CMAKE_SOURCE_DIR}/matrix.psf.gz"
+                                DESTINATION "${CONSOLE_FONTS_DIR}")
+-               endif  ()
+        endforeach ()
+        foreach    (X_FONTS_DIR ${X_FONTS_DIRS})
+-               if     (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}")
+                        message(STATUS "Installing matrix X window fonts to ${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}")
+                        install(FILES
+                                "${CMAKE_SOURCE_DIR}/mtx.pcf"
+@@ -67,7 +64,6 @@ if     (UNIX)
+                                "execute_process(COMMAND \"${MKFONTDIR}\" \"${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}\")")
+                        install(CODE
+                                "message(STATUS \"If this is the first time you have installed CMatrix you will probably have to restart X window in order to use the mtx.pcf font.\")")
+-               endif  ()
+        endforeach ()
+ endif  ()
+ 
diff --git a/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb b/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb
index 6b6acf1be8..e1a6af622b 100644
--- a/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb
+++ b/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb
@@ -3,12 +3,14 @@ SUMMARY = "Terminal based 'The Matrix' screen implementation"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "git://github.com/abishekvashok/cmatrix.git;branch=stable;protocol=https"
+SRC_URI = " \
+    git://github.com/abishekvashok/cmatrix.git;branch=stable;protocol=https \
+    file://0001-reproducibility-Prevent-configuration-from-reading-h.patch \
+"
 SRCREV = "adfdf1656f23e5ab3b52c7d7edf91249a4477e8d"
-S = "${WORKDIR}/git"
 
 inherit cmake
 
 DEPENDS += "ncurses"
 
-FILES:${PN} += "${datadir}/* ${libdir}/kbd/*"
+FILES:${PN} += "${datadir}/* ${libdir}/kbd/* ${libdir}/X11/fonts/"
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-cmpi-bindings-Fix-build-error-with-gcc14.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-cmpi-bindings-Fix-build-error-with-gcc14.patch
deleted file mode 100644
index 750d10a5f1..0000000000
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-cmpi-bindings-Fix-build-error-with-gcc14.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9e4063a9a3fb2fab69d906902a8432da2544654b Mon Sep 17 00:00:00 2001
-From: Lei Maohui <leimaohui@fujitsu.com>
-Date: Tue, 11 Jun 2024 01:38:55 +0000
-Subject: [PATCH] cmpi-bindings: Fix build error with gcc14.
-
-The build error is as the following:
-
-| build-daily-2/tmp/work/aarch64-ubinux-linux/cmpi-bindings/1.0.4/git/swig/python/../../src/target_python.c:168:21: error: passing argument 1 of 'Py_SetProgramName' from incompatible pointer type [-Wincompatible-pointer-types]
-|   168 |   Py_SetProgramName("cmpi_swig");
-|       |                     ^~~~~~~~~~~
-|       |                     |
-|       |                     char *
-| build-daily-2/tmp/work/aarch64-ubinux-linux/cmpi-bindings/1.0.4/recipe-sysroot/usr/include/python3.12/pylifecycle.h:37:56: note: expected 'const wchar_t *' {aka 'const unsigned int *'} but argument is of type 'char *'
-|    37 | Py_DEPRECATED(3.11) PyAPI_FUNC(void) Py_SetProgramName(const wchar_t *);
-|       |        
-
-Upstream-Status: Submitted
-Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
----
- src/target_python.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/target_python.c b/src/target_python.c
-index a8dfd30..69a2515 100644
---- a/src/target_python.c
-+++ b/src/target_python.c
-@@ -154,6 +154,7 @@ cleanup:
- static int
- PyGlobalInitialize(const CMPIBroker* broker, CMPIStatus* st)
- {
-+  const wchar_t proname[] = L"cmpi_swig";
- /*  _SBLIM_TRACE(1,("<%d/0x%x> PyGlobalInitialize() called", getpid(), pthread_self())); */
-   
-   if (_TARGET_INIT)
-@@ -165,7 +166,7 @@ PyGlobalInitialize(const CMPIBroker* broker, CMPIStatus* st)
-   
-   _SBLIM_TRACE(1,("<%d/0x%x> Python: Loading", getpid(), pthread_self()));
-   
--  Py_SetProgramName("cmpi_swig");
-+  Py_SetProgramName(proname);
-   Py_Initialize();
- #if PY_MAJOR_VERSION < 3
-   SWIGEXPORT void SWIG_init(void);
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb
index cc88602532..da710eaedb 100644
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb
@@ -6,22 +6,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064"
 SECTION = "Development/Libraries"
 DEPENDS = "swig-native sblim-cmpi-devel python3-setuptools-native"
 
-SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=master \
+SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=main \
            file://cmpi-bindings-0.4.17-no-ruby-perl.patch \
            file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \
            file://0001-Fix-error.patch \
-           file://0001-cmpi-bindings-Fix-build-error-with-gcc14.patch \
            "
 
-SRCREV = "69077ee4d249816ed428155fc933dca424167e77"
-S = "${WORKDIR}/git"
+SRCREV = "49d6dcfc71ca421100fcf325e31625817c469fc9"
 
 inherit cmake python3targetconfig
 
 EXTRA_OECMAKE = "-DLIB='${baselib}' \
                  -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \
                  -DPYTHON_ABI=${PYTHON_ABI} \
-                 -DBUILD_PYTHON3=YES \
+                 -DBUILD_PYTHON3=NO \
                  -DPython3_SITE_DIR=${PYTHON_SITEPACKAGES_DIR} \
                  "
 
@@ -29,7 +27,11 @@ EXTRA_OECMAKE = "-DLIB='${baselib}' \
 # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$)
 OECMAKE_GENERATOR = "Unix Makefiles"
 
-FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*"
+FILES:${PN} =+ "${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*"
 FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so"
 
 BBCLASSEXTEND = "native"
+
+# http://errors.yoctoproject.org/Errors/Details/766910/
+# cmpi-bindings/1.0.4/git/swig/python/../../src/target_python.c:168:21: error: passing argument 1 of 'Py_SetProgramName' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb
index df36b64695..36aad73b19 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb
@@ -16,7 +16,6 @@ SRC_URI = "https://collectd.org/files/collectd-${PV}.tar.bz2 \
            file://0006-libcollectdclient-Fix-string-overflow-errors.patch \
            file://0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch \
            "
-SRC_URI[md5sum] = "2b23a65960bc323d065234776a542e04"
 SRC_URI[sha256sum] = "5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6"
 
 inherit autotools python3native update-rc.d pkgconfig systemd
@@ -53,6 +52,7 @@ PACKAGECONFIG[ldap] = "--enable-openldap --with-libldap,--disable-openldap --wit
 PACKAGECONFIG[rrdtool] = "--enable-rrdtool,--disable-rrdtool,rrdtool"
 PACKAGECONFIG[rrdcached] = "--enable-rrdcached,--disable-rrdcached,rrdtool"
 PACKAGECONFIG[python] = "--enable-python,--disable-python"
+PACKAGECONFIG[dpdk] = "--with-libdpdk,--without-libdpdk,dpdk"
 
 EXTRA_OECONF = " \
                 ${FPLAYOUT} \
diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.28.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.29.1.bb
index 0863fc1209..99c7d06706 100644
--- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.28.bb
+++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.29.1.bb
@@ -6,12 +6,12 @@ HOMEPAGE = "http://www.gnu.org/software/ddrescue/ddrescue.html"
 SECTION = "console"
 LICENSE = "GPL-2.0-or-later"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=cca7f74ec83b7a9ce7ccd195aad471bd \
                     file://main_common.cc;beginline=5;endline=16;md5=ad099df052bdd8297f490712285069da \
                     "
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz"
-SRC_URI[sha256sum] = "6626c07a7ca1cc1d03cad0958522c5279b156222d32c342e81117cfefaeb10c1"
+SRC_URI[sha256sum] = "ddd7d45df026807835a2ec6ab9c365df2ef19e8de1a50ffe6886cd391e04dd75"
 
 # This isn't already added by base.bbclass
 do_unpack[depends] += "lzip-native:do_populate_sysroot"
diff --git a/meta-oe/recipes-extended/dialog/dialog_1.3-20240307.bb b/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb
index a497175364..7c596371e5 100644
--- a/meta-oe/recipes-extended/dialog/dialog_1.3-20240307.bb
+++ b/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb
@@ -9,10 +9,10 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
 SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz"
-SRC_URI[sha256sum] = "339d311c6abb240213426b99ad63565cbcb3e8641ef1989c033e945b754d34ef"
+SRC_URI[sha256sum] = "68406329827b783d0a8959cc20a94c6e1791ac861a27f854e06e9020541816dd"
 
 # hardcoded here for use in dialog-static recipe
-S = "${WORKDIR}/dialog-${PV}"
+S = "${UNPACKDIR}/dialog-${PV}"
 
 inherit autotools-brokensep pkgconfig
 
@@ -29,3 +29,6 @@ do_configure() {
     sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure
     oe_runconf
 }
+do_install:append () {
+        ln -sf ${bindir}/${HOST_SYS}-dialog ${D}${bindir}/${BPN}
+}
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch
new file mode 100644
index 0000000000..335872c40f
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch
@@ -0,0 +1,40 @@
+From bc03f142507da92add8ba325fdf8187d47a7d719 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 13 Dec 2024 16:37:24 +0800
+Subject: [PATCH] CMakeLists.txt: make DLT_WatchdogSec can be set by user
+
+In my test env, WatchdogSec default value 2 is not enough, manually
+changed to 3 is ok. This makes dlt.service/dlt-system.service start
+failed during boot time. So, make DLT_WatchdogSec can be set by user, so
+user can set them to proper value at build time, then service can start
+successfully in boot time.
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+
+Upstream-Status: Backport [https://github.com/COVESA/dlt-daemon/pull/720/commits/bc03f142507da92add8ba325fdf8187d47a7d719]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ systemd/CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
+index 16cbe86b5..659378d16 100644
+--- a/systemd/CMakeLists.txt
++++ b/systemd/CMakeLists.txt
+@@ -18,10 +18,14 @@ if(WITH_SYSTEMD)
+     set(SYSTEMD_CONFIGURATIONS_FILES_DIR ${SYSTEMD_UNITDIR} )
+ 
+     if(WITH_SYSTEMD_WATCHDOG)
+-        set( DLT_WatchdogSec 2 )
++        if(NOT DEFINED DLT_WatchdogSec)
++            set(DLT_WatchdogSec 2 CACHE STRING "Watchdog timeout in seconds")
++        endif()
+         message( STATUS "The systemd watchdog is enabled - timeout is set to ${DLT_WatchdogSec} seconds")
+     else(WITH_SYSTEMD_WATCHDOG)
+-        set( DLT_WatchdogSec 0 )
++        if(NOT DEFINED DLT_WatchdogSec)
++             set(DLT_WatchdogSec 0 CACHE STRING "Watchdog timeout in seconds")
++        endif()
+         message( STATUS "The systemd watchdog is disabled")
+     endif(WITH_SYSTEMD_WATCHDOG)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
index 3d2e4a73f1..8b48d20aac 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \
            file://0004-Modify-systemd-config-directory.patch \
            file://544.patch \
            file://567.patch \
+           file://0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch \
            "
 SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal ', '', d)} \
  dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console \
diff --git a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
index ec0b4da935..71305cc35f 100644
--- a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
+++ b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
@@ -20,7 +20,6 @@ SRC_URI = "\
     git://github.com/docopt/docopt.cpp.git;protocol=https;branch=master \
 "
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb b/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb
index ef016b8683..afa0e4c8fb 100644
--- a/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb
+++ b/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb
@@ -11,6 +11,8 @@ inherit ptest
 
 SRC_URI[sha256sum] = "90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890"
 
+UPSTREAM_CHECK_URI = "https://duktape.org/download"
+
 EXTRA_OEMAKE = "INSTALL_PREFIX='${prefix}' DESTDIR='${D}' LIBDIR='/${baselib}'"
 
 do_compile () {
diff --git a/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb b/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb
index 310081b822..ad2aee4570 100644
--- a/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb
+++ b/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c"
 
 SRCREV = "89c1502b9d40b5cb4a844498b14d74ba1dd559bf"
 SRC_URI = "git://github.com/Yelp/dumb-init;branch=master;protocol=https"
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'"
 
diff --git a/meta-oe/recipes-extended/enscript/enscript/0001-enscript-does-not-build-with-C23-standard.patch b/meta-oe/recipes-extended/enscript/enscript/0001-enscript-does-not-build-with-C23-standard.patch
new file mode 100644
index 0000000000..28f6764319
--- /dev/null
+++ b/meta-oe/recipes-extended/enscript/enscript/0001-enscript-does-not-build-with-C23-standard.patch
@@ -0,0 +1,32 @@
+From 9865262d7287320eba7d2fad2d4fcb12b489fc6c Mon Sep 17 00:00:00 2001
+From: zdohnal <email-is-unavailable>
+Date: Tue, 8 Apr 2025 20:25:47 +0900
+Subject: [PATCH] enscript does not build with C23 standard
+
+* Imported the submitted patch from:
+  https://savannah.gnu.org/bugs/?66845
+  to fix:
+  http://errors.yoctoproject.org/Errors/Details/851187/
+  ../../enscript-1.6.6/compat/regex.c:3565:13: error: too many arguments to function 're_match_2_internal'; expected 0, have 8
+ 3565 |       val = re_match_2_internal (bufp, string1, size1, string2, size2,
+      |             ^~~~~~~~~~~~~~~~~~~  ~~~~
+
+Upstream-Status: Submitted [https://savannah.gnu.org/bugs/?66845]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ compat/regex.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compat/regex.c b/compat/regex.c
+index c6907f3..da28664 100644
+--- a/compat/regex.c
++++ b/compat/regex.c
+@@ -336,7 +336,7 @@ typedef char boolean;
+ #define false 0
+ #define true 1
+ 
+-static int re_match_2_internal ();
++static int re_match_2_internal (struct re_pattern_buffer*, const char*, int, const char*, int, int, struct re_registers*, int);
+ 
+ /* These are the command codes that appear in compiled regular
+    expressions.  Some opcodes are followed by argument bytes.  A
diff --git a/meta-oe/recipes-extended/enscript/enscript/0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch b/meta-oe/recipes-extended/enscript/enscript/0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch
index a080b3aef7..e84c2d3937 100644
--- a/meta-oe/recipes-extended/enscript/enscript/0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch
+++ b/meta-oe/recipes-extended/enscript/enscript/0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch
@@ -3,9 +3,10 @@ From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 2 Sep 2022 21:24:27 -0700
 Subject: [PATCH] getopt: Include string.h for strcmp/stcncmp functions
 
-Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Backport [http://git.savannah.gnu.org/gitweb/?p=enscript.git;a=commit;h=300ecf85a8fe166a39f9dd818945c7b8a970db39]
+Signed-off-by: mark.yang <mark.yang@lge.com>
 ---
  compat/getopt.c | 1 +
  1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb b/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
index 9490ee09dc..4ca7c081ea 100644
--- a/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
+++ b/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
@@ -14,13 +14,13 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
            file://enscript-autoconf.patch \
            file://0001-Fix-builds-with-recent-gettext.patch \
            file://0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch \
+           file://0001-enscript-does-not-build-with-C23-standard.patch \
            "
 
 inherit autotools gettext
 
 EXTRA_OECONF += "PERL='${USRBINPATH}/env perl'"
 
-SRC_URI[md5sum] = "3acc242b829adacabcaf28533f049afd"
 SRC_URI[sha256sum] = "6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb"
 
 RDEPENDS:${PN} = "perl"
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch
new file mode 100644
index 0000000000..87000b663d
--- /dev/null
+++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch
@@ -0,0 +1,33 @@
+From aeb34f58782fb6d06aea4f5cbeccb23a0224466e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 4 Sep 2024 14:54:42 -0700
+Subject: [PATCH] Replacing GPR_ASSERT with c assert
+
+Latest GRPC >= 2.66 has dropped GRPC_ASSERT macro [1]
+
+[1] https://github.com/grpc/grpc/commit/0e23c2259da967a037e839e80cafd62bc6f9f68e
+
+Upstream-Status: Submitted [https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/pull/281]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/v3/Action.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/src/v3/Action.cpp
++++ b/src/v3/Action.cpp
+@@ -2,6 +2,15 @@
+ #include <grpc/support/log.h>
+ #include <grpcpp/support/status.h>
+ #include "etcd/v3/action_constants.hpp"
++#include <cstdlib>
++
++#ifndef GPR_ASSERT
++#define GPR_ASSERT(x)                                             \
++  if (!(x)) {                                                     \
++    fprintf(stderr, "%s:%d assert failed\n", __FILE__, __LINE__); \
++    abort();                                                      \
++}
++#endif
+ 
+ etcdv3::Action::Action(etcdv3::ActionParameters const& params) {
+   parameters = params;
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb
index 88a8ba3469..c3a5a02a3f 100644
--- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb
+++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450"
 SRC_URI = " \
     git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \
     file://0001-include-stdint.h-for-int64_t-types.patch \
+    file://0001-Replacing-GPR_ASSERT-with-c-assert.patch \
 "
 
 SRCREV = "ba6216385fc332b23d95683966824c2b86c2474e"
@@ -15,9 +16,14 @@ inherit cmake
 
 DEPENDS += "grpc protobuf cpprest grpc-native protobuf-native"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON"
 
+do_install:append() {
+        sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${libdir}/cmake/etcd-cpp-api/etcd-targets.cmake
+}
+
 SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
+
+SKIP_RECIPE[etcd-cpp-apiv3] ?= "needs ccpprest which needs websocket does work with boost >= 1.87"
diff --git a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb
index 24e111dea0..dd30543a41 100644
--- a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb
+++ b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb
@@ -15,7 +15,6 @@ SRC_URI = " \
 "
 
 SRCREV = "215b53cf3b48ee761f4c40908b3874b2e5e95e9f"
-UPSTREAM_CHECK_COMMITS = "1"
 
 GO_IMPORT = "go.etcd.io/etcd/v3"
 GO_INSTALL = "src/${GO_IMPORT}/"
@@ -24,7 +23,7 @@ RDEPENDS:${PN}-dev = " \
     bash \
 "
 
-export GO111MODULE="on"
+export GO111MODULE = "on"
 
 inherit go systemd pkgconfig features_check
 
@@ -71,3 +70,4 @@ do_install:append() {
 
 FILES:${PN}:append = " ${sysconfdir}/etcd.d/etcd-existing.conf"
 
+SKIP_RECIPE[etcd] ?= "QA Issue: task do_compile has network enabled"
diff --git a/meta-oe/recipes-extended/figlet/figlet_git.bb b/meta-oe/recipes-extended/figlet/figlet_git.bb
index 9789ac16d4..d226806050 100644
--- a/meta-oe/recipes-extended/figlet/figlet_git.bb
+++ b/meta-oe/recipes-extended/figlet/figlet_git.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1688bcd97b27704f1afcac7336409857"
 SRC_URI = "git://github.com/cmatsuoka/figlet.git;branch=master;protocol=https \
            file://0001-build-add-autotools-support-to-allow-easy-cross-comp.patch"
 SRCREV = "5bbcd7383a8c3a531299b216b0c734e1495c6db3"
-S = "${WORKDIR}/git"
 PV = "2.2.5+git"
 
 inherit autotools
diff --git a/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.5.bb b/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb
index 423c6faf7e..df7a4e2758 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.5.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb
@@ -5,9 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "git://github.com/flatpak/flatpak-xdg-utils.git;protocol=https;branch=main"
 
-SRCREV = "5ba39872f81bf8d98d58c5f8acb86604645be468"
+SRCREV = "05abdd7421688be5835a6b12f2b068086c38d4aa"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.16.0.bb
index 8351e7d655..f99c8ac36a 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak_1.16.0.bb
@@ -4,22 +4,21 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = " \
-    gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \
+    git://github.com/flatpak/flatpak;protocol=https;branch=main \
     file://0001-flatpak-pc-add-pc_sysrootdir.patch \
 "
 
-SRCREV = "925c80f913d69e7ca424428823e1431c4ffb0deb"
+SRCREV = "1440f4faa67ebf69c7559f31d2cab59e6ec6fe2b"
 
-S = "${WORKDIR}/git"
 
-inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native useradd mime features_check
+inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native mime features_check useradd
 
 REQUIRED_DISTRO_FEATURES = "polkit"
 
 DEPENDS = " \
     appstream \
     bison-native \
-    dconf \
+    bubblewrap-native \
     fuse3 \
     gdk-pixbuf \
     glib-2.0 \
@@ -31,14 +30,16 @@ DEPENDS = " \
     ostree \
     polkit \
     python3-pyparsing-native \
+    xdg-dbus-proxy-native \
     zstd \
 "
 
 RDEPENDS:${PN} = " \
     ca-certificates \
-    dconf \
     flatpak-xdg-utils \
     fuse3-utils \
+    bubblewrap \
+    xdg-dbus-proxy \
 "
 
 GIR_MESON_OPTION = "gir"
@@ -49,6 +50,7 @@ GTKDOC_MESON_ENABLE_FLAG = 'enabled'
 GTKDOC_MESON_DISABLE_FLAG = 'disabled'
 
 PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl"
+PACKAGECONFIG[dconf] = "-Ddconf=enabled,-Ddconf=disabled,dconf"
 PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native"
 PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native"
 PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4"
@@ -66,15 +68,13 @@ PACKAGECONFIG ?= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \
 "
 
-EXTRA_OEMESON = "-Dsystem_fusermount=${bindir}/fusermount3"
-
-FILES:${PN} += "${libdir} ${datadir}"
+EXTRA_OEMESON = " \
+    -Dsystem_fusermount=fusermount3 \
+    -Dsystem_bubblewrap=bwrap \
+    -Dsystem_dbus_proxy=xdg-dbus-proxy \
+"
 
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd"
+USERADD_PARAM:${PN} = "--system --no-create-home --user-group --shell /sbin/nologin flatpak"
 
-do_install:append() {
-    chmod 0700 ${D}/${datadir}/polkit-1/rules.d
-    chown polkitd ${D}/${datadir}/polkit-1/rules.d
-    chgrp root ${D}/${datadir}/polkit-1/rules.d
-}
+FILES:${PN} += "${libdir} ${datadir}"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
deleted file mode 100644
index 0cabed9633..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 6a704ab7bf69cd5d6970b3a7d3ae7798b26027c1 Mon Sep 17 00:00:00 2001
-From: Paulo Neves <ptsneves@gmail.com>
-Date: Thu, 28 Jul 2022 11:28:41 +0200
-Subject: [PATCH] CMakeLists.txt Do not use private makefile $< target
-
-$< is a private detail from the Makefile generated by CMakefile and
-are not under control or to be used at the CMakeLists level. In 3.20
-that private generation changed pre-requisite targets[1] and now logs
-contain the path compiler_depend.ts instead of the actual file.
-
-Upstream-Status: Pending [https://github.com/fluent/fluent-bit/issues/5492]
----
- CMakeLists.txt              | 6 +-----
- lib/chunkio/CMakeLists.txt  | 7 +------
- lib/cmetrics/CMakeLists.txt | 7 +------
- 3 files changed, 3 insertions(+), 17 deletions(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,11 +46,7 @@ else()
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
- endif()
- 
--if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
--else()
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
--endif()
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
- 
- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
-   set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic")
---- a/lib/chunkio/CMakeLists.txt
-+++ b/lib/chunkio/CMakeLists.txt
-@@ -14,12 +14,7 @@ else()
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall ")
- endif()
- 
--# Set __FILENAME__
--if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
--else()
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
--endif()
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
- 
- include(cmake/macros.cmake)
- 
---- a/lib/cmetrics/CMakeLists.txt
-+++ b/lib/cmetrics/CMakeLists.txt
-@@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR  3)
- set(CMT_VERSION_PATCH  7)
- set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
- 
--# Define __CMT_FILENAME__ consistently across Operating Systems
--if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
--else()
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
--endif()
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
- 
- # Configuration options
- option(CMT_DEV                       "Enable development mode"                   No)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch
deleted file mode 100644
index 8d89e4df35..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f645128082117a0152a95b3dccd869a184b7513f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 10 Aug 2022 01:23:48 -0700
-Subject: [PATCH 1/2] Use posix strerror_r with musl
-
-Default with glibc is GNU extention of strerror_r
-where as musl uses posix variant, call that out
-
-Upstream-Status: Inappropriate [Need wider porting beyond linux/musl/glibc]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/flb_network.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/flb_network.c b/src/flb_network.c
-index 992eb1d..5d7a337 100644
---- a/src/flb_network.c
-+++ b/src/flb_network.c
-@@ -506,7 +506,12 @@ static int net_connect_async(int fd,
-             }
- 
-             /* Connection is broken, not much to do here */
-+#ifdef __GLIBC__
-             str = strerror_r(error, so_error_buf, sizeof(so_error_buf));
-+#else
-+            strerror_r(error, so_error_buf, sizeof(so_error_buf));
-+           str = so_error_buf;
-+#endif
-             flb_error("[net] TCP connection failed: %s:%i (%s)",
-                       u->tcp_host, u->tcp_port, str);
-             return -1;
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch
new file mode 100644
index 0000000000..32f4fdec51
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch
@@ -0,0 +1,95 @@
+From 7e6295f14ea057562a235fbf6762d867e739a181 Mon Sep 17 00:00:00 2001
+From: Niko Mauno <niko.mauno@vaisala.com>
+Date: Sun, 29 Sep 2024 12:00:00 +0000
+Subject: [PATCH] lib: Do not use private makefile targets in CMakelists.txt
+
+By extending the scope of changes introduced in commit
+fc325524d50fe179b76f127243ab9e03ddbdaaa4
+("build: CMakeLists.txt Do not use private makefile targets (#5819)")
+we mitigate the following error produced by BitBake in Yocto
+
+  ERROR: fluentbit-3.1.9-r0 do_package_qa: QA Issue: File /usr/bin/fluent-bit in package fluentbit contains reference to TMPDIR [buildpaths]
+  ERROR: fluentbit-3.1.9-r0 do_package_qa: Fatal QA errors were found, failing task.
+
+stemming from
+
+  $ strings packages-split/fluentbit/usr/bin/fluent-bit
+  ...
+  $(subst /yocto/upstream/build/tmp/work/cortexa57-poky-linux/fluentbit/3.1.9/git/,,$(abspath $<))
+  ...
+
+Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
+
+Upstream-Status: Submitted [https://github.com/fluent/fluent-bit/pull/9450]
+---
+ lib/cfl/CMakeLists.txt      | 8 ++------
+ lib/cmetrics/CMakeLists.txt | 8 ++------
+ lib/ctraces/CMakeLists.txt  | 8 ++------
+ lib/monkey/CMakeLists.txt   | 4 +---
+ 4 files changed, 7 insertions(+), 21 deletions(-)
+
+--- a/lib/cfl/CMakeLists.txt
++++ b/lib/cfl/CMakeLists.txt
+@@ -40,12 +40,8 @@ if(NOT MSVC)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ endif()
+ 
+-# Define __FILENAME__ consistently across Operating Systems
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+-endif()
++# Define __FILENAME__
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ 
+ 
+ 
+--- a/lib/cmetrics/CMakeLists.txt
++++ b/lib/cmetrics/CMakeLists.txt
+@@ -60,12 +60,8 @@ if(NOT MSVC)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ endif()
+ 
+-# Define __CMT_FILENAME__ consistently across Operating Systems
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
+-endif()
++# Define __CMT_FILENAME__
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
+ 
+ # Configuration options
+ option(CMT_DEV                       "Enable development mode"                   No)
+--- a/lib/ctraces/CMakeLists.txt
++++ b/lib/ctraces/CMakeLists.txt
+@@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR  6)
+ set(CTR_VERSION_PATCH  4)
+ set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}")
+ 
+-# Define __FILENAME__ consistently across Operating Systems
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+-endif()
++# Define __FILENAME__
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ 
+ # Configuration options
+ option(CTR_DEV             "Enable development mode"                   No)
+--- a/lib/monkey/CMakeLists.txt
++++ b/lib/monkey/CMakeLists.txt
+@@ -15,10 +15,8 @@ include(GNUInstallDirs)
+ # Set default compiler options
+ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath \$$<))\"'")
+-else()
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ endif()
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ 
+ # Monkey Version
+ set(MK_VERSION_MAJOR  1)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch
deleted file mode 100644
index e70664031b..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0d22024c5defba7007e3e633753790e20209c6f6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 09:59:41 -0700
-Subject: [PATCH 1/5] monkey: Define _GNU_SOURCE for memmem API check
-
-This define is necessary to get this API on glibc based systems
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/monkey/mk_core/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/monkey/mk_core/CMakeLists.txt b/lib/monkey/mk_core/CMakeLists.txt
-index 0e74f8d..739fff3 100644
---- a/lib/monkey/mk_core/CMakeLists.txt
-+++ b/lib/monkey/mk_core/CMakeLists.txt
-@@ -62,6 +62,7 @@ set(src "${src}"
-   )
- 
- check_c_source_compiles("
-+  #define _GNU_SOURCE
-   #include <string.h>
-   int main() {
-      char  haystack[] = \"1234\";
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
index 425b838b78..025f8729ea 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
@@ -1,4 +1,4 @@
-From 71dab751a27a2e582b711de22873065dd28f4b65 Mon Sep 17 00:00:00 2001
+From c8c9dd3aeb49ab2ec94c3ab081e2368736a5da20 Mon Sep 17 00:00:00 2001
 From: Paulo Neves <ptsneves@gmail.com>
 Date: Thu, 28 Jul 2022 11:42:31 +0200
 Subject: [PATCH] flb_info.h.in: Do not hardcode compilation directories
@@ -13,8 +13,6 @@ Upstream-Status: Pending
  include/fluent-bit/flb_info.h.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/include/fluent-bit/flb_info.h.in b/include/fluent-bit/flb_info.h.in
-index a89485c..2579afc 100644
 --- a/include/fluent-bit/flb_info.h.in
 +++ b/include/fluent-bit/flb_info.h.in
 @@ -23,7 +23,7 @@
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch
deleted file mode 100644
index d911420df2..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c7b969d1a2a6b61bd179214ee2516b7b6cd55b27 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:21:57 -0700
-Subject: [PATCH 2/5] mbedtls: Remove unused variable
-
-Fixes
-library/bignum.c:1395:29: error: variable 't' set but not used [-Werror,-Wunused-but-set-variable]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- lib/mbedtls-2.28.0/library/bignum.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/lib/mbedtls-2.28.0/library/bignum.c b/lib/mbedtls-2.28.0/library/bignum.c
-index 62e7f76..9c256ae 100644
---- a/lib/mbedtls-2.28.0/library/bignum.c
-+++ b/lib/mbedtls-2.28.0/library/bignum.c
-@@ -1392,7 +1392,7 @@ void mpi_mul_hlp( size_t i,
-                   mbedtls_mpi_uint *d,
-                   mbedtls_mpi_uint b )
- {
--    mbedtls_mpi_uint c = 0, t = 0;
-+    mbedtls_mpi_uint c = 0;
- 
- #if defined(MULADDC_HUIT)
-     for( ; i >= 8; i -= 8 )
-@@ -1443,8 +1443,6 @@ void mpi_mul_hlp( size_t i,
-     }
- #endif /* MULADDC_HUIT */
- 
--    t++;
--
-     while( c != 0 )
-     {
-         *d += c; c = ( *d < c ); d++;
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch
new file mode 100644
index 0000000000..909d1be28d
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch
@@ -0,0 +1,36 @@
+From bf4e832544e8aa5866ef57859f95b71bd8811154 Mon Sep 17 00:00:00 2001
+From: Niko Mauno <niko.mauno@vaisala.com>
+Date: Mon, 21 Oct 2024 16:02:46 +0000
+Subject: [PATCH] CMakeLists.txt: Revise init manager deduction
+
+The init manager deduction is not cross-compile friendly, so replace
+the host specific condition checks with placeholders that can be
+replaced in Yocto recipe.
+
+Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
+
+Upstream-Status: Inappropriate [configuration]
+---
+ src/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -569,7 +569,7 @@ if(FLB_BINARY)
+     set(SYSTEMD_UNITDIR  /lib/systemd/system)
+   endif()
+ 
+-  if(SYSTEMD_UNITDIR)
++  if(@INIT_MANAGER_IS_SYSTEMD@)
+     if (FLB_AMAZON_LINUX2)
+       set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
+       configure_file(
+@@ -594,7 +594,7 @@ if(FLB_BINARY)
+       install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
+       install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
+     endif()
+-  elseif(IS_DIRECTORY /usr/share/upstart)
++  elseif(@INIT_MANAGER_IS_UPSTART@)
+     set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
+     configure_file(
+       "${PROJECT_SOURCE_DIR}/init/upstart.in"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch
deleted file mode 100644
index 473ebaf7d4..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2d12629f768d2459b1fc8a8ca0c38024d84bc195 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:32:12 -0700
-Subject: [PATCH 3/5] mbedtls: Disable documentation warning as error with
- clang
-
-There are shortcomings with doxygen info which clang-15+ flags, dont
-treat them as errors
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- lib/mbedtls-2.28.0/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/mbedtls-2.28.0/CMakeLists.txt b/lib/mbedtls-2.28.0/CMakeLists.txt
-index b33c088..c5f886f 100644
---- a/lib/mbedtls-2.28.0/CMakeLists.txt
-+++ b/lib/mbedtls-2.28.0/CMakeLists.txt
-@@ -212,7 +212,7 @@ if(CMAKE_COMPILER_IS_GNU)
- endif(CMAKE_COMPILER_IS_GNU)
- 
- if(CMAKE_COMPILER_IS_CLANG)
--    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
-+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wno-error=documentation")
-     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
-     set(CMAKE_C_FLAGS_ASAN        "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
-     set(CMAKE_C_FLAGS_ASANDBG     "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
deleted file mode 100644
index 158857ae20..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8486b912281ae85db0c9fc05bb546f16872e114c Mon Sep 17 00:00:00 2001
-From: Paulo Neves <ptsneves@gmail.com>
-Date: Thu, 28 Jul 2022 14:37:18 +0200
-Subject: [PATCH] mbedtls: Do not overwrite CFLAGS
-
-bitbake passes CFLAGS that are often in conflict with the ones set
-in mbedtls' CMakeLists.txt. Such conflicts are the inability to use
-FORTIFY_SOURCE=2 except in release mode
-
-Upstream-Status: Inappropriate [due to fluent-bit having it's own Release flags that also overwrite bitbake ones.]
----
- lib/mbedtls-2.28.0/CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/lib/mbedtls-2.28.0/CMakeLists.txt
-+++ b/lib/mbedtls-2.28.0/CMakeLists.txt
-@@ -204,8 +204,6 @@ if(CMAKE_COMPILER_IS_GNU)
-     if (GCC_VERSION VERSION_GREATER 7.0 OR GCC_VERSION VERSION_EQUAL 7.0)
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation")
-     endif()
--    set(CMAKE_C_FLAGS_RELEASE     "-O2")
--    set(CMAKE_C_FLAGS_DEBUG       "-O0 -g3")
-     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
-     set(CMAKE_C_FLAGS_ASAN        "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
-     set(CMAKE_C_FLAGS_ASANDBG     "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
-@@ -215,8 +213,6 @@ endif(CMAKE_COMPILER_IS_GNU)
- 
- if(CMAKE_COMPILER_IS_CLANG)
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
--    set(CMAKE_C_FLAGS_RELEASE     "-O2")
--    set(CMAKE_C_FLAGS_DEBUG       "-O0 -g3")
-     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
-     set(CMAKE_C_FLAGS_ASAN        "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
-     set(CMAKE_C_FLAGS_ASANDBG     "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch
deleted file mode 100644
index bd4276193d..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a797b79483940ed4adcaa5fe2c40dd0487c7c2c7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:39:08 -0700
-Subject: [PATCH 4/5] Use correct type to store return from flb_kv_item_create
-
-Fix
-error: incompatible pointer to integer conversion assigning to 'int' from 'struct flb_kv *'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- plugins/out_stackdriver/stackdriver_conf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/out_stackdriver/stackdriver_conf.c b/plugins/out_stackdriver/stackdriver_conf.c
-index a9a8eb0..e4f969e 100644
---- a/plugins/out_stackdriver/stackdriver_conf.c
-+++ b/plugins/out_stackdriver/stackdriver_conf.c
-@@ -176,12 +176,12 @@ static int read_credentials_file(const char *cred_file, struct flb_stackdriver *
- 
- static int parse_configuration_labels(struct flb_stackdriver *ctx)
- {
--    int ret;
-     char *p;
-     flb_sds_t key;
-     flb_sds_t val;
-     struct mk_list *head;
-     struct flb_slist_entry *entry;
-+    struct flb_kv *ret;
-     msgpack_object_kv *kv = NULL;
- 
-     if (ctx->labels) {
-@@ -216,7 +216,7 @@ static int parse_configuration_labels(struct flb_stackdriver *ctx)
-             flb_sds_destroy(key);
-             flb_sds_destroy(val);
- 
--            if (ret == -1) {
-+            if (!ret) {
-                 return -1;
-             }
-         }
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch
deleted file mode 100644
index f6e3dce2f3..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7a792624925d46690c1f07fe4b194b5f4c510db6 Mon Sep 17 00:00:00 2001
-From: Paulo Neves <ptsneves@gmail.com>
-Date: Tue, 2 Aug 2022 09:57:05 +0200
-Subject: [PATCH 1/1] build: Make systemd init systemd detection contingent on
- pkgconfig
-
-Use pkg-config to get systemd.pc variables and systemdunitdir. Those
-variable ensure that .service files are installed in the correct paths
-and only when systemd is detected.
-
-Upstream-Status: Pending [https://github.com/fluent/fluent-bit/pull/5818]
-
----
- cmake/FindJournald.cmake | 4 ++++
- src/CMakeLists.txt       | 4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/FindJournald.cmake b/cmake/FindJournald.cmake
-index f5a3a832b..9e6657a29 100644
---- a/cmake/FindJournald.cmake
-+++ b/cmake/FindJournald.cmake
-@@ -5,6 +5,8 @@
- #  JOURNALD_INCLUDE_DIR - the Journald include directory
- #  JOURNALD_LIBRARIES - Link these to use Journald
- #  JOURNALD_DEFINITIONS - Compiler switches required for using Journald
-+#  SYSTEMD_UNITDIR - The systemd units' directory
-+#
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- #
-@@ -16,7 +18,9 @@
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- pkg_check_modules(PC_JOURNALD QUIET systemd)
-+pkg_get_variable(PC_SYSTEMD_UNITDIR systemd "systemdsystemunitdir")
- 
-+set(SYSTEMD_UNITDIR ${PC_SYSTEMD_UNITDIR})
- set(JOURNALD_FOUND ${PC_JOURNALD_FOUND})
- set(JOURNALD_DEFINITIONS ${PC_JOURNALD_CFLAGS_OTHER})
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 522bbf9bd..30743d8d6 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -480,13 +480,13 @@ if(FLB_BINARY)
-   endif()
- 
-   # Detect init system, install upstart, systemd or init.d script
--  if(IS_DIRECTORY /lib/systemd/system)
-+  if(DEFINED SYSTEMD_UNITDIR)
-     set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
-     configure_file(
-       "${PROJECT_SOURCE_DIR}/init/systemd.in"
-       ${FLB_SYSTEMD_SCRIPT}
-       )
--    install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION /lib/systemd/system)
-+    install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
-     install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
-   elseif(IS_DIRECTORY /usr/share/upstart)
-     set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch
index bdcc534964..c34a0ba71d 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch
@@ -1,7 +1,7 @@
-From 63dbbad5978e5f5b0e7d42614999cb6b4ebcce10 Mon Sep 17 00:00:00 2001
+From a07df56092e529627db0946c025cb4964567280c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 10 Aug 2022 01:27:16 -0700
-Subject: [PATCH 2/2] chunkio: Link with fts library with musl
+Subject: [PATCH] chunkio: Link with fts library with musl
 
 Fixes
 cio_utils.c:(.text+0x64): undefined reference to `fts_read'
@@ -14,10 +14,10 @@ Upstream-Status: Pending
  1 file changed, 1 insertion(+)
 
 diff --git a/lib/chunkio/src/CMakeLists.txt b/lib/chunkio/src/CMakeLists.txt
-index a4fc2d3..4244eb8 100644
+index bb52273d4..524500919 100644
 --- a/lib/chunkio/src/CMakeLists.txt
 +++ b/lib/chunkio/src/CMakeLists.txt
-@@ -13,6 +13,7 @@ set(src
+@@ -14,6 +14,7 @@ set(src
    )
  
  set(libs cio-crc32)
@@ -25,6 +25,3 @@ index a4fc2d3..4244eb8 100644
  
  if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
    set(src
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch
new file mode 100644
index 0000000000..281bf66fb9
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch
@@ -0,0 +1,31 @@
+From 0c4310483875509f464883fa345f54e0d3ae25a5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 10 Aug 2022 01:23:48 -0700
+Subject: [PATCH] Use posix strerror_r with musl
+
+Default with glibc is GNU extention of strerror_r
+where as musl uses posix variant, call that out
+
+Upstream-Status: Inappropriate [Need wider porting beyond linux/musl/glibc]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Resolved conflicts while upgrading recipe from v1.9.9 to v3.1.9.
+
+Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
+---
+ src/flb_network.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/flb_network.c b/src/flb_network.c
+index 8f8ca33f6..dd098a2ea 100644
+--- a/src/flb_network.c
++++ b/src/flb_network.c
+@@ -605,7 +605,7 @@ static int net_connect_async(int fd,
+             /* Connection is broken, not much to do here */
+ #if ((defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) ||    \
+      (defined(_XOPEN_SOURCE) || _XOPEN_SOURCE - 0L >= 600L)) &&     \
+-  (!defined(_GNU_SOURCE))
++  (!defined(_GNU_SOURCE)) || (!defined(__GLIBC__))
+             ret = strerror_r(error, so_error_buf, sizeof(so_error_buf));
+             if (ret == 0) {
+                 str = so_error_buf;
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch
deleted file mode 100644
index f023ab5732..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27f0bd5a3339612e03112e6b490900a9fabc3337 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:44:25 -0700
-Subject: [PATCH 5/5] stackdriver: Fix return type mismatch
-
-Fix
-error: incompatible integer to pointer conversion returning 'int' from a function with result type 'flb_sds_t' (aka 'char *') [-Wint-conversion]
-            return -1;
-                   ^~
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- plugins/out_stackdriver/stackdriver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/out_stackdriver/stackdriver.c b/plugins/out_stackdriver/stackdriver.c
-index ae66bf2..e01755c 100644
---- a/plugins/out_stackdriver/stackdriver.c
-+++ b/plugins/out_stackdriver/stackdriver.c
-@@ -2033,7 +2033,7 @@ static flb_sds_t stackdriver_format(struct flb_stackdriver *ctx,
-             flb_sds_destroy(operation_producer);
-             msgpack_unpacked_destroy(&result);
-             msgpack_sbuffer_destroy(&mp_sbuf);
--            return -1;
-+            return NULL; 
-         }
- 
-         /* Number of parsed labels */
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch
deleted file mode 100644
index c3f2574d26..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f88d9b82e8bd8ae38fba666b5825ffb41769f81a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 12:25:22 -0700
-Subject: [PATCH] monkey: Fix TLS detection testcase
-
-Clang15 errors out on compiling the check and disables TLS
-
-Fixes errors like
-
-error: call to undeclared function '__tls_get_addr'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-         __tls_get_addr(0);
-         ^
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- lib/monkey/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/monkey/CMakeLists.txt b/lib/monkey/CMakeLists.txt
-index 15e62e8..96ac2bd 100644
---- a/lib/monkey/CMakeLists.txt
-+++ b/lib/monkey/CMakeLists.txt
-@@ -178,6 +178,8 @@ endif()
- # Use old Pthread TLS
- if(NOT MK_PTHREAD_TLS)
-   check_c_source_compiles("
-+     #include <sys/types.h>
-+     extern void *__tls_get_addr(size_t *v);
-      __thread int a;
-      int main() {
-          __tls_get_addr(0);
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch
deleted file mode 100644
index 71bdd34eeb..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c41653e856d05ed430d22f8b311714ff756a0e0b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 23 Mar 2023 18:05:27 -0700
-Subject: [PATCH] cmake: Do not check for upstart on build host
-
-Some ubuntu distros might have this directory /usr/share/upstart around
-and yocto based distros not using systemd will process this piece of
-code and falsely assume that target supports upstart, which may not be
-true in case of cross-compilation.
-
-This also can end up in configure errors e.g.
-
-| CMake Error at src/CMakeLists.txt:496 (install):
-|   install DIRECTORY given unknown argument "/etc/td-agent-bit/".
-|
-|
-| -- Configuring incomplete, errors occurred!
-
-Upstream-Status: Inappropriate [ Cross-compile Specific ]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index bb30b2a..c63b6d8 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -486,14 +486,6 @@ if(FLB_BINARY)
-       )
-     install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
-     install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
--  elseif(IS_DIRECTORY /usr/share/upstart)
--    set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
--    configure_file(
--      "${PROJECT_SOURCE_DIR}/init/upstart.in"
--      ${FLB_UPSTART_SCRIPT}
--      )
--    install(FILES ${FLB_UPSTART_SCRIPT} COMPONENT binary DESTINATION /etc/init)
--    install(DIRECTORY DESTINATION COMPONENT binary ${FLB_INSTALL_CONFDIR})
-   else()
-     # FIXME: should we support Sysv init script ?
-   endif()
--- 
-2.40.0
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb
deleted file mode 100644
index ef04111131..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb
+++ /dev/null
@@ -1,95 +0,0 @@
-SUMMARY = "Fast Log processor and Forwarder"
-DESCRIPTION = "Fluent Bit is a data collector, processor and  \
-forwarder for Linux. It supports several input sources and \
-backends (destinations) for your data. \
-"
-
-HOMEPAGE = "http://fluentbit.io"
-BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
-SECTION = "net"
-
-SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-bit-${PV};downloadfilename=${BPN}-${PV}.tar.gz \
-           file://0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch \
-           file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \
-           file://0003-mbedtls-Do-not-overwrite-CFLAGS.patch \
-           file://0004-build-Make-systemd-init-systemd-detection-contingent.patch \
-           file://0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch \
-           file://0002-mbedtls-Remove-unused-variable.patch \
-           file://0003-mbedtls-Disable-documentation-warning-as-error-with-.patch \
-           file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \
-           file://0005-stackdriver-Fix-return-type-mismatch.patch \
-           file://0006-monkey-Fix-TLS-detection-testcase.patch \
-           file://0007-cmake-Do-not-check-for-upstart-on-build-host.patch \
-           "
-SRC_URI:remove:x86 = "file://0002-mbedtls-Remove-unused-variable.patch"
-SRC_URI:append:libc-musl = "\
-           file://0001-Use-posix-strerror_r-with-musl.patch \
-           file://0002-chunkio-Link-with-fts-library-with-musl.patch \
-           "
-SRC_URI[sha256sum] = "3f6cd4bd1894cda16b465aef6ffec7e920d54c4209b3e2320fcffe7ae345700e"
-S = "${WORKDIR}/fluent-bit-${PV}"
-
-DEPENDS = "zlib bison-native flex-native openssl"
-DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-
-PACKAGECONFIG[yaml] = "-DFLB_CONFIG_YAML=On,-DFLB_CONFIG_YAML=Off,libyaml"
-PACKAGECONFIG[kafka] = "-DFLB_OUT_KAFKA=On,-DFLB_OUT_KAFKA=Off,librdkafka"
-PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=On,-DFLB_EXAMPLES=Off"
-PACKAGECONFIG[jemalloc] = "-DFLB_JEMALLOC=On,-DFLB_JEMALLOC=Off,jemalloc"
-#TODO add more fluentbit options to PACKAGECONFIG[]
-
-DEPENDS:append:libc-musl = " fts "
-
-# flex hardcodes the input file in #line directives leading to TMPDIR contamination of debug sources.
-do_compile:append() {
-    find ${B} -name '*.c' -or -name '*.h' | xargs sed -i -e 's|${TMPDIR}|${TARGET_DBGSRC_DIR}/|g'
-}
-
-PACKAGECONFIG ?= "yaml"
-
-LTO = ""
-
-# Use CMake 'Unix Makefiles' generator
-OECMAKE_GENERATOR ?= "Unix Makefiles"
-
-# Fluent Bit build options
-# ========================
-
-# Host related setup
-EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} -DFLB_TD=1"
-
-# Disable LuaJIT and filter_lua support
-EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off "
-
-# Disable Library and examples
-EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off"
-
-# Enable systemd iff systemd is in DISTRO_FEATURES
-EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','-DFLB_SYSTEMD=Off',d)}"
-
-# Enable release builds
-EXTRA_OECMAKE += "-DFLB_RELEASE=On"
-
-# musl needs these options
-EXTRA_OECMAKE:append:libc-musl = ' -DFLB_JEMALLOC_OPTIONS="--with-jemalloc-prefix=je_ --with-lg-quantum=3" -DFLB_CORO_STACK_SIZE=24576'
-
-EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:mips = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:powerpc = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-
-CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2"
-
-# Fixes build with GCC-14
-CFLAGS += "-Wno-error=incompatible-pointer-types"
-
-inherit cmake systemd pkgconfig
-
-SYSTEMD_SERVICE:${PN} = "td-agent-bit.service"
-
-EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/"
-TARGET_CC_ARCH += " ${SELECTED_OPTIMIZATION}"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb
new file mode 100644
index 0000000000..05e4fd937f
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb
@@ -0,0 +1,151 @@
+SUMMARY = "Fast Log Processor and Forwarder"
+DESCRIPTION = "Fluent Bit allows to collect log events or metrics from \
+different sources, process them and deliver them to different backends \
+such as Fluentd, Elasticsearch, Splunk, DataDog, Kafka, New Relic, Azure \
+services, AWS services, Google services, NATS, InfluxDB or any custom \
+HTTP end-point."
+HOMEPAGE = "http://fluentbit.io"
+BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
+SECTION = "net"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
+DEPENDS = "\
+    bison-native \
+    flex-native \
+    openssl \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+"
+DEPENDS:append:libc-musl = " fts"
+
+SRCREV = "b12e507090273576d1156342780c7c6d358fa579"
+SRC_URI = "\
+    git://github.com/fluent/fluent-bit.git;branch=master;protocol=https \
+    file://0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch \
+    file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \
+    file://0003-CMakeLists.txt-Revise-init-manager-deduction.patch \
+"
+SRC_URI:append:libc-musl = "\
+    file://0004-chunkio-Link-with-fts-library-with-musl.patch \
+    file://0005-Use-posix-strerror_r-with-musl.patch \
+"
+
+# prefix tag with "v" to avoid upgrade to random tags like "20220215"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
+
+
+PACKAGECONFIG ??= "\
+    aws \
+    binary \
+    config-yaml \
+    custom-calyptia \
+    http-server \
+    inotify \
+    ipo \
+    metrics \
+    parser \
+    prefer-system-libs \
+    profiles \
+    proxy-go \
+    record-accessor \
+    regex \
+    signv4 \
+    sqldb \
+    stream-processor \
+    tls \
+    utf8-encoder \
+"
+# See https://github.com/fluent/fluent-bit/issues/7248#issuecomment-1631280496
+PACKAGECONFIG:remove:toolchain-clang = "ipo"
+
+# Use system libs
+PACKAGECONFIG[prefer-system-libs] = "-DFLB_PREFER_SYSTEM_LIBS=Yes,-DFLB_PREFER_SYSTEM_LIBS=No, nghttp2 c-ares"
+DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs backtrace', 'libbacktrace', '', d)}"
+DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs jemalloc', 'jemalloc', '', d)}"
+DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs luajit', 'luajit', '', d)}"
+
+PACKAGECONFIG[all] = "-DFLB_ALL=Yes,-DFLB_ALL=No"
+PACKAGECONFIG[arrow] = "-DFLB_ARROW=Yes,-DFLB_ARROW=No"
+PACKAGECONFIG[avro-encoder] = "-DFLB_AVRO_ENCODER=Yes,-DFLB_AVRO_ENCODER=No"
+PACKAGECONFIG[aws-error-reporter] = "-DFLB_AWS_ERROR_REPORTER=Yes,-DFLB_AWS_ERROR_REPORTER=No"
+PACKAGECONFIG[aws] = "-DFLB_AWS=Yes,-DFLB_AWS=No"
+PACKAGECONFIG[backtrace] = "-DFLB_BACKTRACE=Yes,-DFLB_BACKTRACE=No"
+PACKAGECONFIG[binary] = "-DFLB_BINARY=Yes,-DFLB_BINARY=No"
+PACKAGECONFIG[chunk-trace] = "-DFLB_CHUNK_TRACE=Yes,-DFLB_CHUNK_TRACE=No"
+PACKAGECONFIG[config-yaml] = "-DFLB_CONFIG_YAML=Yes,-DFLB_CONFIG_YAML=No,libyaml"
+PACKAGECONFIG[custom-calyptia] = "-DFLB_CUSTOM_CALYPTIA=Yes,-DFLB_CUSTOM_CALYPTIA=No"
+PACKAGECONFIG[enforce-alignment] = "-DFLB_ENFORCE_ALIGNMENT=Yes,-DFLB_ENFORCE_ALIGNMENT=No"
+PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=Yes,-DFLB_EXAMPLES=No"
+PACKAGECONFIG[http-client-debug] = "-DFLB_HTTP_CLIENT_DEBUG=Yes,-DFLB_HTTP_CLIENT_DEBUG=No"
+PACKAGECONFIG[http-server] = "-DFLB_HTTP_SERVER=Yes,-DFLB_HTTP_SERVER=No"
+PACKAGECONFIG[inotify] = "-DFLB_INOTIFY=Yes,-DFLB_INOTIFY=No"
+PACKAGECONFIG[ipo] = "-DFLB_IPO=Yes,-DFLB_IPO=no"
+PACKAGECONFIG[jemalloc] = "-DFLB_JEMALLOC=Yes,-DFLB_JEMALLOC=No,jemalloc"
+PACKAGECONFIG[luajit] = "-DFLB_LUAJIT=Yes,-DFLB_LUAJIT=No"
+PACKAGECONFIG[metrics] = "-DFLB_METRICS=Yes,-DFLB_METRICS=No"
+PACKAGECONFIG[mtrace] = "-DFLB_MTRACE=Yes,-DFLB_MTRACE=No"
+PACKAGECONFIG[parser] = "-DFLB_PARSER=Yes,-DFLB_PARSER=No"
+PACKAGECONFIG[posix-tls] = "-DFLB_POSIX_TLS=Yes,-DFLB_POSIX_TLS=No"
+PACKAGECONFIG[profiles] = "-DFLB_PROFILES=Yes,-DFLB_PROFILES=No"
+PACKAGECONFIG[proxy-go] = "-DFLB_PROXY_GO=Yes,-DFLB_PROXY_GO=No"
+PACKAGECONFIG[record-accessor] = "-DFLB_RECORD_ACCESSOR=Yes,-DFLB_RECORD_ACCESSOR=No"
+PACKAGECONFIG[regex] = "-DFLB_REGEX=Yes,-DFLB_REGEX=No"
+PACKAGECONFIG[run-ldconfig] = "-DFLB_RUN_LDCONFIG=Yes,-DFLB_RUN_LDCONFIG=No"
+PACKAGECONFIG[shared-lib] = "-DFLB_SHARED_LIB=Yes,-DFLB_SHARED_LIB=No"
+PACKAGECONFIG[signv4] = "-DFLB_SIGNV4=Yes,-DFLB_SIGNV4=No"
+PACKAGECONFIG[sqldb] = "-DFLB_SQLDB=Yes,-DFLB_SQLDB=No"
+PACKAGECONFIG[stream-processor] = "-DFLB_STREAM_PROCESSOR=Yes,-DFLB_STREAM_PROCESSOR=No"
+PACKAGECONFIG[tests-runtime] = "-DFLB_TESTS_RUNTIME=Yes,-DFLB_TESTS_RUNTIME=No"
+PACKAGECONFIG[tls] = "-DFLB_TLS=Yes,-DFLB_TLS=No"
+PACKAGECONFIG[trace] = "-DFLB_TRACE=Yes,-DFLB_TRACE=No"
+PACKAGECONFIG[utf8-encoder] = "-DFLB_UTF8_ENCODER=Yes,-DFLB_UTF8_ENCODER=No"
+PACKAGECONFIG[valgrind] = "-DFLB_VALGRIND=Yes,-DFLB_VALGRIND=No,valgrind"
+PACKAGECONFIG[wamrc] = "-DFLB_WAMRC=Yes,-DFLB_WAMRC=No"
+PACKAGECONFIG[wasm-stack-protect] = "-DFLB_WASM_STACK_PROTECT=Yes,-DFLB_WASM_STACK_PROTECT=No"
+PACKAGECONFIG[wasm] = "-DFLB_WASM=Yes,-DFLB_WASM=No"
+PACKAGECONFIG[windows-defaults] = "-DFLB_WINDOWS_DEFAULTS=Yes,-DFLB_WINDOWS_DEFAULTS=No"
+
+# Option to disable all Fluent Bit plugins by default. See cmake/plugins_options.cmake which
+# individual plugins then to enable (e.g. using EXTRA_OECMAKE:append = " -DFLB_FOOBAR=ON")
+PACKAGECONFIG[minimal] = "-DFLB_MINIMAL=Yes,-DFLB_MINIMAL=No"
+
+PACKAGECONFIG[in-kafka] = "-DFLB_KAFKA=ON -DFLB_IN_KAFKA=ON,-DFLB_KAFKA=OFF -DFLB_IN_KAFKA=OFF,librdkafka curl"
+PACKAGECONFIG[out-kafka] = "-DFLB_KAFKA=ON -DFLB_OUT_KAFKA=ON,-DFLB_KAFKA=OFF -DFLB_OUT_KAFKA=OFF,librdkafka curl"
+
+SYSTEMD_SERVICE:${PN} = "fluent-bit.service"
+
+inherit cmake systemd pkgconfig
+
+# disable manipulation of compiler flags and CMAKE_BUILD_TYPE
+# release and coverage are off by default, disable also debug
+EXTRA_OECMAKE += "-DFLB_DEBUG=No"
+
+FULL_OPTIMIZATION:remove = "${@'-O2' if bb.data.inherits_class('clang', d) else ''}"
+TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION}"
+TARGET_CC_ARCH:remove = "-D_FORTIFY_SOURCE=2"
+EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/"
+
+SECURITY_STRINGFORMAT:remove = "${@bb.utils.contains('PACKAGECONFIG', 'aws-error-reporter', '-Werror=format-security', '', d)}"
+
+# GCC-15 uses C23 std and it does not yet compile with C23
+CFLAGS += "-std=gnu17"
+# 64bit atomics builtins do not exist in compiler on these arches
+LDFLAGS:append:mips = " -latomic"
+LDFLAGS:append:powerpc = " -latomic"
+LDFLAGS:append:riscv32 = " -latomic"
+LDFLAGS:append:riscv64 = " -latomic"
+LDFLAGS:append:x86 = " -latomic"
+
+do_configure:prepend() {
+    sed -i \
+        -e 's#@INIT_MANAGER_IS_SYSTEMD@#'${@'TRUE' if d.getVar('INIT_MANAGER') == 'systemd' else 'FALSE'}'#' \
+        -e 's#@INIT_MANAGER_IS_UPSTART@#'${@'TRUE' if d.getVar('INIT_MANAGER') == 'upstart' else 'FALSE'}'#' \
+        ${S}/src/CMakeLists.txt
+}
+
+# flex hardcodes the input file in #line directives leading to TMPDIR contamination of debug sources.
+do_compile:append() {
+    find ${B} -name '*.c' -or -name '*.h' | xargs sed -i -e 's|${TMPDIR}|${TARGET_DBGSRC_DIR}/|g'
+}
+
+# needed for shared-lib package config
+FILES:${PN} += "${libdir}/fluent-bit"
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
index a293048a21..679b1a7e98 100644
--- a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
@@ -5,11 +5,10 @@ HOMEPAGE = "http://www.gnuplot.info/"
 SECTION = "console/scientific"
 LICENSE = "gnuplot"
 LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f"
-DEPENDS = "${BPN}-native virtual/libx11 gd readline"
+DEPENDS = "${BPN}-native gd readline"
 
-inherit autotools features_check pkgconfig
+inherit autotools pkgconfig
 # depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz;name=archive \
            http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
@@ -38,10 +37,11 @@ do_install:class-native() {
     rm ${D}${bindir}/*.o
 }
 
-PACKAGECONFIG ??= "cairo"
+PACKAGECONFIG ??= "cairo ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango"
 PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua"
 PACKAGECONFIG[qt5] = "--with-qt --with-qt5nativesysroot=${STAGING_DIR_NATIVE},--without-qt,qtbase-native qtbase qtsvg qttools-native"
+PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11"
 
 EXTRA_OECONF = " \
     --with-readline=${STAGING_LIBDIR}/.. \
diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.19.bb
index 97c354aba8..69de5628c4 100644
--- a/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb
+++ b/meta-oe/recipes-extended/haveged/haveged_1.9.19.bb
@@ -4,13 +4,11 @@ DESCRIPTION = "The haveged project is an attempt to provide an easy-to-use, unpr
 HOMEPAGE = "https://www.issihosts.com/haveged/index.html"
 
 LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-# v1.9.17
-SRCREV = "80ee9289569bc13efff4e0b5db3661cb513802b2"
+SRCREV = "0ef7dd915ee8be4ca2bb10b5cc2bee92b8ede61d"
 SRC_URI = "git://github.com/jirka-h/haveged.git;branch=master;protocol=https \
 "
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://github.com/jirka-h/haveged/releases"
 
diff --git a/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb b/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb
index d2b23b41b4..2299d55b2b 100644
--- a/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb
+++ b/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/pixel/hexedit.git;branch=master;protocol=https \
 
 SRCREV = "eab92dcaa34b66bc5182772afc9fda4ac8a27597"
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep update-alternatives
 
diff --git a/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch b/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch
new file mode 100644
index 0000000000..ecc9c441c5
--- /dev/null
+++ b/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch
@@ -0,0 +1,75 @@
+From b06541a75043c9a8213187fca942a0270783bd0e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 17 Sep 2024 18:22:36 +0000
+Subject: [PATCH] Add cmake check for deducing 32bit or 64bit RISCV
+
+Currently its only compilable for RV64 when RVV is
+enabled, this will extend it to build for RV32 with
+RVV as well
+
+Upstream-Status: Submitted [https://github.com/google/highway/pull/2330]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 38 +++++++++++++++++++++++++++++++++++---
+ 1 file changed, 35 insertions(+), 3 deletions(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,6 +59,33 @@ if(CHECK_PIE_SUPPORTED)
+   endif()
+ endif()
+ 
++if (CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "RISCV32|RISCV64|RISCV128" OR CMAKE_SYSTEM_PROCESSOR MATCHES "riscv32|riscv64|riscv128")
++  include(CheckCSourceCompiles)
++  check_c_source_compiles("
++  #if __riscv_xlen == 64
++  int main() { return 0; }
++  #else
++  #error Not RISCV-64
++  #endif
++  " IS_RISCV_XLEN_64)
++
++  check_c_source_compiles("
++  #if __riscv_xlen == 32
++  int main() { return 0; }
++  #else
++  #error Not RISCV-32
++  #endif
++  " IS_RISCV_XLEN_32)
++
++  if(IS_RISCV_XLEN_32)
++    set(RISCV_XLEN 32)
++  elseif(IS_RISCV_XLEN_64)
++    set(RISCV_XLEN 64)
++  else()
++    message(WARNING "Unable to determine RISC-V XLEN")
++  endif()
++endif()
++
+ include(GNUInstallDirs)
+ 
+ if (NOT CMAKE_BUILD_TYPE)
+@@ -72,7 +99,7 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set c
+ # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard.
+ set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?")
+ 
+-# Currently this will compile the entire codebase with `-march=rv64gcv1p0`:
++# Currently this will compile the entire codebase with `-march=rv<XLEN>gcv1p0`:
+ set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?")
+ 
+ # Unconditionally adding -Werror risks breaking the build when new warnings
+@@ -378,7 +405,13 @@ else()
+     # we add the gcv compiler flag, which then requires the CPU (now when using
+     # either compiler) to support V.
+     if(HWY_CMAKE_RVV)
+-      list(APPEND HWY_FLAGS -march=rv64gcv1p0)
++      if(RISCV_XLEN EQUAL 64)
++        list(APPEND HWY_FLAGS -march=rv64gcv1p0)
++        add_link_options(-march=rv64gcv1p0)
++      elseif(RISCV_XLEN EQUAL 32)
++        list(APPEND HWY_FLAGS -march=rv32gcv1p0)
++        add_link_options(-march=rv32gcv1p0)
++      endif()
+       if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+         list(APPEND HWY_FLAGS -menable-experimental-extensions)
+       endif()
diff --git a/meta-oe/recipes-extended/highway/highway_1.2.0.bb b/meta-oe/recipes-extended/highway/highway_1.2.0.bb
index 5d74941245..ea38310398 100644
--- a/meta-oe/recipes-extended/highway/highway_1.2.0.bb
+++ b/meta-oe/recipes-extended/highway/highway_1.2.0.bb
@@ -6,12 +6,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9"
 
 inherit cmake
 
-SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master \
+           file://0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch"
 
 SRCREV = "457c891775a7397bdb0376bb1031e6e027af1c48"
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release"
+
 CXXFLAGS:append:arm = " -mfp16-format=ieee"
 # Option not supported with clang and its default format for __fp16 anyway with clang
 CXXFLAGS:remove:toolchain-clang = "-mfp16-format=ieee"
diff --git a/meta-oe/recipes-extended/hiredis/hiredis/run-ptest b/meta-oe/recipes-extended/hiredis/hiredis/run-ptest
index 8d450b881f..8b352c3401 100644
--- a/meta-oe/recipes-extended/hiredis/hiredis/run-ptest
+++ b/meta-oe/recipes-extended/hiredis/hiredis/run-ptest
@@ -2,17 +2,17 @@
 
 TEST_SSL=0 TEST_ASYNC=0 ./test.sh | sed -e 's/PASSED/PASS/g' -e 's/FAILED/FAIL/g' -e 's/SKIPPED/SKIP/g' | awk '
 {
-    if ($NF == "\033[0;32mPASS\033[0;0m" || $NF == "\033[0;31mFAIL\033[0;0m" || $NF == "\033[01;33mSKIP\033[0;0m") {
+    gsub(/\x1B\[[0-9;]*m/, "")
+    if ($NF == "PASS" || $NF == "FAIL" || $NF == "SKIP") {
         printf "%s: %s\n", $NF, $0
     } else {
         print
     }
-}'| awk '{
-    if ($NF == "\033[0;32mPASS\033[0;0m" || $NF == "\033[0;31mFAIL\033[0;0m" || $NF == "\033[01;33mSKIP\033[0;0m") {
+}' | awk '{
+    if ($NF == "PASS" || $NF == "FAIL" || $NF == "SKIP") {
         $NF = ""
         print $0
     } else {
-    print
-    }       
+        print
+    }
 }' | awk '{gsub(/:/,"",$NF)}1'
-
diff --git a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb
index d081242736..8678447cf5 100644
--- a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb
+++ b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb
@@ -10,7 +10,6 @@ SRC_URI = " \
     "
 SRCREV = "60e5075d4ac77424809f855ba3e398df7aacefe8"
 
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
@@ -35,5 +34,5 @@ do_install_ptest() {
 
 FILES:${PN}-dev += "${datadir}/hiredis_ssl ${prefix}/build"
 
-RDEPENDS:${PN} = "redis"
+RDEPENDS:${PN} = "virtual-redis"
 RDEPENDS:${PN}-ptest = "${@bb.utils.contains('PACKAGECONFIG', 'testssl', 'openssl-bin', '', d)}"
diff --git a/meta-oe/recipes-extended/hplip/hplip/0001-Fix-upstream-CFLAGS-override.patch b/meta-oe/recipes-extended/hplip/hplip/0001-Fix-upstream-CFLAGS-override.patch
new file mode 100644
index 0000000000..c8c892c5e1
--- /dev/null
+++ b/meta-oe/recipes-extended/hplip/hplip/0001-Fix-upstream-CFLAGS-override.patch
@@ -0,0 +1,68 @@
+From 297e517d302469fa27dd96c091021b53f9ac2254 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 26 Apr 2024 14:17:54 -0600
+Subject: [PATCH] Fix upstream CFLAGS override
+
+Upstream check for python clears OS build system CFLAGS
+
+Upstream-Status: Submitted [https://bugs.launchpad.net/hplip/+bug/1879445]
+---
+ configure.in | 36 +++++++++++++++++++++++-------------
+ 1 file changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index ebea052..80c4618 100644
+--- a/configure.in
++++ b/configure.in
+@@ -628,20 +628,31 @@ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$hpcu
+    fi
+ fi
+ 
+-SAVE_CPPFLAGS="$CPPFLAGS"
+-CFLAGS=`python-config --includes`
+-if [ $? -eq 0 ] 
+-then
+-   echo $FLAGS
+-else
+-CFLAGS=`python3-config --includes`
+-   if [ $? -eq 0 ]
+-   then
+-   echo $FLAGS
+-   fi
++AC_PATH_PROG(python3_config_path, python3-config, [AC_MSG_ERROR([python3-config not installed], 6)])
++
++PYTHON_INCLUDES=`$python3_config_path --includes`
++if test "X$PYTHON_INCLUDES" == "X" ; then
++  AC_MSG_ERROR([Cannot get Python includes via python3-config], 6)
++fi
++
++PYTHON_LIBS=`$python3_config_path --libs`
++if test "X$PYTHON_LIBS" == "X" ; then
++  AC_MSG_ERROR([Cannot get Python libs via python3-config], 6)
++fi
++
++SAVE_CFLAGS=$CFLAGS
++SAVE_LIBS=$LIBS
++
++CFLAGS="$CFLAGS $PYTHON_INCLUDES"
++LIBS="$LIBS $PYTHON_LIBS"
++
++AC_TRY_LINK(,[ ], AC_MSG_RESULT(yes); python_includes="ok", AC_MSG_ERROR([no: PYTHON DISABLED], 6))
++
++if test "X$python_includes" != "Xok" ; then
++  CFLAGS="$SAVE_CFLAGS"
++  LIBS="$SAVE_LIBS"
+ fi
+ 
+-#CFLAGS=`(python-config --includes)`
+ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups_only_build" = "no"; then
+    AC_ARG_VAR([PYTHON], [Python interpreter/compiler command])
+    AC_CHECK_PROGS(PYTHON,[python python3 python2])
+@@ -664,7 +675,6 @@ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite
+    AS_IF([test "x$FOUND_HEADER" != "xyes"],
+           [AC_MSG_ERROR([cannot find python-devel support], 6)])
+ fi
+-CFLAGS="$save_CFLAGS"
+ 
+ if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then
+    AC_CHECK_LIB([sane], [sane_open], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find sane-backends-devel support (or --disable-scan-build)], 12)])
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
index be420b4837..ffc18d90c6 100644
--- a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
+++ b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
@@ -1,5 +1,5 @@
 SUMMARY = "HP Linux Imaging and Printing"
-LICENSE="GPL-2.0-only"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=20f2c819499cc2063e9a7b07b408815c"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
@@ -16,18 +16,16 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch \
            file://0006-Workaround-patch-for-missing-Python3-transition-of-t.patch \
            file://0001-Fix-installing-ipp-usb-quirk.patch \
-           file://0001-Drop-using-register-storage-classifier.patch"
+           file://0001-Drop-using-register-storage-classifier.patch \
+           file://0001-Fix-upstream-CFLAGS-override.patch"
 SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/p/hplip/activity"
+
 DEPENDS += "cups python3 libusb1 python3-setuptools-native"
 
 inherit autotools-brokensep python3-dir python3native python3targetconfig pkgconfig systemd
 
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-CFLAGS += "-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}"
-
 EXTRA_OECONF += "\
         --enable-cups-drv-install \
         --enable-cups-ppd-install \
@@ -74,7 +72,8 @@ RDEPENDS:${PN} += " \
 "
 RDEPENDS:${PN}-filter += "perl ghostscript"
 
-FILES:${PN} += "${datadir}/ipp-usb/quirks/HPLIP.conf"
+FILES:${PN} += "${datadir}/ipp-usb/quirks/HPLIP.conf \
+        ${systemd_system_unitdir}/hplip-printer@.service"
 FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
 FILES:${PN}-ppd = "${datadir}/ppd"
 FILES:${PN}-cups = "${datadir}/cups"
@@ -84,6 +83,4 @@ FILES:${PN}-hal = "${datadir}/hal"
 
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so"
 
-SYSTEMD_SERVICE:${PN} = "hplip-printer@.service"
-
 CLEANBROKEN = "1"
diff --git a/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch b/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch
index c5e210afcd..994f252a15 100644
--- a/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch
+++ b/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch
@@ -1,4 +1,4 @@
-From c2a67c1f62175ab061bc03d10dd766f968c6a097 Mon Sep 17 00:00:00 2001
+From 06207b1340963e77f2e5d08ebf9727180ad86a36 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
 Date: Fri, 2 Aug 2019 10:41:26 +0800
 Subject: [PATCH] configure.ac: skip running test program when cross-compiling
@@ -7,12 +7,14 @@ Upstream-Status: Inappropriate [OE-Specific]
 
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 19 ++-----------------
+ 1 file changed, 2 insertions(+), 17 deletions(-)
 
+diff --git a/configure.ac b/configure.ac
+index c4a9b02..3f5a792 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -160,7 +160,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd mem
+@@ -151,7 +151,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd memrchr sysctl sysctlbyname])
  AC_FUNC_SELECT_ARGTYPES
  
  AC_MSG_CHECKING([for strlcpy])
@@ -21,7 +23,7 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
                 char a[2];
                 if (strlcpy(a, "yes", 2) != 3)
                     return 1;]])],
-@@ -176,7 +176,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ
+@@ -167,7 +167,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[
                ])
  
  AC_MSG_CHECKING([for strlcat])
@@ -30,7 +32,7 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
                 char a[4] = "no";
                 if (strlcat(a, "yes", 4) != 5)
                     return 1;]])],
-@@ -191,21 +191,6 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ
+@@ -182,21 +182,6 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[
                             [Define to 1 if you have the strlcat function.])
                ])
  
diff --git a/meta-oe/recipes-extended/icewm/icewm_3.4.5.bb b/meta-oe/recipes-extended/icewm/icewm_3.7.5.bb
index 6e50231c83..cb792dad4b 100644
--- a/meta-oe/recipes-extended/icewm/icewm_3.4.5.bb
+++ b/meta-oe/recipes-extended/icewm/icewm_3.7.5.bb
@@ -5,9 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b"
 SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \
            file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \
            "
-SRC_URI[sha256sum] = "8d1afe9a2d5e28e88261b68906337449307e53f06c08218e1a6409083998a5f1"
+SRC_URI[sha256sum] = "7457ec08fa74a101b077f391d60f901a77919dcc83a2940992f1f88cd7ec840a"
 
 UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit autotools pkgconfig gettext perlnative features_check qemu update-alternatives
 REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta-oe/recipes-extended/indent/indent_2.2.12.bb b/meta-oe/recipes-extended/indent/indent_2.2.12.bb
index 1a7d61abc0..7847b535b3 100644
--- a/meta-oe/recipes-extended/indent/indent_2.2.12.bb
+++ b/meta-oe/recipes-extended/indent/indent_2.2.12.bb
@@ -18,7 +18,6 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0001-Fix-builds-with-recent-gettext.patch \
            file://0001-Remove-dead-paren_level-code.patch \
            "
-SRC_URI[md5sum] = "4764b6ac98f6654a35da117b8e5e8e14"
 SRC_URI[sha256sum] = "e77d68c0211515459b8812118d606812e300097cfac0b4e9fb3472664263bb8b"
 
 inherit autotools gettext texinfo
diff --git a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
index 9bb2e2f1f3..af9fbda9b8 100644
--- a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
+++ b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
@@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d
 
 SRC_URI = "file://inputattach.conf"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/meta-oe/recipes-extended/iotop/iotop_1.26.bb b/meta-oe/recipes-extended/iotop/iotop_1.30.bb
index 9b36b57cb7..9fe774f9f2 100644
--- a/meta-oe/recipes-extended/iotop/iotop_1.26.bb
+++ b/meta-oe/recipes-extended/iotop/iotop_1.30.bb
@@ -1,13 +1,12 @@
 SUMMARY = "A top utility for I/O"
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=686f457fedcecd9b92d69e625291ffa2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3154adaa1a9ca0d8dcc1944518ece1b9"
 
 DEPENDS = "ncurses"
 
-SRC_URI = "git://github.com/Tomas-M/iotop.git;branch=master;protocol=https"
-SRCREV = "b15743b04bb04ff1fc6e197d21ba30365349edcb"
+SRC_URI = "git://github.com/Tomas-M/iotop.git;branch=master;protocol=https;tag=v${PV}"
+SRCREV = "c3366a8a235f9c8ddc4797625f22cfdf12ba2c36"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb
index 5f2993dd4f..fc94d2caab 100644
--- a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb
+++ b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master;protocol=htt
            file://0002-fix-parallel-error.patch \
 "
 
-S = "${WORKDIR}/git"
 inherit python3native
 
 EXTRA_OEMAKE += " \
@@ -31,6 +30,6 @@ RPROVIDES:${BPN}-dbg += "python3-${BPN}-dbg"
 
 FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so"
 
-SRCREV = "3f4c9bd3f21ec9ac75a025dfa3fa30fe3f621831"
+SRCREV = "ed1f54de86b5d507c4cfa552923e9ddfddd9b893"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch b/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch
deleted file mode 100644
index 5eee6f85aa..0000000000
--- a/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687 Mon Sep 17 00:00:00 2001
-From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com>
-Date: Thu, 28 Apr 2022 17:36:54 +0200
-Subject: [PATCH] Fix overwriting linker flags
-
-Upstream-Status: Backport
-[https://github.com/akheron/jansson/commit/fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687]
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 39b9ad365f78..ed33e3c47f70 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -342,7 +342,7 @@ if(JANSSON_BUILD_SHARED_LIBS)
-    )
-       list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
-       if (VSCRIPT_WORKS)
--         set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
-+         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
-       endif()
-    endif()
- 
--- 
-2.35.1
-
diff --git a/meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch b/meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch
new file mode 100644
index 0000000000..a1c17d1d8e
--- /dev/null
+++ b/meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch
@@ -0,0 +1,29 @@
+From e5c38614fb7e0bdbcaec6db6133fa62cfed62818 Mon Sep 17 00:00:00 2001
+From: Jaeyoon Jung <jaeyoon.jung@lge.com>
+Date: Wed, 15 Jan 2025 22:11:54 +0900
+Subject: [PATCH] Only export symbols starting with "json_" and "jansson_" for
+ cmake
+
+It's already done by the commit 7c707a7 and bcb6b6f, but not for cmake.
+This makes symbols in the same visibility as built with libtool.
+
+Upstream-Status: Submitted [https://github.com/akheron/jansson/pull/704]
+Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3394236..52b9934 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -325,6 +325,9 @@ if(JANSSON_BUILD_SHARED_LIBS)
+ # some linkers may only support --version-script
+       file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/jansson.sym" "JANSSON_${JANSSON_SOVERSION} {
+     global:
++          json_*;
++          jansson_*;
++    local:
+           *;
+ };
+ ")
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.14.bb b/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb
index 833060686a..715b1af5c5 100644
--- a/meta-oe/recipes-extended/jansson/jansson_2.14.bb
+++ b/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb
@@ -2,16 +2,16 @@ SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON d
 HOMEPAGE = "http://www.digip.org/jansson/"
 BUGTRACKER = "https://github.com/akheron/jansson/issues"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d9911525d4128bee234ee2d3ccaa2537"
 
 SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \
-           file://0001-Fix-overwriting-linker-flags.patch \
            file://0001-Honour-multilib-paths.patch \
+           file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \
            "
-SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9"
+SRC_URI[sha256sum] = "6bd82d3043dadbcd58daaf903d974891128d22aab7dada5d399cb39094af49ce"
 
 UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\.tar"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
index bfa0e79d8f..7129d6ef8c 100644
--- a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
+++ b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
@@ -7,7 +7,6 @@ PV = "2.3.6+git"
 SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=https;branch=master"
 SRCREV = "bc1d4f6587a4a4829b5d55e3ca7ad584da6de545"
 
-S = "${WORKDIR}/git"
 
 do_compile() {
         oe_runmake
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
index 6b60d89187..f3f70b8da3 100644
--- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
+++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/rnovacek/konkretcmpi.git;branch=master;protocol=http
            "
 
 SRCREV = "ad28225e6eceff88417a60c1ba8896c8e40f21a7"
-S = "${WORKDIR}/git"
 
 inherit cmake python3-dir
 
@@ -24,8 +23,6 @@ EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
                  ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
                 "
 
-LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
-
 do_install:append() {
     rm -rf ${D}${datadir}
 }
diff --git a/meta-oe/recipes-extended/lastlog2/files/0001-remove-lto-to-fix-link-error-of-clang.patch b/meta-oe/recipes-extended/lastlog2/files/0001-remove-lto-to-fix-link-error-of-clang.patch
deleted file mode 100644
index 71c3de9748..0000000000
--- a/meta-oe/recipes-extended/lastlog2/files/0001-remove-lto-to-fix-link-error-of-clang.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 692523d2f8bf0ce893a781761154db4277f0fceb Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <wangmy@fujitsu.com>
-Date: Wed, 19 Jul 2023 07:11:15 +0000
-Subject: remove lto to fix link error of clang
-
-error message:
-| tests/tst-y2038-64bit-time_t.p/tst-y2038-64bit-time_t.c.o: file not recognized: file format not recognized
-| clang-16: error: linker command failed with exit code 1 (use -v to see invocation)
-
-Upstream-Status: Pending
-
-Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index c521577..13d993b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -26,7 +26,6 @@ add_project_arguments(['-D_GNU_SOURCE=1',
-                        '-DPROJECT_VERSION="@0@"'.format(meson.project_version()) ], language : 'c')
- 
- possible_cc_flags = [
--                  '-flto=auto',
-                   '-ffat-lto-objects',
-                  '-fstack-protector-strong',
-                  '-funwind-tables',
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb b/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb
deleted file mode 100644
index 43deac3839..0000000000
--- a/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY = "Y2038 safe version of lastlog"
-HOMEPAGE = "https://github.com/thkukuk/lastlog2"
-DESCRIPTION = "lastlog reports the last login of a given user or of all users who did ever login on a system."
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=020090a00b69dd2af9ab82eb0003ea2c"
-SECTION = "libs"
-
-SRCREV = "6138dff6f2a5216065fa4833a223b56d98cb62f3"
-
-SRC_URI = "git://github.com/thkukuk/lastlog2.git;branch=main;protocol=https \
-           file://0001-remove-lto-to-fix-link-error-of-clang.patch \
-"
-
-S = "${WORKDIR}/git"
-
-inherit meson pkgconfig systemd features_check
-
-DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} sqlite3 "
-REQUIRED_DISTRO_FEATURES = "pam"
-
-SYSTEMD_SERVICE:${PN} = "lastlog2-import.service"
-
-EXTRA_OEMESON = " -Dpamlibdir=${libdir}"
-
-do_install:append () {
-      if [ -d ${D}${prefix}/lib/systemd -a ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then
-          # Fix makefile hardcoded path assumptions for systemd (assumes $prefix)
-          # without usrmerge distro feature enabled
-          install -d `dirname ${D}${systemd_unitdir}`
-          mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}`
-      fi
-}
-
-FILES:${PN} += " ${systemd_system_unitdir} "
-FILES:${PN} += " ${libdir} "
-FILES:${PN} += " ${nonarch_libdir}/tmpfiles.d/* "
diff --git a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb
index d540737bc9..6ca8569bc5 100644
--- a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb
+++ b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb
@@ -13,7 +13,9 @@ SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https;branch=ma
 PV = "1.0+git"
 SRCREV = "9ae4f4ae4481b1e69d38ed810980d33103544613"
 
-S = "${WORKDIR}/git"
+# The current PV is not a git tag but a README content
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 inherit autotools
 
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb
index fb778005ff..37c514a219 100644
--- a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb
+++ b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb
@@ -12,18 +12,17 @@ inherit autotools gobject-introspection pkgconfig lib_package
 
 DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme"
 
-SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;protocol=https \
+SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.2.x-branch;protocol=https \
            file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \
            "
-SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050"
-S = "${WORKDIR}/git"
+SRCREV = "b829b60d9ff049abb190f09a3b9a5fac648cd5a3"
 
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
 
-PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools"
+PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools smart smartmontools"
 PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3"
-PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2"
-PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2"
+PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools libyaml, lvm2"
+PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools libyaml, lvm2"
 PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2"
 PACKAGECONFIG[parted] = "--with-part, --without-part, parted"
 PACKAGECONFIG[fs] = "--with-fs, --without-fs, e2fsprogs util-linux"
@@ -35,5 +34,7 @@ PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup keyutils nss
 PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize"
 PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2"
 PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper"
+PACKAGECONFIG[smart] = "--with-smart,--without-smart,libatasmart"
+PACKAGECONFIG[smartmontools] = "--with-smartmontools,--without-smartmontools,json-glib,smartmontools"
 
-export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs"
+export GIR_EXTRA_LIBS_PATH = "${B}/src/utils/.libs"
diff --git a/meta-oe/recipes-extended/libcbor/libcbor_0.11.0.bb b/meta-oe/recipes-extended/libcbor/libcbor_0.12.0.bb
index 0e15393dd5..60c3c6fadd 100755
--- a/meta-oe/recipes-extended/libcbor/libcbor_0.11.0.bb
+++ b/meta-oe/recipes-extended/libcbor/libcbor_0.12.0.bb
@@ -5,9 +5,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f3b3881df62ca763a02d359a6e94071"
 
 SRC_URI = "git://github.com/PJK/libcbor.git;protocol=https;branch=master"
-SRCREV = "170bee2b82cdb7b2ed25af301f62cb6efdd40ec1"
+SRCREV = "ae000f44e8d2a69e1f72a738f7c0b6b4b7cc4fbf"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch b/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch
deleted file mode 100644
index 3ecbfce250..0000000000
--- a/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 95d4df3b713925e2c4894a2e4d50b06df861d9ef Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 18 Dec 2019 23:37:40 -0800
-Subject: [PATCH] CheckPlatformSupport.cmake: Do not hardcode lib path
-
-Using CMAKE_INSTALL_LIBDIR ensures that we can build for multilib env
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/libcec/cmake/CheckPlatformSupport.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake
-index 2d7102f..55e78f8 100644
---- a/src/libcec/cmake/CheckPlatformSupport.cmake
-+++ b/src/libcec/cmake/CheckPlatformSupport.cmake
-@@ -224,16 +224,16 @@ else()
- 
-       if (${PYTHON_MAJOR_VERSION} EQUAL 2)
-         install(TARGETS     ${SWIG_MODULE_cec_REAL_NAME}
--                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec)
-+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec)
-         install(FILES       ${CMAKE_BINARY_DIR}/src/libcec/cec.py
--                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
-+                DESTINATION l${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
-         install(FILES ${CMAKE_SOURCE_DIR}/src/libcec/cmake/__init__.py
--                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec)
-+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec)
-       else()
-         install(TARGETS     ${SWIG_MODULE_cec_REAL_NAME}
--                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH})
-+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH})
-         install(FILES       ${CMAKE_BINARY_DIR}/src/libcec/cec.py
--                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
-+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
-       endif()
-     endif()
-   endif()
--- 
-2.24.1
-
diff --git a/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch b/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch
deleted file mode 100644
index 07277f7064..0000000000
--- a/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8ce50bf569ec2d931735180079bbe507730626c8 Mon Sep 17 00:00:00 2001
-From: Yann Dirson <yann@blade-group.com>
-Date: Mon, 7 Sep 2020 18:17:21 +0200
-Subject: [PATCH] Remove buggy test confusing host and target
-
----
-Upstream-Status: Pending
-
- src/libcec/cmake/CheckPlatformSupport.cmake | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake
-index 1d99bd8..31dac4f 100644
---- a/src/libcec/cmake/CheckPlatformSupport.cmake
-+++ b/src/libcec/cmake/CheckPlatformSupport.cmake
-@@ -266,14 +266,6 @@ else()
-                 DESTINATION python/cec)
-       endif()
-     else()
--      if(EXISTS "/etc/os-release")
--        file(READ "/etc/os-release" OS_RELEASE)
--        string(REGEX MATCH "ID(_LIKE)?=debian" IS_DEBIAN ${OS_RELEASE})
--        if (IS_DEBIAN)
--          SET(PYTHON_PKG_DIR "dist-packages")
--        endif()
--      endif()
--
-       if (NOT PYTHON_PKG_DIR)
-         SET(PYTHON_PKG_DIR "site-packages")
-       endif()
--- 
-2.28.0
-
diff --git a/meta-oe/recipes-extended/libcec/libcec/0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch b/meta-oe/recipes-extended/libcec/libcec/0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch
deleted file mode 100644
index ab1ab5b8eb..0000000000
--- a/meta-oe/recipes-extended/libcec/libcec/0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2241edc8b70c2a54d109ac9c0e821889ac138d40 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 27 Jan 2022 22:49:52 -0800
-Subject: [PATCH] cecloader: Match return type of function LibCecBootloader
-
-Fixes
-include/cecloader.h:175:14: error: cannot initialize return object of type 'bool' with an rvalue of type 'nullptr_t'
-      return NULL;
-             ^~~~
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/cecloader.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/cecloader.h b/include/cecloader.h
-index be76468f..550f598e 100644
---- a/include/cecloader.h
-+++ b/include/cecloader.h
-@@ -172,7 +172,7 @@ bool LibCecBootloader(const char *strLib = NULL)
-     if (!g_libCEC)
-     {
-       std::cout << dlerror() << std::endl;
--      return NULL;
-+      return false;
-     }
-   }
- 
-@@ -181,7 +181,7 @@ bool LibCecBootloader(const char *strLib = NULL)
-   if (!LibCecBootloader)
-   {
-     std::cout << "cannot find CECStartBootloader" << std::endl;
--    return NULL;
-+    return false;
-   }
- 
-   bool bReturn = LibCecBootloader();
--- 
-2.35.0
-
diff --git a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb b/meta-oe/recipes-extended/libcec/libcec_7.0.0.bb
index 599416cb2a..2def38d73f 100644
--- a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb
+++ b/meta-oe/recipes-extended/libcec/libcec_7.0.0.bb
@@ -2,27 +2,23 @@ SUMMARY = "USB CEC Adaptor communication Library"
 HOMEPAGE = "http://libcec.pulse-eight.com/"
 
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b3a719e97f49e4841e90573f9b1a98ac"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b3a719e97f49e4841e90573f9b1a98ac"
 
 DEPENDS = "p8platform udev ncurses swig-native python3"
 
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}"
 DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}"
 
-SRCREV = "29d82c80bcc62be2878a9ac080de7eb286c4beb9"
+SRCREV = "ceeec8bfd2242792b6de59ce8fb854437208dc11"
 SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release;protocol=https \
-           file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \
            file://0001-Enhance-reproducibility.patch \
-           file://0001-Remove-buggy-test-confusing-host-and-target.patch \
-           file://0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch \
           "
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
 # default config is for RaspberryPi API, use the Linux 4.10+ API by default
-PLATFORM_CMAKE_FLAGS ?= "-DHAVE_LINUX_API=1 -DHAVE_RPI_API=0"
+PLATFORM_CMAKE_FLAGS ?= "-DHAVE_LINUX_API=1 -DHAVE_RPI_API=0 -DSKIP_PYTHON_WRAPPER=1"
 EXTRA_OECMAKE += "${PLATFORM_CMAKE_FLAGS}"
 
 # Put client examples into separate packages
diff --git a/meta-oe/recipes-extended/libconfig/libconfig/0001-Fix-declarations-to-allow-build-with-gcc-15.patch b/meta-oe/recipes-extended/libconfig/libconfig/0001-Fix-declarations-to-allow-build-with-gcc-15.patch
new file mode 100644
index 0000000000..00ceadb10d
--- /dev/null
+++ b/meta-oe/recipes-extended/libconfig/libconfig/0001-Fix-declarations-to-allow-build-with-gcc-15.patch
@@ -0,0 +1,38 @@
+From 0511e285f3c886a388b8e9c6a4829752d60ab44c Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Thu, 5 Dec 2024 06:47:40 +0000
+Subject: [PATCH] Fix declarations to allow build with gcc 15
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+
+Upstream-Status: Backport [690342b Fix declarations to allow build with gcc 15]
+---
+ lib/grammar.y | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/lib/grammar.y b/lib/grammar.y
+index 87dac00..0e9d0bb 100644
+--- a/lib/grammar.y
++++ b/lib/grammar.y
+@@ -40,8 +40,7 @@
+ #include "wincompat.h"
+ 
+ /* These declarations are provided to suppress compiler warnings. */
+-extern int libconfig_yylex();
+-extern int libconfig_yyget_lineno();
++extern int libconfig_yyget_lineno(void *);
+ 
+ static const char *err_array_elem_type = "mismatched element type in array";
+ static const char *err_duplicate_setting = "duplicate setting name";
+@@ -80,6 +79,11 @@ void libconfig_yyerror(void *scanner, struct parse_context *ctx,
+   char *sval;
+ }
+ 
++%{
++/* These declarations are provided to suppress compiler warnings. */
++extern int libconfig_yylex(YYSTYPE *, void *);
++%}
++
+ %token <ival> TOK_BOOLEAN TOK_INTEGER TOK_HEX
+ %token <llval> TOK_INTEGER64 TOK_HEX64
+ %token <fval> TOK_FLOAT
diff --git a/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb b/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb
index 6382569923..a4df707dd7 100644
--- a/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb
+++ b/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb
@@ -7,14 +7,18 @@ SECTION = "libs"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29"
 
-SRC_URI = "https://hyperrealm.github.io/libconfig/dist/libconfig-${PV}.tar.gz"
+SRC_URI = "https://hyperrealm.github.io/libconfig/dist/libconfig-${PV}.tar.gz \
+    file://0001-Fix-declarations-to-allow-build-with-gcc-15.patch \
+"
+
+# needed when we modify grammar.y with above patch
+DEPENDS += "bison-native"
 
 UPSTREAM_CHECK_URI = "https://github.com/hyperrealm/libconfig/releases"
 UPSTREAM_CHECK_REGEX = "Version (?P<pver>\d+(\.\d+)+)"
 
 inherit autotools-brokensep pkgconfig
 
-SRC_URI[md5sum] = "15ec701205f91f21b1187f8b61e0d64f"
 SRC_URI[sha256sum] = "545166d6cac037744381d1e9cc5a5405094e7bfad16a411699bcff40bbb31ee7"
 
 PACKAGE_BEFORE_PN = "${PN}++"
diff --git a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb
index e3de8aca62..6683c396e2 100644
--- a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb
+++ b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master
     file://0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch \
 "
 
-S = "${WORKDIR}/git"
 SRCREV = "275aa5141db6eda3587214e0f1d3a134768f557d"
 
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
index 87778c6314..9f4b2a19d0 100644
--- a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
+++ b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
@@ -14,6 +14,5 @@ SRCREV = "db9371cf9f38b5a3b2f6e4fae3f92eb052d2d929"
 SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https;branch=master \
           "
 
-S = "${WORKDIR}/git"
 
 
diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
index d4bad38b7a..10e6f34870 100644
--- a/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
+++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
@@ -12,7 +12,6 @@ SRC_URI = "http://distcache.freebsd.org/local-distfiles/itetcu/${BP}.tar.bz2 \
            file://0001-makefile-Fix-build-on-linux.patch \
            file://0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch \
            "
-SRC_URI[md5sum] = "8e9e81c554c1c5d735bc877448e92b91"
 SRC_URI[sha256sum] = "c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f"
 
 CFLAGS += "-fno-omit-frame-pointer  -D_GNU_SOURCE"
diff --git a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb
index eb85a07e99..125b7e9a8d 100644
--- a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb
+++ b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb
@@ -16,7 +16,6 @@ SRC_URI = "https://bitbucket.org/tagoh/libgxim/downloads/${BPN}-${PV}.tar.bz2 \
            file://0003-Add-format-string-qualifier-to-fix-potential-securit.patch \
            "
 
-SRC_URI[md5sum] = "4bb1fa63d00eb224439d413591c29a6a"
 SRC_URI[sha256sum] = "75e20d1744139644f9951b78ea3910b162d3380302315cb4b3d0640f23694c79"
 
 LICENSE = "LGPL-2.0-or-later"
diff --git a/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch b/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch
deleted file mode 100644
index 1dbf2955c9..0000000000
--- a/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 66c1646a3f12836846a054ebd2c427e30c93d3a5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 2 Apr 2023 10:37:15 -0700
-Subject: [PATCH] largefile.m4: Sync with latest gnulib
-
-This ensures it can work with latest autoconf 2.72 release ( upcoming )
-
-Upstream-Status: Backport [it will be not needed with 1.42 release]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- gl/m4/largefile.m4 | 330 ++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 263 insertions(+), 67 deletions(-)
-
-diff --git a/gl/m4/largefile.m4 b/gl/m4/largefile.m4
-index 3e8b5e3..7fb81b8 100644
---- a/gl/m4/largefile.m4
-+++ b/gl/m4/largefile.m4
-@@ -1,7 +1,7 @@
- # Enable large files on systems where this is not the default.
- # Enable support for files on Linux file systems with 64-bit inode numbers.
- 
--# Copyright 1992-1996, 1998-2022 Free Software Foundation, Inc.
-+# Copyright 1992-1996, 1998-2023 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,8 +10,9 @@
- # It does not set _LARGEFILE_SOURCE=1 on HP-UX/ia64 32-bit, although this
- # setting of _LARGEFILE_SOURCE is needed so that <stdio.h> declares fseeko
- # and ftello in C++ mode as well.
-+# Fixed in Autoconf 2.72, which has AC_SYS_YEAR2038.
- AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
--[
-+ m4_ifndef([AC_SYS_YEAR2038], [[
-   AC_REQUIRE([AC_CANONICAL_HOST])
-   AC_FUNC_FSEEKO
-   case "$host_os" in
-@@ -20,10 +21,10 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
-         [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).])
-       ;;
-   esac
--])
-+ ]])
-+)
- 
--# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+
--# with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
-+# Work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
- # or configures them incorrectly in some cases.
- m4_version_prereq([2.70], [], [
-@@ -43,33 +44,258 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES],
- ])
- ])# m4_version_prereq 2.70
- 
-+# Support AC_SYS_YEAR2038, even if Autoconf 2.71 or earlier.
-+# This code is taken from Autoconf master.
-+m4_ifndef([AC_SYS_YEAR2038], [
-+
-+# _AC_SYS_YEAR2038_TEST_CODE
-+# --------------------------
-+# C code used to probe for time_t that can represent time points more
-+# than 2**31 - 1 seconds after the epoch.  With the usual Unix epoch,
-+# these correspond to dates after 2038-01-18 22:14:07 +0000 (Gregorian),
-+# hence the name.
-+AC_DEFUN([_AC_SYS_YEAR2038_TEST_CODE],
-+[[
-+  #include <time.h>
-+  /* Check that time_t can represent 2**32 - 1 correctly.  */
-+  #define LARGE_TIME_T \\
-+    ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30)))
-+  int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535
-+                           && LARGE_TIME_T % 65537 == 0)
-+                          ? 1 : -1];
-+]])
-+
-+# _AC_SYS_YEAR2038_OPTIONS
-+# ------------------------
-+# List of known ways to enable support for large time_t.  If you change
-+# this list you probably also need to change the AS_CASE at the end of
-+# _AC_SYS_YEAR2038_PROBE.
-+m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize(
-+    ["none needed"]                   dnl 64-bit and newer 32-bit Unix
-+    ["-D_TIME_BITS=64"]               dnl glibc 2.34 with some 32-bit ABIs
-+    ["-D__MINGW_USE_VC2005_COMPAT"]   dnl 32-bit MinGW
-+    ["-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"]
-+                                      dnl 32-bit MinGW (misconfiguration)
-+))
-+
-+# _AC_SYS_YEAR2038_PROBE([IF-NOT-DETECTED])
-+# -----------------------------------------
-+# Subroutine of AC_SYS_YEAR2038.  Probe for time_t that can represent
-+# time points more than 2**31 - 1 seconds after the epoch (dates after
-+# 2038-01-18, see above) and set the cache variable ac_cv_sys_year2038_opts
-+# to one of the values in the _AC_SYS_YEAR2038_OPTIONS list, or to
-+# "support not detected" if none of them worked.  Then, set compilation
-+# options and #defines as necessary to enable large time_t support.
-+#
-+# Note that we do not test whether mktime, localtime, etc. handle
-+# large values of time_t correctly, as that would require use of
-+# AC_TRY_RUN.  Note also that some systems only support large time_t
-+# together with large off_t.
-+#
-+# If support is not detected, the behavior depends on which of the
-+# top-level AC_SYS_YEAR2038 macros was used (see below).
-+#
-+# If you change this macro you may also need to change
-+# _AC_SYS_YEAR2038_OPTIONS.
-+AC_DEFUN([_AC_SYS_YEAR2038_PROBE],
-+[AC_CACHE_CHECK([for $CC option to enable timestamps after Jan 2038],
-+  [ac_cv_sys_year2038_opts],
-+  [ac_save_CPPFLAGS="$CPPFLAGS"
-+  ac_opt_found=no
-+  for ac_opt in _AC_SYS_YEAR2038_OPTIONS; do
-+    AS_IF([test x"$ac_opt" != x"none needed"],
-+      [CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"])
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_YEAR2038_TEST_CODE])],
-+      [ac_cv_sys_year2038_opts="$ac_opt"
-+      ac_opt_found=yes])
-+    test $ac_opt_found = no || break
-+  done
-+  CPPFLAGS="$ac_save_CPPFLAGS"
-+  test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected"])
-+
-+ac_have_year2038=yes
-+AS_CASE([$ac_cv_sys_year2038_opts],
-+  ["none needed"], [],
-+  ["support not detected"],
-+    [ac_have_year2038=no
-+     AS_CASE([$enable_year2038],
-+      [yes],
-+        [# If we're not cross compiling and 'touch' works with a large
-+        # timestamp, then we can presume the system supports wider time_t
-+        # *somehow* and we just weren't able to detect it.  One common
-+        # case that we deliberately *don't* probe for is a system that
-+        # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers
-+        # wide time_t.  (It would be inappropriate for us to override an
-+        # intentional use of -m32.)  Error out, demanding use of
-+        # --disable-year2038 if this is intentional.
-+        AS_IF([test $cross_compiling = no],
-+          [AS_IF([TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null],
-+            [AS_CASE([`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`],
-+              [*'Feb  7  2106'* | *'Feb  7 17:10'*],
-+              [AC_MSG_FAILURE(m4_text_wrap(
-+      [this system appears to support timestamps after January 2038,
-+       but no mechanism for enabling wide 'time_t' was detected.
-+       Did you mean to build a 64-bit binary? (e.g. 'CC="${CC} -m64"'.)
-+       To proceed with 32-bit time_t, configure with '--disable-year2038'.],
-+      [], [], [55]))])])])])],
-+
-+  ["-D_TIME_BITS=64"],
-+    [AC_DEFINE([_TIME_BITS], [64],
-+      [Number of bits in time_t, on hosts where this is settable.])],
-+
-+  ["-D__MINGW_USE_VC2005_COMPAT=1"],
-+    [AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1],
-+      [Define to 1 on platforms where this makes time_t a 64-bit type.])],
- 
--# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE,
--#                               CACHE-VAR,
--#                               DESCRIPTION,
--#                               PROLOGUE, [FUNCTION-BODY])
--# --------------------------------------------------------
--m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE],
--[AC_CACHE_CHECK([for $1 value needed for large files], [$3],
--[while :; do
--  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
--    [AC_LANG_PROGRAM([$5], [$6])],
--    [$3=no; break])
--  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
--    [AC_LANG_PROGRAM([#undef $1
--#define $1 $2
--$5], [$6])],
--    [$3=$2; break])
--  $3=unknown
--  break
--done])
--case $$3 in #(
--  no | unknown) ;;
--  *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);;
--esac
--rm -rf conftest*[]dnl
--])# _AC_SYS_LARGEFILE_MACRO_VALUE
-+  ["-U_USE_32_BIT_TIME_T"*],
-+    [AC_MSG_FAILURE(m4_text_wrap(
-+      [the 'time_t' type is currently forced to be 32-bit.
-+       It will stop working after January 2038.
-+       Remove _USE_32BIT_TIME_T from the compiler flags.],
-+      [], [], [55]))],
-+
-+  [AC_MSG_ERROR(
-+    [internal error: bad value for \$ac_cv_sys_year2038_opts])])
-+])
-+
-+# _AC_SYS_YEAR2038_ENABLE
-+# -----------------------
-+# Subroutine of AC_SYS_YEAR2038 and _AC_SYS_YEAR2038_OPT_IN.
-+# Depending on which of the YEAR2038 macros was used, add either an
-+# --enable-year2038, or a --disable-year2038, or no option at all to
-+# the configure script.  Note that this is expanded very late and
-+# therefore there cannot be any code in the AC_ARG_ENABLE.  The
-+# default value for enable_year2038 is emitted unconditionally
-+# because the generated code always looks at this variable.
-+m4_define([_AC_SYS_YEAR2038_ENABLE],
-+[m4_divert_text([DEFAULTS],
-+  m4_provide_if([AC_SYS_YEAR2038],
-+    [enable_year2038=yes],
-+    [enable_year2038=no]))]dnl
-+[AC_ARG_ENABLE([year2038],
-+  m4_provide_if([AC_SYS_YEAR2038],
-+    [AS_HELP_STRING([--disable-year2038],
-+      [do not support timestamps after 2038])],
-+    [AS_HELP_STRING([--enable-year2038],
-+      [support timestamps after 2038])]))])
-+
-+# _AC_SYS_YEAR2038_OPT_IN
-+# -----------------------
-+# If the --enable-year2038 option is given to configure, attempt to
-+# detect and activate support for large time_t on 32-bit systems.
-+# This macro is automatically invoked by AC_SYS_LARGEFILE when large
-+# *file* support is detected.  It does not AC_REQUIRE AC_SYS_LARGEFILE
-+# to avoid a dependency loop, and is therefore unsafe to expose as a
-+# documented macro.
-+AC_DEFUN([_AC_SYS_YEAR2038_OPT_IN],
-+[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl
-+  AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE])
-+  AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])
-+])])
-+
-+# AC_SYS_YEAR2038
-+# ---------------
-+# Attempt to detect and activate support for large time_t.
-+# On systems where time_t is not always 64 bits, this probe can be
-+# skipped by passing the --disable-year2038 option to configure.
-+AC_DEFUN([AC_SYS_YEAR2038],
-+[AC_REQUIRE([AC_SYS_LARGEFILE])]dnl
-+[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl
-+  AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE])
-+  AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])
-+])])
-+
-+# _AC_SYS_LARGEFILE_TEST_CODE
-+# ---------------------------
-+# C code used to probe for large file support.
-+m4_define([_AC_SYS_LARGEFILE_TEST_CODE],
-+[@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-+  int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721
-+                      && LARGE_OFF_T % 2147483647 == 1)
-+                     ? 1 : -1]];[]dnl
-+])
-+
-+# _AC_SYS_LARGEFILE_OPTIONS
-+# -------------------------
-+# List of known ways to enable support for large files.  If you change
-+# this list you probably also need to change the AS_CASE at the end of
-+# _AC_SYS_LARGEFILE_PROBE.
-+m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize(
-+    ["none needed"]                   dnl Most current systems
-+    ["-D_FILE_OFFSET_BITS=64"]        dnl X/Open LFS spec
-+    ["-D_LARGE_FILES=1"]              dnl AIX (which versions?)
-+    ["-n32"]                          dnl Irix 6.2 w/ SGI compiler
-+))
-+
-+# _AC_SYS_LARGEFILE_PROBE
-+# -----------------------
-+# Subroutine of AC_SYS_LARGEFILE. Probe for large file support and set
-+# the cache variable ac_cv_sys_largefile_opts to one of the values in
-+# the _AC_SYS_LARGEFILE_OPTIONS list, or to "support not detected" if
-+# none of the options in that list worked.  Then, set compilation
-+# options and #defines as necessary to enable large file support.
-+#
-+# If large file support is not detected, the behavior depends on which of
-+# the top-level AC_SYS_LARGEFILE macros was used (see below).
-+#
-+# If you change this macro you may also need to change
-+# _AC_SYS_LARGEFILE_OPTIONS.
-+AC_DEFUN([_AC_SYS_LARGEFILE_PROBE],
-+[AC_CACHE_CHECK([for $CC option to enable large file support],
-+  [ac_cv_sys_largefile_opts],
-+  [ac_save_CC="$CC"
-+  ac_opt_found=no
-+  for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do
-+    AS_IF([test x"$ac_opt" != x"none needed"],
-+      [CC="$ac_save_CC $ac_opt"])
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])],
-+      [ac_cv_sys_largefile_opts="$ac_opt"
-+      ac_opt_found=yes])
-+    test $ac_opt_found = no || break
-+  done
-+  CC="$ac_save_CC"
-+  test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected"])
-+
-+ac_have_largefile=yes
-+AS_CASE([$ac_cv_sys_largefile_opts],
-+  ["none needed"], [],
-+  ["support not detected"],
-+    [ac_have_largefile=no],
-+
-+  ["-D_FILE_OFFSET_BITS=64"],
-+    [AC_DEFINE([_FILE_OFFSET_BITS], [64],
-+      [Number of bits in a file offset, on hosts where this is settable.])],
-+
-+  ["-D_LARGE_FILES=1"],
-+    [AC_DEFINE([_LARGE_FILES], [1],
-+      [Define to 1 on platforms where this makes off_t a 64-bit type.])],
-+
-+  ["-n32"],
-+    [CC="$CC -n32"],
-+
-+  [AC_MSG_ERROR(
-+    [internal error: bad value for \$ac_cv_sys_largefile_opts])])
-+
-+_AC_SYS_YEAR2038_OPT_IN
-+])
- 
-+# _AC_SYS_LARGEFILE_ENABLE
-+# ------------------------
-+# Subroutine of AC_SYS_LARGEFILE.  Note that this
-+# is expanded very late and therefore there cannot be any code in the
-+# AC_ARG_ENABLE.  The default value for enable_largefile is emitted
-+# unconditionally because the generated shell code always looks at
-+# this variable.
-+m4_define([_AC_SYS_LARGEFILE_ENABLE],
-+[m4_divert_text([DEFAULTS],
-+  enable_largefile=yes)]dnl
-+[AC_ARG_ENABLE([largefile],
-+  [AS_HELP_STRING([--disable-largefile], [omit support for large files])])])
- 
- # AC_SYS_LARGEFILE
- # ----------------
-@@ -80,44 +306,14 @@ rm -rf conftest*[]dnl
- # Additionally, on Linux file systems with 64-bit inodes a file that happens
- # to have a 64-bit inode number cannot be accessed by 32-bit applications on
- # Linux x86/x86_64.  This can occur with file systems such as XFS and NFS.
-+# This macro allows configuration to continue if the system doesn't support
-+# large files.
- AC_DEFUN([AC_SYS_LARGEFILE],
--[AC_ARG_ENABLE(largefile,
--               [  --disable-largefile     omit support for large files])
--AS_IF([test "$enable_largefile" != no],
-- [AC_CACHE_CHECK([for special C compiler options needed for large files],
--    ac_cv_sys_largefile_CC,
--    [ac_cv_sys_largefile_CC=no
--     if test "$GCC" != yes; then
--       ac_save_CC=$CC
--       while :; do
--         # IRIX 6.2 and later do not support large files by default,
--         # so use the C compiler's -n32 option if that helps.
--         AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])])
--         AC_COMPILE_IFELSE([], [break])
--         CC="$CC -n32"
--         AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break])
--         break
--       done
--       CC=$ac_save_CC
--       rm -f conftest.$ac_ext
--    fi])
--  if test "$ac_cv_sys_largefile_CC" != no; then
--    CC=$CC$ac_cv_sys_largefile_CC
--  fi
--
--  _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
--    ac_cv_sys_file_offset_bits,
--    [Number of bits in a file offset, on hosts where this is settable.],
--    [_AC_SYS_LARGEFILE_TEST_INCLUDES])
--  AS_CASE([$ac_cv_sys_file_offset_bits],
--    [unknown],
--      [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1],
--         [ac_cv_sys_large_files],
--         [Define for large files, on AIX-style hosts.],
--         [_AC_SYS_LARGEFILE_TEST_INCLUDES])],
--    [64],
--      [gl_YEAR2038_BODY([])])])
--])# AC_SYS_LARGEFILE
-+[m4_provide_if([_AC_SYS_LARGEFILE_PROBE], [], [dnl
-+  AS_IF([test "$enable_largefile" != no], [_AC_SYS_LARGEFILE_PROBE])
-+  AC_CONFIG_COMMANDS_PRE([_AC_SYS_LARGEFILE_ENABLE])
-+])])
-+])# m4_ifndef AC_SYS_YEAR2038
- 
- # Enable large files on systems where this is implemented by Gnulib, not by the
- # system headers.
--- 
-2.40.0
-
diff --git a/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
index 46938bccf6..a066b100c3 100644
--- a/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
+++ b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
@@ -1,9 +1,20 @@
+From 62d8c09422148c56b7b1011a5b3ccd553631e3c5 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Sun, 29 Sep 2024 18:38:05 +0800
+Subject: [PATCH] dont depend on help2man
+
 Upstream-Status: Inappropriate [disable feature]
 
 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---- libidn-1.41.orig/doc/Makefile.am
-+++ libidn-1.41/doc/Makefile.am
-@@ -73,16 +73,9 @@ BUILT_SOURCES = example.txt example2.txt
+---
+ doc/Makefile.am | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index ff62009..dba833f 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -87,16 +87,9 @@ BUILT_SOURCES = example.txt example2.txt example3.txt example4.txt example5.txt
  
  # Man pages.
  
@@ -14,10 +25,13 @@ Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
 -idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo $(top_srcdir)/.version
 -       $(MAKE) -C ../lib
 -       $(MAKE) -C ../src
--       $(AM_V_GEN)$(HELP2MAN) \
+-       $(AM_V_GEN)env SOURCE_DATE_EPOCH=0 $(HELP2MAN) \
 -               --name="Internationalized Domain Names command line tool" \
 -               --output=$@ $(top_builddir)/src/idn$(EXEEXT)
 -
  # GDOC
  
  gdoc_TEXINFOS =
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-extended/libidn/libidn_1.41.bb b/meta-oe/recipes-extended/libidn/libidn_1.43.bb
index 17ffc6cdc5..7c478a1495 100644
--- a/meta-oe/recipes-extended/libidn/libidn_1.41.bb
+++ b/meta-oe/recipes-extended/libidn/libidn_1.43.bb
@@ -3,27 +3,23 @@ DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specification
 HOMEPAGE = "http://www.gnu.org/software/libidn/"
 SECTION = "libs"
 LICENSE = "(LGPL-2.1-or-later | LGPL-3.0-only) & GPL-3.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f95a3dc99fecfa9a0c4e726d4b5d822f \
+LIC_FILES_CHKSUM = "file://COPYING;md5=11cc2d3ee574f9d6b7ee797bdce4d423\
                     file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \
                     file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
                     file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \
-                    file://lib/idna.h;endline=21;md5=176de4fe1d98e59d743d3b12a850e4cb \
-                    file://src/idn.c;endline=20;md5=dd17b9093355bf669e2ea108d2defbd0 \
+                    file://lib/idna.h;endline=28;md5=82ce5c462ff87f37c7c0d3a92f8d2f6b \
+                    file://src/idn.c;endline=19;md5=21b4efac8525241da4d38dc1c2e3a461 \
                    "
-                   
+
 DEPENDS = "virtual/libiconv autoconf-archive"
 
 inherit pkgconfig autotools gettext texinfo gtk-doc
 
 SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
            file://dont-depend-on-help2man.patch \
-           file://0001-largefile.m4-Sync-with-latest-gnulib.patch \
            "
 
-#SRC_URI[md5sum] = "813c7b268d1051ca02c3610986126f38"
-#SRC_URI[sha256sum] = "14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038"
-SRC_URI[sha256sum] = "884d706364b81abdd17bee9686d8ff2ae7431c5a14651047c68adf8b31fd8945"
+SRC_URI[sha256sum] = "bdc662c12d041b2539d0e638f3a6e741130cdb33a644ef3496963a443482d164"
 
 # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3
 # so package command into a separate package
@@ -40,4 +36,3 @@ do_install:append() {
 }
 
 BBCLASSEXTEND = "native nativesdk"
-
diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_2.6.0.bb
index 81a3c26e04..7f01962a97 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libplist_2.6.0.bb
@@ -8,10 +8,9 @@ DEPENDS = "libxml2 glib-2.0 swig python3"
 
 inherit autotools pkgconfig python3native python3targetconfig
 
-SRCREV = "b8fcc89b74c9128a13b07cc15a0ce25dca0cd97e"
+SRCREV = "2117b8fdb6b4096455bd2041a63e59a028120136"
 SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 CVE_STATUS_GROUPS += "CVE_STATUS_LIBLIST"
 CVE_STATUS_LIBLIST[status] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
index bfd4af053c..e29ec88e06 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
@@ -13,7 +13,6 @@ PV = "2.3.0+git"
 SRCREV = "2cd858c679d25633077ca78b67182a9b77653816"
 SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 CVE_STATUS_GROUPS += "CVE_STATUS_LIBLIST"
 CVE_STATUS_LIBLIST[status] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
diff --git a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.1.1.bb
index a586f49f96..7869fc1941 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.1.1.bb
@@ -2,15 +2,14 @@ DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7"
 
-DEPENDS = "udev libusb1 libplist"
+DEPENDS = "udev libusb1 libplist libimobiledevice-glue"
 
 inherit autotools pkgconfig gitpkgv
 
 PKGV = "${GITPKGVTAG}"
 
-SRCREV = "ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af"
+SRCREV = "adf9c22b9010490e4b55eaeb14731991db1c172c"
 SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${base_libdir}/udev/rules.d/"
diff --git a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb
index b9f5c34094..76759fe69d 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb
@@ -12,6 +12,5 @@ PV = "2.0.2+git"
 SRCREV = "36ffb7ab6e2a7e33bd1b56398a88895b7b8c615a"
 SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${base_libdir}/udev/rules.d/"
diff --git a/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb b/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
index e3e4c01acb..8021d8cf06 100644
--- a/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
+++ b/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
@@ -14,7 +14,6 @@ SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https;branch=master \
            file://0001-respect-environment-variables.patch \
           "
 
-S = "${WORKDIR}/git"
 
 do_configure () {
         :
diff --git a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb
index 1d650ac63b..c310e0f527 100644
--- a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb
+++ b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb
@@ -12,4 +12,3 @@ SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https;branch=ma
           "
 SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81"
 
-S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb
index b094337e90..99f23fef05 100644
--- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb
@@ -17,7 +17,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.17.orig.tar.gz \
 SRC_URI[sha256sum] = "6e937f3650afab4aac198f348b89b1ca42edceb17fb6bb0918f642143ccfd15e"
 SRC_URI[1.17-1.sha256sum] = "e3657c0e3facfeccb58900c0b48d56cd68ad5f9f24d1b4c6eaa69c26490fb673"
 
-S = "${WORKDIR}/${BP}"
+S = "${UNPACKDIR}/${BP}"
 
 inherit autotools-brokensep
 
diff --git a/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb b/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb
index 5c1c151591..1b7f95d57f 100644
--- a/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb
+++ b/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb
@@ -12,7 +12,6 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=63fe03535d83726f5655072502bef1bc"
 SRC_URI = "http://download.rsyslog.com/${BPN}/${BPN}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "f215c7e7ac6cfd1f5dabdba08c522b29"
 SRC_URI[sha256sum] = "338c6174e5c8652eaa34f956be3451f7491a4416ab489aef63151f802b00bf93"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb b/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb
index 0cc128c8c4..89670d10ca 100644
--- a/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb
+++ b/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/rsyslog/liblognorm;branch=master;protocol=https \
            "
 SRCREV = "46c6ee4c8e5f827893e485a4ef1aff04ea881273"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.10.bb b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.11.bb
index 9e17f91669..ffbb3a8c8e 100644
--- a/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.10.bb
+++ b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.11.bb
@@ -7,9 +7,8 @@ LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "git://github.com/stephane/libmodbus;branch=master;protocol=https"
-SRCREV = "2cbafa3113e276c3697d297f68e88d112b53174d"
+SRCREV = "5190e5e141780ae481f24be16d7b39a5f3ad8f8f"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
index f08fea7de3..7ec01ecd3f 100644
--- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
+++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/libpwquality/libpwquality;branch=master;protocol=htt
 "
 SRCREV = "5490e96a3dd6ed7371435ca5b3ccef98bdb48b5a"
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep gettext setuptools3-base
 
diff --git a/meta-oe/recipes-extended/libqb/libqb_2.0.8.bb b/meta-oe/recipes-extended/libqb/libqb_2.0.8.bb
index 3db9e2e66f..d270bf2113 100644
--- a/meta-oe/recipes-extended/libqb/libqb_2.0.8.bb
+++ b/meta-oe/recipes-extended/libqb/libqb_2.0.8.bb
@@ -9,18 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785"
 
 inherit autotools pkgconfig
 
-SRCREV = "002171bbcf4bc4728da56c1538afd9e9d814ecaf"
-SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=main;protocol=https \
-          "
-S = "${WORKDIR}/git"
+SRC_URI = "https://github.com/ClusterLabs/${BPN}/releases/download/v${PV}/${BP}.tar.xz"
+SRC_URI[sha256sum] = "b42531fc20b8ac02f4c6d0a4dc49f7c4a1eef09bdb13af5f6927b7fc49522ee6"
 
 DEPENDS += "libxml2"
 
 CFLAGS += "-pthread -D_REENTRANT"
 
-do_configure:prepend() {
-    ( cd ${S}
-    ${S}/autogen.sh )
-}
-
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb b/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb
index 28c64a1614..ba10f062ec 100644
--- a/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb
+++ b/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb
@@ -21,7 +21,6 @@ SRCREV = "f6bb06a699617d078fcd4f8b71b4d063bf47b52b"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit features_check
 REQUIRED_DISTRO_FEATURES = "systemd"
diff --git a/meta-oe/recipes-extended/libserialport/libserialport_0.1.1.bb b/meta-oe/recipes-extended/libserialport/libserialport_0.1.2.bb
index 4190338c1f..71dc33da90 100644
--- a/meta-oe/recipes-extended/libserialport/libserialport_0.1.1.bb
+++ b/meta-oe/recipes-extended/libserialport/libserialport_0.1.2.bb
@@ -8,5 +8,4 @@ inherit autotools
 
 SRC_URI = "http://sigrok.org/download/source/libserialport/libserialport-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "b93f0325a6157198152b5bd7e8182b51"
-SRC_URI[sha256sum] = "4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d"
+SRC_URI[sha256sum] = "5deb92b5ca72c0347b07b786848350deca2dcfd975ce613b8e0e1d947a4b4ca9"
diff --git a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb
index 7498a57049..85d3853f4c 100644
--- a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb
+++ b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb
@@ -14,6 +14,7 @@ SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATG
 SRC_URI[sha256sum] = "5688aa4a685547d7174a8a373ea9d8ee927e766e3cc302bdee34523c2c5d6c11"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\_\d+)+)"
 
 # Perl5 is for tests only
 EXTRA_OECONF = "--without-perl5 --with-mnttab=/proc/mounts"
diff --git a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
index 6e6c8cc226..d7e88f4fd0 100644
--- a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
+++ b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
@@ -11,7 +11,6 @@ PV .= "+0.2.2+git"
 
 inherit autotools
 
-S = "${WORKDIR}/git"
 
 PACKAGES += "${PN}-tools"
 
diff --git a/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch b/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch
deleted file mode 100644
index 21a6f292c8..0000000000
--- a/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 61655f82224cadb261e81f8bae111eaaa7bdf531 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 6 Aug 2014 14:53:03 +0200
-Subject: [PATCH] configure: use pkg-config for freetype
-
-Upstream-Status: Pending
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- configure.ac | 37 ++++++++-----------------------------
- 1 file changed, 8 insertions(+), 29 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3cfe974..0055a8c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[  --with-freetype=DIR     use freetype2 in DIR],[
-        fi
- ])
- 
--if [ test -n "$FREETYPE_DIR" ]; then
--       AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, ,[$FREETYPE_DIR/bin:$PATH])
--else
--       AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
--fi
--
--if [ test -n "$FREETYPE_CONFIG" ]; then
--       if [ test -n "$FREETYPE_DIR" ]; then
--               freetype_cflags="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include"
--               freetype_libs=`$FREETYPE_CONFIG --libs`
--       else
--               freetype_cflags=`$FREETYPE_CONFIG --cflags`
--               freetype_libs=`$FREETYPE_CONFIG --libs`
--       fi
--else
--       if [ test -n "$FREETYPE_DIR" ]; then
--               freetype_cflags="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include"
--               freetype_libs="-L$FREETYPE_DIR/lib -lfreetype"
--       else
--               freetype_cflags=""
--               freetype_libs="-lfreetype"
--       fi
--fi
--
--CPPFLAGS="$freetype_cflags $CPPFLAGS"
--LDFLAGS="$LDFLAGS $freetype_libs"
-+PKG_CHECK_MODULES(FREETYPE2, freetype2, 
-+    CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
-+    LDFLAGS="$LDFLAGS $FREETYPE2_LIBS",
-+    AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
-+)
- 
- AC_CHECK_LIB(freetype,FT_Init_FreeType,[
--       WMF_FT_LDFLAGS="$freetype_libs"
-+       WMF_FT_LDFLAGS="$FREETYPE2_LIBS"
- ],[    AC_MSG_ERROR([* * * freetype(2) is required * * *])
- ])
- AC_CHECK_HEADER(ft2build.h,[
--       WMF_FT_CFLAGS="$freetype_cflags"
--       WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
-+       WMF_FT_CFLAGS="$FREETYPE2_CFLAGS"
-+       WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS"
- ],[    AC_MSG_ERROR([* * * freetype(2) is required * * *])
- ])
- 
--- 
-1.9.0
-
diff --git a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch
deleted file mode 100644
index 4e7cd8887a..0000000000
--- a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Pending
-
-http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-intoverflow.patch?view=log
-
-CVE-2006-3376 libwmf integer overflow
-
---- libwmf-0.2.8.4.orig/src/player.c    2002-12-10 19:30:26.000000000 +0000
-+++ libwmf-0.2.8.4/src/player.c 2006-07-12 15:12:52.000000000 +0100
-@@ -42,6 +42,7 @@
- #include "player/defaults.h" /* Provides: default settings               */
- #include "player/record.h"   /* Provides: parameter mechanism            */
- #include "player/meta.h"     /* Provides: record interpreters            */
-+#include <stdint.h>
- 
- /**
-  * @internal
-@@ -132,8 +134,14 @@
-                }
-        }
- 
--/*     P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
-- */    P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
-+       if (MAX_REC_SIZE(API) > UINT32_MAX / 2)
-+       {
-+               API->err = wmf_E_InsMem;
-+               WMF_DEBUG (API,"bailing...");
-+               return (API->err);
-+       }
-+       
-+       P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
- 
-        if (ERR (API))
-        {       WMF_DEBUG (API,"bailing...");
diff --git a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch
deleted file mode 100644
index 9a8cbcb508..0000000000
--- a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-
-
-http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-useafterfree.patch?view=log
-Resolves: CVE-2009-1364
-
---- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list    2009-04-24 04:06:44.000000000 -0400
-+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c       2009-04-24 04:08:30.000000000 -0400
-@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe
-        {       more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle));
-                if (more == 0) return;
-                im->clip->max += 8;
-+                im->clip->list = more;
-        }
-        im->clip->list[im->clip->count] = (*rect);
-        im->clip->count++;
diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.13.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.13.bb
new file mode 100644
index 0000000000..c5411d53a1
--- /dev/null
+++ b/meta-oe/recipes-extended/libwmf/libwmf_0.2.13.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Library for converting WMF files"
+#HOMEPAGE = "http://wvware.sourceforge.net/libwmf.html"
+HOMEPAGE = "https://github.com/caolanm/libwmf"
+SECTION = "libs"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+
+DEPENDS:class-native = "freetype-native libpng-native jpeg-native"
+DEPENDS = "freetype libpng jpeg expat gtk+"
+
+BBCLASSEXTEND = "native"
+
+inherit features_check autotools pkgconfig
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI = "git://github.com/caolanm/libwmf.git;protocol=https;branch=master"
+SRCREV = "9e4737f2293c0d127bda92e5b01896df10571424"
+
+
+do_install:append() {
+    sed -i -e 's@${RECIPE_SYSROOT}@@g' ${D}${bindir}/libwmf-config ${D}${libdir}/pkgconfig/libwmf.pc
+}
+
+FILES:${PN}-dbg += "${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/.debug"
+FILES:${PN}-dev += "${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.la"
+FILES:${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.a"
+FILES:${PN} += "${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.so"
+
diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
deleted file mode 100644
index 93b58057ce..0000000000
--- a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Library for converting WMF files"
-HOMEPAGE = "http://wvware.sourceforge.net/libwmf.html"
-SECTION = "libs"
-
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-
-DEPENDS:class-native = "freetype-native libpng-native jpeg-native"
-DEPENDS = "freetype libpng jpeg expat gtk+"
-
-BBCLASSEXTEND = "native"
-
-inherit features_check autotools pkgconfig
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${BPN}/${PV}/${BPN}-${PV}.tar.gz;name=tarball \
-           file://libwmf-0.2.8.4-intoverflow.patch \
-           file://libwmf-0.2.8.4-useafterfree.patch \
-           file://0001-configure-use-pkg-config-for-freetype.patch \
-          "
-
-SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0"
-SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8"
-
-FILES:${PN}-dbg += "${libdir}/gtk-2.0/2.10.0/loaders/.debug"
-FILES:${PN}-dev += "${libdir}/gtk-2.0/2.10.0/loaders/*.la"
-FILES:${PN}-staticdev += "${libdir}/gtk-2.0/2.10.0/loaders/*.a"
-FILES:${PN} += "${libdir}/gtk-2.0/2.10.0/loaders/*.so"
-
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
index f11c52dd11..817322a484 100644
--- a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
+++ b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
@@ -16,10 +16,14 @@ SRC_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/l
 "
 SRC_URI[sha256sum] = "5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048"
 
+UPSTREAM_CHECK_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/"
+
 BPN = "libx86"
 COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
 
 export LIBDIR = "${libdir}"
 export BACKEND = "x86emu"
 
-inherit autotools-brokensep
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch
index 3c6aee9247..70890e2485 100644
--- a/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch
+++ b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch
@@ -1,4 +1,4 @@
-From 5de24e1b39c09adb0c5bf4bb4228bd1bb935542a Mon Sep 17 00:00:00 2001
+From 24ec37bfe5c4c248dda0e80d6e7ab27afca1d60e Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Wed, 22 Mar 2023 16:03:56 +0800
 Subject: [PATCH] test_context: skip test case test_searchdirs
@@ -13,10 +13,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/tests/utests/basic/test_context.c b/tests/utests/basic/test_context.c
-index cfba1d30f..8c3bb7ad6 100644
+index 116b2ce36..4e96f4e96 100644
 --- a/tests/utests/basic/test_context.c
 +++ b/tests/utests/basic/test_context.c
-@@ -1061,7 +1061,6 @@ int
+@@ -1110,7 +1110,6 @@ int
  main(void)
  {
      const struct CMUnitTest tests[] = {
@@ -24,6 +24,3 @@ index cfba1d30f..8c3bb7ad6 100644
          UTEST(test_options),
          UTEST(test_models),
          UTEST(test_imports),
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/libyang/libyang_2.1.148.bb b/meta-oe/recipes-extended/libyang/libyang_3.12.2.bb
index 0eff3247c6..7fff0b96a1 100644
--- a/meta-oe/recipes-extended/libyang/libyang_2.1.148.bb
+++ b/meta-oe/recipes-extended/libyang/libyang_3.12.2.bb
@@ -4,16 +4,15 @@ HOMEPAGE = "https://github.com/CESNET/libyang"
 SECTION = "libs"
 LICENSE = "BSD-3-Clause"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9bb3d334294e8719f41c531e28a9a697"
 
-SRCREV = "fc4dbd923e044006c93df020590a1e5a8656c09e"
+SRCREV = "da7272e19d9e27d1bfdd68108fa9dce25fbdf5e8"
 
-SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https;tag=v${PV} \
            file://0001-test_context-skip-test-case-test_searchdirs.patch \
            file://run-ptest \
            "
 
-S = "${WORKDIR}/git"
 
 # Main dependencies
 inherit cmake pkgconfig lib_package ptest multilib_header
@@ -31,7 +30,7 @@ do_compile:prepend () {
 }
 
 do_install:append () {
-        oe_multilib_header  libyang/config.h
+        oe_multilib_header  libyang/ly_config.h
 }
 
 do_install_ptest () {
diff --git a/meta-oe/recipes-extended/libzip/libzip_1.10.1.bb b/meta-oe/recipes-extended/libzip/libzip_1.11.4.bb
index a314efc126..039973fdbf 100644
--- a/meta-oe/recipes-extended/libzip/libzip_1.10.1.bb
+++ b/meta-oe/recipes-extended/libzip/libzip_1.11.4.bb
@@ -21,6 +21,6 @@ inherit cmake
 
 SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "dc3c8d5b4c8bbd09626864f6bcf93de701540f761d76b85d7c7d710f4bd90318"
+SRC_URI[sha256sum] = "8a247f57d1e3e6f6d11413b12a6f28a9d388de110adc0ec608d893180ed7097b"
 
 BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
index a2a420ced8..4911cebd16 100644
--- a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
+++ b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
@@ -21,7 +21,7 @@ SRC_URI = "\
 
 SRC_URI[sha256sum] = "bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547"
 
-S = "${WORKDIR}/linuxconsoletools-${PV}"
+S = "${UNPACKDIR}/linuxconsoletools-${PV}"
 
 inherit systemd pkgconfig
 
@@ -35,7 +35,7 @@ SYSTEMD_AUTO_ENABLE:inputattach = "enable"
 PROVIDES += "joystick"
 
 PACKAGECONFIG ??= "sdl"
-PACKAGECONFIG[sdl] = ",,libsdl2"
+PACKAGECONFIG[sdl] = ",,virtual/libsdl2"
 
 do_compile() {
     if ! ${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'true', 'false', d)}; then
diff --git a/meta-oe/recipes-extended/logwatch/logwatch_7.10.bb b/meta-oe/recipes-extended/logwatch/logwatch_7.11.bb
index 2efaa2b3c6..89012f8852 100644
--- a/meta-oe/recipes-extended/logwatch/logwatch_7.10.bb
+++ b/meta-oe/recipes-extended/logwatch/logwatch_7.11.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ba882fa9b4b6b217a51780be3f4db9c8"
 RDEPENDS:${PN} = "perl"
 
 SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "329df0991b879764ed7e50a869de5b6bfa70d241eb254397a5659d1ff5f2588f"
+SRC_URI[sha256sum] = "5eb42d983a9667003368b572149fce788c0d7e13daaf1f28ad1bf3a140b865cf"
 
 do_install() {
     install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts
diff --git a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb b/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb
index 73e4eac3dd..fd20860a03 100644
--- a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb
+++ b/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb
@@ -6,12 +6,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c6570d8d699af1883db9d0e733ac9bfb"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
            file://0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch \
           "
-SRC_URI[md5sum] = "5901bed95e61d2bea3ba3056056af432"
 SRC_URI[sha256sum] = "694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lprng/files/lprng/"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
+
 inherit autotools gettext
 
-EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost"
+EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost \
+                                CHOWN=${base_bindir}/chown CHGRP=${base_bindir}/chgrp \
+                                OPENSSL=${bindir}/openssl PRUTIL=${bindir}/pr"
 FILES:${PN}-dbg += "${libdir}/lprng/filters/.debug"
 
 # configure: WARNING: Program 'clear' is not found. Set environment CLEAR=no if you do not want to use it
diff --git a/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.5.bb b/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb
index 096f869c30..6d5399c8d0 100644
--- a/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.5.bb
+++ b/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb
@@ -9,15 +9,14 @@ BUGTRACKER = "https://github.com/Neargye/magic_enum/issues"
 HOMEPAGE = "https://github.com/Neargye/magic_enum"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b15f48588464ec8ef87d2b560aad2caa"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7e7717cf723eb72f57e80fdb651cb318"
 
 SRC_URI = " \
     git://github.com/Neargye/magic_enum.git;protocol=https;branch=master \
     file://run-ptest \
 "
 
-SRCREV = "e55b9b54d5cf61f8e117cafb17846d7d742dd3b4"
-S = "${WORKDIR}/git"
+SRCREV = "e046b69a3736d314fad813e159b1c192eaef92cd"
 
 inherit cmake ptest
 
diff --git a/meta-oe/recipes-extended/md5deep/md5deep_git.bb b/meta-oe/recipes-extended/md5deep/md5deep_git.bb
index 5351a37db6..4b7192290e 100644
--- a/meta-oe/recipes-extended/md5deep/md5deep_git.bb
+++ b/meta-oe/recipes-extended/md5deep/md5deep_git.bb
@@ -13,6 +13,5 @@ SRC_URI = "git://github.com/jessek/hashdeep.git;branch=master;protocol=https \
            file://0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch
index b997d6ce7d..68fd1ee3e0 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch
@@ -1,4 +1,4 @@
-From 65923a872e44cb461ef1a03374057351f0bc5efe Mon Sep 17 00:00:00 2001
+From 4952f03d150770ff06f9a12ff42d8de680407649 Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Tue, 19 Mar 2024 19:39:04 +0800
 Subject: [PATCH] Do not use bundled packages
@@ -10,60 +10,27 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---
- CMakeLists.txt                       | 23 ++++++-----------------
- extensions/libarchive/CMakeLists.txt |  7 ++-----
- 2 files changed, 8 insertions(+), 22 deletions(-)
+ CMakeLists.txt                       | 3 +--
+ cmake/GetBZip2.cmake                 | 3 +++
+ cmake/GetCatch2.cmake                | 4 ++++
+ cmake/GetCivetWeb.cmake              | 3 +++
+ cmake/GetFmt.cmake                   | 3 +++
+ cmake/GetLibCURL.cmake               | 3 +++
+ cmake/GetLibXml2.cmake               | 3 +++
+ cmake/GetOpenSSL.cmake               | 3 +++
+ cmake/GetRocksDB.cmake               | 4 ++++
+ cmake/GetSpdlog.cmake                | 4 ++++
+ cmake/GetZLIB.cmake                  | 3 +++
+ cmake/GetZstd.cmake                  | 4 ++++
+ extensions/libarchive/CMakeLists.txt | 6 ++----
+ 13 files changed, 40 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13a2b992..8a1dd6d9 100644
+index 50e31d871..fc1718dfd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -222,9 +222,7 @@ else()
- endif()
- 
- if (NOT DISABLE_BZIP2 AND (NOT DISABLE_LIBARCHIVE OR (NOT DISABLE_ROCKSDB AND NOT WIN32)))
--    include(BundledBZip2)
--    use_bundled_bzip2(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
--    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/bzip2/dummy")
-+    find_package(BZip2 REQUIRED)
- endif()
- 
- if(NOT WIN32)
-@@ -247,9 +245,7 @@ endif()
- 
- # OpenSSL
- if (NOT OPENSSL_OFF)
--    include(BundledOpenSSL)
--    use_openssl("${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
--    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/ssl")
-+    find_package(OpenSSL REQUIRED)
- 
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOPENSSL_SUPPORT")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DOPENSSL_SUPPORT")
-@@ -262,9 +258,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSODIUM_STATIC=1")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSODIUM_STATIC=1")
- 
- # zlib
--include(BundledZLIB)
--use_bundled_zlib(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
--list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/zlib/dummy")
-+find_package(ZLIB REQUIRED)
- 
- # uthash
- add_library(ut INTERFACE)
-@@ -272,9 +266,7 @@ target_include_directories(ut SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/thir
- 
- # cURL
- if(NOT DISABLE_CURL)
--    include(BundledLibcURL)
--    use_bundled_curl(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
--    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/curl/dummy")
-+    find_package(CURL REQUIRED)
- else()
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_CURL")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_CURL")
-@@ -285,8 +277,7 @@ include(BundledSpdlog)
- use_bundled_spdlog(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+@@ -265,8 +265,7 @@ include(GetSpdlog)
+ get_spdlog()
  
  # yaml-cpp
 -include(BundledYamlCpp)
@@ -72,27 +39,162 @@ index 13a2b992..8a1dd6d9 100644
  
  # concurrentqueue
  add_library(concurrentqueue INTERFACE)
-@@ -357,9 +348,7 @@ include(Extensions)
- add_subdirectory(libminifi)
- 
- if ((ENABLE_OPENWSMAN AND NOT DISABLE_CIVET AND NOT DISABLE_CURL) OR ENABLE_ALL OR ENABLE_AZURE)
--    include(BundledLibXml2)
--    use_bundled_libxml2(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
--    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/libxml2/dummy")
-+    find_package(LibXml2 REQUIRED)
- endif()
- 
- if (ENABLE_ALL OR ENABLE_PROMETHEUS OR NOT DISABLE_CIVET)
+diff --git a/cmake/GetBZip2.cmake b/cmake/GetBZip2.cmake
+index 2a7d47e9e..754122895 100644
+--- a/cmake/GetBZip2.cmake
++++ b/cmake/GetBZip2.cmake
+@@ -23,5 +23,8 @@ function(get_bzip2 SOURCE_DIR BINARY_DIR)
+         message("Using CMake to build bzip2 from source")
+         include(BundledBZip2)
+         use_bundled_bzip2(${SOURCE_DIR} ${BINARY_DIR})
++    elseif(MINIFI_BZIP2_SOURCE STREQUAL "SYSTEM")
++        message("Using bzip2 provided by system")
++        find_package(BZip2 REQUIRED)
+     endif()
+ endfunction(get_bzip2)
+diff --git a/cmake/GetCatch2.cmake b/cmake/GetCatch2.cmake
+index d6c1d6acc..ec11b0a77 100644
+--- a/cmake/GetCatch2.cmake
++++ b/cmake/GetCatch2.cmake
+@@ -23,5 +23,9 @@ function(get_catch2)
+     elseif(MINIFI_CATCH2_SOURCE STREQUAL "BUILD")
+         message("Using CMake to build Catch2 from source")
+         include(Catch2)
++    elseif(MINIFI_CATCH2_SOURCE STREQUAL "SYSTEM")
++        message("Using Catch2 provided by system")
++        find_package(Catch2 REQUIRED)
++        add_library(Catch2WithMain ALIAS Catch2::Catch2WithMain)
+     endif()
+ endfunction(get_catch2)
+diff --git a/cmake/GetCivetWeb.cmake b/cmake/GetCivetWeb.cmake
+index f30d22289..8fc39a0e2 100644
+--- a/cmake/GetCivetWeb.cmake
++++ b/cmake/GetCivetWeb.cmake
+@@ -22,5 +22,8 @@ function(get_civetweb)
+     elseif(MINIFI_CIVETWEB_SOURCE STREQUAL "BUILD")
+         message("Using CMake to build CivetWeb from source")
+         include(CivetWeb)
++    elseif(MINIFI_CIVETWEB_SOURCE STREQUAL "SYSTEM")
++        message("Using CivetWeb provided by system")
++        find_package(civetweb REQUIRED)
+     endif()
+ endfunction(get_civetweb)
+diff --git a/cmake/GetFmt.cmake b/cmake/GetFmt.cmake
+index f4f28458d..579a63897 100644
+--- a/cmake/GetFmt.cmake
++++ b/cmake/GetFmt.cmake
+@@ -22,5 +22,8 @@ function(get_fmt)
+     elseif(MINIFI_FMT_SOURCE STREQUAL "BUILD")
+         message("Using CMake to build Fmt from source")
+         include(fmt)
++    elseif(MINIFI_FMT_SOURCE STREQUAL "SYSTEM")
++        message("Using Fmt provided by system")
++        find_package(fmt REQUIRED)
+     endif()
+ endfunction(get_fmt)
+diff --git a/cmake/GetLibCURL.cmake b/cmake/GetLibCURL.cmake
+index afd38f3c9..0eac59ec4 100644
+--- a/cmake/GetLibCURL.cmake
++++ b/cmake/GetLibCURL.cmake
+@@ -23,5 +23,8 @@ function(get_curl SOURCE_DIR BINARY_DIR)
+         message("Using CMake to build libcurl from source")
+         include(BundledLibcURL)
+         use_bundled_curl(${SOURCE_DIR} ${BINARY_DIR})
++    elseif(MINIFI_LIBCURL_SOURCE STREQUAL "SYSTEM")
++        message("Using libcurl provided by system")
++        find_package(CURL REQUIRED)
+     endif()
+ endfunction(get_curl SOURCE_DIR BINARY_DIR)
+diff --git a/cmake/GetLibXml2.cmake b/cmake/GetLibXml2.cmake
+index 5915b117d..18048715d 100644
+--- a/cmake/GetLibXml2.cmake
++++ b/cmake/GetLibXml2.cmake
+@@ -23,5 +23,8 @@ function(get_libxml2 SOURCE_DIR BINARY_DIR)
+         message("Using CMake to build libxml2 from source")
+         include(BundledLibXml2)
+         use_bundled_libxml2(${SOURCE_DIR} ${BINARY_DIR})
++    elseif(MINIFI_LIBXML2_SOURCE STREQUAL "SYSTEM")
++        message("Using libxml2 provided by system")
++        find_package(libxml2 REQUIRED)
+     endif()
+ endfunction(get_libxml2)
+diff --git a/cmake/GetOpenSSL.cmake b/cmake/GetOpenSSL.cmake
+index 58132c6bf..2b142f94e 100644
+--- a/cmake/GetOpenSSL.cmake
++++ b/cmake/GetOpenSSL.cmake
+@@ -23,5 +23,8 @@ function(get_openssl SOURCE_DIR BINARY_DIR)
+         message("Using CMake to build OpenSSL from source")
+         include(BundledOpenSSL)
+         use_openssl(${SOURCE_DIR} ${BINARY_DIR})
++    elseif(MINIFI_OPENSSL_SOURCE STREQUAL "SYSTEM")
++        message("Using OpenSSL provided by system")
++        find_package(OpenSSL REQUIRED)
+     endif()
+ endfunction(get_openssl)
+diff --git a/cmake/GetRocksDB.cmake b/cmake/GetRocksDB.cmake
+index 0968afc38..3ca1fe565 100644
+--- a/cmake/GetRocksDB.cmake
++++ b/cmake/GetRocksDB.cmake
+@@ -30,5 +30,9 @@ function(get_rocksdb SOURCE_DIR BINARY_DIR)
+             list(APPEND CMAKE_MODULE_PATH "${SOURCE_DIR}/cmake/rocksdb/sys")
+             find_package(RocksDB REQUIRED)
+         endif()
++    elseif(MINIFI_ROCKSDB_SOURCE STREQUAL "SYSTEM")
++        message("Using RocksDB provided by system")
++        list(APPEND CMAKE_MODULE_PATH "${SOURCE_DIR}/cmake/rocksdb/sys")
++        find_package(RocksDB REQUIRED)
+     endif()
+ endfunction(get_rocksdb SOURCE_DIR BINARY_DIR)
+diff --git a/cmake/GetSpdlog.cmake b/cmake/GetSpdlog.cmake
+index 747894984..6255e31bf 100644
+--- a/cmake/GetSpdlog.cmake
++++ b/cmake/GetSpdlog.cmake
+@@ -27,5 +27,9 @@ function(get_spdlog)
+     elseif(MINIFI_SPDLOG_SOURCE STREQUAL "BUILD")
+         message("Using CMake to build spdlog from source")
+         include(Spdlog)
++    elseif(MINIFI_SPDLOG_SOURCE STREQUAL "SYSTEM")
++        message("Using spdlog provided by system")
++        find_package(spdlog REQUIRED)
++        add_library(spdlog ALIAS spdlog::spdlog)
+     endif()
+ endfunction(get_spdlog)
+diff --git a/cmake/GetZLIB.cmake b/cmake/GetZLIB.cmake
+index 6e7bea1e3..c15e2246a 100644
+--- a/cmake/GetZLIB.cmake
++++ b/cmake/GetZLIB.cmake
+@@ -23,5 +23,8 @@ function(get_zlib SOURCE_DIR BINARY_DIR)
+         message("Using CMake to build zlib from source")
+         include(BundledZLIB)
+         use_bundled_zlib(${SOURCE_DIR} ${BINARY_DIR})
++    elseif(MINIFI_ZLIB_SOURCE STREQUAL "SYSTEM")
++        message("Using zlib provided by system")
++        find_package(ZLIB REQUIRED)
+     endif()
+ endfunction(get_zlib)
+diff --git a/cmake/GetZstd.cmake b/cmake/GetZstd.cmake
+index a0334b02d..0e7600c22 100644
+--- a/cmake/GetZstd.cmake
++++ b/cmake/GetZstd.cmake
+@@ -23,5 +23,9 @@ function(get_zstd)
+     elseif(MINIFI_ZSTD_SOURCE STREQUAL "BUILD")
+         message("Using CMake to build zstd from source")
+         include(Zstd)
++    elseif(MINIFI_ZSTD_SOURCE STREQUAL "SYSTEM")
++        message("Using zstd provided by system")
++        find_package(zstd REQUIRED)
++        add_library(zstd::zstd ALIAS zstd::libzstd_static)
+     endif()
+ endfunction(get_zstd)
 diff --git a/extensions/libarchive/CMakeLists.txt b/extensions/libarchive/CMakeLists.txt
-index 2b89d3ea..49e13e21 100644
+index bf7b2a7f5..eb6b71091 100644
 --- a/extensions/libarchive/CMakeLists.txt
 +++ b/extensions/libarchive/CMakeLists.txt
-@@ -22,13 +22,10 @@ if (DISABLE_LIBARCHIVE)
+@@ -22,12 +22,10 @@ if (NOT ENABLE_LIBARCHIVE)
  endif()
  
- if (NOT DISABLE_LZMA)
--    include(BundledLibLZMA)
--    use_bundled_liblzma(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+ if (ENABLE_LZMA)
+-    include(LibLZMA)
 -    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/liblzma/dummy")
 +    find_package(LibLZMA REQUIRED)
  endif()
@@ -104,5 +206,5 @@ index 2b89d3ea..49e13e21 100644
  include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
  
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch
deleted file mode 100644
index a09a17bf2c..0000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cd2b5362fe2e63dff3666ce72da27979fe06a519 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 28 May 2024 22:24:52 -0700
-Subject: [PATCH] libminifi: Rename mutex_ to mtx_ member of ConcurrentQueue
-
-Fixes
-libminifi/include/utils/MinifiConcurrentQueue.h:48:75: error: no member named 'mutex_' in 'ConcurrentQueue<T>'; did you mean 'mtx_'?
-|    48 |     : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mutex_)) {}
-|       |                                                                           ^~~~~~
-|       |                                                                           mtx_
-| libminifi/include/utils/MinifiConcurrentQueue.h:140:22: note: 'mtx_' declared here
-|   140 |   mutable std::mutex mtx_;
-|       |                      ^
-| 1 error generated.
-
-Upstream-Status: Submitted [https://github.com/apache/nifi-minifi-cpp/pull/1803]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libminifi/include/utils/MinifiConcurrentQueue.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libminifi/include/utils/MinifiConcurrentQueue.h b/libminifi/include/utils/MinifiConcurrentQueue.h
-index 8abc0ec93..1db58080b 100644
---- a/libminifi/include/utils/MinifiConcurrentQueue.h
-+++ b/libminifi/include/utils/MinifiConcurrentQueue.h
-@@ -45,7 +45,7 @@ class ConcurrentQueue {
-   ConcurrentQueue(const ConcurrentQueue& other) = delete;
-   ConcurrentQueue& operator=(const ConcurrentQueue& other) = delete;
-   ConcurrentQueue(ConcurrentQueue&& other)
--    : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mutex_)) {}
-+    : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mtx_)) {}
- 
-   ConcurrentQueue& operator=(ConcurrentQueue&& other) {
-     if (this != &other) {
--- 
-2.45.1
-
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch b/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch
index 65c52c6337..537beb85d3 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch
@@ -1,4 +1,4 @@
-From 4e8e1943541d3b887ba86dc1b488cbb058c7d1cd Mon Sep 17 00:00:00 2001
+From 429b2b357e5142e2b845da95bdd38e8fc1229831 Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Tue, 19 Mar 2024 20:48:25 +0800
 Subject: [PATCH] Fix osspuuid build
@@ -16,7 +16,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  create mode 100644 thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
 
 diff --git a/cmake/BundledOSSPUUID.cmake b/cmake/BundledOSSPUUID.cmake
-index c4fa1523..1faf2e5c 100644
+index 747e52c27..fb6e2164d 100644
 --- a/cmake/BundledOSSPUUID.cmake
 +++ b/cmake/BundledOSSPUUID.cmake
 @@ -23,10 +23,12 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
@@ -33,16 +33,16 @@ index c4fa1523..1faf2e5c 100644
  
      # Define byproducts
      set(BYPRODUCTS "lib/libuuid.a"
-@@ -39,7 +41,7 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
-     ENDFOREACH(BYPRODUCT)
- 
-     # Build project
--    set(CONFIGURE_COMMAND ./configure "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} -fPIC" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} -fPIC" --enable-shared=no --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install")
+@@ -45,7 +47,7 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
+     if(APPLE)
+         string(APPEND ADDITIONAL_COMPILER_FLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ")
+     endif()
+-    set(CONFIGURE_COMMAND ./configure "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}" --enable-shared=no --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install")
 +    set(CONFIGURE_COMMAND ac_cv_va_copy=C99 ./configure --host=${HOST_SYS} --build=${BUILD_SYS} "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} -fPIC" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} -fPIC" --enable-shared=no --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install")
+ 
      string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type)
-     if(NOT build_type MATCHES debug)
-         list(APPEND CONFIGURE_COMMAND --enable-debug=yes)
-@@ -47,10 +49,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
+     if(build_type MATCHES debug)
+@@ -54,10 +56,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
  
      ExternalProject_Add(
              ossp-uuid-external
@@ -56,7 +56,7 @@ index c4fa1523..1faf2e5c 100644
              UPDATE_COMMAND ""
 diff --git a/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch b/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
 new file mode 100644
-index 00000000..b8d7b0bb
+index 000000000..b8d7b0bba
 --- /dev/null
 +++ b/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
 @@ -0,0 +1,13 @@
@@ -74,5 +74,5 @@ index 00000000..b8d7b0bb
 +         if [ ".$opt_o" != . ]; then
 +             if [ ".$opt_t" = .yes ]; then
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch b/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch
index a08962724e..10d9965ef4 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch
@@ -1,4 +1,4 @@
-From 1c697e4d75f0045d5364d622960ff8047a4ad3ec Mon Sep 17 00:00:00 2001
+From a19e548826e65a95a55ac6b9c12a83d3dcc0010d Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Tue, 19 Mar 2024 20:56:05 +0800
 Subject: [PATCH] Fix libsodium build
@@ -14,7 +14,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/cmake/BundledLibSodium.cmake b/cmake/BundledLibSodium.cmake
-index 3a3daf41..d851f753 100644
+index 98d05b737..4f0faa879 100644
 --- a/cmake/BundledLibSodium.cmake
 +++ b/cmake/BundledLibSodium.cmake
 @@ -58,14 +58,12 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR)
@@ -26,7 +26,7 @@ index 3a3daf41..d851f753 100644
  
          ExternalProject_Add(
                  libsodium-external
--                URL "${LIBSODIUM_OFFICIAL_MIRROR_URL} ${LIBSODIUM_GITHUB_MIRROR_URL} ${LIBSODIUM_GENTOO_MIRROR_URL}"
+-                URL "${LIBSODIUM_OFFICIAL_MIRROR_URL}" "${LIBSODIUM_GITHUB_MIRROR_URL}" "${LIBSODIUM_GENTOO_MIRROR_URL}"
 -                URL_HASH ${LIBSODIUM_URL_HASH}
                  BUILD_IN_SOURCE true
 -                SOURCE_DIR "${BINARY_DIR}/thirdparty/libsodium-src"
@@ -35,5 +35,5 @@ index 3a3daf41..d851f753 100644
                  CMAKE_COMMAND ""
                  UPDATE_COMMAND ""
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch b/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch
deleted file mode 100644
index 177c6adee6..0000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 8a5fe73f722718aa5c9a467c28a26913771f7208 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Tue, 19 Mar 2024 20:57:37 +0800
-Subject: [PATCH] Fix spdlog build
-
-* Specify CMAKE_INSTALL_LIBDIR to fix multilib build.
-* Do not download spdlog source during compile.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- cmake/BundledSpdlog.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/BundledSpdlog.cmake b/cmake/BundledSpdlog.cmake
-index 974cbbaa..c0c45688 100644
---- a/cmake/BundledSpdlog.cmake
-+++ b/cmake/BundledSpdlog.cmake
-@@ -35,11 +35,12 @@ function(use_bundled_spdlog SOURCE_DIR BINARY_DIR)
-     endif()
- 
-     # Set build options
--    set(SPDLOG_SOURCE_DIR "${BINARY_DIR}/thirdparty/spdlog-src")
-+    set(SPDLOG_SOURCE_DIR "${SOURCE_DIR}/thirdparty/spdlog-src")
-     set(SPDLOG_INSTALL_DIR "${BINARY_DIR}/thirdparty/spdlog-install")
-     set(SPDLOG_LIBRARY "${SPDLOG_INSTALL_DIR}/${BYPRODUCT}")
-     set(SPDLOG_CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
-             "-DCMAKE_INSTALL_PREFIX=${SPDLOG_INSTALL_DIR}"
-+            "-DCMAKE_INSTALL_LIBDIR=${LIBDIR}"
-             "-DSPDLOG_BUILD_EXAMPLE=OFF"
-             "-DSPDLOG_BUILD_TESTS=OFF"
-             "-DSPDLOG_BUILD_TESTING=OFF"
-@@ -49,7 +50,6 @@ function(use_bundled_spdlog SOURCE_DIR BINARY_DIR)
-     # Build project
-     ExternalProject_Add(
-             spdlog-external
--            URL "https://github.com/gabime/spdlog/archive/v1.8.0.zip"
-             SOURCE_DIR "${SPDLOG_SOURCE_DIR}"
-             CMAKE_ARGS ${SPDLOG_CMAKE_ARGS}
-             BUILD_BYPRODUCTS "${SPDLOG_LIBRARY}"
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0005-Pass-noline-flag-to-flex.patch b/meta-oe/recipes-extended/minifi-cpp/files/0004-Pass-noline-flag-to-flex.patch
index 53939131ff..344e8839e7 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0005-Pass-noline-flag-to-flex.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0004-Pass-noline-flag-to-flex.patch
@@ -1,4 +1,4 @@
-From 083babbd6c6cc6f31530fbac0227c1d426fb0863 Mon Sep 17 00:00:00 2001
+From 229137659501ae51774dcb3249f94545bdd6e21f Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Tue, 19 Mar 2024 21:00:59 +0800
 Subject: [PATCH] Pass --noline flag to flex
@@ -14,18 +14,18 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/extensions/expression-language/CMakeLists.txt b/extensions/expression-language/CMakeLists.txt
-index 775b4116..84edc617 100644
+index c179ab3ef..7f507b03a 100644
 --- a/extensions/expression-language/CMakeLists.txt
 +++ b/extensions/expression-language/CMakeLists.txt
-@@ -77,7 +77,7 @@ flex_target(
+@@ -103,7 +103,7 @@ flex_target(
      el-scanner
      ${CMAKE_CURRENT_SOURCE_DIR}/Scanner.ll
-     ${CMAKE_CURRENT_SOURCE_DIR}/Scanner.cpp
+     ${CMAKE_BINARY_DIR}/el-generated/Scanner.cpp
 -    COMPILE_FLAGS --c++
 +    COMPILE_FLAGS "--c++ --noline"
  )
  
- add_flex_bison_dependency(el-scanner el-parser)
+ set(EL_GENERATED_INCLUDE_DIR ${CMAKE_BINARY_DIR}/el-generated)
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0005-generateVersion.sh-set-correct-buildrev.patch b/meta-oe/recipes-extended/minifi-cpp/files/0005-generateVersion.sh-set-correct-buildrev.patch
new file mode 100644
index 0000000000..2e78b1087e
--- /dev/null
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0005-generateVersion.sh-set-correct-buildrev.patch
@@ -0,0 +1,32 @@
+From 1861170c6de3dd851324debf3a6eaeff4d8d8bce Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Fri, 14 Mar 2025 20:26:38 +0800
+Subject: [PATCH] generateVersion.sh: set correct buildrev
+
+Since this script is run outside the source directory, git log can not
+get the commit id, so buildrev is not set correctly. Fix the issue by
+adding -C option.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ generateVersion.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generateVersion.sh b/generateVersion.sh
+index ff25afba8..0b50a1693 100755
+--- a/generateVersion.sh
++++ b/generateVersion.sh
+@@ -28,7 +28,7 @@ buildident=$8
+ date=$(date +%s)
+ 
+ if [ -d "${src_dir}"/.git ]; then
+-  buildrev=$(git log -1 --pretty=format:"%H")
++  buildrev=$(git -C "${src_dir}" log -1 --pretty=format:"%H")
+ else
+   buildrev="Unknown"
+ fi
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0007-CMakeLists.txt-do-not-use-ccache.patch b/meta-oe/recipes-extended/minifi-cpp/files/0006-CMakeLists.txt-do-not-use-ccache.patch
index 73a59f2a84..055a3e7b57 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0007-CMakeLists.txt-do-not-use-ccache.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0006-CMakeLists.txt-do-not-use-ccache.patch
@@ -1,4 +1,4 @@
-From 44867a8e4100a7296b98e0e850d950d24b980959 Mon Sep 17 00:00:00 2001
+From bbe5c95ef1755c4804c4561c03cafedeb004cb36 Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Thu, 21 Mar 2024 10:18:39 +0800
 Subject: [PATCH] CMakeLists.txt: do not use ccache
@@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a1dd6d91..8a5314544 100644
+index fc1718dfd..70c94c2ff 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -82,12 +82,12 @@ if (USE_REAL_ODBC_TEST_DRIVER)
+@@ -84,12 +84,12 @@ if (MINIFI_USE_REAL_ODBC_TEST_DRIVER)
  endif()
  
  # Use ccache if present
@@ -31,8 +31,8 @@ index 8a1dd6d91..8a5314544 100644
 +#    message("-- Found ccache: ${CCACHE_FOUND}")
 +#endif(CCACHE_FOUND)
  
- # Use gold linker if instructed
- if (UNIX AND USE_GOLD_LINKER AND NOT APPLE )
+ # Check for exec info before we enable the backtrace features.
+ CHECK_INCLUDE_FILE("execinfo.h" HAS_EXECINFO)
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch b/meta-oe/recipes-extended/minifi-cpp/files/0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch
deleted file mode 100644
index 38893e74ac..0000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 08d1b4b66fedde97eefb5e3ff6aa98fd02be7c21 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Wed, 20 Mar 2024 10:03:14 +0800
-Subject: [PATCH] OsUtils.h: add missing header <cstdint> for int64_t
-
-Fix build with musl:
-libminifi/include/utils/OsUtils.h:31:1: error: 'int64_t' does not name a type
-   31 | int64_t getCurrentProcessPhysicalMemoryUsage();
-      | ^~~~~~~
-libminifi/include/utils/OsUtils.h:22:1: note: 'int64_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
-   21 | #include <system_error>
-  +++ |+#include <cstdint>
-   22 |
-
-Upstream-Status: Pending
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- libminifi/include/utils/OsUtils.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libminifi/include/utils/OsUtils.h b/libminifi/include/utils/OsUtils.h
-index a7117233..5e623d1a 100644
---- a/libminifi/include/utils/OsUtils.h
-+++ b/libminifi/include/utils/OsUtils.h
-@@ -19,6 +19,7 @@
- #include <string>
- #include <optional>
- #include <system_error>
-+#include <cstdint>
- 
- struct sockaddr;
- 
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch b/meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch
new file mode 100644
index 0000000000..792a7888e3
--- /dev/null
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch
@@ -0,0 +1,141 @@
+From 3a59f8e5331bb6be5d298bc5c136a79102196c1d Mon Sep 17 00:00:00 2001
+From: Frank Denis <github@pureftpd.org>
+Date: Fri, 20 Oct 2023 13:47:57 +0200
+Subject: [PATCH] aarch64: set compiler attributes *after* including
+ <arm_neon.h>
+
+Fixes #1321
+
+Upstream-Status: Backport
+[https://github.com/jedisct1/libsodium/commit/8f453f41f8834e0fe47610f2a3e03e696ddb3450]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ thirdparty/libsodium-stable/configure.ac             | 11 ++++++-----
+ .../crypto_aead/aegis128l/aegis128l_armcrypto.c      | 12 ++++++------
+ .../crypto_aead/aegis256/aegis256_armcrypto.c        | 12 ++++++------
+ .../aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c   | 12 ++++++------
+ 4 files changed, 24 insertions(+), 23 deletions(-)
+
+diff --git a/thirdparty/libsodium-stable/configure.ac b/thirdparty/libsodium-stable/configure.ac
+index df83ef512..be67d3417 100644
+--- a/thirdparty/libsodium-stable/configure.ac
++++ b/thirdparty/libsodium-stable/configure.ac
+@@ -398,11 +398,6 @@ AS_IF([test "x$EMSCRIPTEN" = "x"], [
+     have_armcrypto=no
+     AC_MSG_CHECKING(for ARM crypto instructions set)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+-      #ifdef __clang__
+-      #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
+-      #elif defined(__GNUC__)
+-      #  pragma GCC target("+simd+crypto")
+-      #endif
+       #ifndef __ARM_FEATURE_CRYPTO
+       #  define __ARM_FEATURE_CRYPTO 1
+       #endif
+@@ -411,6 +406,12 @@ AS_IF([test "x$EMSCRIPTEN" = "x"], [
+       #endif
+ 
+       #include <arm_neon.h>
++
++      #ifdef __clang__
++      #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
++      #elif defined(__GNUC__)
++      #  pragma GCC target("+simd+crypto")
++      #endif
+     ]], [[
+       vaeseq_u8(vmovq_n_u8(0), vmovq_n_u8(0));
+ 
+diff --git a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c
+index 825de8a1c..a01f60cbe 100644
+--- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c
++++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c
+@@ -17,12 +17,6 @@
+ 
+ #include "aegis128l_armcrypto.h"
+ 
+-#ifdef __clang__
+-#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
+-#elif defined(__GNUC__)
+-#pragma GCC target("+simd+crypto")
+-#endif
+-
+ #ifndef __ARM_FEATURE_CRYPTO
+ #define __ARM_FEATURE_CRYPTO 1
+ #endif
+@@ -32,6 +26,12 @@
+ 
+ #include <arm_neon.h>
+ 
++#ifdef __clang__
++#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
++#elif defined(__GNUC__)
++#pragma GCC target("+simd+crypto")
++#endif
++
+ #define AES_BLOCK_LENGTH 16
+ 
+ typedef uint8x16_t aes_block_t;
+diff --git a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c
+index e1ebd577a..058e2072b 100644
+--- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c
++++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c
+@@ -17,12 +17,6 @@
+ 
+ #include "aegis256_armcrypto.h"
+ 
+-#ifdef __clang__
+-#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
+-#elif defined(__GNUC__)
+-#pragma GCC target("+simd+crypto")
+-#endif
+-
+ #ifndef __ARM_FEATURE_CRYPTO
+ #define __ARM_FEATURE_CRYPTO 1
+ #endif
+@@ -32,6 +26,12 @@
+ 
+ #include <arm_neon.h>
+ 
++#ifdef __clang__
++#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
++#elif defined(__GNUC__)
++#pragma GCC target("+simd+crypto")
++#endif
++
+ #define AES_BLOCK_LENGTH 16
+ 
+ typedef uint8x16_t aes_block_t;
+diff --git a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
+index 0a5a12811..aa76f5cd1 100644
+--- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
++++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
+@@ -19,12 +19,6 @@
+ #define __vectorcall
+ #endif
+ 
+-#ifdef __clang__
+-#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
+-#elif defined(__GNUC__)
+-#pragma GCC target("+simd+crypto")
+-#endif
+-
+ #ifndef __ARM_FEATURE_CRYPTO
+ #define __ARM_FEATURE_CRYPTO 1
+ #endif
+@@ -34,6 +28,12 @@
+ 
+ #include <arm_neon.h>
+ 
++#ifdef __clang__
++#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
++#elif defined(__GNUC__)
++#pragma GCC target("+simd+crypto")
++#endif
++
+ #define ABYTES    crypto_aead_aes256gcm_ABYTES
+ #define NPUBBYTES crypto_aead_aes256gcm_NPUBBYTES
+ #define KEYBYTES  crypto_aead_aes256gcm_KEYBYTES
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0008-libsodium-aarch64_crypto.patch b/meta-oe/recipes-extended/minifi-cpp/files/0008-libsodium-aarch64_crypto.patch
deleted file mode 100644
index c2c51148f6..0000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0008-libsodium-aarch64_crypto.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Move target #pragma after arm_neon.h include
-
-Fix per android/ndk#1945
-
-If the pragma is done before the header include,
-when using clang compiler attribute may apply to the functions in arm_neon.h
-
-Upstream-Status: Submitted [https://github.com/jedisct1/libsodium/pull/1321]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
-+++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
-@@ -19,12 +19,6 @@
- #define __vectorcall
- #endif
- 
--#ifdef __clang__
--#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
--#elif defined(__GNUC__)
--#pragma GCC target("+simd+crypto")
--#endif
--
- #ifndef __ARM_FEATURE_CRYPTO
- #define __ARM_FEATURE_CRYPTO 1
- #endif
-@@ -34,6 +28,12 @@
- 
- #include <arm_neon.h>
- 
-+#ifdef __clang__
-+#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
-+#elif defined(__GNUC__)
-+#pragma GCC target("+simd+crypto")
-+#endif
-+
- #define ABYTES    crypto_aead_aes256gcm_ABYTES
- #define NPUBBYTES crypto_aead_aes256gcm_NPUBBYTES
- #define KEYBYTES  crypto_aead_aes256gcm_KEYBYTES
diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb
index fca8d9e754..ab08322805 100644
--- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb
+++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb
@@ -5,66 +5,74 @@ management, focusing on the collection of data at the source of its creation."
 HOMEPAGE = "https://nifi.apache.org/minifi/index.html"
 SECTION = "console/network"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c62efdfb90a8aa4cc3bc15f56baa30b7"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4c5fc3bbd872752266d21f5f167ce297"
 
 SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=main \
            git://github.com/martinmoene/expected-lite.git;protocol=https;branch=master;name=expected-lite;destsuffix=${S}/thirdparty/expected-lite-src \
            git://github.com/ericniebler/range-v3.git;protocol=https;branch=master;name=range-v3;destsuffix=${S}/thirdparty/range-v3-src \
            git://github.com/Neargye/magic_enum.git;protocol=https;branch=master;name=magic-enum;destsuffix=${S}/thirdparty/magic-enum-src \
-           git://github.com/jarro2783/cxxopts.git;protocol=https;branch=v2_2;name=cxxopts;destsuffix=${S}/thirdparty/cxxopts-src \
+           git://github.com/p-ranav/argparse.git;protocol=https;branch=master;name=argparse;destsuffix=${S}/thirdparty/argparse-src \
            git://github.com/gsl-lite/gsl-lite.git;protocol=https;branch=master;name=gsl-lite;destsuffix=${S}/thirdparty/gsl-lite-src \
            git://github.com/HowardHinnant/date.git;protocol=https;branch=master;name=date;destsuffix=${S}/thirdparty/date-src \
            git://github.com/chriskohlhoff/asio.git;protocol=https;branch=master;name=asio;destsuffix=${S}/thirdparty/asio-src \
+           git://github.com/fmtlib/fmt.git;protocol=https;branch=master;name=fmt;destsuffix=${S}/thirdparty/fmt-src \
            git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x;name=spdlog;destsuffix=${S}/thirdparty/spdlog-src \
-           git://github.com/civetweb/civetweb.git;protocol=https;branch=master;name=civetweb;destsuffix=${S}/thirdparty/civetweb-src \
            ${DEBIAN_MIRROR}/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz;name=ossp-uuid;subdir=${S}/thirdparty \
            https://download.libsodium.org/libsodium/releases/libsodium-1.0.19.tar.gz;name=libsodium;subdir=${S}/thirdparty \
            file://0001-Do-not-use-bundled-packages.patch \
            file://0002-Fix-osspuuid-build.patch \
            file://0003-Fix-libsodium-build.patch \
-           file://0004-Fix-spdlog-build.patch \
-           file://0005-Pass-noline-flag-to-flex.patch \
-           file://0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch \
-           file://0007-CMakeLists.txt-do-not-use-ccache.patch \
-           file://0008-libsodium-aarch64_crypto.patch \
-           file://0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch \
+           file://0004-Pass-noline-flag-to-flex.patch \
+           file://0005-generateVersion.sh-set-correct-buildrev.patch \
+           file://0006-CMakeLists.txt-do-not-use-ccache.patch \
+           file://0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch \
            file://systemd-volatile.conf \
            file://sysvinit-volatile.conf \
           "
 
-SRCREV = "9b55dc0c0f17a190f3e9ade87070a28faf542c25"
+# minifi-cpp: 0.99.1
+SRCREV = "78d53ed154c71f1fabbaff0366d44ed3b32754e6"
+# expected-lite: 0.6.3
 SRCREV_expected-lite = "c8ffab649ba56e43c731b7017a69ddaebe2e1893"
+# range-v3: 0.12.0
 SRCREV_range-v3 = "a81477931a8aa2ad025c6bda0609f38e09e4d7ec"
-SRCREV_magic-enum = "e1ea11a93d0bdf6aae415124ded6126220fa4f28"
-SRCREV_cxxopts = "302302b30839505703d37fb82f536c53cf9172fa"
+# magic-enum: 0.9.6
+SRCREV_magic-enum = "dd6a39d0ba1852cf06907e0f0573a2a10d23c2ad"
+# argparse: 3.0
+SRCREV_argparse = "af442b4da0cd7a07b56fa709bd16571889dc7fda"
+# gsl-lite: 0.41.0
 SRCREV_gsl-lite = "755ba124b54914e672737acace6a9314f59e8d6f"
-SRCREV_date = "6e921e1b1d21e84a5c82416ba7ecd98e33a436d0"
+# date: 3.0.3
+SRCREV_date = "5bdb7e6f31fac909c090a46dbd9fea27b6e609a4"
+# asio: 1.29.0
 SRCREV_asio = "814f67e730e154547aea3f4d99f709cbdf1ea4a0"
-SRCREV_spdlog = "7c02e204c92545f869e2f04edaab1f19fe8b19fd"
-SRCREV_civetweb = "d7ba35bbb649209c66e582d5a0244ba988a15159"
+# fmt: 11.1.4
+SRCREV_fmt = "123913715afeb8a437e6388b4473fcc4753e1c9a"
+# spdlog: 1.15.1
+SRCREV_spdlog = "f355b3d58f7067eee1706ff3c801c2361011f3d5"
 
-SRCREV_FORMAT .= "_expected-lite_range-v3_magic-enum_cxxopts_gsl-lite_date_asio_spdlog_civetweb"
+SRCREV_FORMAT .= "_expected-lite_range-v3_magic-enum_argparse_gsl-lite_date_asio_fmt_spdlog"
 
+# ossp-uuid: 1.6.2
 SRC_URI[ossp-uuid.sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
+# libsodium: 1.0.19
 SRC_URI[libsodium.sha256sum] = "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea"
 
-S = "${UNPACKDIR}/git"
 
 inherit pkgconfig cmake systemd
 
-DEPENDS = "virtual/crypt bison-native flex-native flex openssl curl zlib xz bzip2 yaml-cpp"
+DEPENDS = "virtual/crypt bison-native flex-native flex openssl curl zlib xz bzip2 yaml-cpp zstd lz4"
 
 OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
 
+CXXFLAGS:append:toolchain-clang = " -Wno-error=c++11-narrowing-const-reference"
 LDFLAGS:append:riscv32 = " -latomic"
 
 EXTRA_OECMAKE = " \
                  -DCMAKE_BUILD_TYPE=Release \
                  -DHOST_SYS=${HOST_SYS} -DBUILD_SYS=${BUILD_SYS} \
-                 -DGCC_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \
-                 -DGCC_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \
                  -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \
-                 -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines --file-prefix-map=${S}=${TARGET_DBGSRC_DIR}' \
+                 -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines --file-prefix-map=${S}=${TARGET_DBGSRC_DIR} --file-prefix-map=${B}=${TARGET_DBGSRC_DIR}' \
                  -DENABLE_ENCRYPT_CONFIG=ON \
                  -DENABLE_LUA_SCRIPTING=OFF \
                  -DENABLE_PYTHON_SCRIPTING=OFF \
@@ -73,35 +81,49 @@ EXTRA_OECMAKE = " \
                  -DENABLE_GCP=OFF \
                  -DENABLE_KUBERNETES=OFF \
                  -DENABLE_MQTT=OFF \
+                 -DENABLE_GRAFANA_LOKI=OFF \
+                 -DENABLE_GRPC_FOR_LOKI=OFF \
                  -DENABLE_ELASTICSEARCH=OFF \
                  -DENABLE_SQL=OFF \
                  -DENABLE_PROMETHEUS=OFF \
                  -DENABLE_PROCFS=OFF \
                  -DENABLE_SPLUNK=OFF \
                  -DENABLE_OPC=OFF \
-                 -DENABLE_LIBRDKAFKA=OFF \
-                 -DDISABLE_CURL=OFF \
-                 -DDISABLE_BZIP2=OFF \
-                 -DDISABLE_LZMA=OFF \
-                 -DDISABLE_JEMALLOC=ON \
+                 -DENABLE_KAFKA=OFF \
+                 -DENABLE_BZIP2=ON \
+                 -DENABLE_LZMA=ON \
                  -DSKIP_TESTS=ON \
+                 -DMINIFI_OPENSSL_SOURCE=SYSTEM \
+                 -DMINIFI_LIBCURL_SOURCE=SYSTEM \
+                 -DMINIFI_ZSTD_SOURCE=SYSTEM \
+                 -DMINIFI_BZIP2_SOURCE=SYSTEM \
+                 -DMINIFI_LIBXML2_SOURCE=SYSTEM \
+                 -DMINIFI_CATCH2_SOURCE=SYSTEM \
+                 -DMINIFI_ZLIB_SOURCE=SYSTEM \
+                 -DMINIFI_FMT_SOURCE=BUILD \
+                 -DMINIFI_SPDLOG_SOURCE=BUILD \
                  -DFETCHCONTENT_SOURCE_DIR_GSL-LITE=${S}/thirdparty/gsl-lite-src \
                  -DFETCHCONTENT_SOURCE_DIR_DATE_SRC=${S}/thirdparty/date-src \
                  -DFETCHCONTENT_SOURCE_DIR_EXPECTED-LITE=${S}/thirdparty/expected-lite-src \
                  -DFETCHCONTENT_SOURCE_DIR_RANGE-V3_SRC=${S}/thirdparty/range-v3-src \
                  -DFETCHCONTENT_SOURCE_DIR_MAGIC_ENUM=${S}/thirdparty/magic-enum-src \
                  -DFETCHCONTENT_SOURCE_DIR_ASIO=${S}/thirdparty/asio-src \
-                 -DFETCHCONTENT_SOURCE_DIR_CXXOPTS_SRC=${S}/thirdparty/cxxopts-src \
-                 -DFETCHCONTENT_SOURCE_DIR_CIVETWEB=${S}/thirdparty/civetweb-src \
+                 -DFETCHCONTENT_SOURCE_DIR_ARGPARSE=${S}/thirdparty/argparse-src \
+                 -DFETCHCONTENT_SOURCE_DIR_FMT=${S}/thirdparty/fmt-src \
+                 -DFETCHCONTENT_SOURCE_DIR_SPDLOG=${S}/thirdparty/spdlog-src \
                  ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DENABLE_SYSTEMD=ON', '-DENABLE_SYSTEMD=OFF', d)} \
                 "
 
-PACKAGECONFIG ??= "civetweb libarchive rocksdb expression-language"
-PACKAGECONFIG[civetweb] = "-DDISABLE_CIVET=OFF,-DDISABLE_CIVET=ON"
-PACKAGECONFIG[openwsman] = "-DENABLE_OPENWSMAN=ON,-DENABLE_OPENWSMAN=OFF,libxml2"
-PACKAGECONFIG[libarchive] = "-DDISABLE_LIBARCHIVE=OFF,-DDISABLE_LIBARCHIVE=ON,libarchive"
-PACKAGECONFIG[rocksdb] = "-DDISABLE_ROCKSDB=OFF -DBUILD_ROCKSDB=OFF,-DDISABLE_ROCKSDB=ON,rocksdb"
-PACKAGECONFIG[expression-language] = "-DDISABLE_EXPRESSION_LANGUAGE=OFF, -DDISABLE_EXPRESSION_LANGUAGE=ON"
+PACKAGECONFIG ??= "libarchive expression-language"
+
+# rocksdb is not compatible with libc-musl:powerpc & armv5
+PACKAGECONFIG:remove:libc-musl:powerpc = "rocksdb"
+PACKAGECONFIG:remove:armv5 = "rocksdb"
+
+PACKAGECONFIG[libarchive] = "-DENABLE_LIBARCHIVE=ON,-DENABLE_LIBARCHIVE=OFF,libarchive"
+PACKAGECONFIG[expression-language] = "-DENABLE_EXPRESSION_LANGUAGE=ON, -DENABLE_EXPRESSION_LANGUAGE=OFF"
+PACKAGECONFIG[civetweb] = "-DENABLE_CIVET=ON -DMINIFI_CIVETWEB_SOURCE=SYSTEM,-DENABLE_CIVET=OFF,civetweb"
+PACKAGECONFIG[rocksdb] = "-DENABLE_ROCKSDB=ON -DBUILD_ROCKSDB=OFF -DMINIFI_ROCKSDB_SOURCE=SYSTEM,-DENABLE_ROCKSDB=OFF,rocksdb"
 
 SYSTEMD_PACKAGES = "minifi-cpp"
 SYSTEMD_SERVICE:${PN} = "minifi.service"
@@ -141,9 +163,9 @@ do_install() {
     install -m 755 ${WORKDIR}/minifi-install/usr/extensions/*.so ${D}${libdir}/minifi-extensions
 
     install -m 755 -d ${D}${libexecdir}/minifi-python
-    for i in examples google h2o; do
-        cp -rf ${WORKDIR}/minifi-install/usr/minifi-python/${i} ${D}${libexecdir}/minifi-python
-    done
+    install -m 755 -d ${D}${libexecdir}/minifi-python-examples
+    cp -rf ${WORKDIR}/minifi-install/usr/minifi-python/* ${D}${libexecdir}/minifi-python/
+    cp -rf ${WORKDIR}/minifi-install/usr/minifi-python-examples/* ${D}${libexecdir}/minifi-python-examples/
 
     sed -i "s|MINIFI_HOME=.*|MINIFI_HOME=${MINIFI_HOME}|g" ${D}${MINIFI_BIN}/minifi.sh
     sed -i "s|bin_dir=.*|bin_dir=${MINIFI_BIN}|g" ${D}${MINIFI_BIN}/minifi.sh
@@ -197,6 +219,7 @@ FILES:${PN}-dev = ""
 FILES:${PN} += "${libdir}/libcore-minifi.so \
                 ${libdir}/minifi-extensions \
                 ${libexecdir}/minifi-python \
+                ${libexecdir}/minifi-python-examples \
                "
 
 INSANE_SKIP:${PN} += "dev-deps"
diff --git a/meta-oe/recipes-extended/minio/src_uri.inc b/meta-oe/recipes-extended/minio/src_uri.inc
index 5cdc69dfca..964dfab9dc 100644
--- a/meta-oe/recipes-extended/minio/src_uri.inc
+++ b/meta-oe/recipes-extended/minio/src_uri.inc
@@ -1,509 +1,509 @@
 #       github.com/charmbracelet/bubbletea v0.19.3
 # [1] git ls-remote https://github.com/charmbracelet/bubbletea 3dc51789d11229a1fb00f137d02b50b04cac372b 
-SRCREV_bubbletea="3dc51789d11229a1fb00f137d02b50b04cac372b"
+SRCREV_bubbletea = "3dc51789d11229a1fb00f137d02b50b04cac372b"
 SRC_URI += "git://github.com/charmbracelet/bubbletea;name=bubbletea;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/charmbracelet/bubbletea"
 
 #       github.com/cheggaaa/pb v1.0.29
 # [1] git ls-remote https://github.com/cheggaaa/pb e2a33cc368a206516cc95f7bdd9176db0b83f098 
-SRCREV_pb="e2a33cc368a206516cc95f7bdd9176db0b83f098"
+SRCREV_pb = "e2a33cc368a206516cc95f7bdd9176db0b83f098"
 SRC_URI += "git://github.com/cheggaaa/pb;name=pb;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/cheggaaa/pb"
 
 #       github.com/dustin/go-humanize v1.0.0
 # [1] git ls-remote https://github.com/dustin/go-humanize e673fa1ffc91213297a60d18a6f513aa74bced52 
-SRCREV_go-humanize="e673fa1ffc91213297a60d18a6f513aa74bced52"
+SRCREV_go-humanize = "e673fa1ffc91213297a60d18a6f513aa74bced52"
 SRC_URI += "git://github.com/dustin/go-humanize;name=go-humanize;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/dustin/go-humanize"
 
 #       github.com/fatih/color v1.13.0
 # [1] git ls-remote https://github.com/fatih/color a05da93ebe62ca9fc6791d3376ec4dad01196448 
-SRCREV_color="a05da93ebe62ca9fc6791d3376ec4dad01196448"
+SRCREV_color = "a05da93ebe62ca9fc6791d3376ec4dad01196448"
 SRC_URI += "git://github.com/fatih/color;name=color;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/fatih/color"
 
 #       github.com/go-ole/go-ole v1.2.6
 # [1] git ls-remote https://github.com/go-ole/go-ole 8b1f7f90f6b1728609c9694f2cff140d34fd91f8 
-SRCREV_go-ole="8b1f7f90f6b1728609c9694f2cff140d34fd91f8"
+SRCREV_go-ole = "8b1f7f90f6b1728609c9694f2cff140d34fd91f8"
 SRC_URI += "git://github.com/go-ole/go-ole;name=go-ole;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/go-ole/go-ole"
 
 #       github.com/goccy/go-json v0.8.1
 # [1] git ls-remote https://github.com/goccy/go-json de89bd3db67f2219c6183ec6febe2b5f7a6b06fb 
-SRCREV_go-json="de89bd3db67f2219c6183ec6febe2b5f7a6b06fb"
+SRCREV_go-json = "de89bd3db67f2219c6183ec6febe2b5f7a6b06fb"
 SRC_URI += "git://github.com/goccy/go-json;name=go-json;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/goccy/go-json"
 
 #       github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 # [1] git ls-remote https://github.com/google/shlex e7afc7fbc51079733e9468cdfd1efcd7d196cd1d 
-SRCREV_shlex="e7afc7fbc51079733e9468cdfd1efcd7d196cd1d"
+SRCREV_shlex = "e7afc7fbc51079733e9468cdfd1efcd7d196cd1d"
 SRC_URI += "git://github.com/google/shlex;name=shlex;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/google/shlex"
 
 #       github.com/google/uuid v1.3.0
 # [1] git ls-remote https://github.com/google/uuid 44b5fee7c49cf3bcdf723f106b36d56ef13ccc88 
-SRCREV_uuid="44b5fee7c49cf3bcdf723f106b36d56ef13ccc88"
+SRCREV_uuid = "44b5fee7c49cf3bcdf723f106b36d56ef13ccc88"
 SRC_URI += "git://github.com/google/uuid;name=uuid;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/google/uuid"
 
 #       github.com/inconshreveable/mousetrap v1.0.0
 # [1] git ls-remote https://github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 
-SRCREV_mousetrap="76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+SRCREV_mousetrap = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
 SRC_URI += "git://github.com/inconshreveable/mousetrap;name=mousetrap;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/inconshreveable/mousetrap"
 
 #       github.com/json-iterator/go v1.1.12
 # [1] git ls-remote https://github.com/json-iterator/go 024077e996b048517130b21ea6bf12aa23055d3d 
-SRCREV_go="024077e996b048517130b21ea6bf12aa23055d3d"
+SRCREV_go = "024077e996b048517130b21ea6bf12aa23055d3d"
 SRC_URI += "git://github.com/json-iterator/go;name=go;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/json-iterator/go"
 
 #       github.com/klauspost/compress v1.13.6
 # [1] git ls-remote https://github.com/klauspost/compress 38d4ba985ac157cb858763e016645e14e74c13c4 
-SRCREV_compress="38d4ba985ac157cb858763e016645e14e74c13c4"
+SRCREV_compress = "38d4ba985ac157cb858763e016645e14e74c13c4"
 SRC_URI += "git://github.com/klauspost/compress;name=compress;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/klauspost/compress"
 
 #       github.com/mattn/go-ieproxy v0.0.1
 # [1] git ls-remote https://github.com/mattn/go-ieproxy 439dd0581a2a03b415673a2462ad5c21eaabc588 
-SRCREV_go-ieproxy="439dd0581a2a03b415673a2462ad5c21eaabc588"
+SRCREV_go-ieproxy = "439dd0581a2a03b415673a2462ad5c21eaabc588"
 SRC_URI += "git://github.com/mattn/go-ieproxy;name=go-ieproxy;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/mattn/go-ieproxy"
 
 #       github.com/mattn/go-isatty v0.0.14
 # [1] git ls-remote https://github.com/mattn/go-isatty 504425e14f742f1f517c4586048b49b37f829c8e 
-SRCREV_go-isatty="504425e14f742f1f517c4586048b49b37f829c8e"
+SRCREV_go-isatty = "504425e14f742f1f517c4586048b49b37f829c8e"
 SRC_URI += "git://github.com/mattn/go-isatty;name=go-isatty;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/mattn/go-isatty"
 
 #       github.com/minio/cli v1.22.0
 # [1] git ls-remote https://github.com/minio/cli 735b30120ed7535d13933b0246f8a75cf80b0f74 
-SRCREV_cli="735b30120ed7535d13933b0246f8a75cf80b0f74"
+SRCREV_cli = "735b30120ed7535d13933b0246f8a75cf80b0f74"
 SRC_URI += "git://github.com/minio/cli;name=cli;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/cli"
 
 #       github.com/minio/colorjson v1.0.2
 # [1] git ls-remote https://github.com/minio/colorjson f964b335cdb6cd51dff32a726d3d6ab9e1db0633 
-SRCREV_colorjson="f964b335cdb6cd51dff32a726d3d6ab9e1db0633"
+SRCREV_colorjson = "f964b335cdb6cd51dff32a726d3d6ab9e1db0633"
 SRC_URI += "git://github.com/minio/colorjson;name=colorjson;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/colorjson"
 
 #       github.com/minio/filepath v1.0.0
 # [1] git ls-remote https://github.com/minio/filepath a116cb5d2b6396deea35d06389e3e9809c887fcf 
-SRCREV_filepath="a116cb5d2b6396deea35d06389e3e9809c887fcf"
+SRCREV_filepath = "a116cb5d2b6396deea35d06389e3e9809c887fcf"
 SRC_URI += "git://github.com/minio/filepath;name=filepath;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/filepath"
 
 #       github.com/minio/madmin-go v1.4.3
 # [1] git ls-remote https://github.com/minio/madmin-go 4f71c826739af4ebf73308e7f9a849a781859f78 
-SRCREV_madmin-go="4f71c826739af4ebf73308e7f9a849a781859f78"
+SRCREV_madmin-go = "4f71c826739af4ebf73308e7f9a849a781859f78"
 SRC_URI += "git://github.com/minio/madmin-go;name=madmin-go;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/madmin-go"
 
 #       github.com/minio/md5-simd v1.1.2
 # [1] git ls-remote https://github.com/minio/md5-simd 776275e0c9a74ceebbd50fe5c1d61b0c80c608df 
-SRCREV_md5-simd="776275e0c9a74ceebbd50fe5c1d61b0c80c608df"
+SRCREV_md5-simd = "776275e0c9a74ceebbd50fe5c1d61b0c80c608df"
 SRC_URI += "git://github.com/minio/md5-simd;name=md5-simd;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/md5-simd"
 
 #       github.com/minio/minio-go/v7 v7.0.30
 # [1] git ls-remote https://github.com/minio/minio-go 81c303325bb4426c89776854b2ea4f7936deb11c 
-SRCREV_v7="81c303325bb4426c89776854b2ea4f7936deb11c"
+SRCREV_v7 = "81c303325bb4426c89776854b2ea4f7936deb11c"
 SRC_URI += "git://github.com/minio/minio-go;name=v7;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/minio-go/v7"
 
 #       github.com/minio/pkg v1.1.22
 # [1] git ls-remote https://github.com/minio/pkg 3b76bdaec27995a31d0b0a7959bbef55bfe0d364 
-SRCREV_pkg="3b76bdaec27995a31d0b0a7959bbef55bfe0d364"
+SRCREV_pkg = "3b76bdaec27995a31d0b0a7959bbef55bfe0d364"
 SRC_URI += "git://github.com/minio/pkg;name=pkg;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/pkg"
 
 #       github.com/minio/selfupdate v0.4.0
 # [1] git ls-remote https://github.com/minio/selfupdate 9e32fb8d38277355add4fa3983edb0b376d12bb5 
-SRCREV_selfupdate="9e32fb8d38277355add4fa3983edb0b376d12bb5"
+SRCREV_selfupdate = "9e32fb8d38277355add4fa3983edb0b376d12bb5"
 SRC_URI += "git://github.com/minio/selfupdate;name=selfupdate;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/selfupdate"
 
 #       github.com/minio/sha256-simd v1.0.0
 # [1] git ls-remote https://github.com/minio/sha256-simd 6a57409d8e0fa3ae883aee331b71aaa40d5a7dd9 
-SRCREV_sha256-simd="6a57409d8e0fa3ae883aee331b71aaa40d5a7dd9"
+SRCREV_sha256-simd = "6a57409d8e0fa3ae883aee331b71aaa40d5a7dd9"
 SRC_URI += "git://github.com/minio/sha256-simd;name=sha256-simd;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/sha256-simd"
 
 #       github.com/mitchellh/go-homedir v1.1.0
 # [1] git ls-remote https://github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727 
-SRCREV_go-homedir="af06845cf3004701891bf4fdb884bfe4920b3727"
+SRCREV_go-homedir = "af06845cf3004701891bf4fdb884bfe4920b3727"
 SRC_URI += "git://github.com/mitchellh/go-homedir;name=go-homedir;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/mitchellh/go-homedir"
 
 #       github.com/pkg/xattr v0.4.4
 # [1] git ls-remote https://github.com/pkg/xattr 8725d4ccc0fcef59c8d9f0eaf606b3c6f962467a 
-SRCREV_xattr="8725d4ccc0fcef59c8d9f0eaf606b3c6f962467a"
+SRCREV_xattr = "8725d4ccc0fcef59c8d9f0eaf606b3c6f962467a"
 SRC_URI += "git://github.com/pkg/xattr;name=xattr;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/pkg/xattr"
 
 #       github.com/posener/complete v1.2.3
 # [1] git ls-remote https://github.com/posener/complete 05b68ffc813dd10c420993cb1cf927b346c057b8 
-SRCREV_complete="05b68ffc813dd10c420993cb1cf927b346c057b8"
+SRCREV_complete = "05b68ffc813dd10c420993cb1cf927b346c057b8"
 SRC_URI += "git://github.com/posener/complete;name=complete;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/posener/complete"
 
 #       github.com/prometheus/client_golang v1.12.1
 # [1] git ls-remote https://github.com/prometheus/client_golang 2e1c4818ccfdcf953ce399cadad615ff2bed968c 
-SRCREV_client_golang="2e1c4818ccfdcf953ce399cadad615ff2bed968c"
+SRCREV_client_golang = "2e1c4818ccfdcf953ce399cadad615ff2bed968c"
 SRC_URI += "git://github.com/prometheus/client_golang;name=client_golang;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/client_golang"
 
 #       github.com/prometheus/prom2json v1.3.1
 # [1] git ls-remote https://github.com/prometheus/prom2json ac13972e54feb2f8eafc9a613112cb310f5463dc 
-SRCREV_prom2json="ac13972e54feb2f8eafc9a613112cb310f5463dc"
+SRCREV_prom2json = "ac13972e54feb2f8eafc9a613112cb310f5463dc"
 SRC_URI += "git://github.com/prometheus/prom2json;name=prom2json;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/prom2json"
 
 #       github.com/rjeczalik/notify v0.9.2
 # [1] git ls-remote https://github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7 
-SRCREV_notify="69d839f37b13a8cb7a78366f7633a4071cb43be7"
+SRCREV_notify = "69d839f37b13a8cb7a78366f7633a4071cb43be7"
 SRC_URI += "git://github.com/rjeczalik/notify;name=notify;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rjeczalik/notify"
 
 #       github.com/rs/xid v1.3.0
 # [1] git ls-remote https://github.com/rs/xid efa678f304ab65d6d57eedcb086798381ae22206 
-SRCREV_xid="efa678f304ab65d6d57eedcb086798381ae22206"
+SRCREV_xid = "efa678f304ab65d6d57eedcb086798381ae22206"
 SRC_URI += "git://github.com/rs/xid;name=xid;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rs/xid"
 
 #       github.com/secure-io/sio-go v0.3.1
 # [1] git ls-remote https://github.com/secure-io/sio-go a455d2cd8fcacdfe18557d117db15c0629fb7e2c 
-SRCREV_sio-go="a455d2cd8fcacdfe18557d117db15c0629fb7e2c"
+SRCREV_sio-go = "a455d2cd8fcacdfe18557d117db15c0629fb7e2c"
 SRC_URI += "git://github.com/secure-io/sio-go;name=sio-go;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/secure-io/sio-go"
 
 #       github.com/shirou/gopsutil/v3 v3.21.12
 # [1] git ls-remote https://github.com/shirou/gopsutil 2f8da0a39487ceddf44cebe53a1b563b0b7173cc 
-SRCREV_v3="2f8da0a39487ceddf44cebe53a1b563b0b7173cc"
+SRCREV_v3 = "2f8da0a39487ceddf44cebe53a1b563b0b7173cc"
 SRC_URI += "git://github.com/shirou/gopsutil;name=v3;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/shirou/gopsutil/v3"
 
 #       github.com/tidwall/gjson v1.12.1
 # [1] git ls-remote https://github.com/tidwall/gjson db0033701cccc8e2e43b77d03e4f509a48b6b2f2 
-SRCREV_gjson="db0033701cccc8e2e43b77d03e4f509a48b6b2f2"
+SRCREV_gjson = "db0033701cccc8e2e43b77d03e4f509a48b6b2f2"
 SRC_URI += "git://github.com/tidwall/gjson;name=gjson;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tidwall/gjson"
 
 #       golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
 # [1] git ls-remote https://go.googlesource.com/crypto 793ad666bf5ec61392092b27061be9618e4e219b 
-SRCREV_crypto="793ad666bf5ec61392092b27061be9618e4e219b"
+SRCREV_crypto = "793ad666bf5ec61392092b27061be9618e4e219b"
 SRC_URI += "git://go.googlesource.com/crypto;name=crypto;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/crypto"
 
 #       golang.org/x/net v0.0.0-20220225172249-27dd8689420f
 # [1] git ls-remote https://go.googlesource.com/net 27dd8689420fcde088514397d015e4fea5174e0e 
-SRCREV_net="27dd8689420fcde088514397d015e4fea5174e0e"
+SRCREV_net = "27dd8689420fcde088514397d015e4fea5174e0e"
 SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/net"
 
 #       golang.org/x/text v0.3.7
 # [1] git ls-remote https://go.googlesource.com/text 3cd4007149f3f883d229d707172ed356727aae99 
-SRCREV_text="3cd4007149f3f883d229d707172ed356727aae99"
+SRCREV_text = "3cd4007149f3f883d229d707172ed356727aae99"
 SRC_URI += "git://go.googlesource.com/text;name=text;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/text"
 
 #       gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b
 # [1] git ls-remote https://gopkg.in/check.v1 038fdea0a05bc030b0bfda479dc2e08d2220ec74 
-SRCREV_check.v1="038fdea0a05bc030b0bfda479dc2e08d2220ec74"
+SRCREV_check.v1 = "038fdea0a05bc030b0bfda479dc2e08d2220ec74"
 SRC_URI += "git://gopkg.in/check.v1;name=check.v1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/check.v1"
 
 #       gopkg.in/h2non/filetype.v1 v1.0.5
 # [1] git ls-remote https://gopkg.in/h2non/filetype.v1 8f3142c797f0413f00dadaf1bf97dd0b7b1f8d8b 
-SRCREV_filetype.v1="8f3142c797f0413f00dadaf1bf97dd0b7b1f8d8b"
+SRCREV_filetype.v1 = "8f3142c797f0413f00dadaf1bf97dd0b7b1f8d8b"
 SRC_URI += "git://gopkg.in/h2non/filetype.v1;name=filetype.v1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/h2non/filetype.v1"
 
 #       gopkg.in/yaml.v2 v2.4.0
 # [1] git ls-remote https://gopkg.in/yaml.v2 7649d4548cb53a614db133b2a8ac1f31859dda8c 
-SRCREV_yaml.v2="7649d4548cb53a614db133b2a8ac1f31859dda8c"
+SRCREV_yaml.v2 = "7649d4548cb53a614db133b2a8ac1f31859dda8c"
 SRC_URI += "git://gopkg.in/yaml.v2;name=yaml.v2;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/yaml.v2"
 
 #       github.com/charmbracelet/bubbles v0.10.0
 # [1] git ls-remote https://github.com/charmbracelet/bubbles 7714089ad7c81898564ebeb7b6876b5844e26ccd 
-SRCREV_bubbles="7714089ad7c81898564ebeb7b6876b5844e26ccd"
+SRCREV_bubbles = "7714089ad7c81898564ebeb7b6876b5844e26ccd"
 SRC_URI += "git://github.com/charmbracelet/bubbles;name=bubbles;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/charmbracelet/bubbles"
 
 #       github.com/charmbracelet/lipgloss v0.4.1-0.20220204041308-bf2912e703f6
 # [1] git ls-remote https://github.com/charmbracelet/lipgloss bf2912e703f6ecf88a1b843472afd47ce5002caf 
-SRCREV_lipgloss="bf2912e703f6ecf88a1b843472afd47ce5002caf"
+SRCREV_lipgloss = "bf2912e703f6ecf88a1b843472afd47ce5002caf"
 SRC_URI += "git://github.com/charmbracelet/lipgloss;name=lipgloss;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/charmbracelet/lipgloss"
 
 #       github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1
 # [1] git ls-remote https://github.com/gdamore/tcell f057f0a857a1b3ac3e4fff8c6cfe8126f8387cd1 
-SRCREV_v2="f057f0a857a1b3ac3e4fff8c6cfe8126f8387cd1"
+SRCREV_v2 = "f057f0a857a1b3ac3e4fff8c6cfe8126f8387cd1"
 SRC_URI += "git://github.com/gdamore/tcell;name=v2;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/gdamore/tcell/v2"
 
 #       github.com/golang-jwt/jwt/v4 v4.4.1
 # [1] git ls-remote https://github.com/golang-jwt/jwt 0972257eba279bb357882afc11db8218644ad565 
-SRCREV_v4="0972257eba279bb357882afc11db8218644ad565"
+SRCREV_v4 = "0972257eba279bb357882afc11db8218644ad565"
 SRC_URI += "git://github.com/golang-jwt/jwt;name=v4;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/golang-jwt/jwt/v4"
 
 #       github.com/navidys/tvxwidgets v0.1.0
 # [1] git ls-remote https://github.com/navidys/tvxwidgets f017cfd5ce6d4bd7fb22529305d7a438c3f1369d 
-SRCREV_tvxwidgets="f017cfd5ce6d4bd7fb22529305d7a438c3f1369d"
+SRCREV_tvxwidgets = "f017cfd5ce6d4bd7fb22529305d7a438c3f1369d"
 SRC_URI += "git://github.com/navidys/tvxwidgets;name=tvxwidgets;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/navidys/tvxwidgets"
 
 #       github.com/olekukonko/tablewriter v0.0.5
 # [1] git ls-remote https://github.com/olekukonko/tablewriter c7d2a8a09b076b70918308a3cd95464b2ae3b5d8 
-SRCREV_tablewriter="c7d2a8a09b076b70918308a3cd95464b2ae3b5d8"
+SRCREV_tablewriter = "c7d2a8a09b076b70918308a3cd95464b2ae3b5d8"
 SRC_URI += "git://github.com/olekukonko/tablewriter;name=tablewriter;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/olekukonko/tablewriter"
 
 #       github.com/prometheus/client_model v0.2.0
 # [1] git ls-remote https://github.com/prometheus/client_model f44e7adcba5ee54c8a94709e6fc300d83245f171 
-SRCREV_client_model="f44e7adcba5ee54c8a94709e6fc300d83245f171"
+SRCREV_client_model = "f44e7adcba5ee54c8a94709e6fc300d83245f171"
 SRC_URI += "git://github.com/prometheus/client_model;name=client_model;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/client_model"
 
 #       github.com/rivo/tview v0.0.0-20211202162923-2a6de950f73b
 # [1] git ls-remote https://github.com/rivo/tview 2a6de950f73bdc70658f7e754d4b5593f15c8408 
-SRCREV_tview="2a6de950f73bdc70658f7e754d4b5593f15c8408"
+SRCREV_tview = "2a6de950f73bdc70658f7e754d4b5593f15c8408"
 SRC_URI += "git://github.com/rivo/tview;name=tview;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rivo/tview"
 
 #       github.com/tinylib/msgp v1.1.6
 # [1] git ls-remote https://github.com/tinylib/msgp 205265da651409c54677b486e350b4d105da6d8b 
-SRCREV_msgp="205265da651409c54677b486e350b4d105da6d8b"
+SRCREV_msgp = "205265da651409c54677b486e350b4d105da6d8b"
 SRC_URI += "git://github.com/tinylib/msgp;name=msgp;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tinylib/msgp"
 
 #       golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
 # [1] git ls-remote https://go.googlesource.com/term 03fcf44c2211dcd5eb77510b5f7c1fb02d6ded50 
-SRCREV_term="03fcf44c2211dcd5eb77510b5f7c1fb02d6ded50"
+SRCREV_term = "03fcf44c2211dcd5eb77510b5f7c1fb02d6ded50"
 SRC_URI += "git://go.googlesource.com/term;name=term;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/term"
 
 #       github.com/beorn7/perks v1.0.1
 # [1] git ls-remote https://github.com/beorn7/perks c49ff274687222a7373c4cd83578f1065cf3e143 
-SRCREV_perks="c49ff274687222a7373c4cd83578f1065cf3e143"
+SRCREV_perks = "c49ff274687222a7373c4cd83578f1065cf3e143"
 SRC_URI += "git://github.com/beorn7/perks;name=perks;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/beorn7/perks"
 
 #       github.com/cespare/xxhash/v2 v2.1.2
 # [1] git ls-remote https://github.com/cespare/xxhash 7ae26c41ed6fb1f8a6c21e05eeff4d91b5e401c4 
-SRCREV_v21="7ae26c41ed6fb1f8a6c21e05eeff4d91b5e401c4"
+SRCREV_v21 = "7ae26c41ed6fb1f8a6c21e05eeff4d91b5e401c4"
 SRC_URI += "git://github.com/cespare/xxhash;name=v21;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/cespare/xxhash/v2"
 
 #       github.com/containerd/console v1.0.2
 # [1] git ls-remote https://github.com/containerd/console d5efa7d56fd239f7f3dad2ab6685db09359a3618 
-SRCREV_console="d5efa7d56fd239f7f3dad2ab6685db09359a3618"
+SRCREV_console = "d5efa7d56fd239f7f3dad2ab6685db09359a3618"
 SRC_URI += "git://github.com/containerd/console;name=console;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/console"
 
 #       github.com/coreos/go-semver v0.3.0
 # [1] git ls-remote https://github.com/coreos/go-semver 6e25b691b0ebe9657dd0ee60d73a9f8716f0c6f5 
-SRCREV_go-semver="6e25b691b0ebe9657dd0ee60d73a9f8716f0c6f5"
+SRCREV_go-semver = "6e25b691b0ebe9657dd0ee60d73a9f8716f0c6f5"
 SRC_URI += "git://github.com/coreos/go-semver;name=go-semver;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/coreos/go-semver"
 
 #       github.com/coreos/go-systemd/v22 v22.3.2
 # [1] git ls-remote https://github.com/coreos/go-systemd 0b40357fd65760243a3eceb80a299772c23c8470 
-SRCREV_v22="0b40357fd65760243a3eceb80a299772c23c8470"
+SRCREV_v22 = "0b40357fd65760243a3eceb80a299772c23c8470"
 SRC_URI += "git://github.com/coreos/go-systemd;name=v22;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/coreos/go-systemd/v22"
 
 #       github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1
 # [1] git ls-remote https://github.com/decred/dcrd 75f1b4dac2e43133f3281ac63a9ef9eb699200e5 
-SRCREV_v41="75f1b4dac2e43133f3281ac63a9ef9eb699200e5"
+SRCREV_v41 = "75f1b4dac2e43133f3281ac63a9ef9eb699200e5"
 SRC_URI += "git://github.com/decred/dcrd;name=v41;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/decred/dcrd/dcrec/secp256k1/v4"
 
 #       github.com/fatih/structs v1.1.0
 # [1] git ls-remote https://github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047 
-SRCREV_structs="4966fc68f5b7593aafa6cbbba2d65ec6e1416047"
+SRCREV_structs = "4966fc68f5b7593aafa6cbbba2d65ec6e1416047"
 SRC_URI += "git://github.com/fatih/structs;name=structs;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/fatih/structs"
 
 #       github.com/gdamore/encoding v1.0.0
 # [1] git ls-remote https://github.com/gdamore/encoding 79c592247a6248468805a0e297f43a7cac979903 
-SRCREV_encoding="79c592247a6248468805a0e297f43a7cac979903"
+SRCREV_encoding = "79c592247a6248468805a0e297f43a7cac979903"
 SRC_URI += "git://github.com/gdamore/encoding;name=encoding;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/gdamore/encoding"
 
 #       github.com/gogo/protobuf v1.3.2
 # [1] git ls-remote https://github.com/gogo/protobuf b03c65ea87cdc3521ede29f62fe3ce239267c1bc 
-SRCREV_protobuf="b03c65ea87cdc3521ede29f62fe3ce239267c1bc"
+SRCREV_protobuf = "b03c65ea87cdc3521ede29f62fe3ce239267c1bc"
 SRC_URI += "git://github.com/gogo/protobuf;name=protobuf;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/gogo/protobuf"
 
 #       github.com/golang/protobuf v1.5.2
 # [1] git ls-remote https://github.com/golang/protobuf ae97035608a719c7a1c1c41bed0ae0744bdb0c6f 
-SRCREV_protobuf1="ae97035608a719c7a1c1c41bed0ae0744bdb0c6f"
+SRCREV_protobuf1 = "ae97035608a719c7a1c1c41bed0ae0744bdb0c6f"
 SRC_URI += "git://github.com/golang/protobuf;name=protobuf1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/golang/protobuf"
 
 #       github.com/hashicorp/errwrap v1.1.0
 # [1] git ls-remote https://github.com/hashicorp/errwrap 7b00e5db719c64d14dd0caaacbd13e76254d02c0 
-SRCREV_errwrap="7b00e5db719c64d14dd0caaacbd13e76254d02c0"
+SRCREV_errwrap = "7b00e5db719c64d14dd0caaacbd13e76254d02c0"
 SRC_URI += "git://github.com/hashicorp/errwrap;name=errwrap;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/hashicorp/errwrap"
 
 #       github.com/hashicorp/go-multierror v1.1.1
 # [1] git ls-remote https://github.com/hashicorp/go-multierror 9974e9ec57696378079ecc3accd3d6f29401b3a0 
-SRCREV_go-multierror="9974e9ec57696378079ecc3accd3d6f29401b3a0"
+SRCREV_go-multierror = "9974e9ec57696378079ecc3accd3d6f29401b3a0"
 SRC_URI += "git://github.com/hashicorp/go-multierror;name=go-multierror;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/hashicorp/go-multierror"
 
 #       github.com/klauspost/cpuid/v2 v2.0.9
 # [1] git ls-remote https://github.com/klauspost/cpuid 6903d4066801a7d800d4537ee9eebe81ea97000e 
-SRCREV_v212="6903d4066801a7d800d4537ee9eebe81ea97000e"
+SRCREV_v212 = "6903d4066801a7d800d4537ee9eebe81ea97000e"
 SRC_URI += "git://github.com/klauspost/cpuid;name=v212;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/klauspost/cpuid/v2"
 
 #       github.com/kr/text v0.2.0
 # [1] git ls-remote https://github.com/kr/text 0e5f52c28dd72ab84daeb81b5a51f20fdc35f9c5 
-SRCREV_text1="0e5f52c28dd72ab84daeb81b5a51f20fdc35f9c5"
+SRCREV_text1 = "0e5f52c28dd72ab84daeb81b5a51f20fdc35f9c5"
 SRC_URI += "git://github.com/kr/text;name=text1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/kr/text"
 
 #       github.com/lestrrat-go/backoff/v2 v2.0.8
 # [1] git ls-remote https://github.com/lestrrat-go/backoff c3af762cb9d2bc8339e1d5099a4550366a675f60 
-SRCREV_v2123="c3af762cb9d2bc8339e1d5099a4550366a675f60"
+SRCREV_v2123 = "c3af762cb9d2bc8339e1d5099a4550366a675f60"
 SRC_URI += "git://github.com/lestrrat-go/backoff;name=v2123;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/backoff/v2"
 
 #       github.com/lestrrat-go/blackmagic v1.0.0
 # [1] git ls-remote https://github.com/lestrrat-go/blackmagic 370527f88bbfd5be3192a38af3148dbd64f0976f 
-SRCREV_blackmagic="370527f88bbfd5be3192a38af3148dbd64f0976f"
+SRCREV_blackmagic = "370527f88bbfd5be3192a38af3148dbd64f0976f"
 SRC_URI += "git://github.com/lestrrat-go/blackmagic;name=blackmagic;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/blackmagic"
 
 #       github.com/lestrrat-go/httpcc v1.0.0
 # [1] git ls-remote https://github.com/lestrrat-go/httpcc e7e8fea419e32f7549252ad15ecf17f3a3c1a268 
-SRCREV_httpcc="e7e8fea419e32f7549252ad15ecf17f3a3c1a268"
+SRCREV_httpcc = "e7e8fea419e32f7549252ad15ecf17f3a3c1a268"
 SRC_URI += "git://github.com/lestrrat-go/httpcc;name=httpcc;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/httpcc"
 
 #       github.com/lestrrat-go/iter v1.0.1
 # [1] git ls-remote https://github.com/lestrrat-go/iter 628869e97ee3dcc09033086e547a5cab96b0d708 
-SRCREV_iter="628869e97ee3dcc09033086e547a5cab96b0d708"
+SRCREV_iter = "628869e97ee3dcc09033086e547a5cab96b0d708"
 SRC_URI += "git://github.com/lestrrat-go/iter;name=iter;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/iter"
 
 #       github.com/lestrrat-go/jwx v1.2.14
 # [1] git ls-remote https://github.com/lestrrat-go/jwx de7d9bca43812abc4f630320f8632108ccfe34bf 
-SRCREV_jwx="de7d9bca43812abc4f630320f8632108ccfe34bf"
+SRCREV_jwx = "de7d9bca43812abc4f630320f8632108ccfe34bf"
 SRC_URI += "git://github.com/lestrrat-go/jwx;name=jwx;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/jwx"
 
 #       github.com/lestrrat-go/option v1.0.0
 # [1] git ls-remote https://github.com/lestrrat-go/option 7e3467dce320ff45667b138ae503367c92deaa0b 
-SRCREV_option="7e3467dce320ff45667b138ae503367c92deaa0b"
+SRCREV_option = "7e3467dce320ff45667b138ae503367c92deaa0b"
 SRC_URI += "git://github.com/lestrrat-go/option;name=option;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/option"
 
 #       github.com/lucasb-eyer/go-colorful v1.2.0
 # [1] git ls-remote https://github.com/lucasb-eyer/go-colorful d2b05a0d83cca9d610425691c3253d5f36d0ad06 
-SRCREV_go-colorful="d2b05a0d83cca9d610425691c3253d5f36d0ad06"
+SRCREV_go-colorful = "d2b05a0d83cca9d610425691c3253d5f36d0ad06"
 SRC_URI += "git://github.com/lucasb-eyer/go-colorful;name=go-colorful;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lucasb-eyer/go-colorful"
 
 #       github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0
 # [1] git ls-remote https://github.com/lufia/plan9stats 39d0f177ccd07bdf5eb6f051ab9b09651f05d6f2 
-SRCREV_plan9stats="39d0f177ccd07bdf5eb6f051ab9b09651f05d6f2"
+SRCREV_plan9stats = "39d0f177ccd07bdf5eb6f051ab9b09651f05d6f2"
 SRC_URI += "git://github.com/lufia/plan9stats;name=plan9stats;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lufia/plan9stats"
 
 #       github.com/mattn/go-colorable v0.1.12
 # [1] git ls-remote https://github.com/mattn/go-colorable e1bb79c8d53c38a60962ad4b8f658226cc983710 
-SRCREV_go-colorable="e1bb79c8d53c38a60962ad4b8f658226cc983710"
+SRCREV_go-colorable = "e1bb79c8d53c38a60962ad4b8f658226cc983710"
 SRC_URI += "git://github.com/mattn/go-colorable;name=go-colorable;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/mattn/go-colorable"
 
 #       github.com/mattn/go-runewidth v0.0.13
 # [1] git ls-remote https://github.com/mattn/go-runewidth df1ff59654317c1b5a3f860ffc47402931932104 
-SRCREV_go-runewidth="df1ff59654317c1b5a3f860ffc47402931932104"
+SRCREV_go-runewidth = "df1ff59654317c1b5a3f860ffc47402931932104"
 SRC_URI += "git://github.com/mattn/go-runewidth;name=go-runewidth;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/mattn/go-runewidth"
 
 #       github.com/matttproud/golang_protobuf_extensions v1.0.1
 # [1] git ls-remote https://github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c 
-SRCREV_golang_protobuf_extensions="c12348ce28de40eed0136aa2b644d0ee0650e56c"
+SRCREV_golang_protobuf_extensions = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
 SRC_URI += "git://github.com/matttproud/golang_protobuf_extensions;name=golang_protobuf_extensions;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/matttproud/golang_protobuf_extensions"
 
 #       github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
 # [1] git ls-remote https://github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 
-SRCREV_concurrent="bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+SRCREV_concurrent = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
 SRC_URI += "git://github.com/modern-go/concurrent;name=concurrent;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/modern-go/concurrent"
 
 #       github.com/modern-go/reflect2 v1.0.2
 # [1] git ls-remote https://github.com/modern-go/reflect2 2b33151c9bbc5231aea69b8861c540102b087070 
-SRCREV_reflect2="2b33151c9bbc5231aea69b8861c540102b087070"
+SRCREV_reflect2 = "2b33151c9bbc5231aea69b8861c540102b087070"
 SRC_URI += "git://github.com/modern-go/reflect2;name=reflect2;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/modern-go/reflect2"
 
 #       github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b
 # [1] git ls-remote https://github.com/muesli/ansi 2e021307bc4b4f4766c3fb4faf6030b13dc9ec51 
-SRCREV_ansi="2e021307bc4b4f4766c3fb4faf6030b13dc9ec51"
+SRCREV_ansi = "2e021307bc4b4f4766c3fb4faf6030b13dc9ec51"
 SRC_URI += "git://github.com/muesli/ansi;name=ansi;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/muesli/ansi"
 
 #       github.com/muesli/reflow v0.3.0
 # [1] git ls-remote https://github.com/muesli/reflow 602e329532049c9e33fa8c74e352a46fb9486947 
-SRCREV_reflow="602e329532049c9e33fa8c74e352a46fb9486947"
+SRCREV_reflow = "602e329532049c9e33fa8c74e352a46fb9486947"
 SRC_URI += "git://github.com/muesli/reflow;name=reflow;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/muesli/reflow"
 
 #       github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0
 # [1] git ls-remote https://github.com/muesli/termenv 5ac8409525e03ee6cd96daeae32d47902b88f32a 
-SRCREV_termenv="5ac8409525e03ee6cd96daeae32d47902b88f32a"
+SRCREV_termenv = "5ac8409525e03ee6cd96daeae32d47902b88f32a"
 SRC_URI += "git://github.com/muesli/termenv;name=termenv;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/muesli/termenv"
 
 #       github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
 # [1] git ls-remote https://github.com/niemeyer/pretty a10e7caefd8e0d600cea437f5c3613aeb1553d56 
-SRCREV_pretty="a10e7caefd8e0d600cea437f5c3613aeb1553d56"
+SRCREV_pretty = "a10e7caefd8e0d600cea437f5c3613aeb1553d56"
 SRC_URI += "git://github.com/niemeyer/pretty;name=pretty;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/niemeyer/pretty"
 
 #       github.com/philhofer/fwd v1.1.1
 # [1] git ls-remote https://github.com/philhofer/fwd 9bcb9cab1b0394d8516a132ec243ba944efdb644 
-SRCREV_fwd="9bcb9cab1b0394d8516a132ec243ba944efdb644"
+SRCREV_fwd = "9bcb9cab1b0394d8516a132ec243ba944efdb644"
 SRC_URI += "git://github.com/philhofer/fwd;name=fwd;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/philhofer/fwd"
 
 #       github.com/pkg/errors v0.9.1
 # [1] git ls-remote https://github.com/pkg/errors 614d223910a179a466c1767a985424175c39b465 
-SRCREV_errors="614d223910a179a466c1767a985424175c39b465"
+SRCREV_errors = "614d223910a179a466c1767a985424175c39b465"
 SRC_URI += "git://github.com/pkg/errors;name=errors;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/pkg/errors"
 
 #       github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c
 # [1] git ls-remote https://github.com/power-devops/perfstat 5aafc221ea8c1ff54b0835cbd5f2386a8410be11 
-SRCREV_perfstat="5aafc221ea8c1ff54b0835cbd5f2386a8410be11"
+SRCREV_perfstat = "5aafc221ea8c1ff54b0835cbd5f2386a8410be11"
 SRC_URI += "git://github.com/power-devops/perfstat;name=perfstat;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/power-devops/perfstat"
 
 #       github.com/prometheus/common v0.33.0
 # [1] git ls-remote https://github.com/prometheus/common 63e75f51cd2368130efbd51b95a4e457e64b444e 
-SRCREV_common="63e75f51cd2368130efbd51b95a4e457e64b444e"
+SRCREV_common = "63e75f51cd2368130efbd51b95a4e457e64b444e"
 SRC_URI += "git://github.com/prometheus/common;name=common;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/common"
 
 #       github.com/prometheus/procfs v0.7.3
 # [1] git ls-remote https://github.com/prometheus/procfs f436cbb89ece38bf080d446b3ca27053b305eaac 
-SRCREV_procfs="f436cbb89ece38bf080d446b3ca27053b305eaac"
+SRCREV_procfs = "f436cbb89ece38bf080d446b3ca27053b305eaac"
 SRC_URI += "git://github.com/prometheus/procfs;name=procfs;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/procfs"
 
 #       github.com/rivo/uniseg v0.2.0
 # [1] git ls-remote https://github.com/rivo/uniseg 75711fccf6a3e85bc74c241e2dddd06a9bc9e53d 
-SRCREV_uniseg="75711fccf6a3e85bc74c241e2dddd06a9bc9e53d"
+SRCREV_uniseg = "75711fccf6a3e85bc74c241e2dddd06a9bc9e53d"
 SRC_URI += "git://github.com/rivo/uniseg;name=uniseg;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rivo/uniseg"
 
 #       github.com/sirupsen/logrus v1.8.1
 # [1] git ls-remote https://github.com/sirupsen/logrus bdc0db8ead3853c56b7cd1ac2ba4e11b47d7da6b 
-SRCREV_logrus="bdc0db8ead3853c56b7cd1ac2ba4e11b47d7da6b"
+SRCREV_logrus = "bdc0db8ead3853c56b7cd1ac2ba4e11b47d7da6b"
 SRC_URI += "git://github.com/sirupsen/logrus;name=logrus;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/sirupsen/logrus"
 
 #       github.com/tidwall/match v1.1.1
 # [1] git ls-remote https://github.com/tidwall/match 4c9fc61b493b7aa0a3d347e9190aa78c5bec09cf 
-SRCREV_match="4c9fc61b493b7aa0a3d347e9190aa78c5bec09cf"
+SRCREV_match = "4c9fc61b493b7aa0a3d347e9190aa78c5bec09cf"
 SRC_URI += "git://github.com/tidwall/match;name=match;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tidwall/match"
 
 #       github.com/tidwall/pretty v1.2.0
 # [1] git ls-remote https://github.com/tidwall/pretty aaa765e7476acb0028a854b85675801362cbdaa2 
-SRCREV_pretty1="aaa765e7476acb0028a854b85675801362cbdaa2"
+SRCREV_pretty1 = "aaa765e7476acb0028a854b85675801362cbdaa2"
 SRC_URI += "git://github.com/tidwall/pretty;name=pretty1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tidwall/pretty"
 
 #       github.com/tklauser/go-sysconf v0.3.9
 # [1] git ls-remote https://github.com/tklauser/go-sysconf 746b19d14e19d242c2daa08e0d645c19832c1939 
-SRCREV_go-sysconf="746b19d14e19d242c2daa08e0d645c19832c1939"
+SRCREV_go-sysconf = "746b19d14e19d242c2daa08e0d645c19832c1939"
 SRC_URI += "git://github.com/tklauser/go-sysconf;name=go-sysconf;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tklauser/go-sysconf"
 
 #       github.com/tklauser/numcpus v0.3.0
 # [1] git ls-remote https://github.com/tklauser/numcpus cc3fdd5f3955d53d50d94380963bddd24bd373e2 
-SRCREV_numcpus="cc3fdd5f3955d53d50d94380963bddd24bd373e2"
+SRCREV_numcpus = "cc3fdd5f3955d53d50d94380963bddd24bd373e2"
 SRC_URI += "git://github.com/tklauser/numcpus;name=numcpus;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tklauser/numcpus"
 
 #       github.com/yusufpapurcu/wmi v1.2.2
 # [1] git ls-remote https://github.com/yusufpapurcu/wmi 253c5f0cb35e666c4c0fc42083824e7c89f0cc8d 
-SRCREV_wmi="253c5f0cb35e666c4c0fc42083824e7c89f0cc8d"
+SRCREV_wmi = "253c5f0cb35e666c4c0fc42083824e7c89f0cc8d"
 SRC_URI += "git://github.com/yusufpapurcu/wmi;name=wmi;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/yusufpapurcu/wmi"
 
 #       go.etcd.io/etcd/api/v3 v3.5.2
 # [1] git ls-remote https://github.com/etcd-io/etcd 4591a096d4d3c08e577d7269851938db0c1da3d4 
-SRCREV_v31="4591a096d4d3c08e577d7269851938db0c1da3d4"
+SRCREV_v31 = "4591a096d4d3c08e577d7269851938db0c1da3d4"
 SRC_URI += "git://github.com/etcd-io/etcd;name=v31;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/etcd-io/etcd/api/v3"
 
 #       go.uber.org/atomic v1.9.0
 # [1] git ls-remote https://github.com/uber-go/atomic 135466e2d0c8f8adf4d37dc757e3df0ebdd0dfe8 
-SRCREV_atomic="135466e2d0c8f8adf4d37dc757e3df0ebdd0dfe8"
+SRCREV_atomic = "135466e2d0c8f8adf4d37dc757e3df0ebdd0dfe8"
 SRC_URI += "git://github.com/uber-go/atomic;name=atomic;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.uber.org/atomic"
 
 #       go.uber.org/multierr v1.7.0
 # [1] git ls-remote https://github.com/uber-go/multierr 19d9fff1d3b66750a134671435786579bc994737 
-SRCREV_multierr="19d9fff1d3b66750a134671435786579bc994737"
+SRCREV_multierr = "19d9fff1d3b66750a134671435786579bc994737"
 SRC_URI += "git://github.com/uber-go/multierr;name=multierr;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.uber.org/multierr"
 
 #       go.uber.org/zap v1.19.1
 # [1] git ls-remote https://github.com/uber-go/zap 2f61e97148e69cd2dd1902b03e89ce07cd1218a1 
-SRCREV_zap="2f61e97148e69cd2dd1902b03e89ce07cd1218a1"
+SRCREV_zap = "2f61e97148e69cd2dd1902b03e89ce07cd1218a1"
 SRC_URI += "git://github.com/uber-go/zap;name=zap;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.uber.org/zap"
 
 #       golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 # [1] git ls-remote https://go.googlesource.com/sync 036812b2e83c0ddf193dd5a34e034151da389d09 
-SRCREV_sync="036812b2e83c0ddf193dd5a34e034151da389d09"
+SRCREV_sync = "036812b2e83c0ddf193dd5a34e034151da389d09"
 SRC_URI += "git://go.googlesource.com/sync;name=sync;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/sync"
 
 #       golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
 # [1] git ls-remote https://go.googlesource.com/sys 33da011f77ade50ff5b6a6fb4a9a1e6d6b285809 
-SRCREV_sys="33da011f77ade50ff5b6a6fb4a9a1e6d6b285809"
+SRCREV_sys = "33da011f77ade50ff5b6a6fb4a9a1e6d6b285809"
 SRC_URI += "git://go.googlesource.com/sys;name=sys;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/sys"
 
 #       google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb
 # [1] git ls-remote https://github.com/googleapis/go-genproto 3ac035c7e7cbd86eb6d8b95be888cf83d73dedd3 
-SRCREV_genproto="3ac035c7e7cbd86eb6d8b95be888cf83d73dedd3"
+SRCREV_genproto = "3ac035c7e7cbd86eb6d8b95be888cf83d73dedd3"
 SRC_URI += "git://github.com/googleapis/go-genproto;name=genproto;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/google.golang.org/genproto"
 
 #       google.golang.org/grpc v1.43.0
 # [1] git ls-remote https://github.com/grpc/grpc-go 14c11384b76b67f7b1b32a5d18f865762634c0ae 
-SRCREV_grpc="14c11384b76b67f7b1b32a5d18f865762634c0ae"
+SRCREV_grpc = "14c11384b76b67f7b1b32a5d18f865762634c0ae"
 SRC_URI += "git://github.com/grpc/grpc-go;name=grpc;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/google.golang.org/grpc"
 
 #       google.golang.org/protobuf v1.27.1
 # [1] git ls-remote https://github.com/protocolbuffers/protobuf-go b92717ecb630d4a4824b372bf98c729d87311a4d 
-SRCREV_protobuf12="b92717ecb630d4a4824b372bf98c729d87311a4d"
+SRCREV_protobuf12 = "b92717ecb630d4a4824b372bf98c729d87311a4d"
 SRC_URI += "git://github.com/protocolbuffers/protobuf-go;name=protobuf12;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/google.golang.org/protobuf"
 
 #       gopkg.in/ini.v1 v1.66.3
 # [1] git ls-remote https://gopkg.in/ini.v1 fcd6cc399e588727c1231f4ea187d1b963536bcc 
-SRCREV_ini.v1="fcd6cc399e588727c1231f4ea187d1b963536bcc"
+SRCREV_ini.v1 = "fcd6cc399e588727c1231f4ea187d1b963536bcc"
 SRC_URI += "git://gopkg.in/ini.v1;name=ini.v1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/ini.v1"
 
 #       gopkg.in/yaml.v3 v3.0.1
 # [1] git ls-remote https://gopkg.in/yaml.v3 f6f7691b1fdeb513f56608cd2c32c51f8194bf51 
-SRCREV_yaml.v3="f6f7691b1fdeb513f56608cd2c32c51f8194bf51"
+SRCREV_yaml.v3 = "f6f7691b1fdeb513f56608cd2c32c51f8194bf51"
 SRC_URI += "git://gopkg.in/yaml.v3;name=yaml.v3;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/yaml.v3"
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch
deleted file mode 100644
index 38496ea56c..0000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c860dcbe63b0e393c95bfb0131238f91aaac11d3 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Thu, 7 Oct 2021 12:44:18 +0200
-Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize'
- names
-
-The outcome is that processed names no longer match our custom rust
-target definitions, and the build fails.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
----
- build/moz.configure/init.configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/build/moz.configure/init.configure
-+++ b/build/moz.configure/init.configure
-@@ -647,24 +647,7 @@ def help_host_target(help, host, target)
- 
- def config_sub(shell, triplet):
-     config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub")
--    # Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so
--    # munge those before and after calling config.sub.
--    suffix = None
--    munging = {
--        "-windows-msvc": "-mingw32",
--        "-windows-gnu": "-mingw32",
--    }
--    for check_suffix, replacement in munging.items():
--        if triplet.endswith(check_suffix):
--            suffix = check_suffix
--            triplet = triplet[: -len(suffix)] + replacement
--            break
--    result = check_cmd_output(shell, config_sub, triplet).strip()
--    if suffix:
--        assert result.endswith(replacement)
--        result = result[: -len(replacement)] + suffix
--    return result
--
-+    return triplet
- 
- @depends("--host", shell)
- @checking("for host system type", lambda h: h.alias)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/armv5.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/armv5.patch
deleted file mode 100644
index 4c45955bca..0000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/armv5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-The ISB instruction isn't available in ARMv5 or v6, so
-guard it's use to fix the build on qemuarmv5.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-diff --git a/js/src/jit/arm/Architecture-arm.cpp b/js/src/jit/arm/Architecture-arm.cpp
---- a/js/src/jit/arm/Architecture-arm.cpp       2024-01-18 17:31:32.078718197 +0000
-+++ b/js/src/jit/arm/Architecture-arm.cpp       2024-01-18 18:00:16.738921445 +0000
-@@ -529,7 +529,9 @@
- void FlushExecutionContext() {
- #ifndef JS_SIMULATOR_ARM
-+#if __ARM_ARCH >= 7
-   // Ensure that any instructions already in the pipeline are discarded and
-   // reloaded from the icache.
-   asm volatile("isb\n" : : : "memory");
-+#endif
- #else
-   // We assume the icache flushing routines on other platforms take care of this
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch
deleted file mode 100644
index 22f31e05f8..0000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e4d8016d0dc56b02e22898d83aad9f80a94d1c3c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 20 Oct 2021 16:21:14 -0700
-Subject: [PATCH] mozjs: Fix musl miscompiles with HAVE_THREAD_TLS_KEYWORD
-
-Upstream: No
-Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD:
-https://github.com/void-linux/void-packages/issues/2598
-
----
-Upstream-Status: Pending
-
- js/src/old-configure.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index cabd72a2b6..0f08d91cbf 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -807,6 +807,9 @@ if test "$ac_cv_thread_keyword" = yes; then
-     *-android*|*-linuxandroid*)
-       :
-       ;;
-+    *-musl*)
-+      :
-+      ;;
-     *)
-       AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
-       ;;
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-Cargo.toml-do-not-abort-on-panic.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Cargo.toml-do-not-abort-on-panic.patch
index e8dfdea1e9..97a4439628 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-Cargo.toml-do-not-abort-on-panic.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Cargo.toml-do-not-abort-on-panic.patch
@@ -1,4 +1,4 @@
-From f501f7c02df4f0ff5d5f100d9eeb74cd4d12ea3d Mon Sep 17 00:00:00 2001
+From ddd23f8547f3a56aa542924aa400d3535f734bff Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 1 Oct 2021 13:00:24 +0200
 Subject: [PATCH] Cargo.toml: do not abort on panic
@@ -7,16 +7,15 @@ OE's rust is configured to unwind, and this setting clashes with it/
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
 ---
  Cargo.toml | 2 --
  1 file changed, 2 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index a2718b2f35..4e231c30e8 100644
+index a4248187be..eed8964b3a 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -59,13 +59,11 @@ opt-level = 1
+@@ -67,13 +67,11 @@ opt-level = 1
  rpath = false
  lto = false
  debug-assertions = true
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch
new file mode 100644
index 0000000000..4fb7a28eeb
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch
@@ -0,0 +1,27 @@
+From cbb5cc1022cc27edefc8eabbe21458cac9bda6fb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 23 Nov 2024 13:28:33 -0800
+Subject: [PATCH] Link with icu-uc to fix build with ICU-76
+
+Fixes
+https://bugzilla.mozilla.org/show_bug.cgi?id=1927380
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ js/moz.configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/moz.configure b/js/moz.configure
+index 593b93acee..2181dca34b 100644
+--- a/js/moz.configure
++++ b/js/moz.configure
+@@ -1305,7 +1305,7 @@ def enable_system_icu_option(enable_system_icu):
+     return enable_system_icu
+ 
+ 
+-system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1", when="--with-system-icu")
++system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1 icu-uc", when="--with-system-icu")
+ 
+ 
+ @depends(enable_system_icu_option)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-add-arm-to-list-of-mozinline.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch
index 83187861c7..960b4593c2 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-add-arm-to-list-of-mozinline.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch
@@ -1,4 +1,4 @@
-From c5cfb8aa591afd5ad3aedc58fe7f410e89013605 Mon Sep 17 00:00:00 2001
+From 2d1fb35bd81acadc12cc077de86361ac59cee2f1 Mon Sep 17 00:00:00 2001
 From: Kai Kang <kai.kang@windriver.com>
 Date: Fri, 22 Sep 2023 22:59:59 +0000
 Subject: [PATCH] Backport patch from firefox bugzilla to fix compile error for
@@ -12,16 +12,15 @@ Subject: [PATCH] Backport patch from firefox bugzilla to fix compile error for
 Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1761665]
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
 ---
  js/src/jit/GenerateAtomicOperations.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py
-index 24b5a191cf..e41948c5af 100644
+index 9194b8b685..145563bb37 100644
 --- a/js/src/jit/GenerateAtomicOperations.py
 +++ b/js/src/jit/GenerateAtomicOperations.py
-@@ -860,7 +860,7 @@ def generate_atomics_header(c_out):
+@@ -850,7 +850,7 @@ def generate_atomics_header(c_out):
  
          # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE.
          # See bug 1756347.
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-rewrite-cargo-host-linker-in-python3.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch
index 83f384e6c2..94e1651b33 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-rewrite-cargo-host-linker-in-python3.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch
@@ -1,4 +1,4 @@
-From c6a84863454b882695058187cd282987613474ef Mon Sep 17 00:00:00 2001
+From 6f6b78628a8edc834aa147c87ebce3eb8e670e7a Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 18 Nov 2021 07:16:39 +0000
 Subject: [PATCH] Rewrite cargo-host-linker in python3
@@ -18,7 +18,6 @@ rewrite cargo-host-linker in python3
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
 ---
  build/cargo-host-linker | 24 +++++++++++++++++++++---
  1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
index 4921a9028c..d53cc2bd41 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
@@ -1,4 +1,4 @@
-From 0d28cd65efe14022e1d645db71dec74f11ab2ae8 Mon Sep 17 00:00:00 2001
+From 683cd23dd269509a1d913adb2b049b84771e0a94 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 11 Nov 2021 16:05:54 +0800
 Subject: [PATCH] util.configure: fix one occasionally reproduced configure
@@ -28,16 +28,15 @@ It should be another process that deleted this file by using
 Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
 ---
  build/moz.configure/util.configure | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure
-index f5ff3acd79..44f69deceb 100644
+index d93b91fcdd..47ab8b92b9 100644
 --- a/build/moz.configure/util.configure
 +++ b/build/moz.configure/util.configure
-@@ -254,7 +254,7 @@ def try_invoke_compiler(
+@@ -256,7 +256,7 @@ def try_invoke_compiler(
          "C++": ".cpp",
      }[language]
  
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0002-moz.configure-do-not-look-for-llvm-objdump.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0002-moz.configure-do-not-look-for-llvm-objdump.patch
index 4c69155a68..9a82acf77b 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0002-moz.configure-do-not-look-for-llvm-objdump.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0002-moz.configure-do-not-look-for-llvm-objdump.patch
@@ -1,4 +1,4 @@
-From 49cb509abd309e3b74ef4c872ae773f18dabca19 Mon Sep 17 00:00:00 2001
+From 1a5331f1997788e9a25bbc2b10eb14e2ee418be9 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 1 Oct 2021 13:01:10 +0200
 Subject: [PATCH] moz.configure: do not look for llvm-objdump
@@ -8,17 +8,16 @@ for js builds.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
 ---
  moz.configure | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/moz.configure b/moz.configure
-index 3a9461200d..33b3f49b0c 100755
+index 804b9a375a..402e79e3b3 100755
 --- a/moz.configure
 +++ b/moz.configure
-@@ -723,15 +723,15 @@ check_prog(
- )
+@@ -390,15 +390,15 @@ def plain_llvm_or_prefixed(name, llvm_name=None):
+     return plain_llvm_or_prefixed
  
  
 -llvm_objdump = check_prog(
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
index 0f9d062205..40025fbc68 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
@@ -1,4 +1,4 @@
-From ac6a3711917ff3f2b64662cbf4681c22a09da403 Mon Sep 17 00:00:00 2001
+From 2d7f06cdf631e4d4d94e9d8e33a953dc57672750 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 1 Oct 2021 13:02:17 +0200
 Subject: [PATCH] rust.configure: do not try to find a suitable upstream target
@@ -7,13 +7,12 @@ OE is using custom targets and so this is bound to fail.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
 ---
  build/moz.configure/rust.configure | 34 ++----------------------------
  1 file changed, 2 insertions(+), 32 deletions(-)
 
 diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
-index 7a2fd1ae70..e11f13b253 100644
+index acac34ec05..ff3b8fc0fd 100644
 --- a/build/moz.configure/rust.configure
 +++ b/build/moz.configure/rust.configure
 @@ -486,33 +486,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0004-use-asm-sgidefs.h.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch
index 6443d46b2c..eb3ff452b3 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0004-use-asm-sgidefs.h.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch
@@ -1,4 +1,4 @@
-From 607aa4d822b0e074ae1b2fc16d7c140c3e889680 Mon Sep 17 00:00:00 2001
+From 1691939a22ec12245f008993e0b9a1b1dfb91e9c Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <amccurdy@gmail.com>
 Date: Sat, 30 Apr 2016 15:29:06 -0700
 Subject: [PATCH] use <asm/sgidefs.h>
@@ -18,7 +18,6 @@ Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070]
 Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
 ---
  mfbt/RandomNum.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch
new file mode 100644
index 0000000000..564f423fb4
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch
@@ -0,0 +1,28 @@
+From 0dd6fdbf6a821898617f1bd8e57123be048c07f5 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Mon, 16 Dec 2024 05:49:57 +0000
+Subject: [PATCH] The ISB instruction isn't available in ARMv5 or v6, so guard
+ it's use to fix the build on qemuarmv5.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ js/src/jit/arm/Architecture-arm.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/js/src/jit/arm/Architecture-arm.cpp b/js/src/jit/arm/Architecture-arm.cpp
+index d4c5026705..fc0455eaff 100644
+--- a/js/src/jit/arm/Architecture-arm.cpp
++++ b/js/src/jit/arm/Architecture-arm.cpp
+@@ -528,9 +528,11 @@ void FlushICache(void* code, size_t size) {
+ 
+ void FlushExecutionContext() {
+ #ifndef JS_SIMULATOR_ARM
++#if __ARM_ARCH >= 7
+   // Ensure that any instructions already in the pipeline are discarded and
+   // reloaded from the icache.
+   asm volatile("isb\n" : : : "memory");
++#endif
+ #else
+   // We assume the icache flushing routines on other platforms take care of this
+ #endif
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/musl-disable-stackwalk.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch
index 590cddfe5f..3d5452ce4d 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/musl-disable-stackwalk.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch
@@ -1,27 +1,27 @@
-From 9aae71c6ee73431d2609be0ef74ffd4b22b36c75 Mon Sep 17 00:00:00 2001
+From d96e9a40e9da9163e0a4b3475178fe30c26deb19 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 22 Sep 2023 22:59:56 +0000
 Subject: [PATCH] Musl does not have stack unwinder like glibc therefore we can
+
  not assume that its always available on musl, we do need to check for target
  environment as well which could be musl or glibc.
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
 ---
  mozglue/misc/StackWalk.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp
-index 307715b170..a8d3cb40c0 100644
+index 18fd3464b0..d3d9208fdb 100644
 --- a/mozglue/misc/StackWalk.cpp
 +++ b/mozglue/misc/StackWalk.cpp
-@@ -43,7 +43,7 @@ using namespace mozilla;
- #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+@@ -50,7 +50,7 @@ using namespace mozilla;
+ #  define HAVE___LIBC_STACK_END 0
  #endif
  
 -#if (defined(linux) &&                                            \
 +#if (defined(linux) && defined(__GLIBC__) &&                      \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
-       defined(HAVE__UNWIND_BACKTRACE)))
- #  define MOZ_STACKWALK_SUPPORTS_LINUX 1
+       defined(HAVE__UNWIND_BACKTRACE)) &&                         \
+      (HAVE___LIBC_STACK_END || ANDROID))
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch
new file mode 100644
index 0000000000..cb2dc66525
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch
@@ -0,0 +1,30 @@
+Recognise riscv64gc and riscv32gc as valid architectures
+
+Rust uses above for architecture in tuples
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+@@ -1327,6 +1327,10 @@ class LinuxCrossCompileToolchainTest(Bas
+         "mips-unknown-linux-gnu": big_endian + {"__mips__": 1},
+         "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32},
+         "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64},
++        "riscv32gc-unknown-linux-gnu": little_endian
++        + {"__riscv": 1, "__riscv_xlen": 32},
++        "riscv64gc-unknown-linux-gnu": little_endian
++        + {"__riscv": 1, "__riscv_xlen": 64},
+         "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1},
+     }
+ 
+--- a/build/autoconf/config.sub
++++ b/build/autoconf/config.sub
+@@ -1236,7 +1236,7 @@ case $cpu-$vendor in
+                        | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+                        | pru \
+                        | pyramid \
+-                       | riscv | riscv32 | riscv32be | riscv64 | riscv64be \
++                       | riscv | riscv32 | riscv32be | riscv32gc | riscv64 | riscv64be | riscv64gc \
+                        | rl78 | romp | rs6000 | rx \
+                        | s390 | s390x \
+                        | score \
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/riscv32.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch
index 16f95659e2..67e23c5fcc 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/riscv32.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch
@@ -1,11 +1,10 @@
-From d6aff068170e56e6773feba42a463dd8c50bc4ff Mon Sep 17 00:00:00 2001
+From 0cc41bc953974d4852b263708bf8d12f823ca8ad Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 24 Oct 2021 22:32:50 -0700
 Subject: [PATCH] Add RISCV32 support
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
 ---
  build/moz.configure/init.configure                             | 3 +++
  python/mozbuild/mozbuild/configure/constants.py                | 2 ++
@@ -13,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  3 files changed, 6 insertions(+)
 
 diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
-index 53bbc4203f..2ac40d3d39 100644
+index 97b9bab167..d9a5a2035d 100644
 --- a/build/moz.configure/init.configure
 +++ b/build/moz.configure/init.configure
-@@ -584,6 +584,9 @@ def split_triplet(triplet, allow_wasi=False):
+@@ -594,6 +594,9 @@ def split_triplet(triplet, allow_wasi=False):
      elif cpu.startswith("aarch64"):
          canonical_cpu = "aarch64"
          endianness = "little"
@@ -27,10 +26,10 @@ index 53bbc4203f..2ac40d3d39 100644
          canonical_cpu = "riscv64"
          endianness = "little"
 diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py
-index a36152651d..a6050be5d8 100644
+index 25f43bb9f8..3335e69405 100644
 --- a/python/mozbuild/mozbuild/configure/constants.py
 +++ b/python/mozbuild/mozbuild/configure/constants.py
-@@ -51,6 +51,7 @@ CPU_bitness = {
+@@ -73,6 +73,7 @@ CPU_bitness = {
      "mips64": 64,
      "ppc": 32,
      "ppc64": 64,
@@ -38,7 +37,7 @@ index a36152651d..a6050be5d8 100644
      "riscv64": 64,
      "s390": 32,
      "s390x": 64,
-@@ -98,6 +99,7 @@ CPU_preprocessor_checks = OrderedDict(
+@@ -129,6 +130,7 @@ CPU_preprocessor_checks = OrderedDict(
          ("m68k", "__m68k__"),
          ("mips64", "__mips64"),
          ("mips32", "__mips__"),
@@ -47,7 +46,7 @@ index a36152651d..a6050be5d8 100644
          ("loongarch64", "__loongarch64"),
          ("sh4", "__sh__"),
 diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
-index c6af3d99d4..7ef02e1a85 100644
+index d438b68eb8..1be0d02e54 100644
 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
 +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
 @@ -1325,6 +1325,7 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest):
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb
index b088286023..ceb81d07e5 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb
@@ -8,22 +8,25 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire
            file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \
            file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \
            file://0004-use-asm-sgidefs.h.patch \
-           file://fix-musl-build.patch \
-           file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \
            file://riscv32.patch \
            file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \
            file://0001-rewrite-cargo-host-linker-in-python3.patch  \
            file://musl-disable-stackwalk.patch \
            file://0001-add-arm-to-list-of-mozinline.patch \
            file://armv5.patch \
+           file://0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \
+           file://riscv.patch \
            "
-SRC_URI[sha256sum] = "16be46f16a356a2b8bd3541805a24c8a2acf6f077cf8a65859689685c26025e0"
+SRC_URI[sha256sum] = "25d633eb81499cbda44b8c64fa1c1a5879d55024b864ef495d4997154d68358f"
 
-S = "${WORKDIR}/firefox-${PV}"
+UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs128"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
-inherit pkgconfig perlnative python3native rust
+S = "${UNPACKDIR}/firefox-${PV}"
 
-DEPENDS += "zlib cargo-native python3 icu"
+inherit pkgconfig perlnative python3native rust cargo
+
+DEPENDS += "zlib cbindgen-native python3 icu"
 DEPENDS:remove:mipsarch = "icu"
 DEPENDS:remove:powerpc:toolchain-clang = "icu"
 
@@ -54,6 +57,7 @@ export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}"
 
 export AS = "${CC}"
 
+export MOZBUILD_STATE_PATH = "${WORKDIR}/mozbuild_state"
 export RUSTFLAGS
 
 JIT ?= ""
@@ -62,6 +66,8 @@ ICU ?= "--with-system-icu"
 ICU:mipsarch = ""
 ICU:powerpc:toolchain-clang = ""
 
+LDFLAGS:append:riscv32 = " -latomic"
+
 do_configure() {
     cd ${B}
     python3 ${S}/configure.py \
@@ -77,6 +83,13 @@ do_configure() {
 }
 do_configure[cleandirs] += "${B}"
 
+# The main build system is a Makefile that call cargo downstream.
+# We inherit cargo to get the environnement but need to switch back to
+# base_do_compile to do the Makefile base compilation.
+do_compile() {
+    base_do_compile
+}
+
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
 }
@@ -93,6 +106,7 @@ do_install:append() {
     rm -f ${D}${libdir}/libjs_static.ajs
 }
 
+INSANE_SKIP += "32bit-time"
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 PACKAGES =+ "lib${BPN}"
 FILES:lib${BPN} += "${libdir}/lib*"
diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb
index 4d3baf6caa..b53be9803e 100644
--- a/meta-oe/recipes-extended/mraa/mraa_git.bb
+++ b/meta-oe/recipes-extended/mraa/mraa_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \
            file://0002-gpio-Include-limits.h-for-PATH_MAX.patch \
            "
 
-S = "${WORKDIR}/git"
 
 # CMakeLists.txt checks the architecture, only x86 and ARM supported for now
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
@@ -41,11 +40,11 @@ FILES:${PN}-utils = "${bindir}/"
 # will result in only the python bindings being built/packaged.
 # Note: 'nodejs' is disabled by default because the bindings
 # generation currently fails with nodejs (>v7.x).
-BINDINGS ??= "python"
+BINDINGS ??= ""
 
 # nodejs isn't available for armv4/armv5 architectures
-BINDINGS:armv4 ??= "python"
-BINDINGS:armv5 ??= "python"
+BINDINGS:armv4 ??= ""
+BINDINGS:armv5 ??= ""
 
 PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \
  ${@bb.utils.contains('PACKAGES', 'python3-${PN}', 'python', '', d)}"
diff --git a/meta-oe/recipes-extended/nana/nana_git.bb b/meta-oe/recipes-extended/nana/nana_git.bb
index d292bb8827..bad5a797a7 100644
--- a/meta-oe/recipes-extended/nana/nana_git.bb
+++ b/meta-oe/recipes-extended/nana/nana_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/pjmaker/nana;protocol=https;branch=master \
     file://0001-Makefile.am-fix-build-with-separate-build-dir.patch \
     file://0002-man-Makefile.am-we-seem-not-to-need-the-work-around-.patch \
 "
-S = "${WORKDIR}/git"
 
 LICENSE = "BSD-2-Clause"
 
diff --git a/meta-oe/recipes-extended/networking/mstpd_git.bb b/meta-oe/recipes-extended/networking/mstpd_git.bb
index e6e1f9a3b2..b003b52d25 100644
--- a/meta-oe/recipes-extended/networking/mstpd_git.bb
+++ b/meta-oe/recipes-extended/networking/mstpd_git.bb
@@ -9,7 +9,6 @@ SRC_URI = " \
     file://mstpd.service \
 "
 SRCREV = "181c453fc1a00573e19f14960dcc54ad84beea7c"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+){2,})"
 
diff --git a/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch b/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch
deleted file mode 100644
index 090ed5c1c9..0000000000
--- a/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 08ba909500412611953aea0fa2fe0d8fe76b6e24 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Wed, 21 Sep 2016 21:14:40 +0200
-Subject: [PATCH] detect gold as GNU linker too
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 468c718..cd93f30 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -28,7 +28,7 @@ AC_CHECK_SIZEOF([void *])
- AC_MSG_CHECKING([for GNU ld])
- LD=$($CC -print-prog-name=ld 2>&5)
- 
--if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then
-+if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ") = 0; then
-   # Not
-   GNU_LD=""
-   AC_MSG_RESULT([no])
diff --git a/meta-oe/recipes-extended/newt/files/cross_ar.patch b/meta-oe/recipes-extended/newt/files/cross_ar.patch
index 86cc0be1d3..eb8c4134b2 100644
--- a/meta-oe/recipes-extended/newt/files/cross_ar.patch
+++ b/meta-oe/recipes-extended/newt/files/cross_ar.patch
@@ -1,4 +1,7 @@
-Fix cross link using autoconf detected AR
+From 0f33421000006f5991d1cddcb9dbc68b64141e44 Mon Sep 17 00:00:00 2001
+From: Jason Wessel <jason.wessel@windriver.com>
+Date: Wed, 19 Jun 2024 11:22:48 +0200
+Subject: [PATCH] Fix cross link using autoconf detected AR
 
 If building on 32bit host and creating 64bit libraries, the target
 package builds should not invoke the 32bit hosts's ar.  Specifically
@@ -18,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  configure.ac | 4 ++++
  2 files changed, 6 insertions(+), 1 deletion(-)
 
-Index: newt-0.52.20/Makefile.in
-===================================================================
---- newt-0.52.20.orig/Makefile.in
-+++ newt-0.52.20/Makefile.in
+diff --git a/Makefile.in b/Makefile.in
+index f8fe290..8a44a56 100644
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@
  LDFLAGS = @LDFLAGS@
  CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
@@ -30,7 +33,7 @@ Index: newt-0.52.20/Makefile.in
  
  VERSION = @VERSION@
  TAG = r$(subst .,-,$(VERSION))
-@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNE
+@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
         $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
  
  $(LIBNEWT): $(LIBOBJS)
@@ -39,11 +42,11 @@ Index: newt-0.52.20/Makefile.in
  
  newt.o $(SHAREDDIR)/newt.o: newt.c Makefile
  
-Index: newt-0.52.20/configure.ac
-===================================================================
---- newt-0.52.20.orig/configure.ac
-+++ newt-0.52.20/configure.ac
-@@ -15,6 +15,10 @@ AC_PROG_INSTALL
+diff --git a/configure.ac b/configure.ac
+index 434121e..2cfffd6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,6 +15,10 @@ AC_PROG_CC
  AC_PROG_LN_S
  AC_PROG_GREP
  AC_SYS_LARGEFILE
diff --git a/meta-oe/recipes-extended/newt/libnewt_0.52.24.bb b/meta-oe/recipes-extended/newt/libnewt_0.52.25.bb
index 1e39a1c5ca..18a45a3342 100644
--- a/meta-oe/recipes-extended/newt/libnewt_0.52.24.bb
+++ b/meta-oe/recipes-extended/newt/libnewt_0.52.25.bb
@@ -20,12 +20,11 @@ DEPENDS = "slang popt python3"
 SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \
            file://cross_ar.patch \
            file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \
-           file://0001-detect-gold-as-GNU-linker-too.patch \
            "
 
-SRC_URI[sha256sum] = "5ded7e221f85f642521c49b1826c8de19845aa372baf5d630a51774b544fbdbb"
+SRC_URI[sha256sum] = "ef0ca9ee27850d1a5c863bb7ff9aa08096c9ed312ece9087b30f3a426828de82"
 
-S = "${WORKDIR}/newt-${PV}"
+S = "${UNPACKDIR}/newt-${PV}"
 
 inherit autotools-brokensep python3native python3-dir python3targetconfig
 
diff --git a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb
index bf742fa062..d5629b06e5 100644
--- a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb
+++ b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4a94da2a1f918b217ef5156634fc9e0"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch \
            "
-SRC_URI[md5sum] = "9a0b87bbc670c1e738e5b40c7afd184d"
 SRC_URI[sha256sum] = "c4cc33f8838f4523f27c3d7584eedbe59f4c587f0821612f5ac2201adc18b367"
 
 do_compile() {
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
deleted file mode 100644
index df43d25ac3..0000000000
--- a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Set of CLI tools for Openlmi providers"
-DESCRIPTION = "openlmi-tools is a set of command line tools for Openlmi providers."
-HOMEPAGE = "http://www.openlmi.org/"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://../COPYING;md5=75859989545e37968a99b631ef42722e"
-SECTION = "System/Management"
-
-inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)}
-
-SKIP_RECIPE[openlmi-tools] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}"
-
-DEPENDS = "python-native python-pywbem-native python-m2crypto python-pywbem"
-
-SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \
-          "
-SRC_URI[md5sum] = "e156246cb7b49753db82f4ddf7f03e50"
-SRC_URI[sha256sum] = "292b8f5f2250655a4add8183c529b73358bc980bd4f23cfa484a940953fce9e4"
-
-S = "${WORKDIR}/${BP}/cli"
-
-do_configure:prepend() {
-    sed 's/@@VERSION@@/$(VERSION)/g' ${S}/setup.py.skel > ${S}/setup.py
-}
-
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb
index 5437ea13e8..970d7fb5fc 100644
--- a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb
+++ b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb
@@ -24,7 +24,6 @@ SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=main;protocol=https \
            file://0001-Link-with-libm-for-floor-function.patch \
            "
 
-S = "${WORKDIR}/git"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba"
@@ -34,8 +33,6 @@ inherit systemd cmake pkgconfig python3native perlnative
 SYSTEMD_SERVICE:${PN} = "openwsmand.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
-LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd ", '', d)}"
-
 EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \
                  -DBUILD_LIBCIM=NO \
                  -DBUILD_PERL=YES \
diff --git a/meta-oe/recipes-extended/ostree/ostree_2024.6.bb b/meta-oe/recipes-extended/ostree/ostree_2024.10.bb
index 7f30dbfc5a..c33624987a 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2024.6.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2024.10.bb
@@ -22,9 +22,9 @@ GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases"
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \
            file://run-ptest \
            "
-SRC_URI[sha256sum] = "8b61c856697aa412f2f1724322ada40bdd7b1bf9e7783e2c594faa7a594f868f"
+SRC_URI[sha256sum] = "54e3387dee1ff16031a0679aca2b60da90ab7f4a26c211822333c7f23000abee"
 
-S = "${WORKDIR}/libostree-${PV}"
+S = "${UNPACKDIR}/libostree-${PV}"
 
 inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd
 
@@ -45,7 +45,7 @@ BUILD_OPTIMIZATION:append = " -O2"
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'soup3', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'soup3 static', '', d)} \
     glib \
     gpgme \
     curl \
diff --git a/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch b/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch
deleted file mode 100644
index 1f08d1603a..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 653674e11872465dd5edf1c1e8413ea813d7e086 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 23 Apr 2018 23:07:21 -0700
-Subject: [PATCH] Fix narrowing errors -Wc++11-narrowing
-
-Clang 6.x finds these errors
-
-    ../../../../CPP/Windows/ErrorMsg.cpp:24:10: error: case value evaluates to -2147024809, which cannot be narrowed to type 'DWORD' (aka 'unsigned int') [-Wc++11-narrowing]
-        case E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
-             ^
-
-HRESULT causes the macro to be parsed as a signed long, so we need to force it
-to be checked as an unsigned long instead.
-
-also reported here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224930
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- CPP/Windows/ErrorMsg.cpp | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp
-index 99684ae..78a64ba 100644
---- a/CPP/Windows/ErrorMsg.cpp
-+++ b/CPP/Windows/ErrorMsg.cpp
-@@ -15,13 +15,13 @@ UString MyFormatMessage(DWORD errorCode)
- 
-   switch(errorCode) {
-     case ERROR_NO_MORE_FILES   : txt = "No more files"; break ;
--    case E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
--    case E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
--    case E_ABORT               : txt = "E_ABORT"; break ;
--    case E_FAIL                : txt = "E_FAIL"; break ;
--    case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
--    case E_OUTOFMEMORY         : txt = "E_OUTOFMEMORY"; break ;
--    case E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
-+    case (DWORD) E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
-+    case (DWORD) E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
-+    case (DWORD) E_ABORT               : txt = "E_ABORT"; break ;
-+    case (DWORD) E_FAIL                : txt = "E_FAIL"; break ;
-+    case (DWORD) STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
-+    case (DWORD) E_OUTOFMEMORY         : txt = "E_OUTOFMEMORY"; break ;
-+    case (DWORD) E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
-     case ERROR_DIRECTORY          : txt = "Error Directory"; break ;
-     default:
-       txt = strerror(errorCode);
diff --git a/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch b/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch
deleted file mode 100644
index 98e186cbf0..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-p7zip: Update CVE-2016-9296 patch URL.
-From: Robert Luberda <robert@debian.org>
-Date: Sat, 19 Nov 2016 08:48:08 +0100
-Subject: Fix nullptr dereference (CVE-2016-9296)
-
-Patch taken from https://sourceforge.net/p/p7zip/bugs/185/
-This patch file taken from Debian's patch set for p7zip
-
-Upstream-Status: Backport [https://sourceforge.net/p/p7zip/bugs/185/]
-CVE: CVE-2016-9296
-
-Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
-
-Index: p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp
-===================================================================
---- p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp
-+++ p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp
-@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS
-       if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
-         ThrowIncorrect();
-   }
--  HeadersSize += folders.PackPositions[folders.NumPackStreams];
-+  if (folders.PackPositions)
-+      HeadersSize += folders.PackPositions[folders.NumPackStreams];
-   return S_OK;
- }
- 
diff --git a/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch b/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch
deleted file mode 100644
index 9ba1078071..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7f2da4f810b429ddb7afa0e252e3d02ced0eba87 Mon Sep 17 00:00:00 2001
-From: Radovan Scasny <radovan.scasny@siemens.com>
-Date: Tue, 20 Feb 2018 12:08:13 +0100
-Subject: [PATCH] p7zip: Fix CVE-2017-17969
-
-[No upstream tracking] -- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888297
-
-Heap-based buffer overflow in 7zip
-
-Compress/ShrinkDecoder.cpp: Heap-based buffer overflow
-in the NCompress::NShrink::CDecoder::CodeReal method
-in 7-Zip before 18.00 and p7zip allows remote attackers
-to cause a denial of service (out-of-bounds write)
-or potentially execute arbitrary code via a crafted ZIP archive.
-
-Upstream-Status: Backport [https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/8316/attachment/CVE-2017-17969.patch]
-CVE: CVE-2017-17969
-Signed-off-by: Radovan Scasny <radovan.scasny@siemens.com>
-
----
- CPP/7zip/Compress/ShrinkDecoder.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp
-index 80b7e67..5bb0559 100644
---- a/CPP/7zip/Compress/ShrinkDecoder.cpp
-+++ b/CPP/7zip/Compress/ShrinkDecoder.cpp
-@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-     {
-       _stack[i++] = _suffixes[cur];
-       cur = _parents[cur];
-+         if (cur >= kNumItems || i >= kNumItems)
-+               break;
-     }
-+       
-+       if (cur >= kNumItems || i >= kNumItems)
-+               break;
-     
-     _stack[i++] = (Byte)cur;
-     lastChar2 = (Byte)cur;
diff --git a/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch b/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch
deleted file mode 100644
index 47868c982e..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From: Robert Luberda <robert@debian.org>
-Date: Sun, 28 Jan 2018 23:47:40 +0100
-Subject: CVE-2018-5996
-
-Hopefully fix Memory Corruptions via RAR PPMd (CVE-2018-5996) by
-applying a few changes from 7Zip 18.00-beta.
-
-Bug-Debian: https://bugs.debian.org/#888314
-
-Upstream-Status: Backport [https://sources.debian.org/data/non-free/p/p7zip-rar/16.02-3/debian/patches/06-CVE-2018-5996.patch]
-CVE: CVE-2018-5996
-
-Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
----
- CPP/7zip/Compress/Rar1Decoder.cpp | 13 +++++++++----
- CPP/7zip/Compress/Rar1Decoder.h   |  1 +
- CPP/7zip/Compress/Rar2Decoder.cpp | 10 +++++++++-
- CPP/7zip/Compress/Rar2Decoder.h   |  1 +
- CPP/7zip/Compress/Rar3Decoder.cpp | 23 ++++++++++++++++++++---
- CPP/7zip/Compress/Rar3Decoder.h   |  2 ++
- 6 files changed, 42 insertions(+), 8 deletions(-)
-
-diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
-index 1aaedcc..68030c7 100644
---- a/CPP/7zip/Compress/Rar1Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar1Decoder.cpp
-@@ -29,7 +29,7 @@ public:
- };
- */
- 
--CDecoder::CDecoder(): m_IsSolid(false) { }
-+CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
- 
- void CDecoder::InitStructures()
- {
-@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-   InitData();
-   if (!m_IsSolid)
-   {
-+    _errorMode = false;
-     InitStructures();
-     InitHuff();
-   }
-+
-+  if (_errorMode)
-+    return S_FALSE;
-+
-   if (m_UnpackSize > 0)
-   {
-     GetFlagsBuf();
-@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
-     const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
- {
-   try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
--  catch(const CInBufferException &e) { return e.ErrorCode; }
--  catch(const CLzOutWindowException &e) { return e.ErrorCode; }
--  catch(...) { return S_FALSE; }
-+  catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; }
-+  catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; }
-+  catch(...) { _errorMode = true; return S_FALSE; }
- }
- 
- STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
-diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
-index 630f089..01b606b 100644
---- a/CPP/7zip/Compress/Rar1Decoder.h
-+++ b/CPP/7zip/Compress/Rar1Decoder.h
-@@ -39,6 +39,7 @@ public:
- 
-   Int64 m_UnpackSize;
-   bool m_IsSolid;
-+  bool _errorMode;
- 
-   UInt32 ReadBits(int numBits);
-   HRESULT CopyBlock(UInt32 distance, UInt32 len);
-diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
-index b3f2b4b..0580c8d 100644
---- a/CPP/7zip/Compress/Rar2Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar2Decoder.cpp
-@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
- static const UInt32 kWindowReservSize = (1 << 22) + 256;
- 
- CDecoder::CDecoder():
--  m_IsSolid(false)
-+  m_IsSolid(false),
-+  m_TablesOK(false)
- {
- }
- 
-@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numB
- 
- bool CDecoder::ReadTables(void)
- {
-+  m_TablesOK = false;
-+
-   Byte levelLevels[kLevelTableSize];
-   Byte newLevels[kMaxTableSize];
-   m_AudioMode = (ReadBits(1) == 1);
-@@ -170,6 +173,8 @@ bool CDecoder::ReadTables(void)
-   }
-   
-   memcpy(m_LastLevels, newLevels, kMaxTableSize);
-+  m_TablesOK = true;
-+
-   return true;
- }
- 
-@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-       return S_FALSE;
-   }
- 
-+  if (!m_TablesOK)
-+    return S_FALSE;
-+
-   UInt64 startPos = m_OutWindowStream.GetProcessedSize();
-   while (pos < unPackSize)
-   {
-diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
-index 3a0535c..0e9005f 100644
---- a/CPP/7zip/Compress/Rar2Decoder.h
-+++ b/CPP/7zip/Compress/Rar2Decoder.h
-@@ -139,6 +139,7 @@ class CDecoder :
- 
-   UInt64 m_PackSize;
-   bool m_IsSolid;
-+  bool m_TablesOK;
- 
-   void InitStructures();
-   UInt32 ReadBits(unsigned numBits);
-diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
-index 3bf2513..6cb8a6a 100644
---- a/CPP/7zip/Compress/Rar3Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar3Decoder.cpp
-@@ -92,7 +92,8 @@ CDecoder::CDecoder():
-   _writtenFileSize(0),
-   _vmData(0),
-   _vmCode(0),
--  m_IsSolid(false)
-+  m_IsSolid(false),
-+  _errorMode(false)
- {
-   Ppmd7_Construct(&_ppmd);
- }
-@@ -545,6 +546,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
-     return InitPPM();
-   }
- 
-+  TablesRead = false;
-+  TablesOK = false;
-+
-   _lzMode = true;
-   PrevAlignBits = 0;
-   PrevAlignCount = 0;
-@@ -606,6 +610,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
-       }
-     }
-   }
-+  if (InputEofError())
-+    return S_FALSE;
-+
-   TablesRead = true;
- 
-   // original code has check here:
-@@ -623,6 +630,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
-   RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize]));
- 
-   memcpy(m_LastLevels, newLevels, kTablesSizesSum);
-+
-+  TablesOK = true;
-+
-   return S_OK;
- }
- 
-@@ -824,7 +834,12 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
-     PpmEscChar = 2;
-     PpmError = true;
-     InitFilters();
-+    _errorMode = false;
-   }
-+
-+  if (_errorMode)
-+    return S_FALSE;
-+
-   if (!m_IsSolid || !TablesRead)
-   {
-     bool keepDecompressing;
-@@ -838,6 +853,8 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
-     bool keepDecompressing;
-     if (_lzMode)
-     {
-+      if (!TablesOK)
-+        return S_FALSE;
-       RINOK(DecodeLZ(keepDecompressing))
-     }
-     else
-@@ -901,8 +918,8 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
-     _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1;
-     return CodeReal(progress);
-   }
--  catch(const CInBufferException &e)  { return e.ErrorCode; }
--  catch(...) { return S_FALSE; }
-+  catch(const CInBufferException &e)  { _errorMode = true; return e.ErrorCode; }
-+  catch(...) { _errorMode = true; return S_FALSE; }
-   // CNewException is possible here. But probably CNewException is caused
-   // by error in data stream.
- }
-diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
-index c130cec..2f72d7d 100644
---- a/CPP/7zip/Compress/Rar3Decoder.h
-+++ b/CPP/7zip/Compress/Rar3Decoder.h
-@@ -192,6 +192,7 @@ class CDecoder:
-   UInt32 _lastFilter;
- 
-   bool m_IsSolid;
-+  bool _errorMode;
- 
-   bool _lzMode;
-   bool _unsupportedFilter;
-@@ -200,6 +201,7 @@ class CDecoder:
-   UInt32 PrevAlignCount;
- 
-   bool TablesRead;
-+  bool TablesOK;
- 
-   CPpmd7 _ppmd;
-   int PpmEscChar;
-
diff --git a/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch b/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch
deleted file mode 100644
index 93eb0588c0..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0820ef4b9238c1e39ae5bda32cc08cce3fd3ce89 Mon Sep 17 00:00:00 2001
-From: Nisha Parrakat <Nisha.Parrakat@kpit.com>
-Date: Wed, 26 May 2021 19:59:28 +0000
-Subject: [PATCH] fixes the below error
-
-| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp: In member function 'virtual LONG NArchive::NWim::CHandler::GetArchiveProperty(PROPID, PROPVARIANT*)':
-| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:308:11: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
-|   308 |           numMethods++;
-|       |           ^~~~~~~~~~
-| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:318:9: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
-|   318 |         numMethods++;
-
-use unsigned instead of bool
-Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
-
-Upstream-Status: Pending
-
----
- CPP/7zip/Archive/Wim/WimHandler.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CPP/7zip/Archive/Wim/WimHandler.cpp b/CPP/7zip/Archive/Wim/WimHandler.cpp
-index 27d3298..4ff5cfe 100644
---- a/CPP/7zip/Archive/Wim/WimHandler.cpp
-+++ b/CPP/7zip/Archive/Wim/WimHandler.cpp
-@@ -298,7 +298,7 @@ STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value)
- 
-       AString res;
- 
--      bool numMethods = 0;
-+      unsigned numMethods = 0;
-       for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++)
-       {
-         if (methodMask & ((UInt32)1 << i))
diff --git a/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch b/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch
deleted file mode 100644
index 2636e7f6f4..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b2aa209dfc5e59d6329b55b9764782334b63dbe8 Mon Sep 17 00:00:00 2001
-From: Raphael Freudiger <raphael.freudiger@siemens.com>
-Date: Wed, 11 Feb 2015 09:11:47 +0100
-Subject: [PATCH] do not override compiler and do not strip
-
-The default makefile sets the compiler to g++ or gcc. This leads to a wrong architecture when cross-compiling.
-Remove the hardcoded compiler and just append the flags to CXX and CC.
-
-Upstream-Status: Pending
-Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com>
-Reviewed-By: Pascal Bach <pascal.bach@siemens.com>
-
----
- makefile.machine | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/makefile.machine b/makefile.machine
-index 9e34c34..e9244d9 100644
---- a/makefile.machine
-+++ b/makefile.machine
-@@ -2,7 +2,7 @@
- # makefile for Linux (x86, PPC, alpha ...)
- #
- 
--OPTFLAGS=-O -s
-+OPTFLAGS=-O
- 
- ALLFLAGS=${OPTFLAGS} -pipe \
-        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-@@ -10,8 +10,6 @@ ALLFLAGS=${OPTFLAGS} -pipe \
-        -D_7ZIP_LARGE_PAGES \
-        $(LOCAL_FLAGS)
- 
--CXX=g++
--CC=gcc
- CC_SHARED=-fPIC
- LINK_SHARED=-fPIC -shared
- 
diff --git a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
deleted file mode 100644
index e795482eb6..0000000000
--- a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-SUMMARY = "7-zip is a commandline utility handling 7z archives."
-HOMEPAGE = "http://www.7-zip.org/"
-LICENSE = "LGPL-2.1-or-later & unRAR"
-LIC_FILES_CHKSUM = "file://DOC/copying.txt;md5=4fbd65380cdd255951079008b364516c \
-                    file://DOC/unRarLicense.txt;md5=9c87ddde469ef94aed153b0951d088de \
-                    file://DOC/License.txt;md5=879598edf1f54dddb6930d7581357f8b"
-
-SRC_URI = "http://downloads.sourceforge.net/p7zip/p7zip/${PV}/p7zip_${PV}_src_all.tar.bz2 \
-           file://do_not_override_compiler_and_do_not_strip.patch \
-           file://CVE-2017-17969.patch \
-           file://0001-Fix-narrowing-errors-Wc-11-narrowing.patch \
-           file://change_numMethods_from_bool_to_unsigned.patch \
-           file://CVE-2018-5996.patch \
-           file://CVE-2016-9296.patch \
-           "
-
-SRC_URI[md5sum] = "a0128d661cfe7cc8c121e73519c54fbf"
-SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f"
-
-S = "${WORKDIR}/${BPN}_${PV}"
-
-do_compile:append() {
-    oe_runmake 7z
-}
-FILES:${PN} += "${libdir}/* ${bindir}/7z"
-
-FILES_SOLIBSDEV = ""
-INSANE_SKIP:${PN} += "dev-so"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -d ${D}${bindir}/Codecs
-        install -d ${D}${libdir}
-        install -d ${D}${libdir}/Codecs
-        install -m 0755 ${S}/bin/7za ${D}${bindir}
-        ln -s 7za ${D}${bindir}/7z
-        install -m 0755 ${S}/bin/Codecs/* ${D}${libdir}/Codecs/
-        install -m 0755 ${S}/bin/7z.so ${D}${libdir}/lib7z.so
-}
-
-RPROVIDES:${PN} += "lib7z.so()(64bit) 7z lib7z.so"
-RPROVIDES:${PN}-dev += "lib7z.so()(64bit) 7z lib7z.so"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-oe/recipes-extended/p8platform/p8platform_git.bb
index dc7280f099..e69d544b66 100644
--- a/meta-oe/recipes-extended/p8platform/p8platform_git.bb
+++ b/meta-oe/recipes-extended/p8platform/p8platform_git.bb
@@ -9,7 +9,6 @@ PV = "2.1.0.1+git"
 SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https"
 SRCREV = "a7cd0d5780ed80a4e70480d1650749f29e8a1fb2"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb
index 81d0746f89..ab5a8ef342 100644
--- a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb
+++ b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb
@@ -15,7 +15,9 @@ SRC_URI = "git://github.com/PADL/pam_ccreds;branch=master;protocol=https \
            file://0001-configure-Check-for-function-from-libdb-during-confi.patch \
            "
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 inherit autotools
 
diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb
index d5137f80af..2886137b7d 100644
--- a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb
+++ b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb
@@ -13,7 +13,6 @@ REQUIRED_DISTRO_FEATURES = "pam"
 SRCREV = "3e026863cad1fd45c760ee1bc93ef4f0606cc852"
 SRC_URI = "git://github.com/rmbreak/pam_ldapdb;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 do_install () {
     oe_runmake install DESTDIR=${D} PAMDIR=${base_libdir}/security
diff --git a/meta-oe/recipes-extended/pam/pam-radius_3.0.0.bb b/meta-oe/recipes-extended/pam/pam-radius_3.0.0.bb
new file mode 100644
index 0000000000..0e2199b066
--- /dev/null
+++ b/meta-oe/recipes-extended/pam/pam-radius_3.0.0.bb
@@ -0,0 +1,29 @@
+SUMMARY = "PAM module for RADIUS authentication"
+DESCRIPTION = "This allows any PAM-capable machine to become a RADIUS client for \
+authentication and accounting requests. You will need a RADIUS server to perform \
+the actual authentication."
+HOMEPAGE = "http://freeradius.org/pam_radius_auth/"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd794e2a0a289b9dfcc9f513d1996e"
+
+SRC_URI = "git://github.com/FreeRADIUS/pam_radius.git;protocol=https;branch=master"
+SRCREV = "b6442c3e0147f1019990520483fa3a30e4ccf059"
+
+
+DEPENDS = "libpam"
+
+inherit autotools-brokensep features_check
+REQUIRED_DISTRO_FEATURES = "pam"
+
+EXTRA_OECONF = "--disable-developer"
+
+do_install() {
+    install -d ${D}${sysconfdir}
+    install -m 644 ${S}/pam_radius_auth.conf ${D}${sysconfdir}
+    install -d ${D}${base_libdir}/security
+    install -m 644 ${S}/pam_radius_auth.so ${D}${base_libdir}/security
+}
+
+FILES:${PN} += "${base_libdir}/security/*.so"
+FILES:${PN}-dbg += "${base_libdir}/security/.debug"
diff --git a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
index b5bcc63339..d14a20609a 100644
--- a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
+++ b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
@@ -12,7 +12,6 @@ SRC_URI = "http://sourceforge.net/projects/pamsshagentauth/files/pam_ssh_agent_a
            file://0002-Check-against-the-correct-OPENSSL_VERSION_NUMBER.patch \
            file://0001-configure-Include-stdio.h-for-printf.patch \
            "
-SRC_URI[md5sum] = "8dbe90ab3625e545036333e6f51ccf1d"
 SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f47a763"
 
 DEPENDS += "libpam openssl"
@@ -26,7 +25,7 @@ RDEPENDS:${PN} += "openssh-misc"
 
 # Kind of unfortunate to have underscores in the name.
 #
-S = "${WORKDIR}/pam_ssh_agent_auth-${PV}"
+S = "${UNPACKDIR}/pam_ssh_agent_auth-${PV}"
 
 inherit autotools-brokensep perlnative
 
@@ -53,3 +52,16 @@ do_compile () {
 #
 FILES:${PN} += "${base_libdir}/security/pam*"
 FILES:${PN}-dbg += "${base_libdir}/security/.debug"
+
+# This one is reproducible only on 32bit MACHINEs
+# http://errors.yoctoproject.org/Errors/Details/766965/
+# ssh-rsa.c:59:24: error: passing argument 1 of 'EVP_DigestInit' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-rsa.c:60:26: error: passing argument 1 of 'EVP_DigestUpdate' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-rsa.c:61:25: error: passing argument 1 of 'EVP_DigestFinal' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:76:18: error: passing argument 1 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:76:23: error: passing argument 2 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:76:27: error: passing argument 3 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:148:18: error: passing argument 1 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:148:23: error: passing argument 2 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:148:27: error: passing argument 3 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/parallel/parallel_20250522.bb b/meta-oe/recipes-extended/parallel/parallel_20250522.bb
new file mode 100644
index 0000000000..79ea168675
--- /dev/null
+++ b/meta-oe/recipes-extended/parallel/parallel_20250522.bb
@@ -0,0 +1,39 @@
+SUMMARY = "GNU Parallel - A shell tool for executing jobs in parallel using one or more computers"
+DESCRIPTION = "GNU Parallel is a command-line tool for executing jobs in parallel on one or more computers. \
+It allows users to run multiple commands simultaneously, making it easier to process large batches of tasks."
+
+HOMEPAGE = "https://www.gnu.org/software/parallel/"
+LICENSE = "CC-BY-SA-4.0 & GFDL-1.3-or-later & GPL-3.0-or-later"
+
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/CC-BY-SA-4.0.txt;md5=7130783469368ceb248a4f03e89ea4b8 \
+    file://LICENSES/GFDL-1.3-or-later.txt;md5=e0771ae6a62dc8a2e50b1d450fea66b7 \
+    file://LICENSES/GPL-3.0-or-later.txt;md5=8da5784ab1c72e63ac74971f88658166 \
+"
+
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "b4b28f475f8cff8bb6ed4b03cc5a67041f18fc73fa256923b23181b56afdb2cb"
+
+inherit autotools bash-completion
+
+PACKAGES += "${PN}-zsh-completion"
+FILES:${PN}-zsh-completion = "${datadir}/zsh"
+
+RDEPENDS:${PN} = " \
+    perl \
+    perl-module-file-basename \
+    perl-module-file-glob \
+    perl-module-file-path \
+    perl-module-file-temp \
+    perl-module-filehandle \
+    perl-module-getopt-long \
+    perl-module-io-select \
+    perl-module-ipc-open3 \
+    perl-module-posix \
+    perl-module-symbol \
+    perl-module-thread-queue \
+    perl-module-threads \
+    perl-module-threads-shared \
+"
+
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-extended/pegtl/pegtl/run-ptest b/meta-oe/recipes-extended/pegtl/pegtl/run-ptest
new file mode 100644
index 0000000000..e819628c9f
--- /dev/null
+++ b/meta-oe/recipes-extended/pegtl/pegtl/run-ptest
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+fail_count=0
+all_count=0
+
+for test_suite in src/test/pegtl/pegtl-test-*
+do
+    if "./$test_suite"
+    then
+        echo "PASS: $test_suite"
+    else
+        echo "FAIL: $test_suite"
+        fail_count=$((fail_count + 1))
+    fi
+    all_count=$((all_count + 1))
+done
+
+if [ $fail_count -eq 0 ]
+then
+    echo "PASS: All $all_count tests passed"
+else
+    echo "FAIL: $fail_count of $all_count tests failed"
+fi
diff --git a/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb b/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb
deleted file mode 100644
index 237828dbfc..0000000000
--- a/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar"
-HOMEPAGE="https://github.com/taocpp/PEGTL"
-LICENSE="MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dccf35ef30bf912bb07b01d469965293"
-
-SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x"
-SRCREV = "cf639f7f4ee125f68e1ccfba8d99ebc0de57b9fe"
-
-inherit cmake
-
-S = "${WORKDIR}/git"
-
-CXXFLAGS += " -Wno-error=type-limits"
diff --git a/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb b/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb
new file mode 100644
index 0000000000..4d540d0180
--- /dev/null
+++ b/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "header-only library for creating parsers according to Parsing Expression Grammar"
+HOMEPAGE = "https://github.com/taocpp/PEGTL"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=dccf35ef30bf912bb07b01d469965293"
+
+SRC_URI = " \
+        git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x \
+        file://run-ptest \
+"
+
+SRCREV = "be527327653e94b02e711f7eff59285ad13e1db0"
+
+inherit cmake ptest
+
+
+do_install_ptest () {
+    install -d ${D}${PTEST_PATH}/src/test/pegtl/data
+    install -m 0755 ${B}/src/test/pegtl/pegtl-test-* ${D}${PTEST_PATH}/src/test/pegtl
+    install ${S}/src/test/pegtl/file_*.txt ${D}${PTEST_PATH}/src/test/pegtl
+    install ${S}/src/test/pegtl/data/*.json ${D}${PTEST_PATH}/src/test/pegtl/data
+}
+
+CXXFLAGS += " -Wno-error=type-limits"
diff --git a/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb b/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
index 7768d17418..367aedd4c5 100644
--- a/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
+++ b/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
@@ -12,10 +12,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=34;endline=37;md5=54fdfac62963b7cece
 
 SRC_URI = "https://cpan.metacpan.org/authors/id/M/MJ/MJP/File-FnMatch-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "22f77c20d0fb5af01a3165e2df2fe34c"
 SRC_URI[sha256sum] = "962454b8e86bea8b132bf8af35757d0c6a8f5d599015bd6a5d68cb7ae7a9e916"
 
-S = "${WORKDIR}/File-FnMatch-${PV}"
+S = "${UNPACKDIR}/File-FnMatch-${PV}"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-extended/plocate/plocate_1.1.22.bb b/meta-oe/recipes-extended/plocate/plocate_1.1.23.bb
index 694c29776a..c9502db16a 100644
--- a/meta-oe/recipes-extended/plocate/plocate_1.1.22.bb
+++ b/meta-oe/recipes-extended/plocate/plocate_1.1.23.bb
@@ -12,4 +12,4 @@ DEPENDS = "zstd liburing"
 SRC_URI = "https://plocate.sesse.net/download/${BP}.tar.gz \
            file://0001-Include-linux-stat.h-only-when-sys-stat.h-is-not-inc.patch"
 
-SRC_URI[sha256sum] = "3b7e4741b4aa2ec044e53eff06474a32a3fb1e928b9382351fe79d4c27fb0049"
+SRC_URI[sha256sum] = "06bd3b284d5d077b441bef74edb0cc6f8e3f0a6f58b4c15ef865d3c460733783"
diff --git a/meta-oe/recipes-extended/pmdk/pmdk_2.1.0.bb b/meta-oe/recipes-extended/pmdk/pmdk_2.1.1.bb
index 100ff4200c..5aba331acc 100644
--- a/meta-oe/recipes-extended/pmdk/pmdk_2.1.0.bb
+++ b/meta-oe/recipes-extended/pmdk/pmdk_2.1.1.bb
@@ -3,18 +3,17 @@ DESCRIPTION = "Persistent Memory Development Kit"
 HOMEPAGE = "http://pmem.io"
 SECTION = "libs"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b44ee63f162f9cdb18fff1224877aafd"
-DEPENDS = "ndctl cmake-native"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3e2f50552a27ca99772f3d884f98560b"
+DEPENDS = "ndctl"
 
 # Required to have the fts.h header for musl
 DEPENDS:append:libc-musl = " fts"
 
-S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/pmem/pmdk.git;branch=master;protocol=https"
-SRCREV = "5705fdffa755d00b4dbb4d6c30eb49671436f961"
+SRCREV = "0f0ab391d8e3db52f745f33c92b9d9a462bb3695"
 
-inherit autotools-brokensep pkgconfig
+inherit pkgconfig
 
 # Fix jemalloc error:
 # | configure: error: cannot run C compiled programs.
@@ -26,7 +25,7 @@ EXTRA_OEMAKE = "BUILD_EXAMPLES='n' DOC='n' HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='
 # Fix the missing fts libs when using musl
 EXTRA_OEMAKE:append:libc-musl = " EXTRA_LIBS='-lfts'"
 
-do_configure:prepend() {
+do_configure() {
         touch .skip-doc
 }
 
@@ -45,4 +44,4 @@ FILES:${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/i
 FILES:${PN} += "/usr/etc"
 FILES:${PN} += "/usr/share"
 
-COMPATIBLE_HOST='(x86_64).*'
+COMPATIBLE_HOST = '(x86_64).*'
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
index 2159482ebb..c0066d5636 100644
--- a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
@@ -7,7 +7,7 @@ require polkit-group-rule.inc
 SRC_URI = "file://50-org.freedesktop.timedate1.rules"
 
 do_install() {
-        install -m 0755 ${UNPACKDIR}/50-org.freedesktop.timedate1.rules ${D}${sysconfdir}/polkit-1/rules.d
+        install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.timedate1.rules ${D}${datadir}/polkit-1/rules.d
 }
 
 USERADD_PACKAGES = "${PN}"
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
index bfd3361dfe..ec8ff868d4 100644
--- a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
@@ -7,7 +7,7 @@ require polkit-group-rule.inc
 SRC_URI = "file://50-org.freedesktop.NetworkManager.rules"
 
 do_install() {
-        install -m 0755 ${UNPACKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${sysconfdir}/polkit-1/rules.d
+        install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${datadir}/polkit-1/rules.d
 }
 
 USERADD_PACKAGES = "${PN}"
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb
index 8dc8c5e255..884590d47c 100644
--- a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb
@@ -10,7 +10,7 @@ SRC_URI = "file://50-org.freedesktop.udiskie.rules"
 RDEPENDS:${PN} += "udisks2"
 
 do_install() {
-    install -m 0755 ${UNPACKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d
+    install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.udiskie.rules ${D}${datadir}/polkit-1/rules.d
 }
 
 USERADD_PACKAGES = "${PN}"
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
index 4aeeb77d04..b1e16a924c 100644
--- a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
@@ -7,7 +7,7 @@ REQUIRED_DISTRO_FEATURES = "polkit"
 inherit useradd
 
 do_install:prepend() {
-    install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d
-    chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d
+        install -m 755 -d ${D}${datadir}/polkit-1/rules.d
 }
-USERADD_PARAM:${PN}:prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;"
+
+FILES:${PN} += "${datadir}/polkit-1/rules.d"
diff --git a/meta-oe/recipes-extended/polkit/polkit_124.bb b/meta-oe/recipes-extended/polkit/polkit_126.bb
index 9e2eb05c62..0438c4e464 100644
--- a/meta-oe/recipes-extended/polkit/polkit_124.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_126.bb
@@ -1,38 +1,36 @@
-SUMMARY = "PolicyKit Authorization Framework"
+SUMMARY = "Polkit Authorization Framework"
 DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes."
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit"
 LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb"
+BUGTRACKER = "https://github.com/polkit-org/polkit/issues"
 
-SRC_URI = "git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/polkit-org/polkit.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
-SRCREV = "82f0924dc0eb23b9df68e88dbaf9e07c81940a5a"
+SRCREV = "d627b0d1e1108563658dabe3fb8d2a065e64df10"
 
-DEPENDS = "expat glib-2.0"
+DEPENDS = "expat glib-2.0 duktape"
 
 inherit meson pkgconfig useradd systemd gettext gobject-introspection features_check
 
 REQUIRED_DISTRO_FEATURES = "polkit"
 
+# Prevent meson.build to try to autodetect host OS (which could lead to
+# non-reproducibility)
+EXTRA_OEMESON = "-Dos_type=openembedded"
+
 PACKAGECONFIG = " \
         ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
         ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \
         dbus \
-        mozjs \
 "
 PACKAGECONFIG[dbus] = ",,dbus"
 PACKAGECONFIG[gtk-doc] = "-Dgtk_doc=true,-Dgtk_doc=false,gtk-doc-native"
 PACKAGECONFIG[pam] = "-Dauthfw=pam,-Dauthfw=shadow,libpam,libpam"
-PACKAGECONFIG[systemd] = "-Dsession_tracking=libsystemd-login,-Dsession_tracking=ConsoleKit,systemd"
-PACKAGECONFIG[consolekit] = ",,,consolekit"
-
-# Default to mozjs javascript library
-PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-115,,,duktape"
-# duktape javascript engine is much smaller and faster but is not compatible with
-# same javascript standards as mozjs. For example array.includes() function is not
-# supported. Test rule compatibility when switching to duktape.
-PACKAGECONFIG[duktape] = "-Djs_engine=duktape,,duktape,,,mozjs"
+PACKAGECONFIG[systemd] = "-Dsession_tracking=logind,,systemd,,,consolekit elogind"
+PACKAGECONFIG[consolekit] = "-Dsession_tracking=ConsoleKit,,,consolekit,,systemd elogind"
+PACKAGECONFIG[elogind] = "-Dsession_tracking=libelogin,,elogind,,,systemd consolekit"
+PACKAGECONFIG[libs-only] = "-Dlibs-only=true,-Dlibs-only=false"
 
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 --shell /bin/nologin polkitd"
@@ -42,18 +40,26 @@ SYSTEMD_AUTO_ENABLE = "disable"
 
 do_install:append() {
         #Fix up permissions on polkit rules.d to work with rpm4 constraints
-        chmod 700 ${D}/${datadir}/polkit-1/rules.d
-        chmod 700 ${D}/${sysconfdir}/polkit-1/rules.d
-        chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
-        chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d
+        if ${@bb.utils.contains('PACKAGECONFIG', 'libs-only', 'false', 'true', d)}; then
+                chmod 700 ${D}/${sysconfdir}/polkit-1/rules.d
+                chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d
+        fi
+
+        # Polkit unconditionally installs a systemd service, remove it on SysVinit
+        # systems to avoid "installed but not packaged file" error.
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+                rm -rf ${D}${nonarch_libdir}/systemd ${D}${libdir}/systemd
+        fi
 }
 
 FILES:${PN} += " \
         ${libdir}/pam.d/polkit-1 \
         ${libdir}/sysusers.d \
+        ${libdir}/tmpfiles.d \
         ${libdir}/polkit-1 \
         ${nonarch_libdir}/pam.d/polkit-1 \
         ${nonarch_libdir}/sysusers.d \
+        ${nonarch_libdir}/tmpfiles.d \
         ${nonarch_libdir}/polkit-1 \
         ${datadir} \
 "
diff --git a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb
index 25951c9de4..20b7f0a5bd 100644
--- a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb
+++ b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb
@@ -11,7 +11,9 @@ PV = "0.0.1+git"
 SRCREV = "45863e849b39c4921d6553e6d27e267a96ac7d77"
 SRC_URI = "git://github.com/lib-cpp/${BPN}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 do_configure:prepend() {
     echo " " > ${S}/tests/CMakeLists.txt
diff --git a/meta-oe/recipes-extended/qad/qad_git.bb b/meta-oe/recipes-extended/qad/qad_git.bb
index 0bc94121a7..189d2f9d15 100644
--- a/meta-oe/recipes-extended/qad/qad_git.bb
+++ b/meta-oe/recipes-extended/qad/qad_git.bb
@@ -14,7 +14,9 @@ SRC_URI = "git://gitlab.com/CodethinkLabs/qad/qad;branch=main;protocol=https \
 
 SRCREV = "ae0c099c1fdc0ca6f5d631cea6b302937122b362"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 PV = "0.0+git"
 
 DEPENDS = "cjson libmicrohttpd libdrm libpng"
diff --git a/meta-oe/recipes-extended/qcbor/qcbor_1.3.bb b/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb
index f90e814f7a..00cae11c4e 100644
--- a/meta-oe/recipes-extended/qcbor/qcbor_1.3.bb
+++ b/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb
@@ -10,9 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=498c298542365dfcfe29948c72a5849b"
 
 SRC_URI = "git://github.com/laurencelundblade/QCBOR;protocol=https;branch=master"
 
-SRCREV = "1eba85dbbe78fc1938f8aba2112ba1b228caed30"
+SRCREV = "4487f10e1bf258434fb8a39e4f59c29e31910ad0"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-extended/qhull/qhull/0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch b/meta-oe/recipes-extended/qhull/qhull/0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch
new file mode 100644
index 0000000000..7003dd76c2
--- /dev/null
+++ b/meta-oe/recipes-extended/qhull/qhull/0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch
@@ -0,0 +1,35 @@
+From f72312ae0becb581cd428d17dbbcdf1b6f02ebee Mon Sep 17 00:00:00 2001
+From: Orion Poplawski <orion@nwra.com>
+Date: Tue, 4 Oct 2022 21:56:58 -0600
+Subject: [PATCH] Use ${LIB_INSTALL_DIR} for cmake and pkgconfig files to
+ support multi-lib on Fedora/RedHat
+
+Upstream-Status: Backport [https://github.com/qhull/qhull/commit/67d231c872aa1bae892e5da9646a10b303477039]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f50b187..c2248f9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -709,7 +709,7 @@ configure_file(${PROJECT_SOURCE_DIR}/build/config.cmake.in
+   @ONLY
+ )
+ 
+-set(ConfigPackageLocation lib/cmake/Qhull)
++set(ConfigPackageLocation ${LIB_INSTALL_DIR}/cmake/Qhull)
+ install(EXPORT QhullTargets
+   FILE
+     QhullTargets.cmake
+@@ -728,7 +728,7 @@ install(
+     Devel
+ )
+ 
+-set(PkgConfigLocation lib/pkgconfig)
++set(PkgConfigLocation ${LIB_INSTALL_DIR}/pkgconfig)
+ foreach(pkgconfig IN ITEMS "${qhull_SHAREDR};Qhull reentrant shared library"
+                            "${qhull_STATIC};Qhull static library"
+                            "${qhull_STATICR};Qhull reentrant static library"
diff --git a/meta-oe/recipes-extended/qhull/qhull_2020.2.bb b/meta-oe/recipes-extended/qhull/qhull_2020.2.bb
new file mode 100644
index 0000000000..13638c391b
--- /dev/null
+++ b/meta-oe/recipes-extended/qhull/qhull_2020.2.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "library to compute convex hulls, Delaunay triangulations and Voronoi diagrams."
+HOMEPAGE = "http://www.qhull.org/"
+SECTION = "libs"
+LICENSE = "Qhull"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=484ee0cacf0472e8b40225b116f6296c"
+
+SRC_URI = "http://www.qhull.org/download/qhull-2020-src-8.0.2.tgz \
+    file://0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch \
+"
+SRC_URI[sha256sum] = "b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e"
+
+CFLAGS += "-fPIC"
+
+EXTRA_OECMAKE += "\
+    -DCMAKE_SKIP_RPATH=ON \
+    -DLIB_INSTALL_DIR=${baselib} \
+"
+
+inherit cmake
+
+# The QhullTargets-noconfig.cmake checks for the executables despite not
+# needing to execute them for the build.  Staging bindir to the sysroot
+# allows us to pass the check without building qhull natively
+SYSROOT_DIRS:append = " \
+    ${bindir} \
+"
diff --git a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
index 2934312456..c7f320660f 100644
--- a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
+++ b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
@@ -10,7 +10,6 @@ network."
 SECTION = "System Environment/Daemons"
 
 SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.gz/be2a88f8ccddf2a40ac484cb3294fedc/${BP}.tar.gz"
-SRC_URI[md5sum] = "be2a88f8ccddf2a40ac484cb3294fedc"
 SRC_URI[sha256sum] = "4d6145d435a5d8b567b9798620f57f9b0a464078a1deba267958f168fbe776e6"
 
 SRC_URI += "file://0001-rarpd.8-add-man-file.patch \
@@ -25,7 +24,7 @@ SRC_URI += "file://0001-rarpd.8-add-man-file.patch \
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://rarpd.c;md5=199b20b172ea93121bc613a9c77b6931"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb
index 3e757e6037..d643c6f0b9 100644
--- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb
+++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https
            file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch"
 SRCREV = "ad6baa121f4c6fbc7622d83d606210ac22549c78"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0001-hiredis-use-default-CC-if-it-is-set.patch
index 7785acca5c..63bf403412 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0001-hiredis-use-default-CC-if-it-is-set.patch
@@ -1,4 +1,4 @@
-From 41efa2f0cf08c91ff935bbb2d16ab233df7f5811 Mon Sep 17 00:00:00 2001
+From af4fc632c03b2a68be4206b4896f27fc4bb865ae Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 17:39:52 -0600
 Subject: [PATCH] hiredis: use default CC if it is set
@@ -9,6 +9,8 @@ Content-Transfer-Encoding: 8bit
 Instead of trying to automagically figure out CC, which breaks with OE
 as CC has spaces in it, just skip it if one was already passed in.
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Update to work with 4.0.8
@@ -16,10 +18,7 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
 
 Reworked for 6.0.4
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
 ---
-Upstream-Status: Pending
-
  deps/hiredis/Makefile | 2 --
  1 file changed, 2 deletions(-)
 
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0002-lua-update-Makefile-to-use-environment-build-setting.patch
index 20708eda1e..46330f5064 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0002-lua-update-Makefile-to-use-environment-build-setting.patch
@@ -1,4 +1,4 @@
-From aa3d31355f3cc140b1dc2f4fcff8e3c0aa261549 Mon Sep 17 00:00:00 2001
+From 45ae5eb5c3482054073e06ab1a78e0aa9b96447f Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 20:22:19 -0600
 Subject: [PATCH] lua: update Makefile to use environment build settings
@@ -6,6 +6,8 @@ Subject: [PATCH] lua: update Makefile to use environment build settings
 OE-specific parameters, instead of overriding all of these simply use
 the ones that are already passed in. Also configure for only Linux...
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Updated to work with 3.0.x
@@ -14,8 +16,6 @@ Signed-off-by: Armin Kuster <akust808@gmail.com>
 
 updated to work wtih 6.2.1
 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
-
-Upstream-Status: Pending
 ---
  deps/Makefile         |  1 -
  deps/lua/Makefile     |  1 -
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0003-hack-to-force-use-of-libc-malloc.patch
index 7b601e02a9..1f97f9783d 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/oe-use-libc-malloc.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0003-hack-to-force-use-of-libc-malloc.patch
@@ -1,4 +1,4 @@
-From 38a5f403b033d03cdac3ff814687d83f61527d8e Mon Sep 17 00:00:00 2001
+From 7a98e3ac480413ce7db3a5edd5dc70458b921b29 Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Wed, 6 Feb 2013 20:51:02 -0600
 Subject: [PATCH] hack to force use of libc malloc
@@ -9,14 +9,13 @@ removed in favor of magic.
 Note that this of course doesn't allow tcmalloc and jemalloc, however
 jemalloc wasn't building correctly.
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Update to work with 4.0.8
 Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-
 ---
-Upstream-Status: Pending
-
  src/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0004-src-Do-not-reset-FINAL_LIBS.patch
index 01e53e3f21..974cf5169f 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0004-src-Do-not-reset-FINAL_LIBS.patch
@@ -1,4 +1,4 @@
-From d9d1f9a501ef7caa80d1e6595218898e9989ec2b Mon Sep 17 00:00:00 2001
+From 50fc46a12f6cf97e7b927d3ea29eecc9ebdea34d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 10 Sep 2019 20:04:26 -0700
 Subject: [PATCH] src: Do not reset FINAL_LIBS
@@ -9,8 +9,8 @@ environment to get it going
 e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
 
 Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  src/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.8/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
new file mode 100644
index 0000000000..8e5f30993b
--- /dev/null
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
@@ -0,0 +1,29 @@
+From acd832d76002a1916b3128ac05bc0296425aea6d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 21 Dec 2019 12:09:51 -0800
+Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
+
+Fixes
+| zmalloc.c:87:37: error: 'PTHREAD_MUTEX_DEFAULT' undeclared here (not in a function)
+|    87 | pthread_mutex_t used_memory_mutex = PTHREAD_MUTEX_INITIALIZER;
+|       |                                     ^~~~~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/zmalloc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/zmalloc.c b/src/zmalloc.c
+index bbfa386..93e07ff 100644
+--- a/src/zmalloc.c
++++ b/src/zmalloc.c
+@@ -32,6 +32,7 @@
+ #include "config.h"
+ #include "solarisfixes.h"
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdint.h>
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0006-Define-correct-gregs-for-RISCV32.patch
index 93c3595261..7009048171 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/0006-Define-correct-gregs-for-RISCV32.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0006-Define-correct-gregs-for-RISCV32.patch
@@ -1,14 +1,14 @@
-From 634f62be6c135ece93cb4e44a69ce3cb66f394ca Mon Sep 17 00:00:00 2001
+From dd3ecb07bbf80b986b8f2c656ea11d1346e212f6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 26 Oct 2020 21:32:22 -0700
 Subject: [PATCH] Define correct gregs for RISCV32
 
 Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 Updated patch for 6.2.8
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
 ---
  src/debug.c | 26 ++++++++++++++++++++++++--
  1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/init-redis-server b/meta-oe/recipes-extended/redis/redis-7.2.8/init-redis-server
index c5f335f57d..c5f335f57d 100755..100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/init-redis-server
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/init-redis-server
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/redis.conf b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.conf
index 75037d6dc8..75037d6dc8 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/redis.conf
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.conf
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/redis.service b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.service
index b7791d0df4..b7791d0df4 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/redis.service
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.service
diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
index d2a1b45e66..51a6e9c957 100644
--- a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
@@ -1,11 +1,16 @@
-From dc745a33f3875cc72d41bd34ed490b352e546352 Mon Sep 17 00:00:00 2001
+From 67990f216f2fbbc8a6699c700dfc089aa617905f Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 17:39:52 -0600
 Subject: [PATCH] hiredis: use default CC if it is set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Instead of trying to automagically figure out CC, which breaks with OE
 as CC has spaces in it, just skip it if one was already passed in.
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Update to work with 4.0.8
@@ -14,13 +19,11 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
 Reworked for 6.0.4
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
-Upstream-Status: Pending
-
  deps/hiredis/Makefile | 2 --
  1 file changed, 2 deletions(-)
 
 diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
-index 25ac154..569f82b 100644
+index 7e41c97..54717e3 100644
 --- a/deps/hiredis/Makefile
 +++ b/deps/hiredis/Makefile
 @@ -42,8 +42,6 @@ endef
@@ -32,6 +35,3 @@ index 25ac154..569f82b 100644
  OPTIMIZATION?=-O3
  WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
  DEBUG_FLAGS?= -g -ggdb
--- 
-2.21.3
-
diff --git a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
index aade7afd06..17b533669b 100644
--- a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch
+++ b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
@@ -1,4 +1,4 @@
-From 097a2b259cb266c2c861dc74fa6f80712d6138c5 Mon Sep 17 00:00:00 2001
+From ef989aab052510bfda32b2b325a5f80b76c42677 Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 20:22:19 -0600
 Subject: [PATCH] lua: update Makefile to use environment build settings
@@ -6,6 +6,8 @@ Subject: [PATCH] lua: update Makefile to use environment build settings
 OE-specific parameters, instead of overriding all of these simply use
 the ones that are already passed in. Also configure for only Linux...
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Updated to work with 3.0.x
@@ -15,18 +17,16 @@ Signed-off-by: Armin Kuster <akust808@gmail.com>
 updated to work wtih 6.2.1
 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
 ---
-Upstream-Status: Pending
-
  deps/Makefile         |  1 -
  deps/lua/Makefile     |  1 -
  deps/lua/src/Makefile | 16 ++++++----------
  3 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/deps/Makefile b/deps/Makefile
-index ff16ee9..d8d64aa 100644
+index cbe3aef..76bc222 100644
 --- a/deps/Makefile
 +++ b/deps/Makefile
-@@ -74,7 +74,6 @@ LUA_LDFLAGS+= $(LDFLAGS)
+@@ -81,7 +81,6 @@ endif
  # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
  # challenging to cross-compile lua (and redis).  These defines make it easier
  # to fit redis into cross-compilation environments, which typically set AR.
diff --git a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
index e76bdbc263..f1021eef6c 100644
--- a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch
+++ b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
@@ -1,4 +1,4 @@
-From 1fa047162983d4a7e0576f0837a73a6027a783bd Mon Sep 17 00:00:00 2001
+From b9586abcb803747301f6cc4ff93c7642bef693ea Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Wed, 6 Feb 2013 20:51:02 -0600
 Subject: [PATCH] hack to force use of libc malloc
@@ -9,19 +9,18 @@ removed in favor of magic.
 Note that this of course doesn't allow tcmalloc and jemalloc, however
 jemalloc wasn't building correctly.
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Update to work with 4.0.8
 Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-
 ---
-Upstream-Status: Pending
-
  src/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index ecd6929..c7f43c5 100644
+index 7d75c83..35dd314 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -13,7 +13,8 @@
diff --git a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
index 66ab0ee33c..958106e261 100644
--- a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
@@ -1,4 +1,4 @@
-From 97584e1eb78dc18599534b47b6670c20c63f5ee2 Mon Sep 17 00:00:00 2001
+From a4d87aca1c00c53b386ee7490223971e00873add Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 10 Sep 2019 20:04:26 -0700
 Subject: [PATCH] src: Do not reset FINAL_LIBS
@@ -9,17 +9,17 @@ environment to get it going
 e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
 
 Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  src/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 5564351..83ccd76 100644
+index 35dd314..3770f96 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -91,7 +91,7 @@ endif
+@@ -93,7 +93,7 @@ endif
  
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
diff --git a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
index 20f689bd0b..d73c66c9d0 100644
--- a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch
+++ b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
@@ -1,4 +1,4 @@
-From 98d526f76049be21bf3d77158236b2189419a78e Mon Sep 17 00:00:00 2001
+From 2e6311c9c7cd85bf63eab8fe92c08ec1ec01b6fc Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 Dec 2019 12:09:51 -0800
 Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
@@ -9,6 +9,7 @@ Fixes
 |       |                                     ^~~~~~~~~~~~~~~~~~~~~~~~~
 
 Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  src/zmalloc.c | 1 +
@@ -26,6 +27,3 @@ index 1f33d09..5e182d1 100644
  #include <stdio.h>
  #include <stdlib.h>
  #include <stdint.h>
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
index 9d7e502717..bb3f5c607e 100644
--- a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
+++ b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
@@ -1,9 +1,10 @@
-From 26bd72f3b8de22e5036d86e6c79f815853b83473 Mon Sep 17 00:00:00 2001
+From 6149911f7a6fbaef3ed418408e2b501fa9479ffa Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 26 Oct 2020 21:32:22 -0700
 Subject: [PATCH] Define correct gregs for RISCV32
 
 Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 Updated patch for 6.2.1
@@ -13,10 +14,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
  1 file changed, 24 insertions(+), 2 deletions(-)
 
 diff --git a/src/debug.c b/src/debug.c
-index 5318c14..8c21b47 100644
+index bb76c5d..55a0696 100644
 --- a/src/debug.c
 +++ b/src/debug.c
-@@ -1055,7 +1055,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
+@@ -1067,7 +1067,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
      #endif
  #elif defined(__linux__)
      /* Linux */
@@ -27,7 +28,7 @@ index 5318c14..8c21b47 100644
      GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip);
      #elif defined(__X86_64__) || defined(__x86_64__)
      GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip);
-@@ -1222,8 +1224,28 @@ void logRegisters(ucontext_t *uc) {
+@@ -1234,8 +1236,28 @@ void logRegisters(ucontext_t *uc) {
      #endif
  /* Linux */
  #elif defined(__linux__)
@@ -57,6 +58,3 @@ index 5318c14..8c21b47 100644
      serverLog(LL_WARNING,
      "\n"
      "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n"
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/redis/redis/init-redis-server b/meta-oe/recipes-extended/redis/redis/init-redis-server
index c5f335f57d..c5f335f57d 100755..100644
--- a/meta-oe/recipes-extended/redis/redis/init-redis-server
+++ b/meta-oe/recipes-extended/redis/redis/init-redis-server
diff --git a/meta-oe/recipes-extended/redis/redis_6.2.14.bb b/meta-oe/recipes-extended/redis/redis_6.2.18.bb
index 2433abba55..171c6640f2 100644
--- a/meta-oe/recipes-extended/redis/redis_6.2.14.bb
+++ b/meta-oe/recipes-extended/redis/redis_6.2.18.bb
@@ -10,19 +10,20 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://redis.conf \
            file://init-redis-server \
            file://redis.service \
-           file://hiredis-use-default-CC-if-it-is-set.patch \
-           file://lua-update-Makefile-to-use-environment-build-setting.patch \
-           file://oe-use-libc-malloc.patch \
-           file://0001-src-Do-not-reset-FINAL_LIBS.patch \
-           file://GNU_SOURCE.patch \
+           file://0001-hiredis-use-default-CC-if-it-is-set.patch \
+           file://0002-lua-update-Makefile-to-use-environment-build-setting.patch \
+           file://0003-hack-to-force-use-of-libc-malloc.patch \
+           file://0004-src-Do-not-reset-FINAL_LIBS.patch \
+           file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
            file://0006-Define-correct-gregs-for-RISCV32.patch \
-           "
-SRC_URI[sha256sum] = "34e74856cbd66fdb3a684fb349d93961d8c7aa668b06f81fd93ff267d09bc277"
+          "
 
-inherit autotools-brokensep update-rc.d systemd useradd
+SRC_URI[sha256sum] = "470c75bac73d7390be4dd66479c6f29e86371c5d380ce0c7efb4ba2bbda3612d"
+
+inherit update-rc.d systemd useradd
 
 FINAL_LIBS:x86:toolchain-clang = "-latomic"
-FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
+FINAL_LIBS:riscv32 = "-latomic"
 FINAL_LIBS:mips = "-latomic"
 FINAL_LIBS:arm = "-latomic"
 FINAL_LIBS:powerpc = "-latomic"
@@ -36,7 +37,7 @@ GROUPADD_PARAM:${PN} = "--system redis"
 REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
 
 do_compile:prepend() {
-    (cd deps && oe_runmake hiredis lua linenoise)
+    oe_runmake -C deps hiredis lua linenoise
 }
 
 do_install() {
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.5.bb b/meta-oe/recipes-extended/redis/redis_7.2.8.bb
index bfb46240a7..3c4d84085b 100644
--- a/meta-oe/recipes-extended/redis/redis_7.2.5.bb
+++ b/meta-oe/recipes-extended/redis/redis_7.2.8.bb
@@ -10,19 +10,22 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://redis.conf \
            file://init-redis-server \
            file://redis.service \
-           file://hiredis-use-default-CC-if-it-is-set.patch \
-           file://lua-update-Makefile-to-use-environment-build-setting.patch \
-           file://oe-use-libc-malloc.patch \
-           file://0001-src-Do-not-reset-FINAL_LIBS.patch \
-           file://GNU_SOURCE-7.patch \
+           file://0001-hiredis-use-default-CC-if-it-is-set.patch \
+           file://0002-lua-update-Makefile-to-use-environment-build-setting.patch \
+           file://0003-hack-to-force-use-of-libc-malloc.patch \
+           file://0004-src-Do-not-reset-FINAL_LIBS.patch \
+           file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
            file://0006-Define-correct-gregs-for-RISCV32.patch \
-           "
-SRC_URI[sha256sum] = "5981179706f8391f03be91d951acafaeda91af7fac56beffb2701963103e423d"
+          "
 
-inherit autotools-brokensep pkgconfig update-rc.d systemd useradd
+SRC_URI[sha256sum] = "6be4fdfcdb2e5ac91454438246d00842d2671f792673390e742dfcaf1bf01574"
+
+RPROVIDES:${PN} = "virtual-redis"
+
+inherit pkgconfig update-rc.d systemd useradd
 
 FINAL_LIBS:x86:toolchain-clang = "-latomic"
-FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
+FINAL_LIBS:riscv32 = "-latomic"
 FINAL_LIBS:mips = "-latomic"
 FINAL_LIBS:arm = "-latomic"
 FINAL_LIBS:powerpc = "-latomic"
@@ -39,7 +42,7 @@ PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
 
 do_compile:prepend() {
-    (cd deps && oe_runmake hiredis lua linenoise)
+    oe_runmake -C deps hiredis lua linenoise
 }
 
 do_install() {
@@ -68,3 +71,6 @@ INITSCRIPT_NAME = "redis-server"
 INITSCRIPT_PARAMS = "defaults 87"
 
 SYSTEMD_SERVICE:${PN} = "redis.service"
+
+CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows."
+CVE_STATUS[CVE-2022-0543] = "not-applicable-platform: Debian-specific CVE"
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch
deleted file mode 100644
index 7f54a3723d..0000000000
--- a/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch
+++ /dev/null
@@ -1,1583 +0,0 @@
-From b76e3c578f1e9f582e9c28f50d82b1f569602075 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michal=20Such=C3=A1nek?= <hramrach@gmail.com>
-Date: Fri, 5 Jan 2024 15:31:48 +0100
-Subject: [PATCH] Constify argv, fix warnings. (#1242)
-
-* Fix perl warnings
-
- - cast POPs to void to avoid unused value warning
- - declare functions that don't set RETVAL as returning void
-
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
-
-* Constify argv
-
-rrd has no business modifying the string pointed to by passed agrv, and
-as far as gcc can see it does indeed not modify them because it compiles
-with const argv.
-
-This fixes warnings when passing const strings into rrd, and avoids the
-need to duplicate all strings in the tcl bindings.
-
-This fixes warnings like these:
-[    3s] prog/sensord/rrd.c: In function 'rrdInit':
-[    3s] prog/sensord/rrd.c:302:40: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
-[    3s]   302 |                 ret = rrd_create(argc, (char**) argv);
-[    3s]       |                                        ^
-[    3s] prog/sensord/rrd.c: In function 'rrdUpdate':
-[    3s] prog/sensord/rrd.c:458:42: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
-[    3s]   458 |                 if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
-[    3s]       |                                          ^
-
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
-
-* tcl: Do not duplicate const strings
-
----------
-
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
-Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/b76e3c578f1e9f582e9c28f50d82b1f569602075]
----
- CHANGES                         |  3 ++
- bindings/lua/rrdlua.c           | 25 +++++-----
- bindings/perl-shared/RRDs.xs    | 36 +++++++-------
- bindings/python/rrdtoolmodule.c | 38 +++++++--------
- bindings/ruby/main.c            | 10 ++--
- bindings/tcl/tclrrd.c           | 84 ++++++++-------------------------
- src/optparse.c                  | 14 +++---
- src/optparse.h                  |  6 +--
- src/rrd.h                       | 38 +++++++--------
- src/rrd_cgi.c                   | 24 +++++-----
- src/rrd_create.c                |  2 +-
- src/rrd_daemon.c                | 12 ++---
- src/rrd_dump.c                  |  4 +-
- src/rrd_fetch.c                 |  2 +-
- src/rrd_first.c                 |  2 +-
- src/rrd_flushcached.c           |  2 +-
- src/rrd_graph.c                 |  6 +--
- src/rrd_graph.h                 |  4 +-
- src/rrd_graph_helper.c          |  2 +-
- src/rrd_info.c                  |  2 +-
- src/rrd_last.c                  |  2 +-
- src/rrd_lastupdate.c            |  2 +-
- src/rrd_list.c                  |  6 +--
- src/rrd_modify.c                |  2 +-
- src/rrd_modify.h                |  2 +-
- src/rrd_resize.c                |  4 +-
- src/rrd_restore.c               |  2 +-
- src/rrd_tool.c                  | 26 +++++-----
- src/rrd_tune.c                  |  2 +-
- src/rrd_update.c                |  4 +-
- src/rrd_xport.c                 |  2 +-
- src/rrdupdate.c                 |  7 +--
- 32 files changed, 168 insertions(+), 209 deletions(-)
-
-diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c
-index d1a700641..2095c3b5b 100644
---- a/bindings/lua/rrdlua.c
-+++ b/bindings/lua/rrdlua.c
-@@ -37,8 +37,8 @@
- extern void rrd_freemem(void *mem);
- 
- extern int luaopen_rrd (lua_State * L);
--typedef int (*RRD_FUNCTION)(int, char **);
--typedef rrd_info_t *(RRD_FUNCTION_V)(int, char **);
-+typedef int (*RRD_FUNCTION)(int, const char **);
-+typedef rrd_info_t *(RRD_FUNCTION_V)(int, const char **);
- 
- /**********************************************************/
- 
-@@ -49,9 +49,9 @@ static void reset_rrd_state(void)
-     rrd_clear_error();
- }
- 
--static char **make_argv(const char *cmd, lua_State * L)
-+static const char **make_argv(const char *cmd, lua_State * L)
- {
--  char **argv;
-+  const char **argv;
-   int i;
-   int argc = lua_gettop(L) + 1;
- 
-@@ -60,13 +60,12 @@ static char **make_argv(const char *cmd, lua_State * L)
-     luaL_error(L, "Can't allocate memory for arguments array", cmd);
- 
-   /* fprintf(stderr, "Args:\n"); */
--  argv[0] = (char *) cmd; /* Dummy arg. Cast to (char *) because rrd */
--                          /* functions don't expect (const * char)   */
-+  argv[0] = cmd;
-   /* fprintf(stderr, "%s\n", argv[0]); */
-   for (i=1; i<argc; i++) {
-     /* accepts string or number */
-     if (lua_isstring(L, i) || lua_isnumber(L, i)) {
--      if (!(argv[i] = (char *) lua_tostring (L, i))) {
-+      if (!(argv[i] = lua_tostring (L, i))) {
-         /* raise an error and never return */
-         luaL_error(L, "%s - error duplicating string area for arg #%d",
-                    cmd, i);
-@@ -84,7 +83,7 @@ static char **make_argv(const char *cmd, lua_State * L)
- static int
- rrd_common_call (lua_State *L, const char *cmd, RRD_FUNCTION rrd_function)
- {
--  char **argv;
-+  const char **argv;
-   int argc = lua_gettop(L) + 1;
- 
-   argv = make_argv(cmd, L);
-@@ -99,7 +98,7 @@ rrd_common_call (lua_State *L, const char *cmd, RRD_FUNCTION rrd_function)
- static int
- lua_rrd_infocall(lua_State *L, const char *cmd, RRD_FUNCTION_V rrd_function)
- {
--  char **argv;
-+  const char **argv;
-   rrd_info_t *p, *data;
-   int argc = lua_gettop(L) + 1;
- 
-@@ -197,7 +196,7 @@ static int
- lua_rrd_fetch (lua_State * L)
- {
-   int argc = lua_gettop(L) + 1;
--  char **argv = make_argv("fetch", L);
-+  const char **argv = make_argv("fetch", L);
-   unsigned long i, j, step, ds_cnt;
-   rrd_value_t *data, *p;
-   char    **names;
-@@ -246,7 +245,7 @@ lua_rrd_first (lua_State * L)
- {
-   time_t first;
-   int argc = lua_gettop(L) + 1;
--  char **argv = make_argv("first", L);
-+  const char **argv = make_argv("first", L);
-   reset_rrd_state();
-   first = rrd_first(argc, argv);
-   free(argv);
-@@ -260,7 +259,7 @@ lua_rrd_last (lua_State * L)
- {
-   time_t last;
-   int argc = lua_gettop(L) + 1;
--  char **argv = make_argv("last", L);
-+  const char **argv = make_argv("last", L);
-   reset_rrd_state();
-   last = rrd_last(argc, argv);
-   free(argv);
-@@ -275,7 +274,7 @@ static int
- lua_rrd_graph (lua_State * L)
- {
-   int argc = lua_gettop(L) + 1;
--  char **argv = make_argv("last", L);
-+  const char **argv = make_argv("last", L);
-   char **calcpr;
-   int i, xsize, ysize;
-   double ymin, ymax;
-diff --git a/bindings/perl-shared/RRDs.xs b/bindings/perl-shared/RRDs.xs
-index e233b5835..edce76ec4 100644
---- a/bindings/perl-shared/RRDs.xs
-+++ b/bindings/perl-shared/RRDs.xs
-@@ -44,11 +44,11 @@ extern "C" {
-                    strcpy(argv[i+1],handle); \
-                } \
-                rrd_clear_error();\
--               RETVAL=name(items+1,argv); \
-+               RETVAL = name(items + 1, (const char **)argv); \
-                for (i=0; i < items; i++) {\
--                   free(argv[i+1]);\
-+                   free((void *)argv[i+1]);\
-                } \
--               free(argv);\
-+               free((void *)argv);\
-                \
-                if (rrd_test_error()) XSRETURN_UNDEF;
- 
-@@ -67,11 +67,11 @@ extern "C" {
-                    strcpy(argv[i+1],handle); \
-                } \
-                 rrd_clear_error(); \
--                data=name(items+1, argv); \
-+                data = name(items + 1, (const char **)argv); \
-                 for (i=0; i < items; i++) { \
--                   free(argv[i+1]); \
-+                   free((void *)argv[i+1]); \
-                } \
--               free(argv); \
-+               free((void *)argv); \
-                 if (rrd_test_error()) XSRETURN_UNDEF; \
-                 hash = newHV(); \
-                save=data; \
-@@ -175,7 +175,7 @@ static int rrd_fetch_cb_wrapper(
-     /* Check the eval first */
-     if (SvTRUE(ERRSV)) {
-         rrd_set_error("perl callback failed: %s",SvPV_nolen(ERRSV));
--        POPs; /* there is undef on top of the stack when there is an error
-+        (void)POPs; /* there is undef on top of the stack when there is an error
-                  and call_sv was initiated with G_EVAL|G_SCALER */
-         goto error_out;
-     }
-@@ -383,7 +383,7 @@ rrd_tune(...)
- 
- #ifdef HAVE_RRD_GRAPH
- 
--SV *
-+void
- rrd_graph(...)
-        PROTOTYPE: @
-        PREINIT:
-@@ -404,7 +404,7 @@ rrd_graph(...)
-                    strcpy(argv[i+1],handle);
-                }
-                rrd_clear_error();
--               rrd_graph(items+1,argv,&calcpr,&xsize,&ysize,NULL,&ymin,&ymax);
-+               rrd_graph(items+1,(const char **)argv,&calcpr,&xsize,&ysize,NULL,&ymin,&ymax);
-                for (i=0; i < items; i++) {
-                    free(argv[i+1]);
-                }
-@@ -433,7 +433,7 @@ rrd_graph(...)
- 
- #endif /* HAVE_RRD_GRAPH */
- 
--SV *
-+void
- rrd_fetch(...)
-        PROTOTYPE: @
-        PREINIT:
-@@ -455,7 +455,7 @@ rrd_fetch(...)
-                    strcpy(argv[i+1],handle);
-                }
-                rrd_clear_error();
--               rrd_fetch(items+1,argv,&start,&end,&step,&ds_cnt,&ds_namv,&data);
-+               rrd_fetch(items+1,(const char **)argv,&start,&end,&step,&ds_cnt,&ds_namv,&data);
-                for (i=0; i < items; i++) {
-                    free(argv[i+1]);
-                }
-@@ -486,7 +486,7 @@ rrd_fetch(...)
-                PUSHs(sv_2mortal(newRV_noinc((SV*)names)));
-                PUSHs(sv_2mortal(newRV_noinc((SV*)retar)));
- 
--SV *
-+void
- rrd_fetch_cb_register(cb)
-     SV * cb
-     CODE:
-@@ -496,7 +496,7 @@ rrd_fetch_cb_register(cb)
-             SvSetSV(rrd_fetch_cb_svptr,cb);
-         rrd_fetch_cb_register(rrd_fetch_cb_wrapper);
- 
--SV *
-+void
- rrd_times(start, end)
-          char *start
-          char *end
-@@ -521,7 +521,7 @@ rrd_times(start, end)
-                PUSHs(sv_2mortal(newSVuv(start_tmp)));
-                PUSHs(sv_2mortal(newSVuv(end_tmp)));
- 
--int
-+void
- rrd_xport(...)
-        PROTOTYPE: @
-        PREINIT:
-@@ -543,7 +543,7 @@ rrd_xport(...)
-                    strcpy(argv[i+1],handle);
-                }
-                rrd_clear_error();
--               rrd_xport(items+1,argv,&xsize,&start,&end,&step,&col_cnt,&legend_v,&data);
-+               rrd_xport(items+1,(const char **)argv,&xsize,&start,&end,&step,&col_cnt,&legend_v,&data);
-                for (i=0; i < items; i++) {
-                    free(argv[i+1]);
-                }
-@@ -657,7 +657,7 @@ rrd_flushcached(...)
-        OUTPUT:
-                RETVAL
- 
--SV*
-+void
- rrd_list(...)
-        PROTOTYPE: @
-        PREINIT:
-@@ -667,7 +667,7 @@ rrd_list(...)
-                 char **argv;
-                AV *list;
-        PPCODE:
--               argv = (char **) malloc((items+1)*sizeof(char *));
-+               argv = malloc((items+1)*sizeof(char *));
-                argv[0] = "dummy";
- 
-                for (i = 0; i < items; i++) {
-@@ -681,7 +681,7 @@ rrd_list(...)
- 
-                 rrd_clear_error();
- 
--               data = rrd_list(items+1, argv);
-+               data = rrd_list(items+1, (const char **)argv);
- 
-                 for (i=0; i < items; i++) {
-                    free(argv[i+1]);
-diff --git a/bindings/python/rrdtoolmodule.c b/bindings/python/rrdtoolmodule.c
-index 1ab463584..f255e65bc 100644
---- a/bindings/python/rrdtoolmodule.c
-+++ b/bindings/python/rrdtoolmodule.c
-@@ -123,7 +123,7 @@ PyRRD_String_FromCF(enum cf_en cf)
-  * @return Zero if the function succeeds, otherwise -1
-  */
- static int
--convert_args(char *command, PyObject *args, char ***rrdtool_argv, int *rrdtool_argc)
-+convert_args(char *command, PyObject *args, const char ***rrdtool_argv, int *rrdtool_argc)
- {
-     PyObject *o, *lo;
-     int i, j, args_count, argv_count, element_count;
-@@ -145,7 +145,7 @@ convert_args(char *command, PyObject *args, char ***rrdtool_argv, int *rrdtool_a
-         }
-     }
- 
--    *rrdtool_argv = PyMem_New(char *, element_count + 1);
-+    *rrdtool_argv = PyMem_New(const char *, element_count + 1);
- 
-     if (*rrdtool_argv == NULL)
-         return -1;
-@@ -186,7 +186,7 @@ convert_args(char *command, PyObject *args, char ***rrdtool_argv, int *rrdtool_a
-  * Destroy argument vector.
-  */
- static void
--destroy_args(char ***rrdtool_argv)
-+destroy_args(const char ***rrdtool_argv)
- {
-     PyMem_Del(*rrdtool_argv);
-     *rrdtool_argv = NULL;
-@@ -267,7 +267,7 @@ static char _rrdtool_create__doc__[] = "Create a new Round Robin Database.\n\n\
- static PyObject *
- _rrdtool_create(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     int status;
-@@ -306,7 +306,7 @@ static char _rrdtool_dump__doc__[] = "Dump an RRD to XML.\n\n\
- static PyObject *
- _rrdtool_dump(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     int status;
-@@ -345,7 +345,7 @@ static char _rrdtool_update__doc__[] = "Store a new set of values into\
- static PyObject *
- _rrdtool_update(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     int status;
-@@ -378,7 +378,7 @@ static char _rrdtool_updatev__doc__[] = "Store a new set of values into "\
- static PyObject *
- _rrdtool_updatev(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     rrd_info_t *data;
-@@ -419,7 +419,7 @@ static char _rrdtool_fetch__doc__[] = "Fetch data from an RRD.\n\n\
- static PyObject *
- _rrdtool_fetch(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret, *range_tup, *dsnam_tup, *data_list, *t;
-     rrd_value_t *data, *datai, dv;
-@@ -497,7 +497,7 @@ static char _rrdtool_flushcached__doc__[] = "Flush RRD files from memory.\n\n\
- static PyObject *
- _rrdtool_flushcached(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     int status;
-@@ -592,7 +592,7 @@ static char _rrdtool_graph__doc__[] = "Create a graph based on one or more " \
- static PyObject *
- _rrdtool_graph(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     int xsize, ysize, i, status;
-@@ -650,7 +650,7 @@ static char _rrdtool_graphv__doc__[] = "Create a graph based on one or more " \
- static PyObject *
- _rrdtool_graphv(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     rrd_info_t *data;
-@@ -695,7 +695,7 @@ static char _rrdtool_xport__doc__[] = "Dictionary representation of data " \
- static PyObject *
- _rrdtool_xport(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     int xsize, status;
-@@ -793,7 +793,7 @@ static char _rrdtool_list__doc__[] = "List RRDs in storage.\n\n" \
- static PyObject *
- _rrdtool_list(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret, *str;
-     char *data, *ptr, *end;
-@@ -855,7 +855,7 @@ static char _rrdtool_tune__doc__[] = "Modify some basic properties of a " \
- static PyObject *
- _rrdtool_tune(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     int status;
-@@ -893,7 +893,7 @@ static char _rrdtool_first__doc__[] = "Get the first UNIX timestamp of the "\
- static PyObject *
- _rrdtool_first(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     int ts;
-@@ -928,7 +928,7 @@ static char _rrdtool_last__doc__[] = "Get the UNIX timestamp of the most "\
- static PyObject *
- _rrdtool_last(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     int ts;
-@@ -965,7 +965,7 @@ static char _rrdtool_resize__doc__[] = "Modify the number of rows in a "\
- static PyObject *
- _rrdtool_resize(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     int status;
-@@ -1003,7 +1003,7 @@ static char _rrdtool_info__doc__[] = "Extract header information from an "\
- static PyObject *
- _rrdtool_info(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret;
-     rrd_info_t *data;
-@@ -1040,7 +1040,7 @@ static char _rrdtool_lastupdate__doc__[] = "Returns datetime and value stored "\
- static PyObject *
- _rrdtool_lastupdate(PyObject *Py_UNUSED(self), PyObject *args)
- {
--    char **rrdtool_argv = NULL;
-+    const char **rrdtool_argv = NULL;
-     int    rrdtool_argc = 0;
-     PyObject *ret, *ds_dict, *lastupd;
-     int status;
-diff --git a/bindings/ruby/main.c b/bindings/ruby/main.c
-index e4cc6443d..a036b7fb8 100644
---- a/bindings/ruby/main.c
-+++ b/bindings/ruby/main.c
-@@ -9,7 +9,7 @@
- 
- typedef struct string_arr_t {
-     int       len;
--    char    **strings;
-+    const char    **strings;
- } string_arr;
- 
- VALUE     mRRD;
-@@ -18,12 +18,12 @@ VALUE     rb_eRRDError;
- typedef int (
-     *RRDFUNC) (
-     int argc,
--    char **argv);
-+    const char **argv);
- 
- typedef rrd_info_t *(
-     *RRDINFOFUNC) (
-     int argc,
--    char **argv);
-+    const char **argv);
- 
- #define RRD_CHECK_ERROR  \
-     if (rrd_test_error()) \
-@@ -72,10 +72,10 @@ void string_arr_delete(
- 
-     /* skip dummy first entry */
-     for (i = 1; i < a.len; i++) {
--        free(a.strings[i]);
-+        free((void *)a.strings[i]);
-     }
- 
--    free(a.strings);
-+    free((void *)a.strings);
- }
- 
- void reset_rrd_state(
-diff --git a/bindings/tcl/tclrrd.c b/bindings/tcl/tclrrd.c
-index 2927d9251..58a4cef68 100644
---- a/bindings/tcl/tclrrd.c
-+++ b/bindings/tcl/tclrrd.c
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include "../../src/rrd_tool.h"
- #include "../../src/rrd_format.h"
-+#include "../../src/unused.h"
- 
- /* support pre-8.4 tcl */
- 
-@@ -41,47 +42,39 @@ extern int Tclrrd_SafeInit(
-  * Hence, we need to do some preparation before
-  * calling the rrd library functions.
-  */
--static char **getopt_init(
-+static const char **getopt_init(
-     int argc,
-     CONST84 char *argv[])
- {
--    char    **argv2;
-+    const char    **argv2;
-     int       i;
- 
-     argv2 = calloc(argc, sizeof(char *));
-     for (i = 0; i < argc; i++) {
--        argv2[i] = strdup(argv[i]);
-+        argv2[i] = argv[i];
-     }
-     return argv2;
- }
- 
- static void getopt_cleanup(
--    int argc,
--    char **argv2)
-+    int UNUSED(argc),
-+    const char **argv2)
- {
--    int       i;
--
--    for (i = 0; i < argc; i++) {
--        if (argv2[i] != NULL) {
--            free(argv2[i]);
--        }
--    }
--    free(argv2);
-+    free((void *)argv2);
- }
- 
- static void getopt_free_element(
--    char *argv2[],
-+    const char *argv2[],
-     int argn)
- {
-     if (argv2[argn] != NULL) {
--        free(argv2[argn]);
-         argv2[argn] = NULL;
-     }
- }
- 
- static void getopt_squieeze(
-     int *argc,
--    char *argv2[])
-+    const char *argv2[])
- {
-     int       i, null_i = 0, argc_tmp = *argc;
- 
-@@ -104,7 +97,7 @@ static int Rrd_Create(
-     CONST84 char *argv[])
- {
-     int       argv_i;
--    char    **argv2;
-+    const char    **argv2;
-     char     *parsetime_error = NULL;
-     time_t    last_up = time(NULL) - 10;
-     long int  long_tmp;
-@@ -295,7 +288,7 @@ static int Rrd_Flushcached(
-         return TCL_ERROR;
-     }
- 
--    rrd_flushcached(argc, (char**)argv);
-+    rrd_flushcached(argc, argv);
- 
-     if (rrd_test_error()) {
-         Tcl_AppendResult(interp, "RRD Error: ",
-@@ -380,7 +373,7 @@ static int Rrd_Update(
-     CONST84 char *argv[])
- {
-     int       argv_i;
--    char    **argv2, *template = NULL;
-+    const char    **argv2, *template = NULL;
- 
-     argv2 = getopt_init(argc, argv);
- 
-@@ -391,16 +384,10 @@ static int Rrd_Update(
-                 Tcl_AppendResult(interp, "RRD Error: option '",
-                                  argv2[argv_i - 1], "' needs an argument",
-                                  (char *) NULL);
--                if (template != NULL) {
--                    free(template);
--                }
-                 getopt_cleanup(argc, argv2);
-                 return TCL_ERROR;
-             }
--            if (template != NULL) {
--                free(template);
--            }
--            template = strdup(argv2[argv_i]);
-+            template = argv2[argv_i];
-             getopt_free_element(argv2, argv_i - 1);
-             getopt_free_element(argv2, argv_i);
-         } else if (!strcmp(argv2[argv_i], "--")) {
-@@ -409,9 +396,6 @@ static int Rrd_Update(
-         } else if (argv2[argv_i][0] == '-') {
-             Tcl_AppendResult(interp, "RRD Error: unknown option '",
-                              argv2[argv_i], "'", (char *) NULL);
--            if (template != NULL) {
--                free(template);
--            }
-             getopt_cleanup(argc, argv2);
-             return TCL_ERROR;
-         }
-@@ -422,18 +406,12 @@ static int Rrd_Update(
-     if (argc < 2) {
-         Tcl_AppendResult(interp, "RRD Error: needs rrd filename",
-                          (char *) NULL);
--        if (template != NULL) {
--            free(template);
--        }
-         getopt_cleanup(argc, argv2);
-         return TCL_ERROR;
-     }
- 
-     rrd_update_r(argv2[1], template, argc - 2, (const char **)argv2 + 2);
- 
--    if (template != NULL) {
--        free(template);
--    }
-     getopt_cleanup(argc, argv2);
- 
-     if (rrd_test_error()) {
-@@ -454,7 +432,6 @@ static int Rrd_Info(
- {
-     int status = TCL_OK;
-     rrd_info_t *data;
--    char **argv2;
- 
-     /* TODO: support for rrdcached */
-     if (argc != 2) {
-@@ -463,9 +440,7 @@ static int Rrd_Info(
-         return TCL_ERROR;
-     }
- 
--    argv2 = getopt_init(argc, argv);
--
--    data = rrd_info_r(argv2[1]);
-+    data = rrd_info_r(argv[1]);
- 
-     if (data) {
-        Tcl_SetObjResult(interp, convert_info(data));
-@@ -477,7 +452,6 @@ static int Rrd_Info(
-        status = TCL_ERROR;
-     }
- 
--    getopt_cleanup(argc, argv2);
-     return status;
- }
- 
-@@ -488,7 +462,6 @@ static int Rrd_Lastupdate(
-     CONST84 char *argv[])
- {
-     time_t    last_update;
--    char    **argv2;
-     char    **ds_namv;
-     char    **last_ds;
-     char      s[30];
-@@ -502,8 +475,7 @@ static int Rrd_Lastupdate(
-         return TCL_ERROR;
-     }
- 
--    argv2 = getopt_init(argc, argv);
--    if (rrd_lastupdate_r(argv2[1], &last_update,
-+    if (rrd_lastupdate_r(argv[1], &last_update,
-                        &ds_cnt, &ds_namv, &last_ds) == 0) {
-         listPtr = Tcl_GetObjResult(interp);
-         for (i = 0; i < ds_cnt; i++) {
-@@ -527,7 +499,6 @@ static int Rrd_Lastupdate(
-             free(ds_namv);
-         }
-     }
--    getopt_cleanup(argc, argv2);
-     return TCL_OK;
- }
- 
-@@ -543,10 +514,8 @@ static int Rrd_Fetch(
-     char    **ds_namv;
-     Tcl_Obj  *listPtr;
-     char      s[30];
--    char    **argv2;
- 
--    argv2 = getopt_init(argc, argv);
--    if (rrd_fetch(argc, argv2, &start, &end, &step,
-+    if (rrd_fetch(argc, argv, &start, &end, &step,
-                   &ds_cnt, &ds_namv, &data) != -1) {
-         datai = data;
-         listPtr = Tcl_GetObjResult(interp);
-@@ -562,7 +531,6 @@ static int Rrd_Fetch(
-         free(ds_namv);
-         free(data);
-     }
--    getopt_cleanup(argc, argv2);
- 
-     if (rrd_test_error()) {
-         Tcl_AppendResult(interp, "RRD Error: ",
-@@ -590,7 +558,7 @@ static int Rrd_Graph(
-     int       rc, xsize, ysize;
-     double    ymin, ymax;
-     char      dimensions[50];
--    char    **argv2;
-+    const char    **argv2;
-     CONST84 char *save;
- 
-     /*
-@@ -692,11 +660,7 @@ static int Rrd_Tune(
-     int argc,
-     CONST84 char *argv[])
- {
--    char    **argv2;
--
--    argv2 = getopt_init(argc, argv);
--    rrd_tune(argc, argv2);
--    getopt_cleanup(argc, argv2);
-+    rrd_tune(argc, argv);
- 
-     if (rrd_test_error()) {
-         Tcl_AppendResult(interp, "RRD Error: ",
-@@ -716,11 +680,7 @@ static int Rrd_Resize(
-     int argc,
-     CONST84 char *argv[])
- {
--    char    **argv2;
--
--    argv2 = getopt_init(argc, argv);
--    rrd_resize(argc, argv2);
--    getopt_cleanup(argc, argv2);
-+    rrd_resize(argc, argv);
- 
-     if (rrd_test_error()) {
-         Tcl_AppendResult(interp, "RRD Error: ",
-@@ -740,11 +700,7 @@ static int Rrd_Restore(
-     int argc,
-     CONST84 char *argv[])
- {
--    char    **argv2;
--
--    argv2 = getopt_init(argc, argv);
--    rrd_restore(argc, argv2);
--    getopt_cleanup(argc, argv2);
-+    rrd_restore(argc, argv);
- 
-     if (rrd_test_error()) {
-         Tcl_AppendResult(interp, "RRD Error: ",
-diff --git a/src/optparse.c b/src/optparse.c
-index 9040ba8b2..79a3efe11 100644
---- a/src/optparse.c
-+++ b/src/optparse.c
-@@ -10,7 +10,7 @@
- #define options_argv(i) \
-     ((i) < options->argc ? options->argv[i] : NULL)
- 
--void optparse_init(struct optparse *options, int argc, char **argv)
-+void optparse_init(struct optparse *options, int argc, const char **argv)
- {
-     options->argv = argv;
-     options->argc = argc;
-@@ -42,7 +42,7 @@ is_longopt(const char *arg)
- static void
- permute(struct optparse *options, int index)
- {
--    char *nonoption = options->argv[index];
-+    const char *nonoption = options->argv[index];
-     for (int i = index; i < options->optind - 1; i++)
-         options->argv[i] = options->argv[i + 1];
-     options->argv[options->optind - 1] = nonoption;
-@@ -67,7 +67,7 @@ int optparse(struct optparse *options, const char *optstring)
-     options->errmsg[0] = '\0';
-     options->optopt = 0;
-     options->optarg = NULL;
--    char *option = options_argv(options->optind);
-+    const char *option = options_argv(options->optind);
-     if (option == NULL) {
-         return -1;
-     } else if (is_dashdash(option)) {
-@@ -88,7 +88,7 @@ int optparse(struct optparse *options, const char *optstring)
-     option += options->subopt + 1;
-     options->optopt = option[0];
-     int type = argtype(optstring, option[0]);
--    char *next = options_argv(options->optind + 1);
-+    const char *next = options_argv(options->optind + 1);
-     switch (type) {
-     case -1:
-         opterror(options, "invalid option -- '%c'", option[0]);
-@@ -128,10 +128,10 @@ int optparse(struct optparse *options, const char *optstring)
-     return 0;
- }
- 
--char *optparse_arg(struct optparse *options)
-+const char *optparse_arg(struct optparse *options)
- {
-     options->subopt = 0;
--    char *option = options->argv[options->optind];
-+    const char *option = options->argv[options->optind];
-     if (option != NULL)
-         options->optind++;
-     return option;
-@@ -222,7 +222,7 @@ optparse_long(struct optparse *options,
-               int *longindex)
- {
- //    printf("%i < %i\n",options->optind,options->argc);
--    char *option = options_argv(options->optind);
-+    const char *option = options_argv(options->optind);
-     if (option == NULL) {
-         return -1;
-     } else if (is_dashdash(option)) {
-diff --git a/src/optparse.h b/src/optparse.h
-index c4b0ec19c..7a0bb3885 100644
---- a/src/optparse.h
-+++ b/src/optparse.h
-@@ -44,7 +44,7 @@
-  */
- 
- struct optparse {
--    char **argv;
-+    const char **argv;
-     int argc;
-     int permute;
-     int optind;
-@@ -65,7 +65,7 @@ struct optparse_long {
- /**
-  * Initializes the parser state.
-  */
--void optparse_init(struct optparse *options, int argc, char **argv);
-+void optparse_init(struct optparse *options, int argc, const char **argv);
- 
- /**
-  * Read the next option in the argv array.
-@@ -98,6 +98,6 @@ optparse_long(struct optparse *options,
-  * subcommand returned by optparse_arg(). This function allows you to
-  * ignore the value of optind.
-  */
--char *optparse_arg(struct optparse *options);
-+const char *optparse_arg(struct optparse *options);
- 
- #endif
-diff --git a/src/rrd.h b/src/rrd.h
-index 184887ccc..b40f9a449 100644
---- a/src/rrd.h
-+++ b/src/rrd.h
-@@ -155,10 +155,10 @@ extern    "C" {
- /* main function blocks */
-     int       rrd_create(
-     int,
--    char **);
-+    const char **);
-     rrd_info_t *rrd_info(
-     int,
--    char **);
-+    const char **);
-     rrd_info_t *rrd_info_push(
-     rrd_info_t *,
-     char *,
-@@ -170,19 +170,19 @@ extern    "C" {
-     rrd_info_t *);
-     char     *rrd_list(
-     int,
--    char **);
-+    const char **);
-     char     *rrd_list_r(
-     int,
--    char *dirname);
-+    const char *dirname);
-     int       rrd_update(
-     int,
--    char **);
-+    const char **);
-     rrd_info_t *rrd_update_v(
-     int,
--    char **);
-+    const char **);
-     int       rrd_graph(
-     int,
--    char **,
-+    const char **,
-     char ***,
-     int *,
-     int *,
-@@ -191,11 +191,11 @@ extern    "C" {
-     double *);
-     rrd_info_t *rrd_graph_v(
-     int,
--    char **);
-+    const char **);
- 
-     int       rrd_fetch(
-     int,
--    char **,
-+    const char **,
-     time_t *,
-     time_t *,
-     unsigned long *,
-@@ -204,32 +204,32 @@ extern    "C" {
-     rrd_value_t **);
-     int       rrd_restore(
-     int,
--    char **);
-+    const char **);
-     int       rrd_dump(
-     int,
--    char **);
-+    const char **);
-     int       rrd_tune(
-     int,
--    char **);
-+    const char **);
-     time_t    rrd_last(
-     int,
--    char **);
-+    const char **);
-     int       rrd_lastupdate(
-     int argc,
--    char **argv);
-+    const char **argv);
-     time_t    rrd_first(
-     int,
--    char **);
-+    const char **);
-     int       rrd_resize(
-     int,
--    char **);
-+    const char **);
-     char     *rrd_strversion(
-     void);
-     double    rrd_version(
-     void);
-     int       rrd_xport(
-     int,
--    char **,
-+    const char **,
-     int *,
-     time_t *,
-     time_t *,
-@@ -239,7 +239,7 @@ extern    "C" {
-     rrd_value_t **);
-     int       rrd_flushcached(
-     int argc,
--    char **argv);
-+    const char **argv);
- 
-     void      rrd_freemem(
-     void *mem);
-@@ -323,7 +323,7 @@ extern    "C" {
-     const char **argv);
-     int       rrd_dump_opt_r(
-     const char *filename,
--    char *outname,
-+    const char *outname,
-     int opt_noheader);
-     int       rrd_dump_r(
-     const char *filename,
-diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
-index b82c310db..14a4f511a 100644
---- a/src/rrd_cgi.c
-+++ b/src/rrd_cgi.c
-@@ -102,7 +102,7 @@ static char *rrdstrip(
- static char *scanargs(
-     char *line,
-     int *argc,
--    char ***args);
-+    const char ***args);
- 
- /* format at-time specified times using strftime */
- static char *printstrftime(
-@@ -317,7 +317,7 @@ static const char *putvar(
- }
- 
- /* expand those RRD:* directives that can be used recursively */
--static char *rrd_expand_vars(
-+static const char *rrd_expand_vars(
-     char *buffer)
- {
-     int       i;
-@@ -434,7 +434,7 @@ static int readfile(
- 
- int main(
-     int argc,
--    char *argv[])
-+    const char *argv[])
- {
-     char     *buffer;
-     long      i;
-@@ -926,7 +926,7 @@ static char *drawgraph(
-     }
-     calfree();
-     if (rrd_graph
--        (argc + 1, (char **) args - 1, &calcpr, &xsize, &ysize, NULL, &ymin,
-+        (argc + 1, args - 1, &calcpr, &xsize, &ysize, NULL, &ymin,
-          &ymax) != -1) {
-         return stralloc(calcpr[0]);
-     } else {
-@@ -973,7 +973,7 @@ static char *printtimelast(
-         /* not raising argc in step with args - 1 since the last argument
-            will be used below for strftime  */
- 
--        last = rrd_last(argc, (char **) args - 1);
-+        last = rrd_last(argc, args - 1);
-         if (rrd_test_error()) {
-             char      err[4096];
- 
-@@ -1027,7 +1027,7 @@ static char *printtimenow(
- static char *scanargs(
-     char *line,
-     int *argument_count,
--    char ***arguments)
-+    const char ***arguments)
- {
-     char     *getP;     /* read cursor */
-     char     *putP;     /* write cursor */
-@@ -1039,8 +1039,8 @@ static char *scanargs(
- 
-     /* local array of arguments while parsing */
-     int       argc = 1;
--    char    **argv;
--    char    **argv_tmp; /* temp variable for realloc() */
-+    const char    **argv;
-+    const char    **argv_tmp; /* temp variable for realloc() */
- 
- #ifdef DEBUG_PARSER
-     printf("<-- scanargs(%s) -->\n", line);
-@@ -1051,7 +1051,7 @@ static char *scanargs(
- 
-     /* create initial argument array of char pointers */
-     argsz = 32;
--    argv = (char **) malloc(argsz * sizeof(char *));
-+    argv = malloc(argsz * sizeof(char *));
-     if (!argv) {
-         return NULL;
-     }
-@@ -1146,7 +1146,7 @@ static char *scanargs(
-         if (argc == argsz - 2) {
-             /* resize argument array */
-             argsz *= 2;
--            argv_tmp = (char **) rrd_realloc(argv, argsz * sizeof(char *));
-+            argv_tmp = rrd_realloc(argv, argsz * sizeof(char *));
-             if (*argv_tmp == NULL) {
-                 return NULL;
-             }
-@@ -1213,7 +1213,7 @@ static int parse(
-     /* the name of the vairable ... */
-     char     *val;
-     long      valln;
--    char    **args;
-+    const char    **args;
-     char     *end;
-     long      end_offset;
-     int       argc;
-@@ -1264,7 +1264,7 @@ static int parse(
-         /* make sure we do not shrink the mallocd block */
-         size_t    newbufsize = i + strlen(end) + valln + 1;
- 
--        *buf = (char *) rrd_realloc(*buf, newbufsize);
-+        *buf = rrd_realloc(*buf, newbufsize);
- 
-         if (*buf == NULL) {
-             perror("Realoc buf:");
-diff --git a/src/rrd_create.c b/src/rrd_create.c
-index f9bad0866..919b4195a 100644
---- a/src/rrd_create.c
-+++ b/src/rrd_create.c
-@@ -76,7 +76,7 @@ static void parseGENERIC_DS(
- 
- int rrd_create(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
-     struct optparse_long longopts[] = {
-         {"start", 'b', OPTPARSE_REQUIRED},
-diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
-index 751798aa1..21c38a11d 100644
---- a/src/rrd_daemon.c
-+++ b/src/rrd_daemon.c
-@@ -1877,7 +1877,7 @@ static int handle_request_tune(
-     HANDLER_PROTO)
- {                       /* {{{ */
-     int       status;
--    char**    argv = NULL;
-+    const char**    argv = NULL;
-     int       argc, argc_tmp;
-     char*     i;
-     int       rc;
-@@ -1916,7 +1916,7 @@ static int handle_request_tune(
-         goto done;
-     }
- 
--    if ((argv = (char **) malloc(argc * sizeof(char*))) == NULL) {
-+    if ((argv = malloc(argc * sizeof(char*))) == NULL) {
-         rc = send_response(sock, RESP_ERR, "%s\n", rrd_strerror(ENOMEM));
-         goto done;
-     }
-@@ -1927,7 +1927,7 @@ static int handle_request_tune(
-         argc_tmp += 1;
-     }
- 
--    status = rrd_tune_r(file, argc, (const char **)argv);
-+    status = rrd_tune_r(file, argc, argv);
-     if (status != 0) {
-         rc = send_response(sock, RESP_ERR, "Got error %s\n", rrd_get_error());
-         goto done;   
-@@ -1935,7 +1935,7 @@ static int handle_request_tune(
-     rc = send_response(sock, RESP_OK, "Success\n");
-     done:
-     free(file);
--    free(argv);
-+    free((void *)argv);
-     return rc;
- }  
- 
-@@ -4505,7 +4505,7 @@ static int cleanup(
- 
- static int read_options(
-     int argc,
--    char **argv)
-+    const char **argv)
- {                       /* {{{ */
-     struct optparse_long longopts[] = {
-         {NULL, 'a', OPTPARSE_REQUIRED},
-@@ -5050,7 +5050,7 @@ static int read_options(
- 
- int main(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
-     int       status;
- 
-diff --git a/src/rrd_dump.c b/src/rrd_dump.c
-index a4490d594..c58e0ee4a 100644
---- a/src/rrd_dump.c
-+++ b/src/rrd_dump.c
-@@ -497,7 +497,7 @@ static size_t rrd_dump_opt_cb_fileout(
- 
- int rrd_dump_opt_r(
-     const char *filename,
--    char *outname,
-+    const char *outname,
-     int opt_noheader)
- {
-     FILE     *out_file;
-@@ -543,7 +543,7 @@ int rrd_dump_r(
- 
- int rrd_dump(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
-     int       opt;
-     struct optparse_long longopts[] = {
-diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
-index c739bfc45..54780f19b 100644
---- a/src/rrd_fetch.c
-+++ b/src/rrd_fetch.c
-@@ -61,7 +61,7 @@
- 
- int rrd_fetch(
-     int argc,
--    char **argv,
-+    const char **argv,
-     time_t *start,
-     time_t *end,        /* which time frame do you want ?
-                          * will be changed to represent reality */
-diff --git a/src/rrd_first.c b/src/rrd_first.c
-index a696c5c38..f3dde5404 100644
---- a/src/rrd_first.c
-+++ b/src/rrd_first.c
-@@ -13,7 +13,7 @@
- 
- time_t rrd_first(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
-     struct optparse_long longopts[] = {
-         {"rraindex", 129, OPTPARSE_REQUIRED},
-diff --git a/src/rrd_flushcached.c b/src/rrd_flushcached.c
-index 090bca749..3bf6cd29d 100644
---- a/src/rrd_flushcached.c
-+++ b/src/rrd_flushcached.c
-@@ -22,7 +22,7 @@
- #include "rrd_tool.h"
- #include "rrd_client.h"
- 
--int rrd_flushcached (int argc, char **argv)
-+int rrd_flushcached (int argc, const char **argv)
- {
-     struct optparse_long longopts[] = {
-         {"daemon", 'd', OPTPARSE_REQUIRED},
-diff --git a/src/rrd_graph.c b/src/rrd_graph.c
-index b32d45085..46511e9a3 100644
---- a/src/rrd_graph.c
-+++ b/src/rrd_graph.c
-@@ -4607,7 +4607,7 @@ int scan_for_col(
- /* Now just a wrapper around rrd_graph_v */
- int rrd_graph(
-     int argc,
--    char **argv,
-+    const char **argv,
-     char ***prdata,
-     int *xsize,
-     int *ysize,
-@@ -4690,7 +4690,7 @@ int rrd_graph(
- 
- rrd_info_t *rrd_graph_v(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
-     image_desc_t im;
-     rrd_info_t *grinfo;
-@@ -4953,7 +4953,7 @@ void rrd_graph_init(
- 
- void rrd_graph_options(
-     int argc,
--    char *argv[],
-+    const char **argv,
-     struct optparse *poptions,
-     image_desc_t *im)
- {
-diff --git a/src/rrd_graph.h b/src/rrd_graph.h
-index 4df32ec66..083cf3800 100644
---- a/src/rrd_graph.h
-+++ b/src/rrd_graph.h
-@@ -473,12 +473,12 @@ void      time_clean(
- 
- void      rrd_graph_options(
-     int,
--    char **,
-+    const char **,
-     struct optparse *,
-     image_desc_t *);
- void      rrd_graph_script(
-     int,
--    char **,
-+    const char **,
-     image_desc_t *const,
-     int);
- int       rrd_graph_color(
-diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
-index 99cdefa65..ba90e1a6c 100644
---- a/src/rrd_graph_helper.c
-+++ b/src/rrd_graph_helper.c
-@@ -1952,7 +1952,7 @@ static int parse_xport(
- 
- void rrd_graph_script(
-     int argc,
--    char *argv[],
-+    const char **argv,
-     image_desc_t *const im,
-     int optno)
- {
-diff --git a/src/rrd_info.c b/src/rrd_info.c
-index c0c6f68c7..eb0d4e4de 100644
---- a/src/rrd_info.c
-+++ b/src/rrd_info.c
-@@ -82,7 +82,7 @@ rrd_info_t
- 
- rrd_info_t *rrd_info(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
-     struct optparse_long longopts[] = {
-         {"daemon", 'd', OPTPARSE_REQUIRED},
-diff --git a/src/rrd_last.c b/src/rrd_last.c
-index 026a1e828..1aae72512 100644
---- a/src/rrd_last.c
-+++ b/src/rrd_last.c
-@@ -11,7 +11,7 @@
- 
- time_t rrd_last(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
-     char *opt_daemon = NULL;
-     time_t lastupdate;
-diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c
-index ab30dcf67..4f7f4770e 100644
---- a/src/rrd_lastupdate.c
-+++ b/src/rrd_lastupdate.c
-@@ -14,7 +14,7 @@
- #include "rrd_client.h"
- #include <stdarg.h>
- 
--int rrd_lastupdate (int argc, char **argv)
-+int rrd_lastupdate (int argc, const char **argv)
- {
-     struct optparse_long longopts[] = {
-         {"daemon", 'd', OPTPARSE_REQUIRED},
-diff --git a/src/rrd_list.c b/src/rrd_list.c
-index e743b9b7d..6e96220ea 100644
---- a/src/rrd_list.c
-+++ b/src/rrd_list.c
-@@ -37,7 +37,7 @@ static char *move_past_prefix(const char *prefix, const char *string)
-        return (char *)&(string[index]);
- }
- 
--static char *rrd_list_rec(int recursive, char *root, char *dirname)
-+static char *rrd_list_rec(int recursive, const char *root, const char *dirname)
- {
- #define SANE_ASPRINTF2(_dest_str, _format, ...)                                \
-        if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) {         \
-@@ -138,7 +138,7 @@ static char *rrd_list_rec(int recursive, char *root, char *dirname)
-        return out;
- }
- 
--char *rrd_list_r(int recursive, char *dirname)
-+char *rrd_list_r(int recursive, const char *dirname)
- {
- #define SANE_ASPRINTF(_dest_str, _format, ...)                         \
-        if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) {         \
-@@ -240,7 +240,7 @@ char *rrd_list_r(int recursive, char *dirname)
-        return rrd_list_rec(recursive, dirname, dirname);
- }
- 
--char *rrd_list(int argc, char **argv)
-+char *rrd_list(int argc, const char **argv)
- {
-        char *opt_daemon = NULL;
-        int status;
-diff --git a/src/rrd_modify.c b/src/rrd_modify.c
-index a2b07f640..70ac9e77f 100644
---- a/src/rrd_modify.c
-+++ b/src/rrd_modify.c
-@@ -1297,7 +1297,7 @@ static int add_rras(const rrd_t *in, rrd_t *out, const int *ds_map,
- }
- 
- int handle_modify(const rrd_t *in, const char *outfilename,
--                 int argc, char **argv, int optidx,
-+                 int argc, const char **argv, int optidx,
-                  int newstep) {
-     // parse add/remove options
-     int rc = -1;
-diff --git a/src/rrd_modify.h b/src/rrd_modify.h
-index 52d8789be..64a39926e 100644
---- a/src/rrd_modify.h
-+++ b/src/rrd_modify.h
-@@ -28,7 +28,7 @@ typedef struct {
- } rra_mod_op_t;
- 
- int handle_modify(const rrd_t *in, const char *outfilename,
--                 int argc, char **argv, int optind,
-+                 int argc, const char **argv, int optind,
-                  int newstep);
- 
- typedef union {
-diff --git a/src/rrd_resize.c b/src/rrd_resize.c
-index fb75d81ff..742e6d141 100644
---- a/src/rrd_resize.c
-+++ b/src/rrd_resize.c
-@@ -12,9 +12,9 @@
- 
- int rrd_resize(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
--    char     *infilename, outfilename[11] = "resize.rrd";
-+    const char     *infilename, outfilename[11] = "resize.rrd";
-     rrd_t     rrdold, rrdnew;
-     rrd_value_t buffer;
-     int       version;
-diff --git a/src/rrd_restore.c b/src/rrd_restore.c
-index 85d481e0c..ebef5efe8 100644
---- a/src/rrd_restore.c
-+++ b/src/rrd_restore.c
-@@ -1378,7 +1378,7 @@ int write_file(
- 
- int rrd_restore(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
-     struct optparse_long longopts[] = {
-         {"range-check", 'r', OPTPARSE_NONE},
-diff --git a/src/rrd_tool.c b/src/rrd_tool.c
-index cc6119d9a..56321ee1a 100644
---- a/src/rrd_tool.c
-+++ b/src/rrd_tool.c
-@@ -22,16 +22,16 @@
- 
- 
- static void PrintUsage(
--    char *cmd);
-+    const char *cmd);
- static int CountArgs(
-     char *aLine);
- static int CreateArgs(
-+    const char *,
-     char *,
--    char *,
--    char **);
-+    const char **);
- static int HandleInputLine(
-     int,
--    char **,
-+    const char **,
-     FILE *);
- int       RemoteMode = 0;
- int       ChangeRoot = 0;
-@@ -42,7 +42,7 @@ int       ChangeRoot = 0;
- 
- 
- static void PrintUsage(
--    char *cmd)
-+    const char *cmd)
- {
- 
-     const char *help_main =
-@@ -443,11 +443,11 @@ static char *fgetslong(
- 
- int main(
-     int argc,
--    char *argv[])
-+    const char *argv[])
- {
--    char    **myargv;
-+    const char    **myargv;
-     char     *aLine;
--    char     *firstdir = "";
-+    const char     *firstdir = "";
- 
- #ifdef MUST_DISABLE_SIGFPE
-     signal(SIGFPE, SIG_IGN);
-@@ -526,7 +526,7 @@ int main(
-                 printf("ERROR: not enough arguments\n");
-                 continue;
-             }
--            if ((myargv = (char **) malloc((argc + 1) *
-+            if ((myargv = malloc((argc + 1) *
-                                            sizeof(char *))) == NULL) {
-                 perror("malloc");
-                 exit(1);
-@@ -572,7 +572,7 @@ int main(
-    resolving them portably is not really simple. */
- static int HandleInputLine(
-     int argc,
--    char **argv,
-+    const char **argv,
-     FILE * out)
- {
- #if defined(HAVE_OPENDIR) && defined (HAVE_READDIR)
-@@ -887,12 +887,12 @@ static int CountArgs(
-  * CreateArgs - take a string (aLine) and tokenize
-  */
- static int CreateArgs(
--    char *pName,
-+    const char *pName,
-     char *aLine,
--    char **argv)
-+    const char **argv)
- {
-     char     *getP, *putP;
--    char    **pargv = argv;
-+    const char    **pargv = argv;
-     char      Quote = 0;
-     int       inArg = 0;
-     int       len;
-diff --git a/src/rrd_tune.c b/src/rrd_tune.c
-index 198817f37..dd3f3f7cb 100644
---- a/src/rrd_tune.c
-+++ b/src/rrd_tune.c
-@@ -71,7 +71,7 @@ static int set_hwsmootharg(
- 
- int rrd_tune(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
-     char      *opt_daemon = NULL;
-     const char *in_filename = NULL;
-diff --git a/src/rrd_update.c b/src/rrd_update.c
-index fbbe2820a..bb9a0602c 100644
---- a/src/rrd_update.c
-+++ b/src/rrd_update.c
-@@ -299,7 +299,7 @@ static void initialize_time(
- 
- rrd_info_t *rrd_update_v(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
-     struct optparse_long longopts[] = {
-         {"template",          't', OPTPARSE_REQUIRED},
-@@ -674,7 +674,7 @@ static int rrd_template_update(const char *filename,  /* {{{ */
- 
- int rrd_update(
-     int argc,
--    char **argv)
-+    const char **argv)
- {
-     struct optparse_long longopts[] = {
-         {"template",          't', OPTPARSE_REQUIRED},
-diff --git a/src/rrd_xport.c b/src/rrd_xport.c
-index d15d33dd9..93c02f926 100644
---- a/src/rrd_xport.c
-+++ b/src/rrd_xport.c
-@@ -73,7 +73,7 @@ static int rrd_xport_format_addprints(
- 
- int rrd_xport(
-     int argc,
--    char **argv,
-+    const char **argv,
-     int UNUSED(*xsize),
-     time_t *start,
-     time_t *end,        /* which time frame do you want ?
-diff --git a/src/rrdupdate.c b/src/rrdupdate.c
-index cbbf48cc1..e368516c8 100644
---- a/src/rrdupdate.c
-+++ b/src/rrdupdate.c
-@@ -20,19 +20,20 @@ int main(
-     int argc,
-     char **argv)
- {
-+    const char **cargv = (const char **)argv;
-     char *name=basename(argv[0]);
-     rrd_info_t *info;
- 
-     if (!strcmp(name, "rrdcreate")) {
--        rrd_create(argc, argv);
-+        rrd_create(argc, cargv);
-     }
-     else if (!strcmp(name, "rrdinfo")) {
--         info=rrd_info(argc, argv);
-+         info=rrd_info(argc, cargv);
-          rrd_info_print(info);
-          rrd_info_free(info);
-     }
-     else {
--        rrd_update(argc, argv);
-+        rrd_update(argc, cargv);
-     }
- 
-     if (rrd_test_error()) {
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb
index d843f82b27..69c281bd92 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb
@@ -6,15 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=39df84cfd8a5e18bf988f277f7946676"
 
 DEPENDS = "libpng zlib glib-2.0 libxml2 groff-native python3-setuptools-native"
 
-SRCREV = "3af04acd38bbc61bbdcdd931dcf234c971aa5336"
-PV = "1.8.0"
+SRCREV = "522b228d74da7054594b6ed9c289058acd6cd3e7"
+PV = "1.9.0"
 
 SRC_URI = "\
     git://github.com/oetiker/rrdtool-1.x.git;protocol=https;branch=master \
-    file://b76e3c578f1e9f582e9c28f50d82b1f569602075.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit cpan autotools-brokensep gettext pkgconfig python3native python3-dir systemd
 
@@ -23,6 +21,8 @@ BBCLASSEXTEND = "native"
 SYSTEMD_PACKAGES = "rrdcached"
 SYSTEMD_SERVICE:rrdcached = "rrdcached.socket rrdcached.service"
 
+AUTOTOOLS_AUXDIR = "${S}/conftools"
+
 EXTRA_AUTORECONF = "-I m4 --exclude=autopoint"
 
 PACKAGECONFIG ??= "perl graph ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
@@ -63,6 +63,10 @@ export STAGING_INCDIR
 EXTRA_OEMAKE = ' CC="${CC} -Wno-incompatible-pointer-types" PERL5LIB="${PERL_ARCHLIB}" '
 # Avoid do_configure error on some hosts
 
+do_configure:prepend () {
+        mkdir -p ${AUTOTOOLS_AUXDIR}
+}
+
 do_configure() {
     unset PERLHOSTLIB
     #fix the pkglib problem with newer automake
@@ -135,3 +139,7 @@ RDEPENDS:${PN}-python = "python3"
 
 FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \
     ${PYTHON_SITEPACKAGES_DIR}/.debug"
+
+# http://errors.yoctoproject.org/Errors/Details/766911/
+# rrd_tune.c:239:35: error: passing argument 3 of 'optparse_init' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb b/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb
index f16126d936..f1235d7b96 100644
--- a/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb
@@ -10,6 +10,7 @@ SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https;branch=master
 
 SRCREV = "3a8402c1de7c7747c95229db26d8d32fb85a7a52"
 
-S = "${WORKDIR}/git"
+
+CVE_PRODUCT = "rsyslog:libfastjson"
 
 inherit autotools
diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb
index 49847047ac..3ccb87a9c5 100644
--- a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb
@@ -17,7 +17,8 @@ SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https;branch=stable \
 
 SRCREV = "b421f56d9ee31a966058d23bd23c966221c91396"
 
-S = "${WORKDIR}/git"
+
+CVE_PRODUCT = "rsyslog:librelp"
 
 inherit autotools pkgconfig ptest
 
@@ -59,14 +60,16 @@ do_install_ptest() {
     # some tests need to write to this directory
     chmod 777 -R ${D}${PTEST_PATH}/${TESTDIR}
 
-    # do NOT need to rebuild Makefile or $(check_PROGRAMS)
-    sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-
-    # fix the srcdir, top_srcdir, abs_top_builddir
-    sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+        sed -e '# do NOT need to rebuild Makefile or $(check_PROGRAMS)' \
+                -e 's/^Makefile:.*$/Makefile:/' \
+                -e 's/^check-TESTS:.*$/check-TESTS:/' \
+                -e '# fix the srcdir, top_srcdir, abs_top_builddir' \
+                -e 's,^\(srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' \
+                -e 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' \
+                -e 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' \
+                -e '# fix the path to test-driver' \
+                -e '/^SH_LOG_DRIVER =/s/(top_srcdir)/(top_builddir)/' \
+                -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile
 
     # install test-driver
     install -m 644 ${S}/test-driver ${D}${PTEST_PATH}
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
index c1480406fe..a506b7a6dc 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
@@ -1,4 +1,4 @@
-From 194e199ce08acc2192f6a63420ff24d9064666e5 Mon Sep 17 00:00:00 2001
+From 1b02236e84aaed5d80d4a67afb418eadb687d65f Mon Sep 17 00:00:00 2001
 From: Yi Fan Yu <yifan.yu@windriver.com>
 Date: Sat, 27 Mar 2021 19:18:25 -0400
 Subject: [PATCH] tests: disable the check for inotify
@@ -20,10 +20,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tests/diag.sh b/tests/diag.sh
-index 6cd60ea88..7424f48c5 100755
+index a9c2a75..0b017c5 100755
 --- a/tests/diag.sh
 +++ b/tests/diag.sh
-@@ -2672,7 +2672,7 @@ case $1 in
+@@ -2979,7 +2979,7 @@ case $1 in
                 fi
                 ;;
         'check-inotify') # Check for inotify/fen support 
@@ -32,7 +32,7 @@ index 6cd60ea88..7424f48c5 100755
                         echo [inotify mode]
                 elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then
                         grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h
-@@ -2687,7 +2687,7 @@ case $1 in
+@@ -2994,7 +2994,7 @@ case $1 in
                 fi
                 ;;
         'check-inotify-only') # Check for ONLY inotify support 
@@ -41,6 +41,3 @@ index 6cd60ea88..7424f48c5 100755
                         echo [inotify mode]
                 else
                         echo [inotify not supported, skipping...]
--- 
-2.29.2
-
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
index 5df29e7d90..884086bfc3 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
@@ -1,4 +1,4 @@
-From 1e0a77d8a5ae7cd0223afadf46cdbb540119774d Mon Sep 17 00:00:00 2001
+From 59753fe14e9eef4909a535b6e00967e546cc29ea Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 11 May 2024 23:31:46 -0700
 Subject: [PATCH] tests/tcpflood.c: Pass correct parameter type to sendto()
@@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/tcpflood.c b/tests/tcpflood.c
-index bd8edaf..0feda23 100644
+index 5e6f13a..09cedbb 100644
 --- a/tests/tcpflood.c
 +++ b/tests/tcpflood.c
-@@ -808,7 +808,7 @@ int sendMessages(struct instdata *inst)
+@@ -836,7 +836,7 @@ int sendMessages(struct instdata *inst)
                         }
                         lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number);
                 } else if(transport == TP_UDP) {
@@ -30,6 +30,3 @@ index bd8edaf..0feda23 100644
                         error_number = errno;
                 } else if(transport == TP_TLS) {
                         if(sockArray[socknum] == -1) {
--- 
-2.45.0
-
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
index 0352587268..f5ae65fb58 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
@@ -1,4 +1,4 @@
-From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001
+From d2dd13d930c91e45417c7361908f0af75e0e6c00 Mon Sep 17 00:00:00 2001
 From: Roy Li <rongqing.li@windriver.com>
 Date: Wed, 18 Jun 2014 13:46:52 +0800
 Subject: [PATCH] use pkgconfig to check libgcrypt
@@ -10,16 +10,15 @@ libgcrypt does no longer provide libgcrypt-config, and provide
 
 Signed-off-by: Roy Li <rongqing.li@windriver.com>
 Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-
 ---
  configure.ac | 15 +--------------
  1 file changed, 1 insertion(+), 14 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 62178c3..b56c9c7 100644
+index f8c0ac8..794bfb3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt,
+@@ -1217,20 +1217,7 @@ AC_ARG_ENABLE(libgcrypt,
          [enable_libgcrypt=yes]
  )
  if test "x$enable_libgcrypt" = "xyes"; then
@@ -40,4 +39,4 @@ index 62178c3..b56c9c7 100644
 +       PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt)
  fi
  AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes)
- AC_SUBST(LIBGCRYPT_CFLAGS)
+ AM_CONDITIONAL(ENABLE_RSCRYUTIL, test x$enable_libgcrypt = xyes || test x$enable_openssl_crypto_provider = xyes)
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2504.0.bb
index ac1645f671..c4ddb72bcc 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2504.0.bb
@@ -32,18 +32,21 @@ SRC_URI:append:libc-musl = " \
     file://0001-Include-sys-time-h.patch \
     file://disable-omfile-outchannel.patch \
 "
-SRC_URI[sha256sum] = "30528d140ec1b1f079224081fa37df6e06587ff42b02e3e61f2daa0526c54d33"
+SRC_URI[sha256sum] = "5092a20ed40987c74cc604ebfcd6c749e47eb9fc34adc1c2637e6553e7f047ab"
 
-UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases"
+UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
+CVE_PRODUCT = "rsyslog:rsyslog"
+
 inherit autotools pkgconfig systemd update-rc.d ptest
 
-EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes"
-EXTRA_OECONF += "--enable-imfile-tests"
-EXTRA_OECONF:remove:mipsarch = "ap_cv_atomic_builtins=yes"
-EXTRA_OECONF:remove:powerpc = "ap_cv_atomic_builtins=yes"
-EXTRA_OECONF:remove:riscv32 = "ap_cv_atomic_builtins=yes"
+EXTRA_OECONF += "--enable-imfile-tests ${ATOMICS}"
+ATOMICS = "ap_cv_atomic_builtins_64=yes ap_cv_atomic_builtins=yes"
+ATOMICS:mipsarch = ""
+ATOMICS:powerpc = ""
+ATOMICS:riscv32 = ""
+ATOMICS:armv5 = ""
 
 # first line is default yes in configure
 PACKAGECONFIG ??= " \
@@ -99,16 +102,18 @@ do_install_ptest() {
     # some tests need to write to this directory as user 'daemon'
     chmod 777 -R ${D}${PTEST_PATH}/tests
 
-    # do NOT need to rebuild Makefile itself
-    sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    # do NOT need to rebuild $(check_PROGRAMS)
-    sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-
-    # fix the srcdir, top_srcdir
-    sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    # fix the abs_top_builddir
-    sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+        sed -e '# do NOT need to rebuild Makefile itself' \
+            -e 's/^Makefile:.*$/Makefile:/' \
+            -e '# do NOT need to rebuild $(check_PROGRAMS)' \
+            -e 's/^check-TESTS:.*$/check-TESTS:/' \
+            -e '# fix the srcdir, top_srcdir' \
+            -e 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' \
+            -e 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' \
+            -e '# fix the abs_top_builddir' \
+            -e 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' \
+            -e '# fix the path to test-driver' \
+            -e '/^\(SH_\)\?LOG_DRIVER/s/(top_srcdir)/(top_builddir)/' \
+            -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile
 
     # install test-driver
     install -m 644 ${S}/test-driver ${D}${PTEST_PATH}
diff --git a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch b/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch
deleted file mode 100644
index 41f98281f8..0000000000
--- a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 9db4c0f6bc0dd11c77b54296fce6b8afe18f4325 Mon Sep 17 00:00:00 2001
-From: Steffen Nurpmeso <steffen@sdaoden.eu> 
-Date: Thu, 9 Jun 2022 18:26:38 +0800
-Subject: [PATCH] su_INLINE: eh no; give up, share detection with clang but for
- a thing
-
-Upstream-Status: Backport [https://git.sdaoden.eu/browse/s-nail.git/commit/?id=de2a44c393a39d80ddf12154aec94cace84b19c1]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- include/su/code.h | 34 +++++++++-------------------------
- 1 file changed, 9 insertions(+), 25 deletions(-)
-
-diff --git a/include/su/code.h b/include/su/code.h
-index 9683f4a..c7a2af3 100644
---- a/include/su/code.h
-+++ b/include/su/code.h
-@@ -308,29 +308,8 @@ do{\
- # ifdef DOXYGEN
- #  define su_INLINE inline
- #  define su_SINLINE inline
--# elif su_CC_GCC
--#  if !su_CC_VCHECK_GCC(3, 1)
--#   define su_INLINE extern __inline__
--#   define su_SINLINE static __inline__
--#  elif !defined __GNUC_GNU_INLINE__  /*4.1.3; !su_CC_VCHECK_GCC(4, 2)*/
--#   define su_INLINE extern __inline __attribute__((always_inline))
--#   define su_SINLINE static __inline __attribute__((always_inline))
--   /* gcc 8.3.0 bug: does not gracefully inline with -Os
--    * gcc 12.1.0 bug: ditto, -Og
--    * Thus: always gcc-specific! */
--#  elif 1 /*!defined __OPTIMIZE__ || \
--      !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L*/
--#   define su_INLINE extern __inline __attribute__((gnu_inline))
--#   define su_SINLINE static __inline __attribute__((gnu_inline))
--#  elif !defined NDEBUG || !defined __OPTIMIZE__
--#   define su_INLINE static inline
--#   define su_SINLINE static inline
--#  else
--#   define su_INLINE inline
--#   define su_SINLINE static inline
--#  endif
--# elif su_CC_CLANG || su_CC_PCC
--#  if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 199901L
-+# elif su_CC_CLANG || su_CC_GCC || su_CC_PCC
-+#  if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 199901l
- #   if !defined NDEBUG || !defined __OPTIMIZE__
- #    define su_INLINE static inline
- #    define su_SINLINE static inline
-@@ -340,8 +319,13 @@ do{\
- #    define su_SINLINE static inline __attribute__((always_inline))
- #   endif
- #  else
--#   define su_INLINE static __inline
--#   define su_SINLINE static __inline
-+#   if su_CC_VCHECK_GCC(3, 1)
-+#    define su_INLINE static __inline __attribute__((always_inline))
-+#    define su_SINLINE static __inline __attribute__((always_inline))
-+#   else
-+#    define su_INLINE static __inline
-+#    define su_SINLINE static __inline
-+#   endif
- #  endif
- # else
- #  define su_INLINE static /* TODO __attribute__((unused)) alike? */
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch b/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch
deleted file mode 100644
index 37ecb0c1ff..0000000000
--- a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5429b9e343c808951b1418d8626e544c9dcb28de Mon Sep 17 00:00:00 2001
-From: Steffen Nurpmeso <steffen@sdaoden.eu>
-Date: Thu, 9 Jun 2022 18:06:04 +0800
-Subject: [PATCH] su_INLINE: gcc: only GNU specifics after -Og
-
-Upstream-Status: Backport [https://git.sdaoden.eu/browse/s-nail.git/commit/?id=c5544b66c3b4b2e161166562349908a07e324b38]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- include/su/code.h | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/include/su/code.h b/include/su/code.h
-index 4d552c1..9683f4a 100644
---- a/include/su/code.h
-+++ b/include/su/code.h
-@@ -309,16 +309,17 @@ do{\
- #  define su_INLINE inline
- #  define su_SINLINE inline
- # elif su_CC_GCC
--   /* After lots of trouble with OpenBSD/gcc 4.2.1 and SunOS/gcc 3.4.3 */
--#  if !su_CC_VCHECK_GCC(3, 2) /* Unsure: only used C++ at that time */
--#   define su_INLINE extern __inline
--#   define su_SINLINE static __inline
--#  elif !su_CC_VCHECK_GCC(4, 3)
-+#  if !su_CC_VCHECK_GCC(3, 1)
-+#   define su_INLINE extern __inline__
-+#   define su_SINLINE static __inline__
-+#  elif !defined __GNUC_GNU_INLINE__  /*4.1.3; !su_CC_VCHECK_GCC(4, 2)*/
- #   define su_INLINE extern __inline __attribute__((always_inline))
- #   define su_SINLINE static __inline __attribute__((always_inline))
--   /* xxx gcc 8.3.0 bug: does not truly inline with -Os */
--#  elif !su_CC_VCHECK_GCC(8, 3) || !defined __OPTIMIZE__ ||\
--      !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L
-+   /* gcc 8.3.0 bug: does not gracefully inline with -Os
-+    * gcc 12.1.0 bug: ditto, -Og
-+    * Thus: always gcc-specific! */
-+#  elif 1 /*!defined __OPTIMIZE__ || \
-+      !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L*/
- #   define su_INLINE extern __inline __attribute__((gnu_inline))
- #   define su_SINLINE static __inline __attribute__((gnu_inline))
- #  elif !defined NDEBUG || !defined __OPTIMIZE__
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb b/meta-oe/recipes-extended/s-nail/s-nail_14.9.25.bb
index bcdb1e4788..93a852a6df 100644
--- a/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb
+++ b/meta-oe/recipes-extended/s-nail/s-nail_14.9.25.bb
@@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=87266591c81260f10221f1f38872d023"
 SRC_URI = "https://ftp.sdaoden.eu/${BP}.tar.xz \
            file://make-errors.patch \
            file://0001-make.rc-set-VAL_MTA.patch \
-           file://0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch \
-           file://0001-su_INLINE-eh-no-give-up-share-detection.patch \
            file://0001-mk-make-config.sh-not-reveal-the-build-env.patch \
 "
-SRC_URI[sha256sum] = "2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c"
+SRC_URI[sha256sum] = "20ff055be9829b69d46ebc400dfe516a40d287d7ce810c74355d6bdc1a28d8a9"
 
 DEPENDS = "coreutils-native"
 
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.9.3.bb b/meta-oe/recipes-extended/sanlock/sanlock_4.0.0.bb
index 3b558cafcb..fe8592be39 100644
--- a/meta-oe/recipes-extended/sanlock/sanlock_3.9.3.bb
+++ b/meta-oe/recipes-extended/sanlock/sanlock_4.0.0.bb
@@ -17,9 +17,8 @@ SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \
            file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \
            file://0001-add-missing-system-header-string.h.patch \
            "
-SRCREV = "79b35bba8298f4444923c15e11bed38380cb18ee"
+SRCREV = "70c268a07273da78a4aadd14c40ffb75138ccebe"
 
-S = "${WORKDIR}/git"
 
 CVE_STATUS[CVE-2012-5638] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
 
diff --git a/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb b/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb
index 0e5fc7b6bb..41cbe4c429 100644
--- a/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb
+++ b/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb
@@ -10,9 +10,11 @@ SECTION = "Development/Libraries"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sblim/${BP}.tar.bz2 \
            file://sblim-cmpi-devel-2.0.3-docdir.patch"
-SRC_URI[md5sum] = "b934616f88a848f17ca3cf1b9e792cbf"
 SRC_URI[sha256sum] = "1671cabff6b922b6fde897673d9fdafd56c9310f82a7eacc0547d596b9cdfea6"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sblim/files/development%20pkgs/sblim-cmpi-devel/"
+UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)"
+
 inherit autotools
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb b/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
index 4e90215c0e..03d8d4940c 100644
--- a/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
+++ b/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
@@ -9,11 +9,12 @@ SECTION = "Development/Libraries"
 
 DEPENDS = "cmpi-bindings"
 
-S = "${WORKDIR}/sblim-sfcCommon-${PV}"
+S = "${UNPACKDIR}/sblim-sfcCommon-${PV}"
 SRC_URI = "http://downloads.sourceforge.net/sblim/sblim-sfcCommon-${PV}.tar.bz2"
-SRC_URI[md5sum] = "8aa2655d97bdea54c4750f220b40990c"
 SRC_URI[sha256sum] = "b9b1037173d6ae0181c3bd5a316ddab5afd6a342ad0dbdc18e940fc0ad2c3297"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sblim/files/sblim-sfcCommon/"
+
 inherit autotools
 
 do_install() {
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-missing-system-headers.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-missing-system-headers.patch
index c16e393f49..f9083e7934 100644
--- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-missing-system-headers.patch
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-missing-system-headers.patch
@@ -18,8 +18,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  trace.h             | 3 ++-
  9 files changed, 12 insertions(+), 3 deletions(-)
 
-diff --git a/brokerEnc.c b/brokerEnc.c
-index 9115e71..889afcd 100644
 --- a/brokerEnc.c
 +++ b/brokerEnc.c
 @@ -25,6 +25,8 @@
@@ -31,8 +29,6 @@ index 9115e71..889afcd 100644
  extern const char *opGetClassNameChars(const CMPIObjectPath * cop);
  extern const char *opGetNameSpaceChars(const CMPIObjectPath * cop);
  extern CMPIConstClass *getConstClass(const char *ns, const char *cn);
-diff --git a/brokerOs.c b/brokerOs.c
-index 8d73a0b..b1427fd 100644
 --- a/brokerOs.c
 +++ b/brokerOs.c
 @@ -22,6 +22,7 @@
@@ -43,8 +39,6 @@ index 8d73a0b..b1427fd 100644
  
  static char    *
  resolveFileName(const char *filename)
-diff --git a/mlog.c b/mlog.c
-index a2d9eb7..6d9cd29 100644
 --- a/mlog.c
 +++ b/mlog.c
 @@ -26,6 +26,7 @@ const char     *_mlog_id =
@@ -55,8 +49,6 @@ index a2d9eb7..6d9cd29 100644
  #include <errno.h>
  #include <signal.h>
  #include "trace.h"              /* for setSignal() */
-diff --git a/mofc/backend_sfcb.c b/mofc/backend_sfcb.c
-index 614abcd..99d4061 100644
 --- a/mofc/backend_sfcb.c
 +++ b/mofc/backend_sfcb.c
 @@ -29,7 +29,7 @@
@@ -68,8 +60,6 @@ index 614abcd..99d4061 100644
  
  extern CMPIStatus sfcb_simpleArrayAdd(CMPIArray * array, CMPIValue * val, CMPIType type);
  extern CMPIObjectPath *getObjectPath(char *path, char **msg);
-diff --git a/sfcbdump.c b/sfcbdump.c
-index 8a9c335..aa8559c 100644
 --- a/sfcbdump.c
 +++ b/sfcbdump.c
 @@ -23,6 +23,7 @@
@@ -80,8 +70,6 @@ index 8a9c335..aa8559c 100644
  #include "objectImpl.h"
  
  #define BINARY_NAME argv[0]
-diff --git a/sfcbdumpP32onI32.c b/sfcbdumpP32onI32.c
-index ccf87dc..3540751 100644
 --- a/sfcbdumpP32onI32.c
 +++ b/sfcbdumpP32onI32.c
 @@ -22,6 +22,7 @@
@@ -92,8 +80,6 @@ index ccf87dc..3540751 100644
  #include <getopt.h>
  #include "objectImpl.h"
  #include <byteswap.h>
-diff --git a/sfcbsem.c b/sfcbsem.c
-index 3f8de7f..1e6358b 100644
 --- a/sfcbsem.c
 +++ b/sfcbsem.c
 @@ -21,6 +21,7 @@
@@ -104,8 +90,6 @@ index 3f8de7f..1e6358b 100644
  #include <getopt.h>
  #include <errno.h>
  
-diff --git a/trace.c b/trace.c
-index 23597e1..c4f8011 100644
 --- a/trace.c
 +++ b/trace.c
 @@ -25,6 +25,7 @@
@@ -125,8 +109,6 @@ index 23597e1..c4f8011 100644
  int             terminating = 0;
  int             colorTrace;
  
-diff --git a/trace.h b/trace.h
-index ea39850..52d408d 100644
 --- a/trace.h
 +++ b/trace.h
 @@ -25,6 +25,7 @@
@@ -137,7 +119,7 @@ index ea39850..52d408d 100644
  extern unsigned long _sfcb_trace_mask;
  /* use pointer indirect _sfcb_trace_mask to allow shared memory flag */
  extern unsigned long *_ptr_sfcb_trace_mask;
-@@ -162,7 +163,7 @@ extern sigHandler *setSignal(int sn, sigHandler * sh, int flags);
+@@ -162,7 +163,7 @@ extern sigHandler *setSignal(int sn, sig
  
  extern char    *processName;
  extern int      providerProcess;
@@ -146,6 +128,33 @@ index ea39850..52d408d 100644
  extern int      terminating;
  
  #endif
--- 
-2.37.3
-
+--- a/support.c
++++ b/support.c
+@@ -39,6 +39,7 @@
+ #include <err.h>
+ #endif
+ #include <errno.h>
++#include <string.h> /* memcpy */
+ #include "native.h"
+ #include "trace.h"
+ #include "control.h"
+--- a/qualifier.c
++++ b/qualifier.c
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <string.h> /* memcpy */
+ #include "objectImpl.h"
+ #include "qualifier.h"
+ 
+--- a/objectImplSwapI32toP32.c
++++ b/objectImplSwapI32toP32.c
+@@ -24,6 +24,7 @@
+ #include <byteswap.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h> /* memcpy */
+ #include <sfcCommon/utilft.h>
+ #include <sys/utsname.h>
+ 
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
index 5089397916..591321b7e9 100644
--- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
@@ -31,7 +31,6 @@ SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \
            file://0001-include-missing-system-headers.patch \
 "
 
-SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30"
 SRC_URI[sha256sum] = "634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd"
 
 CVE_STATUS[CVE-2012-3381] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
@@ -43,9 +42,10 @@ SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE:${PN} = "sblim-sfcb.service"
 SYSTEMD_AUTO_ENABLE = "enable"
 
-LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--allow-shlib-undefined ', '', d)}"
 
+CFLAGS += "-std=gnu17"
+
 EXTRA_OECONF = '--enable-debug \
                 --enable-ssl \
                 --enable-pam \
@@ -86,3 +86,8 @@ FILES:${PN} += "${libdir}/sfcb ${datadir}/sfcb"
 FILES:${PN}-dbg += "${libdir}/sfcb/.debug"
 
 RDEPENDS:${PN} = "perl bash"
+
+# This one is reproducible only on 32bit MACHINEs
+# http://errors.yoctoproject.org/Errors/Details/766970/
+# sblim-sfcb-1.4.9/trace.c:214:18: error: passing argument 1 of 'gmtime_r' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch
new file mode 100644
index 0000000000..5e8f4fa0d5
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch
@@ -0,0 +1,72 @@
+From 5151163d6f4d4de0699d1e85c54fbe2cb5b55460 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@fujitsu.com>
+Date: Thu, 27 Jun 2024 01:51:36 +0000
+Subject: Fix incompatible pointer type error with gcc option 
+ -Wincompatible-pointer-types
+
+| ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c: In function 'main':
+| ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c:86:31: error: passing argument 1 of 'showClass' from incompatible pointer type [-Wincompatible-pointer-types]
+|    86 |           showClass(data.value.cls);
+|       |                     ~~~~~~~~~~^~~~
+|       |                               |
+|       |                               CIMCClass * {aka struct _CIMCClass *}
+| In file included from ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c:7:
+| ../../sblim-sfcc-2.2.8/TEST/show.h:9:34: note: expected 'CMPIConstClass *' {aka 'struct _CMPIConstClass *'} but argument is of type 'CIMCClass *' {aka 'struct _CIMCClass *'}
+|     9 | void showClass( CMPIConstClass * in_class );
+|       |                 ~~~~~~~~~~~~~~~~~^~~~~~~~
+
+| ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c: In function 'main':
+| ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c:96:36: error: passing argument 1 of 'showObjectPath' from incompatible pointer type [-Wincompatible-pointer-types]
+|    96 |           showObjectPath(data.value.ref);
+|       |                          ~~~~~~~~~~^~~~
+|       |                                    |
+|       |                                    CIMCObjectPath * {aka struct _CIMCObjectPath *}
+| In file included from ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c:7:
+| ../../sblim-sfcc-2.2.8/TEST/show.h:7:39: note: expected 'CMPIObjectPath *' {aka 'struct _CMPIObjectPath *'} but argument is of type 'CIMCObjectPath *' {aka 'struct _CIMCObjectPath *'}
+|     7 | void showObjectPath( CMPIObjectPath * objectpath );
+|       |                      ~~~~~~~~~~~~~~~~~^~~~~~~~~~
+| make[2]: *** [Makefile:1110: v2test_ein.o] Error 1
+| make[2]: *** Waiting for unfinished jobs....
+| ../../sblim-sfcc-2.2.8/TEST/v2test_im.c: In function 'main':
+| ../../sblim-sfcc-2.2.8/TEST/v2test_im.c:82:40: warning: '%s' directive argument is null [-Wformat-overflow=]
+|    82 |     printf( "invokeMethod() rc=%d, msg=%s\n",
+|       |                                        ^~
+
+Upstream-Status: Backport
+[https://github.com/kkaempf/sblim-sfcc/commit/881fccbaf19e26cbef3da1bebe2b42b3a9de1147#diff-ad9eeee99837ead0f29c70cd5f3956178dc3d51bd79618affd53d72a31404d5f]
+
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+---
+ TEST/v2test_ec.c  | 2 +-
+ TEST/v2test_ein.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c
+index 940ca57..72a93a5 100644
+--- a/TEST/v2test_ec.c
++++ b/TEST/v2test_ec.c
+@@ -83,7 +83,7 @@ int main()
+        count = enm->ft->hasNext(enm, NULL) ;
+        while (count > 0) {
+           data = enm->ft->getNext(enm, NULL);
+-          showClass(data.value.cls);          
++          showClass((CMPIConstClass *)data.value.cls);          
+           /*
+            * see if we have any more
+            */
+diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c
+index ede95c1..c9d1152 100644
+--- a/TEST/v2test_ein.c
++++ b/TEST/v2test_ein.c
+@@ -93,7 +93,7 @@ int count = 0;
+                  
+           data = enm->ft->getNext(enm, NULL);
+ 
+-          showObjectPath(data.value.ref);
++          showObjectPath((CMPIObjectPath *)data.value.ref);
+           /*
+            * see if we have any more
+            */
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb
index c9d3ddd6b2..733cddc88b 100644
--- a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb
+++ b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb
@@ -5,14 +5,21 @@ HOMEPAGE = "http://www.sblim.org"
 SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://0001-cimxml-Include-sys-select.h-for-fd_set.patch \
            file://0001-Fix-implicit-function-declarations.patch \
+           file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \
            "
 
-SRC_URI[md5sum] = "0bac0dec19f17ec065b6c332a56d7bae"
 SRC_URI[sha256sum] = "1b8f187583bc6c6b0a63aae0165ca37892a2a3bd4bb0682cd76b56268b42c3d6"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sblim/files/sblim-sfcc/"
+
 LICENSE = "EPL-1.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261"
 
 DEPENDS = "curl"
 
 inherit autotools
+
+# http://errors.yoctoproject.org/Errors/Details/766897/
+# sblim-sfcc-2.2.8/TEST/v2test_ec.c:86:31: error: passing argument 1 of 'showClass' from incompatible pointer type [-Wincompatible-pointer-types]
+# sblim-sfcc-2.2.8/TEST/v2test_ein.c:96:36: error: passing argument 1 of 'showObjectPath' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb
index 999d2b9e95..ccd2f90c3b 100644
--- a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb
+++ b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb
@@ -14,7 +14,6 @@ SRC_URI = "http://prdownloads.sourceforge.net/scsirastools/scsirastools-${PV}.ta
            file://mdadm.patch;apply=no \
            file://print-format.patch \
 "
-SRC_URI[md5sum] = "6271a61b2ce40aaf33ef61775148cda1"
 SRC_URI[sha256sum] = "e7b997e75decb06a650c42c35cd63d0c94c34e39cf133c723337b0eeabbfdf6a"
 
 inherit autotools update-rc.d
@@ -44,3 +43,18 @@ FILES:${PN}-raidmon = "${sbindir}/sgraidmon ${sysconfdir}/init.d/sgraid"
 RDEPENDS:${PN} += "bash"
 RDEPENDS:${PN}-diskmon += "${PN} bash"
 RDEPENDS:${PN}-raidmon += "${PN} bash"
+
+# This one is reproducible only on 32bit MACHINEs
+# http://errors.yoctoproject.org/Errors/Details/766967/
+# scsirastools-1.6.6/src/sgdiag.c:238:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdiag.c:697:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdiag.c:699:30: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdiag.c:733:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdefects.c:214:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgmode.c:290:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdiskmon.c:1278:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdskfl.c:318:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdskfl.c:829:37: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgraidmon.c:1641:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgsafte.c:1298:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch b/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch
deleted file mode 100644
index 8afcb1fa48..0000000000
--- a/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 927cd88cad7bea94c2eebecc18f7881f0defaccb Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 26 Jan 2023 23:36:29 -0800
-Subject: [PATCH] include missing <cstdint>
-
-gcc 13 moved some includes around and as a result <cstdint>
-is no longer transitively included [1]. Explicitly include
-it for uint{32,64}_t.
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Upstream-Status: Submitted [https://github.com/Drive-Trust-Alliance/sedutil/pull/425]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Common/DtaOptions.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Common/DtaOptions.h b/Common/DtaOptions.h
-index c012af1..7530a0b 100644
---- a/Common/DtaOptions.h
-+++ b/Common/DtaOptions.h
-@@ -21,6 +21,7 @@ along with sedutil.  If not, see <http://www.gnu.org/licenses/>.
- #ifndef _DTAOPTIONS_H
- #define        _DTAOPTIONS_H
- 
-+#include <cstdint>
- /** Output modes */
- typedef enum _sedutiloutput {
-        sedutilNormal,
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-oe/recipes-extended/sedutil/sedutil_git.bb
index 972a33c742..e8987b2dd0 100644
--- a/meta-oe/recipes-extended/sedutil/sedutil_git.bb
+++ b/meta-oe/recipes-extended/sedutil/sedutil_git.bb
@@ -7,13 +7,12 @@ LICENSE = "GPL-3.0-only"
 
 LIC_FILES_CHKSUM = "file://Common/LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"
 
-PV = "1.20.0"
-SRCREV = "d3de8e45e06a21d31cca0046ceb16ced1ef3563a"
+PV = "1.20.0+git"
+
+SRCREV = "6270fb0e3c110572d96936a473b5e0d21a39884d"
 SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git;branch=master;protocol=https \
            file://0001-Fix-build-on-big-endian-architectures.patch \
-           file://0001-include-missing-cstdint.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep
diff --git a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
index 9b25745ed6..1b3a484ccb 100644
--- a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
+++ b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
@@ -6,10 +6,9 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-1.2-0.10-src.ta
            file://Makefile-error-fix.patch \
            file://0001-makefile-Add-LDFLAGS-to-linking-rule.patch \
            "
-SRC_URI[md5sum] = "a417bf68da4e9bd79a4664c11d7debd1"
 SRC_URI[sha256sum] = "9bf8c42acaa247efd9321bdb1fc2390022f0c554d77fbbd4a7363d990fc0270b"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE_GPL;md5=393a5ca445f6965873eca0259a17f833"
diff --git a/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb b/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb
index 1e5ffdd856..1e63179e84 100644
--- a/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb
+++ b/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb
@@ -19,7 +19,6 @@ inherit autotools pkgconfig mime
 
 SRC_URI = "http://sigrok.org/download/source/libsigrok/libsigrok-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "e258d471b6d5eaa58daf927a0dc3ba67"
 SRC_URI[sha256sum] = "4d341f90b6220d3e8cb251dacf726c41165285612248f2c52d15df4590a1ce3c"
 
 FILES:${PN} += "${datadir}/*"
diff --git a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
index 45556afa8a..a051f90c43 100644
--- a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
+++ b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
@@ -18,7 +18,7 @@ index 4802f35..e0e468f 100644
  # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
  SR_PKG_CHECK([python3], [SRD_PKGLIBS],
 -       [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
-+       [python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
++       [python-3.13-embed], [python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
  AS_IF([test "x$sr_have_python3" = xno],
         [AC_MSG_ERROR([Cannot find Python 3 development headers.])])
  
diff --git a/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb b/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb
index 24091bcf90..4ea2287e40 100644
--- a/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb
+++ b/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb
@@ -13,5 +13,4 @@ SRC_URI = "http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-${P
            file://0001-configure.ac-add-py-3.10-support.patch \
            "
 
-SRC_URI[md5sum] = "7ba4ed4ef1f06ae96979751e096c2821"
 SRC_URI[sha256sum] = "c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0"
diff --git a/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb b/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb
index 48f96cc435..f9da51fe6c 100644
--- a/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb
+++ b/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb
@@ -13,7 +13,6 @@ PACKAGECONFIG ??= "decode"
 inherit autotools pkgconfig mime-xdg
 
 SRC_URI = "http://sigrok.org/download/source/sigrok-cli/sigrok-cli-${PV}.tar.gz"
-SRC_URI[md5sum] = "856fd496cd99d1091aa128405c522a36"
 SRC_URI[sha256sum] = "71d0443f36897bf565732dec206830dbea0f2789b6601cf10536b286d1140ab8"
 
 FILES:${PN} += "${datadir}/icons/hicolor"
diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb b/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb
index bc3bc3aa47..2a49ba99b0 100644
--- a/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb
+++ b/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb
@@ -15,7 +15,6 @@ SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main \
 
 SRCREV = "dc05e026488865bc69313a68bcc03ef2e4ea8e83"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
index ab97356e9b..530e38ce21 100644
--- a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
+++ b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
@@ -5,8 +5,9 @@ PV = "1.0+git"
 
 SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master"
 
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit module
 
diff --git a/meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch b/meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch
new file mode 100644
index 0000000000..91b9dd3c4e
--- /dev/null
+++ b/meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch
@@ -0,0 +1,28 @@
+From 4363ef59cc9f2169455f56453759d4a4d9b89a5f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 13 Feb 2025 22:14:47 -0800
+Subject: [PATCH] Include time.h for timespec struct definition
+
+Fixes
+git/isobusfs/../libj1939.h:33:18: error: field has incomplete type 'struct timespec'
+   33 |         struct timespec next_send_time;
+      |                         ^
+
+Upstream-Status: Submitted [https://github.com/linux-can/can-utils/pull/579]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libj1939.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libj1939.h b/libj1939.h
+index 44393a2..7c19f43 100644
+--- a/libj1939.h
++++ b/libj1939.h
+@@ -17,6 +17,7 @@
+ #include <linux/can/j1939.h>
+ #include <stdbool.h>
+ #include <stdint.h>
++#include <time.h>
+ #include <sys/socket.h>
+ 
+ #ifndef J1939_LIB_H
diff --git a/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
index ca6cb7db58..5dc41bcb93 100644
--- a/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb
+++ b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
@@ -4,22 +4,46 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61
 
 DEPENDS = "libsocketcan"
 
-SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master \
+           file://0001-Include-time.h-for-timespec-struct-definition.patch"
 
-SRCREV = "cfe41963f3425e9adb01a70cfaddedf5e5982720"
+SRCREV = "01083a64ebf28cc716efe2d2fd51c141042ae34b"
 
-S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig update-alternatives
+inherit cmake pkgconfig update-alternatives
 
-PACKAGES =+ "${PN}-access ${PN}-isotp ${PN}-j1939 ${PN}-cantest ${PN}-slcan ${PN}-log"
+PACKAGES =+ " \
+    ${PN}-access \
+    ${PN}-cantest \
+    ${PN}-isobusfs \
+    ${PN}-isobusfs-dev \
+    ${PN}-isotp \
+    ${PN}-j1939 \
+    ${PN}-log \
+    ${PN}-mcp251xfd \
+    ${PN}-slcan \
+"
 
 FILES:${PN}-access = " \
     ${bindir}/cangw \
     ${bindir}/canlogserver \
     ${bindir}/bcmserver \
-    ${bindir}/socketcand \
-    ${bindir}/cannelloni \
+"
+
+FILES:${PN}-cantest = " \
+    ${bindir}/canbusload \
+    ${bindir}/can-calc-bit-timing \
+    ${bindir}/canfdtest \
+"
+
+FILES:${PN}-isobusfs = " \
+    ${bindir}/isobusfs-cli \
+    ${bindir}/isobusfs-srv \
+    ${libdir}/libisobusfs.so \
+"
+
+FILES:${PN}-isobusfs-dev = " \
+    ${includedir}/isobusfs* \
 "
 
 FILES:${PN}-isotp = "${bindir}/isotp*"
@@ -29,16 +53,14 @@ FILES:${PN}-j1939 = " \
     ${bindir}/testj1939 \
 "
 
-FILES:${PN}-cantest = " \
-    ${bindir}/canbusload \
-    ${bindir}/can-calc-bit-timing \
-    ${bindir}/canfdtest \
+FILES:${PN}-log = "${bindir}/*log*"
+
+FILES:${PN}-mcp251xfd = " \
+    ${bindir}/mcp251xfd* \
 "
 
 FILES:${PN}-slcan = "${bindir}/slcan*"
 
-FILES:${PN}-log = "${bindir}/*log*"
-
 ALTERNATIVE:${PN} = "candump cansend cansequence"
 ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump"
 ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend"
@@ -46,5 +68,4 @@ ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence"
 
 # busybox ip fails to configure can interfaces, so we need iproute2 to do so.
 # See details in http://www.armadeus.com/wiki/index.php?title=CAN_bus_Linux_driver.
-RRECOMMENDS:${PN} += "iproute2"
-
+RRECOMMENDS:${PN} += "iproute2-ip"
diff --git a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
index ab4710e81f..b92b8086d6 100644
--- a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
+++ b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
@@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "libsocketcan"
 
 SRCREV = "299dff7f5322bf0348dcdd60071958ebedf5f09d"
-SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git;branch=master \
+SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=https;branch=master \
     file://0001-canutils-candump-Add-error-frame-s-handling.patch \
 "
 
 inherit update-alternatives
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
index 9f6ef85c87..535f37f84c 100644
--- a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
+++ b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38ad
 
 SRCREV = "077def398ad303043d73339112968e5112d8d7c8"
 
-SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git;branch=master"
+SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/socketcan/socketcand_git.bb b/meta-oe/recipes-extended/socketcan/socketcand_git.bb
new file mode 100644
index 0000000000..ba69875c93
--- /dev/null
+++ b/meta-oe/recipes-extended/socketcan/socketcand_git.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Socketcand, socketcan over tcp/ip"
+LICENSE = "GPL-2.0-only | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause;md5=4c00cf8b0a04a9441d8fa24850231d00 \
+    file://LICENSES/GPL-2.0-only.txt;md5=f9d20a453221a1b7e32ae84694da2c37 \
+"
+
+SRC_URI = "git://github.com/linux-can/socketcand;branch=master;protocol=https"
+SRCREV = "998b0394d028e791aa97d549bfc686b4fbadf5ee"
+
+inherit meson pkgconfig
+
+PACKAGECONFIG ?= "libconfig libsocketcan"
+PACKAGECONFIG[libconfig] = "-Dlibconfig=true,-Dlibconfig=false,libconfig"
+PACKAGECONFIG[libsocketcan] = "-Dlibsocketcan=true,-Dlibsocketcan=false,libsocketcan"
diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-fix-build-with-gcc-15.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..9a81f1c74c
--- /dev/null
+++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-fix-build-with-gcc-15.patch
@@ -0,0 +1,31 @@
+From 47a86dabd065096ffc8818a1cffca96964d18120 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Tue, 22 Apr 2025 18:43:46 +0200
+Subject: [PATCH] libsinsp: fix build with gcc-15
+
+fixes:
+http://errors.yoctoproject.org/Errors/Details/852848/
+
+In file included from TOPDIR/tmp/work/core2-64-oe-linux/sysdig/0.28.0/git/falcosecurity-libs/userspace/chisel/lua_parser.cpp:20:
+TOPDIR/tmp/work/core2-64-oe-linux/sysdig/0.28.0/git/falcosecurity-libs/userspace/libsinsp/./gen_filter.h:87:17: error: 'uint64_t' does not name a type
+   87 |         virtual uint64_t get_ts() const = 0;
+      |                 ^~~~~~~~
+
+Upstream-Status: Pending [gen_filter is removed in newer version with https://github.com/falcosecurity/libs/commit/47e245f3d343eff27ed178ec2449caa3a01faabb]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ userspace/libsinsp/gen_filter.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/userspace/libsinsp/gen_filter.h b/userspace/libsinsp/gen_filter.h
+index f4cfa08b1..79ac30dc3 100644
+--- a/userspace/libsinsp/gen_filter.h
++++ b/userspace/libsinsp/gen_filter.h
+@@ -16,6 +16,7 @@ along with Falco.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <set>
+ #include <list>
+ #include <map>
diff --git a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb b/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb
index e814120ee6..b60f9c643c 100644
--- a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb
+++ b/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb
@@ -23,16 +23,16 @@ DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp \
 RDEPENDS:${PN} = "bash"
 
 SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https;name=sysdig \
-           git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=git/falcosecurity-libs \
+           git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/falcosecurity-libs \
            file://0001-Add-cstdint-for-uintXX_t-types.patch;patchdir=./falcosecurity-libs \
            file://0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch \
+           file://0001-libsinsp-fix-build-with-gcc-15.patch;patchdir=./falcosecurity-libs \
           "
 SRCREV_sysdig = "4fb6288275f567f63515df0ff0a6518043ecfa9b"
-SRCREV_falco= "caa0e4d0044fdaaebab086592a97f0c7f32aeaa9"
+SRCREV_falco = "caa0e4d0044fdaaebab086592a97f0c7f32aeaa9"
 
 SRCREV_FORMAT = "sysdig_falco"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "\
                 -DBUILD_DRIVER=OFF \
diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
index 580d03cbb5..a4bf3eaaca 100644
--- a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
+++ b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
@@ -18,7 +18,6 @@ DEPENDS += "libdaemon"
 
 RDEPENDS:${PN} = "iproute2-tipc"
 
-S = "${WORKDIR}/git"
 
 do_configure:prepend() {
     ( cd ${S}; ${S}/bootstrap )
@@ -46,7 +45,7 @@ do_install:append() {
     # Install systemd related configuration file
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/modules-load.d
-        install -m 0644 ${WORKDIR}/tipcutils.conf ${D}${sysconfdir}/modules-load.d
+        install -m 0644 ${UNPACKDIR}/tipcutils.conf ${D}${sysconfdir}/modules-load.d
     fi
 }
 
diff --git a/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb b/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb
index 4e66d8d05a..5fb28b0085 100644
--- a/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb
+++ b/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb
@@ -12,6 +12,5 @@ SRC_URI = "\
 
 SRCREV = "5e00bfa5e137e76c81888727712ced2b3fd99f5b"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools
diff --git a/meta-oe/recipes-extended/tmux/tmux_3.3a.bb b/meta-oe/recipes-extended/tmux/tmux_3.5.bb
index 5187222838..33f709681d 100644
--- a/meta-oe/recipes-extended/tmux/tmux_3.3a.bb
+++ b/meta-oe/recipes-extended/tmux/tmux_3.5.bb
@@ -5,13 +5,13 @@ SECTION = "console/utils"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf19144bdaca107"
 
-DEPENDS = "ncurses libevent"
+DEPENDS = "ncurses libevent bison-native"
 
 SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz"
-SRC_URI[md5sum] = "8eee5883b9f6550fa4efaad0c9ec38f3"
-SRC_URI[sha256sum] = "e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f"
+SRC_URI[sha256sum] = "2fe01942e7e7d93f524a22f2c883822c06bc258a4d61dba4b407353d7081950f"
 
 UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
index 0b14f9557a..1a453ebe10 100644
--- a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
+++ b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
@@ -9,9 +9,8 @@ SRCREV = "44a173195986d0d853316cb02a58785ded66c12b"
 PV = "0.5.0+git"
 SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian;protocol=https"
 
-S = "${WORKDIR}/git"
 
-inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd
+inherit pkgconfig perlnative update-rc.d systemd
 
 PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
 PACKAGECONFIG[systemd] = ",,systemd"
@@ -30,7 +29,9 @@ FILES:${PN} = "\
 "
 CONFFILES:${PN} = "${sysconfdir}/udev/rules.d/80-triggerhappy.rules"
 
-do_install:append() {
+do_install() {
+    oe_runmake 'DESTDIR=${D}' 'BINDIR=${D}${sbindir}' install
+
     install -d ${D}${sysconfdir}/triggerhappy/triggers.d
 
     install -d ${D}${nonarch_base_libdir}/udev/rules.d
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
index 6a99e8d29b..0e189b558f 100644
--- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
+++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
@@ -11,11 +11,11 @@ SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_
            file://0001-cow.c-Replace-stat64-with-stat.patch \
            file://0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch \
            "
-SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a"
 SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/user-mode-linux/files/tools/1/"
 
-S = "${WORKDIR}/tools"
+S = "${UNPACKDIR}/tools"
 
 inherit update-alternatives
 
diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb
index 3aa766d0bd..616f4ca09a 100644
--- a/meta-oe/recipes-extended/upm/upm_git.bb
+++ b/meta-oe/recipes-extended/upm/upm_git.bb
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \
 
 SRC_URI:append:toolchain-clang:x86 = " file://0001-nmea_gps-Link-with-latomic.patch "
 
-S = "${WORKDIR}/git"
 
 # Depends on mraa which only supports x86 and ARM for now
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
diff --git a/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch
new file mode 100644
index 0000000000..7dd064fc03
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch
@@ -0,0 +1,30 @@
+From a657a3c88488e761c05011400fcee5328fc797e1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 10 Sep 2019 20:04:26 -0700
+Subject: [PATCH] src: Do not reset FINAL_LIBS
+
+This helps case where additional libraries are needed to be passed from
+environment to get it going
+
+e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 5919f01e9..e95050376 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -138,7 +138,7 @@ endif
+ 
+ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(SERVER_CFLAGS)
+ FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(SERVER_LDFLAGS) $(DEBUG)
+-FINAL_LIBS=-lm
++FINAL_LIBS+=-lm
+ DEBUG=-g -ggdb
+ 
+ # Linux ARM32 needs -latomic at linking time
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.5/GNU_SOURCE-7.patch b/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch
index 6e07c25c6a..bf6fc9ab24 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.5/GNU_SOURCE-7.patch
+++ b/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch
@@ -1,4 +1,4 @@
-From a22512ac1cbd6de1f5646219722e49752d1f60ac Mon Sep 17 00:00:00 2001
+From 6414a404c3216e654cc6583ebda0c7b3bd304ecf Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 Dec 2019 12:09:51 -0800
 Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
@@ -10,18 +10,18 @@ Fixes
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
 ---
  src/zmalloc.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/src/zmalloc.c b/src/zmalloc.c
-index ba03685..322304f 100644
+index 3abf9a31a..fa2f25c07 100644
 --- a/src/zmalloc.c
 +++ b/src/zmalloc.c
-@@ -32,6 +32,7 @@
- #include "config.h"
+@@ -33,6 +33,7 @@
  #include "solarisfixes.h"
+ #include "serverassert.h"
  
 +#define _GNU_SOURCE
  #include <stdio.h>
diff --git a/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch
new file mode 100644
index 0000000000..ffb365f371
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch
@@ -0,0 +1,43 @@
+From a5bcf56630df520040076dd14c3c54fef0785ceb Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Fri, 8 Feb 2013 17:39:52 -0600
+Subject: [PATCH] hiredis: use default CC if it is set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Instead of trying to automagically figure out CC, which breaks with OE
+as CC has spaces in it, just skip it if one was already passed in.
+
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+
+Update to work with 4.0.8
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+
+Reworked for 6.0.4
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
+Reworked for 8.0.0
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+
+Reworked for 8.1.0
+Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
+
+Upstream-Status: Inappropriate [OE-specifc]
+---
+ deps/hiredis/Makefile | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
+index 4a3de1f6e..49bb525cd 100644
+--- a/deps/hiredis/Makefile
++++ b/deps/hiredis/Makefile
+@@ -36,8 +36,6 @@ endef
+ export REDIS_TEST_CONFIG
+ 
+ # Fallback to gcc when $CC is not in $PATH.
+-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+ OPTIMIZATION?=-O3
+ WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+ DEBUG_FLAGS?= -g -ggdb
diff --git a/meta-oe/recipes-extended/valkey/valkey/init-valkey-server b/meta-oe/recipes-extended/valkey/valkey/init-valkey-server
new file mode 100755
index 0000000000..8731795740
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/init-valkey-server
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          valkey-server
+# Required-Start:    $network
+# Required-Stop:     $network
+# Default-Start:     S 2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Redis, a key-value store
+# Description:       Redis is an open source, advanced key-value store.
+#                    http://valkey.io
+### END INIT INFO
+
+test -f /usr/bin/valkey-server || exit 0
+
+ARGS="/etc/valkey/valkey.conf"
+
+case "$1" in
+    start)
+        echo "Starting valkey-server..."
+        start-stop-daemon --start --quiet --exec /usr/bin/valkey-server -- $ARGS
+        ;;
+    stop)
+        echo "Stopping valkey-server..."
+        start-stop-daemon --stop --quiet --exec /usr/bin/valkey-server
+        ;;
+    restart)
+        echo "Stopping valkey-server..."
+        start-stop-daemon --stop --quiet --exec /usr/bin/valkey-server
+
+        # Since busybox implementation ignores --retry arguments repeatedly check
+        # if the process is still running and try another signal after a timeout,
+        # efectively simulating a stop with --retry=TERM/5/KILL/5 schedule.
+        waitAfterTerm=5000000 # us / 5000 ms / 5 s
+        waitAfterKill=5000000 # us / 5000 ms / 5 s
+        waitStep=100000 # us / 100 ms / 0.1 s
+        waited=0
+        start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+        processOff=$?
+        while [ $processOff -eq 0 ] && [ $waited -le $waitAfterTerm ] ; do
+            usleep ${waitStep}
+            ((waited+=${waitStep}))
+            start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+            processOff=$?
+        done
+        if [ $processOff -eq 0 ] ; then
+            start-stop-daemon --stop --signal KILL --exec /usr/bin/valkey-server
+            start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+            processOff=$?
+        fi
+        waited=0
+        while [ $processOff -eq 0 ] && [ $waited -le $waitAfterKill ] ; do
+            usleep ${waitStep}
+            ((waited+=${waitStep}))
+            start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+            processOff=$?
+        done
+        # Here $processOff will indicate if waiting and retrying according to
+        # the schedule ended in a successfull stop or not.
+
+        echo "Starting valkey-server..."
+        start-stop-daemon --start --quiet --exec /usr/bin/valkey-server -- $ARGS
+        ;;
+    *)
+        echo "Usage: /etc/init.d/valkey-server {start|stop|restart}"
+        exit 1
+        ;;
+esac
+
+exit 0
+
diff --git a/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch
new file mode 100644
index 0000000000..b91684afd6
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch
@@ -0,0 +1,82 @@
+From 60487572d23cb374f8eb6b6560c385ecf6ad417e Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Fri, 8 Feb 2013 20:22:19 -0600
+Subject: [PATCH] lua: update Makefile to use environment build settings
+
+OE-specific parameters, instead of overriding all of these simply use
+the ones that are already passed in. Also configure for only Linux...
+
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+
+Updated to work with 3.0.x
+
+Signed-off-by: Armin Kuster <akust808@gmail.com>
+
+updated to work wtih 6.2.1
+Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+
+Updated to work with 8.1.x
+Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
+
+Upstream-Status: Inappropriate [OE-specific]
+
+---
+ deps/Makefile         |  1 -
+ deps/lua/Makefile     |  1 -
+ deps/lua/src/Makefile | 16 ++++++----------
+ 3 files changed, 6 insertions(+), 12 deletions(-)
+
+diff --git a/deps/Makefile b/deps/Makefile
+index 72389def9..5d3ade528 100644
+--- a/deps/Makefile
++++ b/deps/Makefile
+@@ -95,7 +95,6 @@ endif
+ # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
+ # challenging to cross-compile lua (and redis).  These defines make it easier
+ # to fit redis into cross-compilation environments, which typically set AR.
+-AR=ar
+ ARFLAGS=rc
+ 
+ lua: .make-prerequisites
+diff --git a/deps/lua/Makefile b/deps/lua/Makefile
+index 209a13244..72f4b2bf2 100644
+--- a/deps/lua/Makefile
++++ b/deps/lua/Makefile
+@@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644
+ 
+ # Utilities.
+ MKDIR= mkdir -p
+-RANLIB= ranlib
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile
+index f3bba2f81..1555ec028 100644
+--- a/deps/lua/src/Makefile
++++ b/deps/lua/src/Makefile
+@@ -5,18 +5,14 @@
+ # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
+ 
+ # Your platform. See PLATS for possible values.
+-PLAT= none
++PLAT= linux
+ 
+-CC?= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
+-AR= ar rcu
+-RANLIB= ranlib
+-RM= rm -f
+-LIBS= -lm $(MYLIBS)
+-
+-MYCFLAGS=
++MYCFLAGS=-DLUA_USE_LINUX
+ MYLDFLAGS=
+-MYLIBS=
++MYLIBS=-Wl,-E -ldl -lreadline -lhistory -lncurses
++
++CFLAGS += $(MYCFLAGS)
++LIBS += -lm $(MYLIBS)
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
diff --git a/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch
new file mode 100644
index 0000000000..a711830e41
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch
@@ -0,0 +1,42 @@
+From 87bbb65c3c5fb7d248871d9c3bcbd3d27c781449 Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Wed, 6 Feb 2013 20:51:02 -0600
+Subject: [PATCH] hack to force use of libc malloc
+
+Hack to force libc usage as it seems the option to pass it in has been
+removed in favor of magic.
+
+Note that this of course doesn't allow tcmalloc and jemalloc, however
+jemalloc wasn't building correctly.
+
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+
+Update to work with 4.0.8
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+
+Update to work with 8.0.0
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+
+Update to work with 8.1.0
+Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
+
+Upstream-Status: Inappropriate [Embedded specific]
+
+---
+ src/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 1437f41bd..5919f01e9 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,7 +13,8 @@
+ # Just use 'make dep', but this is only needed by developers.
+ 
+ release_hdr := $(shell sh -c './mkreleasehdr.sh')
+-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
++# use fake uname option to force use of generic libc
++uname_S := "USE_LIBC_MALLOC"
+ uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
+ CLANG := $(findstring clang,$(shell sh -c '$(CC) --version | head -1'))
+ 
diff --git a/meta-oe/recipes-extended/valkey/valkey/valkey.conf b/meta-oe/recipes-extended/valkey/valkey/valkey.conf
new file mode 100644
index 0000000000..5efff8fd4c
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/valkey.conf
@@ -0,0 +1,1314 @@
+# Redis configuration file example.
+#
+# Note that in order to read the configuration file, Redis must be
+# started with the file path as first argument:
+#
+# ./valkey-server /path/to/valkey.conf
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## MODULES #####################################
+
+# Load modules at startup. If the server is not able to load modules
+# it will abort. It is possible to use multiple loadmodule directives.
+#
+# loadmodule /path/to/my_module.so
+# loadmodule /path/to/other_module.so
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 6379
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+# unixsocket /tmp/valkey.sock
+# unixsocketperm 700
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 300
+
+################################# GENERAL #####################################
+
+# OE: run as a daemon.
+daemonize yes
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/valkey.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+
+# When running daemonized, Redis writes a pid file in /var/run/valkey.pid by
+# default. You can specify a custom pid file location here.
+pidfile /var/run/valkey.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile ""
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+syslog-enabled yes
+
+# Specify the syslog identity.
+syslog-ident valkey
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+# By default Redis shows an ASCII art logo only when started to log to the
+# standard output and if the standard output is a TTY. Basically this means
+# that normally a logo is displayed only in interactive sessions.
+#
+# However it is possible to force the pre-4.0 behavior and always show a
+# ASCII art logo in startup logs by setting the following option to yes.
+always-show-logo yes
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+#save 900 1
+#save 300 10
+#save 60 10000
+
+# OE: tune for a small embedded system with a limited # of keys.
+save 120 1
+save 60 100
+save 30 1000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+dbfilename dump.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir /var/lib/valkey/
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only yes
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# Note that slaves never free the backlog for timeout, since they may be
+# promoted to masters later, and should be able to correctly "partially
+# resynchronize" with the slaves: hence they should always accumulate backlog.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+# A Redis master is able to list the address and port of the attached
+# slaves in different ways. For example the "INFO replication" section
+# offers this information, which is used, among other tools, by
+# Redis Sentinel in order to discover slave instances.
+# Another place where this info is available is in the output of the
+# "ROLE" command of a master.
+#
+# The listed IP and address normally reported by a slave is obtained
+# in the following way:
+#
+#   IP: The address is auto detected by checking the peer address
+#   of the socket used by the slave to connect with the master.
+#
+#   Port: The port is communicated by the slave during the replication
+#   handshake, and is normally the port that the slave is using to
+#   list for connections.
+#
+# However when port forwarding or Network Address Translation (NAT) is
+# used, the slave may be actually reachable via different IP and port
+# pairs. The following two options can be used by a slave in order to
+# report to its master a specific set of IP and port, so that both INFO
+# and ROLE will report those values.
+#
+# There is no need to use both the options if you need to override just
+# the port or the IP address.
+#
+# slave-announce-ip 5.5.5.5
+# slave-announce-port 1234
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running valkey-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### CLIENTS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+############################## MEMORY MANAGEMENT ################################
+
+# Set a memory usage limit to the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU or LFU cache, or to
+# set a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> Evict using approximated LRU among the keys with an expire set.
+# allkeys-lru -> Evict any key using approximated LRU.
+# volatile-lfu -> Evict using approximated LFU among the keys with an expire set.
+# allkeys-lfu -> Evict any key using approximated LFU.
+# volatile-random -> Remove a random key among the ones with an expire set.
+# allkeys-random -> Remove a random key, any key.
+# volatile-ttl -> Remove the key with the nearest expire time (minor TTL)
+# noeviction -> Don't evict anything, just return an error on write operations.
+#
+# LRU means Least Recently Used
+# LFU means Least Frequently Used
+#
+# Both LRU, LFU and volatile-ttl are implemented using approximated
+# randomized algorithms.
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU, LFU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs more CPU. 3 is faster but not very accurate.
+#
+# maxmemory-samples 5
+
+############################# LAZY FREEING ####################################
+
+# Redis has two primitives to delete keys. One is called DEL and is a blocking
+# deletion of the object. It means that the server stops processing new commands
+# in order to reclaim all the memory associated with an object in a synchronous
+# way. If the key deleted is associated with a small object, the time needed
+# in order to execute the DEL command is very small and comparable to most other
+# O(1) or O(log_N) commands in Redis. However if the key is associated with an
+# aggregated value containing millions of elements, the server can block for
+# a long time (even seconds) in order to complete the operation.
+#
+# For the above reasons Redis also offers non blocking deletion primitives
+# such as UNLINK (non blocking DEL) and the ASYNC option of FLUSHALL and
+# FLUSHDB commands, in order to reclaim memory in background. Those commands
+# are executed in constant time. Another thread will incrementally free the
+# object in the background as fast as possible.
+#
+# DEL, UNLINK and ASYNC option of FLUSHALL and FLUSHDB are user-controlled.
+# It's up to the design of the application to understand when it is a good
+# idea to use one or the other. However the Redis server sometimes has to
+# delete keys or flush the whole database as a side effect of other operations.
+# Specifically Redis deletes objects independently of a user call in the
+# following scenarios:
+#
+# 1) On eviction, because of the maxmemory and maxmemory policy configurations,
+#    in order to make room for new data, without going over the specified
+#    memory limit.
+# 2) Because of expire: when a key with an associated time to live (see the
+#    EXPIRE command) must be deleted from memory.
+# 3) Because of a side effect of a command that stores data on a key that may
+#    already exist. For example the RENAME command may delete the old key
+#    content when it is replaced with another one. Similarly SUNIONSTORE
+#    or SORT with STORE option may delete existing keys. The SET command
+#    itself removes any old content of the specified key in order to replace
+#    it with the specified string.
+# 4) During replication, when a slave performs a full resynchronization with
+#    its master, the content of the whole database is removed in order to
+#    load the RDB file just transfered.
+#
+# In all the above cases the default is to delete objects in a blocking way,
+# like if DEL was called. However you can configure each case specifically
+# in order to instead release memory in a non-blocking way like if UNLINK
+# was called, using the following configuration directives:
+
+lazyfree-lazy-eviction no
+lazyfree-lazy-expire no
+lazyfree-lazy-server-del no
+slave-lazy-flush no
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://valkey.io/topics/persistence for more information.
+
+# OE: changed default to enable this
+appendonly yes
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/valkey-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+appendfsync everysec
+# appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "valkey-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+# When rewriting the AOF file, Redis is able to use an RDB preamble in the
+# AOF file for faster rewrites and recoveries. When this option is turned
+# on the rewritten AOF file is composed of two different stanzas:
+#
+#   [RDB file][AOF tail]
+#
+# When loading Redis recognizes that the AOF file starts with the "REDIS"
+# string and loads the prefixed RDB file, and continues loading the AOF
+# tail.
+#
+# This is currently turned off by default in order to avoid the surprise
+# of a format change, but will at some point be used as the default.
+aof-use-rdb-preamble no
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+# cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+# cluster-config-file nodes-6379.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have an exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://valkey.io web site.
+
+########################## CLUSTER DOCKER/NAT support  ########################
+
+# In certain deployments, Redis Cluster nodes address discovery fails, because
+# addresses are NAT-ted or because ports are forwarded (the typical case is
+# Docker and other containers).
+#
+# In order to make Redis Cluster working in such environments, a static
+# configuration where each node knows its public address is needed. The
+# following two options are used for this scope, and are:
+#
+# * cluster-announce-ip
+# * cluster-announce-port
+# * cluster-announce-bus-port
+#
+# Each instruct the node about its address, client port, and cluster message
+# bus port. The information is then published in the header of the bus packets
+# so that other nodes will be able to correctly map the address of the node
+# publishing the information.
+#
+# If the above options are not used, the normal Redis Cluster auto-detection
+# will be used instead.
+#
+# Note that when remapped, the bus port may not be at the fixed offset of
+# clients port + 10000, so you can specify any port and bus-port depending
+# on how they get remapped. If the bus-port is not set, a fixed offset of
+# 10000 will be used as usually.
+#
+# Example:
+#
+# cluster-announce-ip 10.1.1.5
+# cluster-announce-port 6379
+# cluster-announce-bus-port 6380
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://valkey.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  of zero or multiple characters. The empty string means that notifications
+#  are disabled.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Client query buffers accumulate new commands. They are limited to a fixed
+# amount by default in order to avoid that a protocol desynchronization (for
+# instance due to a bug in the client) will lead to unbound memory usage in
+# the query buffer. However you can configure it here if you have very special
+# needs, such us huge multi/exec requests or alike.
+#
+# client-query-buffer-limit 1gb
+
+# In the Redis protocol, bulk requests, that are, elements representing single
+# strings, are normally limited ot 512 mb. However you can change this limit
+# here.
+#
+# proto-max-bulk-len 512mb
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
+
+# Redis LFU eviction (see maxmemory setting) can be tuned. However it is a good
+# idea to start with the default settings and only change them after investigating
+# how to improve the performances and how the keys LFU change over time, which
+# is possible to inspect via the OBJECT FREQ command.
+#
+# There are two tunable parameters in the Redis LFU implementation: the
+# counter logarithm factor and the counter decay time. It is important to
+# understand what the two parameters mean before changing them.
+#
+# The LFU counter is just 8 bits per key, it's maximum value is 255, so Redis
+# uses a probabilistic increment with logarithmic behavior. Given the value
+# of the old counter, when a key is accessed, the counter is incremented in
+# this way:
+#
+# 1. A random number R between 0 and 1 is extracted.
+# 2. A probability P is calculated as 1/(old_value*lfu_log_factor+1).
+# 3. The counter is incremented only if R < P.
+#
+# The default lfu-log-factor is 10. This is a table of how the frequency
+# counter changes with a different number of accesses with different
+# logarithmic factors:
+#
+# +--------+------------+------------+------------+------------+------------+
+# | factor | 100 hits   | 1000 hits  | 100K hits  | 1M hits    | 10M hits   |
+# +--------+------------+------------+------------+------------+------------+
+# | 0      | 104        | 255        | 255        | 255        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+# | 1      | 18         | 49         | 255        | 255        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+# | 10     | 10         | 18         | 142        | 255        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+# | 100    | 8          | 11         | 49         | 143        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+#
+# NOTE: The above table was obtained by running the following commands:
+#
+#   valkey-benchmark -n 1000000 incr foo
+#   valkey-cli object freq foo
+#
+# NOTE 2: The counter initial value is 5 in order to give new objects a chance
+# to accumulate hits.
+#
+# The counter decay time is the time, in minutes, that must elapse in order
+# for the key counter to be divided by two (or decremented if it has a value
+# less <= 10).
+#
+# The default value for the lfu-decay-time is 1. A Special value of 0 means to
+# decay the counter every time it happens to be scanned.
+#
+# lfu-log-factor 10
+# lfu-decay-time 1
+
+########################### ACTIVE DEFRAGMENTATION #######################
+#
+# WARNING THIS FEATURE IS EXPERIMENTAL. However it was stress tested
+# even in production and manually tested by multiple engineers for some
+# time.
+#
+# What is active defragmentation?
+# -------------------------------
+#
+# Active (online) defragmentation allows a Redis server to compact the
+# spaces left between small allocations and deallocations of data in memory,
+# thus allowing to reclaim back memory.
+#
+# Fragmentation is a natural process that happens with every allocator (but
+# less so with Jemalloc, fortunately) and certain workloads. Normally a server
+# restart is needed in order to lower the fragmentation, or at least to flush
+# away all the data and create it again. However thanks to this feature
+# implemented by Oran Agra for Redis 4.0 this process can happen at runtime
+# in an "hot" way, while the server is running.
+#
+# Basically when the fragmentation is over a certain level (see the
+# configuration options below) Redis will start to create new copies of the
+# values in contiguous memory regions by exploiting certain specific Jemalloc
+# features (in order to understand if an allocation is causing fragmentation
+# and to allocate it in a better place), and at the same time, will release the
+# old copies of the data. This process, repeated incrementally for all the keys
+# will cause the fragmentation to drop back to normal values.
+#
+# Important things to understand:
+#
+# 1. This feature is disabled by default, and only works if you compiled Redis
+#    to use the copy of Jemalloc we ship with the source code of Redis.
+#    This is the default with Linux builds.
+#
+# 2. You never need to enable this feature if you don't have fragmentation
+#    issues.
+#
+# 3. Once you experience fragmentation, you can enable this feature when
+#    needed with the command "CONFIG SET activedefrag yes".
+#
+# The configuration parameters are able to fine tune the behavior of the
+# defragmentation process. If you are not sure about what they mean it is
+# a good idea to leave the defaults untouched.
+
+# Enabled active defragmentation
+# activedefrag yes
+
+# Minimum amount of fragmentation waste to start active defrag
+# active-defrag-ignore-bytes 100mb
+
+# Minimum percentage of fragmentation to start active defrag
+# active-defrag-threshold-lower 10
+
+# Maximum percentage of fragmentation at which we use maximum effort
+# active-defrag-threshold-upper 100
+
+# Minimal effort for defrag in CPU percentage
+# active-defrag-cycle-min 25
+
+# Maximal effort for defrag in CPU percentage
+# active-defrag-cycle-max 75
diff --git a/meta-oe/recipes-extended/valkey/valkey/valkey.service b/meta-oe/recipes-extended/valkey/valkey/valkey.service
new file mode 100644
index 0000000000..5c6aa5b17c
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/valkey.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Valkey: an open source, in-memory data store
+After=network.target
+
+[Service]
+User=valkey
+Group=valkey
+ExecStart=/usr/bin/valkey-server /etc/valkey/valkey.conf
+ExecStop=/usr/bin/valkey-cli shutdown
+Restart=always
+LimitNOFILE=10032
+StateDirectory=valkey
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb b/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb
new file mode 100644
index 0000000000..35b3d3c4a7
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb
@@ -0,0 +1,76 @@
+SUMMARY = "Valkey key-value store"
+DESCRIPTION = "A flexible distributed key-value datastore that supports both caching and beyond caching workloads."
+HOMEPAGE = "http://valkey.io"
+SECTION = "libs"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=08b9159809d809e8aaa340a8387e693e"
+DEPENDS = "readline lua ncurses"
+
+SRC_URI = " \
+        git://github.com/valkey-io/valkey.git;branch=8.1;protocol=https \
+        file://valkey.conf \
+        file://init-valkey-server \
+        file://valkey.service \
+        file://hiredis-use-default-CC-if-it-is-set.patch \
+        file://lua-update-Makefile-to-use-environment-build-setting.patch \
+        file://oe-use-libc-malloc.patch \
+        file://0001-src-Do-not-reset-FINAL_LIBS.patch \
+        file://GNU_SOURCE-7.patch \
+"
+SRCREV = "fcd8bc3ee40f5d7841b7d5a8f3cd12252fec14e4"
+
+
+RPROVIDES:${PN} = "virtual-redis"
+
+inherit pkgconfig update-rc.d systemd useradd
+
+FINAL_LIBS:x86:toolchain-clang = "-latomic"
+FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
+FINAL_LIBS:mips = "-latomic"
+FINAL_LIBS:arm = "-latomic"
+FINAL_LIBS:powerpc = "-latomic"
+
+export FINAL_LIBS
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN}  = "--system --home-dir /var/lib/valkey -g valkey --shell /bin/false valkey"
+GROUPADD_PARAM:${PN} = "--system valkey"
+
+PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
+
+EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
+
+do_compile() {
+    oe_runmake -C deps hiredis lua linenoise
+    oe_runmake
+}
+
+do_install() {
+    export PREFIX=${D}/${prefix}
+    oe_runmake install
+    install -d ${D}/${sysconfdir}/valkey
+    install -m 0644 ${UNPACKDIR}/valkey.conf ${D}/${sysconfdir}/valkey/valkey.conf
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${UNPACKDIR}/init-valkey-server ${D}/${sysconfdir}/init.d/valkey-server
+    install -d ${D}/var/lib/valkey/
+    chown valkey.valkey ${D}/var/lib/valkey/
+
+    install -d ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/valkey.service ${D}${systemd_system_unitdir}
+    sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/valkey.service
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/valkey/valkey.conf
+        sed -i 's!supervised no!supervised systemd!' ${D}/${sysconfdir}/valkey/valkey.conf
+    fi
+}
+
+CONFFILES:${PN} = "${sysconfdir}/valkey/valkey.conf"
+
+INITSCRIPT_NAME = "valkey-server"
+INITSCRIPT_PARAMS = "defaults 87"
+
+SYSTEMD_SERVICE:${PN} = "valkey.service"
+
+CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows."
diff --git a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
index 1a75922277..8f9f87b370 100644
--- a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
+++ b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
@@ -9,14 +9,13 @@ SECTION = "utils"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
 
-SRC_URI = "${GENTOO_MIRROR}/${BP}.tar.gz \
+SRC_URI = "${GENTOO_MIRROR}/37/${BP}.tar.gz \
        file://disable_vlockrc.patch \
        file://vlock_pam_tally2_reset.patch \
        file://vlock-no_tally.patch \
        file://vlock_pam \
        "
 
-SRC_URI[md5sum] = "378175c7692a8f288e65fd4dbf8a38eb"
 SRC_URI[sha256sum] = "85aa5aed1ae49351378a0bd527a013078f0f969372a63164b1944174ae1a5e39"
 
 inherit autotools-brokensep update-alternatives
diff --git a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
index cc03ab4fea..01215a4b25 100644
--- a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
+++ b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
@@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "https://releases.pagure.org/volume_key/volume_key-${PV}.tar.xz \
 "
-SRC_URI[md5sum] = "200591290173c3ea71528411838f9080"
 SRC_URI[sha256sum] = "6ca3748fc1dad22c450bbf6601d4e706cb11c5e662d11bb4aeb473a9cd77309b"
 
 SRCNAME = "volume_key"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
 inherit autotools python3native python3targetconfig gettext pkgconfig
 
diff --git a/meta-oe/recipes-extended/wipe/wipe_0.24.bb b/meta-oe/recipes-extended/wipe/wipe_0.24.bb
index ad32cb0e72..ba3ed29d59 100644
--- a/meta-oe/recipes-extended/wipe/wipe_0.24.bb
+++ b/meta-oe/recipes-extended/wipe/wipe_0.24.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/berke/wipe.git;branch=master;protocol=https \
 "
 SRCREV = "796b62293e007546e051619bd03f5ba338ef28e5"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "linux"
 
diff --git a/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
index 785ae50e9e..b901e8815a 100644
--- a/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
+++ b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
@@ -10,7 +10,6 @@ SRCREV = "493e9704dbc50f141d5fbd41c823311e79d7e8d3"
 SRC_URI = "git://github.com/thkukuk/wtmpdb.git;branch=main;protocol=https \
            file://0001-include-libgen.h-for-basename.patch"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig systemd features_check
 
@@ -19,7 +18,7 @@ REQUIRED_DISTRO_FEATURES = "pam"
 
 SYSTEMD_SERVICE:${PN} = "wtmpdb-update-boot.service wtmpdb-rotate.service"
 
-EXTRA_OEMESON = " -Dpamlibdir=${libdir}"
+EXTRA_OEMESON = " -Dpamlibdir=${base_libdir}/security"
 
 do_install:append () {
       if [ -d ${D}${prefix}/lib/systemd -a ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then
@@ -33,3 +32,4 @@ do_install:append () {
 FILES:${PN} += " ${systemd_system_unitdir} "
 FILES:${PN} += " ${libdir} "
 FILES:${PN} += " ${nonarch_libdir}/tmpfiles.d/* "
+FILES:${PN} += " ${base_libdir}/security/*.so "
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch
deleted file mode 100644
index 52f4449339..0000000000
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 72c3b7324f00047e6dc5d8380ed2f6ff2494a6f9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 18 Dec 2022 14:51:34 -0800
-Subject: [PATCH] locale: Avoid using glibc specific defines on musl
-
-musl does not provide some glibc-only enum members e.g. _NL_ADDRESS_LANG_NAME
-
-Upstream-Status: Submitted [https://github.com/wxWidgets/wxWidgets/pull/23050]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/unix/uilocale.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/unix/uilocale.cpp b/src/unix/uilocale.cpp
-index 57773e17f5..86816ba896 100644
---- a/src/unix/uilocale.cpp
-+++ b/src/unix/uilocale.cpp
-@@ -619,7 +619,7 @@ wxString
- wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const
- {
-     wxString str;
--#if defined(HAVE_LANGINFO_H) && defined(__LINUX__)
-+#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) && defined(__GLIBC__)
-     switch (name)
-     {
-         case wxLOCALE_NAME_LOCALE:
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
index b3b9e79c53..a3b8d0c0ee 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
@@ -1,4 +1,4 @@
-From a071243763f4b06fc7e71f541c49cecf380b6f27 Mon Sep 17 00:00:00 2001
+From 8f582c0ea40ccdb2d439b7614459d752f3606e15 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 11 Oct 2020 22:16:55 +0200
 Subject: [PATCH] wx-config.in: Disable cross magic - it does not work for us
@@ -18,10 +18,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/wx-config.in b/wx-config.in
-index d132e3182f..d0d162e8a3 100755
+index 4df8571d28..1173d89685 100755
 --- a/wx-config.in
 +++ b/wx-config.in
-@@ -396,7 +396,7 @@ get_mask()
+@@ -394,7 +394,7 @@ get_mask()
  }
  
  # Returns true if this script is for a cross compiled config.
@@ -31,5 +31,5 @@ index d132e3182f..d0d162e8a3 100755
  
  # Determine the base directories we require.
 -- 
-2.26.2
+2.25.1
 
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
index ea204ed3b1..b599f38871 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
@@ -1,12 +1,18 @@
-wxWidgets hardcodes libdir with 'lib' and does not support multilib which will
-change it. Respect variable wxPLATFORM_LIB_DIR to support libdir be configurable.
+From 9487fe5cd271a4bee96ab590509ef38f6972887a Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] fix libdir for multilib
+
+wxWidgets hardcodes libdir with 'lib' and does not support multilib
+which will change it. Respect variable wxPLATFORM_LIB_DIR to support
+libdir be configurable.
 
 Upstream-Status: Pending
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 
-Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX in this
-patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass.
+Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX
+in this patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass.
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
@@ -17,36 +23,36 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
  4 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a49ecd3883..d469471f38 100644
+index f6ae7f6210..2a13e448db 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -45,7 +45,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE)
  # Initialize variables for quick access to wx root dir in sub dirs
  set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
- set(wxBINARY_DIR ${CMAKE_BINARY_DIR})
+ set(wxBINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 -set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib)
 +set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib${LIB_SUFFIX})
  
  # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION
  file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS)
 diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
-index b359560bc0..c59ea60923 100644
+index addd8d6b81..9ec677534b 100644
 --- a/build/cmake/config.cmake
 +++ b/build/cmake/config.cmake
-@@ -76,7 +76,7 @@ function(wx_write_config_inplace)
+@@ -100,7 +100,7 @@ function(wx_write_config_inplace)
      execute_process(
          COMMAND
          "${CMAKE_COMMAND}" -E ${COPY_CMD}
--        "${CMAKE_CURRENT_BINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
-+        "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
-         "${CMAKE_CURRENT_BINARY_DIR}/wx-config"
+-        "${wxBINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
++        "${wxBINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
+         "${wxBINARY_DIR}/wx-config"
          )
  endfunction()
 diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
-index 7182364e5e..55fbebc7ee 100644
+index 72a34f0b4f..81ede7d8ae 100644
 --- a/build/cmake/functions.cmake
 +++ b/build/cmake/functions.cmake
-@@ -435,8 +435,8 @@ macro(wx_add_library name)
+@@ -462,8 +462,8 @@ macro(wx_add_library name)
          endif()
          wx_install(TARGETS ${name}
              EXPORT wxWidgetsTargets
@@ -105,3 +111,6 @@ index 384c6837b8..d3303faabb 100644
  )
  
  # uninstall target
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
index 6eef0b6790..dbede0304f 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
@@ -1,18 +1,23 @@
+From b86806ef34d4c9171165c1533064bf34ad822e20 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] create links with relative path
+
 It fails to build python3-wxgtk4 which depends on wxwidgets:
 
 | ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an
     absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux
-        /wxwidgets-native/3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work
-        /x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wx-config
+    /wxwidgets-native/3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work
+    /x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wx-config
     pointing at /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native/3.2.1-r0
-        /recipe-sysroot-native/usr/lib/wx/config/gtk3-unicode-3.2.
+    /recipe-sysroot-native/usr/lib/wx/config/gtk3-unicode-3.2.
   Please replace this with a relative link.
 | ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an
     absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
-        /3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
-        /3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc pointing at /path/to/build/tmp-glibc
-        /work/x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc-3.2.
-  Please replace this with a relative link.
+    /3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
+    /3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc pointing at /path/to/build/tmp-glibc
+    /work/x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc-3.2.
+   Please replace this with a relative link.
 
 Create symlink with relative path to fix the issues.
 
@@ -50,3 +55,6 @@ index dbed8cc9b3..1dbc3261d3 100644
              \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
              )"
          )
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch
index 6329256b0c..e3463ba170 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch
@@ -1,3 +1,8 @@
+From 5e9725c1151e2b029066d61ef5dccf1f3e6cb323 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] don not append system name to lib name
+
 It appends system name to library names for cross compile. For example, the
 library name is libwx_baseu-3.1-Linux.so rather than libwx_baseu-3.1.so. It is
 not appropriate for oe.
@@ -14,10 +19,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
-index e374d9a273..c6b1908bd6 100644
+index 81ede7d8ae..23eebeb914 100644
 --- a/build/cmake/functions.cmake
 +++ b/build/cmake/functions.cmake
-@@ -219,9 +219,9 @@ function(wx_set_target_properties target_name)
+@@ -243,9 +243,9 @@ function(wx_set_target_properties target_name)
      endif()
  
      set(cross_target)
@@ -30,3 +35,6 @@ index e374d9a273..c6b1908bd6 100644
  
      set(lib_prefix "lib")
      if(MSVC OR (WIN32 AND wxBUILD_SHARED))
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch
index 628f8dee56..b650c50386 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch
@@ -1,8 +1,14 @@
-It sets 'libdir' with path element 'lib' directly which is not suitable for
-multilib. Add an option '--baselib' for wx-config to support multilib when
-cross compile. And set default value of baselib with "lib${wxPLATFORM_LIB_DIR}".
+From 4230cd84f156f9eb5c9b80ffbc69dd55fa7c7ca7 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] wx-config: fix libdir for multilib
 
-Upstream-Status: Pending [oe specific]
+It sets 'libdir' with path element 'lib' directly which is not suitable
+for multilib. Add an option '--baselib' for wx-config to support
+multilib when cross compile. And set default value of baselib with
+"lib${wxPLATFORM_LIB_DIR}".
+
+Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 
@@ -15,10 +21,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
-index 52ae69d3f6..28aa733eb0 100644
+index 9ec677534b..ee61cf7572 100644
 --- a/build/cmake/config.cmake
 +++ b/build/cmake/config.cmake
-@@ -86,7 +86,7 @@ function(wx_write_config)
+@@ -110,7 +110,7 @@ function(wx_write_config)
      set(prefix ${CMAKE_INSTALL_PREFIX})
      set(exec_prefix "\${prefix}")
      set(includedir "\${prefix}/include")
@@ -26,9 +32,9 @@ index 52ae69d3f6..28aa733eb0 100644
 +    set(libdir "\${exec_prefix}/\${baselib}")
      set(bindir "\${exec_prefix}/bin")
  
-     find_program(EGREP egrep)
+     if(wxBUILD_MONOLITHIC)
 diff --git a/wx-config.in b/wx-config.in
-index e3f7d115bb..0e78af03c7 100755
+index 1173d89685..8364a33e9d 100755
 --- a/wx-config.in
 +++ b/wx-config.in
 @@ -42,7 +42,8 @@ usage()
@@ -41,7 +47,7 @@ index e3f7d115bb..0e78af03c7 100755
             [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
             [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]]
             [--debug[=yes|no]] [--version[=VERSION]] [--flavour=FLAVOUR]
-@@ -137,7 +138,7 @@ wxconfig_output_options="prefix exec_prefix
+@@ -133,7 +134,7 @@ wxconfig_output_options="prefix exec_prefix
  
  # Options that permit the user to supply hints that may affect the output.
  # These options all accept arbitrary values, to interpret as they please.
@@ -50,7 +56,7 @@ index e3f7d115bb..0e78af03c7 100755
  
  # Input options that accept only a yes or no argument.
  #
-@@ -404,6 +405,7 @@ is_cross()  { [ "x@cross_compiling@" = "xyes" ]; }
+@@ -400,6 +401,7 @@ is_cross()  { [ "xno" = "xyes" ]; }
  # Determine the base directories we require.
  prefix=${input_option_prefix-${this_prefix:-@prefix@}}
  exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}}
@@ -58,3 +64,6 @@ index e3f7d115bb..0e78af03c7 100755
  wxconfdir="@libdir@/wx/config"
  
  installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"`
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch
index e4ca6579f8..37d61dcb3f 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch
@@ -1,8 +1,19 @@
-Upstream-Status: Pending
+From 64d5d7f68cde208c6f8a5e0b71da93f98e4720f7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 12 Oct 2024 20:30:16 +0800
+Subject: [PATCH] Fix locale on musl
 
 these macro'd away functions don't exist in musl (yet)
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/wx/xlocale.h | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
 diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
-index c433d25..3ab9d84 100644
+index c433d25d05..794cf0b66b 100644
 --- a/include/wx/xlocale.h
 +++ b/include/wx/xlocale.h
 @@ -33,6 +33,26 @@
@@ -32,3 +43,6 @@ index c433d25..3ab9d84 100644
  // The platform-specific locale type
  // If wxXLocale_t is not defined, then only "C" locale support is provided
  #ifdef wxHAS_XLOCALE_SUPPORT
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
index 5160f2e1fe..ef94e3551b 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
@@ -1,4 +1,4 @@
-From e108aff9d6dae613f486c1b1681f4a3cdf17b845 Mon Sep 17 00:00:00 2001
+From 22f70d5bd039b20bfdad522341412ca001c639db Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 19 Dec 2022 15:07:55 -0800
 Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly
@@ -6,16 +6,17 @@ Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly
 nothing sets this to 0, but for some reason it gets undef'd
 
 Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  build/cmake/setup.h.in | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in
-index bce33a73f3..22afb4cfa0 100644
+index fcc282980d..767adbf658 100644
 --- a/build/cmake/setup.h.in
 +++ b/build/cmake/setup.h.in
-@@ -869,8 +869,7 @@
+@@ -867,8 +867,7 @@
  /*
   * Define if large (64 bit file offsets) files are supported.
   */
@@ -26,5 +27,5 @@ index bce33a73f3..22afb4cfa0 100644
   * Use OpenGL
   */
 -- 
-2.39.0
+2.25.1
 
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb
index 91653e2852..2cd154cab6 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb
@@ -20,16 +20,16 @@ DEPENDS += " \
 
 SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \
            file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \
-           file://fix-libdir-for-multilib.patch \
-           file://create-links-with-relative-path.patch \
-           file://not-append-system-name-to-lib-name.patch \
-           file://wx-config-fix-libdir-for-multilib.patch \
-           file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \
-           file://musl-locale-l.patch \
-           file://0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
+           file://0002-fix-libdir-for-multilib.patch \
+           file://0003-create-links-with-relative-path.patch \
+           file://0004-don-not-append-system-name-to-lib-name.patch \
+           file://0005-wx-config-fix-libdir-for-multilib.patch \
+           file://0006-Fix-locale-on-musl.patch \
+           file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
            "
-SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496"
-S = "${WORKDIR}/git"
+SRCREV = "5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a"
+
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 # These can be either 'builtin' or 'sys' and builtin means cloned soures are
 # build. So these cannot be PACKAGECONFIGs and let's use libs where we can (see
@@ -73,7 +73,7 @@ PACKAGECONFIG[libsecret] = "-DwxUSE_SECRETSTORE=ON,-DwxUSE_SECRETSTORE=OFF,libse
 PACKAGECONFIG[lzma] = "-DwxUSE_LIBLZMA=ON,-DwxUSE_LIBLZMA=OFF,xz"
 PACKAGECONFIG[mspack] = "-DwxUSE_LIBMSPACK=ON,-DwxUSE_LIBMSPACK=OFF,libmspack"
 PACKAGECONFIG[opengl] = "-DwxUSE_OPENGL=ON,-DwxUSE_OPENGL=OFF,libglu"
-PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,libsdl2"
+PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,virtual/libsdl2"
 PACKAGECONFIG[webkit] = "-DwxUSE_WEBVIEW_WEBKIT=ON,-DwxUSE_WEBVIEW_WEBKIT=OFF,webkitgtk3,,,no_gui"
 PACKAGECONFIG[curl] = "-DwxUSE_WEBREQUEST_CURL=ON,-DwxUSE_WEBREQUEST_CURL=OFF,curl"
 
diff --git a/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb b/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
index b75802f09f..f450c2cf01 100644
--- a/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
+++ b/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SRCREV = "dc2c284664757fce6ef8f96f8b3ab667a53ef489"
 SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-extended/zram/zram_0.2.bb b/meta-oe/recipes-extended/zram/zram_0.2.bb
index 89292118d0..2c894c0230 100644
--- a/meta-oe/recipes-extended/zram/zram_0.2.bb
+++ b/meta-oe/recipes-extended/zram/zram_0.2.bb
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit update-rc.d systemd
 
-RDEPENDS:${PN} = "kmod \
-    ${@bb.utils.contains('DISTRO_FEATURES','systemd','util-linux','util-linux-swaponoff',d)}"
+RDEPENDS:${PN} = "kmod util-linux-swaponoff \
+    ${@bb.utils.contains('DISTRO_FEATURES','systemd','util-linux-zramctl','',d)}"
 RRECOMMENDS:${PN} = "kernel-module-zram"
 
 
@@ -17,8 +17,7 @@ SRC_URI = " \
            file://dev-zram0.swap \
 "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install () {
     # Install systemd related configuration file
diff --git a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
index 1bc4010f8a..5227b834f9 100644
--- a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
+++ b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
@@ -12,9 +12,17 @@ SRCREV = "00141c2806ccc4ddf2ff6263ee1612d19c0b713f"
 
 PV = "0.6.2+git"
 
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 inherit autotools
 
-S = "${WORKDIR}/git"
 AUTOTOOLS_SCRIPT_PATH = "${S}/src"
 
 BBCLASSEXTEND = "native nativesdk"
+
+# http://errors.yoctoproject.org/Errors/Details/766891/
+# git/src/libzsync/zsync.c:445:18: error: returning 'char **' from a function with incompatible return type 'const char * const*' [-Wincompatible-pointer-types]
+# git/src/libzsync/zsync.c:450:18: error: returning 'char **' from a function with incompatible return type 'const char * const*' [-Wincompatible-pointer-types]
+# git/src/libzsync/zsync.c:932:43: error: passing argument 4 of 'zsync_configure_zstream_for_zdata' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.3.bb b/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.3.bb
index 62ca015309..23e2ff7811 100644
--- a/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.3.bb
+++ b/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.3.bb
@@ -15,7 +15,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 SRC_URI[archive.sha256sum] = "6ec264eaa0c4de0adb7202c600170bde9a7fbe4d466bfbe940eaf7faaa6c5974"
 
-S = "${WORKDIR}/${GNOMEBN}-${PV}"
+S = "${UNPACKDIR}/${GNOMEBN}-${PV}"
 
 EXTRA_OEMESON = "-Dbuild-documentation=false"
 
diff --git a/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch b/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch
new file mode 100644
index 0000000000..dd6ae1b427
--- /dev/null
+++ b/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch
@@ -0,0 +1,37 @@
+From 6fa1b6d3f72caf6d0cf61752b522dc19fb9933b7 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Fri, 30 Aug 2024 10:44:17 +0200
+Subject: [PATCH] gcab-enums.c.etemplate: include @basename@ instead of full
+ path from @filename@
+
+* fixes:
+  ERROR: QA Issue: File /usr/src/debug/gcab/1.6/libgcab/gcab-enums.c in package gcab-src contains reference to TMPDIR [buildpaths]
+
+lib32-gcab/1.6/package $ grep -R styhead .
+./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-file.h"
+./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-folder.h"
+
+glib-mkenum supports also @basename@ since 2.22 which would avoid this QA issue
+  @filename@            name of current input file
+  @basename@            base name of the current input file (Since: 2.22)
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+Upstream-Status: Pending
+
+ libgcab/gcab-enums.c.etemplate | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgcab/gcab-enums.c.etemplate b/libgcab/gcab-enums.c.etemplate
+index 194b1e0..2e85824 100644
+--- a/libgcab/gcab-enums.c.etemplate
++++ b/libgcab/gcab-enums.c.etemplate
+@@ -21,7 +21,7 @@
+ /*** END file-header ***/
+ 
+ /*** BEGIN file-production ***/
+-#include "@filename@"
++#include "@basename@"
+ /*** END file-production ***/
+ 
+ 
diff --git a/meta-oe/recipes-gnome/gcab/gcab_1.6.bb b/meta-oe/recipes-gnome/gcab/gcab_1.6.bb
index 4278fc9453..503d25271f 100644
--- a/meta-oe/recipes-gnome/gcab/gcab_1.6.bb
+++ b/meta-oe/recipes-gnome/gcab/gcab_1.6.bb
@@ -7,6 +7,7 @@ DEPENDS = "glib-2.0"
 
 SRC_URI = "\
     ${GNOME_MIRROR}/gcab/${PV}/gcab-${PV}.tar.xz \
+    file://0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch \
     file://run-ptest \
 "
 SRC_URI[sha256sum] = "2f0c9615577c4126909e251f9de0626c3ee7a152376c15b5544df10fc87e560b"
diff --git a/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb b/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb
index 0fd30f7424..bb905265ee 100644
--- a/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb
+++ b/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb
@@ -25,7 +25,7 @@ SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=arc
 SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch"
 SRC_URI[archive.sha256sum] = "bad10f3c553a0e1854649ab59c5b2434da22ca1a54ae6138f1f53961567e1ab7"
 
-S = "${WORKDIR}/gcr-${PV}"
+S = "${UNPACKDIR}/gcr-${PV}"
 
 PACKAGECONFIG ??= " \
         ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
diff --git a/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.15.bb
index 54b37912b2..1f84c5e20a 100644
--- a/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb
+++ b/meta-oe/recipes-gnome/gmime/gmime_3.2.15.bb
@@ -11,12 +11,15 @@ inherit gnomebase gobject-introspection vala gtk-doc
 SRC_URI = "https://github.com/jstedfast/${BPN}/releases/download/${PV}/${BP}.tar.xz \
     file://iconv-detect.h \
 "
-SRC_URI[sha256sum] = "2e10a54d4821daf8b16c019ad5d567e0fb8e766f8ffe5fec3d4c6a37373d6406"
+SRC_URI[sha256sum] = "84cd2a481a27970ec39b5c95f72db026722904a2ccf3fdbd57b280cf2d02b5c4"
+
+UPSTREAM_CHECK_URI = "https://github.com/jstedfast/gmime/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 EXTRA_OECONF += "--enable-largefile"
 
-export ac_cv_have_iconv_detect_h="yes"
-export ac_cv_sys_file_offset_bits="64"
+export ac_cv_have_iconv_detect_h = "yes"
+export ac_cv_sys_file_offset_bits = "64"
 
 do_configure:append () {
     cp ${UNPACKDIR}/iconv-detect.h ${S}
diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
index c929763763..f10537eca7 100644
--- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
+++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
@@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m
 
 SRC_URI = "file://gnome-doc-utils.m4"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PROVIDES = "gnome-doc-utils"
 
diff --git a/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.3.bb b/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.10.bb
index 1ddc277651..70da55c137 100644
--- a/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.3.bb
+++ b/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.10.bb
@@ -8,9 +8,8 @@ DEPENDS = "sassc-native"
 
 inherit meson
 
-SRC_URI = "git://github.com/lassekongo83/adw-gtk3.git;protocol=https;branch=main"
+SRC_URI = "git://github.com/lassekongo83/adw-gtk3.git;protocol=https;branch=main;tag=v${PV}"
 
-S = "${WORKDIR}/git"
-SRCREV = "22a3b9374369640993e4a7ab84f8acc72318e501"
+SRCREV = "c2e74c9d2a5c3895b8025ac1d4b9e4cced71fbe9"
 
 FILES:${PN} = "${datadir}/themes"
diff --git a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb
index 3456383c3a..61deceb7a3 100644
--- a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb
+++ b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb
@@ -1,5 +1,5 @@
 SUMMARY = "GTK+2 standard themes"
-HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/"
+HOMEPAGE = "https://download.gnome.org/sources/gnome-themes-standard/"
 BUGTRACKER = "https://bugzilla.gnome.org/"
 SECTION = "x11/gnome"
 
@@ -19,6 +19,9 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz;name=archive"
 SRC_URI[archive.md5sum] = "f9f2c6c521948da427f702372e16f826"
 SRC_URI[archive.sha256sum] = "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819"
 
+UPSTREAM_CHECK_URI = "https://gitlab.gnome.org/Archive/gnome-themes-extra/-/tags"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
 EXTRA_OECONF = "--disable-gtk2-engine"
 
 do_install:append() {
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch b/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch
new file mode 100644
index 0000000000..dfa54f2f31
--- /dev/null
+++ b/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch
@@ -0,0 +1,40 @@
+From 3bbf0b6176d42836d23c36a6ac410e807ec0a7a7 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Sat, 15 Jun 2024 14:18:01 -0400
+Subject: [PATCH] Stop looking for modules in cwd
+
+This is just not a good idea. It is surprising, and can be misused.
+
+Fixes: #6786
+
+CVE: CVE-2024-6655
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7]
+
+Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com>
+---
+ gtk/gtkmodules.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
+index e09b583..e75810c 100644
+--- a/gtk/gtkmodules.c
++++ b/gtk/gtkmodules.c
+@@ -225,13 +225,8 @@ find_module (const gchar *name)
+   gchar *module_name;
+
+   module_name = _gtk_find_module (name, "modules");
+-  if (!module_name)
+-    {
+-      /* As last resort, try loading without an absolute path (using system
+-       * library path)
+-       */
+-      module_name = g_module_build_path (NULL, name);
+-    }
++  if (module_name == NULL)
++    return NULL;
+
+   module = g_module_open (module_name, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY);
+
+--
+2.40.0
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb
index 74b0531414..2ca2bba0aa 100644
--- a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb
@@ -4,13 +4,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
                     file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
                     file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
-SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
+SRC_URI = "${GNOME_MIRROR}/gtk+/2.24/gtk+-${PV}.tar.xz \
            file://xsettings.patch \
            file://toggle-font.diff;striplevel=0 \
            file://doc-fixes.patch \
            file://strict-prototypes.patch \
            file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \
            file://0001-Fix-signature-of-create_menu-function.patch \
+           file://CVE-2024-6655.patch \
            "
 
 SRC_URI[sha256sum] = "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da"
diff --git a/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb b/meta-oe/recipes-gnome/libjcat/libjcat_0.2.3.bb
index 2d95e14447..6e31889b69 100644
--- a/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb
+++ b/meta-oe/recipes-gnome/libjcat/libjcat_0.2.3.bb
@@ -11,8 +11,7 @@ SRC_URI = "\
     git://github.com/hughsie/libjcat.git;branch=main;protocol=https \
     file://run-ptest \
 "
-SRCREV = "869e7cf4511b81897512a3f0adb627218e618112"
-S = "${WORKDIR}/git"
+SRCREV = "f284d18a694ed98f49ddb06e6920265781a30125"
 
 inherit gobject-introspection gtk-doc meson ptest-gnome vala lib_package
 
@@ -32,3 +31,5 @@ GTKDOC_MESON_OPTION = "gtkdoc"
 RDEPENDS:${PN}:class-target = "\
     ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \
 "
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch b/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch
deleted file mode 100644
index 6bb48777ec..0000000000
--- a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From d798af685e9e1166400acbdab082c17b02dad85b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 18 May 2023 23:28:10 -0700
-Subject: [PATCH] Remove builddir and srcdir paths from test binaries
-
-Encoding buildtime paths is not needed since if these tests are to be
-run they will be run on target where builddir structure most certainly
-wont be available.
-
-Fixes
-WARNING: libpeas-1.36.0-r0 do_package_qa: QA Issue: File /usr/bin/peas-demo in package libpeas-demo contains reference to TMPDIR [buildpaths]
-
-Upstream-Status: Inappropriate [Cross-compile specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- peas-demo/meson.build                 | 2 +-
- tests/libpeas-gtk/testing/meson.build | 4 ++--
- tests/libpeas/testing/meson.build     | 4 ++--
- tests/testing-util/meson.build        | 4 ++--
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/peas-demo/meson.build b/peas-demo/meson.build
-index a3ec53b..855ebf2 100644
---- a/peas-demo/meson.build
-+++ b/peas-demo/meson.build
-@@ -9,7 +9,7 @@ peas_demo_c = [
- 
- peas_demo_c_args = [
-   '-DHAVE_CONFIG_H',
--  '-DPEAS_BUILDDIR="@0@"'.format(builddir),
-+  '-DPEAS_BUILDDIR="/usr/src/debug/libpeas"',
-   '-DPEAS_PREFIX="@0@"'.format(prefix),
-   '-DPEAS_LIBDIR="@0@"'.format(libdir),
- ]
-diff --git a/tests/libpeas-gtk/testing/meson.build b/tests/libpeas-gtk/testing/meson.build
-index 646f42d..fd9a692 100644
---- a/tests/libpeas-gtk/testing/meson.build
-+++ b/tests/libpeas-gtk/testing/meson.build
-@@ -19,8 +19,8 @@ libpeas_gtk_testing_deps = [
- 
- libpeas_gtk_testing_c_args = [
-   '-DHAVE_CONFIG_H',
--  '-DBUILDDIR="@0@"'.format(builddir),
--  '-DSRCDIR="@0@"'.format(srcdir),
-+  '-DBUILDDIR="/usr/src/debug/libpeas"',
-+  '-DSRCDIR="/usr/src/debug/libpeas"',
- ]
- 
- libpeas_gtk_testing_lib = library(
-diff --git a/tests/libpeas/testing/meson.build b/tests/libpeas/testing/meson.build
-index 74ba7b1..084daa9 100644
---- a/tests/libpeas/testing/meson.build
-+++ b/tests/libpeas/testing/meson.build
-@@ -21,8 +21,8 @@ libpeas_testing_deps = [
- 
- libpeas_testing_c_args = [
-   '-DHAVE_CONFIG_H',
--  '-DBUILDDIR="@0@"'.format(builddir),
--  '-DSRCDIR="@0@"'.format(srcdir),
-+  '-DBUILDDIR="/usr/src/debug/libpeas"',
-+  '-DSRCDIR="/usr/src/debug/libpeas"',
- ]
- 
- libpeas_testing_lib = library(
-diff --git a/tests/testing-util/meson.build b/tests/testing-util/meson.build
-index 1c40740..83ad059 100644
---- a/tests/testing-util/meson.build
-+++ b/tests/testing-util/meson.build
-@@ -17,8 +17,8 @@ libtesting_util_deps = [
- 
- libtesting_util_c_args = [
-   '-DHAVE_CONFIG_H',
--  '-DBUILDDIR="@0@"'.format(builddir),
--  '-DSRCDIR="@0@"'.format(srcdir),
-+  '-DBUILDDIR="/usr/src/debug/libpeas"',
-+  '-DSRCDIR="/usr/src/debug/libpeas"',
-   '-UG_DISABLE_ASSERT',
-   '-UG_DISABLE_CAST_CHECKS',
- ]
--- 
-2.40.1
-
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
deleted file mode 100644
index 016981f04d..0000000000
--- a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "libpeas is a gobject-based plugins engine"
-HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas"
-LICENSE = "LGPL-2.1-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d"
-
-DEPENDS = "gtk+3"
-
-GTKDOC_MESON_OPTION = "gtk_doc"
-
-inherit gnomebase gobject-introspection gi-docgen gtk-icon-cache features_check
-
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-# FIXME: When upgrading to libpeas 2, g-i is no longer needed.
-REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
-
-SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch"
-SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c"
-
-PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject"
-
-PACKAGES =+ "${PN}-demo ${PN}-python3"
-FILES:${PN}-demo = " \
-    ${bindir}/peas-demo \
-    ${libdir}/peas-demo \
-"
-
-RDEPENDS:${PN}-python3 = "python3-pygobject"
-FILES:${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so"
diff --git a/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb b/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb
index ca3bf081d6..8630822939 100644
--- a/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb
+++ b/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 require malcontent.inc
 
-DEPENDS = " \
+DEPENDS += " \
         malcontent \
         accountsservice \
         glib-2.0 \
@@ -16,6 +16,7 @@ DEPENDS = " \
         libpam \
         polkit \
         appstream \
+        appstream-native \
         flatpak \
         libadwaita \
         gtk4 \
@@ -40,7 +41,7 @@ do_install() {
         ln -sf libmalcontent-ui-1.so.${PV} ${D}${libdir}/libmalcontent-ui-1.so.1
         install -m 0755 ${B}/malcontent-control/malcontent-control ${D}${bindir}
         install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.policy ${D}${datadir}/polkit-1/actions
-        install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.appdata.xml ${D}${datadir}/metainfo
+        install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.metainfo.xml ${D}${datadir}/metainfo
         install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.desktop ${D}${datadir}/applications
 }
 
diff --git a/meta-oe/recipes-gnome/malcontent/malcontent.bb b/meta-oe/recipes-gnome/malcontent/malcontent.bb
index c4bc50fa8e..9da95329a8 100644
--- a/meta-oe/recipes-gnome/malcontent/malcontent.bb
+++ b/meta-oe/recipes-gnome/malcontent/malcontent.bb
@@ -17,26 +17,17 @@ DEPENDS = " \
 
 GIR_MESON_OPTION = ""
 
-inherit  meson pkgconfig gobject-introspection gettext features_check useradd
+inherit  meson pkgconfig gobject-introspection gettext features_check
 
 REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection"
 
 PACKAGECONFIG ?= "ui"
 PACKAGECONFIG[ui] = ",,,malcontent-ui"
 
-EXTRA_OEMESON = "-Dui=disabled"
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd"
-
-do_install:append() {
-        # Fix up permissions on polkit rules.d to work with rpm4 constraints
-        chmod 700 ${D}/${datadir}/polkit-1/rules.d
-        chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
-}
+EXTRA_OEMESON = "-Dui=disabled -Dpamlibdir=${base_libdir}/security"
 
 FILES:${PN} += " \
-        ${libdir}/security/pam_malcontent.so \
+        ${base_libdir}/security/pam_malcontent.so \
         ${datadir}/accountsservice \
         ${datadir}/help \
         ${datadir}/dbus-1 \
diff --git a/meta-oe/recipes-gnome/malcontent/malcontent.inc b/meta-oe/recipes-gnome/malcontent/malcontent.inc
index d48be08bbc..10597f3308 100644
--- a/meta-oe/recipes-gnome/malcontent/malcontent.inc
+++ b/meta-oe/recipes-gnome/malcontent/malcontent.inc
@@ -1,4 +1,3 @@
 SRC_URI = "git://gitlab.freedesktop.org/pwithnall/malcontent.git;protocol=https;branch=main"
-S = "${WORKDIR}/git"
-SRCREV = "3ba80995bb25b7aeda7e21d547f9e39ff9a81736"
-PV = "0.12.0"
+SRCREV = "21f3ef7b6f984710a23b607d2298fe16e554f0c3"
+PV = "0.13.0"
diff --git a/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb b/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb
index 0c9599a49c..b4dc739ec3 100644
--- a/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb
+++ b/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb
@@ -9,4 +9,3 @@ SRC_URI = "git://anongit.freedesktop.org/xdg/pyxdg;branch=master"
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-graphics/aml/aml_git.bb b/meta-oe/recipes-graphics/aml/aml_git.bb
index 2633e0d215..a0b27bd256 100644
--- a/meta-oe/recipes-graphics/aml/aml_git.bb
+++ b/meta-oe/recipes-graphics/aml/aml_git.bb
@@ -10,7 +10,6 @@ SRCREV = "b83f3576ce4187d9285f06e9066ef43a691464d4"
 
 PV = "0.3.0+git"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false"
diff --git a/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb b/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb
index a6872ef0cd..8a8e783309 100644
--- a/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb
+++ b/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb
@@ -10,7 +10,7 @@ DEPENDS += "boost cairo libsigc++-3"
 SRC_URI = "https://www.cairographics.org/releases/cairomm-${PV}.tar.xz"
 SRC_URI[sha256sum] = "b81255394e3ea8e8aa887276d22afa8985fc8daef60692eb2407d23049f03cfb"
 
-S = "${WORKDIR}/cairomm-${PV}"
+S = "${UNPACKDIR}/cairomm-${PV}"
 
 FILES:${PN}-doc += "${datadir}/devhelp"
 FILES:${PN}-dev += "${libdir}/cairomm-*/"
diff --git a/meta-oe/recipes-graphics/cairo/cairomm_1.14.3.bb b/meta-oe/recipes-graphics/cairo/cairomm_1.14.5.bb
index 54a2b07ca5..e451c5d1ad 100644
--- a/meta-oe/recipes-graphics/cairo/cairomm_1.14.3.bb
+++ b/meta-oe/recipes-graphics/cairo/cairomm_1.14.5.bb
@@ -8,7 +8,7 @@ inherit gnomebase
 DEPENDS += "boost cairo libsigc++-2.0"
 
 SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.xz"
-SRC_URI[sha256sum] = "0d37e067c5c4ca7808b7ceddabfe1932c5bd2a750ad64fb321e1213536297e78"
+SRC_URI[sha256sum] = "70136203540c884e89ce1c9edfb6369b9953937f6cd596d97c78c9758a5d48db"
 
 FILES:${PN}-doc += "${datadir}/devhelp"
 FILES:${PN}-dev += "${libdir}/cairomm-*/"
diff --git a/meta-oe/recipes-graphics/cglm/cglm_0.9.4.bb b/meta-oe/recipes-graphics/cglm/cglm_0.9.6.bb
index 6fcc07d92b..b2673f1e9b 100644
--- a/meta-oe/recipes-graphics/cglm/cglm_0.9.4.bb
+++ b/meta-oe/recipes-graphics/cglm/cglm_0.9.6.bb
@@ -9,10 +9,9 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8dc95c4110ba741c43832734b51b7de7"
 
 SRC_URI = "git://github.com/recp/cglm;branch=master;protocol=https"
-# Tag v0.9.1
-SRCREV = "1796cc5ce298235b615dc7a4750b8c3ba56a05dd"
+# Tag v0.9.6
+SRCREV = "144d1e7c29b3b0c6dede7917a0476cc95248559c"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG[build_tests] = "-Dbuild_tests=true,-Dbuild_tests=false,"
 
diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc b/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc
new file mode 100644
index 0000000000..9ba87e0b4a
--- /dev/null
+++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc
@@ -0,0 +1,300 @@
+# Autogenerated with 'bitbake -c update_crates deqp-runner'
+
+# from Cargo.lock
+SRC_URI += " \
+    crate://crates.io/adler2/2.0.0 \
+    crate://crates.io/aho-corasick/1.1.3 \
+    crate://crates.io/android-tzdata/0.1.1 \
+    crate://crates.io/android_system_properties/0.1.5 \
+    crate://crates.io/ansi_term/0.12.1 \
+    crate://crates.io/anyhow/1.0.97 \
+    crate://crates.io/atty/0.2.14 \
+    crate://crates.io/autocfg/1.4.0 \
+    crate://crates.io/bitflags/1.3.2 \
+    crate://crates.io/bitflags/2.9.0 \
+    crate://crates.io/bumpalo/3.17.0 \
+    crate://crates.io/cast/0.3.0 \
+    crate://crates.io/cc/1.2.18 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/chrono/0.4.40 \
+    crate://crates.io/clap/2.34.0 \
+    crate://crates.io/core-foundation-sys/0.8.7 \
+    crate://crates.io/crc32fast/1.4.2 \
+    crate://crates.io/criterion/0.3.6 \
+    crate://crates.io/criterion-plot/0.4.5 \
+    crate://crates.io/crossbeam-deque/0.8.6 \
+    crate://crates.io/crossbeam-epoch/0.9.18 \
+    crate://crates.io/crossbeam-utils/0.8.21 \
+    crate://crates.io/csv/1.3.1 \
+    crate://crates.io/csv-core/0.1.12 \
+    crate://crates.io/derive-getters/0.1.1 \
+    crate://crates.io/either/1.15.0 \
+    crate://crates.io/errno/0.3.11 \
+    crate://crates.io/fastrand/2.3.0 \
+    crate://crates.io/flate2/1.1.1 \
+    crate://crates.io/getrandom/0.1.16 \
+    crate://crates.io/getrandom/0.3.2 \
+    crate://crates.io/half/1.8.3 \
+    crate://crates.io/hashbrown/0.12.3 \
+    crate://crates.io/heck/0.3.3 \
+    crate://crates.io/hermit-abi/0.1.19 \
+    crate://crates.io/iana-time-zone/0.1.63 \
+    crate://crates.io/iana-time-zone-haiku/0.1.2 \
+    crate://crates.io/indexmap/1.9.3 \
+    crate://crates.io/itertools/0.10.5 \
+    crate://crates.io/itoa/1.0.15 \
+    crate://crates.io/js-sys/0.3.77 \
+    crate://crates.io/junit-report/0.4.0 \
+    crate://crates.io/lazy_static/1.5.0 \
+    crate://crates.io/libc/0.2.171 \
+    crate://crates.io/linux-raw-sys/0.9.3 \
+    crate://crates.io/log/0.4.27 \
+    crate://crates.io/memchr/2.7.4 \
+    crate://crates.io/miniz_oxide/0.8.7 \
+    crate://crates.io/mio/0.8.11 \
+    crate://crates.io/num-traits/0.2.19 \
+    crate://crates.io/once_cell/1.21.3 \
+    crate://crates.io/oorandom/11.1.5 \
+    crate://crates.io/plotters/0.3.7 \
+    crate://crates.io/plotters-backend/0.3.7 \
+    crate://crates.io/plotters-svg/0.3.7 \
+    crate://crates.io/ppv-lite86/0.2.21 \
+    crate://crates.io/proc-macro-error/1.0.4 \
+    crate://crates.io/proc-macro-error-attr/1.0.4 \
+    crate://crates.io/proc-macro2/1.0.94 \
+    crate://crates.io/quote/1.0.40 \
+    crate://crates.io/r-efi/5.2.0 \
+    crate://crates.io/rand/0.7.3 \
+    crate://crates.io/rand_chacha/0.2.2 \
+    crate://crates.io/rand_core/0.5.1 \
+    crate://crates.io/rand_hc/0.2.0 \
+    crate://crates.io/rayon/1.10.0 \
+    crate://crates.io/rayon-core/1.12.1 \
+    crate://crates.io/regex/1.11.1 \
+    crate://crates.io/regex-automata/0.4.9 \
+    crate://crates.io/regex-syntax/0.8.5 \
+    crate://crates.io/roxmltree/0.13.1 \
+    crate://crates.io/rustix/1.0.5 \
+    crate://crates.io/rustversion/1.0.20 \
+    crate://crates.io/ryu/1.0.20 \
+    crate://crates.io/same-file/1.0.6 \
+    crate://crates.io/serde/1.0.219 \
+    crate://crates.io/serde-tuple-vec-map/1.0.1 \
+    crate://crates.io/serde_cbor/0.11.2 \
+    crate://crates.io/serde_derive/1.0.219 \
+    crate://crates.io/serde_json/1.0.140 \
+    crate://crates.io/serde_yaml/0.9.21 \
+    crate://crates.io/shlex/1.3.0 \
+    crate://crates.io/stderrlog/0.5.4 \
+    crate://crates.io/strsim/0.8.0 \
+    crate://crates.io/structopt/0.3.26 \
+    crate://crates.io/structopt-derive/0.4.18 \
+    crate://crates.io/syn/1.0.109 \
+    crate://crates.io/syn/2.0.100 \
+    crate://crates.io/tempfile/3.19.1 \
+    crate://crates.io/termcolor/1.1.3 \
+    crate://crates.io/textwrap/0.11.0 \
+    crate://crates.io/thiserror/1.0.69 \
+    crate://crates.io/thiserror-impl/1.0.69 \
+    crate://crates.io/thread_local/1.1.8 \
+    crate://crates.io/tinytemplate/1.2.1 \
+    crate://crates.io/toml/0.5.11 \
+    crate://crates.io/unicode-ident/1.0.18 \
+    crate://crates.io/unicode-segmentation/1.12.0 \
+    crate://crates.io/unicode-width/0.1.14 \
+    crate://crates.io/unsafe-libyaml/0.2.11 \
+    crate://crates.io/vec_map/0.8.2 \
+    crate://crates.io/version_check/0.9.5 \
+    crate://crates.io/walkdir/2.5.0 \
+    crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \
+    crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
+    crate://crates.io/wasi/0.14.2+wasi-0.2.4 \
+    crate://crates.io/wasm-bindgen/0.2.100 \
+    crate://crates.io/wasm-bindgen-backend/0.2.100 \
+    crate://crates.io/wasm-bindgen-macro/0.2.100 \
+    crate://crates.io/wasm-bindgen-macro-support/0.2.100 \
+    crate://crates.io/wasm-bindgen-shared/0.2.100 \
+    crate://crates.io/web-sys/0.3.77 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.9 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/windows-core/0.61.0 \
+    crate://crates.io/windows-implement/0.60.0 \
+    crate://crates.io/windows-interface/0.59.1 \
+    crate://crates.io/windows-link/0.1.1 \
+    crate://crates.io/windows-result/0.3.2 \
+    crate://crates.io/windows-strings/0.4.0 \
+    crate://crates.io/windows-sys/0.48.0 \
+    crate://crates.io/windows-sys/0.59.0 \
+    crate://crates.io/windows-targets/0.48.5 \
+    crate://crates.io/windows-targets/0.52.6 \
+    crate://crates.io/windows_aarch64_gnullvm/0.48.5 \
+    crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
+    crate://crates.io/windows_aarch64_msvc/0.48.5 \
+    crate://crates.io/windows_aarch64_msvc/0.52.6 \
+    crate://crates.io/windows_i686_gnu/0.48.5 \
+    crate://crates.io/windows_i686_gnu/0.52.6 \
+    crate://crates.io/windows_i686_gnullvm/0.52.6 \
+    crate://crates.io/windows_i686_msvc/0.48.5 \
+    crate://crates.io/windows_i686_msvc/0.52.6 \
+    crate://crates.io/windows_x86_64_gnu/0.48.5 \
+    crate://crates.io/windows_x86_64_gnu/0.52.6 \
+    crate://crates.io/windows_x86_64_gnullvm/0.48.5 \
+    crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
+    crate://crates.io/windows_x86_64_msvc/0.48.5 \
+    crate://crates.io/windows_x86_64_msvc/0.52.6 \
+    crate://crates.io/wit-bindgen-rt/0.39.0 \
+    crate://crates.io/xml-rs/0.8.25 \
+    crate://crates.io/xmlparser/0.13.6 \
+    crate://crates.io/zerocopy/0.8.24 \
+    crate://crates.io/zerocopy-derive/0.8.24 \
+"
+
+SRC_URI[adler2-2.0.0.sha256sum] = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+SRC_URI[ansi_term-0.12.1.sha256sum] = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+SRC_URI[anyhow-1.0.97.sha256sum] = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+SRC_URI[autocfg-1.4.0.sha256sum] = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+SRC_URI[bitflags-2.9.0.sha256sum] = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+SRC_URI[bumpalo-3.17.0.sha256sum] = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+SRC_URI[cast-0.3.0.sha256sum] = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+SRC_URI[cc-1.2.18.sha256sum] = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[chrono-0.4.40.sha256sum] = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+SRC_URI[clap-2.34.0.sha256sum] = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+SRC_URI[crc32fast-1.4.2.sha256sum] = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+SRC_URI[criterion-0.3.6.sha256sum] = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
+SRC_URI[criterion-plot-0.4.5.sha256sum] = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
+SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+SRC_URI[csv-1.3.1.sha256sum] = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
+SRC_URI[csv-core-0.1.12.sha256sum] = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d"
+SRC_URI[derive-getters-0.1.1.sha256sum] = "16dc4e2517f08ca167440ccb11023c1308ee19a4022d7b03c0e652f971171869"
+SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+SRC_URI[errno-0.3.11.sha256sum] = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+SRC_URI[flate2-1.1.1.sha256sum] = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+SRC_URI[getrandom-0.1.16.sha256sum] = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+SRC_URI[getrandom-0.3.2.sha256sum] = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+SRC_URI[half-1.8.3.sha256sum] = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+SRC_URI[heck-0.3.3.sha256sum] = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+SRC_URI[iana-time-zone-0.1.63.sha256sum] = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+SRC_URI[itertools-0.10.5.sha256sum] = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+SRC_URI[itoa-1.0.15.sha256sum] = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+SRC_URI[js-sys-0.3.77.sha256sum] = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+SRC_URI[junit-report-0.4.0.sha256sum] = "e4e00ad2de771fc4988af88b02cbd618c08c17920208c35c4bbfe67ccfab31eb"
+SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+SRC_URI[libc-0.2.171.sha256sum] = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+SRC_URI[linux-raw-sys-0.9.3.sha256sum] = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
+SRC_URI[log-0.4.27.sha256sum] = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+SRC_URI[miniz_oxide-0.8.7.sha256sum] = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
+SRC_URI[mio-0.8.11.sha256sum] = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+SRC_URI[oorandom-11.1.5.sha256sum] = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
+SRC_URI[plotters-0.3.7.sha256sum] = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+SRC_URI[plotters-backend-0.3.7.sha256sum] = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+SRC_URI[plotters-svg-0.3.7.sha256sum] = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+SRC_URI[ppv-lite86-0.2.21.sha256sum] = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+SRC_URI[proc-macro2-1.0.94.sha256sum] = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+SRC_URI[quote-1.0.40.sha256sum] = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+SRC_URI[r-efi-5.2.0.sha256sum] = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+SRC_URI[rand-0.7.3.sha256sum] = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+SRC_URI[rand_chacha-0.2.2.sha256sum] = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+SRC_URI[rand_core-0.5.1.sha256sum] = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+SRC_URI[rand_hc-0.2.0.sha256sum] = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+SRC_URI[rayon-1.10.0.sha256sum] = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+SRC_URI[rayon-core-1.12.1.sha256sum] = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+SRC_URI[regex-automata-0.4.9.sha256sum] = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+SRC_URI[roxmltree-0.13.1.sha256sum] = "dbf7d7b1ea646d380d0e8153158063a6da7efe30ddbf3184042848e3f8a6f671"
+SRC_URI[rustix-1.0.5.sha256sum] = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+SRC_URI[rustversion-1.0.20.sha256sum] = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+SRC_URI[ryu-1.0.20.sha256sum] = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+SRC_URI[serde-1.0.219.sha256sum] = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+SRC_URI[serde-tuple-vec-map-1.0.1.sha256sum] = "a04d0ebe0de77d7d445bb729a895dcb0a288854b267ca85f030ce51cdc578c82"
+SRC_URI[serde_cbor-0.11.2.sha256sum] = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
+SRC_URI[serde_derive-1.0.219.sha256sum] = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+SRC_URI[serde_json-1.0.140.sha256sum] = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+SRC_URI[serde_yaml-0.9.21.sha256sum] = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c"
+SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+SRC_URI[stderrlog-0.5.4.sha256sum] = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b"
+SRC_URI[strsim-0.8.0.sha256sum] = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+SRC_URI[structopt-0.3.26.sha256sum] = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
+SRC_URI[structopt-derive-0.4.18.sha256sum] = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
+SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+SRC_URI[syn-2.0.100.sha256sum] = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+SRC_URI[tempfile-3.19.1.sha256sum] = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
+SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+SRC_URI[textwrap-0.11.0.sha256sum] = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+SRC_URI[thiserror-1.0.69.sha256sum] = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+SRC_URI[thiserror-impl-1.0.69.sha256sum] = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+SRC_URI[thread_local-1.1.8.sha256sum] = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+SRC_URI[tinytemplate-1.2.1.sha256sum] = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+SRC_URI[unicode-ident-1.0.18.sha256sum] = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+SRC_URI[unicode-segmentation-1.12.0.sha256sum] = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+SRC_URI[unicode-width-0.1.14.sha256sum] = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+SRC_URI[unsafe-libyaml-0.2.11.sha256sum] = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+SRC_URI[vec_map-0.8.2.sha256sum] = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+SRC_URI[wasi-0.9.0+wasi-snapshot-preview1.sha256sum] = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+SRC_URI[wasi-0.14.2+wasi-0.2.4.sha256sum] = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+SRC_URI[wasm-bindgen-0.2.100.sha256sum] = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+SRC_URI[wasm-bindgen-backend-0.2.100.sha256sum] = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+SRC_URI[wasm-bindgen-macro-0.2.100.sha256sum] = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+SRC_URI[wasm-bindgen-macro-support-0.2.100.sha256sum] = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+SRC_URI[wasm-bindgen-shared-0.2.100.sha256sum] = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+SRC_URI[web-sys-0.3.77.sha256sum] = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+SRC_URI[winapi-util-0.1.9.sha256sum] = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+SRC_URI[windows-core-0.61.0.sha256sum] = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
+SRC_URI[windows-implement-0.60.0.sha256sum] = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+SRC_URI[windows-interface-0.59.1.sha256sum] = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+SRC_URI[windows-link-0.1.1.sha256sum] = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+SRC_URI[windows-result-0.3.2.sha256sum] = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+SRC_URI[windows-strings-0.4.0.sha256sum] = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+SRC_URI[wit-bindgen-rt-0.39.0.sha256sum] = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+SRC_URI[xml-rs-0.8.25.sha256sum] = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4"
+SRC_URI[xmlparser-0.13.6.sha256sum] = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
+SRC_URI[zerocopy-0.8.24.sha256sum] = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
+SRC_URI[zerocopy-derive-0.8.24.sha256sum] = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch
new file mode 100644
index 0000000000..d50549e88e
--- /dev/null
+++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch
@@ -0,0 +1,36 @@
+From 64e8e422abebf139fac9a4ec8ba8f259e54679e6 Mon Sep 17 00:00:00 2001
+From: Dan Gohman <dev@sunfishcode.online>
+Date: Sun, 6 Apr 2025 05:22:49 -0700
+Subject: [PATCH] Define more ioctl codes on riscv32gc-unknown-linux-gnu
+
+Define ioctl codes including `FICLONE` and `FS_IOC32_GETVERSION` on
+riscv32gc-unknown-linux-gnu.
+
+Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/4382]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/unix/linux_like/linux/arch/generic/mod.rs | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/unix/linux_like/linux/arch/generic/mod.rs b/src/unix/linux_like/linux/arch/generic/mod.rs
+index 61d2e3f..05ffb12 100644
+--- a/src/unix/linux_like/linux/arch/generic/mod.rs
++++ b/src/unix/linux_like/linux/arch/generic/mod.rs
+@@ -164,6 +164,7 @@ cfg_if! {
+         target_arch = "x86_64",
+         target_arch = "arm",
+         target_arch = "aarch64",
++        target_arch = "riscv32",
+         target_arch = "riscv64",
+         target_arch = "s390x",
+         target_arch = "csky",
+@@ -303,7 +304,8 @@ cfg_if! {
+     if #[cfg(any(
+         target_arch = "x86",
+         target_arch = "arm",
+-        target_arch = "csky"
++        target_arch = "csky",
++        target_arch = "riscv32"
+     ))] {
+         pub const FS_IOC_GETFLAGS: Ioctl = 0x80046601;
+         pub const FS_IOC_SETFLAGS: Ioctl = 0x40046602;
diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-cargo-Update-tempfile-to-latest-3.x.patch b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-cargo-Update-tempfile-to-latest-3.x.patch
new file mode 100644
index 0000000000..dcd5e065f9
--- /dev/null
+++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-cargo-Update-tempfile-to-latest-3.x.patch
@@ -0,0 +1,1239 @@
+From 1cb9f536511ef57cba8f53ea767038084ea2c4af Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 6 Apr 2025 19:11:44 -0700
+Subject: [PATCH] cargo: Update tempfile to latest 3.x
+
+This updates rustix to 1.x gets more architectures supported e.g. riscv
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Cargo.lock | 616 ++++++++++++++++++++++++++++++++---------------------
+ Cargo.toml |   4 +-
+ 2 files changed, 375 insertions(+), 245 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index d4f6619..ef87ade 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1,18 +1,18 @@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
+-version = 3
++version = 4
+ 
+ [[package]]
+-name = "adler"
+-version = "1.0.2"
++name = "adler2"
++version = "2.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
++checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+ 
+ [[package]]
+ name = "aho-corasick"
+-version = "1.0.5"
++version = "1.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+ dependencies = [
+  "memchr",
+ ]
+@@ -43,9 +43,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "anyhow"
+-version = "1.0.75"
++version = "1.0.97"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
++checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+ 
+ [[package]]
+ name = "atty"
+@@ -53,16 +53,16 @@ version = "0.2.14"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+ dependencies = [
+- "hermit-abi 0.1.19",
++ "hermit-abi",
+  "libc",
+  "winapi",
+ ]
+ 
+ [[package]]
+ name = "autocfg"
+-version = "1.1.0"
++version = "1.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+ 
+ [[package]]
+ name = "bitflags"
+@@ -72,15 +72,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+ 
+ [[package]]
+ name = "bitflags"
+-version = "2.4.0"
++version = "2.9.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
++checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+ 
+ [[package]]
+ name = "bumpalo"
+-version = "3.13.0"
++version = "3.17.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
++checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+ 
+ [[package]]
+ name = "cast"
+@@ -90,11 +90,11 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+ 
+ [[package]]
+ name = "cc"
+-version = "1.0.83"
++version = "1.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
++checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
+ dependencies = [
+- "libc",
++ "shlex",
+ ]
+ 
+ [[package]]
+@@ -105,16 +105,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+ 
+ [[package]]
+ name = "chrono"
+-version = "0.4.30"
++version = "0.4.40"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877"
++checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+ dependencies = [
+  "android-tzdata",
+  "iana-time-zone",
+  "js-sys",
+  "num-traits",
+  "wasm-bindgen",
+- "windows-targets",
++ "windows-link",
+ ]
+ 
+ [[package]]
+@@ -134,15 +134,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "core-foundation-sys"
+-version = "0.8.4"
++version = "0.8.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
++checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+ 
+ [[package]]
+ name = "crc32fast"
+-version = "1.3.2"
++version = "1.4.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
++checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+ dependencies = [
+  "cfg-if",
+ ]
+@@ -183,54 +183,36 @@ dependencies = [
+  "itertools",
+ ]
+ 
+-[[package]]
+-name = "crossbeam-channel"
+-version = "0.5.8"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+-dependencies = [
+- "cfg-if",
+- "crossbeam-utils",
+-]
+-
+ [[package]]
+ name = "crossbeam-deque"
+-version = "0.8.3"
++version = "0.8.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
++checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+ dependencies = [
+- "cfg-if",
+  "crossbeam-epoch",
+  "crossbeam-utils",
+ ]
+ 
+ [[package]]
+ name = "crossbeam-epoch"
+-version = "0.9.15"
++version = "0.9.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
++checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+ dependencies = [
+- "autocfg",
+- "cfg-if",
+  "crossbeam-utils",
+- "memoffset",
+- "scopeguard",
+ ]
+ 
+ [[package]]
+ name = "crossbeam-utils"
+-version = "0.8.16"
++version = "0.8.21"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+-dependencies = [
+- "cfg-if",
+-]
++checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+ 
+ [[package]]
+ name = "csv"
+-version = "1.2.2"
++version = "1.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
++checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
+ dependencies = [
+  "csv-core",
+  "itoa",
+@@ -240,9 +222,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "csv-core"
+-version = "0.1.10"
++version = "0.1.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
++checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d"
+ dependencies = [
+  "memchr",
+ ]
+@@ -286,42 +268,31 @@ dependencies = [
+ 
+ [[package]]
+ name = "either"
+-version = "1.9.0"
++version = "1.15.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
++checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+ 
+ [[package]]
+ name = "errno"
+-version = "0.3.3"
++version = "0.3.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
++checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+ dependencies = [
+- "errno-dragonfly",
+- "libc",
+- "windows-sys",
+-]
+-
+-[[package]]
+-name = "errno-dragonfly"
+-version = "0.1.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+-dependencies = [
+- "cc",
+  "libc",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+ name = "fastrand"
+-version = "2.0.0"
++version = "2.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
++checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+ 
+ [[package]]
+ name = "flate2"
+-version = "1.0.27"
++version = "1.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
++checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+ dependencies = [
+  "crc32fast",
+  "miniz_oxide",
+@@ -338,11 +309,23 @@ dependencies = [
+  "wasi 0.9.0+wasi-snapshot-preview1",
+ ]
+ 
++[[package]]
++name = "getrandom"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "r-efi",
++ "wasi 0.14.2+wasi-0.2.4",
++]
++
+ [[package]]
+ name = "half"
+-version = "1.8.2"
++version = "1.8.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
++checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+ 
+ [[package]]
+ name = "hashbrown"
+@@ -368,24 +351,19 @@ dependencies = [
+  "libc",
+ ]
+ 
+-[[package]]
+-name = "hermit-abi"
+-version = "0.3.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+-
+ [[package]]
+ name = "iana-time-zone"
+-version = "0.1.57"
++version = "0.1.63"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
++checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+ dependencies = [
+  "android_system_properties",
+  "core-foundation-sys",
+  "iana-time-zone-haiku",
+  "js-sys",
++ "log",
+  "wasm-bindgen",
+- "windows",
++ "windows-core",
+ ]
+ 
+ [[package]]
+@@ -418,16 +396,17 @@ dependencies = [
+ 
+ [[package]]
+ name = "itoa"
+-version = "1.0.9"
++version = "1.0.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
++checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+ 
+ [[package]]
+ name = "js-sys"
+-version = "0.3.64"
++version = "0.3.77"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
++checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+ dependencies = [
++ "once_cell",
+  "wasm-bindgen",
+ ]
+ 
+@@ -445,100 +424,81 @@ dependencies = [
+ 
+ [[package]]
+ name = "lazy_static"
+-version = "1.4.0"
++version = "1.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.147"
++version = "0.2.171"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
++checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+ 
+ [[package]]
+ name = "linux-raw-sys"
+-version = "0.4.7"
++version = "0.9.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
++checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
+ 
+ [[package]]
+ name = "log"
+-version = "0.4.20"
++version = "0.4.27"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
++checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+ 
+ [[package]]
+ name = "memchr"
+-version = "2.6.3"
++version = "2.7.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+-
+-[[package]]
+-name = "memoffset"
+-version = "0.9.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+-dependencies = [
+- "autocfg",
+-]
++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+ 
+ [[package]]
+ name = "miniz_oxide"
+-version = "0.7.1"
++version = "0.8.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
++checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
+ dependencies = [
+- "adler",
++ "adler2",
+ ]
+ 
+ [[package]]
+ name = "mio"
+-version = "0.8.8"
++version = "0.8.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
++checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+ dependencies = [
+  "libc",
+  "log",
+  "wasi 0.11.0+wasi-snapshot-preview1",
+- "windows-sys",
++ "windows-sys 0.48.0",
+ ]
+ 
+ [[package]]
+ name = "num-traits"
+-version = "0.2.16"
++version = "0.2.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+ dependencies = [
+  "autocfg",
+ ]
+ 
+-[[package]]
+-name = "num_cpus"
+-version = "1.16.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+-dependencies = [
+- "hermit-abi 0.3.2",
+- "libc",
+-]
+-
+ [[package]]
+ name = "once_cell"
+-version = "1.18.0"
++version = "1.21.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
++checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+ 
+ [[package]]
+ name = "oorandom"
+-version = "11.1.3"
++version = "11.1.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
++checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
+ 
+ [[package]]
+ name = "plotters"
+-version = "0.3.5"
++version = "0.3.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
++checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+ dependencies = [
+  "num-traits",
+  "plotters-backend",
+@@ -549,24 +509,27 @@ dependencies = [
+ 
+ [[package]]
+ name = "plotters-backend"
+-version = "0.3.5"
++version = "0.3.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
++checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+ 
+ [[package]]
+ name = "plotters-svg"
+-version = "0.3.5"
++version = "0.3.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
++checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+ dependencies = [
+  "plotters-backend",
+ ]
+ 
+ [[package]]
+ name = "ppv-lite86"
+-version = "0.2.17"
++version = "0.2.21"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
++checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
++dependencies = [
++ "zerocopy",
++]
+ 
+ [[package]]
+ name = "proc-macro-error"
+@@ -594,29 +557,35 @@ dependencies = [
+ 
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.85"
++version = "1.0.94"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
++checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+ dependencies = [
+  "unicode-ident",
+ ]
+ 
+ [[package]]
+ name = "quote"
+-version = "1.0.36"
++version = "1.0.40"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
++checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+ dependencies = [
+  "proc-macro2",
+ ]
+ 
++[[package]]
++name = "r-efi"
++version = "5.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
++
+ [[package]]
+ name = "rand"
+ version = "0.7.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+ dependencies = [
+- "getrandom",
++ "getrandom 0.1.16",
+  "libc",
+  "rand_chacha",
+  "rand_core",
+@@ -639,7 +608,7 @@ version = "0.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+ dependencies = [
+- "getrandom",
++ "getrandom 0.1.16",
+ ]
+ 
+ [[package]]
+@@ -653,9 +622,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rayon"
+-version = "1.7.0"
++version = "1.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
++checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+ dependencies = [
+  "either",
+  "rayon-core",
+@@ -663,30 +632,19 @@ dependencies = [
+ 
+ [[package]]
+ name = "rayon-core"
+-version = "1.11.0"
++version = "1.12.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
++checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+ dependencies = [
+- "crossbeam-channel",
+  "crossbeam-deque",
+  "crossbeam-utils",
+- "num_cpus",
+-]
+-
+-[[package]]
+-name = "redox_syscall"
+-version = "0.3.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+-dependencies = [
+- "bitflags 1.3.2",
+ ]
+ 
+ [[package]]
+ name = "regex"
+-version = "1.9.5"
++version = "1.11.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
++checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+ dependencies = [
+  "aho-corasick",
+  "memchr",
+@@ -696,9 +654,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "regex-automata"
+-version = "0.3.8"
++version = "0.4.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
++checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+ dependencies = [
+  "aho-corasick",
+  "memchr",
+@@ -707,9 +665,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "regex-syntax"
+-version = "0.7.5"
++version = "0.8.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
++checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+ 
+ [[package]]
+ name = "roxmltree"
+@@ -722,22 +680,28 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustix"
+-version = "0.38.13"
++version = "1.0.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662"
++checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+ dependencies = [
+- "bitflags 2.4.0",
++ "bitflags 2.9.0",
+  "errno",
+  "libc",
+  "linux-raw-sys",
+- "windows-sys",
++ "windows-sys 0.59.0",
+ ]
+ 
++[[package]]
++name = "rustversion"
++version = "1.0.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
++
+ [[package]]
+ name = "ryu"
+-version = "1.0.15"
++version = "1.0.20"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
++checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+ 
+ [[package]]
+ name = "same-file"
+@@ -748,17 +712,11 @@ dependencies = [
+  "winapi-util",
+ ]
+ 
+-[[package]]
+-name = "scopeguard"
+-version = "1.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+-
+ [[package]]
+ name = "serde"
+-version = "1.0.203"
++version = "1.0.219"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
++checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+ dependencies = [
+  "serde_derive",
+ ]
+@@ -784,22 +742,23 @@ dependencies = [
+ 
+ [[package]]
+ name = "serde_derive"
+-version = "1.0.203"
++version = "1.0.219"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
++checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.66",
++ "syn 2.0.100",
+ ]
+ 
+ [[package]]
+ name = "serde_json"
+-version = "1.0.117"
++version = "1.0.140"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
++checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+ dependencies = [
+  "itoa",
++ "memchr",
+  "ryu",
+  "serde",
+ ]
+@@ -817,6 +776,12 @@ dependencies = [
+  "unsafe-libyaml",
+ ]
+ 
++[[package]]
++name = "shlex"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
++
+ [[package]]
+ name = "stderrlog"
+ version = "0.5.4"
+@@ -873,9 +838,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "syn"
+-version = "2.0.66"
++version = "2.0.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
++checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -884,15 +849,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "tempfile"
+-version = "3.8.0"
++version = "3.19.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
++checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
+ dependencies = [
+- "cfg-if",
+  "fastrand",
+- "redox_syscall",
++ "getrandom 0.3.2",
++ "once_cell",
+  "rustix",
+- "windows-sys",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -915,29 +880,29 @@ dependencies = [
+ 
+ [[package]]
+ name = "thiserror"
+-version = "1.0.48"
++version = "1.0.69"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+ dependencies = [
+  "thiserror-impl",
+ ]
+ 
+ [[package]]
+ name = "thiserror-impl"
+-version = "1.0.48"
++version = "1.0.69"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.66",
++ "syn 2.0.100",
+ ]
+ 
+ [[package]]
+ name = "thread_local"
+-version = "1.1.7"
++version = "1.1.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
++checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+ dependencies = [
+  "cfg-if",
+  "once_cell",
+@@ -964,27 +929,27 @@ dependencies = [
+ 
+ [[package]]
+ name = "unicode-ident"
+-version = "1.0.11"
++version = "1.0.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
++checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+ 
+ [[package]]
+ name = "unicode-segmentation"
+-version = "1.10.1"
++version = "1.12.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
++checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+ 
+ [[package]]
+ name = "unicode-width"
+-version = "0.1.10"
++version = "0.1.14"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
++checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+ 
+ [[package]]
+ name = "unsafe-libyaml"
+-version = "0.2.9"
++version = "0.2.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
++checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+ 
+ [[package]]
+ name = "vec_map"
+@@ -994,15 +959,15 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+ 
+ [[package]]
+ name = "version_check"
+-version = "0.9.4"
++version = "0.9.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
++checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+ 
+ [[package]]
+ name = "walkdir"
+-version = "2.4.0"
++version = "2.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
++checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+ dependencies = [
+  "same-file",
+  "winapi-util",
+@@ -1020,36 +985,46 @@ version = "0.11.0+wasi-snapshot-preview1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+ 
++[[package]]
++name = "wasi"
++version = "0.14.2+wasi-0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
++dependencies = [
++ "wit-bindgen-rt",
++]
++
+ [[package]]
+ name = "wasm-bindgen"
+-version = "0.2.87"
++version = "0.2.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
++checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+ dependencies = [
+  "cfg-if",
++ "once_cell",
++ "rustversion",
+  "wasm-bindgen-macro",
+ ]
+ 
+ [[package]]
+ name = "wasm-bindgen-backend"
+-version = "0.2.87"
++version = "0.2.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
++checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+ dependencies = [
+  "bumpalo",
+  "log",
+- "once_cell",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.66",
++ "syn 2.0.100",
+  "wasm-bindgen-shared",
+ ]
+ 
+ [[package]]
+ name = "wasm-bindgen-macro"
+-version = "0.2.87"
++version = "0.2.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
++checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+ dependencies = [
+  "quote",
+  "wasm-bindgen-macro-support",
+@@ -1057,28 +1032,31 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro-support"
+-version = "0.2.87"
++version = "0.2.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
++checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.66",
++ "syn 2.0.100",
+  "wasm-bindgen-backend",
+  "wasm-bindgen-shared",
+ ]
+ 
+ [[package]]
+ name = "wasm-bindgen-shared"
+-version = "0.2.87"
++version = "0.2.100"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
++checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
++dependencies = [
++ "unicode-ident",
++]
+ 
+ [[package]]
+ name = "web-sys"
+-version = "0.3.64"
++version = "0.3.77"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
++checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+ dependencies = [
+  "js-sys",
+  "wasm-bindgen",
+@@ -1102,11 +1080,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+ 
+ [[package]]
+ name = "winapi-util"
+-version = "0.1.5"
++version = "0.1.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
++checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+ dependencies = [
+- "winapi",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -1116,12 +1094,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+ 
+ [[package]]
+-name = "windows"
+-version = "0.48.0"
++name = "windows-core"
++version = "0.61.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
++dependencies = [
++ "windows-implement",
++ "windows-interface",
++ "windows-link",
++ "windows-result",
++ "windows-strings",
++]
++
++[[package]]
++name = "windows-implement"
++version = "0.60.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.100",
++]
++
++[[package]]
++name = "windows-interface"
++version = "0.59.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
++checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+ dependencies = [
+- "windows-targets",
++ "proc-macro2",
++ "quote",
++ "syn 2.0.100",
++]
++
++[[package]]
++name = "windows-link"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
++
++[[package]]
++name = "windows-result"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
++dependencies = [
++ "windows-link",
++]
++
++[[package]]
++name = "windows-strings"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
++dependencies = [
++ "windows-link",
+ ]
+ 
+ [[package]]
+@@ -1130,7 +1158,16 @@ version = "0.48.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+ dependencies = [
+- "windows-targets",
++ "windows-targets 0.48.5",
++]
++
++[[package]]
++name = "windows-sys"
++version = "0.59.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
++dependencies = [
++ "windows-targets 0.52.6",
+ ]
+ 
+ [[package]]
+@@ -1139,13 +1176,29 @@ version = "0.48.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+ dependencies = [
+- "windows_aarch64_gnullvm",
+- "windows_aarch64_msvc",
+- "windows_i686_gnu",
+- "windows_i686_msvc",
+- "windows_x86_64_gnu",
+- "windows_x86_64_gnullvm",
+- "windows_x86_64_msvc",
++ "windows_aarch64_gnullvm 0.48.5",
++ "windows_aarch64_msvc 0.48.5",
++ "windows_i686_gnu 0.48.5",
++ "windows_i686_msvc 0.48.5",
++ "windows_x86_64_gnu 0.48.5",
++ "windows_x86_64_gnullvm 0.48.5",
++ "windows_x86_64_msvc 0.48.5",
++]
++
++[[package]]
++name = "windows-targets"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
++dependencies = [
++ "windows_aarch64_gnullvm 0.52.6",
++ "windows_aarch64_msvc 0.52.6",
++ "windows_i686_gnu 0.52.6",
++ "windows_i686_gnullvm",
++ "windows_i686_msvc 0.52.6",
++ "windows_x86_64_gnu 0.52.6",
++ "windows_x86_64_gnullvm 0.52.6",
++ "windows_x86_64_msvc 0.52.6",
+ ]
+ 
+ [[package]]
+@@ -1154,50 +1207,127 @@ version = "0.48.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+ 
++[[package]]
++name = "windows_aarch64_gnullvm"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
++
+ [[package]]
+ name = "windows_aarch64_msvc"
+ version = "0.48.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+ 
++[[package]]
++name = "windows_aarch64_msvc"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
++
+ [[package]]
+ name = "windows_i686_gnu"
+ version = "0.48.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+ 
++[[package]]
++name = "windows_i686_gnu"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
++
++[[package]]
++name = "windows_i686_gnullvm"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
++
+ [[package]]
+ name = "windows_i686_msvc"
+ version = "0.48.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+ 
++[[package]]
++name = "windows_i686_msvc"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
++
+ [[package]]
+ name = "windows_x86_64_gnu"
+ version = "0.48.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+ 
++[[package]]
++name = "windows_x86_64_gnu"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
++
+ [[package]]
+ name = "windows_x86_64_gnullvm"
+ version = "0.48.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+ 
++[[package]]
++name = "windows_x86_64_gnullvm"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
++
+ [[package]]
+ name = "windows_x86_64_msvc"
+ version = "0.48.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+ 
++[[package]]
++name = "windows_x86_64_msvc"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
++
++[[package]]
++name = "wit-bindgen-rt"
++version = "0.39.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
++dependencies = [
++ "bitflags 2.9.0",
++]
++
+ [[package]]
+ name = "xml-rs"
+-version = "0.8.18"
++version = "0.8.25"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a"
++checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4"
+ 
+ [[package]]
+ name = "xmlparser"
+-version = "0.13.5"
++version = "0.13.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd"
++checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
++
++[[package]]
++name = "zerocopy"
++version = "0.8.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
++dependencies = [
++ "zerocopy-derive",
++]
++
++[[package]]
++name = "zerocopy-derive"
++version = "0.8.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.100",
++]
+diff --git a/Cargo.toml b/Cargo.toml
+index d702030..5ee83a1 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -129,7 +129,7 @@ version = ">= 0.4, < 0.6"
+ version = "0.3"
+ 
+ [dependencies.tempfile]
+-version = "3.2"
++version = "3"
+ 
+ [dependencies.toml]
+ version = "0.5"
+@@ -138,4 +138,4 @@ version = "0.5"
+ version = "0.3.0"
+ 
+ [dev-dependencies.tempfile]
+-version = "3.2"
++version = "3"
diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch
new file mode 100644
index 0000000000..1e2cdacf4c
--- /dev/null
+++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch
@@ -0,0 +1,172 @@
+From f453ec77fa9e6fd961a1f5f0b221260a5a21bba2 Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Date: Tue, 27 Aug 2024 14:08:47 +0300
+Subject: [PATCH] deqp-runner: drop zstd support
+
+Building zstd-sys results in the "foo contains reference to TMPDIR" QA
+error. Revert commit 1adddf3aa89f21b472d8046347ccdfa4612f141b to drop
+zstd dependency.
+
+Upstream-Status: Inappropriate [oe specific]
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ Cargo.lock | 45 ---------------------------------------------
+ Cargo.toml |  3 ---
+ src/lib.rs | 31 +++++++------------------------
+ 3 files changed, 7 insertions(+), 72 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 8443695e2bd5..50924576a8e3 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -94,7 +94,6 @@ version = "1.0.83"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+ dependencies = [
+- "jobserver",
+  "libc",
+ ]
+ 
+@@ -271,7 +270,6 @@ dependencies = [
+  "structopt",
+  "tempfile",
+  "toml",
+- "zstd",
+ ]
+ 
+ [[package]]
+@@ -423,15 +421,6 @@ version = "1.0.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+ 
+-[[package]]
+-name = "jobserver"
+-version = "0.1.31"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+-dependencies = [
+- "libc",
+-]
+-
+ [[package]]
+ name = "js-sys"
+ version = "0.3.64"
+@@ -544,12 +533,6 @@ version = "11.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+ 
+-[[package]]
+-name = "pkg-config"
+-version = "0.3.30"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+-
+ [[package]]
+ name = "plotters"
+ version = "0.3.5"
+@@ -1217,31 +1200,3 @@ name = "xmlparser"
+ version = "0.13.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd"
+-
+-[[package]]
+-name = "zstd"
+-version = "0.13.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
+-dependencies = [
+- "zstd-safe",
+-]
+-
+-[[package]]
+-name = "zstd-safe"
+-version = "7.1.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
+-dependencies = [
+- "zstd-sys",
+-]
+-
+-[[package]]
+-name = "zstd-sys"
+-version = "2.0.10+zstd.1.5.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
+-dependencies = [
+- "cc",
+- "pkg-config",
+-]
+diff --git a/Cargo.toml b/Cargo.toml
+index ac6295763e87..1fa1344a3105 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -120,9 +120,6 @@ version = "3.2"
+ [dependencies.toml]
+ version = "0.5"
+ 
+-[dependencies.zstd]
+-version = "0.13.0"
+-
+ [dev-dependencies.criterion]
+ version = "0.3.0"
+ 
+diff --git a/src/lib.rs b/src/lib.rs
+index e7095267f1cd..ff7bc4f5d025 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -63,7 +63,6 @@ use rayon::prelude::*;
+ use regex::RegexSet;
+ use serde::{Deserialize, Serialize};
+ use std::collections::HashMap;
+-use std::ffi::OsStr;
+ use std::fs::File;
+ use std::io::prelude::*;
+ use std::io::BufReader;
+@@ -76,7 +75,6 @@ use std::time::Duration;
+ use std::time::Instant;
+ use structopt::StructOpt;
+ use timeout::{TimeoutChildExt, TimeoutChildStdout, Timer};
+-use zstd::stream::read::Decoder;
+ 
+ fn parse_key_val<T, U>(s: &str) -> Result<(T, U), Box<dyn std::error::Error>>
+ where
+@@ -1082,32 +1080,17 @@ pub fn read_lines<I: IntoIterator<Item = impl AsRef<Path>>>(files: I) -> Result<
+     let mut lines: Vec<String> = Vec::new();
+ 
+     for path in files {
+-        let mut path: &Path = path.as_ref();
+-        let mut path_compressed: PathBuf = path.to_path_buf();
+-
+-        // always try append zst extension (and keep existing one, e.g. .txt)
+-        let ext = if let Some(file_ext) = path.extension().and_then(|ext| ext.to_str()) {
+-            format!("{}.zst", file_ext)
+-        } else {
+-            (".zst").to_string()
+-        };
+-
+-        path_compressed.set_extension(ext);
+-        if path_compressed.exists() {
+-            path = path_compressed.as_ref();
+-        }
+-        let file = File::open(path).with_context(|| format!("opening path: {}", path.display()))?;
+-        let reader: Box<dyn Read> = match path.extension().and_then(OsStr::to_str) {
+-            Some("zst") => Box::new(Decoder::new(file).unwrap()),
+-            _ => Box::new(file),
+-        };
+-
+-        for line in BufReader::new(reader).lines() {
++        let path = path.as_ref();
++        for line in BufReader::new(
++            File::open(path).with_context(|| format!("opening path: {}", path.display()))?,
++        )
++        .lines()
++        {
+             let line = line.with_context(|| format!("reading line from {}", path.display()))?;
+             // In newer dEQP, vk-master.txt just contains a list of .txt
+             // caselist files relative to its current path, so recursively read
+             // thoseand append their contents.
+-            if line.ends_with(".txt") || line.ends_with(".txt.zst") {
++            if line.ends_with(".txt") {
+                 let sub_path = path.parent().context("Getting path parent dir")?.join(line);
+ 
+                 lines.extend_from_slice(
diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.3.bb b/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.3.bb
new file mode 100644
index 0000000000..57f1635426
--- /dev/null
+++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.3.bb
@@ -0,0 +1,21 @@
+SUMMARY = "A VK-GL-CTS/dEQP wrapper program to parallelize it across CPUs and report results against a baseline."
+HOMEPAGE = "https://gitlab.freedesktop.org/mesa/deqp-runner"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = " \
+    file://LICENSE;md5=4f59d6446bf2e004e80df1a0937129fa\
+"
+
+inherit cargo cargo-update-recipe-crates
+
+SRC_URI += " \
+    crate://crates.io/deqp-runner/${PV} \
+    file://0001-deqp-runner-drop-zstd-support.patch \
+    file://0001-cargo-Update-tempfile-to-latest-3.x.patch \
+    file://0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch;patchdir=${CARGO_VENDORING_DIRECTORY}/libc-0.2.171 \
+"
+SRC_URI[deqp-runner-0.20.3.sha256sum] = "2de4b135ed68a7f821deeedebb4084d33058b0307f1f9935e2c960430f7532e8"
+
+require deqp-runner-crates.inc
+
+RUSTFLAGS:append:riscv32 = " --cfg getrandom_backend=\"linux_raw\""
diff --git a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
index 1ee2657bd0..1018e0675e 100644
--- a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
+++ b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/lucasdemarchi/dietsplash.git;branch=master;protocol=
 
 inherit autotools
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF = " --with-systemdsystemunitdir=${systemd_unitdir}/system \
                  --disable-staticimages --with-rootdir=${root_prefix}"
diff --git a/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb b/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb
index 398e339482..f4a257ce89 100644
--- a/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb
+++ b/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb
@@ -14,9 +14,8 @@ SRC_URI = " \
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=ecf6fd2b19915afc4da56043926ca18f"
 
-S = "${WORKDIR}/DirectFB-examples-${PV}"
+S = "${UNPACKDIR}/DirectFB-examples-${PV}"
 
 inherit autotools pkgconfig
 
-SRC_URI[md5sum] = "8b60c867af295481c32a8c7fc5802307"
 SRC_URI[sha256sum] = "9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a"
diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc
index 54aeb06aa9..0dc410b2cb 100644
--- a/meta-oe/recipes-graphics/directfb/directfb.inc
+++ b/meta-oe/recipes-graphics/directfb/directfb.inc
@@ -9,7 +9,7 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"
 
 HOMEPAGE = "http://directfb.org"
-DEPENDS = "jpeg libpng freetype zlib sysfsutils"
+DEPENDS = "jpeg libpng"
 
 SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \
            file://configurefix.patch \
@@ -25,36 +25,34 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g
            file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \
            file://0001-include-libgen.h-for-basename.patch \
            file://0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch \
+           file://0001-libdirect-remove-use-of-keyword-register.patch \
            "
 
-S = "${WORKDIR}/DirectFB-${PV}"
+S = "${UNPACKDIR}/DirectFB-${PV}"
 
 LDFLAGS:append = " -lm"
 
 CXXFLAGS:append:toolchain-clang = " -Wno-error=dtor-typedef"
 
-# Workaround for linking issues seen with armv7a + gold
-LDFLAGS:append:arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
-
 BINCONFIG = "${bindir}/directfb-config"
 
 inherit autotools binconfig-disabled pkgconfig
 
-PACKAGECONFIG ??= "linuxinput"
-PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper"
+PACKAGECONFIG ??= "freetype linuxinput zlib"
 PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm"
-PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff"
-PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
-PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib"
+PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype,freetype"
+PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper"
+PACKAGECONFIG[mesa] = "--enable-mesa,--disable-mesa,virtual/mesa,"
 PACKAGECONFIG[linuxinput] = "--with-inputdrivers=linuxinput,,"
 PACKAGECONFIG[noinput] = "--with-inputdrivers=none,,"
-PACKAGECONFIG[mesa] = "--enable-mesa,--disable-mesa,virtual/mesa,"
+PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff"
+PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib"
+PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
 PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,xserver-xorg,"
+PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
 
 EXTRA_OECONF = "\
   --with-gfxdrivers=none \
-  --enable-freetype=yes \
-  --enable-zlib \
   --disable-imlib2 \
   --disable-sdl \
   --disable-vnc \
diff --git a/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch b/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch
new file mode 100644
index 0000000000..24d977f4dc
--- /dev/null
+++ b/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch
@@ -0,0 +1,44 @@
+From f6cdb9f1c3dbef8ef695703a2a5fb4e92b2dd8a0 Mon Sep 17 00:00:00 2001
+From: Simon Barth <simon.barth@gmx.de>
+Date: Mon, 5 Aug 2024 19:35:16 +0200
+Subject: [PATCH] libdirect: remove use of keyword 'register'
+
+The 'register' keyword was removed in C++17 and is now unused and
+reserved. When compiling code that uses DirecthFB with C++17,
+compilation fails.
+
+Since modern compilers likely don't produce different code whether the
+'register' keyword is used or not, there shouldn't be any performance
+impact introduced by this change.
+
+Signed-off-by: Simon Barth <simon.barth@gmx.de>
+
+Upstream-Status: Submitted [https://github.com/deniskropp/DirectFB/pull/25]
+---
+ lib/direct/util.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/direct/util.h b/lib/direct/util.h
+index 2109b6ca1..734645796 100644
+--- a/lib/direct/util.h
++++ b/lib/direct/util.h
+@@ -220,7 +220,7 @@ void DIRECT_API direct_md5_sum( void *dst, const void *src, const int len );
+ static __inline__ int
+ direct_util_count_bits( unsigned int mask )
+ {
+-     register int ret = 0;
++     int ret = 0;
+ 
+      while (mask) {
+           ret += mask & 1;
+@@ -325,7 +325,7 @@ D_ICEIL(float f)
+ static __inline__ int
+ direct_log2( int val )
+ {
+-     register int ret = 0;
++     int ret = 0;
+ 
+      while (val >> ++ret);
+ 
+-- 
+2.25.1
diff --git a/meta-oe/recipes-graphics/directfb/directfb_1.7.7.bb b/meta-oe/recipes-graphics/directfb/directfb_1.7.7.bb
index c6c070eda6..15f22697cd 100644
--- a/meta-oe/recipes-graphics/directfb/directfb_1.7.7.bb
+++ b/meta-oe/recipes-graphics/directfb/directfb_1.7.7.bb
@@ -4,5 +4,4 @@ RV = "1.7-7"
 
 LEAD_SONAME = "libdirectfb-1.7.so.0"
 
-SRC_URI[md5sum] = "152cf1863b1a3a28aa1370e9053440bf"
 SRC_URI[sha256sum] = "b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3"
diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb
index 50504caf9f..ef6dc14ca6 100644
--- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb
+++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/manatools/dnfdragora.git;branch=stable-2.x;protocol=
 
 SRCREV = "abbe08b7a487325182758d5285b54437a914207b"
 
-S = "${WORKDIR}/git"
 
 inherit cmake gettext pkgconfig python3-dir python3native setuptools3-base mime-xdg
 
diff --git a/meta-oe/recipes-graphics/drm/drm-info_2.7.0.bb b/meta-oe/recipes-graphics/drm/drm-info_2.7.0.bb
new file mode 100644
index 0000000000..810be40013
--- /dev/null
+++ b/meta-oe/recipes-graphics/drm/drm-info_2.7.0.bb
@@ -0,0 +1,12 @@
+SUMMARY = "Small utility to dump info about DRM devices"
+HOMEPAGE = "https://gitlab.freedesktop.org/emersion/drm_info"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=32fd56d355bd6a61017655d8da26b67c"
+
+SRC_URI = "git://gitlab.freedesktop.org/emersion/drm_info.git;branch=master;protocol=https"
+SRCREV = "c1f5ca4cf750b26eb26c1d9d5c2ef057acbcfefc"
+
+
+inherit meson pkgconfig
+
+DEPENDS = "json-c libdrm"
diff --git a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb
index 7b52ead909..72187696e3 100644
--- a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb
+++ b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb
@@ -7,10 +7,14 @@ DEPENDS = "libpng zlib"
 SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https;branch=master"
 
 SRCREV = "f43ce6d5ce48fb01360eaa7c4a92c2573a1d02f8"
-S = "${WORKDIR}/git"
-
-inherit autotools-brokensep
 
 do_configure:prepend() {
-    sed -i 's|$(DESTDIR)/usr/man/|$(DESTDIR)${mandir}/|g' ${S}/Makefile
+    sed \
+        -e 's|$(DESTDIR)/usr/bin/|$(DESTDIR)${bindir}/|g' \
+        -e 's|$(DESTDIR)/usr/man/|$(DESTDIR)${mandir}/|g' \
+        -i ${S}/Makefile
+}
+
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
 }
diff --git a/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-oe/recipes-graphics/fbida/fbida_git.bb
index 6c06748499..2736f61004 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_git.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_git.bb
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/kraxel/fbida;protocol=https;branch=master \
            file://0001-fbida-Include-missing-sys-types.h.patch \
 "
 SRCREV = "eb769e3d7f4a073d4c37ed524ebd5017c6a578f5"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
 
diff --git a/meta-oe/recipes-graphics/feh/feh_3.10.2.bb b/meta-oe/recipes-graphics/feh/feh_3.10.3.bb
index 2c38ce614b..5ab333c60d 100644
--- a/meta-oe/recipes-graphics/feh/feh_3.10.2.bb
+++ b/meta-oe/recipes-graphics/feh/feh_3.10.3.bb
@@ -9,7 +9,7 @@ DEPENDS = "\
 "
 
 SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "5f94a77de25c5398876f0cf431612d782b842f4db154d2139b778c8f196e8969"
+SRC_URI[sha256sum] = "5426e2799770217af1e01c2e8c182d9ca8687d84613321d8ab4a66fe4041e9c8"
 
 inherit mime-xdg features_check
 # depends on virtual/libx11
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2024-25081_CVE-2024-25082.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2024-25081_CVE-2024-25082.patch
new file mode 100644
index 0000000000..40f85e9f33
--- /dev/null
+++ b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2024-25081_CVE-2024-25082.patch
@@ -0,0 +1,181 @@
+From 216eb14b558df344b206bf82e2bdaf03a1f2f429 Mon Sep 17 00:00:00 2001
+From: Peter Kydas <pk@canva.com>
+Date: Tue, 6 Feb 2024 20:03:04 +1100
+Subject: [PATCH] fix splinefont shell command injection (#5367)
+
+CVE: CVE-2024-25081
+CVE: CVE-2024-25082
+Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/216eb14b558df344b206bf82e2bdaf03a1f2f429]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ fontforge/splinefont.c | 123 +++++++++++++++++++++++++++++------------
+ 1 file changed, 89 insertions(+), 34 deletions(-)
+
+diff --git a/fontforge/splinefont.c b/fontforge/splinefont.c
+index 239fdc035..647daee10 100644
+--- a/fontforge/splinefont.c
++++ b/fontforge/splinefont.c
+@@ -788,11 +788,14 @@ return( name );
+ 
+ char *Unarchive(char *name, char **_archivedir) {
+     char *dir = getenv("TMPDIR");
+-    char *pt, *archivedir, *listfile, *listcommand, *unarchivecmd, *desiredfile;
++    char *pt, *archivedir, *listfile, *desiredfile;
+     char *finalfile;
+     int i;
+     int doall=false;
+     static int cnt=0;
++    gchar *command[5];
++    gchar *stdoutresponse = NULL;
++    gchar *stderrresponse = NULL;
+ 
+     *_archivedir = NULL;
+ 
+@@ -827,18 +830,30 @@ return( NULL );
+     listfile = malloc(strlen(archivedir)+strlen("/" TOC_NAME)+1);
+     sprintf( listfile, "%s/" TOC_NAME, archivedir );
+ 
+-    listcommand = malloc( strlen(archivers[i].unarchive) + 1 +
+-                       strlen( archivers[i].listargs) + 1 +
+-                       strlen( name ) + 3 +
+-                       strlen( listfile ) +4 );
+-    sprintf( listcommand, "%s %s %s > %s", archivers[i].unarchive,
+-           archivers[i].listargs, name, listfile );
+-    if ( system(listcommand)!=0 ) {
+-       free(listcommand); free(listfile);
+-       ArchiveCleanup(archivedir);
+-return( NULL );
++    command[0] = archivers[i].unarchive;
++    command[1] = archivers[i].listargs;
++    command[2] = name;
++    command[3] = NULL; // command args need to be NULL-terminated
++
++    if ( g_spawn_sync(
++                      NULL,
++                      command,
++                      NULL,
++                      G_SPAWN_SEARCH_PATH, 
++                      NULL, 
++                      NULL, 
++                      &stdoutresponse, 
++                      &stderrresponse, 
++                      NULL, 
++                      NULL
++                      ) == FALSE) { // did not successfully execute
++      ArchiveCleanup(archivedir);
++      return( NULL );
+     }
+-    free(listcommand);
++    // Write out the listfile to be read in later
++    FILE *fp = fopen(listfile, "wb");
++    fwrite(stdoutresponse, strlen(stdoutresponse), 1, fp);
++    fclose(fp);
+ 
+     desiredfile = ArchiveParseTOC(listfile, archivers[i].ars, &doall);
+     free(listfile);
+@@ -847,22 +862,28 @@ return( NULL );
+ return( NULL );
+     }
+ 
+-    /* I tried sending everything to stdout, but that doesn't work if the */
+-    /*  output is a directory file (ufo, sfdir) */
+-    unarchivecmd = malloc( strlen(archivers[i].unarchive) + 1 +
+-                       strlen( archivers[i].listargs) + 1 +
+-                       strlen( name ) + 1 +
+-                       strlen( desiredfile ) + 3 +
+-                       strlen( archivedir ) + 30 );
+-    sprintf( unarchivecmd, "( cd %s ; %s %s %s %s ) > /dev/null", archivedir,
+-           archivers[i].unarchive,
+-           archivers[i].extractargs, name, doall ? "" : desiredfile );
+-    if ( system(unarchivecmd)!=0 ) {
+-       free(unarchivecmd); free(desiredfile);
+-       ArchiveCleanup(archivedir);
+-return( NULL );
++    command[0] = archivers[i].unarchive;
++    command[1] = archivers[i].extractargs;
++    command[2] = name;
++    command[3] = doall ? "" : desiredfile;
++    command[4] = NULL;
++
++    if ( g_spawn_sync(
++                      (gchar*)archivedir,
++                      command,
++                      NULL,
++                      G_SPAWN_SEARCH_PATH, 
++                      NULL, 
++                      NULL, 
++                      &stdoutresponse, 
++                      &stderrresponse, 
++                      NULL, 
++                      NULL
++                      ) == FALSE) { // did not successfully execute
++      free(desiredfile);
++      ArchiveCleanup(archivedir);
++      return( NULL );
+     }
+-    free(unarchivecmd);
+ 
+     finalfile = malloc( strlen(archivedir) + 1 + strlen(desiredfile) + 1);
+     sprintf( finalfile, "%s/%s", archivedir, desiredfile );
+@@ -885,20 +906,54 @@ struct compressors compressors[] = {
+ 
+ char *Decompress(char *name, int compression) {
+     char *dir = getenv("TMPDIR");
+-    char buf[1500];
+     char *tmpfn;
+-
++    gchar *command[4];
++    gint stdout_pipe;
++    gchar buffer[4096];
++    gssize bytes_read;
++    GByteArray *binary_data = g_byte_array_new();
++    
+     if ( dir==NULL ) dir = P_tmpdir;
+     tmpfn = malloc(strlen(dir)+strlen(GFileNameTail(name))+2);
+     strcpy(tmpfn,dir);
+     strcat(tmpfn,"/");
+     strcat(tmpfn,GFileNameTail(name));
+     *strrchr(tmpfn,'.') = '\0';
+-    snprintf( buf, sizeof(buf), "%s < %s > %s", compressors[compression].decomp, name, tmpfn );
+-    if ( system(buf)==0 )
+-return( tmpfn );
+-    free(tmpfn);
+-return( NULL );
++
++    command[0] = compressors[compression].decomp;
++    command[1] = "-c";
++    command[2] = name;
++    command[3] = NULL;
++
++    // Have to use async because g_spawn_sync doesn't handle nul-bytes in the output (which happens with binary data)
++    if (g_spawn_async_with_pipes(
++      NULL, 
++      command, 
++      NULL, 
++      G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
++      NULL, 
++      NULL,  
++      NULL,
++      NULL, 
++      &stdout_pipe, 
++      NULL, 
++      NULL) == FALSE) {
++      //command has failed
++      return( NULL );
++    }
++
++    // Read binary data from pipe and output to file
++    while ((bytes_read = read(stdout_pipe, buffer, sizeof(buffer))) > 0) {
++        g_byte_array_append(binary_data, (guint8 *)buffer, bytes_read);
++    }
++    close(stdout_pipe);
++
++    FILE *fp = fopen(tmpfn, "wb");
++    fwrite(binary_data->data, sizeof(gchar), binary_data->len, fp);
++    fclose(fp);
++    g_byte_array_free(binary_data, TRUE);
++
++               return(tmpfn);
+ }
+ 
+ static char *ForceFileToHaveName(FILE *file, char *exten) {
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb
index 31dd495fd7..af77ec913e 100644
--- a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb
+++ b/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb
@@ -20,8 +20,8 @@ SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
            file://0001-fontforgeexe-Use-env-to-find-fontforge.patch \
            file://0001-cmake-Use-alternate-way-to-detect-libm.patch \
            file://0001-Fix-Translations-containing-invalid-directives-hs.patch \
+           file://CVE-2024-25081_CVE-2024-25082.patch \
 "
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DENABLE_DOCS=OFF"
 PACKAGECONFIG = "readline"
diff --git a/meta-oe/recipes-graphics/fontforge/libspiro_20221101.bb b/meta-oe/recipes-graphics/fontforge/libspiro_20240903.bb
index 0adac8464e..7e07906e17 100644
--- a/meta-oe/recipes-graphics/fontforge/libspiro_20221101.bb
+++ b/meta-oe/recipes-graphics/fontforge/libspiro_20240903.bb
@@ -7,7 +7,10 @@ LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "https://github.com/fontforge/libspiro/releases/download/${PV}/libspiro-dist-${PV}.tar.gz"
-SRC_URI[sha256sum] = "5984fb5af3e4e1f927f3a74850b705a711fb86284802a5e6170b09786440e8be"
+SRC_URI[sha256sum] = "1412a21b943c6e1db834ee2d74145aad20b3f62b12152d475613b8241d9cde10"
+
+UPSTREAM_CHECK_URI = "https://github.com/fontforge/libspiro/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+)"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch
deleted file mode 100644
index 385bff8dd1..0000000000
--- a/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e3bce98a60d6db3b719bbf5d71f732f9b86cb566 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 9 Feb 2019 08:28:09 -0800
-Subject: [PATCH] Explicit typecast to avoid implicit double to float
- conversion
-
-fixes compile errors e.g.
-
-../../ftgl-2.1.3~rc5/demo/simple.cpp:110:27: error: non-constant-expression cannot be narrowed from type 'double' to
-      'float' in initializer list [-Wc++11-narrowing]
-                          (t3 + 2.0) / 3, 0.3 };
-                          ^~~~~~~~~~~~~~
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- demo/simple.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/demo/simple.cpp b/demo/simple.cpp
-index 532e862..aba55b4 100644
---- a/demo/simple.cpp
-+++ b/demo/simple.cpp
-@@ -105,9 +105,9 @@ static void RenderScene(void)
-     float t2 = sin(n / 50 + 1);
-     float t3 = sin(n / 30 + 2);
- 
--    float ambient[4]  = { (t1 + 2.0) / 3,
--                          (t2 + 2.0) / 3,
--                          (t3 + 2.0) / 3, 0.3 };
-+    float ambient[4]  = { float(t1 + 2.0) / 3,
-+                          float(t2 + 2.0) / 3,
-+                          float(t3 + 2.0) / 3, 0.3 };
-     float diffuse[4]  = { 1.0, 0.9, 0.9, 1.0 };
-     float specular[4] = { 1.0, 0.7, 0.7, 1.0 };
-     float position[4] = { 100.0, 100.0, 0.0, 1.0 };
--- 
-2.20.1
-
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch
new file mode 100644
index 0000000000..9c91b5be19
--- /dev/null
+++ b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch
@@ -0,0 +1,33 @@
+From d11219b681a080c71e33c51c9404c28b134e1745 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 21 Aug 2024 13:50:34 -0700
+Subject: [PATCH] Fix type mismatch with latest FreeType
+
+This change is intrumented due to a type change in freetype [1] with release 2.13.3
+
+Fixes
+| ../../git/src/FTVectoriser.cpp:171:15: error: cannot initialize a variable of type 'char *' with an rvalue of type 'unsigned char *'
+|   171 |         char* tagList = &outline.tags[startIndex];
+|       |               ^         ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+[1] https://gitlab.freedesktop.org/freetype/freetype/-/commit/044d142be7b6a93b6940367a1bc5847451ff4775
+
+Upstream-Status: Submitted [https://github.com/HamzaM3/ftgl/pull/1]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/FTVectoriser.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/FTVectoriser.cpp b/src/FTVectoriser.cpp
+index 26e7da8..3610215 100644
+--- a/src/FTVectoriser.cpp
++++ b/src/FTVectoriser.cpp
+@@ -168,7 +168,7 @@ void FTVectoriser::ProcessContours()
+     for(int i = 0; i < ftContourCount; ++i)
+     {
+         FT_Vector* pointList = &outline.points[startIndex];
+-        char* tagList = &outline.tags[startIndex];
++        char* tagList = (char*)&outline.tags[startIndex];
+ 
+         endIndex = outline.contours[i];
+         contourLength =  (endIndex - startIndex) + 1;
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch
deleted file mode 100644
index e5ed0bdb86..0000000000
--- a/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8bb183926078b6dd54048fb6820838fe7b6e6163 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 23 Oct 2016 22:46:43 +0200
-Subject: [PATCH] use pkg-config to find freetype2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 53560ea..b5bb6a3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -41,8 +41,13 @@ AC_CHECK_FUNCS(strndup)
- 
- AC_PATH_X
- 
--AC_CHECK_FT2([9.0.3],[],
--             [AC_MSG_ERROR([FreeType2 is required to compile this library])])
-+PKG_CHECK_MODULES(FT2, freetype2,
-+    CFLAGS="$CFLAGS $FT2_CFLAGS"
-+    LIBS="$LIBS $FT2_LIBS",
-+    AC_MSG_ERROR([FreeType2 is required to compile this library])
-+)
-+AC_SUBST([FT2_CFLAGS])
-+AC_SUBST([FT2_LIBS])
- 
- AC_PATH_XTRA
- 
--- 
-2.5.5
-
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch
deleted file mode 100644
index 830783e204..0000000000
--- a/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From daabb4110661c4358ec73293d5c0b2106f567c1f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 23 Oct 2016 23:54:14 +0200
-Subject: [PATCH] Makefile.am: remove useless and breaking code
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- Makefile.am | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 89a8a7f..e582a34 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -24,15 +24,6 @@ EXTRA_DIST = \
-        m4 \
-        $(NULL)
- 
--# Print out an informative summary.
--all-local:
--       @$(ECHO) "Done."
--       @$(ECHO)
--       @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \
--         $(ECHO) "---" ;\
--         $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\
--       fi
--       @$(ECHO)
- 
- # Upload documentation
- DOC = docs/html docs/latex/ftgl.pdf
--- 
-2.5.5
-
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb b/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb
deleted file mode 100644
index 65f72747cc..0000000000
--- a/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "OpenGL frontend to Freetype 2"
-HOMEPAGE = "https://sourceforge.net/projects/ftgl/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4"
-
-inherit autotools pkgconfig features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl x11"
-
-DEPENDS += " \
-    freetype \
-    freeglut \
-"
-
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
-    file://0001-use-pkg-config-to-find-freetype2.patch \
-    file://0002-Makefile.am-remove-useless-and-breaking-code.patch \
-    file://0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch \
-"
-SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503"
-SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59"
-
-S = "${WORKDIR}/ftgl-2.1.3~rc5"
-
-# undefined reference to symbol 'sin@@GLIBC_2.4'
-CFLAGS += "-lm"
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb b/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb
new file mode 100644
index 0000000000..c5c547186f
--- /dev/null
+++ b/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb
@@ -0,0 +1,19 @@
+SUMMARY = "OpenGL frontend to Freetype 2"
+HOMEPAGE = "https://sourceforge.net/projects/ftgl/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4"
+
+inherit autotools pkgconfig features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl x11"
+
+DEPENDS += " \
+    freetype \
+    freeglut \
+"
+SRCREV = "b787042cc1d1e4861337d5f9a6727e4c6900a4f2"
+PV .= "+git"
+
+SRC_URI = "git://github.com/HamzaM3/ftgl;protocol=https;branch=master \
+           file://0001-Fix-type-mismatch-with-latest-FreeType.patch"
+
diff --git a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb
index df349494aa..959463e962 100644
--- a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb
+++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb
@@ -41,7 +41,6 @@ SRC_URI = " \
 
 SRCREV = "7baf540e56fb1a3e91752acba872a88543529d46"
 
-S = "${WORKDIR}/git"
 
 inherit autotools gettext update-alternatives pkgconfig python3native perlnative features_check
 # depends on virtual/libx11
@@ -72,6 +71,8 @@ EXTRA_OECONF = " \
     --without-xpm-library \
     ac_cv_func_mkstemp=no \
     has_safety_mkstemp=yes \
+    ac_cv_path_FVWM_CPP=cpp \
+    ac_cv_path_PERL=perl \
 "
 
 # show the exact commands in the log file
@@ -90,6 +91,7 @@ do_install:append() {
     sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${bindir}/fvwm-*
     sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${libexecdir}/fvwm/*/Fvwm*
     sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/fvwm-menu-desktop
+    sed -i -e 's:${WORKDIR}::g' ${D}${bindir}/fvwm-bug
 }
 
 # the only needed packages (note: locale packages are automatically generated
diff --git a/meta-oe/recipes-graphics/glad/glad_2.0.8.bb b/meta-oe/recipes-graphics/glad/glad_2.0.8.bb
new file mode 100644
index 0000000000..ea4ee6eac6
--- /dev/null
+++ b/meta-oe/recipes-graphics/glad/glad_2.0.8.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specifications for multiple languages."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae570f26774ac096cff8f992091a223c"
+
+SRC_URI = "git://github.com/Dav1dde/glad.git;protocol=https;branch=glad2"
+SRCREV = "73db193f853e2ee079bf3ca8a64aa2eaf6459043"
+
+inherit python_setuptools_build_meta
+
+BBCLASSEXTEND = "native nativesdk"
+RDEPENDS:${PN} = "python3 python3-jinja2"
diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb
index e313d7a192..e6fd0edd21 100644
--- a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb
+++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb
@@ -20,7 +20,6 @@ SRC_URI = " \
 SRCREV = "efec5db081e3aad807d0731e172ac597f6a39447"
 PV .= "+0.9.9.9+git"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb
index 513845194d..63993bfbeb 100644
--- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb
+++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb
@@ -19,3 +19,6 @@ EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \
                  --without-cdk \
 "
 
+do_compile:prepend() {
+        sed -i -e 's/--sysroot=[^ "]*//g' ${B}/config.h
+}
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
deleted file mode 100644
index fd647b7386..0000000000
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 31a5d2f7db18737aef08c34e8707b4f69f7e5156 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 21 Oct 2012 17:59:20 +0200
-Subject: [PATCH] configure.ac: remove AM_PO_SUBDIRS
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-together with oe autotools.bbclass this is done twice and causes:
-
-| autoreconf: running: aclocal --system-acdir=/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/aclocal-copy/ --automake-acdir=/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/share/aclocal-1.12 -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ --force -I auto-m4 -I m4m
-| configure.ac:230: error: `po-directories' is already registered with AC_CONFIG_COMMANDS.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac                 |    1 -
- libgphoto2_port/configure.ac |    1 -
- 2 files changed, 0 insertions(+), 2 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -282,7 +282,6 @@ dnl ------------------------------------
- GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2],
-                  [${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],
-                  [po])
--AM_PO_SUBDIRS()
- AM_GNU_GETTEXT_VERSION([0.19.1])
- AM_GNU_GETTEXT([external])
- AM_ICONV()
---- a/libgphoto2_port/configure.ac
-+++ b/libgphoto2_port/configure.ac
-@@ -122,7 +122,6 @@ dnl ------------------------------------
- GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2_PORT],
-                  [${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],
-                  [po])
--AM_PO_SUBDIRS()
- AM_GNU_GETTEXT_VERSION([0.19.1])
- AM_GNU_GETTEXT([external])
- AM_ICONV()
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
index 57c9d199eb..0b58e8e75f 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb
@@ -11,7 +11,6 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \
            file://40-libgphoto2.rules \
-           file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
            file://0001-configure-Filter-out-buildpaths-from-CC.patch \
            file://fix-build-with-gcc-14.patch \
 "
@@ -25,18 +24,6 @@ PACKAGECONFIG ??= ""
 PACKAGECONFIG[gd] = ",--without-gdlib,gd"
 PACKAGECONFIG[serial] = "--enable-serial,--disable-serial,lockdev"
 
-do_configure:prepend() {
-    rm -rf ${S}/libgphoto2_port/auto-m4/*
-    rm -rf ${S}/auto-m4/*
-}
-
-do_configure:append() {
-    cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/
-    cd ${S}/libgphoto2_port/
-    autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
-    cd ${S}
-}
-
 do_install:append() {
     install -d ${D}${sysconfdir}/udev/rules.d/
     install -m 0644 ${UNPACKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
@@ -49,6 +36,4 @@ RRECOMMENDS:${PN} = "libgphoto2-camlibs"
 FILES:libgphotoport = "${libdir}/libgphoto2_port.so.*"
 
 FILES:${PN} += "${nonarch_base_libdir}/udev/*"
-FILES:${PN}-dbg += "${libdir}/*/*/.debug"
-FILES:${PN}-dev += "${libdir}/*/*/*.la"
 FILES:${PN}-doc += "${datadir}/libgphoto2_port/0.12.?/vcamera/README.txt"
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch
deleted file mode 100644
index 0d3f412706..0000000000
--- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 671e0d091b40ef7deb4a9d43e0dbed2a44edbec8 Mon Sep 17 00:00:00 2001
-From: Matthew Fernandez <matthew.fernandez@gmail.com>
-Date: Sat, 9 Sep 2023 01:03:04 -0700
-Subject: [PATCH] Autotools: fix: do not put '$prefix' based paths in
- compilation flags
-
-This was causing problems with cross-compilation with a dedicated sysroot,
-because compilation would incorrectly use headers and libraries from the
-`--prefix` path. The `--prefix` path is meant to indicate a target path to
-install to, not a path from which to source dependent libraries.
-
-Gitlab: fixes #2442
-Reported-by: Daniel Klauer
-Suggested-by: Daniel Klauer
-
-Upstream-Status: Backport [https://gitlab.com/graphviz/graphviz/-/commit/012d250a903e13114bce3ba40995fb957fed7848]
-Signed-off-by: Daniel Klauer <daniel.klauer@gin.de>
----
- CHANGELOG.md | 3 +++
- configure.ac | 8 --------
- 2 files changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index b9b7e8e08..3a15fd256 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -39,6 +39,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
-   longer fails due to missing PHP files. #2388
- - Syntax for a loop in `gvmap.sh` has been corrected. This was a regression in
-   Graphviz 2.50.0. #2404
-+- The Autotools build system no longer uses headers and libraries from the
-+  `--prefix` path given on the command line. This previously caused
-+  cross-compilation to incorrectly pick up host headers and libraries. #2442
- 
- ## [8.0.5] – 2023-04-30
- 
-diff --git a/configure.ac b/configure.ac
-index 573a3ee5d..7d53346de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -190,14 +190,6 @@ if test "x${prefix}" = "xNONE"; then
-        AC_SUBST([prefix])
- fi
- 
--# automatically check for other dependencies in $prefix first
--if test "x${prefix}" != "x/usr"; then
--       CPPFLAGS="$CPPFLAGS -I${prefix}/include"
--       LDFLAGS="$LDFLAGS -L${prefix}/lib"
--       PKG_CONFIG_PATH="$prefix/lib/pkgconfig$PATHSEPARATOR$PKG_CONFIG_PATH"
--       export PKG_CONFIG_PATH
--fi
--
- dnl -----------------------------------
- # Static/Shared binaries
- 
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
deleted file mode 100644
index 99b53e2e12..0000000000
--- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 564901ab78da2b2b1bed92351dc3c102dc0a8154 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 6 Aug 2019 17:51:39 -0700
-Subject: [PATCH] Set use_tcl to be empty string if tcl is disabled
-
-Upstream-Status: Inappropriate [Cross-compile specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1225,7 +1225,7 @@ AC_ARG_ENABLE(tcl,
-   [], [enable_tcl=yes])
- 
- if test "x$enable_tcl" != "xyes"; then
--  use_tcl="No (disabled)"
-+  use_tcl=""
- fi
- 
- if test "x$use_tcl" = "x"; then
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,7 +11,7 @@ pkginclude_HEADERS = $(top_builddir)/gra
- dist_man_MANS = graphviz.7
- 
- # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS
--SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs tests
-+SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs tests
- 
- .PHONY: doxygen
- doxygen:
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb b/meta-oe/recipes-graphics/graphviz/graphviz_12.2.1.bb
index 38d738310e..cccbbe75f7 100644
--- a/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb
+++ b/meta-oe/recipes-graphics/graphviz/graphviz_12.2.1.bb
@@ -19,16 +19,14 @@ DEPENDS:append:class-nativesdk = " ${BPN}-native"
 inherit autotools-brokensep pkgconfig gettext qemu
 
 SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-releases/${PV}/${BP}.tar.xz \
-           file://0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch \
            "
-# Use native mkdefs
-SRC_URI:append:class-target = "\
-           file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \
-"
 SRC_URI:append:class-nativesdk = "\
            file://graphviz-setup.sh \
 "
-SRC_URI[sha256sum] = "d593695fdaa8a19297523b679ad13d3ef2027b0b7f14cc2bc23e77969ed81565"
+SRC_URI[sha256sum] = "85e34b5c982777c30f01dfab9ea7c713b4335a2f584e62c0abb9868413eb915b"
+
+UPSTREAM_CHECK_URI = "https://graphviz.org/download/"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 PACKAGECONFIG ??= "librsvg"
 PACKAGECONFIG[librsvg] = "--with-librsvg,--without-librsvg,librsvg"
@@ -40,6 +38,7 @@ EXTRA_OECONF:class-target = "\
                 --with-expatlibdir=${STAGING_LIBDIR} \
                 --without-included-ltdl \
                 --disable-java \
+                --disable-perl \
                 --disable-tcl \
                 --disable-r \
                 --disable-sharp \
diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
index 30964a1b9a..ef9b194f9a 100644
--- a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
+++ b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
@@ -11,12 +11,14 @@ SRC_URI = "http://prdownloads.sourceforge.net/${BPN}/${BPN}_${PV}.tar.gz \
            file://0001-main.c-Define-prototype-for-setup_appdata.patch \
            "
 
-SRC_URI[md5sum] = "4331dde4bb83865e15482885fcb0cc53"
 SRC_URI[sha256sum] = "9704344e732038eecbd007dd996a56293a6b027b5b76f3f036273a3fae1ab27b"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gtkperf/files/gtkperf/"
+UPSTREAM_CHECK_REGEX = "${BPN}_(?P<pver>\d+(\.\d+)+)"
+
 DEPENDS = "gtk+"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 inherit features_check autotools binconfig pkgconfig gettext
 
diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.119.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.122.bb
index 0b1b054041..f912686c41 100644
--- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.119.bb
+++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.122.bb
@@ -6,8 +6,8 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
 
 SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz"
-SRC_URI[sha256sum] = "eab3e09e7641115c07848bfb30f7dd0c3bbe2b8cbe45017e95e077dbba6ac038"
-S = "${WORKDIR}/${BPN}-gtk3-${PV}"
+SRC_URI[sha256sum] = "6201b5f93dcaeafa92fc0ec4ad4baeaf60acf16fc8f019bbf061cf4ebf27938a"
+S = "${UNPACKDIR}/${BPN}-gtk3-${PV}"
 
 DEPENDS = " \
     gperf-native \
@@ -33,12 +33,15 @@ REQUIRED_DISTRO_FEATURES = "wayland x11"
 
 EXTRA_OECONF = " \
     --enable-gtk3 \
-    --with-tcl=${STAGING_BINDIR_CROSS} \
-    --with-tk=${STAGING_BINDIR_CROSS} \
     --with-tirpc \
     --disable-mime-update \
 "
 
+PACKAGECONFIG = ""
+
+PACKAGECONFIG[tcl] = "--with-tcl=${STAGING_BINDIR_CROSS},--disable-tcl,tcl"
+PACKAGECONFIG[tk] = "--with-tk=${STAGING_BINDIR_CROSS},--disable-tcl,tk"
+
 FILES:${PN} = "${bindir} ${datadir}"
 
 RDEPENDS:${PN} += "tk-lib"
diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
index 87e7ed4a6b..66e9f8a0c4 100644
--- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
+++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
@@ -7,15 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
 
 DEPENDS = "freetype "
 PROVIDES = "virtual/imlib2"
-PV = "1.12.2"
-SRCREV = "a860e34b19af6b0a73d86ddc0e4829145e18fa6e"
+PV = "1.12.5"
+SRCREV = "df73df52ddf0e1ea40507f5ee8c6b794b328b3bc"
 
 inherit autotools pkgconfig lib_package
 
 AUTO_LIBNAME_PKGS = ""
 
 SRC_URI = "git://git.enlightenment.org/old/legacy-${BPN}.git;protocol=https;branch=master"
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "jpeg png zlib ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 
diff --git a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb b/meta-oe/recipes-graphics/jasper/jasper_4.2.4.bb
index 5281980ecb..4796a85190 100644
--- a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb
+++ b/meta-oe/recipes-graphics/jasper/jasper_4.2.4.bb
@@ -3,13 +3,11 @@ HOMEPAGE = "https://jasper-software.github.io/jasper/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a80440d1d8f17d041c71c7271d6e06eb"
 
-SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https;branch=master"
-SRCREV = "917f7708b755d8434f70618108c1a76f1b6a0a82"
+SRC_URI = "https://github.com/jasper-software/${BPN}/releases/download/version-${PV}/${BP}.tar.gz"
+SRC_URI[sha256sum] = "6a597613d8d84c500b5b83bf0eec06cd3707c23d19957f70354ac2394c9914e7"
 
 CVE_STATUS[CVE-2015-8751] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
 
-S = "${WORKDIR}/git"
-
 inherit cmake multilib_header
 
 do_configure:prepend() {
@@ -31,4 +29,3 @@ do_install:append() {
     chrpath -d ${D}${libdir}/libjasper.so.*
     oe_multilib_header jasper/jas_config.h
 }
-
diff --git a/meta-oe/recipes-graphics/leptonica/leptonica_1.82.0.bb b/meta-oe/recipes-graphics/leptonica/leptonica_1.85.0.bb
index c0a2b45a48..2e1a3642ad 100644
--- a/meta-oe/recipes-graphics/leptonica/leptonica_1.82.0.bb
+++ b/meta-oe/recipes-graphics/leptonica/leptonica_1.85.0.bb
@@ -4,9 +4,10 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://leptonica-license.txt;md5=809b282cea2df68975fbe0ffe02b560f"
 
 UPSTREAM_CHECK_URI = "https://github.com/DanBloomberg/leptonica/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz"
-SRC_URI[sha256sum] = "155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6"
+SRC_URI[sha256sum] = "3745ae3bf271a6801a2292eead83ac926e3a9bc1bf622e9cd4dd0f3786e17205"
 
 EXTRA_OECONF += " \
     --without-libwebp \
diff --git a/meta-oe/recipes-graphics/libdecor/libdecor_0.2.2.bb b/meta-oe/recipes-graphics/libdecor/libdecor_0.2.3.bb
index 6621389b5a..35deb8d2aa 100644
--- a/meta-oe/recipes-graphics/libdecor/libdecor_0.2.2.bb
+++ b/meta-oe/recipes-graphics/libdecor/libdecor_0.2.3.bb
@@ -2,9 +2,7 @@ SUMMARY = "libdecor - A client-side decorations library for Wayland clients"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7ae2be7fb1637141840314b51970a9f7"
 
-SRC_URI = " \
-    git://gitlab.freedesktop.org/libdecor/libdecor.git;protocol=https;branch=master \
-"
+SRC_URI = "git://gitlab.freedesktop.org/libdecor/libdecor.git;protocol=https;branch=libdecor-0.2;tag=${PV}"
 
 DEPENDS = " \
     cairo \
@@ -14,8 +12,7 @@ DEPENDS = " \
     wayland-protocols \
 "
 
-S = "${WORKDIR}/git"
-SRCREV = "7807ae3480f5c6a37c5e8505d94af1e764aaf704"
+SRCREV = "15afd30a6e23e949d022ff18f17dd7fdbd3361e4"
 
 PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk+3', d)}"
 
diff --git a/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb
index 251c07adf0..e59de6f0ca 100644
--- a/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb
+++ b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb
@@ -18,9 +18,14 @@ inherit autotools features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl x11"
 
-S = "${WORKDIR}/xforms-${PV}"
+S = "${UNPACKDIR}/xforms-${PV}"
 
 DEPENDS = "libxpm jpeg libx11 virtual/libgl"
 RDEPENDS:${PN} = "bash"
 
 EXTRA_OECONF = "--with-extra-inc=${S}/lib" 
+
+do_compile:append() {
+    sed -i -e 's|${B}|.|' ${B}/fd2ps/fd2ps
+    sed -i -e 's|${B}|.|' ${B}/fdesign/fdesign
+}
diff --git a/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb b/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb
deleted file mode 100644
index 4094aa4fc6..0000000000
--- a/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "libglvnd is a vendor-neutral dispatch layer for arbitrating \
-OpenGL API calls between multiple vendors."
-HOMEPAGE = "https://gitlab.freedesktop.org/glvnd/libglvnd"
-LICENSE = "MIT & BSD-1-Clause & BSD-3-Clause & GPL-3.0-with-autoconf-exception"
-LIC_FILES_CHKSUM = "file://README.md;beginline=323;md5=7ac5f0111f648b92fe5427efeb08e8c4"
-
-SRC_URI = "git://git@gitlab.freedesktop.org/glvnd/libglvnd.git;protocol=https;branch=master"
-
-# v1.5.0 tag
-SRCREV = "faa23f21fc677af5792825dc30cb1ccef4bf33a6"
-
-REQUIRED_DISTRO_FEATURES = "opengl"
-
-inherit meson pkgconfig features_check
-
-S = "${WORKDIR}/git"
-
-PACKAGECONFIG ?= "\
-  ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
-  ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl gles1 gles2', '', d)} \
-  ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)} \
-  "
-
-PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,libx11 libxext xorgproto"
-PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,libx11 libxext xorgproto"
-PACKAGECONFIG[egl] = "-Degl=true,-Degl=false,"
-PACKAGECONFIG[gles1] = "-Dgles1=true,-Dgles1=false,"
-PACKAGECONFIG[gles2] = "-Dgles2=true,-Dgles2=false,"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb b/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb
index ba928d281d..c92696b8bf 100644
--- a/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb
+++ b/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb
@@ -10,9 +10,11 @@ DEPENDS = "zlib"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "7e9a12ba2a99dff7e736902ea07383d4"
 SRC_URI[sha256sum] = "cf112a1fb02f5b1c0fce5cab11ea8243852c139e669c44014125874b14b7dfaa"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libmng/files/libmng-devel/"
+UPSTREAM_CHECK_REGEX = "libmng-devel/(?P<pver>\d+(\.\d+)+)"
+
 inherit autotools-brokensep pkgconfig
 
 PACKAGECONFIG ??= "jpeg"
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb
index 666442fba2..d707b6c9b4 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb
@@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d1de21f0b70830e299905eac3419084"
 DEPENDS = "libsdl"
 
 SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz"
-SRC_URI[md5sum] = "ea24ed4b82ff1304809c363494fa8e16"
-SRC_URI[sha256sum] = "556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0"
+SRC_URI[sha256sum] = "dfb15ac5f8ce7a4952dc12d2aed9747518c5e6b335c0e31636d23f93c630f419"
 
-S = "${WORKDIR}/SDL_gfx-${PV}"
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sdlgfx/files/"
+
+S = "${UNPACKDIR}/SDL_gfx-${PV}"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb
index 01137bb0ca..29fb8cb4aa 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.
            file://configure.patch"
 SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699"
 
-S = "${WORKDIR}/SDL_image-${PV}"
+S = "${UNPACKDIR}/SDL_image-${PV}"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb b/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb
index a470ee81d0..d87c15aebc 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb
@@ -8,10 +8,9 @@ SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.
            file://configure.patch \
 "
 
-SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1"
 SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a"
 
-S = "${WORKDIR}/SDL_mixer-${PV}"
+S = "${UNPACKDIR}/SDL_mixer-${PV}"
 
 inherit autotools-brokensep pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb b/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb
index 49b1ef2879..ef4d13ebb6 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb
@@ -14,7 +14,6 @@ SRC_URI = " \
   file://am_foreign.patch \
 "
 
-S = "${WORKDIR}/SDL_net-${PV}"
+S = "${UNPACKDIR}/SDL_net-${PV}"
 
-SRC_URI[md5sum] = "20e64e61d65662db66c379034f11f718"
 SRC_URI[sha256sum] = "5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4"
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb b/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb
index 797c38d8e1..2cf3e88f17 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=22800d1b3701377aae0b61ee36f5c303"
 SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
            file://use.pkg-config.for.freetype2.patch \
 "
-SRC_URI[md5sum] = "61e29bd9da8d245bc2471d1b2ce591aa"
 SRC_URI[sha256sum] = "724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7"
 
-S = "${WORKDIR}/SDL_ttf-${PV}"
+S = "${UNPACKDIR}/SDL_ttf-${PV}"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.2.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.2.bb
deleted file mode 100644
index 267311853a..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.2.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY = "Simple DirectMedia Layer image library v2"
-SECTION = "libs"
-
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2f6d9e01c97958aa851954ed5acf82ee"
-
-DEPENDS = "tiff zlib libpng jpeg libsdl2 libwebp"
-
-SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz"
-SRC_URI[sha256sum] = "8f486bbfbcf8464dd58c9e5d93394ab0255ce68b51c5a966a918244820a76ddc"
-
-S = "${WORKDIR}/SDL2_image-${PV}"
-
-inherit autotools pkgconfig
-
-# Disable the run-time loading of the libs and bring back the soname dependencies.
-EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared"
-
-do_configure:prepend() {
-    # make autoreconf happy
-    touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog
-    # Removing these files fixes a libtool version mismatch.
-    rm -f ${S}/acinclude/libtool.m4
-    rm -f ${S}/acinclude/sdl2.m4
-    rm -f ${S}/acinclude/pkg.m4
-    rm -f ${S}/acinclude/lt~obsolete.m4
-    rm -f ${S}/acinclude/ltoptions.m4
-    rm -f ${S}/acinclude/ltsugar.m4
-    rm -f ${S}/acinclude/ltversion.m4
-}
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
new file mode 100644
index 0000000000..c15e986dc3
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Simple DirectMedia Layer image library v2"
+SECTION = "libs"
+
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
+
+DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz"
+SRC_URI[sha256sum] = "2213b56fdaff2220d0e38c8e420cbe1a83c87374190cba8c70af2156097ce30a"
+
+S = "${UNPACKDIR}/SDL2_image-${PV}"
+
+inherit cmake pkgconfig
+
+FILES:${PN} += "${datadir}/licenses"
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch
deleted file mode 100644
index 0605b32e30..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9363c98528ef850235852e44f678df6b5c011ee1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 7 Feb 2021 18:08:36 -0800
-Subject: [PATCH] configure.in: Undefine AC_CONFIG_AUX_DIR
-
-This helps reconfiguring with autotools 2.70+
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.in | 5 -----
- 1 file changed, 5 deletions(-)
-
---- a/configure.in
-+++ b/configure.in
-@@ -1,7 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(README.txt)
- AC_CONFIG_AUX_DIR(build-scripts)
--
- dnl Set various version strings - taken gratefully from the GTk sources
- 
- # Making releases:
-@@ -40,10 +39,6 @@ AC_SUBST(LT_CURRENT)
- AC_SUBST(LT_REVISION)
- AC_SUBST(LT_AGE)
- 
--dnl Detect the canonical build and host environments
--AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
--dnl AC_CANONICAL_HOST
--
- dnl Check for tools
- AC_PROG_LIBTOOL
- AC_PROG_CC
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb
deleted file mode 100644
index dbcb2a193b..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Simple DirectMedia Layer mixer library V2"
-SECTION = "libs"
-DEPENDS = "libsdl2 flac libmikmod libvorbis"
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=516daf7a177ad4c8874bb9efa1a69c1f"
-
-SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz \
-           file://0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch \
-          "
-SRC_URI[sha256sum] = "b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419"
-
-S = "${WORKDIR}/SDL2_mixer-${PV}"
-
-inherit autotools-brokensep pkgconfig
-
-EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --disable-music-ogg-shared LIBS=-L${STAGING_LIBDIR}"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad"
-
-do_configure:prepend () {
-    # Remove old libtool macros.
-    MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
-    for i in ${MACROS}; do
-        rm -f acinclude/$i
-    done
-}
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
new file mode 100644
index 0000000000..46e6ba0774
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Simple DirectMedia Layer mixer library V2"
+SECTION = "libs"
+DEPENDS = "virtual/libsdl2"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz"
+SRC_URI[sha256sum] = "cb760211b056bfe44f4a1e180cc7cb201137e4d1572f2002cc1be728efd22660"
+
+S = "${UNPACKDIR}/SDL2_mixer-${PV}"
+
+inherit cmake pkgconfig
+
+do_configure:prepend() {
+        # cmake checks for these binaries. Touch them to pass the tests and add RDEPENDS
+        touch ${STAGING_BINDIR}/fluidsynth
+        touch ${STAGING_BINDIR}/wavpack
+        touch ${STAGING_BINDIR}/wvunpack
+        touch ${STAGING_BINDIR}/wvgain
+        touch ${STAGING_BINDIR}/wvtag
+}
+
+PACKAGECONFIG ?= "flac wave vorbis"
+PACKAGECONFIG[opusfile] = "-DSDL2MIXER_OPUS=ON -DSDL2MIXER_OPUS_ENABLED=ON, -DSDL2MIXER_OPUS=OFF,opusfile"
+PACKAGECONFIG[vorbis] = "-DSDL2MIXER_VORBIS=VORBISFILE -DSDL2MIXER_VORBIS_VORBISFILE=ON, -DSDL2MIXER_VORBIS=OFF,libvorbis"
+PACKAGECONFIG[flac] = "-DSDL2MIXER_FLAC=ON, -DSDL2MIXER_FLAC=OFF,flac"
+PACKAGECONFIG[xmp] = "-DSDL2MIXER_MOD=ON -DSDL2MIXER_MOD_XMP=ON, -DSDL2MIXER_MOD=OFF,libxmp,libxmp"
+PACKAGECONFIG[fluidsynth] = "-DSDL2MIXER_MIDI=ON -DSDL2MIXER_MIDI_FLUIDSYNTH_ENABLED=ON, -DSDL2MIXER_MIDI=OFF,fluidsynth,fluidsynth-bin"
+PACKAGECONFIG[wave] = "-DSDL2MIXER_WAVE=ON -DSDL2MIXER_WAVPACK=ON, -DSDL2MIXER_WAVE=OFF,wavpack,wavpack wavpack-bin"
+PACKAGECONFIG[mpg123] = "-DSDL2MIXER_MP3=ON -DSDL2MIXER_MP3_MPG123=ON, -DSDL2MIXER_MP3=OFF,mpg123"
+
+FILES:${PN} += "${datadir}/licenses"
+
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb
deleted file mode 100644
index 35369e8731..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Simple DirectMedia Layer networking library."
-SECTION = "libs/network"
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fe9d52a78585a65224776875510ed127"
-
-SRC_URI = " \
-  https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz \
-"
-S = "${WORKDIR}/SDL2_net-${PV}"
-
-inherit autotools pkgconfig
-
-DEPENDS = "libsdl2"
-
-SRC_URI[md5sum] = "5c1d9d1cfa63301b141cb5c0de2ea7c4"
-SRC_URI[sha256sum] = "15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21"
-
-do_configure:prepend() {
-    # create dummy files which autotools consider as mandatory
-    touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog  
-
-    # Remove old libtool macros.
-    for macro in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
-        echo ${S}/acinclude/macro
-        rm -f ${S}/acinclude/$macro
-    done
-}
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb
new file mode 100644
index 0000000000..4a7ada94cb
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Simple DirectMedia Layer networking library."
+SECTION = "libs/network"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=68a088513da90254b2fbe664f42af315"
+
+SRC_URI = " \
+  https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz \
+"
+S = "${UNPACKDIR}/SDL2_net-${PV}"
+
+inherit cmake pkgconfig
+
+DEPENDS = "virtual/libsdl2"
+
+SRC_URI[sha256sum] = "4e4a891988316271974ff4e9585ed1ef729a123d22c08bd473129179dc857feb"
+
+FILES:${PN} += "${datadir}/licenses"
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch
deleted file mode 100644
index 8cb76c35d6..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6c52693d264ca3dc8e15a92f56cf3a636639bb6c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Fri, 28 Oct 2022 22:17:15 +0300
-Subject: [PATCH] freetype: Fix function signatures to match without casts
-
-Clang 16 has got a new stricter warning for casts of function types
-(see https://github.com/llvm/llvm-project/commit/1aad641c793090b4d036c03e737df2ebe2c32c57).
-
-This new warning gets included as part of the existing error
-diagnostic setting of -Wcast-function-type.
-
-This fixes errors like these:
-
-../src/hb-ft.cc:1011:34: error: cast from 'void (*)(FT_Face)' (aka 'void (*)(FT_FaceRec_ *)') to 'FT_Generic_Finalizer' (aka 'void (*)(void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
-    ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
-                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169]
----
- src/hb-ft.cc | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/hb-ft.cc b/src/hb-ft.cc
-index a6beb9f0f..a35e75b18 100644
---- a/src/hb-ft.cc
-+++ b/src/hb-ft.cc
-@@ -729,8 +729,9 @@ hb_ft_face_create_referenced (FT_Face ft_face)
- }
- 
- static void
--hb_ft_face_finalize (FT_Face ft_face)
-+hb_ft_face_finalize (void *arg)
- {
-+  FT_Face ft_face = (FT_Face) arg;
-   hb_face_destroy ((hb_face_t *) ft_face->generic.data);
- }
- 
-@@ -762,7 +763,7 @@ hb_ft_face_create_cached (FT_Face ft_face)
-       ft_face->generic.finalizer (ft_face);
- 
-     ft_face->generic.data = hb_ft_face_create (ft_face, nullptr);
--    ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
-+    ft_face->generic.finalizer = hb_ft_face_finalize;
-   }
- 
-   return hb_face_reference ((hb_face_t *) ft_face->generic.data);
-@@ -949,8 +950,9 @@ get_ft_library ()
- }
- 
- static void
--_release_blob (FT_Face ft_face)
-+_release_blob (void *arg)
- {
-+  FT_Face ft_face = (FT_Face) arg;
-   hb_blob_destroy ((hb_blob_t *) ft_face->generic.data);
- }
- 
-@@ -1032,7 +1034,7 @@ hb_ft_font_set_funcs (hb_font_t *font)
- #endif
- 
-   ft_face->generic.data = blob;
--  ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob;
-+  ft_face->generic.finalizer = _release_blob;
- 
-   _hb_ft_font_set_funcs (font, ft_face, true);
-   hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
--- 
-2.39.2
-
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch
deleted file mode 100644
index bc9371553f..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 6ec375eaafc43a2b3c30a0e0e49447d231d81a67 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 May 2017 00:57:10 -0700
-
----
-Upstream-Status: Pending
-
- Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8568dd2..5efc91e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,6 +3,8 @@ ACLOCAL_AMFLAGS = -I acinclude
- 
- lib_LTLIBRARIES = libSDL2_ttf.la
- 
-+AUTOMAKE_OPTIONS = foreign
-+
- libSDL2_ttfincludedir = $(includedir)/SDL2
- libSDL2_ttfinclude_HEADERS =   \
-        SDL_ttf.h
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb
deleted file mode 100644
index 6cd4a48aa8..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "Simple DirectMedia Layer truetype font library"
-SECTION = "libs"
-DEPENDS = "libsdl2 freetype virtual/egl"
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68"
-
-SRC_URI = " \
-    git://github.com/libsdl-org/SDL_ttf.git;branch=release-2.20.x;protocol=https \
-    git://github.com/libsdl-org/freetype.git;branch=VER-2-12-1-SDL;destsuffix=git/external/freetype;name=freetype;protocol=https \
-    git://github.com/libsdl-org/harfbuzz.git;branch=2.9.1-SDL;destsuffix=git/external/harfbuzz;name=harfbuzz;protocol=https \
-    file://0001-freetype-Fix-function-signatures-to-match-without-ca.patch;patchdir=external/harfbuzz \
-    file://automake_foreign.patch \
-"
-SRCREV = "89d1692fd8fe91a679bb943d377bfbd709b52c23"
-SRCREV_freetype = "6fc77cee03e078e97afcee0c0e06a2d3274b9a29"
-SRCREV_harfbuzz = "43931e3e596c04044861770b831c8f9452e2d3b0"
-
-SRCREV_FORMAT .= "_freetype_harfbuzz"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig features_check
-
-# links to libGL.so
-REQUIRED_DISTRO_FEATURES += "opengl"
-
-do_configure:prepend() {
-    # Removing these files fixes a libtool version mismatch.
-    MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
-
-    for i in ${MACROS}; do
-        rm -f ${S}/acinclude/$i
-    done
-}
-ASNEEDED = ""
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb
new file mode 100644
index 0000000000..d06f41bd0e
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Simple DirectMedia Layer truetype font library"
+SECTION = "libs"
+DEPENDS = "virtual/libsdl2 freetype virtual/egl"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz"
+SRC_URI[sha256sum] = "0b2bf1e7b6568adbdbc9bb924643f79d9dedafe061fa1ed687d1d9ac4e453bfd"
+
+inherit cmake pkgconfig
+
+S = "${UNPACKDIR}/SDL2_ttf-${PV}"
+
+FILES:${PN} += "${datadir}/licenses"
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb
index 1f436c6d7f..8122b88a68 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -31,9 +31,8 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
 
 UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar"
 
-S = "${WORKDIR}/SDL-${PV}"
+S = "${UNPACKDIR}/SDL-${PV}"
 
-SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85"
 SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
 
 BINCONFIG = "${bindir}/sdl-config"
@@ -41,7 +40,9 @@ BINCONFIG = "${bindir}/sdl-config"
 inherit autotools lib_package binconfig-disabled pkgconfig
 
 CVE_PRODUCT = "simple_directmedia_layer sdl"
-
+# GCC15/C23 results in following errors
+# ../SDL-1.2.15/src/video/Xext/XME/xme.c:218:5: error: initialization of 'int (*)(Display *, XExtCodes *)' from incompatible pointer type 'int (*)(void)' [-Wincompatible-pointer-types]
+CFLAGS += "-std=c17"
 EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \
                 --enable-file --disable-oss --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas \
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.56.bb b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.56.bb
new file mode 100644
index 0000000000..3b17f350df
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.56.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Simple DirectMedia Layer (SDL) sdl2-compat"
+DESCRIPTION = "This code is a compatibility layer; it provides a binary and source compatible \
+API for programs written against SDL2, but it uses SDL3 behind the scenes. If you are \
+writing new code, please target SDL3 directly and do not use this layer."
+HOMEPAGE = "http://www.libsdl.org"
+BUGTRACKER = "http://bugzilla.libsdl.org/"
+
+SECTION = "libs"
+
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=98241180d857fe975e4b60d44d6c01a5"
+
+SRC_URI = "http://www.libsdl.org/release/sdl2-compat-${PV}.tar.gz"
+SRC_URI[sha256sum] = "27e845b1b7dc0a91a85f1a1f18892ed205adb38caf767741eb258008d8264de0"
+S = "${UNPACKDIR}/sdl2-compat-${PV}"
+
+DEPENDS += "libsdl3"
+
+PROVIDES = "virtual/libsdl2"
+
+inherit cmake pkgconfig upstream-version-is-even features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl x11"
+
+do_install:append() {
+        mv ${D}${libdir}/pkgconfig/sdl2-compat.pc ${D}${libdir}/pkgconfig/sdl2.pc
+}
+
+FILES:${PN} += "${datadir}/licenses"
+
+RCONFLICTS:${PN} = "libsdl2"
+RPROVIDES:${PN} = "libsdl2"
+
+BBCLASSEXTEND = "nativesdk native"
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb
new file mode 100644
index 0000000000..ac425f6ad2
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Simple DirectMedia Layer image library v2"
+SECTION = "libs"
+
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
+
+DEPENDS = "tiff zlib libpng jpeg libsdl3 libwebp"
+
+SRC_URI = "git://github.com/libsdl-org/SDL_image.git;protocol=https;branch=release-3.2.x"
+SRCREV = "11154afb7855293159588b245b446a4ef09e574f"
+
+
+inherit cmake pkgconfig
+
+FILES:${PN} += "${datadir}/licenses"
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb
new file mode 100644
index 0000000000..1f82f95d65
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Simple DirectMedia Layer truetype font library"
+SECTION = "libs"
+DEPENDS = "libsdl3 freetype"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL3_ttf-${PV}.tar.gz \
+"
+SRC_URI[sha256sum] = "63547d58d0185c833213885b635a2c0548201cc8f301e6587c0be1a67e1e045d"
+
+S = "${UNPACKDIR}/SDL3_ttf-${PV}"
+
+inherit cmake pkgconfig
+
+FILES:${PN} += "${datadir}/licenses"
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.16.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.16.bb
new file mode 100644
index 0000000000..9579cb73a1
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.16.bb
@@ -0,0 +1,78 @@
+SUMMARY = "Simple DirectMedia Layer"
+DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \
+library designed to provide low level access to audio, keyboard, mouse, \
+joystick, 3D hardware via OpenGL, and 2D video framebuffer."
+HOMEPAGE = "http://www.libsdl.org"
+BUGTRACKER = "http://bugzilla.libsdl.org/"
+
+SECTION = "libs"
+
+LICENSE = "Zlib & BSD-2-Clause"
+LIC_FILES_CHKSUM = "\
+    file://LICENSE.txt;md5=cbf0e3161523f9a9315b6b915c5c4457 \
+    file://src/hidapi/LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077 \
+    file://src/hidapi/LICENSE-bsd.txt;md5=b5fa085ce0926bb50d0621620a82361f \
+    file://src/video/yuv2rgb/LICENSE;md5=79f8f3418d91531e05f0fc94ca67e071 \
+"
+
+SRC_URI = "http://www.libsdl.org/release/SDL3-${PV}.tar.gz"
+
+S = "${UNPACKDIR}/SDL3-${PV}"
+
+SRC_URI[sha256sum] = "6340e58879b2d15830c8460d2f589a385c444d1faa2a4828a9626c7322562be8"
+
+inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even
+
+CVE_PRODUCT = "simple_directmedia_layer sdl"
+
+EXTRA_OECMAKE = " \
+        -DSDL_OSS_DEFAULT=OFF \
+        -DSDL_DISKAUDIO=OFF \
+        -DSDL_DUMMYVIDEO=OFF \
+        -DSDL_RPI=OFF \
+        -DSDL_PTHREADS=ON \
+        -DSDL_RPATH=OFF \
+        -DSDL_SNDIO=OFF \
+        -DSDL_X11_XCURSOR=OFF \
+        -DSDL_X11_XDBE=OFF \
+        -DSDL_X11_XFIXES=OFF \
+        -DSDL_X11_XINPUT=OFF \
+        -DSDL_X11_XSCRNSAVER=OFF \
+        -DSDL_X11_XSHAPE=OFF \
+"
+
+# opengl packageconfig factored out to make it easy for distros
+# and BSP layers to pick either (desktop) opengl, gles2, or no GL
+PACKAGECONFIG_GL ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
+
+PACKAGECONFIG:class-native = "x11 ${PACKAGECONFIG_GL}"
+PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} ${PACKAGECONFIG_GL}"
+PACKAGECONFIG ??= " \
+        ${PACKAGECONFIG_GL} \
+        ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio pipewire x11 vulkan', d)} \
+        ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \
+        ${@bb.utils.contains("TUNE_FEATURES", "neon","arm-neon","",d)} \
+        ${@bb.utils.contains_any("DISTRO_FEATURES", "x11 wayland","","console-build",d)} \
+"
+PACKAGECONFIG[alsa]       = "-DSDL_ALSA=ON,-DSDL_ALSA=OFF,alsa-lib,"
+PACKAGECONFIG[arm-neon]   = "-DSDL_ARMNEON=ON,-DSDL_ARMNEON=OFF"
+PACKAGECONFIG[console-build] = "-DSDL_UNIX_CONSOLE_BUILD=ON"
+PACKAGECONFIG[gles2]      = "-DSDL_OPENGLES=ON,-DSDL_OPENGLES=OFF,virtual/libgles2"
+PACKAGECONFIG[jack]       = "-DSDL_JACK=ON,-DSDL_JACK=OFF,jack"
+PACKAGECONFIG[kmsdrm]     = "-DSDL_KMSDRM=ON,-DSDL_KMSDRM=OFF,libdrm virtual/libgbm"
+# The hidraw support doesn't catch Xbox, PS4 and Nintendo controllers,
+#  so we'll just use libusb when it's available.
+PACKAGECONFIG[libusb] = "-DSDL_HIDAPI_LIBUSB=ON,-DSDL_HIDAPI_LIBUSB=OFF,libusb1"
+PACKAGECONFIG[libdecor] = "-DSDL_WAYLAND_LIBDECOR=ON,-DSDL_WAYLAND_LIBDECOR=OFF,libdecor,libdecor"
+PACKAGECONFIG[opengl]     = "-DSDL_OPENGL=ON,-DSDL_OPENGL=OFF,virtual/egl"
+PACKAGECONFIG[pipewire] = "-DSDL_PIPEWIRE_SHARED=ON,-DSDL_PIPEWIRE_SHARED=OFF,pipewire"
+PACKAGECONFIG[pulseaudio] = "-DSDL_PULSEAUDIO=ON,-DSDL_PULSEAUDIO=OFF,pulseaudio"
+PACKAGECONFIG[vulkan]    = "-DSDL_VULKAN=ON -DSDL_RENDER_VULKAN=ON,-DSDL_VULKAN=OFF -DSDL_RENDER_VULKAN=OFF"
+PACKAGECONFIG[wayland]    = "-DSDL_WAYLAND=ON,-DSDL_WAYLAND=OFF,wayland-native wayland wayland-protocols libxkbcommon"
+PACKAGECONFIG[x11]        = "-DSDL_X11=ON,-DSDL_X11=OFF,virtual/libx11 libxext libxrandr libxrender"
+
+CFLAGS:append:class-native = " -DNO_SHARED_MEMORY"
+
+FILES:${PN} += "${datadir}/licenses/SDL3/LICENSE.txt"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb
index ce01593b8b..ff5df428e8 100644
--- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb
@@ -35,7 +35,7 @@ PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,libpng"
 PACKAGECONFIG[pthread] = "-DWITH_THREADS=ON,-DWITH_THREADS=OFF,"
 PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd"
 PACKAGECONFIG[sasl] = "-DWITH_SASL=ON,-DWITH_SASL=OFF,cyrus-sasl"
-PACKAGECONFIG[sdl] = "-DWITH_SDL=ON,-DWITH_SDL=OFF,libsdl2"
+PACKAGECONFIG[sdl] = "-DWITH_SDL=ON,-DWITH_SDL=OFF,virtual/libsdl2"
 PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,"
 PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib"
 
@@ -47,7 +47,6 @@ inherit cmake
 SRC_URI = "git://github.com/LibVNC/libvncserver;branch=master;protocol=https"
 SRCREV = "10e9eb75f73e973725dc75c373de5d89807af028"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DMAKE_INSTALL_LIBDIR=${libdir}"
 
diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch
deleted file mode 100644
index b29e5dc7b2..0000000000
--- a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From b81fb7942ab77b0bf6791e5fd98411dd68f133d9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 18 Dec 2022 15:13:00 -0800
-Subject: [PATCH] libyui-ncurses: Replace off64_t with off_t and stat64 with stat
-
-stat is same as stat64 when 64bit off_t is used.
-
-Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/88]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- CMakeLists.txt         |  2 +-
- src/NCAskForFile.cc    |  6 +++---
- src/NCFileSelection.cc | 24 ++++++++++++------------
- src/NCFileSelection.h  |  6 +++---
- 4 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/CMakeLists.txt b/libyui-ncurses/CMakeLists.txt
-index b10eab8e..2000bb58 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,7 +58,7 @@ set( CMAKE_INSTALL_MESSAGE LAZY ) # Suppress "up-to-date" messages during "make
- # Initialize compiler flags for all targets in all subdirectories
- add_compile_options( "-Wall" )
- add_compile_options( "-Os" )    # Optimize for size (overrides CMake's -O3 in RELEASE builds)
--
-+add_compile_options( "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ) # Enable largefile support
- if ( WERROR )
-   add_compile_options( "-Werror" )
- endif()
-diff --git a/src/NCAskForFile.cc b/libyui-ncurses/src/NCAskForFile.cc
-index aba6e0a6..44bb81bc 100644
---- a/src/NCAskForFile.cc
-+++ b/src/NCAskForFile.cc
-@@ -73,8 +73,8 @@ std::string NCAskForFile::checkIniDir( std::string iniDir )
- {
-     std::string dname = "";
- 
--    struct stat64 statInfo;
--    stat64( iniDir.c_str(), &statInfo );
-+    struct stat statInfo;
-+    stat( iniDir.c_str(), &statInfo );
- 
-     if ( S_ISDIR( statInfo.st_mode ) )
-     {
-@@ -90,7 +90,7 @@ std::string NCAskForFile::checkIniDir( std::string iniDir )
-             && pos != 0 )
-        {
-            std::string dir = iniDir.substr( 0, pos );
--           stat64( dir.c_str(), &statInfo );
-+           stat( dir.c_str(), &statInfo );
- 
-            if ( S_ISDIR( statInfo.st_mode ) )
-            {
-diff --git a/src/NCFileSelection.cc b/libyui-ncurses/src/NCFileSelection.cc
-index 3eb9c908..8894dc72 100644
---- a/src/NCFileSelection.cc
-+++ b/src/NCFileSelection.cc
-@@ -46,7 +46,7 @@ using std::list;
- 
- 
- NCFileInfo::NCFileInfo( string         fileName,
--                       struct stat64 * statInfo,
-+                       struct stat *   statInfo,
-                        bool            link )
- {
-     _name   = fileName;
-@@ -146,7 +146,7 @@ NCFileInfo::NCFileInfo()
-     _mode     = ( mode_t )0;
-     _device   = ( dev_t )0;
-     _links    = ( nlink_t )0;
--    _size     = ( off64_t )0;
-+    _size     = ( off_t )0;
-     _mtime    = ( time_t )0;
- }
- 
-@@ -177,11 +177,11 @@ NCFileSelection::NCFileSelection( YWidget *           parent,
- {
-     SetSepChar( ' ' );
- 
--    struct stat64 statInfo;
-+    struct stat statInfo;
- 
-     if ( !iniDir.empty() )
-     {
--       stat64( iniDir.c_str(), &statInfo );
-+       stat( iniDir.c_str(), &statInfo );
-     }
- 
-     if ( iniDir.empty()
-@@ -559,8 +559,8 @@ NCursesEvent NCFileTable::wHandleInput( wint_t key )
- bool NCFileTable::fillList()
- {
- 
--    struct stat64      statInfo;
--    struct stat64      linkInfo;
-+    struct stat        statInfo;
-+    struct stat        linkInfo;
-     struct dirent *    entry;
-     list<string>       tmpList;
-     list<string>::iterator   it;
-@@ -592,7 +592,7 @@ bool NCFileTable::fillList()
-        {
-            string fullName = currentDir + "/" + ( *it );
- 
--           if ( lstat64( fullName.c_str(), &statInfo ) == 0 )
-+           if ( lstat( fullName.c_str(), &statInfo ) == 0 )
-            {
-                if ( S_ISREG( statInfo.st_mode ) || S_ISBLK( statInfo.st_mode ) )
-                {
-@@ -604,7 +604,7 @@ bool NCFileTable::fillList()
-                }
-                else if ( S_ISLNK( statInfo.st_mode ) )
-                {
--                   if ( stat64( fullName.c_str(), &linkInfo ) == 0 )
-+                   if ( stat( fullName.c_str(), &linkInfo ) == 0 )
-                    {
-                        if ( S_ISREG( linkInfo.st_mode ) || S_ISBLK( linkInfo.st_mode ) )
-                        {
-@@ -701,8 +701,8 @@ void NCDirectoryTable::fillHeader()
- 
- bool NCDirectoryTable::fillList()
- {
--    struct stat64      statInfo;
--    struct stat64      linkInfo;
-+    struct stat        statInfo;
-+    struct stat        linkInfo;
-     struct dirent *    entry;
-     list<string>       tmpList;
-     list<string>::iterator   it;
-@@ -734,7 +734,7 @@ bool NCDirectoryTable::fillList()
-        {
-            string fullName = currentDir + "/" + ( *it );
- 
--           if ( lstat64( fullName.c_str(), &statInfo ) == 0 )
-+           if ( lstat( fullName.c_str(), &statInfo ) == 0 )
-            {
-                if ( S_ISDIR( statInfo.st_mode ) )
-                {
-@@ -746,7 +746,7 @@ bool NCDirectoryTable::fillList()
-                }
-                else if ( S_ISLNK( statInfo.st_mode ) )
-                {
--                   if ( stat64( fullName.c_str(), &linkInfo ) == 0 )
-+                   if ( stat( fullName.c_str(), &linkInfo ) == 0 )
-                    {
-                        if ( S_ISDIR( linkInfo.st_mode ) )
-                        {
-diff --git a/src/NCFileSelection.h b/libyui-ncurses/src/NCFileSelection.h
-index 0569215d..5c459d62 100644
---- a/src/NCFileSelection.h
-+++ b/src/NCFileSelection.h
-@@ -44,10 +44,10 @@
- struct NCFileInfo
- {
-     /**
--     * Constructor from a stat buffer (i.e. based on an lstat64() call).
-+     * Constructor from a stat buffer (i.e. based on an lstat() call).
-      **/
-     NCFileInfo( std::string    fileName,
--               struct stat64   * statInfo,
-+               struct stat     * statInfo,
-                bool link       = false );
- 
-     NCFileInfo();
-@@ -65,7 +65,7 @@ struct NCFileInfo
-     dev_t              _device;        // device this object resides on
-     mode_t             _mode;          // file permissions + object type
-     nlink_t            _links;         // number of links
--    off64_t            _size;          // size in bytes
-+    off_t              _size;          // size in bytes
-     time_t             _mtime;         // modification time
- 
-     bool isDir()  { return (( S_ISDIR( _mode ) ) ? true : false ); }
--- 
-2.39.0
-
diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.2.3.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb
index bcc5ef33e2..d7c96492b2 100644
--- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.2.3.bb
+++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb
@@ -5,14 +5,13 @@ LIC_FILES_CHKSUM = "file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad0
 "
 
 SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \
-           file://0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch \
           "
 
 SRC_URI:append:class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"
 
-SRCREV = "dabdcd9cc6a0058fd6966d7d2e19d508debcc0ac"
+SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516"
 
-S = "${WORKDIR}/git/libyui-ncurses"
+S = "${UNPACKDIR}/${BP}/libyui-ncurses"
 
 inherit cmake gettext pkgconfig
 
@@ -20,9 +19,16 @@ DEPENDS += "boost libyui ncurses"
 
 BBCLASSEXTEND = "nativesdk"
 
-EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF"
+EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=Release -DWERROR=OFF -DCMAKE_SKIP_RPATH=1"
+
+# TODO: Check with newer GCC, it works ok with GCC
+# GCC-14 causes buildpaths QA error
+# WARNING: libyui-ncurses-4.6.2-r0 do_package_qa: QA Issue: File /usr/lib/yui/.debug/libyui-ncurses.so.16.0.0 in package libyui-ncurses-dbg contains reference to TMPDIR [buildpaths
+
+DEBUG_LEVELFLAG = ""
 
 CXXFLAGS += "-DNCURSES_WIDECHAR"
+LDFLAGS += "-L${B}/src"
 
 do_configure:prepend () {
     cd ${S}
diff --git a/meta-oe/recipes-graphics/libyui/libyui_4.2.3.bb b/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb
index 939f3f36e5..d86aa4da91 100644
--- a/meta-oe/recipes-graphics/libyui/libyui_4.2.3.bb
+++ b/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb
@@ -10,9 +10,9 @@ SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \
            file://0001-Use-relative-install-paths-for-CMake.patch \
            "
 
-SRCREV = "dabdcd9cc6a0058fd6966d7d2e19d508debcc0ac"
+SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516"
 
-S = "${WORKDIR}/git/libyui"
+S = "${UNPACKDIR}/${BP}/libyui"
 
 inherit cmake gettext pkgconfig
 
@@ -20,6 +20,7 @@ DEPENDS += "boost"
 
 EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF"
 
+LDFLAGS += "-L${B}/src"
 BBCLASSEXTEND = "native nativesdk"
 
 do_install:append () {
diff --git a/meta-oe/recipes-graphics/lvgl/files/0001-thorvg-fix-build-with-gcc-15.patch b/meta-oe/recipes-graphics/lvgl/files/0001-thorvg-fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..e61b5224aa
--- /dev/null
+++ b/meta-oe/recipes-graphics/lvgl/files/0001-thorvg-fix-build-with-gcc-15.patch
@@ -0,0 +1,32 @@
+From a9e41f7e9590c757e74877cace6442dd676223ff Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Fri, 21 Mar 2025 10:25:43 +0000
+Subject: [PATCH] thorvg: fix build with gcc-15
+
+* add missing include to fix:
+  src/libs/thorvg/thorvg.h:357:20: error: 'uint8_t' has not been declared
+  357 |     Result opacity(uint8_t o) noexcept;
+      |                    ^~~~~~~
+
+* not needed with latest master where it was resolved differently in
+  fc5c15638 feat(thorvg): use LVGL's malloc/realloc/zalloc/free (#7772)
+  which includes stdlib/lv_string.h which includes misc/lv_types.h which
+  includes stdint
+
+Upstream-Status: Pending [not needed with latest master where it was resolved differently in fc5c15638 feat(thorvg): use LVGL's malloc/realloc/zalloc/free (#7772)]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ src/libs/thorvg/thorvg.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/libs/thorvg/thorvg.h
++++ b/src/libs/thorvg/thorvg.h
+@@ -12,6 +12,7 @@
+ #define TVG_BUILD 1
+ 
+ 
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
diff --git a/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch b/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch
deleted file mode 100644
index bd619b1572..0000000000
--- a/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 5b7f657e8ad656e0854f2252b3bd482b966d650c Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Wed, 13 Mar 2024 02:12:30 +0100
-Subject: [PATCH 2/2] fix(sdl): handle both LV_IMAGE_SRC_FILE and
- LV_IMAGE_SRC_VARIABLE
-
-The SDL image draw code currently assumes that the image source is a
-filename and attempts to open that filename. This is not necessarily
-the case, e.g. the lv_demo_fb uses encoded images which are of type
-LV_IMAGE_SRC_VARIABLE and instead of filename, come with a buffer of
-pixels. Handle the later using SDL_CreateRGBSurfaceFrom().
-
-Upstream-Status: Submitted [https://github.com/lvgl/lvgl/pull/5852]
-Signed-off-by: Marek Vasut <marex@denx.de>
----
- src/draw/sdl/lv_draw_sdl.c | 30 +++++++++++++++++++++++++++---
- 1 file changed, 27 insertions(+), 3 deletions(-)
-
-diff --git a/src/draw/sdl/lv_draw_sdl.c b/src/draw/sdl/lv_draw_sdl.c
-index cbb555d94..5eee5b725 100644
---- a/src/draw/sdl/lv_draw_sdl.c
-+++ b/src/draw/sdl/lv_draw_sdl.c
-@@ -224,10 +224,34 @@ static bool draw_to_texture(lv_draw_sdl_unit_t * u, cache_data_t * data)
-             break;
-         case LV_DRAW_TASK_TYPE_IMAGE: {
-                 lv_draw_image_dsc_t * image_dsc = task->draw_dsc;
--                const char * path = image_dsc->src;
--                SDL_Surface * surface = IMG_Load(&path[2]);
-+                lv_image_src_t type = lv_image_src_get_type(image_dsc->src);
-+                SDL_Surface * surface = NULL;
-+                if(type == LV_IMAGE_SRC_FILE) {
-+                    const char * path = image_dsc->src;
-+                    surface = IMG_Load(&path[2]);
-+                }
-+                else if(type == LV_IMAGE_SRC_VARIABLE) {
-+                    lv_image_dsc_t * lvd = image_dsc->src;
-+                    surface = SDL_CreateRGBSurfaceFrom(lvd->data,
-+                                                       lvd->header.w, lvd->header.h,
-+                                                       LV_COLOR_FORMAT_GET_BPP(lvd->header.cf),
-+                                                       lvd->header.stride,
-+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-+                                                       0x00FF0000,
-+                                                       0x0000FF00,
-+                                                       0x000000FF,
-+                                                       0xFF000000
-+#else
-+                                                       0x0000FF00,
-+                                                       0x00FF0000,
-+                                                       0xFF000000,
-+                                                       0x000000FF
-+#endif
-+                                                      );
-+                }
-+
-                 if(surface == NULL) {
--                    fprintf(stderr, "could not load image: %s\n", IMG_GetError());
-+                    fprintf(stderr, "could not load image\n");
-                     return false;
-                 }
- 
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch b/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch
deleted file mode 100644
index 73c01cb590..0000000000
--- a/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 85d90749a10b5f91741d37b75825935bf7cc4fb3 Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Tue, 12 Mar 2024 03:00:37 +0100
-Subject: [PATCH 3/6] Make fbdev device node runtime configurable via
- environment variable
-
-Test whether $LV_VIDEO_CARD environment variable is non-NULL and in
-case it is, use it as the video card file in lv_linux_fbdev_set_file().
-Otherwise fall back to /dev/fb0, i.e. the current behavior. This way,
-it is possible to test LVGL on systems with multiple fbdev devices.
-
-Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47]
-Signed-off-by: Marek Vasut <marex@denx.de>
----
- main.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/main.c b/main.c
-index 9775b9c..b64a098 100644
---- a/main.c
-+++ b/main.c
-@@ -4,13 +4,19 @@
- #include <pthread.h>
- #include <time.h>
- 
-+static const char *lv_linux_get_video_card_node(const char *videocard_default)
-+{
-+    return getenv("LV_VIDEO_CARD") ? : videocard_default;
-+}
-+
- int main(void)
- {
-+    const char *videocard = lv_linux_get_video_card_node("/dev/fb0");
-     lv_init();
- 
-     /*Linux frame buffer device init*/
-     lv_display_t * disp = lv_linux_fbdev_create();
--    lv_linux_fbdev_set_file(disp, "/dev/fb0");
-+    lv_linux_fbdev_set_file(disp, videocard);
- 
-     /*Create a Demo*/
-     lv_demo_widgets();
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch b/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch
deleted file mode 100644
index d24d150c06..0000000000
--- a/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 593da8e11cc5029773ad330b5d7633ee9f2fba95 Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Tue, 12 Mar 2024 18:09:42 +0100
-Subject: [PATCH 4/6] Factor out fbdev initialization code
-
-Pull fbdev initialization code into separate function and add ifdef
-around it, so it can be conditionally compiled in. This is done in
-preparation for addition of other backend initialization example
-code.
-
-Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47]
-Signed-off-by: Marek Vasut <marex@denx.de>
----
- main.c | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/main.c b/main.c
-index b64a098..288519c 100644
---- a/main.c
-+++ b/main.c
-@@ -9,14 +9,24 @@ static const char *lv_linux_get_video_card_node(const char *videocard_default)
-     return getenv("LV_VIDEO_CARD") ? : videocard_default;
- }
- 
--int main(void)
-+#if LV_USE_LINUX_FBDEV
-+static void lv_linux_disp_init(void)
- {
-     const char *videocard = lv_linux_get_video_card_node("/dev/fb0");
--    lv_init();
--
--    /*Linux frame buffer device init*/
-     lv_display_t * disp = lv_linux_fbdev_create();
-+
-     lv_linux_fbdev_set_file(disp, videocard);
-+}
-+#else
-+#error Unsupported configuration
-+#endif
-+
-+int main(void)
-+{
-+    lv_init();
-+
-+    /*Linux display device init*/
-+    lv_linux_disp_init();
- 
-     /*Create a Demo*/
-     lv_demo_widgets();
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch b/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch
deleted file mode 100644
index 9ee7a7f19d..0000000000
--- a/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From dabf40559428733413432afa29598bc145aa6636 Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Tue, 12 Mar 2024 03:08:13 +0100
-Subject: [PATCH 5/6] Add DRM/KMS example support
-
-Extend the main.c to support both legacy fbdev and DRM/KMS initialization.
-
-To use legacy fbdev support, adjust lv_conf.h as follows:
-LV_USE_LINUX_FBDEV=1
-LV_USE_LINUX_DRM=0
-
-To use DRM/KMS support, adjust lv_conf.h as follows:
-LV_USE_LINUX_FBDEV=0
-LV_USE_LINUX_DRM=1
-
-Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47]
-Signed-off-by: Marek Vasut <marex@denx.de>
----
- CMakeLists.txt | 5 ++++-
- main.c         | 8 ++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d91b196..c1cfb7f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,9 @@ target_include_directories(lvgl PUBLIC ${PROJECT_SOURCE_DIR})
- 
- add_executable(main main.c mouse_cursor_icon.c)
- 
--target_link_libraries(main lvgl lvgl::examples lvgl::demos lvgl::thorvg ${SDL2_LIBRARIES} m pthread)
-+include(${CMAKE_CURRENT_LIST_DIR}/lvgl/tests/FindLibDRM.cmake)
-+include_directories(${Libdrm_INCLUDE_DIRS})
-+
-+target_link_libraries(main lvgl lvgl::examples lvgl::demos lvgl::thorvg ${SDL2_LIBRARIES} ${Libdrm_LIBRARIES} m pthread)
- add_custom_target (run COMMAND ${EXECUTABLE_OUTPUT_PATH}/main DEPENDS main)
- 
-diff --git a/main.c b/main.c
-index 288519c..ab4e936 100644
---- a/main.c
-+++ b/main.c
-@@ -17,6 +17,14 @@ static void lv_linux_disp_init(void)
- 
-     lv_linux_fbdev_set_file(disp, videocard);
- }
-+#elif LV_USE_LINUX_DRM
-+static void lv_linux_disp_init(void)
-+{
-+    const char *videocard = lv_linux_get_video_card_node("/dev/dri/card0");
-+    lv_display_t * disp = lv_linux_drm_create();
-+
-+    lv_linux_drm_set_file(disp, videocard, -1);
-+}
- #else
- #error Unsupported configuration
- #endif
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch b/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch
deleted file mode 100644
index 691ee80b59..0000000000
--- a/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From b202ce51f7b68c460fcd1b6d9c3ffa8aaf2baaf6 Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Tue, 12 Mar 2024 19:05:38 +0100
-Subject: [PATCH 6/6] Add SDL2 example support
-
-Extend the main.c to support both legacy fbdev, DRM/KMS, SDL2 initialization.
-The SDL2 window resolution can be configured using environment variables
-LV_VIDEO_WIDTH and LV_VIDEO_HEIGHT and defaults to 800 x 480 .
-
-To use legacy fbdev support, adjust lv_conf.h as follows:
-LV_USE_LINUX_FBDEV=1
-LV_USE_LINUX_DRM=0
-LV_USE_SDL=0
-
-To use DRM/KMS support, adjust lv_conf.h as follows:
-LV_USE_LINUX_FBDEV=0
-LV_USE_LINUX_DRM=1
-LV_USE_SDL=0
-
-To use SDL2 support, adjust lv_conf.h as follows:
-LV_USE_LINUX_FBDEV=0
-LV_USE_LINUX_DRM=0
-LV_USE_SDL=1
-
-Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47]
-Signed-off-by: Marek Vasut <marex@denx.de>
----
- CMakeLists.txt | 6 +++++-
- main.c         | 8 ++++++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c1cfb7f..658193f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,6 +15,10 @@ add_executable(main main.c mouse_cursor_icon.c)
- include(${CMAKE_CURRENT_LIST_DIR}/lvgl/tests/FindLibDRM.cmake)
- include_directories(${Libdrm_INCLUDE_DIRS})
- 
--target_link_libraries(main lvgl lvgl::examples lvgl::demos lvgl::thorvg ${SDL2_LIBRARIES} ${Libdrm_LIBRARIES} m pthread)
-+find_package(SDL2)
-+find_package(SDL2_image)
-+include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS})
-+
-+target_link_libraries(main lvgl lvgl::examples lvgl::demos lvgl::thorvg ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${Libdrm_LIBRARIES} m pthread)
- add_custom_target (run COMMAND ${EXECUTABLE_OUTPUT_PATH}/main DEPENDS main)
- 
-diff --git a/main.c b/main.c
-index ab4e936..4b66ebc 100644
---- a/main.c
-+++ b/main.c
-@@ -25,6 +25,14 @@ static void lv_linux_disp_init(void)
- 
-     lv_linux_drm_set_file(disp, videocard, -1);
- }
-+#elif LV_USE_SDL
-+static void lv_linux_disp_init(void)
-+{
-+    const int width = atoi(getenv("LV_VIDEO_WIDTH") ? : "800");
-+    const int height = atoi(getenv("LV_VIDEO_HEIGHT") ? : "480");
-+
-+    lv_sdl_window_create(width, height);
-+}
- #else
- #error Unsupported configuration
- #endif
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch b/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch
deleted file mode 100644
index 6997d84153..0000000000
--- a/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 40657a770baadfff30abfecf7638e7b1c340db4d Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Thu, 14 Mar 2024 03:23:10 +0100
-Subject: [PATCH] fix(cmake): generate versioned shared libraries
-
-Add missing version suffix to shared libraries. Currently the filename of
-generated shared libraries is only liblvgl.so, which prevents coexistence
-of different versions of LVGL on the same system. Set VERSION and SOVERSION
-to make cmake add the version suffix to generated shared libraries. That
-changes the filename to liblvgl.so.9.0.0 and includes symlink with major
-ABI version, i.e. liblvgl.so.9 .
-
-Upstream-Status: Submitted [https://github.com/lvgl/lvgl/pull/5865]
-Signed-off-by: Marek Vasut <marex@denx.de>
----
- env_support/cmake/custom.cmake | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/env_support/cmake/custom.cmake b/env_support/cmake/custom.cmake
-index 9800468eb..6f33f1cc8 100644
---- a/env_support/cmake/custom.cmake
-+++ b/env_support/cmake/custom.cmake
-@@ -1,3 +1,6 @@
-+set(LVGL_VERSION "9.0.0")
-+set(LVGL_SOVERSION "9")
-+
- # Option to define LV_LVGL_H_INCLUDE_SIMPLE, default: ON
- option(LV_LVGL_H_INCLUDE_SIMPLE
-        "Use #include \"lvgl.h\" instead of #include \"../../lvgl.h\"" ON)
-@@ -119,6 +122,8 @@ install(
- set_target_properties(
-   lvgl
-   PROPERTIES OUTPUT_NAME lvgl
-+             VERSION ${LVGL_VERSION}
-+             SOVERSION ${LVGL_SOVERSION}
-              ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-              LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-              RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-@@ -137,6 +142,8 @@ if(NOT LV_CONF_BUILD_DISABLE_THORVG_INTERNAL)
-   set_target_properties(
-     lvgl_thorvg
-     PROPERTIES OUTPUT_NAME lvgl_thorvg
-+               VERSION ${LVGL_VERSION}
-+               SOVERSION ${LVGL_SOVERSION}
-                ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-                LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-                RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-@@ -155,6 +162,8 @@ if(NOT LV_CONF_BUILD_DISABLE_DEMOS)
-   set_target_properties(
-     lvgl_demos
-     PROPERTIES OUTPUT_NAME lvgl_demos
-+               VERSION ${LVGL_VERSION}
-+               SOVERSION ${LVGL_SOVERSION}
-                ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-                LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-                RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-@@ -173,6 +182,8 @@ if(NOT LV_CONF_BUILD_DISABLE_EXAMPLES)
-   set_target_properties(
-     lvgl_examples
-     PROPERTIES OUTPUT_NAME lvgl_examples
-+               VERSION ${LVGL_VERSION}
-+               SOVERSION ${LVGL_SOVERSION}
-                ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-                LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-                RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch b/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch
deleted file mode 100644
index 449db53dfb..0000000000
--- a/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a6f822f75b3ba01b00c028608c93160d09a6ffd1 Mon Sep 17 00:00:00 2001
-From: Jaeyoon Jung <jaeyoon.jung@lge.com>
-Date: Mon, 1 Apr 2024 18:00:39 +0900
-Subject: [PATCH] fix(fbdev): set resolution prior to buffer
-
-Otherwise it ends up with using the default value 800x480 and may fail
-at lv_display_set_buffers due to incorrect resolution.
-
-Upstream-Status: Submitted [https://github.com/lvgl/lvgl/pull/6004]
-Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
----
-
- src/drivers/display/fb/lv_linux_fbdev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/drivers/display/fb/lv_linux_fbdev.c b/src/drivers/display/fb/lv_linux_fbdev.c
-index b3cc89199..5fb4c5c9f 100644
---- a/src/drivers/display/fb/lv_linux_fbdev.c
-+++ b/src/drivers/display/fb/lv_linux_fbdev.c
-@@ -233,8 +233,8 @@ void lv_linux_fbdev_set_file(lv_display_t * disp, const char * file)
-         draw_buf_2 = malloc(draw_buf_size);
-     }
- 
--    lv_display_set_buffers(disp, draw_buf, draw_buf_2, draw_buf_size, LV_LINUX_FBDEV_RENDER_MODE);
-     lv_display_set_resolution(disp, hor_res, ver_res);
-+    lv_display_set_buffers(disp, draw_buf, draw_buf_2, draw_buf_size, LV_LINUX_FBDEV_RENDER_MODE);
- 
-     if(width > 0) {
-         lv_display_set_dpi(disp, DIV_ROUND_UP(hor_res * 254, width * 10));
diff --git a/meta-oe/recipes-graphics/lvgl/lv-conf.inc b/meta-oe/recipes-graphics/lvgl/lv-conf.inc
index 9186015537..69e42af922 100644
--- a/meta-oe/recipes-graphics/lvgl/lv-conf.inc
+++ b/meta-oe/recipes-graphics/lvgl/lv-conf.inc
@@ -3,6 +3,7 @@ PACKAGECONFIG ??= "drm"
 PACKAGECONFIG[drm] = ",,libdrm"
 PACKAGECONFIG[fbdev] = ",,"
 PACKAGECONFIG[gridnav] = ",,"
+PACKAGECONFIG[thorvg] = ",,"
 PACKAGECONFIG[sdl] = ",,virtual/libsdl2 libsdl2-image"
 
 # Add libdrm include if drm is selected in PACKAGECONFIG
@@ -32,6 +33,16 @@ LVGL_CONFIG_LV_USE_GRIDNAV = "${@bb.utils.contains('PACKAGECONFIG', 'gridnav', '
 
 LVGL_CONFIG_LV_THEME_DEFAULT_DARK ?= "0"
 
+LVGL_CONFIG_USE_LOTTIE = "${@bb.utils.contains('PACKAGECONFIG', 'thorvg', '1', '0', d)}"
+
+LVGL_CONFIG_USE_VECTOR_GRAPHICS = "${@bb.utils.contains('PACKAGECONFIG', 'thorvg', '1', '0', d)}"
+
+LVGL_CONFIG_USE_THORVG_INTERNAL = "${@bb.utils.contains('PACKAGECONFIG', 'thorvg', '1', '0', d)}"
+
+LVGL_CONFIG_USE_MATRIX = "${@bb.utils.contains('PACKAGECONFIG', 'thorvg', '1', '0', d)}"
+
+LVGL_CONFIG_USE_FLOAT = "${@bb.utils.contains('PACKAGECONFIG', 'thorvg', '1', '0', d)}"
+
 DEBUG_BUILD ??= "0"
 
 ALLOW_EMPTY:${PN} = "1"
@@ -77,5 +88,11 @@ do_configure:append() {
         -e "s|^([[:space:]]*#define LV_USE_GRIDNAV[[:space:]]).*|\1${LVGL_CONFIG_LV_USE_GRIDNAV}|" \
         -e "s|^([[:space:]]*#define LV_THEME_DEFAULT_DARK[[:space:]]).*|\1${LVGL_CONFIG_LV_THEME_DEFAULT_DARK}|" \
         \
+        -e "s|^([[:space:]]*#define LV_USE_VECTOR_GRAPHIC[[:space:]]).*|\1${LVGL_CONFIG_USE_VECTOR_GRAPHICS}|" \
+        -e "s|^([[:space:]]*#define LV_USE_THORVG_INTERNAL[[:space:]]).*|\1${LVGL_CONFIG_USE_THORVG_INTERNAL}|" \
+        -e "s|^([[:space:]]*#define LV_USE_MATRIX[[:space:]]).*|\1${LVGL_CONFIG_USE_MATRIX}|" \
+        -e "s|^([[:space:]]*#define LV_USE_FLOAT[[:space:]]).*|\1${LVGL_CONFIG_USE_FLOAT}|" \
+        \
+        -e "s|^([[:space:]]*#define LV_USE_LOTTIE[[:space:]]).*|\1${LVGL_CONFIG_USE_LOTTIE}|" \
         -i "${S}/lv_conf.h"
 }
diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.2.2.bb
index 6e8371baad..ede5c16f3f 100644
--- a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb
+++ b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.2.2.bb
@@ -5,18 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=802d3d83ae80ef5f343050bf96cce3a4 \
                     file://lvgl/LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a"
 
 SRC_URI = "\
-        git://github.com/lvgl/lv_port_linux_frame_buffer.git;protocol=https;branch=master;name=demo \
-        git://github.com/lvgl/lvgl;protocol=https;branch=master;name=lvgl;subdir=git/lvgl \
-        file://0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch;patchdir=lvgl \
-        file://0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch \
-        file://0004-Factor-out-fbdev-initialization-code.patch \
-        file://0005-Add-DRM-KMS-example-support.patch \
-        file://0006-Add-SDL2-example-support.patch \
-        file://0007-fix-cmake-generate-versioned-shared-libraries.patch;patchdir=lvgl \
-        file://0008-fix-fbdev-set-resolution-prior-to-buffer.patch;patchdir=lvgl \
+        git://github.com/lvgl/lv_port_linux_frame_buffer.git;protocol=https;branch=release/v9.2;name=demo \
+        git://github.com/lvgl/lvgl;protocol=https;branch=release/v9.2;name=lvgl;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/lvgl \
+        file://0001-thorvg-fix-build-with-gcc-15.patch;patchdir=lvgl \
         "
-SRCREV_demo = "dccc6a1ca48372aa993dbea7a8e17dec6f42df6a"
-SRCREV_lvgl = "e1c0b21b2723d391b885de4b2ee5cc997eccca91"
+SRCREV_demo = "c924e24c7aa55317521bcd9dd75ce9337508f5a5"
+SRCREV_lvgl = "7f07a129e8d77f4984fff8e623fd5be18ff42e74"
 SRCREV_FORMAT = "demo_lvgl"
 
 EXTRA_OEMAKE = "DESTDIR=${D}"
@@ -30,7 +24,6 @@ require lv-conf.inc
 
 inherit cmake
 
-S = "${WORKDIR}/git"
 
 do_configure:prepend() {
         if [ "${LVGL_CONFIG_USE_SDL}" -eq 1 ] ; then
diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.2.2.bb
index 63c810d74d..28306a1101 100644
--- a/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb
+++ b/meta-oe/recipes-graphics/lvgl/lvgl_9.2.2.bb
@@ -9,17 +9,14 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a"
 
 SRC_URI = "\
-        git://github.com/lvgl/lvgl;protocol=https;branch=master \
-        file://0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch \
-        file://0007-fix-cmake-generate-versioned-shared-libraries.patch \
-        file://0008-fix-fbdev-set-resolution-prior-to-buffer.patch \
+        git://github.com/lvgl/lvgl;protocol=https;branch=release/v9.2 \
+    file://0001-thorvg-fix-build-with-gcc-15.patch \
         "
-SRCREV = "e1c0b21b2723d391b885de4b2ee5cc997eccca91"
+SRCREV = "7f07a129e8d77f4984fff8e623fd5be18ff42e74"
 
 inherit cmake
 
 EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib} -DBUILD_SHARED_LIBS=ON"
-S = "${WORKDIR}/git"
 
 require lv-conf.inc
 
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
index ae45258297..a7d79a916c 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \
            file://lxdm.conf \
            ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \
-           ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
+           ${@bb.utils.contains("IMAGE_FEATURES", "allow-root-login", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
            file://0002-let-autotools-create-lxdm.conf.patch \
            file://0003-check-for-libexecinfo-providing-backtrace-APIs.patch \
            file://0004-fix-css-under-gtk-3.20.patch \
@@ -21,7 +21,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.
            file://0001-systemd-lxdm.service-remove-plymouth-quit-conflicts.patch \
            file://0001-Initialize-msghdr-struct-in-a-portable-way.patch \
            "
-SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0"
 SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f"
 
 PE = "1"
@@ -30,9 +29,6 @@ DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+3
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}"
 DEPENDS:append:libc-musl = " libexecinfo"
 
-# combine oe-core way with angstrom DISTRO_TYPE
-DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
-
 inherit autotools pkgconfig gettext systemd features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -66,7 +62,8 @@ do_install:append() {
         # ArchLinux version of pam config has the following advantages:
         # * simple setup of passwordless login
         # * in XFCE powerdown/restart enabled in logoff dialog
-        install -m 644 ${UNPACKDIR}/${@bb.utils.contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm
+        install -m 644 ${UNPACKDIR}/${@bb.utils.contains_any("IMAGE_FEATURES", [ "allow-empty-password", "empty-root-password" ], "lxdm-pam-debug", "lxdm-pam",d)} \
+            ${D}${sysconfdir}/pam.d/lxdm
     fi
 }
 
diff --git a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.0.bb b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb
index c9c4a6c27a..2b26ec57ae 100644
--- a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.0.bb
+++ b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb
@@ -4,11 +4,10 @@ HOMEPAGE = "https://github.com/any1/neatvnc"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94fc374e7174f41e3afe0f027ee59ff7"
 
-SRC_URI = "git://github.com/any1/neatvnc;branch=master;protocol=https"
+SRC_URI = "git://github.com/any1/neatvnc;branch=v0.8;protocol=https"
 
-SRCREV = "46432ce8cade0b54a38d4bb42eb07f96c8ff49fd"
+SRCREV = "07081567ab21a2b099ceb41ae8cab872a31cbb9a"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "libdrm pixman aml zlib"
 
diff --git a/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb b/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
index 0d53c78f3e..beebbd5665 100644
--- a/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
+++ b/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
@@ -7,7 +7,6 @@ DEPENDS = "virtual/libx11 libxtst"
 
 SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/numlockx/numlockx-${PV}.tar.gz/be9109370447eae23f6f3f8527bb1a67/numlockx-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "be9109370447eae23f6f3f8527bb1a67"
 SRC_URI[sha256sum] = "e468eb9121c94c9089dc6a287eeb347e900ce04a14be37da29d7696cbce772e4"
 
 inherit autotools features_check
diff --git a/meta-oe/recipes-graphics/nyancat/nyancat_1.5.2.bb b/meta-oe/recipes-graphics/nyancat/nyancat_1.5.2.bb
index a44e79362d..c31ad985d9 100644
--- a/meta-oe/recipes-graphics/nyancat/nyancat_1.5.2.bb
+++ b/meta-oe/recipes-graphics/nyancat/nyancat_1.5.2.bb
@@ -5,7 +5,6 @@ SECTION = "graphics"
 LICENSE = "NCSA"
 LIC_FILES_CHKSUM = "file://src/nyancat.c;beginline=27;endline=49;md5=285f7ac87da4a631f348800687d845bd"
 
-S = "${WORKDIR}/git"
 
 SRCREV = "5ffb6c5c03d0e9156db8f360599d4f0449bb16b9"
 SRC_URI = " \
diff --git a/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch b/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch
new file mode 100644
index 0000000000..8bc2b80f68
--- /dev/null
+++ b/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch
@@ -0,0 +1,56 @@
+From d41128e5a1002af41c976c8860f8299cfcd3cd72 Mon Sep 17 00:00:00 2001
+From: pldubouilh <pldubouilh@gmail.com>
+Date: Fri, 17 Mar 2023 18:23:47 +0100
+Subject: [PATCH] Fix list traversal issue in client_calc_layer
+
+The calls to client_calc_layer_internal can modify stacking_list, which
+can cause us to follow dangling ->next pointers (either by the pointer
+itself already being freed, or it pointing to a freed area). Avoid this
+by copying the list first, the goal is to visit every client in the list
+once so this should be fine.
+
+Upstream-Status: Backport [http://git.openbox.org/?p=mikachu/openbox.git;a=commit;h=d41128e5a1002af41c976c8860f8299cfcd3cd72]
+Signed-off-by: Alexandre Videgrain <alexandre.videgrain@smile.fr>
+---
+ openbox/client.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/openbox/client.c b/openbox/client.c
+index 7168b240..b8264587 100644
+--- a/openbox/client.c
++++ b/openbox/client.c
+@@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self)
+ void client_calc_layer(ObClient *self)
+ {
+     GList *it;
++    /* the client_calc_layer_internal calls below modify stacking_list,
++       so we have to make a copy to iterate over */
++    GList *list = g_list_copy(stacking_list);
+ 
+     /* skip over stuff above fullscreen layer */
+-    for (it = stacking_list; it; it = g_list_next(it))
++    for (it = list; it; it = g_list_next(it))
+         if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
+ 
+     /* find the windows in the fullscreen layer, and mark them not-visited */
+@@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self)
+     client_calc_layer_internal(self);
+ 
+     /* skip over stuff above fullscreen layer */
+-    for (it = stacking_list; it; it = g_list_next(it))
++    for (it = list; it; it = g_list_next(it))
+         if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
+ 
+     /* now recalc any windows in the fullscreen layer which have not
+@@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self)
+                  !WINDOW_AS_CLIENT(it->data)->visited)
+             client_calc_layer_internal(it->data);
+     }
++
++    g_list_free(it);
+ }
+ 
+ gboolean client_should_show(ObClient *self)
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-oe/recipes-graphics/openbox/obconf_git.bb
index 1210af70ea..917492c982 100644
--- a/meta-oe/recipes-graphics/openbox/obconf_git.bb
+++ b/meta-oe/recipes-graphics/openbox/obconf_git.bb
@@ -16,7 +16,6 @@ SRC_URI = " \
     file://0001-Fix-function-protype-visibility.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit autotools gettext pkgconfig mime mime-xdg features_check
 # depends on openbox, which is X11-only
diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
index 9a15077316..5b62b9b2a7 100644
--- a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
+++ b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
@@ -8,11 +8,14 @@ SRC_URI = " \
     http://icculus.org/openbox/releases/openbox-${PV}.tar.gz \
     file://0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch \
     file://0001-openbox-xdg-autostart-convert-to-python3.patch \
+    file://0001-Fix-list-traversal-issue-in-client_calc_layer.patch \
 "
 
-SRC_URI[md5sum] = "b72794996c6a3ad94634727b95f9d204"
 SRC_URI[sha256sum] = "8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7"
 
+UPSTREAM_CHECK_URI = "https://github.com/Mikachu/openbox/tags"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
 inherit autotools gettext update-alternatives pkgconfig features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
index 0ba13cf88f..2e25ecc7ef 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
@@ -1,4 +1,4 @@
-From 4681de07e21f17aa28710d3a51fabe7da60463f9 Mon Sep 17 00:00:00 2001
+From 805ce4d40c5aaae12aa73452ff07babe8eb43a62 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Fri, 28 Sep 2018 00:38:50 +0200
 Subject: [PATCH] Do not ask cmake to export binaries - they don't make it
@@ -15,17 +15,17 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
-index 4324c36d..2c11fe02 100644
+index 26156bcb..9eff04aa 100644
 --- a/src/bin/jp2/CMakeLists.txt
 +++ b/src/bin/jp2/CMakeLists.txt
-@@ -66,7 +66,6 @@ foreach(exe opj_decompress opj_compress opj_dump)
+@@ -64,7 +64,6 @@ foreach(exe opj_decompress opj_compress opj_dump)
    endif()
    # Install exe
    install(TARGETS ${exe}
 -    EXPORT OpenJPEGTargets
-     DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+     DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
    )
    if(OPJ_USE_DSYMUTIL)
 -- 
-2.14.4
+2.25.1
 
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb
index f2d74078e8..6c383e3423 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb
@@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c"
 DEPENDS = "libpng tiff lcms zlib"
 
 SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \
-           file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
+           file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
            "
-SRCREV = "a5891555eb49ed7cc26b2901ea680acda136d811"
-S = "${WORKDIR}/git"
+SRCREV = "210a8a5690d0da66f02d49420d7176a21ef409dc"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb b/meta-oe/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb
new file mode 100644
index 0000000000..d3c96cd66f
--- /dev/null
+++ b/meta-oe/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Firmware file compiler for the panel-mipi-dbi display driver"
+DESCRIPTION = "The panel-mipi-dbi Linux display driver allows using the same \
+               driver for most MIPI DBI based display panels. \
+               This means many displays attached via SPI, even if the \
+               datasheet does not explicitly mention DBI support. \
+               To do so it uses tiny firmware files that contain \
+               display/controller-specific initialization commands. \
+               The mipi-dbi-cmd tool compiles these firmware files from a \
+               text format to a firmware blob format."
+HOMEPAGE = "https://github.com/notro/panel-mipi-dbi"
+SECTION = "graphics"
+LICENSE = "CC0-1.0"
+LIC_FILES_CHKSUM = "file://mipi-dbi-cmd;beginline=4;endline=13;md5=5e3d3f14cc87aa9e8976d728520cbcae"
+SRCREV = "1cbd40135a8c7f25d7b444a7fac77fd3c3ad471e"
+
+SRC_URI = "git://github.com/notro/panel-mipi-dbi.git;protocol=https;branch=main"
+
+
+inherit native
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install () {
+    install -D -p -m 0755 ${S}/mipi-dbi-cmd ${D}${bindir}/mipi-dbi-cmd
+}
+
+RDEPENDS:${PN} += "python3-native"
diff --git a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.52.0.bb b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.56.1.bb
index 3b0fbd3e76..d99c6ceac0 100644
--- a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.52.0.bb
+++ b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.56.1.bb
@@ -9,10 +9,10 @@ DEPENDS = "mm-common cairomm-1.16 glibmm-2.68 pango"
 GNOMEBN = "pangomm"
 inherit gnomebase features_check
 
-SRC_URI[archive.sha256sum] = "34a134126a6484ff12f774358c36ecc44d0e9df094e1b83796d9774bb7d24947"
+SRC_URI[archive.sha256sum] = "539f5aa60e9bdc6b955bb448e2a62cc14562744df690258040fbb74bf885755d"
 REQUIRED_DISTRO_FEATURES = "x11"
 
-S = "${WORKDIR}/${GNOMEBN}-${PV}"
+S = "${UNPACKDIR}/${GNOMEBN}-${PV}"
 
 FILES:${PN} = "${libdir}/lib*.so.*"
 FILES:${PN}-dev += "${libdir}/*/include/ ${libdir}/pangomm-*/"
diff --git a/meta-oe/recipes-graphics/pango/pangomm_2.46.2.bb b/meta-oe/recipes-graphics/pango/pangomm_2.46.4.bb
index da822f3243..6f228b131e 100644
--- a/meta-oe/recipes-graphics/pango/pangomm_2.46.2.bb
+++ b/meta-oe/recipes-graphics/pango/pangomm_2.46.4.bb
@@ -11,7 +11,7 @@ inherit gnomebase features_check
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-SRC_URI[archive.sha256sum] = "57442ab4dc043877bfe3839915731ab2d693fc6634a71614422fb530c9eaa6f4"
+SRC_URI[archive.sha256sum] = "b92016661526424de4b9377f1512f59781f41fb16c9c0267d6133ba1cd68db22"
 
 FILES:${PN} = "${libdir}/lib*.so.*"
 FILES:${PN}-dev += "${libdir}/*/include/ ${libdir}/pangomm-*/"
diff --git a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb
index 2ec89bc05b..88cdce26d1 100644
--- a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb
+++ b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb
@@ -10,6 +10,5 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=h
 PV = "2020.06.15+git"
 SRCREV = "e1642fb691d29b1462504b58916f7f514a963e80"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig meson
diff --git a/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb b/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb
index 039816e4a0..c794f41370 100644
--- a/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb
+++ b/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 SRCREV = "715e29fd4cd71b6e452ae0f4e36d917b43122ce8"
 SRC_URI = "git://github.com/fukuchi/libqrencode.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb
index 58f2275736..c5a0cdc6aa 100644
--- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb
+++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.38.bb
@@ -2,13 +2,12 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd"
 DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger"
 HOMEPAGE = "https://github.com/baldurk/renderdoc"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=36d34a46cb71546195d2b0c626a52e5d"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=963d134bd809d24547253120513346d3"
 
-SRCREV = "35b13a8e8fd2a331854dba6da81a20452e142d6f"
+SRCREV = "34c3c40787f440da9c2947cd63a41e6c4d1f95b9"
 SRC_URI = " \
     git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \
 "
-S = "${WORKDIR}/git"
 
 DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms"
 
diff --git a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb
index bf3070701f..567f7a55e8 100644
--- a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb
+++ b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb
@@ -4,7 +4,6 @@ LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SECTION = "graphics"
 
-S = "${WORKDIR}/git"
 SRCREV = "f09ba2777714871bddb70d049878af34b94fa54d"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=master;protocol=https"
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb b/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb
index 161650f75d..b70859dc13 100644
--- a/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb
+++ b/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb
@@ -8,9 +8,10 @@ DEPENDS = "virtual/libx11"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "ae95dbbacc2620e032acea8abab8c9ef"
 SRC_URI[sha256sum] = "36548a588b2d466913423245dda6ffb6313132cd0cec635a117d37b3dab5fd4c"
 
+UPSTREAM_CHECK_REGEX = "files/v(?P<pver>\d+(\.\d+)+)"
+
 inherit autotools features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-oe/recipes-graphics/surf/surf_2.1.bb
index 4d9d4d3dd0..258c78e509 100644
--- a/meta-oe/recipes-graphics/surf/surf_2.1.bb
+++ b/meta-oe/recipes-graphics/surf/surf_2.1.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \
            "
 SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linker.patch file://0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig features_check
 
diff --git a/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb b/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb
index 1fabe2e29e..4cfbde5354 100644
--- a/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb
+++ b/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb
@@ -12,7 +12,6 @@ DEPENDS = "hostperl-runtime-native gzip-native bdftopcf-native"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
           file://use-no-name-option-for-gzip.patch \
           "
-SRC_URI[md5sum] = "1b6acbd221957e33c8a792ebfaf3a659"
 SRC_URI[sha256sum] = "d961c1b781627bf417f9b340693d64fc219e0113ad3a3af1a3424c7aa373ef79"
 
 inherit allarch fontcache
diff --git a/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb
index 0d45ee765c..f4923f3f00 100644
--- a/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb
+++ b/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRCREV = "4767ea922bcc460e70b87b1d303ebdfed0897da8"
 SRC_URI = "git://github.com/tesseract-ocr/tessdata.git;branch=main;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit allarch
 
diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_5.3.4.bb b/meta-oe/recipes-graphics/tesseract/tesseract_5.5.1.bb
index b32bf34518..4bc0f5b88f 100644
--- a/meta-oe/recipes-graphics/tesseract/tesseract_5.3.4.bb
+++ b/meta-oe/recipes-graphics/tesseract/tesseract_5.5.1.bb
@@ -5,10 +5,9 @@ BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "8ee020e14cf5be4e3f0e9beb09b6b050a1871854"
+SRCREV = "3b7c70e34dea179549ed3e995872e2e019eb8477"
 SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "leptonica"
 
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch b/meta-oe/recipes-graphics/tigervnc/files/0001-do-not-build-tests-sub-directory.patch
index 5a42e67d06..0d58d2502d 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0001-do-not-build-tests-sub-directory.patch
@@ -1,4 +1,4 @@
-From 076d0e12a7be6cd2108e4ca0dcde1cb658918fa5 Mon Sep 17 00:00:00 2001
+From e117ccc2b4ebb116ab63a3aa6097104964ee223b Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 19 Apr 2021 23:02:45 -0700
 Subject: [PATCH] do not build tests sub directory
@@ -12,19 +12,19 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  1 file changed, 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7bf99441..bda80598 100644
+index 468f4b54..c47c9c0e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -304,9 +304,6 @@ if(BUILD_VIEWER)
+@@ -351,9 +351,6 @@ if(BUILD_VIEWER)
    add_subdirectory(media)
  endif()
  
 -add_subdirectory(tests)
 -
 -
- add_subdirectory(release)
- 
- # uninstall
+ if(BUILD_VIEWER)
+   add_subdirectory(release)
+ endif()
 -- 
-2.30.2
+2.25.1
 
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch b/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
index cfb84ac141..101adaa82f 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
@@ -1,7 +1,7 @@
-From 6369a5be2af2ed1fa443f40f48deaf318d22713e Mon Sep 17 00:00:00 2001
+From 4c7658b43f903599608c1fea4fbd7e37dc117119 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 20 Jul 2017 05:06:00 -0400
-Subject: [PATCH 3/4] add missing dynamic library to FLTK_LIBRARIES
+Subject: [PATCH] add missing dynamic library to FLTK_LIBRARIES
 
 Upstream-Status: Pending
 
@@ -11,18 +11,18 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fb72a00..5732dc8 100644
+index 80c2762c..eb581600 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -246,6 +246,8 @@ if(UNIX AND NOT APPLE)
-   endif()
+@@ -315,6 +315,8 @@ if(BUILD_VIEWER)
+   set(CMAKE_REQUIRED_LIBRARIES)
  endif()
  
 +set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lm -ldl -lpng -ljpeg)
 +
  # Check for GNUTLS library
- option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication" ON)
+ trioption(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication")
  if(ENABLE_GNUTLS)
 -- 
-2.7.4
+2.25.1
 
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch b/meta-oe/recipes-graphics/tigervnc/files/0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
index 5f14665b8d..c292df4a52 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
@@ -1,4 +1,4 @@
-From 7f8acd59bb2e54f9be25a98dd71534700a9e355a Mon Sep 17 00:00:00 2001
+From 36bf37cb638cd87d7f8eb96afaf69c2d95177614 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 19 Apr 2021 23:14:28 -0700
 Subject: [PATCH] tigervnc: add fPIC option to COMPILE_FLAGS
@@ -18,35 +18,35 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  3 files changed, 3 insertions(+)
 
 diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt
-index d00ca452..e84e0290 100644
+index f08eaa31..85c05951 100644
 --- a/common/network/CMakeLists.txt
 +++ b/common/network/CMakeLists.txt
-@@ -16,4 +16,5 @@ endif()
+@@ -15,4 +15,5 @@ endif()
  
  if(UNIX)
    libtool_create_control_file(network)
 +  set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC)
  endif()
 diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
-index 989ba2f4..20f6489d 100644
+index 30c2403a..94e1ff98 100644
 --- a/common/rdr/CMakeLists.txt
 +++ b/common/rdr/CMakeLists.txt
-@@ -27,4 +27,5 @@ target_link_libraries(rdr ${RDR_LIBRARIES})
+@@ -35,4 +35,5 @@ endif()
  
  if(UNIX)
    libtool_create_control_file(rdr)
 +  set_target_properties(rdr PROPERTIES COMPILE_FLAGS -fPIC)
  endif()
 diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
-index fc5a37bf..7f5ce131 100644
+index 360434a9..28566e90 100644
 --- a/common/rfb/CMakeLists.txt
 +++ b/common/rfb/CMakeLists.txt
-@@ -99,4 +99,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES})
+@@ -116,4 +116,5 @@ endif()
  
  if(UNIX)
    libtool_create_control_file(rfb)
 +  set_target_properties(rfb PROPERTIES COMPILE_FLAGS -fPIC)
  endif()
 -- 
-2.30.2
+2.25.1
 
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb
deleted file mode 100644
index 668ca79ddd..0000000000
--- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb
+++ /dev/null
@@ -1,133 +0,0 @@
-DESCRIPTION = "TigerVNC remote display system"
-HOMEPAGE = "http://www.tigervnc.com/"
-LICENSE = "GPL-2.0-or-later"
-SECTION = "x11/utils"
-DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk libpam"
-RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash xkbcomp"
-
-LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
-
-S = "${WORKDIR}/git"
-
-inherit autotools cmake features_check pkgconfig
-
-REQUIRED_DISTRO_FEATURES = "x11 pam"
-
-B = "${S}"
-
-SRCREV = "540bfc3278e396321124d4b18a798ac2bc18b6ca"
-
-SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch;protocol=https \
-           file://0002-do-not-build-tests-sub-directory.patch \
-           file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
-           file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
-"
-
-# Keep sync with xorg-server in oe-core
-XORG_PN ?= "xorg-server"
-XORG_PV ?= "1.20.6"
-SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg"
-XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}"
-SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b"
-SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1"
-
-# It is the directory containing the Xorg source for the
-# machine on which you are building TigerVNC.
-XSERVER_SOURCE_DIR="${S}/unix/xserver"
-
-do_patch[postfuncs] += "do_patch_xserver"
-do_patch_xserver () {
-    for subdir in Xext xkb GL hw/xquartz/bundle hw/xfree86/common; do
-        install -d ${XSERVER_SOURCE_DIR}/$subdir
-    done
-
-    for subdir in hw/dmx/doc man doc hw/dmx/doxygen; do
-        install -d ${XSERVER_SOURCE_DIR}/$subdir
-    done
-
-    sources="hw/xquartz/bundle/cpprules.in man/Xserver.man doc/smartsched \
-             hw/dmx/doxygen/doxygen.conf.in xserver.ent.in xkb/README.compiled \
-             hw/xfree86/xorgconf.cpp hw/xfree86/Xorg.sh.in"
-    for i in ${sources}; do
-        install -m 0644 ${XORG_S}/$i ${XSERVER_SOURCE_DIR}/$i;
-    done
-
-    cd ${XORG_S}
-    find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' | \
-    xargs tar cf - | (cd ${XSERVER_SOURCE_DIR} && tar xf -)
-
-    cd ${XSERVER_SOURCE_DIR}
-    xserverpatch="${S}/unix/xserver120.patch"
-    echo "Apply $xserverpatch"
-    patch -p1 -b --suffix .vnc < $xserverpatch
-}
-
-EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
-        --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
-        --disable-static --disable-xinerama \
-        --with-xkb-output=${localstatedir}/lib/xkb \
-        --disable-glx --disable-dri --disable-dri2 \
-        --disable-config-hal \
-        --disable-config-udev \
-        --without-dtrace \
-        --disable-unit-tests \
-        --disable-devel-docs \
-        --disable-selective-werror \
-        --disable-xshmfence \
-        --disable-config-udev \
-        --disable-dri3 \
-        --disable-libunwind \
-        --without-xmlto \
-        --enable-systemd-logind=no \
-        --disable-xinerama \
-        --disable-xwayland \
-"
-
-EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DCMAKE_INSTALL_UNITDIR=${systemd_unitdir}', '-DINSTALL_SYSTEMD_UNITS=OFF', d)}"
-
-do_configure:append () {
-    olddir=`pwd`
-    cd ${XSERVER_SOURCE_DIR}
-
-    rm -rf aclocal-copy/
-    rm -f aclocal.m4
-
-    export ACLOCALDIR="${XSERVER_SOURCE_DIR}/aclocal-copy"
-    mkdir -p ${ACLOCALDIR}/
-    if [ -d ${STAGING_DATADIR_NATIVE}/aclocal ]; then
-        cp-noerror ${STAGING_DATADIR_NATIVE}/aclocal/ ${ACLOCALDIR}/
-    fi
-    if [ -d ${STAGING_DATADIR}/aclocal -a "${STAGING_DATADIR_NATIVE}/aclocal" != "${STAGING_DATADIR}/aclocal" ]; then
-        cp-noerror ${STAGING_DATADIR}/aclocal/ ${ACLOCALDIR}/
-    fi
-    ACLOCAL="aclocal --system-acdir=${ACLOCALDIR}/" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
-    chmod +x ./configure
-    ${CACHED_CONFIGUREVARS} ./configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
-    cd $olddir
-}
-
-do_compile:append () {
-    olddir=`pwd`
-    cd ${XSERVER_SOURCE_DIR}
-
-    oe_runmake
-
-    cd $olddir
-}
-
-do_install:append() {
-    olddir=`pwd`
-    cd ${XSERVER_SOURCE_DIR}/hw/vnc
-
-    oe_runmake 'DESTDIR=${D}' install
-
-    cd $olddir
-}
-
-FILES:${PN} += " \
-    ${libdir}/xorg/modules/extensions \
-    ${datadir}/icons \
-    ${systemd_unitdir} \
-"
-
-FILES:${PN}-dbg += "${libdir}/xorg/modules/extensions/.debug"
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
new file mode 100644
index 0000000000..dd4f79c314
--- /dev/null
+++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
@@ -0,0 +1,87 @@
+DESCRIPTION = "TigerVNC remote display system"
+HOMEPAGE = "http://www.tigervnc.com/"
+LICENSE = "GPL-2.0-or-later"
+SECTION = "x11/utils"
+DEPENDS = "gettext-native xserver-xorg gnutls nettle jpeg pixman libxtst fltk libpam libx11 libxdamage libxfixes libxrandr xkbcomp"
+RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash xkbcomp"
+
+LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
+
+
+inherit autotools cmake features_check pkgconfig systemd
+
+REQUIRED_DISTRO_FEATURES = "x11 pam"
+
+# For ease we do in-tree builds right now. It should be possible to do
+# out-of-tree builds.
+B = "${S}"
+
+SRCREV = "8bdf8734ce12c8ed3c232496fc8a4ccdb04636b8"
+
+SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.15-branch;protocol=https \
+           file://0001-do-not-build-tests-sub-directory.patch \
+           file://0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \
+           file://0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \
+"
+
+# Keep sync with xorg-server in oe-core
+XORG_PN ?= "xorg-server"
+XORG_PV ?= "21.1.16"
+SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.xz;name=xorg"
+XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}"
+SRC_URI[xorg.sha256sum] = "b14a116d2d805debc5b5b2aac505a279e69b217dae2fae2dfcb62400471a9970"
+
+# It is the directory containing the Xorg source for the
+# machine on which you are building TigerVNC.
+XSERVER_SOURCE_DIR = "${S}/unix/xserver"
+AUTOTOOLS_SCRIPT_PATH = "${XSERVER_SOURCE_DIR}"
+
+do_patch[postfuncs] += "do_patch_xserver"
+do_patch_xserver () {
+    # Put the xserver source in the right place in the tigervnc source tree
+    cp -rfl ${XORG_S}/* ${XSERVER_SOURCE_DIR}
+    # Apply the patch to integrate the vnc server
+    patch -p1 -b --suffix .vnc --directory ${XSERVER_SOURCE_DIR} <${S}/unix/xserver21.patch
+}
+
+EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb \
+        --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
+        --disable-static --disable-xinerama \
+        --with-xkb-output=${localstatedir}/lib/xkb \
+        --disable-glx --disable-dri --disable-dri2 \
+        --disable-config-hal \
+        --disable-config-udev \
+        --without-dtrace \
+        --disable-unit-tests \
+        --disable-devel-docs \
+        --disable-selective-werror \
+        --disable-xshmfence \
+        --disable-config-udev \
+        --disable-dri3 \
+        --disable-libunwind \
+        --without-xmlto \
+        --enable-systemd-logind=no \
+        --disable-xinerama \
+"
+
+EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DCMAKE_INSTALL_UNITDIR=${systemd_system_unitdir}', '-DINSTALL_SYSTEMD_UNITS=OFF', d)}"
+
+do_configure:append () {
+    autotools_do_configure
+}
+
+do_compile:append () {
+    oe_runmake 'TIGERVNC_BUILDDIR=${B}'
+}
+
+do_install:append() {
+    oe_runmake -C ${B}/hw/vnc 'DESTDIR=${D}' install
+}
+
+FILES:${PN} += " \
+    ${libdir}/xorg/modules/extensions \
+    ${datadir}/icons \
+    ${datadir}/metainfo \
+"
+
+SYSTEMD_SERVICE:${PN} = "vncserver@.service"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb b/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb
index e7ec004059..38a5126eea 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb
@@ -12,7 +12,10 @@ SRC_URI = " \
     file://44-source-code-pro-fonts-fontconfig.conf \
 "
 SRC_URI[sha256sum] = "da2ac159497d31b0c6d9daa8fc390fb8252e75b4a9805ace6a2c9cccaed4932e"
-S = "${WORKDIR}/source-code-pro-2.030R-ro-1.050R-it"
+S = "${UNPACKDIR}/source-code-pro-2.030R-ro-1.050R-it"
+
+UPSTREAM_CHECK_URI = "https://github.com/adobe-fonts/source-code-pro/tags"
+UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+\.\d+)R"
 
 do_install() {
     install -d ${D}${sysconfdir}/fonts/conf.d/
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.100.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.300.bb
index bce37a2e05..4a3b8e471e 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.100.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.300.bb
@@ -3,13 +3,15 @@ require ttf.inc
 SUMMARY = "Ethiopia and Eritrea (Amharic) font - TTF Edition"
 HOMEPAGE = "http://software.sil.org/abyssinica/"
 LICENSE = "OFL-1.1"
-LIC_FILES_CHKSUM = "file://OFL.txt;md5=fd664aaab50445c3c1c97544554a6bda"
+LIC_FILES_CHKSUM = "file://OFL.txt;md5=6c56db018aa8803f8aff326829e3ce32"
 
 SRCNAME = "AbyssinicaSIL"
 SRC_URI = "http://software.sil.org/downloads/r/abyssinica/${SRCNAME}-${PV}.zip"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
-SRC_URI[sha256sum] = "1a1fc8e82f0c0f2e824f42bff05c1f4a0356330a89dc7ba798c1a20bc3e333e0"
+UPSTREAM_CHECK_URI = "https://software.sil.org/abyssinica/download/"
+
+SRC_URI[sha256sum] = "725e6cd58be6495e0e53f367608db36d9f818498bccba739d742892c5a3d8151"
 
 FONT_PACKAGES = "${PN}"
 FILES:${PN} = "${datadir}"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
index ea734182de..82b2541a60 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
@@ -8,7 +8,7 @@ RPROVIDES:${PN} = "virtual-chinese-font"
 FONT_PACKAGES = "${PN}"
 
 SRC_URI = "https://deb.debian.org/debian/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_0.2.${PV}.2.orig.tar.bz2"
-S = "${WORKDIR}/ttf-arphic-uming-0.2.20080216.2"
+S = "${UNPACKDIR}/ttf-arphic-uming-0.2.20080216.2"
 
 require ttf.inc
 
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
index 54aeb318a4..9dc23fc4c7 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
@@ -17,7 +17,7 @@ RDEPENDS:${PN}-common = ""
 SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \
            file://30-dejavu-aliases.conf"
 
-S = "${WORKDIR}/dejavu-fonts-ttf-${PV}/ttf"
+S = "${UNPACKDIR}/dejavu-fonts-ttf-${PV}/ttf"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/dejavu/files/dejavu/"
 
@@ -44,7 +44,6 @@ FILES:${PN}-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.t
 FILES:${PN}-mathtexgyre     = "${datadir}/fonts/truetype/DejaVuMathTeXGyre.ttf"
 FILES:${PN}-common          = "${sysconfdir}"
 
-SRC_URI[md5sum] = "d0efec10b9f110a32e9b8f796e21782c"
 SRC_URI[sha256sum] = "fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
index cc9213ec5b..06ab2a7921 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
@@ -9,7 +9,7 @@ PV = "0.1+git"
 
 SRC_URI = "git://github.com/android/platform_frameworks_base.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git/data/fonts"
+S = "${UNPACKDIR}/${BP}/data/fonts"
 
 do_install:append() {
     for f in Ahem.ttf MTLc3m.ttf DroidSansArabic.ttf DroidSansThai.ttf \
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
index 2439766ad5..f50da65ddc 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://OFL;md5=33a5bf7b98a9c0ae87430760ba762295 \
 
 SRC_URI = "https://archive.debian.org/debian/pool/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz "
 
-S = "${WORKDIR}/ttf-sil-gentium-${PV}"
+S = "${UNPACKDIR}/ttf-sil-gentium-${PV}"
 
 do_install:append() {
 
@@ -32,5 +32,4 @@ FILES:${PN} = "${datadir}/fonts/truetype/GenI*.ttf \
                ${datadir}/fonts/truetype/GenR*.ttf \
                ${datadir}/doc/ttf-gentium/*"
 
-SRC_URI[md5sum] = "4c3e6ae586be277537ebb68f2a45b883"
 SRC_URI[sha256sum] = "4746c04c9a4ad9e0788a38e0a2f81919a630d8070ceabc89f156b6d41d8ceb37"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb
index c142f1dd02..0697e69399 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb
@@ -23,8 +23,7 @@ SRC_URI = "git://github.com/google/fonts.git;protocol=https;branch=main;subpath=
            git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasanscondensed;name=firasanscondensed \
            git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasansextracondensed;name=firasansextracondensed"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install:append() {
     install -d ${D}${datadir}/fonts/truetype/
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb
index 8a75fe38bd..373bdb4bde 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://../COPYRIGHT.TXT;md5=70d34478e38b1ad9995079f9921f9ef7
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2"
 
-S = "${WORKDIR}/hunkyfonts-${PV}/TTF"
+S = "${UNPACKDIR}/hunkyfonts-${PV}/TTF"
 
 PACKAGES = "ttf-hunky-sans ttf-hunky-serif"
 FONT_PACKAGES = "ttf-hunky-sans ttf-hunky-serif"
@@ -15,5 +15,4 @@ FONT_PACKAGES = "ttf-hunky-sans ttf-hunky-serif"
 FILES:ttf-hunky-sans = "${datadir}/fonts/truetype/HunkySans*.ttf"
 FILES:ttf-hunky-serif = "${datadir}/fonts/truetype/HunkySerif*.ttf"
 
-SRC_URI[md5sum] = "b933312967842e5737b5415fa22d682a"
 SRC_URI[sha256sum] = "3fc528737ccd12ec3c09c4a91447d241d3c5bceeeb4d24b7f2c29b15c9735328"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
index 43b4614f0b..2c671840e2 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
@@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://${UNPACKDIR}/OFL.txt;md5=969851e3a70122069a4d9ee61dd5
 SRC_URI = "http://levien.com/type/myfonts/Inconsolata.otf \
     file://OFL.txt"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 FILES:${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \
     ${datadir}/doc/ttf-inconsolata/*"
@@ -23,5 +22,4 @@ do_install:append() {
     install -m 0644 ${UNPACKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/
 }
 
-SRC_URI[md5sum] = "0fbe014c1f0fb5e3c71140ff0dc63edf"
 SRC_URI[sha256sum] = "1561e616c414a1b82d6e6dfbd18e5726fd65028913ade191e5fa38b6ec375a1a"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-ipa_003.03.01.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-ipa_003.03.01.bb
index 89c48d5fe2..165ea7576a 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-ipa_003.03.01.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-ipa_003.03.01.bb
@@ -10,7 +10,7 @@ SRC_URI = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip "
 
 SRC_URI[sha256sum] = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5"
 
-S = "${WORKDIR}/IPAfont00303"
+S = "${UNPACKDIR}/IPAfont00303"
 
 PACKAGES = "ttf-ipag ttf-ipagp ttf-ipam ttf-ipamp"
 FONT_PACKAGES = "ttf-ipag ttf-ipagp ttf-ipam ttf-ipamp"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb
index a0fb7b6a79..bb2930ae0b 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb
@@ -13,10 +13,9 @@ SRC_URI = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${P
            file://30-0-liberation-sans-narrow.conf \
 "
 
-SRC_URI[md5sum] = "134d8262145fc793c6af494dcace3e71"
 SRC_URI[sha256sum] = "61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c"
 
-S = "${WORKDIR}/liberation-fonts-ttf-${PV}"
+S = "${UNPACKDIR}/liberation-fonts-ttf-${PV}"
 
 do_install:append () {
     install -d ${D}${datadir}/fonts/TTF/
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb
deleted file mode 100644
index 6d7ba11e73..0000000000
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require ttf.inc
-
-SUMMARY = "Liberation fonts - TTF Version"
-HOMEPAGE = "https://www.redhat.com/promo/fonts/"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://License.txt;md5=5b171c5100029d884fcea21d9a2b7543 \
-"
-
-
-SRC_URI = "http://fedorahosted.org/liberation-fonts/export/807b6dfd069b998cd9b4d3158da98817ef23c79d/F-9/liberation-fonts-ttf-3.tar.gz"
-S = "${WORKDIR}/liberation-fonts-${PV}"
-
-PACKAGES = "ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif"
-FONT_PACKAGES = "ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif"
-
-FILES:ttf-liberation-mono  = "${datadir}/fonts/truetype/*Mono*"
-FILES:ttf-liberation-sans  = "${datadir}/fonts/truetype/*Sans*"
-FILES:ttf-liberation-serif = "${datadir}/fonts/truetype/*Serif*"
-
-SRC_URI[md5sum] = "77728078a17e39f7c242b42c3bf6feb8"
-SRC_URI[sha256sum] = "174cf27c57612971434ec8cc4a52bfd37bad8408e9b9219539c6d5113df6ff8f"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_2.1.5.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_2.1.5.bb
new file mode 100644
index 0000000000..92717da32f
--- /dev/null
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_2.1.5.bb
@@ -0,0 +1,26 @@
+require ttf.inc
+
+SUMMARY = "Liberation fonts - TTF Version"
+HOMEPAGE = "https://github.com/liberationfonts"
+LICENSE = "OFL-1.1"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f96db970a9a46c5369142b99f530366b \
+"
+
+
+SRCREV = "4b0192046158094654e865245832c66d2104219e"
+SRC_URI = "git://github.com/liberationfonts/liberation-fonts.git;branch=main;protocol=https"
+
+DEPENDS = "fontforge-native"
+
+PACKAGES = "ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif"
+FONT_PACKAGES = "ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif"
+
+FILES:ttf-liberation-mono  = "${datadir}/fonts/truetype/*Mono*"
+FILES:ttf-liberation-sans  = "${datadir}/fonts/truetype/*Sans*"
+FILES:ttf-liberation-serif = "${datadir}/fonts/truetype/*Serif*"
+
+inherit python3native
+
+do_compile() {
+    cd ${S}; make ttf;
+}
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb
index 65d0f0bb35..d4c7a2f219 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb
@@ -10,8 +10,7 @@ SRC_URI[sha256sum] = "de5750f7048973f851961050f76b8b58e9bda400d5007c3078d9317fbe
 
 DEPENDS = "fontforge-native"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 FONT_PACKAGES = "${PN}"
 FILES:${PN} = "${datadir}"
 
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb
index 8340cccbb4..43ec61772b 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.92.1.bb
@@ -11,7 +11,6 @@ SRCREV = "a403c9b7f509dad5e58dde85ef63b1c36fde3a21"
 SRC_URI = "git://github.com/pravins/lohit.git;branch=master;protocol=https"
 
 DEPENDS = "fontforge-native"
-S = "${WORKDIR}/git"
 FONT_PACKAGES = "${PN}"
 FILES:${PN} = "${datadir}"
 
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
index a3babe90a5..1ae1d1a2b4 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE_E;md5=ac161e96eda00db9a3aec7870b5d9658 \
                     file://LICENSE_J;md5=a120ca8d7c8e4a475d5277c9aeb95221 \
 "
 SRC_URI = "http://downloads.sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-${PV}.tar.gz"
-S = "${WORKDIR}/mplus-TESTFLIGHT-${PV}"
+S = "${UNPACKDIR}/mplus-TESTFLIGHT-${PV}"
 
 PACKAGESPLITFUNCS:prepend = "split_ttf_mplus_packages "
 
@@ -22,5 +22,4 @@ do_install() {
     install -m 0644 *.ttf ${D}${datadir}/fonts/ttf-mplus/
 }
 
-SRC_URI[md5sum] = "d1400184b51b3871e8d2fca6c50e18ae"
 SRC_URI[sha256sum] = "a20b9b9b03c2a6fb1e2137d29e8a6ce06406ba1e008906ea3c474dc048dc06a6"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb
index 9d6a9a6c2e..b5dae22a9d 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb
@@ -11,7 +11,6 @@ SRCREV = "aac7ccaa4d1dea4543453b96f7d6fc47066a57ff"
 PACKAGES = "${PN}-color ${PN}-regular"
 FONT_PACKAGES = "${PN}-color ${PN}-regular"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN}-color = "${datadir}/fonts/truetype/NotoColorEmoji.ttf"
 FILES:${PN}-regular = "${datadir}/fonts/truetype/NotoEmoji-Regular.ttf"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
index fce76418f9..3c3207c672 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
@@ -13,7 +13,6 @@ inherit allarch fontcache
 # and causes hash build failures
 SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/paratype-pt-sans-fonts/PTSans.zip/c3f5a0e20a75cf628387510a720924a7/PTSans.zip"
 
-SRC_URI[md5sum] = "c3f5a0e20a75cf628387510a720924a7"
 SRC_URI[sha256sum] = "0164f824e03c32c99e8a225853ec168893a04a09ade132e93a674e85ae033b2e"
 
 S = "${UNPACKDIR}"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb
index 3752ec39bc..9c9f2e566d 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb
@@ -6,10 +6,8 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
 SRC_URI = "https://github.com/google/roboto/releases/download/v${PV}/roboto-android.zip"
-SRC_URI[md5sum] = "3b43a5cb33196ec25e44d5fcb40219e1"
 SRC_URI[sha256sum] = "c825453253f590cfe62557733e7173f9a421fff103b00f57d33c4ad28ae53baf"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 FILES:${PN} = "${datadir}/fonts/truetype/*.ttf"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
index a4ad91fc77..b72307519c 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://README;md5=97d739900be6e852830f55aa3c07d4a0"
 RPROVIDES:${PN} = "virtual-japanese-font"
 
 SRC_URI = "http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2"
-S = "${WORKDIR}/sazanami-20040629"
+S = "${UNPACKDIR}/sazanami-20040629"
 
 PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho"
 FONT_PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho"
@@ -29,5 +29,4 @@ do_install:append() {
     install -m 0644 ${S}/README ${D}${datadir}/doc/ttf-sazanami-mincho
 }
 
-SRC_URI[md5sum] = "ceef10579a75c92483171f3bd7f77df2"
 SRC_URI[sha256sum] = "3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb
index be0e544ccc..b224f46869 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb
@@ -9,10 +9,10 @@ SECTION = "User Interface/X"
 LICENSE = "IPA"
 LIC_FILES_CHKSUM = "file://IPA_Font_License_Agreement_v1.0.txt;md5=6cd3351ba979cf9db1fad644e8221276"
 
-SRC_URI = "https://launchpad.net/${BPN}/trunk/15.03/+download/TakaoFonts_00303.01.tar.xz"
+SRC_URI = "https://launchpad.net/takao-fonts/trunk/15.03/+download/TakaoFonts_00303.01.tar.xz"
 SRC_URI[sha256sum] = "e9871f72ac69acb3e277aebbee7ca01fbebf54800733e29fafdc46133fc3552f"
 
-S = "${WORKDIR}/TakaoFonts_00303.01"
+S = "${UNPACKDIR}/TakaoFonts_00303.01"
 
 PACKAGES = "ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho"
 FONT_PACKAGES = "ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb
index d118769cc8..ff89f7466a 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb
@@ -10,10 +10,12 @@ SHA1SUM = "0cef8205"
 SRC_URI = "https://assets.ubuntu.com/v1/${SHA1SUM}-ubuntu-font-family-${PV}.zip"
 
 
-SRC_URI[md5sum] = "c5a5059d6856b4ddf79d824dcaf5ad32"
 SRC_URI[sha256sum] = "61a2b342526fd552f19fef438bb9211a8212de19ad96e32a1209c039f1d68ecf"
 
-S = "${WORKDIR}/ubuntu-font-family-${PV}"
+UPSTREAM_CHECK_URI = "https://repology.org/project/fonts:ubuntu/packages"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
+
+S = "${UNPACKDIR}/ubuntu-font-family-${PV}"
 
 PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans"
 FONT_PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans"
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb
index 4cc5afd4a7..c7be162b1b 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb
@@ -12,7 +12,7 @@ SRC_URI = "https://osdn.jp/dl/vlgothic/VLGothic-${PV}.tar.xz"
 
 SRC_URI[sha256sum] = "297a3813675fbea12c5813b55a78091c9a5946515ecbf9fde8b8102e01c579f4"
 
-S = "${WORKDIR}/VLGothic"
+S = "${UNPACKDIR}/VLGothic"
 
 do_install:append () {
     install -D -m644 ${S}/LICENSE_E.mplus ${D}${datadir}/licenses/${PN}/COPYING_MPLUS.txt
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb
index 21897a7589..8d721d00ad 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb
@@ -6,10 +6,12 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cf540fc7d35b5777e36051280b3a911c"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wqy/wqy-zenhei-${PV}.tar.gz"
-SRC_URI[md5sum] = "4c6c3f4e902dd5ee0a121e8c41d040bd"
 SRC_URI[sha256sum] = "e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6"
 
-S = "${WORKDIR}/wqy-zenhei"
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/wqy/files/wqy-zenhei/"
+UPSTREAM_CHECK_REGEX = "wqy-zenhei/(?P<pver>\d+(\.\d+)+)"
+
+S = "${UNPACKDIR}/wqy-zenhei"
 
 do_install:append () {
     sed -i -e '/<string>[^W]/d' ${S}/44-wqy-zenhei.conf
diff --git a/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb b/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb
index e80aebc89b..5aea738c15 100644
--- a/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb
+++ b/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb
@@ -14,7 +14,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS = "libev libx11 libxi libxfixes"
 
-S = "${WORKDIR}/git"
 
 do_install:append() {
     # LICENSE is installed to /usr/share/licenses but we don't want it in the package
diff --git a/meta-oe/recipes-graphics/vdpau/libvdpau_1.5.bb b/meta-oe/recipes-graphics/vdpau/libvdpau_1.5.bb
index db3c045588..3ba561a54e 100644
--- a/meta-oe/recipes-graphics/vdpau/libvdpau_1.5.bb
+++ b/meta-oe/recipes-graphics/vdpau/libvdpau_1.5.bb
@@ -8,7 +8,6 @@ DEPENDS = "virtual/libx11 libxext xorgproto"
 SRCREV = "79f1506a3307d3275b0fdfb2e110c173f68e6f78"
 SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau;branch=master"
 
-S = "${WORKDIR}/git"
 
 inherit features_check meson pkgconfig
 
diff --git a/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb b/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb
new file mode 100644
index 0000000000..a7db743239
--- /dev/null
+++ b/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Tool to query the capabilities of a VDPAU implementation"
+HOMEPAGE = "https://gitlab.freedesktop.org/vdpau/vdpauinfo"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5b6e110c362fe46168199f3490e52c3c"
+
+DEPENDS = "libvdpau"
+
+# libvdpau is available only with x11
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "x11"
+
+RDEPENDS:${PN} = "libvdpau"
+
+SRCREV = "d3c5bd63bf8878d59b22d618d2bb5116db392d28"
+SRC_URI = "git://anongit.freedesktop.org/vdpau/vdpauinfo;branch=master"
+
+
+inherit autotools pkgconfig
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Fix-missing-include-cstdint-causing-build-failures.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Fix-missing-include-cstdint-causing-build-failures.patch
new file mode 100644
index 0000000000..44632bc74f
--- /dev/null
+++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Fix-missing-include-cstdint-causing-build-failures.patch
@@ -0,0 +1,47 @@
+From 1d80b54aefd1f5f361990b1223c6fe308a8d3085 Mon Sep 17 00:00:00 2001
+From: Ricardo Garcia <rgarcia@igalia.com>
+Date: Mon, 21 Apr 2025 12:30:05 +0200
+Subject: [PATCH] Fix missing #include <cstdint> causing build failures
+
+Tested on Fedora 42 with clang.
+
+Upstream-Status: Submitted [https://github.com/google/amber/pull/1092]
+
+Fixes:
+http://errors.yoctoproject.org/Errors/Details/852849/
+
+In file included from TOPDIR/tmp/work/core2-64-oe-linux/vulkan-cts/1.4.1.0/git/external/amber/src/src/type.cc:15:
+TOPDIR/tmp/work/core2-64-oe-linux/vulkan-cts/1.4.1.0/git/external/amber/src/src/type.h:56:39: error: 'uint32_t' has not been declared
+   56 |   static bool IsInt8(FormatMode mode, uint32_t num_bits) {
+      |                                       ^~~~~~~~
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ src/tokenizer.h | 1 +
+ src/type.h      | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/tokenizer.h b/src/tokenizer.h
+index 53efec60..ea4f19df 100644
+--- a/src/tokenizer.h
++++ b/src/tokenizer.h
+@@ -16,6 +16,7 @@
+ #define SRC_TOKENIZER_H_
+ 
+ #include <cstdlib>
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ 
+diff --git a/src/type.h b/src/type.h
+index c63779ba..97720f29 100644
+--- a/src/type.h
++++ b/src/type.h
+@@ -16,6 +16,7 @@
+ #define SRC_TYPE_H_
+ 
+ #include <cassert>
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ #include <vector>
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch
index f659e36066..9eef9a702e 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch
+++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch
@@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/framework/platform/CMakeLists.txt
 +++ b/framework/platform/CMakeLists.txt
-@@ -73,8 +73,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
-                        add_definitions(-DDEQP_SUPPORT_WAYLAND=1)
-                        include_directories(lnx/wayland)
- 
--                       pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
+@@ -83,8 +83,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
+                                configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.c ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.c COPYONLY)
+                                configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.h ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.h COPYONLY)
+                        else ()
+-                               pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
 -
-+                       if (NOT WAYLAND_PROTOCOLS_DIR)
-+                               pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
-+                       endif()
-                        if (NOT WAYLAND_SCANNER)
-                                pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
-                        endif()
++                               if (NOT WAYLAND_PROTOCOL_DIR)
++                                       pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
++                               endif()
+                                if (NOT WAYLAND_SCANNER)
+                                        pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
+                                endif()
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch
new file mode 100644
index 0000000000..5e19ed2db3
--- /dev/null
+++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch
@@ -0,0 +1,123 @@
+From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001
+From: Trevor Woerner <twoerner@gmail.com>
+Date: Thu, 23 Sep 2021 19:36:43 -0400
+Subject: [PATCH] use library sonames for linking
+
+The recommended "best practices" for applications is to link to library
+sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This
+ensures that applications don't try to use libraries if an incompatible ABI
+change occurs.
+
+Upstream-Status: Denied [https://github.com/KhronosGroup/VK-GL-CTS/pull/288]
+Signed-off-by: Trevor Woerner <twoerner@gmail.com>
+---
+ framework/egl/egluGLContextFactory.cpp                      | 4 ++--
+ framework/egl/wrapper/eglwLibrary.cpp                       | 2 +-
+ framework/platform/android/tcuAndroidPlatform.cpp           | 2 +-
+ framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp   | 2 +-
+ .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +-
+ framework/platform/surfaceless/tcuSurfacelessPlatform.cpp   | 6 +++---
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/framework/egl/egluGLContextFactory.cpp
++++ b/framework/egl/egluGLContextFactory.cpp
+@@ -63,7 +63,7 @@ using std::vector;
+ #if (DE_OS == DE_OS_WIN32)
+ #define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll"
+ #else
+-#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so"
++#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2"
+ #endif
+ #endif
+ 
+@@ -75,7 +75,7 @@ using std::vector;
+ #if (DE_OS == DE_OS_WIN32)
+ #define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll"
+ #else
+-#define DEQP_OPENGL_LIBRARY_PATH "libGL.so"
++#define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1"
+ #endif
+ #endif
+ 
+--- a/framework/egl/wrapper/eglwLibrary.cpp
++++ b/framework/egl/wrapper/eglwLibrary.cpp
+@@ -145,7 +145,7 @@ DefaultLibrary::~DefaultLibrary(void)
+ const char *DefaultLibrary::getLibraryFileName(void)
+ {
+ #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX)
+-    return "libEGL.so";
++    return "libEGL.so.1";
+ #elif (DE_OS == DE_OS_WIN32)
+     return "libEGL.dll";
+ #else
+--- a/framework/platform/android/tcuAndroidPlatform.cpp
++++ b/framework/platform/android/tcuAndroidPlatform.cpp
+@@ -56,7 +56,7 @@ static const eglu::NativeWindow::Capabil
+ class NativeDisplay : public eglu::NativeDisplay
+ {
+ public:
+-    NativeDisplay(void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so")
++    NativeDisplay(void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1")
+     {
+     }
+     virtual ~NativeDisplay(void)
+@@ -223,7 +223,7 @@ class VulkanLibrary : public vk::Library
+ {
+ public:
+     VulkanLibrary(const char *libraryPath)
+-        : m_library(libraryPath != nullptr ? libraryPath : "libvulkan.so")
++        : m_library(libraryPath != nullptr ? libraryPath : "libvulkan.so.1")
+         , m_driver(m_library)
+     {
+     }
+--- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp
++++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp
+@@ -77,7 +77,7 @@ using tcu::TextureLevel;
+ class Library : public eglw::DefaultLibrary
+ {
+ public:
+-    Library(void) : eglw::DefaultLibrary("libEGL.so")
++    Library(void) : eglw::DefaultLibrary("libEGL.so.1")
+     {
+     }
+ 
+--- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp
++++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp
+@@ -64,7 +64,7 @@ public:
+     Display(MovePtr<wayland::Display> waylandDisplay)
+         : NativeDisplay(CAPABILITIES, EGL_PLATFORM_WAYLAND_KHR, "EGL_KHR_platform_wayland")
+         , m_display(waylandDisplay)
+-        , m_library("libEGL.so")
++        , m_library("libEGL.so.1")
+     {
+     }
+ 
+--- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
++++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
+@@ -69,7 +69,7 @@ using std::vector;
+ 
+ // Default library names
+ #if !defined(DEQP_GLES2_LIBRARY_PATH)
+-#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so"
++#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2"
+ #endif
+ 
+ #if !defined(DEQP_GLES3_LIBRARY_PATH)
+@@ -77,7 +77,7 @@ using std::vector;
+ #endif
+ 
+ #if !defined(DEQP_OPENGL_LIBRARY_PATH)
+-#define DEQP_OPENGL_LIBRARY_PATH "libGL.so"
++#define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1"
+ #endif
+ 
+ #if !defined(DEQP_VULKAN_LIBRARY_PATH)
+@@ -258,7 +258,7 @@ glu::RenderContext *ContextFactory::crea
+ 
+ EglRenderContext::EglRenderContext(const glu::RenderConfig &config, const tcu::CommandLine &cmdLine,
+                                    const glu::RenderContext *sharedContext)
+-    : m_egl("libEGL.so")
++    : m_egl("libEGL.so.1")
+     , m_contextType(config.type)
+     , m_eglDisplay(EGL_NO_DISPLAY)
+     , m_eglContext(EGL_NO_CONTEXT)
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch
deleted file mode 100644
index 0dd59713a1..0000000000
--- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b07f6ecd6ab83b788301a555dc546b9a5c9dd8a2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 25 Jan 2023 19:19:34 -0800
-Subject: [PATCH] Include missing <cstdint>
-
-This error is seen with gcc-13 where include headers are not implicitly
-included [1]
-
-Fixes errors e.g.
-error: 'uint32_t' does not name a type
-
-[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
-
-Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- framework/common/tcuDefs.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/framework/common/tcuDefs.hpp b/framework/common/tcuDefs.hpp
-index ad3d0736d..6dfac10fb 100644
---- a/framework/common/tcuDefs.hpp
-+++ b/framework/common/tcuDefs.hpp
-@@ -26,6 +26,7 @@
- #include "deDefs.hpp"
- #include "qpTestLog.h"
- 
-+#include <cstdint>
- #include <string>
- #include <stdexcept>
- 
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch
deleted file mode 100644
index 40aea8f203..0000000000
--- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1b7646ced0f0b969f818084887885827ed1a4244 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 31 May 2021 17:31:33 -0700
-Subject: [PATCH] vulkancts: Include missing <cstdint>
-
-Fixes build with gcc-13
-
-../git/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp:2798:102: error: 'uintptr_t' in namespace 'std' does not name a type
- 2798 |                 BufferDataType type              = static_cast<BufferDataType>(reinterpret_cast<std::uintptr_t>(expectedOutputs[resultIndex].getUserData()));
-      |                                                                                                      ^~~~~~~~~
-
-Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp        | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp
-index ab02be1dc..3d3ee4829 100644
---- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp
-+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp
-@@ -33,6 +33,7 @@
- #include "deFloat16.h"
- #include "vkQueryUtil.hpp"
- #include "vkRefUtil.hpp"
-+#include <cstdint>
- #include <cstring>
- #include <vector>
- #include <limits>
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch
index 4ecc371ca4..af59dd3e61 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch
+++ b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch
@@ -2,7 +2,7 @@ Upstream-Status: Pending
 
 --- a/external/glslang/src/glslang/Include/PoolAlloc.h
 +++ b/external/glslang/src/glslang/Include/PoolAlloc.h
-@@ -240,8 +240,9 @@ protected:
+@@ -245,8 +245,9 @@ protected:
  
      int numCalls;           // just an interesting statistic
      size_t totalBytes;      // just an interesting statistic
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch
index 58dc1f24dd..717d489786 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch
+++ b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch
@@ -2,9 +2,9 @@ Upstream-Status: Pending
 
 --- a/framework/delibs/dethread/CMakeLists.txt
 +++ b/framework/delibs/dethread/CMakeLists.txt
-@@ -42,6 +42,7 @@ if (DE_OS_IS_UNIX)
+@@ -41,6 +41,7 @@ if (DE_OS_IS_UNIX)
+        if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
                 add_definitions(-D__BSD_VISIBLE)
-                add_definitions(-D_XOPEN_SOURCE=600)
         endif ()
 +       add_definitions(-D_XOPEN_SOURCE=600)
         add_definitions(-D_GNU_SOURCE)
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch
deleted file mode 100644
index 8a8d8d2c32..0000000000
--- a/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Prepend instead of append to the module search path, as this script needs to use
-the local module build, not the host module build.
-
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py
-index 83c5329ce..10e720910 100755
---- a/external/vulkancts/scripts/gen_framework.py
-+++ b/external/vulkancts/scripts/gen_framework.py
-@@ -33 +33 @@ from collections import OrderedDict
--sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
-+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
-diff --git a/external/vulkancts/scripts/gen_framework_c.py b/external/vulkancts/scripts/gen_framework_c.py
-index 95587e642..84b878cb2 100644
---- a/external/vulkancts/scripts/gen_framework_c.py
-+++ b/external/vulkancts/scripts/gen_framework_c.py
-@@ -28 +28 @@ import re
--sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
-+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/generate-srcuri.py b/meta-oe/recipes-graphics/vk-gl-cts/files/generate-srcuri.py
new file mode 100755
index 0000000000..c2756b592c
--- /dev/null
+++ b/meta-oe/recipes-graphics/vk-gl-cts/files/generate-srcuri.py
@@ -0,0 +1,131 @@
+#! /usr/bin/env python3
+
+import json
+import re
+import os
+import subprocess
+import sys
+import types
+import urllib.parse
+
+
+def resolve_commit(repo, ref):
+    # If it looks like a SHA, just return that
+    if re.match(r"[a-z0-9]{40}", ref):
+        return ref
+
+    # Otherwise it's probably a tag name so resolve it
+    cmd = ("git", "ls-remote", "--tags", "--exit-code", repo, ref)
+    ret = subprocess.run(cmd, check=True, text=True, capture_output=True)
+    sha = ret.stdout.split(maxsplit=1)[0]
+    assert len(sha) == 40
+    return sha
+
+
+def transform_git(repo_url, repo_ref, destination):
+    parts = urllib.parse.urlparse(repo_url)
+    protocol = parts.scheme
+    parts = parts._replace(scheme="git")
+    url = urllib.parse.urlunparse(parts)
+    # Resolve the commit reference to a SHA
+    sha = resolve_commit(repo_url, repo_ref)
+
+    return url + f";protocol={protocol};nobranch=1;destsuffix={destination};rev={sha}"
+
+
+def load_module(filename):
+    import importlib.util
+
+    spec = importlib.util.spec_from_file_location("fetchmodule", filename)
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    return module
+
+
+def convert_fetch(basedir):
+    """
+    Convert the external/fetch_sources.py data
+    """
+    fetch = load_module(os.path.join(basedir, "fetch_sources.py"))
+    lines = []
+    for p in fetch.PACKAGES:
+        if isinstance(p, fetch.SourcePackage):
+            # Ignore these as so far we can use the system copies
+            pass
+        elif isinstance(p, fetch.SourceFile):
+            dest = "/".join(["git/external", p.baseDir, p.extractDir])
+            url = f"{p.url};subdir={dest};sha256sum={p.checksum}"
+            lines.append(f"    {url} \\")
+        elif isinstance(p, fetch.GitRepo):
+            dest = "/".join(["git/external", p.baseDir, p.extractDir])
+            url = transform_git(p.httpsUrl, p.revision, dest)
+            lines.append(f"    {url} \\")
+        else:
+            assert f"Unexpected {p=}"
+    return lines
+
+
+def convert_knowngood(basedir, destination):
+    """
+    Convert the """
+    filename = os.path.join(basedir, "vulkan-validationlayers/src/scripts/known_good.json")
+    try:
+        with open(filename) as fp:
+            data = json.load(fp, object_hook=lambda x: types.SimpleNamespace(**x))
+    except FileNotFoundError:
+        return []
+
+    lines = []
+    for repo in data.repos:
+        # Skip repositories that are not needed on Linux (TODO: assumes linux target)
+        if hasattr(repo, "build_platforms") and repo.build_platforms != "linux":
+            continue
+
+        # Switch the URL to use git: and save the original protocol
+        parts = urllib.parse.urlparse(repo.url)
+        protocol = parts.scheme
+        parts = parts._replace(scheme="git")
+        url = urllib.parse.urlunparse(parts)
+        # Resolve the commit reference to a SHA
+        sha = resolve_commit(repo.url, repo.commit)
+
+        destsuffix = destination + "/" + repo.sub_dir
+
+        url += f";protocol={protocol};nobranch=1;destsuffix={destsuffix};rev={sha}"
+        lines.append(f"    {url} \\")
+    return lines
+
+
+def main():
+    pv = sys.argv[1]
+    basedir = sys.argv[2]
+
+    print("""
+#
+# Generated by generate-srcuri.py, don't update manually")
+#
+
+RECIPE_UPGRADE_EXTRA_TASKS += "do_refresh_srcuri"
+
+python __anonymous() {
+    if d.getVar("PV") != "%s":
+        bb.warn("-sources.inc out of date, run refresh_srcuri task")
+}
+""" % (pv))
+
+    print('SRC_URI += " \\')
+    lines = convert_fetch(basedir)
+    print("\n".join(lines))
+    print('"')
+
+    #lines = convert_knowngood(sys.argv[1], "git/external/validation")
+    #if lines:
+    #    print('SRC_URI += " \\')
+    #    print("\n".join(lines))
+    #    print('"')
+    #else:
+    #    print("# Re-run")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
index 09f1fbcaee..1cc2da7a49 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
+++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
@@ -1,46 +1,31 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRC_URI = "\
-        git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \
-        git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \
-        git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;branch=main \
-        git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=main \
-        git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=main \
-        git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;branch=master \
-        git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;branch=main \
-        https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \
-        git://github.com/Igalia/ESExtractor.git;protocol=https;destsuffix=git/external/ESExtractor/src;name=ESExtractor;branch=main \
-        git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1 \
-"
+SRC_URI = "git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \
+           file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \
+           file://0001-use-library-sonames-for-linking.patch \
+           file://generate-srcuri.py \
+           "
 
-S = "${WORKDIR}/git"
+SRC_URI:append:libc-musl = "file://fix-musl.patch"
+SRC_URI:append:toolchain-clang = "file://fix-clang-private-operator.patch"
 
-SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_vulkan-docs"
+SRCREV_FORMAT = "vk-gl-cts"
 
-S = "${WORKDIR}/git"
 
-inherit pkgconfig cmake features_check python3native qemu
+inherit pkgconfig cmake cmake-qemu features_check python3native
+
+UPSTREAM_CHECK_GITTAGREGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
 
 ANY_OF_DISTRO_FEATURES += "opengl vulkan"
 
 DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native"
-
-SRC_URI += " \
-            file://0001-vulkancts-Include-missing-cstdint.patch \
-            file://0001-use-library-sonames-for-linking.patch \
-"
-
-SRC_URI:append:libc-musl = "\
-        file://fix-musl.patch \
-"
 DEPENDS:append:libc-musl = " libexecinfo"
 
-SRC_URI:append:toolchain-clang = "\
-        file://fix-clang-private-operator.patch \
-"
-
-EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols -DAMBER_DISABLE_WERROR=ON"
+EXTRA_OECMAKE += "-DAMBER_DISABLE_WERROR=ON \
+                  -DUPDATE_DEPS_DIR=${S}/external/validation/ \
+                  -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \
+                  -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols"
 
 # The best thing for the user to do is to not specify any of the following
 # PACKAGECONFIGs (i.e. leave it blank) which tells the project to do its own
@@ -54,17 +39,6 @@ PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,,virtual/libx11 virtual/egl,,,su
 PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11,,,surfaceless wayland x11_egl x11_egl_glx"
 PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_egl x11_glx"
 
-do_configure:append() {
-        # Write out a qemu wrapper that will be used by cmake
-        # so that it can run target helper binaries through that.
-        qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
-        cat > ${WORKDIR}/qemuwrapper << EOF
-#!/bin/sh
-$qemu_binary "\$@"
-EOF
-        chmod +x ${WORKDIR}/qemuwrapper
-}
-
 python __anonymous() {
     # if the user doesn't specify any PACKAGECONFIG then the cts build system
     # is going to probe the sysroot to try to figure out what to build
@@ -81,3 +55,20 @@ python __anonymous() {
 CTSDIR = "/usr/lib/${BPN}"
 
 FILES:${PN} += "${CTSDIR}"
+
+# does not work with libc++-19 due
+# error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'
+TOOLCHAIN = "gcc"
+
+# Prototype task to refresh the generated SRC_URI entries by parsing
+# the files in the source tree and writing a BPN-sources.inc file.
+do_refresh_srcuri() {
+    ${UNPACKDIR}/generate-srcuri.py ${PV} ${S}/external/ \
+        > ${THISDIR}/${BPN}-sources.inc
+    # Don't convert ${S}/external/vulkan-validationlayers/src/scripts/known_good.json as we
+    # currently build without validation
+}
+
+addtask refresh_srcuri after do_patch
+do_refresh_srcuri[network] = "1"
+do_refresh_srcuri[nostamp] = "1"
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts-sources.inc b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts-sources.inc
new file mode 100644
index 0000000000..4e7155cd7f
--- /dev/null
+++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts-sources.inc
@@ -0,0 +1,25 @@
+
+#
+# Generated by generate-srcuri.py, don't update manually")
+#
+
+RECIPE_UPGRADE_EXTRA_TASKS += "do_refresh_srcuri"
+
+python __anonymous() {
+    if d.getVar("PV") != "3.2.12.0":
+        bb.warn("-sources.inc out of date, run refresh_srcuri task")
+}
+
+SRC_URI += " \
+    https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/external/renderdoc/src;sha256sum=e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e \
+    git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-tools/src;rev=04b4a204aa501992ae85a207be1e200e195c98e1 \
+    git://github.com/KhronosGroup/glslang.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/glslang/src;rev=0549c7127c2fbab2904892c9d6ff491fa1e93751 \
+    git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-headers/src;rev=e7294a8ebed84f8c5bd3686c68dbe12a4e65b644 \
+    git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-docs/src;rev=645c59c70e826d9738b6bb103316c03d887dfed3 \
+    git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-validationlayers/src;rev=6cf616f131e9870c499a50441bca2d07ccda9733 \
+    git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/amber/src;rev=6fa5ac1fb3b01c93eef3caa2aeb8841565e38d90 \
+    git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \
+    git://github.com/Igalia/vk_video_samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/nvidia-video-samples/src;rev=45fe88b456c683120138f052ea81f0a958ff3ec4 \
+    git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-video-samples/src;rev=0e87744edbb84c9c56c3fc8de9ea5150af5ee4ea \
+    git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \
+"
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch
deleted file mode 100644
index b5a1d331ed..0000000000
--- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001
-From: Trevor Woerner <twoerner@gmail.com>
-Date: Thu, 23 Sep 2021 19:36:43 -0400
-Subject: [PATCH] use library sonames for linking
-
-The recommended "best practices" for applications is to link to library
-sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This
-ensures that applications don't try to use libraries if an incompatible ABI
-change occurs.
-
-Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288]
-Signed-off-by: Trevor Woerner <twoerner@gmail.com>
----
- framework/egl/egluGLContextFactory.cpp                      | 4 ++--
- framework/egl/wrapper/eglwLibrary.cpp                       | 2 +-
- framework/platform/android/tcuAndroidPlatform.cpp           | 2 +-
- framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp   | 2 +-
- .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +-
- framework/platform/surfaceless/tcuSurfacelessPlatform.cpp   | 6 +++---
- 6 files changed, 9 insertions(+), 9 deletions(-)
-
---- a/framework/egl/egluGLContextFactory.cpp
-+++ b/framework/egl/egluGLContextFactory.cpp
-@@ -63,7 +63,7 @@ using std::vector;
- #      if (DE_OS == DE_OS_WIN32)
- #              define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll"
- #      else
--#              define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so"
-+#              define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2"
- #      endif
- #endif
- 
-@@ -75,7 +75,7 @@ using std::vector;
- #      if (DE_OS == DE_OS_WIN32)
- #              define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll"
- #      else
--#              define DEQP_OPENGL_LIBRARY_PATH "libGL.so"
-+#              define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1"
- #      endif
- #endif
- 
---- a/framework/egl/wrapper/eglwLibrary.cpp
-+++ b/framework/egl/wrapper/eglwLibrary.cpp
-@@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void)
- const char* DefaultLibrary::getLibraryFileName (void)
- {
- #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX)
--       return "libEGL.so";
-+       return "libEGL.so.1";
- #elif (DE_OS == DE_OS_WIN32)
-        return "libEGL.dll";
- #else
---- a/framework/platform/android/tcuAndroidPlatform.cpp
-+++ b/framework/platform/android/tcuAndroidPlatform.cpp
-@@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capabil
- class NativeDisplay : public eglu::NativeDisplay
- {
- public:
--                                                                       NativeDisplay                   (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {}
-+                                                                       NativeDisplay                   (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {}
-        virtual                                                 ~NativeDisplay                  (void) {}
- 
-        virtual EGLNativeDisplayType    getLegacyNative                 (void)                  { return EGL_DEFAULT_DISPLAY;   }
---- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp
-+++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp
-@@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibr
- {
- public:
-        Library (void)
--               : eglw::DefaultLibrary("libEGL.so")
-+               : eglw::DefaultLibrary("libEGL.so.1")
-        {
-        }
- 
---- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp
-+++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp
-@@ -66,7 +66,7 @@ public:
-                                                                                                         EGL_PLATFORM_WAYLAND_KHR,
-                                                                                                         "EGL_KHR_platform_wayland")
-                                                                        , m_display             (waylandDisplay)
--                                                                       , m_library             ("libEGL.so") {}
-+                                                                       , m_library             ("libEGL.so.1") {}
- 
-        ~Display(void) {}
-        wayland::Display&                       getWaylandDisplay       (void)  { return *m_display; }
---- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
-+++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
-@@ -69,7 +69,7 @@ using std::vector;
- 
- // Default library names
- #if !defined(DEQP_GLES2_LIBRARY_PATH)
--#      define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so"
-+#      define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2"
- #endif
- 
- #if !defined(DEQP_GLES3_LIBRARY_PATH)
-@@ -77,7 +77,7 @@ using std::vector;
- #endif
- 
- #if !defined(DEQP_OPENGL_LIBRARY_PATH)
--#      define DEQP_OPENGL_LIBRARY_PATH "libGL.so"
-+#      define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1"
- #endif
- 
- #if !defined(DEQP_VULKAN_LIBRARY_PATH)
-@@ -234,7 +234,7 @@ glu::RenderContext* ContextFactory::crea
- }
- 
- EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine)
--       : m_egl("libEGL.so")
-+       : m_egl("libEGL.so.1")
-        , m_contextType(config.type)
-        , m_eglDisplay(EGL_NO_DISPLAY)
-        , m_eglContext(EGL_NO_CONTEXT)
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.12.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.12.0.bb
new file mode 100644
index 0000000000..1bcbed1600
--- /dev/null
+++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.12.0.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "OpenGL CTS"
+
+require khronos-cts.inc
+
+SRCREV_vk-gl-cts = "42e61858e862e153cd0fe36593a8c3f7c16c3275"
+
+require opengl-es-cts-sources.inc
+
+EXTRA_OECMAKE += "-DSELECTED_BUILD_TARGETS="cts-runner deqp-egl deqp-gles2 deqp-gles3 deqp-gles31 deqp-gl-shared de-internal-tests glcts""
+
+do_install() {
+        install -d ${D}/${CTSDIR}
+        cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR}
+        cp -r ${S}/external/openglcts/data/gl_cts/data/mustpass/ ${D}/${CTSDIR}/mustpass/
+
+        install -m 0755 ${B}/modules/egl/deqp-egl ${D}/${CTSDIR}
+        install -m 0755 ${B}/modules/gles2/deqp-gles2 ${D}/${CTSDIR}
+        install -m 0755 ${B}/modules/gles3/deqp-gles3 ${D}/${CTSDIR}
+        install -m 0755 ${B}/modules/gles31/deqp-gles31 ${D}/${CTSDIR}
+        install -m 0755 ${B}/modules/internal/de-internal-tests ${D}/${CTSDIR}
+
+        rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles
+        rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles
+        rm -rf ${D}/${CTSDIR}/common/subgroups/*.a ${D}/${CTSDIR}/common/subgroups/cmake_install.cmake ${D}/${CTSDIR}/common/subgroups/CMakeFiles
+}
+
+SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}"
+# GCC-15 segfaults see - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=120119
+TUNE_CCARGS:remove:aarch64 = "-mcpu=cortex-a57+crc"
+LTO = ""
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb
deleted file mode 100644
index 0656d724b4..0000000000
--- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "OpenGL CTS"
-
-require khronos-cts.inc
-# opengl-es-cts-3.2.9.3
-SRCREV_vk-gl-cts = "7f5fb62245d535a1fc0bf50b2c7e5a342dc551fe"
-SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273"
-SRCREV_glslang = "a0ad0d7067521fff880e36acfb8ce453421c3f25"
-SRCREV_spirv-headers = "87d5b782bec60822aa878941e6b13c0a9a954c9b"
-SRCREV_spirv-tools = "f98473ceeb1d33700d01e20910433583e5256030"
-SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4"
-# Not yet needed
-SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1"
-SRCREV_vulkan-docs = "9a2e576a052a1e65a5d41b593e693ff02745604b"
-SRCREV_video-parser = "7d68747d3524842afaf050c5e00a10f5b8c07904"
-SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e"
-
-SRC_URI += "\
-        git://github.com/nvpro-samples/vk_video_samples.git;protocol=https;destsuffix=git/external/video-parser/src;name=video-parser;branch=main \
-        file://gen-framework-path.patch \
-        "
-S = "${WORKDIR}/git"
-
-do_install() {
-        install -d ${D}/${CTSDIR}
-        cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR}
-
-        install -m 0755 ${B}/modules/egl/deqp-egl ${D}/${CTSDIR}
-        install -m 0755 ${B}/modules/gles2/deqp-gles2 ${D}/${CTSDIR}
-        install -m 0755 ${B}/modules/gles3/deqp-gles3 ${D}/${CTSDIR}
-        install -m 0755 ${B}/modules/gles31/deqp-gles31 ${D}/${CTSDIR}
-        install -m 0755 ${B}/modules/internal/de-internal-tests ${D}/${CTSDIR}
-
-        rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles
-        rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles
-        rm -rf ${D}/${CTSDIR}/common/subgroups/*.a ${D}/${CTSDIR}/common/subgroups/cmake_install.cmake ${D}/${CTSDIR}/common/subgroups/CMakeFiles
-}
-
-SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}"
-LTO = ""
-
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc
new file mode 100644
index 0000000000..563da1007a
--- /dev/null
+++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc
@@ -0,0 +1,26 @@
+
+#
+# Generated by generate-srcuri.py, don't update manually")
+#
+
+RECIPE_UPGRADE_EXTRA_TASKS += "do_refresh_srcuri"
+
+python __anonymous() {
+    if d.getVar("PV") != "1.4.2.1":
+        bb.warn("-sources.inc out of date, run refresh_srcuri task")
+}
+
+SRC_URI += " \
+    https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/external/renderdoc/src;sha256sum=e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e \
+    git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-tools/src;rev=3364b982713a0440d1d342dd5eec65b122a61b71 \
+    git://github.com/KhronosGroup/glslang.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/glslang/src;rev=1b65bd602b23d401d1c4c86dfa90a36a52c66294 \
+    git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-headers/src;rev=767e901c986e9755a17e7939b3046fc2911a4bbd \
+    git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-docs/src;rev=645c59c70e826d9738b6bb103316c03d887dfed3 \
+    git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-validationlayers/src;rev=6cf616f131e9870c499a50441bca2d07ccda9733 \
+    git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/amber/src;rev=6fa5ac1fb3b01c93eef3caa2aeb8841565e38d90 \
+    git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \
+    git://github.com/Igalia/vk_video_samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/nvidia-video-samples/src;rev=45fe88b456c683120138f052ea81f0a958ff3ec4 \
+    git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-video-samples/src;rev=0e87744edbb84c9c56c3fc8de9ea5150af5ee4ea \
+    git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \
+    file://0001-Fix-missing-include-cstdint-causing-build-failures.patch;patchdir=external/amber/src \
+"
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch
deleted file mode 100644
index f12abd0c1a..0000000000
--- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001
-From: Trevor Woerner <twoerner@gmail.com>
-Date: Thu, 23 Sep 2021 19:36:43 -0400
-Subject: [PATCH] use library sonames for linking
-
-The recommended "best practices" for applications is to link to library
-sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This
-ensures that applications don't try to use libraries if an incompatible ABI
-change occurs.
-
-Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288]
-Signed-off-by: Trevor Woerner <twoerner@gmail.com>
----
- framework/egl/egluGLContextFactory.cpp                      | 4 ++--
- framework/egl/wrapper/eglwLibrary.cpp                       | 2 +-
- framework/platform/android/tcuAndroidPlatform.cpp           | 2 +-
- framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp   | 2 +-
- .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +-
- framework/platform/surfaceless/tcuSurfacelessPlatform.cpp   | 6 +++---
- 6 files changed, 9 insertions(+), 9 deletions(-)
-
---- a/framework/egl/egluGLContextFactory.cpp
-+++ b/framework/egl/egluGLContextFactory.cpp
-@@ -63,7 +63,7 @@ using std::vector;
- #      if (DE_OS == DE_OS_WIN32)
- #              define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll"
- #      else
--#              define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so"
-+#              define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2"
- #      endif
- #endif
- 
-@@ -75,7 +75,7 @@ using std::vector;
- #      if (DE_OS == DE_OS_WIN32)
- #              define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll"
- #      else
--#              define DEQP_OPENGL_LIBRARY_PATH "libGL.so"
-+#              define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1"
- #      endif
- #endif
- 
---- a/framework/egl/wrapper/eglwLibrary.cpp
-+++ b/framework/egl/wrapper/eglwLibrary.cpp
-@@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void)
- const char* DefaultLibrary::getLibraryFileName (void)
- {
- #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX)
--       return "libEGL.so";
-+       return "libEGL.so.1";
- #elif (DE_OS == DE_OS_WIN32)
-        return "libEGL.dll";
- #else
---- a/framework/platform/android/tcuAndroidPlatform.cpp
-+++ b/framework/platform/android/tcuAndroidPlatform.cpp
-@@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capabil
- class NativeDisplay : public eglu::NativeDisplay
- {
- public:
--                                                                       NativeDisplay                   (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {}
-+                                                                       NativeDisplay                   (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {}
-        virtual                                                 ~NativeDisplay                  (void) {}
- 
-        virtual EGLNativeDisplayType    getLegacyNative                 (void)                  { return EGL_DEFAULT_DISPLAY;   }
---- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp
-+++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp
-@@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibr
- {
- public:
-        Library (void)
--               : eglw::DefaultLibrary("libEGL.so")
-+               : eglw::DefaultLibrary("libEGL.so.1")
-        {
-        }
- 
---- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp
-+++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp
-@@ -66,7 +66,7 @@ public:
-                                                                                                         EGL_PLATFORM_WAYLAND_KHR,
-                                                                                                         "EGL_KHR_platform_wayland")
-                                                                        , m_display             (waylandDisplay)
--                                                                       , m_library             ("libEGL.so") {}
-+                                                                       , m_library             ("libEGL.so.1") {}
- 
-        ~Display(void) {}
-        wayland::Display&                       getWaylandDisplay       (void)  { return *m_display; }
---- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
-+++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
-@@ -69,7 +69,7 @@ using std::vector;
- 
- // Default library names
- #if !defined(DEQP_GLES2_LIBRARY_PATH)
--#      define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so"
-+#      define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2"
- #endif
- 
- #if !defined(DEQP_GLES3_LIBRARY_PATH)
-@@ -77,7 +77,7 @@ using std::vector;
- #endif
- 
- #if !defined(DEQP_OPENGL_LIBRARY_PATH)
--#      define DEQP_OPENGL_LIBRARY_PATH "libGL.so"
-+#      define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1"
- #endif
- 
- #if !defined(DEQP_VULKAN_LIBRARY_PATH)
-@@ -237,7 +237,7 @@ glu::RenderContext* ContextFactory::crea
- }
- 
- EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine, const glu::RenderContext *sharedContext)
--       : m_egl("libEGL.so")
-+       : m_egl("libEGL.so.1")
-        , m_contextType(config.type)
-        , m_eglDisplay(EGL_NO_DISPLAY)
-        , m_eglContext(EGL_NO_CONTEXT)
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb
deleted file mode 100644
index 7492fe9aa4..0000000000
--- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Vulkan CTS"
-
-require khronos-cts.inc
-
-SRC_URI += "git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1"
-
-# vulkan-cts-1.3.7.3
-SRCREV_vk-gl-cts = "d71a36db16d98313c431829432a136dbda692a08"
-SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273"
-SRCREV_glslang = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3"
-SRCREV_spirv-headers = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c"
-SRCREV_spirv-tools = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0"
-SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1"
-SRCREV_vulkan-docs = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0"
-SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e"
-# Not yet needed
-SRCREV_ESExtractor = "75ffcaf55bb069f7a23764194742d2fb78c7f71f"
-SRCREV_video-parser = "138bbe048221d315962ddf8413aa6a08cc62a381"
-
-SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \
-            file://0001-vulkan-cts-include-missing-cstdint.patch \
-"
-
-TOOLCHAIN = "gcc"
-
-# Workaround an optimization bug that breaks createMeshShaderMiscTestsEXT
-OECMAKE_CXX_FLAGS:remove:toolchain-gcc = "-O2"
-
-S = "${WORKDIR}/git"
-
-REQUIRED_DISTRO_FEATURES = "vulkan"
-inherit features_check
-
-DEPENDS += " vulkan-loader"
-
-do_install() {
-        install -d ${D}/${CTSDIR}
-        cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/
-        rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles
-        rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles
-}
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.2.1.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.2.1.bb
new file mode 100644
index 0000000000..abbd026047
--- /dev/null
+++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.2.1.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Vulkan CTS"
+
+require khronos-cts.inc
+
+SRCREV_vk-gl-cts = "644f10ca39dea3b7d9dbadaa75c56206b499a520"
+
+require vulkan-cts-sources.inc
+
+# Workaround an optimization bug that breaks createMeshShaderMiscTestsEXT
+OECMAKE_CXX_FLAGS:remove:toolchain-gcc = "-O2"
+
+REQUIRED_DISTRO_FEATURES = "vulkan"
+inherit features_check
+
+DEPENDS += " vulkan-loader"
+
+EXTRA_OECMAKE += "-DSELECTED_BUILD_TARGETS="deqp-vk deqp-vksc""
+
+do_install() {
+        install -d ${D}/${CTSDIR}/mustpass
+        cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/
+        cp -r ${S}/external/vulkancts/mustpass/main/ ${D}/${CTSDIR}/mustpass/
+        rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles
+        rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles
+}
diff --git a/meta-oe/recipes-graphics/wayland/libei_1.2.1.bb b/meta-oe/recipes-graphics/wayland/libei_1.4.1.bb
index 807dcea1ed..764616906f 100644
--- a/meta-oe/recipes-graphics/wayland/libei_1.2.1.bb
+++ b/meta-oe/recipes-graphics/wayland/libei_1.4.1.bb
@@ -16,8 +16,7 @@ DEPENDS = " \
 
 SRC_URI = "git://gitlab.freedesktop.org/libinput/libei.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
-SRCREV = "08f1d41085a6ae4bac7bc52abe2955d3354342cb"
+SRCREV = "9e0413cbc7d3ae6656266890425f152589ddf74d"
 
 inherit meson pkgconfig
 
diff --git a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb
index c1f5f4ed8e..bb909a313a 100644
--- a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb
+++ b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=maste
 DEPENDS = "pugixml"
 DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2"
 
-S = "${WORKDIR}/git"
 SRCREV = "4321ed5c7b4bffa41b8a2a13dc7f3ece1191f4f3"
 
 inherit cmake pkgconfig features_check
diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
index 74f80e1844..1493eed7af 100644
--- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
+++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/LibVNC/x11vnc;branch=master;protocol=https \
            file://starting-fix.patch \
            file://CVE-2020-29074.patch \
            "
-S = "${WORKDIR}/git"
 
 DEPENDS = "\
         jpeg \
diff --git a/meta-oe/recipes-graphics/xbindkeys/xbindkeys_1.8.7.bb b/meta-oe/recipes-graphics/xbindkeys/xbindkeys_1.8.7.bb
index 0c316edf95..5076b5a945 100644
--- a/meta-oe/recipes-graphics/xbindkeys/xbindkeys_1.8.7.bb
+++ b/meta-oe/recipes-graphics/xbindkeys/xbindkeys_1.8.7.bb
@@ -12,7 +12,6 @@ inherit features_check autotools
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "http://www.nongnu.org/xbindkeys/xbindkeys-${PV}.tar.gz"
-SRC_URI[md5sum] = "b5e1a9668ba13ff8673836d1d965d951"
 SRC_URI[sha256sum] = "a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2"
 
 EXTRA_OECONF = "--disable-guile"
diff --git a/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.8.bb b/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.9.bb
index 3770babe80..f8e5de7554 100644
--- a/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.8.bb
+++ b/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.9.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bd1fb9ee90eead85f7b171807b3ab4f2"
 DEPENDS = "libpng libxcursor"
 
 SRC_URI = "http://xorg.freedesktop.org/archive/individual/app/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "32b33ce27b4e285e64ff375731806bb7988cc626ff10915c65f1dc4da640cc9b"
+SRC_URI[sha256sum] = "0cc9e156ac84ca16ea902710af35e0faffa51d13797071e3b4b6cc7cbd493bbc"
 
 inherit features_check autotools pkgconfig
 
diff --git a/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb b/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb
index cef82bd348..45defe82d6 100644
--- a/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb
+++ b/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb
@@ -12,7 +12,10 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "https://github.com/jordansissel/${BPN}/releases/download/v${PV}/${BP}.tar.gz"
 SRC_URI[sha256sum] = "96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada"
 
-EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLLIB=${libdir} INSTALLMAN=${mandir}"
+EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLLIB=${libdir} INSTALLMAN=${mandir} WITHOUT_RPATH_FIX=1"
+
+UPSTREAM_CHECK_URI = "https://github.com/jordansissel/xdotool/tags"
+UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+\.\d{8}\.\d+)"
 
 do_install() {
     oe_runmake install DESTDIR=${D} PREFIX=${prefix}
diff --git a/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb b/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb
index 9116b5f749..53e09fd868 100644
--- a/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb
+++ b/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb
@@ -7,7 +7,6 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f9a35333adf75edd1eaef84bca65a490"
 DEPENDS = "libxfont"
 
-SRC_URI[md5sum] = "2a455d3c02390597feb9cefb3fe97a45"
 SRC_URI[sha256sum] = "4b4df05fc53f1e98993638d6f7e178d95b31745c4568cee407e167491fd311a2"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-graphics/xorg-app/twm_1.0.12.bb b/meta-oe/recipes-graphics/xorg-app/twm_1.0.13.1.bb
index 91b1abc211..ff0238a430 100644
--- a/meta-oe/recipes-graphics/xorg-app/twm_1.0.12.bb
+++ b/meta-oe/recipes-graphics/xorg-app/twm_1.0.13.1.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586"
 
 SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.gz"
-SRC_URI[sha256sum] = "4150c9ec595520167ab8c4efcb5cf82641a4c4db78ce0a1cb4834e6aeb7c87fb"
+SRC_URI[sha256sum] = "e16bdbc82ac57c096d606a90e63c42c73a4a8a6a8a04d97b7dad199f919c8471"
 
 FILES:${PN} += "${datadir}/X11/twm/system.twmrc"
 ALTERNATIVE_NAME = "x-window-manager"
diff --git a/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.5.bb b/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.6.bb
index afc1fe17d5..92f1b94215 100644
--- a/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.5.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.6.bb
@@ -10,4 +10,4 @@ DEPENDS += "libxkbfile bison-native"
 BBCLASSEXTEND = "native"
 
 SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "38357b702de9d3457c4ff75053390f457b84c4accc7f088101255c37c684926b"
+SRC_URI[sha256sum] = "d9b401f84cf8568342ff63b1ffc6aecd3877579256d89fe6408645e2741b073e"
diff --git a/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.7.bb
index e866bed016..9b8c655acd 100644
--- a/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.7.bb
@@ -9,5 +9,5 @@ DEPENDS += "libxkbfile"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[sha256sum] = "99cc9404f7b90289ae04944c0d98a208cc8b158492ad6481386e31d4d09aa7b0"
+SRC_URI[sha256sum] = "1c4f49c030329e0defd8c7bc3739e60f2aa1d2aabe0e2d7e63740ab629aa59cc"
 SRC_URI_EXT = "xz"
diff --git a/meta-oe/recipes-graphics/xorg-app/xmag_1.0.7.bb b/meta-oe/recipes-graphics/xorg-app/xmag_1.0.8.bb
index f3dac53451..1589f9ae6e 100644
--- a/meta-oe/recipes-graphics/xorg-app/xmag_1.0.7.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xmag_1.0.8.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3413fe6832380b44b69b172d2d1b2387"
 DEPENDS += " libxaw libxt"
 
 SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "009936cc5a2706084079127b26cf55c713767650a34cb69e5682d60e33ce7461"
+SRC_URI[sha256sum] = "326d3c583d795bb53ac609d144e7f7fb1499baba7eaec14b8e6cd232ea069532"
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_392.bb b/meta-oe/recipes-graphics/xorg-app/xterm_394.bb
index 677f5c9994..94953b288e 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_392.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_394.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=1a3032aa728f8fda9d
 SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
            file://0001-include-missing-pty.h-header-for-openpty.patch \
           "
-SRC_URI[sha256sum] = "4d57372ef08eafa9fb7682db8d07be0fe0513e58e8478c2ec8e9b62486e7fe5e"
+SRC_URI[sha256sum] = "a2a0cb206eb0423dedc34794f5c2d38c83390d2dd1106b66aba0960c3a976c7a"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native"
@@ -47,3 +47,5 @@ ALTERNATIVE:${PN} = "resize x-terminal-emulator"
 ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm"
 # rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm.
 ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9"
+
+CVE_STATUS[CVE-1999-0965] = "cpe-incorrect: Current version (392) not affected. This was fixed in version X11R5-fix-26 (R11R6 from 1994)"
diff --git a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.7.bb
index 1be0b5cd77..27138f23f8 100644
--- a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.7.bb
@@ -9,4 +9,4 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=31e8892c80b7a0c1c5f37c8e8ae6d794"
 
 SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "64048cd15eba3cd9a3d2e3280650391259ebf6b529f2101d1a20f441038c1afe"
+SRC_URI[sha256sum] = "e55cbedab36d7a5f671abf8e594888afc48caa116d51d429ea53ea317ec0c61e"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb
index 8c26bf798c..a2be3bb70b 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb
@@ -9,6 +9,8 @@ RRECOMMENDS:${PN} += "tslib-calibrate"
 SRC_URI = "https://github.com/merge/xf86-input-tslib/releases/download/${PV}/xf86-input-tslib-${PV}.tar.xz \
            file://99-xf86-input-tslib.rules \
 "
+UPSTREAM_CHECK_URI = "https://github.com/merge/xf86-input-tslib/tags"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$"
 
 SRC_URI[sha256sum] = "b596168c4ed2f1023212dc828ce49cbe82a0bbd1aac3c5e2958154d78870ca88"
 
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb
index 8b4526fc5e..8fd2ae2e84 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb
@@ -9,6 +9,5 @@ DEPENDS += "virtual/libx11 libdrm xorgproto"
 SRCREV = "8bbdb2ae3bb8ef649999a8da33ddbe11a04763b8"
 SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-armsoc;branch=master"
 
-S = "${WORKDIR}/git"
 
 RDEPENDS:${PN} += "xserver-xorg-module-exa"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.1.0.bb
index 34b3e4cde6..5ad64eede8 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.1.0.bb
@@ -11,7 +11,7 @@ DEPENDS += "virtual/libx11 libpciaccess"
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
 
 XORG_DRIVER_COMPRESSOR = ".tar.xz"
-SRC_URI[sha256sum] = "27a33b70837965bb4a5f27fd260be085ca5bba837a4e62907f093c2f205603ab"
+SRC_URI[sha256sum] = "7bf85dbf4efa17b7cdd483be8f61cf11fd73d0310514b6ae10d89358de63ab73"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
 PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xorgproto,xserver-xorg-extension-dri"
diff --git a/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb b/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb
index 36f05b7277..52d5892c15 100644
--- a/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb
+++ b/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb
@@ -16,5 +16,4 @@ inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[md5sum] = "1347c3031b74c9e91dc4dfa53b12f143"
 SRC_URI[sha256sum] = "b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054"
diff --git a/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb b/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb
index 8b83ba378f..7c43767d22 100644
--- a/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb
+++ b/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb
@@ -16,5 +16,4 @@ inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[md5sum] = "66fb6de561648a6dce2755621d6aea17"
 SRC_URI[sha256sum] = "d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5"
diff --git a/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb b/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb
index 5d321acc6e..fd8f16dca8 100644
--- a/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb
+++ b/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb
@@ -16,5 +16,4 @@ inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[md5sum] = "9f11ade089d689b9d59e0f47d26f39cd"
 SRC_URI[sha256sum] = "23c07162708e4b79eb33095c8bfa62c783717a9431254bbf44863734ea239481"
diff --git a/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb b/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb
index 557eeb17bd..a1a6d43e06 100644
--- a/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb
+++ b/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb
@@ -16,5 +16,4 @@ inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[md5sum] = "c8b73a53dcefe3e8d3907d3500e484a9"
 SRC_URI[sha256sum] = "62a83363c2536095fda49d260d21e0847675676e4e3415054064cbdffa641fbb"
diff --git a/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb b/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb
index b280a32603..def7357e3f 100644
--- a/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb
+++ b/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb
@@ -16,5 +16,4 @@ inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[md5sum] = "6b223a54b15ecbd5a1bc52312ad790d8"
 SRC_URI[sha256sum] = "ebe0d7444e3d7c8da7642055ac2206f0190ee060700d99cd876f8fc9964cb6ce"
diff --git a/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb b/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb
index ba4575bc29..787541d3b3 100644
--- a/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb
+++ b/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb
@@ -13,5 +13,4 @@ inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[md5sum] = "3e0069d4f178a399cffe56daa95c2b63"
 SRC_URI[sha256sum] = "17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635"
diff --git a/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb b/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb
index 852f93602f..ed314ab3c0 100644
--- a/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb
+++ b/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb
@@ -13,5 +13,4 @@ inherit features_check
 # depends on bdftopcf-native -> virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[md5sum] = "c88eb44b3b903d79fb44b860a213e623"
 SRC_URI[sha256sum] = "b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794"
diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb
index d698efa5e6..073b3f0912 100644
--- a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb
+++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb
@@ -13,6 +13,8 @@ MIRRORS += "https://www.jwz.org/${BPN} https://ftp.osuosl.org/pub/blfs/conglomer
 
 SRC_URI[sha256sum] = "787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152"
 
+UPSTREAM_CHECK_URI = "https://www.jwz.org/xscreensaver/download.html"
+
 DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam jpeg"
 # These are only needed as part of the stopgap screensaver implementation:
 RDEPENDS:${PN} = " \
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch
deleted file mode 100644
index 6f738e7376..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From f919725918fad2b32504f89a28310fcae4ab0406 Mon Sep 17 00:00:00 2001
-From: Yu Ke <ke.yu@intel.com>
-Date: Wed, 11 Apr 2012 14:26:16 +0200
-Subject: [PATCH] COPYING: add GPLv2 license file
-
-this is a local file recipe and the license file is missing.In order
-to pass the license checksum checking, the license file is needed. So
-this patch add the GPLv2 license file.
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
-Upstream-Status: Pending
-
- COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 339 insertions(+)
- create mode 100644 COPYING
-
-diff --git a/COPYING b/COPYING
-new file mode 100644
-index 0000000..d511905
---- /dev/null
-+++ b/COPYING
-@@ -0,0 +1,339 @@
-+                   GNU GENERAL PUBLIC LICENSE
-+                      Version 2, June 1991
-+
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+                           Preamble
-+
-+  The licenses for most software are designed to take away your
-+freedom to share and change it.  By contrast, the GNU General Public
-+License is intended to guarantee your freedom to share and change free
-+software--to make sure the software is free for all its users.  This
-+General Public License applies to most of the Free Software
-+Foundation's software and to any other program whose authors commit to
-+using it.  (Some other Free Software Foundation software is covered by
-+the GNU Lesser General Public License instead.)  You can apply it to
-+your programs, too.
-+
-+  When we speak of free software, we are referring to freedom, not
-+price.  Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+this service if you wish), that you receive source code or can get it
-+if you want it, that you can change the software or use pieces of it
-+in new free programs; and that you know you can do these things.
-+
-+  To protect your rights, we need to make restrictions that forbid
-+anyone to deny you these rights or to ask you to surrender the rights.
-+These restrictions translate to certain responsibilities for you if you
-+distribute copies of the software, or if you modify it.
-+
-+  For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must give the recipients all the rights that
-+you have.  You must make sure that they, too, receive or can get the
-+source code.  And you must show them these terms so they know their
-+rights.
-+
-+  We protect your rights with two steps: (1) copyright the software, and
-+(2) offer you this license which gives you legal permission to copy,
-+distribute and/or modify the software.
-+
-+  Also, for each author's protection and ours, we want to make certain
-+that everyone understands that there is no warranty for this free
-+software.  If the software is modified by someone else and passed on, we
-+want its recipients to know that what they have is not the original, so
-+that any problems introduced by others will not reflect on the original
-+authors' reputations.
-+
-+  Finally, any free program is threatened constantly by software
-+patents.  We wish to avoid the danger that redistributors of a free
-+program will individually obtain patent licenses, in effect making the
-+program proprietary.  To prevent this, we have made it clear that any
-+patent must be licensed for everyone's free use or not licensed at all.
-+
-+  The precise terms and conditions for copying, distribution and
-+modification follow.
-+
-+                   GNU GENERAL PUBLIC LICENSE
-+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+  0. This License applies to any program or other work which contains
-+a notice placed by the copyright holder saying it may be distributed
-+under the terms of this General Public License.  The "Program", below,
-+refers to any such program or work, and a "work based on the Program"
-+means either the Program or any derivative work under copyright law:
-+that is to say, a work containing the Program or a portion of it,
-+either verbatim or with modifications and/or translated into another
-+language.  (Hereinafter, translation is included without limitation in
-+the term "modification".)  Each licensee is addressed as "you".
-+
-+Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope.  The act of
-+running the Program is not restricted, and the output from the Program
-+is covered only if its contents constitute a work based on the
-+Program (independent of having been made by running the Program).
-+Whether that is true depends on what the Program does.
-+
-+  1. You may copy and distribute verbatim copies of the Program's
-+source code as you receive it, in any medium, provided that you
-+conspicuously and appropriately publish on each copy an appropriate
-+copyright notice and disclaimer of warranty; keep intact all the
-+notices that refer to this License and to the absence of any warranty;
-+and give any other recipients of the Program a copy of this License
-+along with the Program.
-+
-+You may charge a fee for the physical act of transferring a copy, and
-+you may at your option offer warranty protection in exchange for a fee.
-+
-+  2. You may modify your copy or copies of the Program or any portion
-+of it, thus forming a work based on the Program, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+    a) You must cause the modified files to carry prominent notices
-+    stating that you changed the files and the date of any change.
-+
-+    b) You must cause any work that you distribute or publish, that in
-+    whole or in part contains or is derived from the Program or any
-+    part thereof, to be licensed as a whole at no charge to all third
-+    parties under the terms of this License.
-+
-+    c) If the modified program normally reads commands interactively
-+    when run, you must cause it, when started running for such
-+    interactive use in the most ordinary way, to print or display an
-+    announcement including an appropriate copyright notice and a
-+    notice that there is no warranty (or else, saying that you provide
-+    a warranty) and that users may redistribute the program under
-+    these conditions, and telling the user how to view a copy of this
-+    License.  (Exception: if the Program itself is interactive but
-+    does not normally print such an announcement, your work based on
-+    the Program is not required to print an announcement.)
-+
-+These requirements apply to the modified work as a whole.  If
-+identifiable sections of that work are not derived from the Program,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works.  But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Program, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Program.
-+
-+In addition, mere aggregation of another work not based on the Program
-+with the Program (or with a work based on the Program) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+  3. You may copy and distribute the Program (or a work based on it,
-+under Section 2) in object code or executable form under the terms of
-+Sections 1 and 2 above provided that you also do one of the following:
-+
-+    a) Accompany it with the complete corresponding machine-readable
-+    source code, which must be distributed under the terms of Sections
-+    1 and 2 above on a medium customarily used for software interchange; or,
-+
-+    b) Accompany it with a written offer, valid for at least three
-+    years, to give any third party, for a charge no more than your
-+    cost of physically performing source distribution, a complete
-+    machine-readable copy of the corresponding source code, to be
-+    distributed under the terms of Sections 1 and 2 above on a medium
-+    customarily used for software interchange; or,
-+
-+    c) Accompany it with the information you received as to the offer
-+    to distribute corresponding source code.  (This alternative is
-+    allowed only for noncommercial distribution and only if you
-+    received the program in object code or executable form with such
-+    an offer, in accord with Subsection b above.)
-+
-+The source code for a work means the preferred form of the work for
-+making modifications to it.  For an executable work, complete source
-+code means all the source code for all modules it contains, plus any
-+associated interface definition files, plus the scripts used to
-+control compilation and installation of the executable.  However, as a
-+special exception, the source code distributed need not include
-+anything that is normally distributed (in either source or binary
-+form) with the major components (compiler, kernel, and so on) of the
-+operating system on which the executable runs, unless that component
-+itself accompanies the executable.
-+
-+If distribution of executable or object code is made by offering
-+access to copy from a designated place, then offering equivalent
-+access to copy the source code from the same place counts as
-+distribution of the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+  4. You may not copy, modify, sublicense, or distribute the Program
-+except as expressly provided under this License.  Any attempt
-+otherwise to copy, modify, sublicense or distribute the Program is
-+void, and will automatically terminate your rights under this License.
-+However, parties who have received copies, or rights, from you under
-+this License will not have their licenses terminated so long as such
-+parties remain in full compliance.
-+
-+  5. You are not required to accept this License, since you have not
-+signed it.  However, nothing else grants you permission to modify or
-+distribute the Program or its derivative works.  These actions are
-+prohibited by law if you do not accept this License.  Therefore, by
-+modifying or distributing the Program (or any work based on the
-+Program), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Program or works based on it.
-+
-+  6. Each time you redistribute the Program (or any work based on the
-+Program), the recipient automatically receives a license from the
-+original licensor to copy, distribute or modify the Program subject to
-+these terms and conditions.  You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties to
-+this License.
-+
-+  7. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License.  If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Program at all.  For example, if a patent
-+license would not permit royalty-free redistribution of the Program by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Program.
-+
-+If any portion of this section is held invalid or unenforceable under
-+any particular circumstance, the balance of the section is intended to
-+apply and the section as a whole is intended to apply in other
-+circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system, which is
-+implemented by public license practices.  Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+  8. If the distribution and/or use of the Program is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Program under this License
-+may add an explicit geographical distribution limitation excluding
-+those countries, so that distribution is permitted only in or among
-+countries not thus excluded.  In such case, this License incorporates
-+the limitation as if written in the body of this License.
-+
-+  9. The Free Software Foundation may publish revised and/or new versions
-+of the General Public License from time to time.  Such new versions will
-+be similar in spirit to the present version, but may differ in detail to
-+address new problems or concerns.
-+
-+Each version is given a distinguishing version number.  If the Program
-+specifies a version number of this License which applies to it and "any
-+later version", you have the option of following the terms and conditions
-+either of that version or of any later version published by the Free
-+Software Foundation.  If the Program does not specify a version number of
-+this License, you may choose any version ever published by the Free Software
-+Foundation.
-+
-+  10. If you wish to incorporate parts of the Program into other free
-+programs whose distribution conditions are different, write to the author
-+to ask for permission.  For software which is copyrighted by the Free
-+Software Foundation, write to the Free Software Foundation; we sometimes
-+make exceptions for this.  Our decision will be guided by the two goals
-+of preserving the free status of all derivatives of our free software and
-+of promoting the sharing and reuse of software generally.
-+
-+                           NO WARRANTY
-+
-+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-+REPAIR OR CORRECTION.
-+
-+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGES.
-+
-+                    END OF TERMS AND CONDITIONS
-+
-+           How to Apply These Terms to Your New Programs
-+
-+  If you develop a new program, and you want it to be of the greatest
-+possible use to the public, the best way to achieve this is to make it
-+free software which everyone can redistribute and change under these terms.
-+
-+  To do so, attach the following notices to the program.  It is safest
-+to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least
-+the "copyright" line and a pointer to where the full notice is found.
-+
-+    <one line to give the program's name and a brief idea of what it does.>
-+    Copyright (C) <year>  <name of author>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License along
-+    with this program; if not, write to the Free Software Foundation, Inc.,
-+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+If the program is interactive, make it output a short notice like this
-+when it starts in an interactive mode:
-+
-+    Gnomovision version 69, Copyright (C) year name of author
-+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-+    This is free software, and you are welcome to redistribute it
-+    under certain conditions; type `show c' for details.
-+
-+The hypothetical commands `show w' and `show c' should show the appropriate
-+parts of the General Public License.  Of course, the commands you use may
-+be called something other than `show w' and `show c'; they could even be
-+mouse-clicks or menu items--whatever suits your program.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the program, if
-+necessary.  Here is a sample; alter the names:
-+
-+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-+
-+  <signature of Ty Coon>, 1 April 1989
-+  Ty Coon, President of Vice
-+
-+This General Public License does not permit incorporating your program into
-+proprietary programs.  If your program is a subroutine library, you may
-+consider it more useful to permit linking proprietary applications with the
-+library.  If this is what you want to do, use the GNU Lesser General
-+Public License instead of this License.
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch
deleted file mode 100644
index ea7c7d6a94..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1002a1137b140dad3319bf3206fec5b6c6b74fea Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Thu, 10 Nov 2016 14:33:05 +0200
-Subject: [PATCH] Don't install Xsession or Xserver
-
-The goal is to use Xsession and Xserver from xserver-nodm-init.
-Xsession scripts and xserver-common from this recipe will still
-be used as before.
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-
----
-Upstream-Status: Pending
-
- Makefile | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index caa5de1..9428205 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,8 +20,6 @@ install-program:
-        install -m 755 run-calibrate.sh $(DESTDIR)$(PREFIX)/bin/run-calibrate.sh
-        install -m 644 X11/Xdefaults $(DESTDIR)/etc/X11/Xdefaults
-        install -m 755 X11/Xinit $(DESTDIR)/etc/X11/Xinit
--       install -m 755 X11/Xserver $(DESTDIR)/etc/X11/Xserver
--       install -m 755 X11/Xsession $(DESTDIR)/etc/X11/Xsession
-        install -m 755 X11/xserver-common $(DESTDIR)/etc/X11/xserver-common
-        install -m 755 X11/functions $(DESTDIR)/etc/X11/functions
-        install -d $(DESTDIR)/etc/X11/xmodmap
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch
deleted file mode 100644
index b408234ecb..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 3b5f431a370054bfc090796e8d55de8c8cea46f4 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 11 Apr 2012 14:28:45 +0200
-Subject: [PATCH] add setdpi Xinit.d script
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
-Upstream-Status: Pending
-
- X11/Xinit.d/50setdpi | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 92 insertions(+)
- create mode 100644 X11/Xinit.d/50setdpi
-
-diff --git a/X11/Xinit.d/50setdpi b/X11/Xinit.d/50setdpi
-new file mode 100644
-index 0000000..04a2edd
---- /dev/null
-+++ b/X11/Xinit.d/50setdpi
-@@ -0,0 +1,92 @@
-+#! /bin/sh
-+#
-+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-+#
-+# Filename: setDPI.sh
-+# Date: 09-Apr-06
-+
-+# This script configures Xft.dpi dependent on your screens DPI. This insures that the same font-size
-+# setting of 7 can be used on all machines.
-+
-+
-+XDEFAULTS="/etc/X11/Xdefaults"
-+
-+
-+
-+set_dpi() {
-+       
-+       CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Xft.dpi\:/s/.*\:\(.*\)/\1/p" | sed -n "s/\ //p"`" 
-+
-+       if test "$CURRENT_SETTING" != "$1"
-+       then
-+               echo "Using Xft.dpi of $SET_SCREEN_DPI for your $SCREEN_DPI DPI screen"
-+               
-+               if grep -q "Xft.dpi" "$XDEFAULTS"
-+               then
-+                       cat "${XDEFAULTS}" | sed "s/^Xft.dpi\:.*/Xft.dpi\: $SET_SCREEN_DPI/" > "${XDEFAULTS}_"
-+                       mv "${XDEFAULTS}_" "${XDEFAULTS}"
-+               else
-+                       echo -e "Xft.dpi: $SET_SCREEN_DPI\n" >> "$XDEFAULTS"
-+               fi
-+       else
-+               echo "Your $SCREEN_DPI DPI screen is already configured."
-+       fi
-+}
-+
-+set_rxvt_font() {
-+
-+       CURRENT_SETTING="`cat ${XDEFAULTS} | sed  -n "/Rxvt\*font/s/\(.*\pixelsize=\)\(.*\)/\2/p"`"
-+
-+       if test "$1" -gt 100
-+       then
-+       
-+               # Configure the rxvt font-size for your screen here:
-+               test "$1" -gt 180 -a "$1" -lt "221" && RXVT_FONT_SIZE=16
-+               
-+               if test -z "$RXVT_FONT_SIZE"
-+               then
-+                       echo "WARNING: No rxvt font-size configured for a $SCREEN_DPI DPI screen!"
-+                       echo "Defaulting to size 9"
-+                       RXVT_FONT_SIZE=9
-+               fi
-+               
-+               if test "$CURRENT_SETTING" != "$RXVT_FONT_SIZE"
-+               then
-+                       echo "Using a rxvt font-size of $RXVT_FONT_SIZE"
-+                       cat ${XDEFAULTS} | sed "/Rxvt\*font/s/\(.*\pixelsize\)\(=*.*\)/\1=$RXVT_FONT_SIZE/" > ${XDEFAULTS}_
-+                       mv ${XDEFAULTS}_ ${XDEFAULTS}
-+               else
-+                       echo "The rxvt font-size is already configured"
-+               fi 
-+       fi
-+}
-+
-+if test -z "$DISPLAY"
-+then
-+       echo "DISPLAY is not set, aborting..."
-+       exit 0
-+fi
-+
-+SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`"
-+
-+if test -z "$SCREEN_DPI"
-+then
-+       echo "WARNING: Couldn't read your screens DPI, defaulting to 100"
-+       SCREEN_DPI=100
-+fi
-+
-+# Configure your screen here:
-+test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160
-+test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100
-+
-+
-+if test -z "$SET_SCREEN_DPI"
-+then
-+       echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!"
-+       echo "Using 100 DPI"
-+       SET_SCREEN_DPI=100
-+fi
-+
-+set_dpi "$SET_SCREEN_DPI"
-+set_rxvt_font "$SCREEN_DPI"
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch
deleted file mode 100644
index 4a9342c934..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b60e364c35d56a2a3164254d98c9931bfa3feed4 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 11 Apr 2012 14:34:43 +0200
-Subject: [PATCH] add support for /etc/X11/xserver-system
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
-Upstream-Status: Pending
-
- X11/xserver-common | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/X11/xserver-common b/X11/xserver-common
-index 52655cb..bb7c2ff 100644
---- a/X11/xserver-common
-+++ b/X11/xserver-common
-@@ -204,3 +204,8 @@ fi
- if [ "$XSERVER" != "Xorg" ] ; then
-     ARGS="$ARGS $MOUSE $KDRIVEARGS"
- fi
-+
-+# let a local script modify the variables                    
-+if [ -e /etc/X11/xserver-system ] ; then                    
-+       . /etc/X11/xserver-system                    
-+fi                    
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch
deleted file mode 100644
index ba35d1cf6c..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 492c65a32a4ae44c34580ed8ac5d3f50a155cfef Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 11 Apr 2012 14:36:02 +0200
-Subject: [PATCH] use own functions file instead /etc/init.d/functions
-
-* so we don't have to depend on initscripts
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
-Upstream-Status: Pending
-
- Makefile             |  1 +
- X11/Xinit.d/11zaurus |  2 +-
- X11/Xinit.d/12keymap |  2 +-
- X11/functions        | 11 +++++++++++
- X11/xserver-common   |  2 +-
- 5 files changed, 15 insertions(+), 3 deletions(-)
- create mode 100644 X11/functions
-
-diff --git a/Makefile b/Makefile
-index e2d9af9..caa5de1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -23,6 +23,7 @@ install-program:
-        install -m 755 X11/Xserver $(DESTDIR)/etc/X11/Xserver
-        install -m 755 X11/Xsession $(DESTDIR)/etc/X11/Xsession
-        install -m 755 X11/xserver-common $(DESTDIR)/etc/X11/xserver-common
-+       install -m 755 X11/functions $(DESTDIR)/etc/X11/functions
-        install -d $(DESTDIR)/etc/X11/xmodmap
-        install -m 644 X11/xmodmap/*.xmodmap $(DESTDIR)/etc/X11/xmodmap
-        install -m 644 X11/xmodmap/xmodmap-* $(DESTDIR)/etc/X11/xmodmap
-diff --git a/X11/Xinit.d/11zaurus b/X11/Xinit.d/11zaurus
-index 54ea6f5..23e7713 100644
---- a/X11/Xinit.d/11zaurus
-+++ b/X11/Xinit.d/11zaurus
-@@ -8,7 +8,7 @@ else
-    CHCK=chkhinge
- fi
- 
--. /etc/init.d/functions
-+. /etc/X11/functions
- 
- $CHCK -e
- if [ $? = 12 ]; then
-diff --git a/X11/Xinit.d/12keymap b/X11/Xinit.d/12keymap
-index 7eac296..b7a7f2d 100644
---- a/X11/Xinit.d/12keymap
-+++ b/X11/Xinit.d/12keymap
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--. /etc/init.d/functions
-+. /etc/X11/functions
- 
- # since kdrive 1.4 there is no default keymap in server
- xmodmap - </etc/X11/xmodmap/default.xmodmap
-diff --git a/X11/functions b/X11/functions
-new file mode 100644
-index 0000000..a1311ad
---- /dev/null
-+++ b/X11/functions
-@@ -0,0 +1,11 @@
-+# -*-Shell-script-*-
-+#
-+# functions     This file contains functions shared by few X11 scripts
-+#               machine_id also exists in /etc/init.d/functions but some
-+#               people don't use initscripts anymore
-+#
-+
-+machine_id() { # return the machine ID
-+       awk 'BEGIN { FS=": " } /Hardware/ \
-+               { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
-+}
-diff --git a/X11/xserver-common b/X11/xserver-common
-index bb7c2ff..d622f2a 100644
---- a/X11/xserver-common
-+++ b/X11/xserver-common
-@@ -30,7 +30,7 @@ if [ -f /etc/profile ]; then
-   . /etc/profile
- fi
- 
--. /etc/init.d/functions
-+. /etc/X11/functions
- 
- fallback_screen_arg() {
-     geom=`fbset | grep geometry`
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch
deleted file mode 100644
index a04e563f82..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e2abbe110e71a7b4b56564e6b9d58ffa7f34a9e8 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 11 Apr 2012 14:37:29 +0200
-Subject: [PATCH] xserver-common: add dpi and nocursor params for gta01 and
- gta02
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
-Upstream-Status: Pending
-
- X11/xserver-common | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/X11/xserver-common b/X11/xserver-common
-index d622f2a..a2c0591 100644
---- a/X11/xserver-common
-+++ b/X11/xserver-common
-@@ -133,15 +133,19 @@ else
-             ARGS="$ARGS -screen ${SCREEN_SIZE}"
-             DPI="225" ;;
-         "gta01" )
--            DPI="285"
-+            DPI="280"
-             if [ "$XSERVER" != "Xorg" ] ; then
-                 ARGS="$ARGS -screen 480x640"
-+            else
-+                ARGS="$ARGS -dpi ${DPI} -nocursor"
-             fi
-             ;;
-         "gta02")
--            DPI="285"
-+            DPI="280"
-             if [ "$XSERVER" != "Xorg" ] ; then
-                 ARGS="$ARGS -screen ${SCREEN_SIZE}"
-+            else
-+                ARGS="$ARGS -dpi ${DPI} -nocursor"
-             fi
-             ;;
-         "motorola_ezx_platform")
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch
deleted file mode 100644
index 993b320154..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f2d808cea5b9f69158f82e16c06f882a6db10d63 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 11 Apr 2012 14:40:14 +0200
-Subject: [PATCH] xserver-common: add support for n900 alias nokia_rx-51_board
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
-Upstream-Status: Pending
-
- X11/xserver-common | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/X11/xserver-common b/X11/xserver-common
-index a2c0591..b8c37e6 100644
---- a/X11/xserver-common
-+++ b/X11/xserver-common
-@@ -132,6 +132,13 @@ else
-         "nokia_n800" | "nokia_rx-44" | "nokia_n770")
-             ARGS="$ARGS -screen ${SCREEN_SIZE}"
-             DPI="225" ;;
-+        "nokia_rx-51_board" )                                     
-+            DPI="267"                                    
-+            if [ "$XSERVER" != "Xorg" ] ; then                    
-+                ARGS="$ARGS -screen ${SCREEN_SIZE}"               
-+            else                                                  
-+                ARGS="$ARGS -dpi ${DPI} -nocursor"       
-+            fi ;;                                                    
-         "gta01" )
-             DPI="280"
-             if [ "$XSERVER" != "Xorg" ] ; then
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch
deleted file mode 100644
index 2948cd611b..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a194ba2013f9e58cf73cd39b57be68386e501eda Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 11 Apr 2012 14:40:44 +0200
-Subject: [PATCH] xserver-common: add support for nexus S alias herring
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
-Upstream-Status: Pending
-
- X11/xserver-common | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/X11/xserver-common b/X11/xserver-common
-index b8c37e6..9aa6b24 100644
---- a/X11/xserver-common
-+++ b/X11/xserver-common
-@@ -126,6 +126,9 @@ else
-         "htc_tornado")
-             ARGS="$ARGS -hide-cursor"
-             DPI="100" ;;
-+        "herring")
-+            DPI="235"
-+            ARGS="$ARGS -dpi ${DPI} -nocursor";;
-         "generic_omap1510/1610/1710")
-             ARGS="$ARGS -screen ${SCREEN_SIZE}"
-             DPI="225" ;;
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch
deleted file mode 100644
index 342d49becd..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dfd832b35b6cb4cf2b6f2b51df7b0999f10c8ca1 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 11 Apr 2012 14:41:06 +0200
-Subject: [PATCH] xserver-common: add support for nexus one alias mahimahi
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
-Upstream-Status: Pending
-
- X11/xserver-common | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/X11/xserver-common b/X11/xserver-common
-index 9aa6b24..8da926e 100644
---- a/X11/xserver-common
-+++ b/X11/xserver-common
-@@ -129,6 +129,9 @@ else
-         "herring")
-             DPI="235"
-             ARGS="$ARGS -dpi ${DPI} -nocursor";;
-+        "mahimahi")
-+            DPI="254"
-+            ARGS="$ARGS -dpi ${DPI}";;
-         "generic_omap1510/1610/1710")
-             ARGS="$ARGS -screen ${SCREEN_SIZE}"
-             DPI="225" ;;
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch
deleted file mode 100644
index 94f9d2ca6f..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d9e05e53b30c66705852256ff5c603252aa94b2c Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 11 Apr 2012 14:41:52 +0200
-Subject: [PATCH] xserver-common: add support for gta04 alias OpenPhoenux
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
-Upstream-Status: Pending
-
- X11/xserver-common | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/X11/xserver-common b/X11/xserver-common
-index 8da926e..d9325dd 100644
---- a/X11/xserver-common
-+++ b/X11/xserver-common
-@@ -161,6 +161,14 @@ else
-                 ARGS="$ARGS -dpi ${DPI} -nocursor"
-             fi
-             ;;
-+        "gta04")
-+            DPI="280"
-+            if [ "$XSERVER" != "Xorg" ] ; then
-+                ARGS="$ARGS -screen ${SCREEN_SIZE}"
-+            else
-+                ARGS="$ARGS -dpi ${DPI} -nocursor"
-+            fi
-+            ;;
-         "motorola_ezx_platform")
-             ARGS="$ARGS -screen 240x320"
-             DPI="170" ;;
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch
deleted file mode 100644
index c023b583b0..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 57ab521ffc1024f21105ca14be2d041a477942b1 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 17 Aug 2012 13:00:56 +0200
-Subject: [PATCH] xserver-common: add support for tuna alias Galaxy Nexus
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
----
-Upstream-Status: Pending
-
- X11/xserver-common | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/X11/xserver-common b/X11/xserver-common
-index d9325dd..017e5ae 100644
---- a/X11/xserver-common
-+++ b/X11/xserver-common
-@@ -169,6 +169,14 @@ else
-                 ARGS="$ARGS -dpi ${DPI} -nocursor"
-             fi
-             ;;
-+        "tuna")
-+            DPI="316"
-+            if [ "$XSERVER" != "Xorg" ] ; then
-+                ARGS="$ARGS -screen ${SCREEN_SIZE}"
-+            else
-+                ARGS="$ARGS -dpi ${DPI} -nocursor"
-+            fi
-+            ;;
-         "motorola_ezx_platform")
-             ARGS="$ARGS -screen 240x320"
-             DPI="170" ;;
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
deleted file mode 100644
index a731917003..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5236209e30e0f45113e140f0667c8ffcfe621536 Mon Sep 17 00:00:00 2001
-From: Javier Viguera <javier.viguera@digi.com>
-Date: Wed, 26 Nov 2014 09:24:44 +0100
-Subject: [PATCH] xserver-common: disable TCP connections
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Javier Viguera <javier.viguera@digi.com>
-
----
- X11/xserver-common | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/X11/xserver-common b/X11/xserver-common
-index 017e5ae..4dc48c4 100644
---- a/X11/xserver-common
-+++ b/X11/xserver-common
-@@ -44,7 +44,7 @@ SCREEN_SIZE=`fallback_screen_arg`
- export USER=root
- export XSERVER_DEFAULT_ORIENTATION=normal
- 
--ARGS="-br -pn $INPUT_EXTRA_ARGS"
-+ARGS="-br -pn -nolisten tcp $INPUT_EXTRA_ARGS"
- DPI="100"
- MOUSE=""
- KDRIVEARGS=""
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
deleted file mode 100644
index 3f577bfa05..0000000000
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-SUMMARY = "Common X11 scripts and support files"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-
-# we are using a gpe-style Makefile
-inherit features_check gpe
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI[md5sum] = "82f2f84cd96610e8f7b92c700cd31c14"
-SRC_URI[sha256sum] = "cd04c33418f776b1e13fcc7af3d6bd0c7cccd03fbabd7dbcd97f88166cc34210"
-
-SRC_URI:append = " \
-    file://0001-COPYING-add-GPLv2-license-file.patch \
-    file://0002-add-setdpi-Xinit.d-script.patch \
-    file://0006-add-support-for-etc-X11-xserver-system.patch \
-    file://0007-use-own-functions-file-instead-etc-init.d-functions.patch \
-    file://0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch \
-    file://0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch \
-    file://0010-xserver-common-add-support-for-nexus-S-alias-herring.patch \
-    file://0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch \
-    file://0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch \
-    file://0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch \
-    file://0015-xserver-common-disable-TCP-connections.patch \
-    file://0001-Don-t-install-Xsession-or-Xserver.patch \
-"
-
-do_install:append() {
-    sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/xserver-common
-    # Rename all Xsession files not ending with .sh
-    # Unfortunatelly when xinput-calibrator was moved to oe-core
-    # its Xsession file got name 30xinput_calibrate.sh and ls -X sorts it
-    # last, not respecting numbers for sorting them
-    for i in ${D}/${sysconfdir}/X11/Xsession.d/*; do
-        echo $i | grep '.sh$' || mv $i $i.sh
-    done
-}
-
-RDEPENDS:${PN} = "xmodmap xrandr xdpyinfo fbset xinput-calibrator"
-
-RCONFLICTS:${PN} = "xserver-kdrive-common x11-common"
-RREPLACES:${PN} = "xserver-kdrive-common x11-common"
-
diff --git a/meta-oe/recipes-graphics/yad/yad_6.0.bb b/meta-oe/recipes-graphics/yad/yad_6.0.bb
index 9e46215fd8..64c12f5904 100644
--- a/meta-oe/recipes-graphics/yad/yad_6.0.bb
+++ b/meta-oe/recipes-graphics/yad/yad_6.0.bb
@@ -13,6 +13,5 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS = "gtk+3 glib-2.0-native intltool-native"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${datadir}/icons/"
diff --git a/meta-oe/recipes-graphics/ydotool/ydotool_git.bb b/meta-oe/recipes-graphics/ydotool/ydotool_git.bb
index 3acf70235e..7562271d90 100644
--- a/meta-oe/recipes-graphics/ydotool/ydotool_git.bb
+++ b/meta-oe/recipes-graphics/ydotool/ydotool_git.bb
@@ -8,7 +8,6 @@ PV = "1.0.4+git"
 SRC_URI = "git://github.com/ReimuNotMoe/ydotool;protocol=https;branch=master"
 SRCREV = "0c295346d55afcc6aebaaee564333b3e1efabcbd"
 
-S = "${WORKDIR}/git"
 
 inherit cmake systemd
 
diff --git a/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb b/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb
index 0e17800c4b..3bbfe4cf9f 100644
--- a/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb
+++ b/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git;protoc
 
 BBCLASSEXTEND = "native nativesdk"
 
-S = "${WORKDIR}/git"
 
 do_install () {
     install -d ${D}${bindir}
diff --git a/meta-oe/recipes-kernel/blktests/blktests.bb b/meta-oe/recipes-kernel/blktests/blktests.bb
new file mode 100644
index 0000000000..ded03a4de2
--- /dev/null
+++ b/meta-oe/recipes-kernel/blktests/blktests.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Linux kernel block layer testing framework"
+DESCRIPTION = "blktests is a test framework for the Linux kernel block layer and storage stack. It is inspired by the xfstests filesystem testing framework."
+DEPENDS = "gnutls keyutils glib-2.0 libnl"
+RDEPENDS:${PN} += " bash coreutils gawk util-linux fio"
+LICENSE = "GPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSES/GPL-3.0;md5=d32239bcb673463ab874e80d47fae504"
+
+SRCREV = "9aa2023312bfcdd6b31c24b6e4a4a5c2d4f870d2"
+SRC_URI = " \
+        git://github.com/osandov/blktests.git;nobranch=1;protocol=https \
+        "
+
+
+inherit autotools-brokensep
+
+do_configure[noexec] = "1"
+
+FILES:${PN} = "/usr/blktests/*"
diff --git a/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-oe/recipes-kernel/bpftool/bpftool.bb
index b22334fe90..d19746184c 100644
--- a/meta-oe/recipes-kernel/bpftool/bpftool.bb
+++ b/meta-oe/recipes-kernel/bpftool/bpftool.bb
@@ -14,7 +14,7 @@ EXTRA_OEMAKE = "\
     -C ${S}/tools/bpf/bpftool \
     O=${B} \
     CROSS=${TARGET_PREFIX} \
-    CC="${CC} ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH}" \
+    CC="${CC} ${DEBUG_PREFIX_MAP} -ffile-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} ${CFLAGS}" \
     HOSTCC="${BUILD_CC} ${BUILD_CFLAGS}" \
     LD="${LD}" \
     AR=${AR} \
@@ -26,7 +26,7 @@ SECURITY_CFLAGS = ""
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
-COMPATIBLE_HOST = "(x86_64|aarch64).*-linux"
+COMPATIBLE_HOST = "(x86_64|aarch64|riscv64).*-linux"
 COMPATIBLE_HOST:libc-musl = 'null'
 
 do_compile() {
diff --git a/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb b/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb
index 4b6026ebc0..fe980e3e6f 100644
--- a/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb
+++ b/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb
@@ -14,7 +14,6 @@ SRCREV = "a0eb4805dbb232f02f156b9351a23790c1a4cec7"
 
 PE = "1"
 
-S = "${WORKDIR}/git"
 
 inherit allarch
 
diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb b/meta-oe/recipes-kernel/cpupower/cpupower.bb
index 18e3638052..453ebe8c7f 100644
--- a/meta-oe/recipes-kernel/cpupower/cpupower.bb
+++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb
@@ -7,7 +7,7 @@ PROVIDES = "virtual/cpupower"
 
 inherit kernelsrc kernel-arch bash-completion
 
-do_populate_lic[depends] += "virtual/kernel:do_patch"
+do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
 
 EXTRA_OEMAKE = "-C ${S}/tools/power/cpupower O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}"
 
diff --git a/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.4.bb b/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.6.bb
index 54883cef38..bafe56d2c4 100644
--- a/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.4.bb
+++ b/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.6.bb
@@ -15,9 +15,9 @@ DEPENDS = "\
     nativesdk-mpfr \
     nativesdk-readline \
     nativesdk-zlib \
-    virtual/${HOST_PREFIX}gcc \
-    virtual/${HOST_PREFIX}binutils \
-    virtual/nativesdk-${HOST_PREFIX}compilerlibs \
+    virtual/nativesdk-cross-cc \
+    virtual/nativesdk-cross-binutils \
+    virtual/nativesdk-compilerlibs \
     virtual/nativesdk-libc"
 
 RDEPENDS:${PN} = "nativesdk-liblzma"
diff --git a/meta-oe/recipes-kernel/crash/crash.inc b/meta-oe/recipes-kernel/crash/crash.inc
index 04318b1505..3c9a99ae4a 100644
--- a/meta-oe/recipes-kernel/crash/crash.inc
+++ b/meta-oe/recipes-kernel/crash/crash.inc
@@ -14,16 +14,21 @@ DEPENDS = "zlib readline coreutils-native ncurses-native"
 
 INC_PR = "r1"
 
-S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=https \
-           ${GNU_MIRROR}/gdb/gdb-10.2.tar.gz;name=gdb;subdir=git \
+           ${GNU_MIRROR}/gdb/gdb-10.2.tar.gz;name=gdb;subdir=${BB_GIT_DEFAULT_DESTSUFFIX} \
            file://7001force_define_architecture.patch \
            file://7003cross_ranlib.patch \
            file://0001-cross_add_configure_option.patch \
            file://donnot-extract-gdb-during-do-compile.patch \
            file://gdb_build_jobs_and_not_write_crash_target.patch \
+           file://0001-symbol-fix-S-cannot-work-with-kaslr-detection.patch \
+           file://0002-arm64-add-pac-mask-to-better-support-gdb-stack-unwin.patch \
+           file://0003-Fix-build-failure-in-readline-lib.patch \
+           file://0004-tools.c-do-not-use-keywords-nullptr-as-a-variable-in.patch \
+           file://0005-Fix-build-failure-on-32bit-machine-i686.patch \
+           file://0001-Use-CC-env-var-to-get-compiler-version.patch \
            "
-SRCREV = "a6832f608cb5d473739cf33bbf84ab1df8d98fd5"
+SRCREV = "f13853cef53f5c5463a51021edbc81977e2b1405"
 
 SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350"
 
diff --git a/meta-oe/recipes-kernel/crash/crash/0001-Use-CC-env-var-to-get-compiler-version.patch b/meta-oe/recipes-kernel/crash/crash/0001-Use-CC-env-var-to-get-compiler-version.patch
new file mode 100644
index 0000000000..773598def1
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0001-Use-CC-env-var-to-get-compiler-version.patch
@@ -0,0 +1,48 @@
+From 6ad5e9302057e157ab701880a8543ca59058df2d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
+Date: Fri, 16 May 2025 16:18:28 +0200
+Subject: [PATCH v2] Use CC env var to get compiler version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The source file build_data.c generated at compilation time define a
+variable compiler_version which is obtained by calling "gcc --version"
+cmd. This call retrieve the native gcc compiler install on host build
+machine but not necessarily the compiler use to build the project (ex:
+cross compilation).
+
+The CC env variable commonly used in Makefile project define the
+compiler to use at build, so this is the appropriate way to retrieve the
+compiler version, when the CC env var is define.
+
+Upstream-Status: Submitted [https://lists.crash-utility.osci.io/archives/list/devel@lists.crash-utility.osci.io/thread/V3G3QH3YW6WZWD56TVTFQIHYLZ33UIJL/]
+
+Signed-off-by: Kéléfa Sané <kelefa.sane@smile.fr>
+---
+ configure.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/configure.c b/configure.c
+index 4668c9a..4b65bd7 100644
+--- a/configure.c
++++ b/configure.c
+@@ -1362,7 +1362,17 @@ make_build_data(char *target)
+ 
+         fp1 = popen("date", "r");
+         fp2 = popen("id", "r");
+-       fp3 = popen("gcc --version", "r");
++
++       const char *cc_env = getenv("CC");
++       if(NULL == cc_env) {
++               fp3 = popen("gcc --version", "r");
++       }
++       else {
++               char compiler_version_cmd[512];
++
++               snprintf(compiler_version_cmd, sizeof(compiler_version_cmd), "%s --version", cc_env);
++               fp3 = popen(compiler_version_cmd, "r");
++       }
+ 
+        if ((fp4 = fopen("build_data.c", "w")) == NULL) {
+                perror("build_data.c");
diff --git a/meta-oe/recipes-kernel/crash/crash/0001-symbol-fix-S-cannot-work-with-kaslr-detection.patch b/meta-oe/recipes-kernel/crash/crash/0001-symbol-fix-S-cannot-work-with-kaslr-detection.patch
new file mode 100644
index 0000000000..47182f8b6c
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0001-symbol-fix-S-cannot-work-with-kaslr-detection.patch
@@ -0,0 +1,89 @@
+From 329bd56da28fc1b5b53a60ca2172643d2090435d Mon Sep 17 00:00:00 2001
+From: Tao Liu <ltao@redhat.com>
+Date: Fri, 13 Dec 2024 08:36:03 +0000
+Subject: [PATCH] symbol: fix -S cannot work with kaslr detection
+
+When kernel enabled the CONFIG_RANDOMIZE_BASE, crash needs to add "kaslr=auto"
+in crash command line to tell crash to decode the random address.
+But when with "-S" in command line, crash would bypass the kaslr option
+that cause symbol from kernel image is mismatch with ram on a live system.
+
+The fix is provided by Tao Liu <ltao@redhat.com> from crash-utility upstream,
+and not merged to crash master yet.
+
+Upstream-Status: Pending
+[https://lists.crash-utility.osci.io/archives/list/devel@lists.crash-utility.osci.io/thread/5OXNYPPU6GLLQKCWH7WBNBJXLNZ4EBZD/]
+
+Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
+---
+ symbols.c | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/symbols.c b/symbols.c
+index a3cd0f3..6062d21 100644
+--- a/symbols.c
++++ b/symbols.c
+@@ -25,7 +25,7 @@
+ 
+ static void store_symbols(bfd *, int, void *, long, unsigned int);
+ static void store_sysmap_symbols(void);
+-static ulong relocate(ulong, char *, int);
++static ulong relocate(ulong, char *, int *);
+ static int relocate_force(ulong, char *);
+ static void kaslr_init(void);
+ static void strip_module_symbol_end(char *s);
+@@ -230,6 +230,7 @@ symtab_init(void)
+                                DEBUGINFO_ERROR_MESSAGE1 :
+                                DEBUGINFO_ERROR_MESSAGE2);
+                }
++               kt->flags |= RELOC_FORCE;
+                store_sysmap_symbols();
+                return;
+        } else if (LKCD_KERNTYPES())
+@@ -817,7 +818,7 @@ store_symbols(bfd *abfd, int dynamic, void *minisyms, long symcount,
+                    syminfo.type)) {
+                        if (kt->flags & (RELOC_SET|RELOC_FORCE))
+                                sp->value = relocate(syminfo.value,
+-                                       (char *)syminfo.name, !(first++));
++                                       (char *)syminfo.name, &first);
+                        else
+                                sp->value = syminfo.value;
+                        sp->type = syminfo.type;
+@@ -893,9 +894,9 @@ store_sysmap_symbols(void)
+ 
+                 if (machdep->verify_symbol(name, syment.value, 
+                    syment.type)) {
+-                       if (kt->flags & RELOC_SET)
++                       if (kt->flags & (RELOC_SET|RELOC_FORCE))
+                                sp->value = relocate(syment.value,
+-                                       syment.name, !(first++));
++                                       syment.name, &first);
+                        else
+                                sp->value = syment.value;
+                         sp->type = syment.type;
+@@ -924,7 +925,7 @@ store_sysmap_symbols(void)
+  *  are not as loaded into the kernel (not unity-mapped).
+  */
+ static ulong
+-relocate(ulong symval, char *symname, int first_symbol)
++relocate(ulong symval, char *symname, int *first_symbol)
+ {
+        if (XEN_HYPER_MODE()) {
+                kt->flags &= ~(RELOC_SET|RELOC_FORCE);
+@@ -937,9 +938,10 @@ relocate(ulong symval, char *symname, int first_symbol)
+                break;
+ 
+        case RELOC_FORCE:
+-               if (first_symbol && !relocate_force(symval, symname))
+-                       kt->flags &= ~RELOC_FORCE;
+-               break;
++               if (!(*first_symbol) && relocate_force(symval, symname)) {
++                       *first_symbol += 1;
++               }
++               return symval - kt->relocate;
+        }
+ 
+        if (machine_type("X86_64")) {
+-- 
+2.35.5
+
diff --git a/meta-oe/recipes-kernel/crash/crash/0002-arm64-add-pac-mask-to-better-support-gdb-stack-unwin.patch b/meta-oe/recipes-kernel/crash/crash/0002-arm64-add-pac-mask-to-better-support-gdb-stack-unwin.patch
new file mode 100644
index 0000000000..42a585d366
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0002-arm64-add-pac-mask-to-better-support-gdb-stack-unwin.patch
@@ -0,0 +1,85 @@
+From 0f39e33d3504f3a17b83574c3be97640460b7eef Mon Sep 17 00:00:00 2001
+From: "Guanyou.Chen" <chenguanyou@xiaomi.com>
+Date: Wed, 25 Dec 2024 23:50:28 +0800
+Subject: [PATCH] arm64: add pac mask to better support gdb stack unwind
+
+Currently, gdb passthroughs of 'bt', 'frame', 'up', 'down',
+'info, locals' don't work on arm64 machine enabled pauth.
+This is because gdb does not know the lr register actual values
+to unwind the stack frames.
+
+Without the patch:
+    crash> gdb bt
+    #0  __switch_to (prev=0xffffff8001af92c0, next=0xffffff889da7a580) at /proc/self/cwd/common/arch/arm64/kernel/process.c:569
+    #1  0x9fc5c5d3602132c0 in ?? ()
+    Backtrace stopped: previous frame identical to this frame (corrupt stack?)
+
+With the patch:
+    crash> gdb bt
+    #0  __switch_to (prev=prev@entry=0xffffff8001af92c0, next=next@entry=0xffffff889da7a580) at /proc/self/cwd/common/arch/arm64/kernel/process.c:569
+    #1  0xffffffd3602132c0 in context_switch (rq=0xffffff8a7295a080, prev=0xffffff8001af92c0, next=0xffffff889da7a580, rf=<optimized out>) at /proc/self/cwd/common/kernel/sched/core.c:5515
+    #2  __schedule (sched_mode=<optimized out>, sched_mode@entry=2147859424) at /proc/self/cwd/common/kernel/sched/core.c:6843
+    #3  0xffffffd3602136d8 in schedule () at /proc/self/cwd/common/kernel/sched/core.c:6917
+    ...
+
+Signed-off-by: Guanyou.Chen <chenguanyou@xiaomi.com>
+Signed-off-by: mark.yang <mark.yang@lge.com>
+
+Upstream-Status: Backport [0f39e33 arm64: add pac mask to better support gdb stack unwind]
+---
+ gdb-10.2.patch  | 23 +++++++++++++++++++++++
+ gdb_interface.c | 10 ++++++++++
+ 2 files changed, 33 insertions(+)
+
+diff --git a/gdb-10.2.patch b/gdb-10.2.patch
+index c867660..fd6fadb 100644
+--- a/gdb-10.2.patch
++++ b/gdb-10.2.patch
+@@ -16216,3 +16216,26 @@ exit 0
+            printf_filtered (_("Backtrace stopped: %s\n"),
+                             frame_stop_reason_string (trailing));
+        }
++--- gdb-10.2/gdb/frame.c.orig
+++++ gdb-10.2/gdb/frame.c
++@@ -944,6 +944,10 @@ frame_find_by_id (struct frame_id id)
++   return NULL;
++ }
++
+++#ifdef CRASH_MERGE
+++extern "C" void crash_decode_ptrauth_pc(ulong* pc);
+++#endif
+++
++ static CORE_ADDR
++ frame_unwind_pc (struct frame_info *this_frame)
++ {
++@@ -974,6 +978,9 @@ frame_unwind_pc (struct frame_info *this_frame)
++       try
++       {
++         pc = gdbarch_unwind_pc (prev_gdbarch, this_frame);
+++#ifdef CRASH_MERGE
+++        crash_decode_ptrauth_pc(&pc);
+++#endif
++         pc_p = true;
++       }
++       catch (const gdb_exception_error &ex)
+diff --git a/gdb_interface.c b/gdb_interface.c
+index 315711e..e108d09 100644
+--- a/gdb_interface.c
++++ b/gdb_interface.c
+@@ -1083,3 +1083,13 @@ int crash_get_current_task_reg (int regno, const char *regname,
+        return machdep->get_current_task_reg(regno, regname, regsize, value);
+ }
+ 
++/* arm64 kernel lr maybe has patuh */
++void crash_decode_ptrauth_pc(ulong *pc);
++void crash_decode_ptrauth_pc(ulong *pc)
++{
++#ifdef ARM64
++       struct machine_specific *ms = machdep->machspec;
++       if (is_kernel_text(*pc | ms->CONFIG_ARM64_KERNELPACMASK))
++               *pc |= ms->CONFIG_ARM64_KERNELPACMASK;
++#endif /* !ARM64 */
++}
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-kernel/crash/crash/0003-Fix-build-failure-in-readline-lib.patch b/meta-oe/recipes-kernel/crash/crash/0003-Fix-build-failure-in-readline-lib.patch
new file mode 100644
index 0000000000..f3318b3a6a
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0003-Fix-build-failure-in-readline-lib.patch
@@ -0,0 +1,136 @@
+From 772fbb1022911410b5fb773fde37910fc8286041 Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Fri, 24 Jan 2025 16:12:40 +0800
+Subject: [PATCH] Fix build failure in readline lib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a backported patch from gdb upstream, see the commit
+425f843d58c5 ("Import GNU Readline 8.2"), and only backported
+patch related to compilation errors.
+
+Without the patch:
+
+  signals.c: In function ‘_rl_handle_signal’:
+  signals.c:62:36: error: ‘return’ with a value, in function returning void [-Wreturn-mismatch]
+     62 | #  define SIGHANDLER_RETURN return (0)
+        |                                    ^
+  signals.c:290:3: note: in expansion of macro ‘SIGHANDLER_RETURN’
+    290 |   SIGHANDLER_RETURN;
+        |   ^~~~~~~~~~~~~~~~~
+  signals.c:178:1: note: declared here
+    178 | _rl_handle_signal (int sig)
+        | ^~~~~~~~~~~~~~~~~
+  signals.c: In function ‘rl_sigwinch_handler’:
+  signals.c:306:32: error: passing argument 2 of ‘rl_set_sighandler’ from incompatible pointer type [-Wincompatible-pointer-types]
+    306 |   rl_set_sighandler (SIGWINCH, rl_sigwinch_handler, &dummy_winch);
+        |                                ^~~~~~~~~~~~~~~~~~~
+        |                                |
+        |                                void (*)(int)
+  In file included from rldefs.h:31,
+                   from signals.c:37:
+  signals.c:81:51: note: expected ‘void (*)(void)’ but argument is of type ‘void (*)(int)’
+     81 | static SigHandler *rl_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *));
+
+Note: the current build failure was observed on gcc (GCC) 15.0.0.
+
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+Signed-off-by: mark.yang <mark.yang@lge.com>
+
+Upstream-Status: Backport [772fbb1 Fix build failure in readline lib]
+---
+ gdb-10.2.patch | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 82 insertions(+)
+
+diff --git a/gdb-10.2.patch b/gdb-10.2.patch
+index fd6fadb..8f5d7db 100644
+--- a/gdb-10.2.patch
++++ b/gdb-10.2.patch
+@@ -16239,3 +16239,85 @@ exit 0
+          pc_p = true;
+        }
+        catch (const gdb_exception_error &ex)
++--- gdb-10.2/readline/readline/signals.c.orig
+++++ gdb-10.2/readline/readline/signals.c
++@@ -48,23 +48,11 @@
++ 
++ #if defined (HANDLE_SIGNALS)
++ 
++-#if !defined (RETSIGTYPE)
++-#  if defined (VOID_SIGHANDLER)
++-#    define RETSIGTYPE void
++-#  else
++-#    define RETSIGTYPE int
++-#  endif /* !VOID_SIGHANDLER */
++-#endif /* !RETSIGTYPE */
++-
++-#if defined (VOID_SIGHANDLER)
++-#  define SIGHANDLER_RETURN return
++-#else
++-#  define SIGHANDLER_RETURN return (0)
++-#endif
+++#define SIGHANDLER_RETURN return
++ 
++ /* This typedef is equivalent to the one for Function; it allows us
++    to say SigHandler *foo = signal (SIGKILL, SIG_IGN); */
++-typedef RETSIGTYPE SigHandler ();
+++typedef void SigHandler (int);
++ 
++ #if defined (HAVE_POSIX_SIGNALS)
++ typedef struct sigaction sighandler_cxt;
++@@ -78,12 +66,12 @@ typedef struct { SigHandler *sa_handler; int sa_mask, sa_flags; } sighandler_cxt
++ #  define SA_RESTART 0
++ #endif
++ 
++-static SigHandler *rl_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *));
++-static void rl_maybe_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *));
++-static void rl_maybe_restore_sighandler PARAMS((int, sighandler_cxt *));
+++static SigHandler *rl_set_sighandler (int, SigHandler *, sighandler_cxt *);
+++static void rl_maybe_set_sighandler (int, SigHandler *, sighandler_cxt *);
+++static void rl_maybe_restore_sighandler (int, sighandler_cxt *);
++ 
++-static RETSIGTYPE rl_signal_handler PARAMS((int));
++-static RETSIGTYPE _rl_handle_signal PARAMS((int));
+++static void rl_signal_handler (int);
+++static void _rl_handle_signal (int);
++      
++ /* Exported variables for use by applications. */
++ 
++@@ -137,7 +125,7 @@ void *_rl_sigcleanarg;
++ /* Readline signal handler functions. */
++ 
++ /* Called from RL_CHECK_SIGNALS() macro */
++-RETSIGTYPE
+++void
++ _rl_signal_handler (int sig)
++ {
++   _rl_caught_signal = 0;      /* XXX */
++@@ -160,7 +148,7 @@ _rl_signal_handler (int sig)
++   SIGHANDLER_RETURN;
++ }
++ 
++-static RETSIGTYPE
+++static void
++ rl_signal_handler (int sig)
++ {
++   if (_rl_interrupt_immediately)
++@@ -174,7 +162,7 @@ rl_signal_handler (int sig)
++   SIGHANDLER_RETURN;
++ }
++ 
++-static RETSIGTYPE
+++static void
++ _rl_handle_signal (int sig)
++ {
++ #if defined (HAVE_POSIX_SIGNALS)
++@@ -291,7 +279,7 @@ _rl_handle_signal (int sig)
++ }
++ 
++ #if defined (SIGWINCH)
++-static RETSIGTYPE
+++static void
++ rl_sigwinch_handler (int sig)
++ {
++   SigHandler *oh;
+
diff --git a/meta-oe/recipes-kernel/crash/crash/0004-tools.c-do-not-use-keywords-nullptr-as-a-variable-in.patch b/meta-oe/recipes-kernel/crash/crash/0004-tools.c-do-not-use-keywords-nullptr-as-a-variable-in.patch
new file mode 100644
index 0000000000..e4bd4cd3a9
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0004-tools.c-do-not-use-keywords-nullptr-as-a-variable-in.patch
@@ -0,0 +1,60 @@
+From 325a9d1b3b4ce76bf4556235c885e619e219622c Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Fri, 24 Jan 2025 15:32:59 +0800
+Subject: [PATCH] tools.c: do not use keywords 'nullptr' as a variable in code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without the patch:
+
+  tools.c: In function ‘drop_core’:
+  tools.c:6251:23: error: expected identifier or ‘(’ before ‘nullptr’
+   6251 |         volatile int *nullptr;
+        |                       ^~~~~~~
+  tools.c:6259:17: error: lvalue required as left operand of assignment
+   6259 |         nullptr = NULL;
+        |                 ^
+  tools.c:6261:21: error: invalid type argument of unary ‘*’ (have ‘typeof (nullptr)’)
+   6261 |                 i = *nullptr;
+        |                     ^~~~~~~~
+  make[6]: *** [Makefile:345: tools.o] Error 1
+
+Note: this was observed on gcc version 15.0.1
+
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+Signed-off-by: mark.yang <mark.yang@lge.com>
+
+Upstream-Status: Backport [325a9d1 tools.c: do not use keywords 'nullptr' as a variable in code]
+---
+ tools.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools.c b/tools.c
+index 85d8b6f..c9305be 100644
+--- a/tools.c
++++ b/tools.c
+@@ -6248,7 +6248,7 @@ lowest_bit_long(ulong val)
+ void
+ drop_core(char *s)
+ {
+-       volatile int *nullptr;
++       volatile int *ptr;
+        int i ATTRIBUTE_UNUSED;
+ 
+        if (s && ascii_string(s))
+@@ -6256,9 +6256,9 @@ drop_core(char *s)
+ 
+        kill((pid_t)pc->program_pid, 3);
+ 
+-       nullptr = NULL;
++       ptr = NULL;
+        while (TRUE)
+-               i = *nullptr;
++               i = *ptr;
+ }
+ 
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-kernel/crash/crash/0005-Fix-build-failure-on-32bit-machine-i686.patch b/meta-oe/recipes-kernel/crash/crash/0005-Fix-build-failure-on-32bit-machine-i686.patch
new file mode 100644
index 0000000000..e4796b9ced
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0005-Fix-build-failure-on-32bit-machine-i686.patch
@@ -0,0 +1,83 @@
+From 2724bb1d0260f3886f8a3d533838caf80c7e61e5 Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Fri, 24 Jan 2025 17:56:23 +0800
+Subject: [PATCH 10/10] Fix build failure on 32bit machine(i686)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This issue was caused by commit 0f39e33d3504 with the following
+compilation error:
+
+  frame.c: In function ‘CORE_ADDR frame_unwind_pc(frame_info*)’:
+  frame.c:982:35: error: cannot convert ‘CORE_ADDR*’ {aka ‘long long unsigned int*’} to ‘ulong*’ {aka ‘long unsigned int*’}
+    982 |           crash_decode_ptrauth_pc(&pc);
+        |                                   ^~~
+        |                                   |
+        |                                   CORE_ADDR* {aka long long unsigned int*}
+  frame.c:948:48: note: initializing argument 1 of ‘void crash_decode_ptrauth_pc(ulong*)’
+    948 | extern "C" void crash_decode_ptrauth_pc(ulong* pc);
+        |                                         ~~~~~~~^~
+
+Upstream-Status: Backport [https://github.com/crash-utility/crash/commit/2724bb1d0260f3886f8a3d533838caf80c7e61e5]
+Fixes: 0f39e33d3504 ("arm64: add pac mask to better support gdb stack unwind")
+Reported-by: Guanyou.Chen <chenguanyou@xiaomi.com>
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ gdb-10.2.patch  | 6 +++---
+ gdb_interface.c | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/gdb-10.2.patch b/gdb-10.2.patch
+index 8f5d7db22840..d22f2d6d75bc 100644
+--- a/gdb-10.2.patch
++++ b/gdb-10.2.patch
+@@ -55,7 +55,7 @@ exit 0
+  # your system doesn't have fcntl.h in /usr/include (which is where it
+  # should be according to Posix).
+ -DEFS = @DEFS@
+-+DEFS = -DCRASH_MERGE @DEFS@
+++DEFS = -DCRASH_MERGE -D${CRASH_TARGET} @DEFS@
+  GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config \
+        -DLOCALEDIR="\"$(localedir)\"" $(DEFS)
+  
+@@ -16222,7 +16222,7 @@ exit 0
+    return NULL;
+  }
+ 
+-+#ifdef CRASH_MERGE
+++#if defined(CRASH_MERGE) && defined(ARM64)
+ +extern "C" void crash_decode_ptrauth_pc(ulong* pc);
+ +#endif
+ +
+@@ -16233,7 +16233,7 @@ exit 0
+        try
+        {
+          pc = gdbarch_unwind_pc (prev_gdbarch, this_frame);
+-+#ifdef CRASH_MERGE
+++#if defined(CRASH_MERGE) && defined(ARM64)
+ +        crash_decode_ptrauth_pc(&pc);
+ +#endif
+          pc_p = true;
+diff --git a/gdb_interface.c b/gdb_interface.c
+index e108d097ee5f..c2e99f5c156a 100644
+--- a/gdb_interface.c
++++ b/gdb_interface.c
+@@ -1084,12 +1084,12 @@ int crash_get_current_task_reg (int regno, const char *regname,
+ }
+ 
+ /* arm64 kernel lr maybe has patuh */
++#ifdef ARM64
+ void crash_decode_ptrauth_pc(ulong *pc);
+ void crash_decode_ptrauth_pc(ulong *pc)
+ {
+-#ifdef ARM64
+        struct machine_specific *ms = machdep->machspec;
+        if (is_kernel_text(*pc | ms->CONFIG_ARM64_KERNELPACMASK))
+                *pc |= ms->CONFIG_ARM64_KERNELPACMASK;
+-#endif /* !ARM64 */
+ }
++#endif /* !ARM64 */
+-- 
+2.47.1
+
diff --git a/meta-oe/recipes-kernel/crash/crash_8.0.4.bb b/meta-oe/recipes-kernel/crash/crash_8.0.6.bb
index 1af90978e0..1af90978e0 100644
--- a/meta-oe/recipes-kernel/crash/crash_8.0.4.bb
+++ b/meta-oe/recipes-kernel/crash/crash_8.0.6.bb
diff --git a/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.32.bb b/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.32.bb
new file mode 100644
index 0000000000..31674ffec0
--- /dev/null
+++ b/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.32.bb
@@ -0,0 +1,79 @@
+SUMMARY = "drgn (pronounced dragon) is a debugger with an emphasis on  \
+programmability. drgn exposes the types and variables in a program for easy, \
+expressive scripting in Python."
+HOMEPAGE = "https://github.com/osandov/drgn"
+LICENSE = " LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7c83d30e99508d6b790eacdd3abab846"
+
+SRC_URI = "git://github.com/osandov/drgn.git;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "348d6efc5c18e0ae4ef2f3aea50a8edf17cb1fe9"
+
+
+DEPENDS = "\
+    autoconf-native \
+    automake-native \
+    libtool-native \
+    elfutils \
+    "
+
+DEPENDS:append:toolchain-clang:class-target = "\
+    openmp \
+    "
+
+OPENMP_LIB = "libgomp"
+OPENMP_LIB:toolchain-clang:class-target = "openmp"
+
+RDEPENDS:${PN} = "\
+    python3-crypt \
+    python3-io \
+    python3-logging \
+    python3-math \
+    python3-pickle \
+    python3-stringold \
+    python3-compression \
+    "
+
+RDEPENDS:${PN}:append:class-target = "\
+    libdw \
+    libelf \
+    ${OPENMP_LIB} \
+    "
+
+RDEPENDS:${PN}:append:class-native = "\
+    elfutils-native \
+    "
+
+RDEPENDS:${PN}:append:class-nativesdk = "\
+    nativesdk-elfutils \
+    "
+
+OPENMP_LIB_NAME = "gomp"
+OPENMP_LIB_NAME:toolchain-clang:class-target = "omp"
+
+export CONFIGURE_FLAGS = "\
+    --build=${BUILD_SYS}, \
+    --host=${HOST_SYS}, \
+    --target=${TARGET_SYS}, \
+    --prefix=${prefix}, \
+    --exec_prefix=${exec_prefix}, \
+    --bindir=${bindir}, \
+    --sbindir=${sbindir}, \
+    --libexecdir=${libexecdir}, \
+    --datadir=${datadir}, \
+    --sysconfdir=${sysconfdir}, \
+    --sharedstatedir=${sharedstatedir}, \
+    --localstatedir=${localstatedir}, \
+    --libdir=${libdir}, \
+    --includedir=${includedir}, \
+    --oldincludedir=${includedir}, \
+    --infodir=${infodir}, \
+    --mandir=${mandir}, \
+    --enable-openmp=${OPENMP_LIB_NAME} \
+    "
+
+export PYTHON_CPPFLAGS = "-I${STAGING_INCDIR}/${PYTHON_DIR}"
+
+inherit python3native pkgconfig setuptools3
+
+BBCLASSEXTEND = "native nativesdk"
+
diff --git a/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb b/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb
index 23ea0d8aae..3b5866180d 100644
--- a/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb
+++ b/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb
@@ -13,7 +13,7 @@ COMPATIBLE_HOST:libc-musl = 'null'
 
 DEPENDS = "libnl"
 
-do_populate_lic[depends] += "virtual/kernel:do_patch"
+do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
 
 B = "${WORKDIR}/${BPN}-${PV}"
 
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
index 7a15d16bc3..b5b8075fd7 100644
--- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
@@ -21,18 +21,20 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9aa91e13d644326bf281924212862184"
 
 DEPENDS = "openssl readline ncurses"
-SRCREV = "ab5ce5baff097ebb6e2a17a171858be213ee68d3"
+SRCREV = "bf774149ae7f74c12164a5b021b23520c5ca4016"
 SRC_URI = "git://codeberg.org/ipmitool/ipmitool;protocol=https;branch=master \
            ${IANA_ENTERPRISE_NUMBERS} \
            file://0001-csv-revision-Drop-the-git-revision-info.patch \
            "
+
+UPSTREAM_CHECK_GITTAGREGEX = "IPMITOOL_(?P<pver>\d+(_\d+)+)"
+
 IANA_ENTERPRISE_NUMBERS ?= ""
 
 # Add these via bbappend if this database is needed by the system
 #IANA_ENTERPRISE_NUMBERS = "http://www.iana.org/assignments/enterprise-numbers.txt;name=iana-enterprise-numbers;downloadfilename=iana-enterprise-numbers"
 #SRC_URI[iana-enterprise-numbers.sha256sum] = "cdd97fc08325667434b805eb589104ae63f7a9eb720ecea73cb55110b383934c"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
@@ -57,3 +59,6 @@ EXTRA_OECONF = "--disable-dependency-tracking --enable-file-security --disable-i
                 --disable-registry-download \
                 "
 
+# http://errors.yoctoproject.org/Errors/Details/766896/
+# git/lib/ipmi_fru.c:1556:41: error: initialization of 'struct fru_multirec_mgmt *' from incompatible pointer type 'struct fru_multirect_mgmt *' [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
index 3f57ef3bfd..14aa5d0c0c 100644
--- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
+++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
@@ -2,16 +2,19 @@ SUMMARY = "Kernel selftest for Linux"
 DESCRIPTION = "Kernel selftest for Linux"
 LICENSE = "GPL-2.0-only"
 
-LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 DEPENDS = "rsync-native llvm-native"
 
+S = "${UNPACKDIR}"
+
 # for musl libc
 SRC_URI:append:libc-musl = "\
                       file://userfaultfd.patch \
                       "
 SRC_URI += "file://run-ptest \
             file://COPYING \
+            file://0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch \
             "
 
 # now we just test bpf and vm
@@ -42,8 +45,6 @@ do_compile[depends] += "virtual/kernel:do_install"
 
 inherit linux-kernel-base module-base kernel-arch ptest siteinfo
 
-S = "${WORKDIR}/${BP}"
-
 DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map"
 
 TEST_LIST = "\
@@ -55,7 +56,7 @@ TEST_LIST = "\
 EXTRA_OEMAKE = '\
     CROSS_COMPILE=${TARGET_PREFIX} \
     ARCH=${ARCH} \
-    CC="${CC}" \
+    CC="${CC} ${DEBUG_PREFIX_MAP}" \
     AR="${AR}" \
     LD="${LD}" \
     CLANG="clang -fno-stack-protector -target ${TARGET_ARCH} ${TOOLCHAIN_OPTIONS} -isystem ${S} -D__WORDSIZE=\'64\' -Wno-error=unused-command-line-argument" \
@@ -96,33 +97,17 @@ either install it and add it to HOSTTOOLS, or add clang-native from meta-clang t
     sed -i -e '/mrecord-mcount/d' ${S}/Makefile
     sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/Makefile
     sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/scripts/Makefile.*
-    for i in ${TEST_LIST}
-    do
-        oe_runmake -C ${S}/tools/testing/selftests/${i}
-    done
+    oe_runmake -C ${S}/tools/testing/selftests TARGETS="${TEST_LIST}"
 }
 
 do_install() {
-    for i in ${TEST_LIST}
-    do
-        oe_runmake -C ${S}/tools/testing/selftests/${i} INSTALL_PATH=${D}/usr/kernel-selftest/${i} install
-        # Install kselftest-list.txt that required by kselftest runner.
-        oe_runmake -s --no-print-directory COLLECTION=${i} -C ${S}/tools/testing/selftests/${i} emit_tests \
-            >> ${D}/usr/kernel-selftest/kselftest-list.txt
-    done
-    # Install kselftest runner.
-    install -m 0755 ${S}/tools/testing/selftests/run_kselftest.sh ${D}/usr/kernel-selftest/
-    cp -R --no-dereference --preserve=mode,links -v ${S}/tools/testing/selftests/kselftest ${D}/usr/kernel-selftest/
+    oe_runmake -C ${S}/tools/testing/selftests INSTALL_PATH=${D}/usr/kernel-selftest TARGETS="${TEST_LIST}" install
     if [ -e ${D}/usr/kernel-selftest/bpf/test_offload.py ]; then
-        sed -i -e '1s,#!.*python3,#! /usr/bin/env python3,' ${D}/usr/kernel-selftest/bpf/test_offload.py
+        sed -i -e '1s,#!.*python3,#! /usr/bin/env python3,' ${D}/usr/kernel-selftest/bpf/test_offload.py
     fi
     chown root:root  -R ${D}/usr/kernel-selftest
 }
 
-do_configure() {
-    install -D -m 0644 ${UNPACKDIR}/COPYING ${S}/COPYING
-}
-
 do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_unrelated"
 python copy_kselftest_source_from_kernel() {
     sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split()
@@ -149,15 +134,23 @@ remove_unrelated() {
     fi
 }
 
+do_configure[dirs] = "${S}"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-INHIBIT_PACKAGE_DEBUG_SPLIT="1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 FILES:${PN} += "/usr/kernel-selftest"
 
 RDEPENDS:${PN} += "python3 perl perl-module-io-handle"
 
 INSANE_SKIP:${PN} += "libdir"
 
+# A few of the selftests set compile flags that trip up the "ldflags" and
+# "already-stripped" QA checks.  As this is mainly a testing package and
+# not really meant for user level execution, disable these two checks.
+INSANE_SKIP:${PN} += "ldflags"
+INSANE_SKIP:${PN} += "already-stripped"
+
 SECURITY_CFLAGS = ""
 COMPATIBLE_HOST:libc-musl = 'null'
 
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch
new file mode 100644
index 0000000000..bf5525c361
--- /dev/null
+++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch
@@ -0,0 +1,34 @@
+From 34021e84d03e2becb88e6c28e8e4867e82a81da5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 17 Sep 2024 17:40:03 -0700
+Subject: [PATCH] selftests: timers: Fix clock_adjtime for newer 32-bit arches
+
+Newer 32-bit architectures e.g. riscv32 are using 64-bit time_t
+from get go, they have not wired __NR_clock_adjtime at all
+valid-adjtimex testcase fails to compile on such architectures.
+if this condition is found then use 64-bit adjtime syscall
+
+Upstream-Status: Submitted [https://patchwork.kernel.org/project/linux-kselftest/patch/20240918004731.3295870-1-raj.khem@gmail.com/]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: John Stultz <jstultz@google.com>
+Cc: Shuah Khan <shuah@kernel.org>
+---
+ tools/testing/selftests/timers/valid-adjtimex.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c
+index d500884801d8..ff4ff8b1d127 100644
+--- a/tools/testing/selftests/timers/valid-adjtimex.c
++++ b/tools/testing/selftests/timers/valid-adjtimex.c
+@@ -39,7 +39,11 @@
+ #include <sys/syscall.h>
+ int clock_adjtime(clockid_t id, struct timex *tx)
+ {
++#if !defined(__NR_clock_adjtime) && defined(__NR_clock_adjtime64)
++       return syscall(__NR_clock_adjtime64, id, tx);
++#else
+        return syscall(__NR_clock_adjtime, id, tx);
++#endif
+ }
+ 
+ 
diff --git a/meta-oe/recipes-kernel/kpatch/kpatch.inc b/meta-oe/recipes-kernel/kpatch/kpatch.inc
index 4d187200ec..b8ef092262 100644
--- a/meta-oe/recipes-kernel/kpatch/kpatch.inc
+++ b/meta-oe/recipes-kernel/kpatch/kpatch.inc
@@ -22,7 +22,6 @@ EXTRA_OEMAKE = " \
         CC='${CC}' \
         "
 
-S = "${WORKDIR}/git"
 
 do_install () {
         oe_runmake install
diff --git a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
index ba3983e6ff..6521830b7a 100644
--- a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
+++ b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
@@ -6,6 +6,5 @@ SRCREV = "0c3c21930895f6582a5c9d9d797f7e11ff41ffb2"
 
 PV = "0.9.1"
 
-S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch
new file mode 100644
index 0000000000..954b1393db
--- /dev/null
+++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch
@@ -0,0 +1,36 @@
+From ca95e956307672484e8c018263600749aa9c4f4d Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Wed, 9 Apr 2025 11:14:52 +1000
+Subject: [PATCH] tlshd: Define ALLPERMS if it doesn't exist to fix musl build
+
+ALLPERMS exists in glibc, but not on musl, so we manually define
+it if it doesn't exist. This fixes building on musl systems.
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Upstream-Status: Submitted [https://github.com/oracle/ktls-utils/pull/88]
+---
+ src/tlshd/config.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/tlshd/config.c b/src/tlshd/config.c
+index 38948e8..e653bd8 100644
+--- a/src/tlshd/config.c
++++ b/src/tlshd/config.c
+@@ -46,6 +46,14 @@
+ 
+ static GKeyFile *tlshd_configuration;
+ 
++/**
++ * ALLPERMS exists in glibc, but not on musl, so we
++ * manually define it if it doesn't exist
++ */
++#ifndef ALLPERMS
++#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)
++#endif
++
+ /**
+  * tlshd_config_init - Read tlshd's config file
+  * @pathname: Pathname to config file
+-- 
+2.49.0
+
diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch
new file mode 100644
index 0000000000..6aabb77ee8
--- /dev/null
+++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch
@@ -0,0 +1,36 @@
+From d170b04dcb8b2b28e370d8b18ffa1f593e8eec11 Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Thu, 10 Apr 2025 13:15:16 +1000
+Subject: [PATCH] tlshd: configure.ac: Use AC_CHECK_HEADER instead of
+ AC_CHECK_FILE
+
+AC_CHECK_FILE doesn't work when cross-compiling [1], which breaks a lot of
+use cases (like OpenEmbedded for one). Autoconf supports AC_CHECK_HEADER
+which can be used instead and is more robust [2] so let's use that
+instead.
+
+1: https://www.gnu.org/software/autoconf/manual/autoconf-2.68/html_node/Files.html
+2: https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Generic-Headers.html
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Upstream-Status: Submitted [https://github.com/oracle/ktls-utils/pull/90]
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2c77fb1..c790d71 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,7 @@ PKG_CHECK_MODULES([LIBNL_GENL3], libnl-genl-3.0 >= 3.1)
+ AC_SUBST([LIBNL_GENL3_CFLAGS])
+ AC_SUBST([LIBNL_GENL3_LIBS])
+ 
+-AC_CHECK_FILE([/usr/include/linux/quic.h],
++AC_CHECK_HEADER([linux/quic.h],
+               [AC_CHECK_LIB([gnutls], [gnutls_handshake_set_secret_function],
+                             [AC_DEFINE([HAVE_GNUTLS_QUIC], [1], [Define to 1 if QUIC is found.])])])
+ 
+-- 
+2.49.0
+
diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb
new file mode 100644
index 0000000000..1a90dcf998
--- /dev/null
+++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb
@@ -0,0 +1,24 @@
+SUMMARY = "TLS handshake utilities for in-kernel TLS consumers"
+DESCRIPTION = "In-kernel TLS consumers need a mechanism to perform TLS \
+handshakes on a connected socket to negotiate TLS session parameters that \
+can then be programmed into the kernel's TLS record protocol engine."
+DEPENDS = "gnutls keyutils glib-2.0 libnl"
+RDEPENDS:${PN} += " gnutls"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d568123389d9a12625cca2b089b1728b"
+
+SRCREV = "c787cd26330af457e1ca9cf43232db2c71c03154"
+SRC_URI = " \
+        git://github.com/oracle/ktls-utils.git;nobranch=1;protocol=https \
+        file://0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch \
+        file://0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch \
+        "
+
+
+inherit autotools-brokensep pkgconfig systemd
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+
+PACKAGECONFIG[systemd] = "--with-systemd,,systemd"
+
+SYSTEMD_SERVICE:${PN} = "tlshd.service"
diff --git a/meta-oe/recipes-kernel/libbpf/files/0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch b/meta-oe/recipes-kernel/libbpf/files/0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch
new file mode 100644
index 0000000000..873995b644
--- /dev/null
+++ b/meta-oe/recipes-kernel/libbpf/files/0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch
@@ -0,0 +1,43 @@
+From ff2eb6e134ebfc225b97b46182af3cc58ed481f6 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 10 Apr 2025 11:50:04 +0800
+Subject: [PATCH] libbpf: check for empty BTF data section in btf_parse_elf
+
+A valid ELF file may contain a SHT_NOBITS .BTF section. This case is
+not handled correctly in btf_parse_elf, which leads to a segfault.
+
+Add a null check for a buffer returned by elf_getdata() before
+proceeding with its processing.
+
+Bug report: https://github.com/libbpf/libbpf/issues/894
+
+Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
+Acked-by: Mykyta Yatsenko <mykyta.yatsenko5@gmail.com>
+
+Upstream-Status: Backport [https://github.com/kernel-patches/bpf-rc/commit/b02b669fd9398d246c8c9ae901c0d8f5bb36a588]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ btf.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/btf.c b/btf.c
+index e9673c0e..21d38dcf 100644
+--- a/btf.c
++++ b/btf.c
+@@ -1199,6 +1199,12 @@ static struct btf *btf_parse_elf(const char *path, struct btf *base_btf,
+                goto done;
+        }
+ 
++       if (!secs.btf_data->d_buf) {
++               pr_warn("BTF data is empty in %s\n", path);
++               err = -ENODATA;
++               goto done;
++       }
++
+        if (secs.btf_base_data) {
+                dist_base_btf = btf_new(secs.btf_base_data->d_buf, secs.btf_base_data->d_size,
+                                        NULL);
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-kernel/libbpf/files/CVE-2025-29481.patch b/meta-oe/recipes-kernel/libbpf/files/CVE-2025-29481.patch
new file mode 100644
index 0000000000..ebfcb94a2f
--- /dev/null
+++ b/meta-oe/recipes-kernel/libbpf/files/CVE-2025-29481.patch
@@ -0,0 +1,102 @@
+From 806b4e0a9f658d831119cece11a082ba1578b800 Mon Sep 17 00:00:00 2001
+From: Viktor Malik <vmalik@redhat.com>
+Date: Tue, 15 Apr 2025 17:50:14 +0200
+Subject: [PATCH] libbpf: Fix buffer overflow in bpf_object__init_prog
+
+As shown in [1], it is possible to corrupt a BPF ELF file such that
+arbitrary BPF instructions are loaded by libbpf. This can be done by
+setting a symbol (BPF program) section offset to a large (unsigned)
+number such that <section start + symbol offset> overflows and points
+before the section data in the memory.
+
+Consider the situation below where:
+- prog_start = sec_start + symbol_offset    <-- size_t overflow here
+- prog_end   = prog_start + prog_size
+
+    prog_start        sec_start        prog_end        sec_end
+        |                |                 |              |
+        v                v                 v              v
+    .....................|################################|............
+
+The report in [1] also provides a corrupted BPF ELF which can be used as
+a reproducer:
+
+    $ readelf -S crash
+    Section Headers:
+      [Nr] Name              Type             Address           Offset
+           Size              EntSize          Flags  Link  Info  Align
+    ...
+      [ 2] uretprobe.mu[...] PROGBITS         0000000000000000  00000040
+           0000000000000068  0000000000000000  AX       0     0     8
+
+    $ readelf -s crash
+    Symbol table '.symtab' contains 8 entries:
+       Num:    Value          Size Type    Bind   Vis      Ndx Name
+    ...
+         6: ffffffffffffffb8   104 FUNC    GLOBAL DEFAULT    2 handle_tp
+
+Here, the handle_tp prog has section offset ffffffffffffffb8, i.e. will
+point before the actual memory where section 2 is allocated.
+
+This is also reported by AddressSanitizer:
+
+    =================================================================
+    ==1232==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x7c7302fe0000 at pc 0x7fc3046e4b77 bp 0x7ffe64677cd0 sp 0x7ffe64677490
+    READ of size 104 at 0x7c7302fe0000 thread T0
+        #0 0x7fc3046e4b76 in memcpy (/lib64/libasan.so.8+0xe4b76)
+        #1 0x00000040df3e in bpf_object__init_prog /src/libbpf/src/libbpf.c:856
+        #2 0x00000040df3e in bpf_object__add_programs /src/libbpf/src/libbpf.c:928
+        #3 0x00000040df3e in bpf_object__elf_collect /src/libbpf/src/libbpf.c:3930
+        #4 0x00000040df3e in bpf_object_open /src/libbpf/src/libbpf.c:8067
+        #5 0x00000040f176 in bpf_object__open_file /src/libbpf/src/libbpf.c:8090
+        #6 0x000000400c16 in main /poc/poc.c:8
+        #7 0x7fc3043d25b4 in __libc_start_call_main (/lib64/libc.so.6+0x35b4)
+        #8 0x7fc3043d2667 in __libc_start_main@@GLIBC_2.34 (/lib64/libc.so.6+0x3667)
+        #9 0x000000400b34 in _start (/poc/poc+0x400b34)
+
+    0x7c7302fe0000 is located 64 bytes before 104-byte region [0x7c7302fe0040,0x7c7302fe00a8)
+    allocated by thread T0 here:
+        #0 0x7fc3046e716b in malloc (/lib64/libasan.so.8+0xe716b)
+        #1 0x7fc3045ee600 in __libelf_set_rawdata_wrlock (/lib64/libelf.so.1+0xb600)
+        #2 0x7fc3045ef018 in __elf_getdata_rdlock (/lib64/libelf.so.1+0xc018)
+        #3 0x00000040642f in elf_sec_data /src/libbpf/src/libbpf.c:3740
+
+The problem here is that currently, libbpf only checks that the program
+end is within the section bounds. There used to be a check
+`while (sec_off < sec_sz)` in bpf_object__add_programs, however, it was
+removed by commit 6245947c1b3c ("libbpf: Allow gaps in BPF program
+sections to support overriden weak functions").
+
+Add a check for detecting the overflow of `sec_off + prog_sz` to
+bpf_object__init_prog to fix this issue.
+
+[1] https://github.com/lmarch2/poc/blob/main/libbpf/libbpf.md
+
+Fixes: 6245947c1b3c ("libbpf: Allow gaps in BPF program sections to support overriden weak functions")
+Reported-by: lmarch2 <2524158037@qq.com>
+Signed-off-by: Viktor Malik <vmalik@redhat.com>
+Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
+Reviewed-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
+Link: https://github.com/lmarch2/poc/blob/main/libbpf/libbpf.md
+Link: https://lore.kernel.org/bpf/20250415155014.397603-1-vmalik@redhat.com
+
+CVE: CVE-2025-29481
+Upstream-Status: Backport [https://github.com/libbpf/libbpf/commit/806b4e0a9f658d831119cece11a082ba1578b800]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ src/libbpf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libbpf.c b/src/libbpf.c
+index b2591f5..56250b5 100644
+--- a/src/libbpf.c
++++ b/src/libbpf.c
+@@ -889,7 +889,7 @@ bpf_object__add_programs(struct bpf_object *obj, Elf_Data *sec_data,
+                        return -LIBBPF_ERRNO__FORMAT;
+                }
+ 
+-               if (sec_off + prog_sz > sec_sz) {
++               if (sec_off + prog_sz > sec_sz || sec_off + prog_sz < sec_off) {
+                        pr_warn("sec '%s': program at offset %zu crosses section boundary\n",
+                                sec_name, sec_off);
+                        return -LIBBPF_ERRNO__FORMAT;
diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.5.0.bb
index 928482ba36..36312c386b 100644
--- a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb
+++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.5.0.bb
@@ -8,13 +8,16 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238
 
 DEPENDS = "zlib elfutils"
 
-SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.2"
-SRCREV = "1b357586a7a62db7fe27af4ebe4bdefe6986cfd6"
+SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master \
+           file://0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch \
+           file://CVE-2025-29481.patch;striplevel=2 \
+"
+SRCREV = "09b9e83102eb8ab9e540d36b4559c55f3bcdb95d"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/${BP}/src"
 
 EXTRA_OEMAKE += "DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir}"
 EXTRA_OEMAKE:append:class-native = " UAPIDIR=${includedir}"
diff --git a/meta-oe/recipes-kernel/libpfm/libpfm4_4.13.0.bb b/meta-oe/recipes-kernel/libpfm/libpfm4_4.13.0.bb
index be0659ad2a..f87502930e 100644
--- a/meta-oe/recipes-kernel/libpfm/libpfm4_4.13.0.bb
+++ b/meta-oe/recipes-kernel/libpfm/libpfm4_4.13.0.bb
@@ -26,7 +26,7 @@ EXTRA_OEMAKE:append:powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\""
 EXTRA_OEMAKE:append:powerpc64le = " ARCH=\"powerpc\" BITMODE=\"64\""
 EXTRA_OEMAKE:append:aarch64 = " ARCH=\"arm64\""
 
-S = "${WORKDIR}/libpfm-${PV}"
+S = "${UNPACKDIR}/libpfm-${PV}"
 
 do_install () {
         oe_runmake install
diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.1.bb
index c90ac19fa7..6b9e8b9b38 100644
--- a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb
+++ b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.1.bb
@@ -9,11 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97
 SECTION = "libs"
 DEPENDS = "libtraceevent bison-native flex-native"
 
-SRCREV = "67f3b2ab9f836e6c9c70c94db7aac3251119a263"
+SRCREV = "417c2e3aa21af670cc5c13db633dd35292f2d0fa"
 SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \
            file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \
            "
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
deleted file mode 100644
index 96a996f616..0000000000
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 6d16911316cb576db0239f607e60918a222e4436 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Sun, 24 Apr 2022 17:25:33 +0800
-Subject: [PATCH] makedumpfile: replace hardcode CFLAGS
-
-* Create alias for target such as powerpc as powerpc32
-* Remove hardcode CFLAGS
-* Add CFLAGS_COMMON to instead of CFLAGS so can flexibly
-  customize CFLAGS and not hardcode the CFLAGS as previously
-* Forcibly to link dynamic library as the poky build
-  system doesn't build static library by default
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
-
-[2021-11-18] Patch updated to use CFLAGS_COMMON for zstd
-Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-
-Rebase to 1.7.1
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- Makefile | 40 +++++++++++++++++++++-------------------
- 1 file changed, 21 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 71d8548..22acdd5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,12 +8,6 @@ ifeq ($(strip $CC),)
- CC     = gcc
- endif
- 
--CFLAGS_BASE := $(CFLAGS) -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \
--               -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
--CFLAGS      := $(CFLAGS_BASE) -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"'
--CFLAGS_ARCH := $(CFLAGS_BASE)
--# LDFLAGS = -L/usr/local/lib -I/usr/local/include
--
- HOST_ARCH := $(shell uname -m)
- # Use TARGET as the target architecture if specified.
- # Defaults to uname -m
-@@ -24,26 +18,34 @@ endif
- ARCH := $(shell echo ${TARGET}  | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \
-                               -e s/arm.*/arm/ -e s/sa110/arm/ \
-                               -e s/s390x/s390/ -e s/parisc64/parisc/ \
--                              -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/)
-+                              -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/ \
-+                              -e s/_powerpc_/_powerpc32_/)
- 
- CROSS :=
- ifneq ($(TARGET), $(HOST_ARCH))
- CROSS := -U__$(HOST_ARCH)__
- endif
- 
--CFLAGS += -D__$(ARCH)__ $(CROSS)
- CFLAGS_ARCH += -D__$(ARCH)__ $(CROSS)
- 
--ifeq ($(ARCH), powerpc64)
--CFLAGS += -m64
-+ifeq ($(ARCH), __powerpc64__)
- CFLAGS_ARCH += -m64
- endif
- 
--ifeq ($(ARCH), powerpc32)
--CFLAGS += -m32
-+ifeq ($(ARCH), __powerpc32__)
- CFLAGS_ARCH += -m32
- endif
- 
-+CFLAGS_ARCH += $(CFLAGS) \
-+              -D_FILE_OFFSET_BITS=64 \
-+              -D_LARGEFILE_SOURCE \
-+              -D_LARGEFILE64_SOURCE
-+
-+CFLAGS_COMMON = $(CFLAGS_ARCH) \
-+              -DVERSION='"$(VERSION)"' \
-+              -DRELEASE_DATE='"$(DATE)"'
-+
-+
- SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h
- SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c detect_cycle.c
- OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
-@@ -52,12 +54,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
- 
- LIBS = -ldw -lbz2 -ldl -lelf -lz
- ifneq ($(LINKTYPE), dynamic)
--LIBS := -static $(LIBS) -llzma
-+LIBS := $(LIBS) -llzma
- endif
- 
- ifeq ($(USELZO), on)
- LIBS := -llzo2 $(LIBS)
--CFLAGS += -DUSELZO
-+CFLAGS_COMMON += -DUSELZO
- endif
- 
- ifeq ($(USESNAPPY), on)
-@@ -65,12 +67,12 @@ LIBS := -lsnappy $(LIBS)
- ifneq ($(LINKTYPE), dynamic)
- LIBS := $(LIBS) -lstdc++
- endif
--CFLAGS += -DUSESNAPPY
-+CFLAGS_COMMON += -DUSESNAPPY
- endif
- 
- ifeq ($(USEZSTD), on)
- LIBS := -lzstd $(LIBS)
--CFLAGS += -DUSEZSTD
-+CFLAGS_COMMON += -DUSEZSTD
- endif
- 
- ifeq ($(DEBUG), on)
-@@ -104,14 +106,14 @@ LIBS := $(LIBS) $(call try-run,\
- all: makedumpfile
- 
- $(OBJ_PART): $(SRC_PART)
--       $(CC) $(CFLAGS) -c -o ./$@ $(VPATH)$(@:.o=.c)
-+       $(CC) $(CFLAGS_COMMON) -c -o ./$@ $(VPATH)$(@:.o=.c)
- 
- $(OBJ_ARCH): $(SRC_ARCH)
-        @mkdir -p $(@D)
-        $(CC) $(CFLAGS_ARCH) -c -o ./$@ $(VPATH)$(@:.o=.c)
- 
- makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
--       $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
-+       $(CC) $(CFLAGS_COMMON) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
-        @sed -e "s/@DATE@/$(DATE)/" \
-             -e "s/@VERSION@/$(VERSION)/" \
-             $(VPATH)makedumpfile.8.in > $(VPATH)makedumpfile.8
-@@ -120,7 +122,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
-             $(VPATH)makedumpfile.conf.5.in > $(VPATH)makedumpfile.conf.5
- 
- eppic_makedumpfile.so: extension_eppic.c
--       $(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
-+       $(CC) $(CFLAGS_COMMON) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
- 
- clean:
-        rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8 makedumpfile.conf.5
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb
deleted file mode 100644
index 85b44c4941..0000000000
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY = "VMcore extraction tool"
-DESCRIPTION = "\
-    This program is used to extract a subset of the memory available either \
-    via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \
-    images without extra uneeded information (zero pages, userspace programs, \
-    etc). \
-"
-HOMEPAGE = "https://github.com/makedumpfile/makedumpfile"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-LICENSE = "GPL-2.0-only"
-
-SRCBRANCH ?= "master"
-SRCREV = "c266469347d49287be38059d45e7aaa454db9cb2"
-
-DEPENDS = "bzip2 zlib elfutils xz"
-RDEPENDS:${PN}-tools = "perl ${PN}"
-
-# mips/rv32 would not compile.
-COMPATIBLE_HOST:mipsarcho32 = "null"
-COMPATIBLE_HOST:riscv32 = "null"
-
-PACKAGES =+ "${PN}-tools"
-FILES:${PN}-tools = "${bindir}/*.pl"
-
-SRC_URI = "\
-    git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH};protocol=https \
-    file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
-"
-
-S = "${WORKDIR}/git"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
-
-SECTION = "base"
-
-# If we do not specify TARGET, makedumpfile will build for the host but use the
-# target gcc.
-#
-
-MAKEDUMPFILE_TARGET ?= "${TARGET_ARCH}"
-MAKEDUMPFILE_TARGET:powerpc = "ppc"
-
-EXTRA_OEMAKE = "\
-    LINKTYPE=static \
-    TARGET=${MAKEDUMPFILE_TARGET} \
-    ${PACKAGECONFIG_CONFARGS} \
-"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[lzo] = "USELZO=on,USELZO=off,lzo"
-PACKAGECONFIG[snappy] = "USESNAPPY=on,USESNAPPY=off,snappy"
-PACKAGECONFIG[zstd] = "USEZSTD=on,USEZSTD=off,zstd"
-
-do_install () {
-    mkdir -p ${D}/usr/bin
-    install -m 755 ${S}/makedumpfile ${D}/usr/bin
-    install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin
-
-    mkdir -p ${D}/etc/
-    install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample
-}
diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb
index 90e847c137..4073381899 100644
--- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb
+++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \
            file://0001-corestripper-Fix-uninitialized-warning.patch \
            "
 
-S = "${WORKDIR}/git"
 
 SYSTEMD_SERVICE:${PN} = "minicoredumper.service"
 SYSTEMD_AUTO_ENABLE = "enable"
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
index 56981d96fa..e28903d6ba 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
@@ -1,4 +1,4 @@
-From 50cea8fd3c07ab27da6edce865a49339f16f3b57 Mon Sep 17 00:00:00 2001
+From 468850b5d39435025633df14dda3d48651d9ec29 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
 Date: Tue, 18 Jun 2019 17:10:15 +0800
 Subject: [PATCH] Makefile: fix multilib build failure
@@ -6,20 +6,26 @@ Subject: [PATCH] Makefile: fix multilib build failure
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+
+Refresh to 5.13
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---
- Makefile | 50 +++++++++++++++++++++++++++-----------------------
- 1 file changed, 27 insertions(+), 23 deletions(-)
+ Makefile | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 8455415..4aa0786 100644
+index 337c53e..58e3779 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,30 +1,34 @@
- # SPDX-License-Identifier: GPL-2.0
- PREFIX         ?= /usr
- DESTDIR                ?=
-+BASELIB                ?=
+@@ -25,6 +25,7 @@ BINDIR ?=     /usr/bin
+ MANDIR ?=      /usr/share/man
+ SHRDIR ?=      /usr/share/pm-graph
+ LIBDIR ?=      /usr/lib
++BASELIB        ?=
  
+ # Toolchain: what tools do we use, and what options do they need:
+ INSTALL = /usr/bin/install
+@@ -33,6 +34,9 @@ INSTALL_DATA  = ${INSTALL} -m 644
  all:
         @echo "Nothing to build"
  
@@ -27,63 +33,34 @@ index 8455415..4aa0786 100644
 +       @echo "Nothing to clean"
 +
  install : uninstall
--       install -d  $(DESTDIR)$(PREFIX)/lib/pm-graph
--       install sleepgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph
--       install bootgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph
--       install -d  $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-+       install -d  $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
-+       install sleepgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
-+       install bootgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
-+       install -d  $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+        $(INSTALL) -d  $(DESTDIR)$(LIBDIR)/pm-graph
+        $(INSTALL) sleepgraph.py $(DESTDIR)$(LIBDIR)/pm-graph
+@@ -54,10 +58,10 @@ install : uninstall
+        $(INSTALL) -d  $(DESTDIR)$(SHRDIR)
  
-        install -d  $(DESTDIR)$(PREFIX)/bin
--       ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph
--       ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph
-+       ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph
-+       ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph
+        $(INSTALL) -d  $(DESTDIR)$(BINDIR)
+-       ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(BINDIR)/bootgraph
+-       ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(BINDIR)/sleepgraph
+-       ln -s ../lib/pm-graph/netfix.py $(DESTDIR)$(BINDIR)/netfix
+-       $(DESTDIR)$(BINDIR)/netfix defconfig > $(DESTDIR)$(SHRDIR)/netfix.cfg
++       ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(BINDIR)/bootgraph
++       ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(BINDIR)/sleepgraph
++       ln -s ../$(BASELIB)/pm-graph/netfix.py $(DESTDIR)$(BINDIR)/netfix
++       #$(DESTDIR)$(BINDIR)/netfix defconfig > $(DESTDIR)$(SHRDIR)/netfix.cfg
  
-        install -d  $(DESTDIR)$(PREFIX)/share/man/man8
-        install bootgraph.8 $(DESTDIR)$(PREFIX)/share/man/man8
-@@ -37,11 +41,11 @@ uninstall :
-        rm -f $(DESTDIR)$(PREFIX)/bin/bootgraph
-        rm -f $(DESTDIR)$(PREFIX)/bin/sleepgraph
+        $(INSTALL) -d  $(DESTDIR)$(MANDIR)/man8
+        $(INSTALL) bootgraph.8 $(DESTDIR)$(MANDIR)/man8
+@@ -90,8 +94,8 @@ hwcheck-install :
+        rm -f $(DESTDIR)$(LIBDIR)/pm-graph/hwcheck.py
+        $(INSTALL) tools/hwcheck.py $(DESTDIR)$(LIBDIR)/pm-graph
+        $(INSTALL) -d  $(DESTDIR)$(BINDIR)
+-       ln -s ../lib/pm-graph/hwcheck.py $(DESTDIR)$(BINDIR)/hwcheck
+-       $(DESTDIR)$(BINDIR)/hwcheck cronon
++       ln -s ../$(BASELIB)/pm-graph/hwcheck.py $(DESTDIR)$(BINDIR)/hwcheck
++       #$(DESTDIR)$(BINDIR)/hwcheck cronon
  
--       rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/config/*
--       if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config ] ; then \
--               rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph/config; \
-+       rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config/*
-+       if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ] ; then \
-+               rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config; \
-        fi;
--       rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/*
--       if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph ] ; then \
--               rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph; \
-+       rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/*
-+       if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ] ; then \
-+               rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph; \
-        fi;
+ hwcheck-uninstall :
+        if [ -e $(DESTDIR)$(BINDIR)/hwcheck ] ; then \
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch
deleted file mode 100644
index f7f8bc0687..0000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 47a1db21f6c5d17c94c58c3fe0dcce35c623dbf4 Mon Sep 17 00:00:00 2001
-From: Liwei Song <liwei.song@windriver.com>
-Date: Tue, 23 Jun 2020 04:47:20 +0000
-Subject: [PATCH] sleepgraph: add support for RT kernel ftrace flags
-
-with PREEMPT_RT enabled in kernel, ftrace have a different
-flags format:
-
-                   _-----=> irqs-off
-                  / _----=> need-resched
-                 | / _----=> need-resched
-                 || / _---=> hardirq/softirq
-                 ||| / _--=> preempt-depth
-                 ||||/     delay
-TASK-PID   CPU#  |||||   TIMESTAMP  FUNCTION
-   | |       |   |||||      |         |
-
-add support for this.
-
-Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/18]
-
-Signed-off-by: Liwei Song <liwei.song@windriver.com>
----
- sleepgraph.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sleepgraph.py b/sleepgraph.py
-index cfed8e09e0e6..561f165cf9be 100755
---- a/sleepgraph.py
-+++ b/sleepgraph.py
-@@ -2689,7 +2689,7 @@ class TestProps:
-                '[ +!#\*@$]*(?P<dur>[0-9\.]*) .*\|  (?P<msg>.*)'
-        ftrace_line_fmt_nop = \
-                ' *(?P<proc>.*)-(?P<pid>[0-9]*) *\[(?P<cpu>[0-9]*)\] *'+\
--               '(?P<flags>.{4}) *(?P<time>[0-9\.]*): *'+\
-+               '(?P<flags>.{4,7}) *(?P<time>[0-9\.]*): *'+\
-                '(?P<msg>.*)'
-        def __init__(self):
-                self.stamp = ''
--- 
-2.24.1
-
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch
deleted file mode 100644
index fc5991d464..0000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 9bbc991a927722439cad38c892fc9f57207089d3 Mon Sep 17 00:00:00 2001
-From: Liwei Song <liwei.song@windriver.com>
-Date: Mon, 24 May 2021 08:27:28 +0000
-Subject: [PATCH] sleepgraph.py: parse unfished cpu exec line
-
-exist the below case in ftrace file:
-sleepgraph-6508    [003] .... 18197.824037: tracing_mark_write: ps - xxx..., lock_torture_wr-94 169,lock_torture_wr-95 143,lock_tort
-sleepgraph-6508    [003] .... 18197.824043: tracing_mark_write: ure_wr-96 189,lock_torture_wr-97 174,lock_torture_wr-98 160,lock_torture_st-99 1
-
-lock_torture_wr-96 was split to different line due to limited buffer
-size(1k) set in kernel, check this case and re-parse the unfinished
-line.
-
-Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/20]
-
-Signed-off-by: Liwei Song <liwei.song@windriver.com>
----
- sleepgraph.py | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/sleepgraph.py b/sleepgraph.py
-index e340d5b3f03b..38b4439db8eb 100755
---- a/sleepgraph.py
-+++ b/sleepgraph.py
-@@ -3365,8 +3365,21 @@ def parseTraceLog(live=False):
-                                        val = ps.split()
-                                        if not val:
-                                                continue
--                                       name = val[0].replace('--', '-')
--                                       proclist[name] = int(val[1])
-+                                       if not len(val) < 2:
-+                                               name = val[0].replace('--', '-')
-+                                               proclist[name] = int(val[1])
-+                                       else:
-+                                               proclist = dict()
-+                                               nextline = next(tf)
-+                                               mcont = re.match(tp.ftrace_line_fmt, nextline)
-+                                               n = m.group('ps') + mcont.group('msg').split(': ')[1]
-+                                               for pscont in n.split(','):
-+                                                       val = pscont.split()
-+                                                       if not val:
-+                                                               continue
-+                                                       if not len(val) < 2:
-+                                                               name = val[0].replace('--', '-')
-+                                                               proclist[name] = int(val[1])
-                                data.pstl[t.time] = proclist
-                                continue
-                # find the end of resume
--- 
-2.29.2
-
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch
deleted file mode 100644
index 25c87093f6..0000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 22ce65d997f99606a3bb9d2a660ead42eecc234a Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 11 Sep 2019 11:31:07 +0800
-Subject: [PATCH] sleepgraph.py: use python3
-
-Already compatible with Python 3.
-Same goes for bootgraph.py
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- bootgraph.py  | 2 +-
- sleepgraph.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bootgraph.py b/bootgraph.py
-index d3b99a1..efb5714 100755
---- a/bootgraph.py
-+++ b/bootgraph.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- # SPDX-License-Identifier: GPL-2.0-only
- #
- # Tool for analyzing boot timing
-diff --git a/sleepgraph.py b/sleepgraph.py
-index 1794c79..cfed8e0 100755
---- a/sleepgraph.py
-+++ b/sleepgraph.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- # SPDX-License-Identifier: GPL-2.0-only
- #
- # Tool for analyzing suspend/resume timing
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.13.bb
index 6e52a58de5..219629d4d7 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.13.bb
@@ -5,14 +5,10 @@ HOMEPAGE = "https://01.org/pm-graph"
 LICENSE  = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
-SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6"
+SRCREV = "0987732b013936ad771334f51cba31c453c8a9c9"
 SRC_URI = "git://github.com/intel/pm-graph.git;branch=master;protocol=https \
            file://0001-Makefile-fix-multilib-build-failure.patch \
-           file://0001-sleepgraph.py-use-python3.patch \
-           file://0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch \
-           file://0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch \
 "
-S = "${WORKDIR}/git"
 
 # Apart from the listed RDEPENDS, analyze-suspend depends on some features
 # provided by the kernel. These options are:
@@ -22,12 +18,14 @@ S = "${WORKDIR}/git"
 #   - CONFIG_FUNCTION_TRACER=y
 #   - CONFIG_FUNCTION_GRAPH_TRACER=y
 
-COMPATIBLE_HOST='(i.86|x86_64).*'
-EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}"
+COMPATIBLE_HOST = '(i.86|x86_64).*'
+EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} LIBDIR=${libdir} BASELIB=${baselib}"
 
 do_install() {
-        oe_runmake install
-        install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py
+    oe_runmake install
+    install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py
+
+    rm -rf ${D}${libdir}/pm-graph/__pycache__
 }
 
 RDEPENDS:${PN} += "python3-core python3-threading python3-datetime python3-compression"
diff --git a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb
index 2e8c5cbb8d..7b87dd28df 100644
--- a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb
+++ b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb
@@ -6,7 +6,7 @@ PROVIDES = "virtual/spidev-test"
 
 inherit bash-completion kernelsrc kernel-arch
 
-do_populate_lic[depends] += "virtual/kernel:do_patch"
+do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
 
 EXTRA_OEMAKE = "-C ${S}/tools/spi O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}"
 
diff --git a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb
index 11c4037b23..6782dec228 100644
--- a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb
+++ b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;b
            file://0001-Do-not-emit-useless-rpath.patch"
 SRCREV = "18233e4c32857cb7ddd4960beeec8360ed834fc5"
 
-S = "${WORKDIR}/git"
 
 DEPENDS += "libtraceevent libtracefs zstd xmlto-native asciidoc-native swig-native bison-native flex-native"
 
diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat.bb
index 4770fae50e..f65699865e 100644
--- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb
+++ b/meta-oe/recipes-kernel/turbostat/turbostat.bb
@@ -16,12 +16,14 @@ LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b
 COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
+KERNEL_VERSION = "${@get_kernelversion_file("${STAGING_KERNEL_BUILDDIR}")}"
+inherit linux-kernel-base
+
 SRC_URI += "\
             file://COPYING \
             "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 DEPENDS = "libcap"
@@ -33,7 +35,7 @@ do_populate_lic[depends] = "${PN}:do_configure"
 
 
 EXTRA_OEMAKE = '\
-                CC="${CC}" 'CFLAGS=-Wall ${LDFLAGS}' \
+                CC="${CC}" 'CFLAGS=-Wall ${LDFLAGS}'  \
                '
 
 # If we build under STAGING_KERNEL_DIR, source will not be put
@@ -52,12 +54,21 @@ do_configure:prepend() {
                 cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S}
                 cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S}
         fi
+        if [ -f "${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h" ]; then
+                cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h ${S}
+        fi
+        cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler.h ${S}
+        cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler_types.h ${S}
+        cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler-gcc.h ${S}
         cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S}
 }
 
 
 do_compile() {
         sed -i 's#<linux/bits.h>#"bits.h"#' msr-index.h
+        sed -i 's#<linux/compiler.h>#"compiler.h"#' build_bug.h
+        sed -i 's#<linux/compiler_types.h>#"compiler_types.h"#' compiler.h
+        sed -i 's#<linux/compiler-gcc.h>#"compiler-gcc.h"#' compiler_types.h
         'TMPCHECK='grep "<vdso/const.h>" bits.h'' || true
         if [ -n $TMPCHECK ]; then
                 sed -i 's#<vdso/const.h>#"const.h"#' bits.h
@@ -66,8 +77,15 @@ do_compile() {
                 sed -i 's#<linux/const.h>#"const.h"#' bits.h
                 sed -i -e 's#<uapi/linux/const.h>#<linux/const.h>#' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.h
         fi
+        echo '#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))' >> msr-index.h
+        echo "#define BIT(x) (1 << (x))" > bits.h
+        echo "#define BIT_ULL(nr) (1ULL << (nr))" >> bits.h
+        echo "#define GENMASK(h, l) (((~0UL) << (l)) & (~0UL >> (sizeof(long) * 8 - 1 - (h))))" >> bits.h
+        echo "#define GENMASK_ULL(h, l) (((~0ULL) << (l)) & (~0ULL >> (sizeof(long long) * 8 - 1 - (h))))" >> bits.h
+
         sed -i 's#MSRHEADER#"msr-index.h"#' turbostat.c
         sed -i 's#INTEL_FAMILY_HEADER#"intel-family.h"#' turbostat.c
+        sed -i 's#BUILD_BUG_HEADER#"build_bug.h"#' turbostat.c
         sed -i 's#\$(CC) \$(CFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#' Makefile
         oe_runmake STAGING_KERNEL_DIR=${STAGING_KERNEL_DIR}
 }
@@ -75,3 +93,7 @@ do_compile() {
 do_install() {
         oe_runmake DESTDIR="${D}" install
 }
+
+python do_package:prepend() {
+    d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0])
+}
diff --git a/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb b/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb
index e7e4ca50af..aae17a9fd7 100644
--- a/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb
+++ b/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb
@@ -28,7 +28,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
 # We need to set S, for not being set to STAGING_KERNEL_DIR, and by that
 # be wiped when we prune dest below. We just set it to usbip-tools-1.0
-S = "${WORKDIR}/${BP}"
+S = "${UNPACKDIR}/${BP}"
 
 # Copy the source files from KERNEL/tools/usb/usbip to ${S}
 do_configure[prefuncs] += "copy_usbip_source_from_kernel"
diff --git a/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb b/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb
index a09f84381e..50df31c7b9 100644
--- a/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb
+++ b/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb
@@ -13,8 +13,12 @@ SRC_URI = " \
     file://0001-fix-negative-shift-constants.patch \
     file://0002-fix-build-on-gcc6.patch \
     file://0003-fix-CVE-2015-7747.patch \
+    file://0004-Always-check-the-number-of-coefficients.patch \
+    file://0005-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch \
+    file://0006-Check-for-multiplication-overflow-in-sfconvert.patch \
+    file://0007-Actually-fail-when-error-occurs-in-parseFormat.patch \
+    file://0008-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch \
 "
-SRC_URI[md5sum] = "235dde14742317328f0109e9866a8008"
 SRC_URI[sha256sum] = "ea2449ad3f201ec590d811db9da6d02ffc5e87a677d06b92ab15363d8cb59782"
 
 inherit autotools lib_package pkgconfig
diff --git a/meta-oe/recipes-multimedia/audiofile/files/0004-Always-check-the-number-of-coefficients.patch b/meta-oe/recipes-multimedia/audiofile/files/0004-Always-check-the-number-of-coefficients.patch
new file mode 100644
index 0000000000..17a97163f5
--- /dev/null
+++ b/meta-oe/recipes-multimedia/audiofile/files/0004-Always-check-the-number-of-coefficients.patch
@@ -0,0 +1,46 @@
+From c48e4c6503f7dabd41f11d4c9c7b7f8960e7f2c0 Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Mon, 6 Mar 2017 12:51:22 +0100
+Subject: [PATCH] Always check the number of coefficients
+
+When building the library with NDEBUG, asserts are eliminated
+so it's better to always check that the number of coefficients
+is inside the array range.
+
+This fixes the 00191-audiofile-indexoob issue in #41
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+
+CVE: CVE-2017-6827
+CVE: CVE-2017-6828
+CVE: CVE-2017-6832
+CVE: CVE-2017-6833
+CVE: CVE-2017-6835
+CVE: CVE-2017-6837
+CVE: CVE-2020-18781
+Upstream-Status: Inactive-Upstream [lastrelease: 2013]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ libaudiofile/WAVE.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libaudiofile/WAVE.cpp b/libaudiofile/WAVE.cpp
+index 0e81cf7..61f9541 100644
+--- a/libaudiofile/WAVE.cpp
++++ b/libaudiofile/WAVE.cpp
+@@ -281,6 +281,12 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size)
+ 
+                        /* numCoefficients should be at least 7. */
+                        assert(numCoefficients >= 7 && numCoefficients <= 255);
++                       if (numCoefficients < 7 || numCoefficients > 255)
++                       {
++                               _af_error(AF_BAD_HEADER,
++                                               "Bad number of coefficients");
++                               return AF_FAIL;
++                       }
+ 
+                        m_msadpcmNumCoefficients = numCoefficients;
+ 
+-- 
+2.11.0
+
diff --git a/meta-oe/recipes-multimedia/audiofile/files/0005-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch b/meta-oe/recipes-multimedia/audiofile/files/0005-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch
new file mode 100644
index 0000000000..00bb7e597e
--- /dev/null
+++ b/meta-oe/recipes-multimedia/audiofile/files/0005-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch
@@ -0,0 +1,43 @@
+From 25eb00ce913452c2e614548d7df93070bf0d066f Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Mon, 6 Mar 2017 18:02:31 +0100
+Subject: [PATCH] clamp index values to fix index overflow in IMA.cpp
+
+This fixes #33
+(also reported at https://bugzilla.opensuse.org/show_bug.cgi?id=1026981
+and https://blogs.gentoo.org/ago/2017/02/20/audiofile-global-buffer-overflow-in-decodesample-ima-cpp/)
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+
+CVE: CVE-2017-6829
+Upstream-Status: Inactive-Upstream [lastrelease: 2013]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ libaudiofile/modules/IMA.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libaudiofile/modules/IMA.cpp b/libaudiofile/modules/IMA.cpp
+index 7476d44..df4aad6 100644
+--- a/libaudiofile/modules/IMA.cpp
++++ b/libaudiofile/modules/IMA.cpp
+@@ -169,7 +169,7 @@ int IMA::decodeBlockWAVE(const uint8_t *encoded, int16_t *decoded)
+                if (encoded[1] & 0x80)
+                        m_adpcmState[c].previousValue -= 0x10000;
+ 
+-               m_adpcmState[c].index = encoded[2];
++               m_adpcmState[c].index = clamp(encoded[2], 0, 88);
+ 
+                *decoded++ = m_adpcmState[c].previousValue;
+ 
+@@ -210,7 +210,7 @@ int IMA::decodeBlockQT(const uint8_t *encoded, int16_t *decoded)
+                        predictor -= 0x10000;
+ 
+                state.previousValue = clamp(predictor, MIN_INT16, MAX_INT16);
+-               state.index = encoded[1] & 0x7f;
++               state.index = clamp(encoded[1] & 0x7f, 0, 88);
+                encoded += 2;
+ 
+                for (int n=0; n<m_framesPerPacket; n+=2)
+-- 
+2.11.0
+
diff --git a/meta-oe/recipes-multimedia/audiofile/files/0006-Check-for-multiplication-overflow-in-sfconvert.patch b/meta-oe/recipes-multimedia/audiofile/files/0006-Check-for-multiplication-overflow-in-sfconvert.patch
new file mode 100644
index 0000000000..ec21b09f30
--- /dev/null
+++ b/meta-oe/recipes-multimedia/audiofile/files/0006-Check-for-multiplication-overflow-in-sfconvert.patch
@@ -0,0 +1,79 @@
+From 7d65f89defb092b63bcbc5d98349fb222ca73b3c Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Mon, 6 Mar 2017 13:54:52 +0100
+Subject: [PATCH] Check for multiplication overflow in sfconvert
+
+Checks that a multiplication doesn't overflow when
+calculating the buffer size, and if it overflows,
+reduce the buffer size instead of failing.
+
+This fixes the 00192-audiofile-signintoverflow-sfconvert case
+in #41
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+
+CVE: CVE-2017-6830
+CVE: CVE-2017-6834
+CVE: CVE-2017-6836
+CVE: CVE-2017-6838
+Upstream-Status: Inactive-Upstream [lastrelease: 2013]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ sfcommands/sfconvert.c | 34 ++++++++++++++++++++++++++++++++--
+ 1 file changed, 32 insertions(+), 2 deletions(-)
+
+diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c
+index 80a1bc4..970a3e4 100644
+--- a/sfcommands/sfconvert.c
++++ b/sfcommands/sfconvert.c
+@@ -45,6 +45,33 @@ void printusage (void);
+ void usageerror (void);
+ bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid);
+ 
++int firstBitSet(int x)
++{
++        int position=0;
++        while (x!=0)
++        {
++                x>>=1;
++                ++position;
++        }
++        return position;
++}
++
++#ifndef __has_builtin
++#define __has_builtin(x) 0
++#endif
++
++int multiplyCheckOverflow(int a, int b, int *result)
++{
++#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
++       return __builtin_mul_overflow(a, b, result);
++#else
++       if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits
++               return true;
++       *result = a * b;
++       return false;
++#endif
++}
++
+ int main (int argc, char **argv)
+ {
+        if (argc == 2)
+@@ -323,8 +350,11 @@ bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid)
+ {
+        int frameSize = afGetVirtualFrameSize(infile, trackid, 1);
+ 
+-       const int kBufferFrameCount = 65536;
+-       void *buffer = malloc(kBufferFrameCount * frameSize);
++       int kBufferFrameCount = 65536;
++       int bufferSize;
++       while (multiplyCheckOverflow(kBufferFrameCount, frameSize, &bufferSize))
++               kBufferFrameCount /= 2;
++       void *buffer = malloc(bufferSize);
+ 
+        AFframecount totalFrames = afGetFrameCount(infile, AF_DEFAULT_TRACK);
+        AFframecount totalFramesWritten = 0;
+-- 
+2.11.0
+
diff --git a/meta-oe/recipes-multimedia/audiofile/files/0007-Actually-fail-when-error-occurs-in-parseFormat.patch b/meta-oe/recipes-multimedia/audiofile/files/0007-Actually-fail-when-error-occurs-in-parseFormat.patch
new file mode 100644
index 0000000000..38294ca200
--- /dev/null
+++ b/meta-oe/recipes-multimedia/audiofile/files/0007-Actually-fail-when-error-occurs-in-parseFormat.patch
@@ -0,0 +1,46 @@
+From a2e9eab8ea87c4ffc494d839ebb4ea145eb9f2e6 Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Mon, 6 Mar 2017 18:59:26 +0100
+Subject: [PATCH] Actually fail when error occurs in parseFormat
+
+When there's an unsupported number of bits per sample or an invalid
+number of samples per block, don't only print an error message using
+the error handler, but actually stop parsing the file.
+
+This fixes #35 (also reported at
+https://bugzilla.opensuse.org/show_bug.cgi?id=1026983 and
+https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-imadecodeblockwave-ima-cpp/
+)
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+
+CVE: CVE-2017-6831
+Upstream-Status: Inactive-Upstream [lastrelease: 2013]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ libaudiofile/WAVE.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libaudiofile/WAVE.cpp b/libaudiofile/WAVE.cpp
+index 0e81cf7..d762249 100644
+--- a/libaudiofile/WAVE.cpp
++++ b/libaudiofile/WAVE.cpp
+@@ -326,6 +326,7 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size)
+                        {
+                                _af_error(AF_BAD_NOT_IMPLEMENTED,
+                                        "IMA ADPCM compression supports only 4 bits per sample");
++                               return AF_FAIL;
+                        }
+ 
+                        int bytesPerBlock = (samplesPerBlock + 14) / 8 * 4 * channelCount;
+@@ -333,6 +334,7 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size)
+                        {
+                                _af_error(AF_BAD_CODEC_CONFIG,
+                                        "Invalid samples per block for IMA ADPCM compression");
++                               return AF_FAIL;
+                        }
+ 
+                        track->f.sampleWidth = 16;
+-- 
+2.11.0
+
diff --git a/meta-oe/recipes-multimedia/audiofile/files/0008-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch b/meta-oe/recipes-multimedia/audiofile/files/0008-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch
new file mode 100644
index 0000000000..857ed78c59
--- /dev/null
+++ b/meta-oe/recipes-multimedia/audiofile/files/0008-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch
@@ -0,0 +1,126 @@
+From beacc44eb8cdf6d58717ec1a5103c5141f1b37f9 Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <larrosa@kde.org>
+Date: Mon, 6 Mar 2017 13:43:53 +0100
+Subject: [PATCH] Check for multiplication overflow in MSADPCM decodeSample
+
+Check for multiplication overflow (using __builtin_mul_overflow
+if available) in MSADPCM.cpp decodeSample and return an empty
+decoded block if an error occurs.
+
+This fixes the 00193-audiofile-signintoverflow-MSADPCM case of #41
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+
+CVE: CVE-2017-6839
+Upstream-Status: Inactive-Upstream [lastrelease: 2013]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ libaudiofile/modules/BlockCodec.cpp |  5 ++--
+ libaudiofile/modules/MSADPCM.cpp    | 47 +++++++++++++++++++++++++++++++++----
+ 2 files changed, 46 insertions(+), 6 deletions(-)
+
+diff --git a/libaudiofile/modules/BlockCodec.cpp b/libaudiofile/modules/BlockCodec.cpp
+index 45925e8..4731be1 100644
+--- a/libaudiofile/modules/BlockCodec.cpp
++++ b/libaudiofile/modules/BlockCodec.cpp
+@@ -52,8 +52,9 @@ void BlockCodec::runPull()
+        // Decompress into m_outChunk.
+        for (int i=0; i<blocksRead; i++)
+        {
+-               decodeBlock(static_cast<const uint8_t *>(m_inChunk->buffer) + i * m_bytesPerPacket,
+-                       static_cast<int16_t *>(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount);
++               if (decodeBlock(static_cast<const uint8_t *>(m_inChunk->buffer) + i * m_bytesPerPacket,
++                       static_cast<int16_t *>(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount)==0)
++                       break;
+ 
+                framesRead += m_framesPerPacket;
+        }
+diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp
+index 8ea3c85..ef9c38c 100644
+--- a/libaudiofile/modules/MSADPCM.cpp
++++ b/libaudiofile/modules/MSADPCM.cpp
+@@ -101,24 +101,60 @@ static const int16_t adaptationTable[] =
+        768, 614, 512, 409, 307, 230, 230, 230
+ };
+ 
++int firstBitSet(int x)
++{
++        int position=0;
++        while (x!=0)
++        {
++                x>>=1;
++                ++position;
++        }
++        return position;
++}
++
++#ifndef __has_builtin
++#define __has_builtin(x) 0
++#endif
++
++int multiplyCheckOverflow(int a, int b, int *result)
++{
++#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow))
++       return __builtin_mul_overflow(a, b, result);
++#else
++       if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits
++               return true;
++       *result = a * b;
++       return false;
++#endif
++}
++
++
+ // Compute a linear PCM value from the given differential coded value.
+ static int16_t decodeSample(ms_adpcm_state &state,
+-       uint8_t code, const int16_t *coefficient)
++       uint8_t code, const int16_t *coefficient, bool *ok=NULL)
+ {
+        int linearSample = (state.sample1 * coefficient[0] +
+                state.sample2 * coefficient[1]) >> 8;
++       int delta;
+ 
+        linearSample += ((code & 0x08) ? (code - 0x10) : code) * state.delta;
+ 
+        linearSample = clamp(linearSample, MIN_INT16, MAX_INT16);
+ 
+-       int delta = (state.delta * adaptationTable[code]) >> 8;
++       if (multiplyCheckOverflow(state.delta, adaptationTable[code], &delta))
++       {
++                if (ok) *ok=false;
++               _af_error(AF_BAD_COMPRESSION, "Error decoding sample");
++               return 0;
++       }
++       delta >>= 8;
+        if (delta < 16)
+                delta = 16;
+ 
+        state.delta = delta;
+        state.sample2 = state.sample1;
+        state.sample1 = linearSample;
++       if (ok) *ok=true;
+ 
+        return static_cast<int16_t>(linearSample);
+ }
+@@ -212,13 +248,16 @@ int MSADPCM::decodeBlock(const uint8_t *encoded, int16_t *decoded)
+        {
+                uint8_t code;
+                int16_t newSample;
++               bool ok;
+ 
+                code = *encoded >> 4;
+-               newSample = decodeSample(*state[0], code, coefficient[0]);
++               newSample = decodeSample(*state[0], code, coefficient[0], &ok);
++               if (!ok) return 0;
+                *decoded++ = newSample;
+ 
+                code = *encoded & 0x0f;
+-               newSample = decodeSample(*state[1], code, coefficient[1]);
++               newSample = decodeSample(*state[1], code, coefficient[1], &ok);
++               if (!ok) return 0;
+                *decoded++ = newSample;
+ 
+                encoded++;
+-- 
+2.11.0
+
diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
index bbce3e3bfd..4b57957cfc 100644
--- a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
+++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
@@ -18,7 +18,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \
 SRC_URI:append:class-nativesdk = " \
            file://0001-install-netscsid-to-bin-for-nativesdk.patch \
 "
-SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9"
 SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da"
 
 inherit cmake
@@ -63,3 +62,8 @@ do_install:append() {
 }
 
 BBCLASSEXTEND = "native nativesdk"
+
+# http://errors.yoctoproject.org/Errors/Details/766905/
+# cdrkit/1.1.11/cdrkit-1.1.11/genisoimage/eltorito.c:399:41: error: passing argument 1 of 'set_721' from incompatible pointer type [-Wincompatible-pointer-types]
+# cdrkit/1.1.11/cdrkit-1.1.11/genisoimage/eltorito.c:422:25: error: passing argument 1 of 'set_721' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-multimedia/faad2/faad2_2.11.1.bb b/meta-oe/recipes-multimedia/faad2/faad2_2.11.2.bb
index bec9b75ebd..83fcaa248d 100644
--- a/meta-oe/recipes-multimedia/faad2/faad2_2.11.1.bb
+++ b/meta-oe/recipes-multimedia/faad2/faad2_2.11.2.bb
@@ -10,8 +10,7 @@ LICENSE_FLAGS = "commercial"
 PV .= "+git"
 
 SRC_URI = "git://github.com/knik0/faad2.git;branch=master;protocol=https"
-SRCREV = "216f00e8ddba6f2c64caf481a04f1ddd78b93e78"
+SRCREV = "673a22a3c7c33e96e2ff7aae7c4d2bc190dfbf92"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
diff --git a/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb
index 379c7e1b63..7ae262345b 100644
--- a/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb
+++ b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb
@@ -14,6 +14,8 @@ SRC_URI[archive.sha256sum] = "2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b687
 SRC_URI[patch.md5sum] = "997c764d3be11c9a51779d93facf1118"
 SRC_URI[patch.sha256sum] = "ac2ee23ec89ba2af51d2c6dd5b1b6bf9f8a9f813de251bc182941439a4053176"
 
+CVE_STATUS[CVE-2007-4460] = "patched: fix is included in debian patch"
+
 inherit autotools
 
 # Unlike other Debian packages, id3lib*.diff.gz contains another series of
diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb b/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb
index bfdf26ed46..7f8988c3c3 100644
--- a/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb
+++ b/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb
@@ -16,7 +16,6 @@ SRC_URI = " \
     file://ppc_musl_ucontext.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
@@ -24,6 +23,6 @@ EXTRA_OEMESON = "-Db_lto=false"
 
 LDFLAGS:append:libc-musl = " -lexecinfo"
 
-export LINKFLAGS="${LDFLAGS}"
+export LINKFLAGS = "${LDFLAGS}"
 
 FILES:${PN} += "${datadir}/dbus-1/services"
diff --git a/meta-oe/recipes-multimedia/jack/jack-example-tools_4.bb b/meta-oe/recipes-multimedia/jack/jack-example-tools_4.bb
new file mode 100644
index 0000000000..58bbd8cac3
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/jack-example-tools_4.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "JACK example tools and clients"
+SECTION = "libs/multimedia"
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b"
+
+DEPENDS = "jack"
+
+SRC_URI = "git://github.com/jackaudio/jack-example-tools.git;branch=main;protocol=https"
+SRCREV = "33de8b4285fa5054af1b37fe0496c110604ed564"
+
+
+inherit meson pkgconfig
+
+PACKAGECONFIG ??= "alsa_in_out jack_rec"
+PACKAGECONFIG[alsa_in_out] = ",-Dalsa_in_out=disabled,alsa-lib"
+PACKAGECONFIG[jack_net] = ",-Djack_net=disabled"
+PACKAGECONFIG[jack_netsource] = ",-Djack_netsource=disabled,libopus"
+PACKAGECONFIG[jack_rec] = ",-Djack_rec=disabled"
+PACKAGECONFIG[opus_support] = ",-Dopus_support=disabled,libopus"
+PACKAGECONFIG[readline] = ",-Dreadline_support=disabled,readline"
+
+# ZALSA requires packages that are not available (libzita-alsa-pcmi and libzita-resampler)
+EXTRA_OECONF = "-Dzalsa=disabled"
+
+# jack recipe previously packaged jack-utils when these were part of the jack2 repository
+# keep using jack-utils package name to provide compatibility with old image recipes
+PACKAGES =+ "jack-utils"
+
+FILES:jack-utils = " \
+    ${bindir}/* \
+    ${libdir}/jack/*.so \
+"
diff --git a/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb b/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb
index bb844e4ff1..3b3ea85349 100644
--- a/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb
+++ b/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb
@@ -24,36 +24,26 @@ SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit waf pkgconfig
 
 PACKAGECONFIG ??= "alsa"
 PACKAGECONFIG[alsa] = "--alsa=yes,--alsa=no,alsa-lib"
 # --dbus only stops building jackd -> add --classic
-PACKAGECONFIG[dbus] = "--dbus --classic,,dbus"
+PACKAGECONFIG[dbus] = "--dbus --classic,,dbus,python3-core"
 PACKAGECONFIG[opus] = "--opus=yes,--opus=no,libopus"
 
 # portaudio is for windows builds only
 EXTRA_OECONF = "--portaudio=no"
 
-do_install:append() {
-        if ! ${@bb.utils.contains('PACKAGECONFIG', 'dbus', True, False, d)}; then
-                rm -f ${D}${bindir}/jack_control
-        fi
-}
-
-PACKAGES =+ "libjack jack-server jack-utils"
+PACKAGE_BEFORE_PN = "libjack jack-server"
 
 RDEPENDS:jack-dev:remove = "${PN} (= ${EXTENDPKGV})"
 
 FILES:libjack = "${libdir}/*.so.* ${libdir}/jack/*.so"
+
 FILES:jack-server = " \
     ${datadir}/dbus-1/services \
     ${bindir}/jackdbus \
     ${bindir}/jackd \
 "
-FILES:jack-utils = "${bindir}/*"
-
-FILES:${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*"
-
diff --git a/meta-oe/recipes-multimedia/libass/libass_0.17.2.bb b/meta-oe/recipes-multimedia/libass/libass_0.17.4.bb
index e239d028eb..3165736981 100644
--- a/meta-oe/recipes-multimedia/libass/libass_0.17.2.bb
+++ b/meta-oe/recipes-multimedia/libass/libass_0.17.4.bb
@@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75"
 DEPENDS = "fontconfig freetype fribidi harfbuzz"
 
 SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=master"
-SRCREV = "cbb48cc4f2f076300004b8b06a86bec55281d0c2"
-S = "${WORKDIR}/git"
+SRCREV = "bbb3c7f1570a4a021e52683f3fbdf74fe492ae84"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb
index 53404e54a8..42507051f6 100644
--- a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb
+++ b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb
@@ -9,6 +9,9 @@ DEPENDS = "libcdio"
 SRC_URI = "${GNU_MIRROR}/libcdio/${BP}.tar.bz2"
 SRC_URI[sha256sum] = "33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a"
 
+UPSTREAM_CHECK_URI = "https://github.com/rocky/libcdio-paranoia/releases"
+UPSTREAM_CHECK_REGEX = "release-(?P<pver>\d+(\.\d+)+\+\d+(\.\d+)+)"
+
 inherit autotools pkgconfig
 
 PACKAGES += "${PN}-utils"
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb
index 8562462cba..d986f90d72 100644
--- a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb
+++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb
@@ -9,7 +9,6 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2 \
            file://Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch \
            "
 
-SRC_URI[md5sum] = "aa7629e8f73662a762f64c444b901055"
 SRC_URI[sha256sum] = "8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
index 850918d319..23487329fb 100644
--- a/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
+++ b/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
@@ -19,9 +19,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz \
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mad/files/libid3tag/"
 UPSTREAM_CHECK_REGEX = "/projects/mad/files/libid3tag/(?P<pver>.*)/$"
 
-SRC_URI[md5sum] = "e5808ad997ba32c498803822078748c3"
 SRC_URI[sha256sum] = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
 
-S = "${WORKDIR}/libid3tag-${PV}"
+S = "${UNPACKDIR}/libid3tag-${PV}"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch b/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch
new file mode 100644
index 0000000000..287dfc8ca8
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch
@@ -0,0 +1,56 @@
+From 0cf439c243dfdb6eee6133ee87172235a42e59c9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 14 Sep 2024 22:04:06 +0000
+Subject: [PATCH] cmake: Do not use -mrelax-all with clang on RISCV64
+
+This option causes clang 19+ to crash on riscv64
+
+For RISC-V -mrelax-all causes the assembler stage to convert
+all conditional branches into
+
+  bcc reg, reg, tmplabel
+  jmp target
+tmplabel:
+
+Unconditional jmp can reach targets a lot further than a conditional branch.
+Unfortunately, jmp also has a limited range so sometimes needs to be
+converted to an indirect jump which requires a scratch register.
+We do all branch relaxation early for RISC-V during the compilation
+stage so we can allocate the scratch register.
+
+If the assembler also does branch relaxation it will increase the size
+of the function and may cause unconditional jmps to go out of range.
+If this happens, linking will fail.
+
+Upstream-Status: Submitted [https://github.com/libjxl/libjxl/pull/3826]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ CONTRIBUTORS   | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8b2ccb57..39bee096 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -335,7 +335,7 @@ else ()
+ 
+   # Machine flags.
+   add_compile_options(-funwind-tables)
+-  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
++  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "riscv")
+     add_compile_options("SHELL:-Xclang -mrelax-all")
+   endif()
+   if (CXX_CONSTRUCTOR_ALIASES_SUPPORTED)
+diff --git a/CONTRIBUTORS b/CONTRIBUTORS
+index 848096f9..a88c6157 100644
+--- a/CONTRIBUTORS
++++ b/CONTRIBUTORS
+@@ -10,6 +10,7 @@ Iulia-Maria Comșa
+ Jan Wassenberg
+ Jon Sneyers
+ Jyrki Alakuijala
++Khem Raj
+ Krzysztof Potempa
+ Lode Vandevenne
+ Luca Versari
diff --git a/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb b/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.3.bb
index 8df0e9a2c2..2405126e5c 100644
--- a/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb
+++ b/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.3.bb
@@ -8,10 +8,11 @@ inherit cmake pkgconfig mime
 
 DEPENDS = "highway brotli"
 
-SRC_URI = "gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1"
+SRC_URI = "gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1 \
+           file://0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch \
+           "
 
-SRCREV = "e1489592a770b989303b0edc5cc1dc447bbe0515"
-S = "${WORKDIR}/git"
+SRCREV = "4a3b22d2600f92d8706fb72d85d52bfee2acbd54"
 
 EXTRA_OECMAKE = " \
         -DCMAKE_BUILD_TYPE=Release \
@@ -36,6 +37,7 @@ PACKAGECONFIG ?= "mime gdk-pixbuf-loader sizeless-vectors"
 #  591 | HWY_RVV_FOREACH(HWY_RVV_LANES, Lanes, setvlmax_e, _ALL)
 #      |                 ^
 PACKAGECONFIG:remove:riscv64 = "sizeless-vectors"
+PACKAGECONFIG:remove:riscv32 = "sizeless-vectors"
 PACKAGECONFIG[gdk-pixbuf-loader] = "-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=ON,-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=OFF,gdk-pixbuf"
 PACKAGECONFIG[gimp] = "-DJPEGXL_ENABLE_PLUGIN_GIMP210=ON,-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF,gimp"
 PACKAGECONFIG[mime] = "-DJPEGXL_ENABLE_PLUGIN_MIME=ON,-DJPEGXL_ENABLE_PLUGIN_MIME=OFF"
diff --git a/meta-oe/recipes-multimedia/libmad/libmad/CVE-2017-8372_CVE-2017-8373.patch b/meta-oe/recipes-multimedia/libmad/libmad/CVE-2017-8372_CVE-2017-8373.patch
new file mode 100644
index 0000000000..a57df492d0
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libmad/libmad/CVE-2017-8372_CVE-2017-8373.patch
@@ -0,0 +1,69 @@
+From 7e8f6e5118e31455924940141a761a1589e8d85d Mon Sep 17 00:00:00 2001
+From: Kurt Roeckx <kurt@roeckx.be>
+Date: Sun, 28 Jan 2018 15:44:08 +0100
+Subject: [PATCH] Check the size of the main data
+
+The main data to decode a frame can come from the current frame and part of the
+previous frame, the so called bit reservoir. si.main_data_begin is the part of
+the previous frame we need for this frame. frame_space is the amount of main
+data that can be in this frame, and next_md_begin is the part of this frame that
+is going to be used for the next frame.
+
+The maximum amount of data from a previous frame that the format allows is 511
+bytes. The maximum frame size for the defined bitrates is at MPEG 2.5 layer 2
+at 320 kbit/s and 8 kHz sample rate which gives 72 * (320000 / 8000) + 1 = 2881.
+So those defines are not large enough:
+ # define MAD_BUFFER_GUARD      8
+ # define MAD_BUFFER_MDLEN      (511 + 2048 + MAD_BUFFER_GUARD)
+
+There is also support for a "free" bitrate which allows you to create any frame
+size, which can be larger than the buffer.
+
+Changing the defines is not an option since it's part of the ABI, so we check
+that the main data fits in the bufer.
+
+The previous frame data is stored in *stream->main_data and contains
+stream->md_len bytes. If stream->md_len is larger than the data we
+need from the previous frame (si.main_data_begin) it still wouldn't fit
+in the buffer, so just keep the data that we need.
+
+Source: https://salsa.debian.org/multimedia-team/libmad/-/blob/debian/0.15.1b-11/debian/patches/md_size.diff?ref_type=tags
+
+CVE: CVE-2017-8372
+CVE: CVE-2017-8373
+Upstream-Status: Inactive-Upstream [lastrelease: 2018]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ layer3.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/layer3.c b/layer3.c
+index 4e5d3fa..7dc4ca6 100644
+--- a/layer3.c
++++ b/layer3.c
+@@ -2608,6 +2608,11 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
+     next_md_begin = 0;
+ 
+   md_len = si.main_data_begin + frame_space - next_md_begin;
++  if (md_len + MAD_BUFFER_GUARD > MAD_BUFFER_MDLEN) {
++    stream->error = MAD_ERROR_LOSTSYNC;
++    stream->sync = 0;
++    return -1;
++  }
+ 
+   frame_used = 0;
+ 
+@@ -2625,8 +2630,11 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
+       }
+     }
+     else {
+-      mad_bit_init(&ptr,
+-                  *stream->main_data + stream->md_len - si.main_data_begin);
++      memmove(stream->main_data,
++       *stream->main_data + stream->md_len - si.main_data_begin,
++       si.main_data_begin);
++      stream->md_len = si.main_data_begin;
++      mad_bit_init(&ptr, *stream->main_data);
+ 
+       if (md_len > si.main_data_begin) {
+        assert(stream->md_len + md_len -
diff --git a/meta-oe/recipes-multimedia/libmad/libmad/CVE-2017-8374.patch b/meta-oe/recipes-multimedia/libmad/libmad/CVE-2017-8374.patch
new file mode 100644
index 0000000000..69a7153f07
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libmad/libmad/CVE-2017-8374.patch
@@ -0,0 +1,830 @@
+From 05de6e0ddc2c911b725955d2af331ffd76aa8186 Mon Sep 17 00:00:00 2001
+From: Kurt Roeckx <kurt@roeckx.be>
+Date: Sun, 28 Jan 2018 19:26:36 +0100
+Subject: [PATCH] Check the size before reading with mad_bit_read
+
+There are various cases where it attemps to read past the end of the buffer
+using mad_bit_read(). Most functions didn't even know the size of the buffer
+they were reading from.
+
+Source: https://salsa.debian.org/multimedia-team/libmad/-/raw/debian/0.15.1b-11/debian/patches/length-check.patch?ref_type=tags
+
+CVE: CVE-2017-8374
+Upstream-Status: Inactive-Upstream [lastrelease: 2018]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ bit.c     |   3 +
+ frame.c   |  20 +++++-
+ layer12.c | 112 +++++++++++++++++++++++++++---
+ layer3.c  | 198 ++++++++++++++++++++++++++++++++++++++----------------
+ 4 files changed, 262 insertions(+), 71 deletions(-)
+
+diff --git a/bit.c b/bit.c
+index c2bfb24..39ef50b 100644
+--- a/bit.c
++++ b/bit.c
+@@ -138,6 +138,9 @@ unsigned long mad_bit_read(struct mad_bitptr *bitptr, unsigned int len)
+ {
+   register unsigned long value;
+ 
++  if (len == 0)
++    return 0;
++
+   if (bitptr->left == CHAR_BIT)
+     bitptr->cache = *bitptr->byte;
+ 
+diff --git a/frame.c b/frame.c
+index 0cb3d0f..4b3aea8 100644
+--- a/frame.c
++++ b/frame.c
+@@ -120,11 +120,18 @@ static
+ int decode_header(struct mad_header *header, struct mad_stream *stream)
+ {
+   unsigned int index;
++  struct mad_bitptr bufend_ptr;
+ 
+   header->flags        = 0;
+   header->private_bits = 0;
+ 
++  mad_bit_init(&bufend_ptr, stream->bufend);
++
+   /* header() */
++  if (mad_bit_length(&stream->ptr, &bufend_ptr) < 32) {
++    stream->error = MAD_ERROR_BUFLEN;
++    return -1;
++  }
+ 
+   /* syncword */
+   mad_bit_skip(&stream->ptr, 11);
+@@ -225,8 +232,13 @@ int decode_header(struct mad_header *header, struct mad_stream *stream)
+   /* error_check() */
+ 
+   /* crc_check */
+-  if (header->flags & MAD_FLAG_PROTECTION)
++  if (header->flags & MAD_FLAG_PROTECTION) {
++    if (mad_bit_length(&stream->ptr, &bufend_ptr) < 16) {
++      stream->error = MAD_ERROR_BUFLEN;
++      return -1;
++    }
+     header->crc_target = mad_bit_read(&stream->ptr, 16);
++  }
+ 
+   return 0;
+ }
+@@ -338,7 +350,7 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream)
+       stream->error = MAD_ERROR_BUFLEN;
+       goto fail;
+     }
+-    else if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
++    else if ((end - ptr >= 2) && !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
+       /* mark point where frame sync word was expected */
+       stream->this_frame = ptr;
+       stream->next_frame = ptr + 1;
+@@ -361,6 +373,8 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream)
+     ptr = mad_bit_nextbyte(&stream->ptr);
+   }
+ 
++  stream->error = MAD_ERROR_NONE;
++
+   /* begin processing */
+   stream->this_frame = ptr;
+   stream->next_frame = ptr + 1;  /* possibly bogus sync word */
+@@ -413,7 +427,7 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream)
+     /* check that a valid frame header follows this frame */
+ 
+     ptr = stream->next_frame;
+-    if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
++    if ((end - ptr >= 2) && !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
+       ptr = stream->next_frame = stream->this_frame + 1;
+       goto sync;
+     }
+diff --git a/layer12.c b/layer12.c
+index 6981f9c..b6f4a2f 100644
+--- a/layer12.c
++++ b/layer12.c
+@@ -72,10 +72,18 @@ mad_fixed_t const linear_table[14] = {
+  * DESCRIPTION:        decode one requantized Layer I sample from a bitstream
+  */
+ static
+-mad_fixed_t I_sample(struct mad_bitptr *ptr, unsigned int nb)
++mad_fixed_t I_sample(struct mad_bitptr *ptr, unsigned int nb, struct mad_stream *stream)
+ {
+   mad_fixed_t sample;
++  struct mad_bitptr frameend_ptr;
+ 
++  mad_bit_init(&frameend_ptr, stream->next_frame);
++
++  if (mad_bit_length(ptr, &frameend_ptr) < nb) {
++    stream->error = MAD_ERROR_LOSTSYNC;
++    stream->sync = 0;
++    return 0;
++  }
+   sample = mad_bit_read(ptr, nb);
+ 
+   /* invert most significant bit, extend sign, then scale to fixed format */
+@@ -106,6 +114,10 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
+   struct mad_header *header = &frame->header;
+   unsigned int nch, bound, ch, s, sb, nb;
+   unsigned char allocation[2][32], scalefactor[2][32];
++  struct mad_bitptr bufend_ptr, frameend_ptr;
++
++  mad_bit_init(&bufend_ptr, stream->bufend);
++  mad_bit_init(&frameend_ptr, stream->next_frame);
+ 
+   nch = MAD_NCHANNELS(header);
+ 
+@@ -118,6 +130,11 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
+   /* check CRC word */
+ 
+   if (header->flags & MAD_FLAG_PROTECTION) {
++    if (mad_bit_length(&stream->ptr, &bufend_ptr)
++               < 4 * (bound * nch + (32 - bound))) {
++      stream->error = MAD_ERROR_BADCRC;
++      return -1;
++    }
+     header->crc_check =
+       mad_bit_crc(stream->ptr, 4 * (bound * nch + (32 - bound)),
+                  header->crc_check);
+@@ -133,6 +150,11 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
+ 
+   for (sb = 0; sb < bound; ++sb) {
+     for (ch = 0; ch < nch; ++ch) {
++      if (mad_bit_length(&stream->ptr, &frameend_ptr) < 4) {
++       stream->error = MAD_ERROR_LOSTSYNC;
++       stream->sync = 0;
++       return -1;
++      }
+       nb = mad_bit_read(&stream->ptr, 4);
+ 
+       if (nb == 15) {
+@@ -145,6 +167,11 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
+   }
+ 
+   for (sb = bound; sb < 32; ++sb) {
++    if (mad_bit_length(&stream->ptr, &frameend_ptr) < 4) {
++      stream->error = MAD_ERROR_LOSTSYNC;
++      stream->sync = 0;
++      return -1;
++    }
+     nb = mad_bit_read(&stream->ptr, 4);
+ 
+     if (nb == 15) {
+@@ -161,6 +188,11 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
+   for (sb = 0; sb < 32; ++sb) {
+     for (ch = 0; ch < nch; ++ch) {
+       if (allocation[ch][sb]) {
++        if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
++         stream->error = MAD_ERROR_LOSTSYNC;
++         stream->sync = 0;
++         return -1;
++       }
+        scalefactor[ch][sb] = mad_bit_read(&stream->ptr, 6);
+ 
+ # if defined(OPT_STRICT)
+@@ -185,8 +217,10 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
+       for (ch = 0; ch < nch; ++ch) {
+        nb = allocation[ch][sb];
+        frame->sbsample[ch][s][sb] = nb ?
+-         mad_f_mul(I_sample(&stream->ptr, nb),
++         mad_f_mul(I_sample(&stream->ptr, nb, stream),
+                    sf_table[scalefactor[ch][sb]]) : 0;
++       if (stream->error != 0)
++         return -1;
+       }
+     }
+ 
+@@ -194,7 +228,14 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
+       if ((nb = allocation[0][sb])) {
+        mad_fixed_t sample;
+ 
+-       sample = I_sample(&stream->ptr, nb);
++       if (mad_bit_length(&stream->ptr, &frameend_ptr) < nb) {
++         stream->error = MAD_ERROR_LOSTSYNC;
++         stream->sync = 0;
++          return -1;
++       }
++       sample = I_sample(&stream->ptr, nb, stream);
++        if (stream->error != 0)
++         return -1;
+ 
+        for (ch = 0; ch < nch; ++ch) {
+          frame->sbsample[ch][s][sb] =
+@@ -280,13 +321,21 @@ struct quantclass {
+ static
+ void II_samples(struct mad_bitptr *ptr,
+                struct quantclass const *quantclass,
+-               mad_fixed_t output[3])
++               mad_fixed_t output[3], struct mad_stream *stream)
+ {
+   unsigned int nb, s, sample[3];
++  struct mad_bitptr frameend_ptr;
++
++  mad_bit_init(&frameend_ptr, stream->next_frame);
+ 
+   if ((nb = quantclass->group)) {
+     unsigned int c, nlevels;
+ 
++    if (mad_bit_length(ptr, &frameend_ptr) < quantclass->bits) {
++      stream->error = MAD_ERROR_LOSTSYNC;
++      stream->sync = 0;
++      return;
++    }
+     /* degrouping */
+     c = mad_bit_read(ptr, quantclass->bits);
+     nlevels = quantclass->nlevels;
+@@ -299,8 +348,14 @@ void II_samples(struct mad_bitptr *ptr,
+   else {
+     nb = quantclass->bits;
+ 
+-    for (s = 0; s < 3; ++s)
++    for (s = 0; s < 3; ++s) {
++      if (mad_bit_length(ptr, &frameend_ptr) < nb) {
++       stream->error = MAD_ERROR_LOSTSYNC;
++       stream->sync = 0;
++       return;
++      }
+       sample[s] = mad_bit_read(ptr, nb);
++    }
+   }
+ 
+   for (s = 0; s < 3; ++s) {
+@@ -336,6 +391,9 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
+   unsigned char const *offsets;
+   unsigned char allocation[2][32], scfsi[2][32], scalefactor[2][32][3];
+   mad_fixed_t samples[3];
++  struct mad_bitptr frameend_ptr;
++
++  mad_bit_init(&frameend_ptr, stream->next_frame);
+ 
+   nch = MAD_NCHANNELS(header);
+ 
+@@ -402,13 +460,24 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
+   for (sb = 0; sb < bound; ++sb) {
+     nbal = bitalloc_table[offsets[sb]].nbal;
+ 
+-    for (ch = 0; ch < nch; ++ch)
++    for (ch = 0; ch < nch; ++ch) {
++      if (mad_bit_length(&stream->ptr, &frameend_ptr) < nbal) {
++       stream->error = MAD_ERROR_LOSTSYNC;
++       stream->sync = 0;
++       return -1;
++      }
+       allocation[ch][sb] = mad_bit_read(&stream->ptr, nbal);
++    }
+   }
+ 
+   for (sb = bound; sb < sblimit; ++sb) {
+     nbal = bitalloc_table[offsets[sb]].nbal;
+ 
++    if (mad_bit_length(&stream->ptr, &frameend_ptr) < nbal) {
++      stream->error = MAD_ERROR_LOSTSYNC;
++      stream->sync = 0;
++      return -1;
++    }
+     allocation[0][sb] =
+     allocation[1][sb] = mad_bit_read(&stream->ptr, nbal);
+   }
+@@ -417,8 +486,14 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
+ 
+   for (sb = 0; sb < sblimit; ++sb) {
+     for (ch = 0; ch < nch; ++ch) {
+-      if (allocation[ch][sb])
++      if (allocation[ch][sb]) {
++       if (mad_bit_length(&stream->ptr, &frameend_ptr) < 2) {
++         stream->error = MAD_ERROR_LOSTSYNC;
++         stream->sync = 0;
++         return -1;
++       }
+        scfsi[ch][sb] = mad_bit_read(&stream->ptr, 2);
++      }
+     }
+   }
+ 
+@@ -441,6 +516,11 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
+   for (sb = 0; sb < sblimit; ++sb) {
+     for (ch = 0; ch < nch; ++ch) {
+       if (allocation[ch][sb]) {
++       if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
++         stream->error = MAD_ERROR_LOSTSYNC;
++         stream->sync = 0;
++         return -1;
++       }
+        scalefactor[ch][sb][0] = mad_bit_read(&stream->ptr, 6);
+ 
+        switch (scfsi[ch][sb]) {
+@@ -451,11 +531,21 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
+          break;
+ 
+        case 0:
++         if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
++           stream->error = MAD_ERROR_LOSTSYNC;
++           stream->sync = 0;
++           return -1;
++         }
+          scalefactor[ch][sb][1] = mad_bit_read(&stream->ptr, 6);
+          /* fall through */
+ 
+        case 1:
+        case 3:
++         if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
++           stream->error = MAD_ERROR_LOSTSYNC;
++           stream->sync = 0;
++           return -1;
++         }
+          scalefactor[ch][sb][2] = mad_bit_read(&stream->ptr, 6);
+        }
+ 
+@@ -487,7 +577,9 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
+        if ((index = allocation[ch][sb])) {
+          index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
+ 
+-         II_samples(&stream->ptr, &qc_table[index], samples);
++         II_samples(&stream->ptr, &qc_table[index], samples, stream);
++         if (stream->error != 0)
++            return -1;
+ 
+          for (s = 0; s < 3; ++s) {
+            frame->sbsample[ch][3 * gr + s][sb] =
+@@ -505,7 +597,9 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
+       if ((index = allocation[0][sb])) {
+        index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
+ 
+-       II_samples(&stream->ptr, &qc_table[index], samples);
++       II_samples(&stream->ptr, &qc_table[index], samples, stream);
++       if (stream->error != 0)
++          return -1;
+ 
+        for (ch = 0; ch < nch; ++ch) {
+          for (s = 0; s < 3; ++s) {
+diff --git a/layer3.c b/layer3.c
+index 7dc4ca6..59a81ed 100644
+--- a/layer3.c
++++ b/layer3.c
+@@ -598,7 +598,8 @@ enum mad_error III_sideinfo(struct mad_bitptr *ptr, unsigned int nch,
+ static
+ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
+                                  struct channel *channel,
+-                                 struct channel *gr1ch, int mode_extension)
++                                 struct channel *gr1ch, int mode_extension,
++                                 unsigned int bits_left, unsigned int *part2_length)
+ {
+   struct mad_bitptr start;
+   unsigned int scalefac_compress, index, slen[4], part, n, i;
+@@ -644,8 +645,12 @@ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
+ 
+     n = 0;
+     for (part = 0; part < 4; ++part) {
+-      for (i = 0; i < nsfb[part]; ++i)
++      for (i = 0; i < nsfb[part]; ++i) {
++       if (bits_left < slen[part])
++         return MAD_ERROR_BADSCFSI;
+        channel->scalefac[n++] = mad_bit_read(ptr, slen[part]);
++       bits_left -= slen[part];
++      }
+     }
+ 
+     while (n < 39)
+@@ -690,7 +695,10 @@ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
+       max = (1 << slen[part]) - 1;
+ 
+       for (i = 0; i < nsfb[part]; ++i) {
++       if (bits_left < slen[part])
++         return MAD_ERROR_BADSCFSI;
+        is_pos = mad_bit_read(ptr, slen[part]);
++       bits_left -= slen[part];
+ 
+        channel->scalefac[n] = is_pos;
+        gr1ch->scalefac[n++] = (is_pos == max);
+@@ -703,7 +711,8 @@ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
+     }
+   }
+ 
+-  return mad_bit_length(&start, ptr);
++  *part2_length = mad_bit_length(&start, ptr);
++  return MAD_ERROR_NONE;
+ }
+ 
+ /*
+@@ -712,7 +721,8 @@ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
+  */
+ static
+ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
+-                             struct channel const *gr0ch, unsigned int scfsi)
++                             struct channel const *gr0ch, unsigned int scfsi,
++                             unsigned int bits_left, unsigned int *part2_length)
+ {
+   struct mad_bitptr start;
+   unsigned int slen1, slen2, sfbi;
+@@ -728,12 +738,20 @@ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
+     sfbi = 0;
+ 
+     nsfb = (channel->flags & mixed_block_flag) ? 8 + 3 * 3 : 6 * 3;
+-    while (nsfb--)
++    while (nsfb--) {
++      if (bits_left < slen1)
++       return MAD_ERROR_BADSCFSI;
+       channel->scalefac[sfbi++] = mad_bit_read(ptr, slen1);
++      bits_left -= slen1;
++    }
+ 
+     nsfb = 6 * 3;
+-    while (nsfb--)
++    while (nsfb--) {
++      if (bits_left < slen2)
++       return MAD_ERROR_BADSCFSI;
+       channel->scalefac[sfbi++] = mad_bit_read(ptr, slen2);
++      bits_left -= slen2;
++    }
+ 
+     nsfb = 1 * 3;
+     while (nsfb--)
+@@ -745,8 +763,12 @@ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
+        channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
+     }
+     else {
+-      for (sfbi = 0; sfbi < 6; ++sfbi)
++      for (sfbi = 0; sfbi < 6; ++sfbi) {
++       if (bits_left < slen1)
++         return MAD_ERROR_BADSCFSI;
+        channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
++       bits_left -= slen1;
++      }
+     }
+ 
+     if (scfsi & 0x4) {
+@@ -754,8 +776,12 @@ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
+        channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
+     }
+     else {
+-      for (sfbi = 6; sfbi < 11; ++sfbi)
++      for (sfbi = 6; sfbi < 11; ++sfbi) {
++       if (bits_left < slen1)
++         return MAD_ERROR_BADSCFSI;
+        channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
++       bits_left -= slen1;
++      }
+     }
+ 
+     if (scfsi & 0x2) {
+@@ -763,8 +789,12 @@ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
+        channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
+     }
+     else {
+-      for (sfbi = 11; sfbi < 16; ++sfbi)
++      for (sfbi = 11; sfbi < 16; ++sfbi) {
++       if (bits_left < slen2)
++         return MAD_ERROR_BADSCFSI;
+        channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
++       bits_left -= slen2;
++      }
+     }
+ 
+     if (scfsi & 0x1) {
+@@ -772,14 +802,19 @@ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
+        channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
+     }
+     else {
+-      for (sfbi = 16; sfbi < 21; ++sfbi)
++      for (sfbi = 16; sfbi < 21; ++sfbi) {
++       if (bits_left < slen2)
++         return MAD_ERROR_BADSCFSI;
+        channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
++       bits_left -= slen2;
++      }
+     }
+ 
+     channel->scalefac[21] = 0;
+   }
+ 
+-  return mad_bit_length(&start, ptr);
++  *part2_length = mad_bit_length(&start, ptr);
++  return MAD_ERROR_NONE;
+ }
+ 
+ /*
+@@ -933,19 +968,17 @@ static
+ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+                              struct channel *channel,
+                              unsigned char const *sfbwidth,
+-                             unsigned int part2_length)
++                             signed int part3_length)
+ {
+   signed int exponents[39], exp;
+   signed int const *expptr;
+   struct mad_bitptr peek;
+-  signed int bits_left, cachesz;
++  signed int bits_left, cachesz, fakebits;
+   register mad_fixed_t *xrptr;
+   mad_fixed_t const *sfbound;
+   register unsigned long bitcache;
+ 
+-  bits_left = (signed) channel->part2_3_length - (signed) part2_length;
+-  if (bits_left < 0)
+-    return MAD_ERROR_BADPART3LEN;
++  bits_left = part3_length;
+ 
+   III_exponents(channel, sfbwidth, exponents);
+ 
+@@ -956,8 +989,12 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+   cachesz  = mad_bit_bitsleft(&peek);
+   cachesz += ((32 - 1 - 24) + (24 - cachesz)) & ~7;
+ 
++  if (bits_left < cachesz) {
++    cachesz = bits_left;
++  }
+   bitcache   = mad_bit_read(&peek, cachesz);
+   bits_left -= cachesz;
++  fakebits = 0;
+ 
+   xrptr = &xr[0];
+ 
+@@ -986,7 +1023,7 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+ 
+     big_values = channel->big_values;
+ 
+-    while (big_values-- && cachesz + bits_left > 0) {
++    while (big_values-- && cachesz + bits_left - fakebits > 0) {
+       union huffpair const *pair;
+       unsigned int clumpsz, value;
+       register mad_fixed_t requantized;
+@@ -1023,10 +1060,19 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+        unsigned int bits;
+ 
+        bits       = ((32 - 1 - 21) + (21 - cachesz)) & ~7;
++       if (bits_left < bits) {
++         bits = bits_left;
++       }
+        bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
+        cachesz   += bits;
+        bits_left -= bits;
+       }
++      if (cachesz < 21) {
++       unsigned int bits = 21 - cachesz;
++       bitcache <<= bits;
++       cachesz += bits;
++       fakebits += bits;
++      }
+ 
+       /* hcod (0..19) */
+ 
+@@ -1041,6 +1087,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+       }
+ 
+       cachesz -= pair->value.hlen;
++      if (cachesz < fakebits)
++       return MAD_ERROR_BADHUFFDATA;
+ 
+       if (linbits) {
+        /* x (0..14) */
+@@ -1054,10 +1102,15 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+ 
+        case 15:
+          if (cachesz < linbits + 2) {
+-           bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
+-           cachesz   += 16;
+-           bits_left -= 16;
++           unsigned int bits = 16;
++           if (bits_left < 16)
++             bits = bits_left;
++           bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
++           cachesz   += bits;
++           bits_left -= bits;
+          }
++         if (cachesz - fakebits < linbits)
++           return MAD_ERROR_BADHUFFDATA;
+ 
+          value += MASK(bitcache, cachesz, linbits);
+          cachesz -= linbits;
+@@ -1074,6 +1127,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+          }
+ 
+        x_final:
++         if (cachesz - fakebits < 1)
++           return MAD_ERROR_BADHUFFDATA;
+          xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
+            -requantized : requantized;
+        }
+@@ -1089,10 +1144,15 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+ 
+        case 15:
+          if (cachesz < linbits + 1) {
+-           bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
+-           cachesz   += 16;
+-           bits_left -= 16;
++           unsigned int bits = 16;
++           if (bits_left < 16)
++             bits = bits_left;
++           bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
++           cachesz   += bits;
++           bits_left -= bits;
+          }
++         if (cachesz - fakebits < linbits)
++           return MAD_ERROR_BADHUFFDATA;
+ 
+          value += MASK(bitcache, cachesz, linbits);
+          cachesz -= linbits;
+@@ -1109,6 +1169,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+          }
+ 
+        y_final:
++         if (cachesz - fakebits < 1)
++           return MAD_ERROR_BADHUFFDATA;
+          xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
+            -requantized : requantized;
+        }
+@@ -1128,6 +1190,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+            requantized = reqcache[value] = III_requantize(value, exp);
+          }
+ 
++         if (cachesz - fakebits < 1)
++           return MAD_ERROR_BADHUFFDATA;
+          xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
+            -requantized : requantized;
+        }
+@@ -1146,6 +1210,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+            requantized = reqcache[value] = III_requantize(value, exp);
+          }
+ 
++         if (cachesz - fakebits < 1)
++           return MAD_ERROR_BADHUFFDATA;
+          xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
+            -requantized : requantized;
+        }
+@@ -1155,9 +1221,6 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+     }
+   }
+ 
+-  if (cachesz + bits_left < 0)
+-    return MAD_ERROR_BADHUFFDATA;  /* big_values overrun */
+-
+   /* count1 */
+   {
+     union huffquad const *table;
+@@ -1167,15 +1230,24 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+ 
+     requantized = III_requantize(1, exp);
+ 
+-    while (cachesz + bits_left > 0 && xrptr <= &xr[572]) {
++    while (cachesz + bits_left - fakebits > 0 && xrptr <= &xr[572]) {
+       union huffquad const *quad;
+ 
+       /* hcod (1..6) */
+ 
+       if (cachesz < 10) {
+-       bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
+-       cachesz   += 16;
+-       bits_left -= 16;
++       unsigned int bits = 16;
++       if (bits_left < 16)
++         bits = bits_left;
++       bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
++       cachesz   += bits;
++       bits_left -= bits;
++      }
++      if (cachesz < 10) {
++       unsigned int bits = 10 - cachesz;
++       bitcache <<= bits;
++       cachesz += bits;
++       fakebits += bits;
+       }
+ 
+       quad = &table[MASK(bitcache, cachesz, 4)];
+@@ -1188,6 +1260,11 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+                      MASK(bitcache, cachesz, quad->ptr.bits)];
+       }
+ 
++      if (cachesz - fakebits < quad->value.hlen + quad->value.v
++        + quad->value.w + quad->value.x + quad->value.y)
++       /* We don't have enough bits to read one more entry, consider them
++        * stuffing bits. */
++       break;
+       cachesz -= quad->value.hlen;
+ 
+       if (xrptr == sfbound) {
+@@ -1236,22 +1313,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
+ 
+       xrptr += 2;
+     }
+-
+-    if (cachesz + bits_left < 0) {
+-# if 0 && defined(DEBUG)
+-      fprintf(stderr, "huffman count1 overrun (%d bits)\n",
+-             -(cachesz + bits_left));
+-# endif
+-
+-      /* technically the bitstream is misformatted, but apparently
+-        some encoders are just a bit sloppy with stuffing bits */
+-
+-      xrptr -= 4;
+-    }
+   }
+ 
+-  assert(-bits_left <= MAD_BUFFER_GUARD * CHAR_BIT);
+-
+ # if 0 && defined(DEBUG)
+   if (bits_left < 0)
+     fprintf(stderr, "read %d bits too many\n", -bits_left);
+@@ -2348,10 +2411,11 @@ void III_freqinver(mad_fixed_t sample[18][32], unsigned int sb)
+  */
+ static
+ enum mad_error III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
+-                         struct sideinfo *si, unsigned int nch)
++                         struct sideinfo *si, unsigned int nch, unsigned int md_len)
+ {
+   struct mad_header *header = &frame->header;
+   unsigned int sfreqi, ngr, gr;
++  int bits_left = md_len * CHAR_BIT;
+ 
+   {
+     unsigned int sfreq;
+@@ -2383,6 +2447,7 @@ enum mad_error III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
+     for (ch = 0; ch < nch; ++ch) {
+       struct channel *channel = &granule->ch[ch];
+       unsigned int part2_length;
++      unsigned int part3_length;
+ 
+       sfbwidth[ch] = sfbwidth_table[sfreqi].l;
+       if (channel->block_type == 2) {
+@@ -2391,18 +2456,30 @@ enum mad_error III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
+       }
+ 
+       if (header->flags & MAD_FLAG_LSF_EXT) {
+-       part2_length = III_scalefactors_lsf(ptr, channel,
++       error = III_scalefactors_lsf(ptr, channel,
+                                            ch == 0 ? 0 : &si->gr[1].ch[1],
+-                                           header->mode_extension);
++                                           header->mode_extension, bits_left, &part2_length);
+       }
+       else {
+-       part2_length = III_scalefactors(ptr, channel, &si->gr[0].ch[ch],
+-                                       gr == 0 ? 0 : si->scfsi[ch]);
++       error = III_scalefactors(ptr, channel, &si->gr[0].ch[ch],
++                                       gr == 0 ? 0 : si->scfsi[ch], bits_left, &part2_length);
+       }
++      if (error)
++        return error;
+ 
+-      error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part2_length);
++      bits_left -= part2_length;
++
++      if (part2_length > channel->part2_3_length)
++        return MAD_ERROR_BADPART3LEN;
++
++      part3_length = channel->part2_3_length - part2_length;
++      if (part3_length > bits_left)
++        return MAD_ERROR_BADPART3LEN;
++
++      error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part3_length);
+       if (error)
+        return error;
++      bits_left -= part3_length;
+     }
+ 
+     /* joint stereo processing */
+@@ -2519,11 +2596,13 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
+   unsigned int nch, priv_bitlen, next_md_begin = 0;
+   unsigned int si_len, data_bitlen, md_len;
+   unsigned int frame_space, frame_used, frame_free;
+-  struct mad_bitptr ptr;
++  struct mad_bitptr ptr, bufend_ptr;
+   struct sideinfo si;
+   enum mad_error error;
+   int result = 0;
+ 
++  mad_bit_init(&bufend_ptr, stream->bufend);
++
+   /* allocate Layer III dynamic structures */
+ 
+   if (stream->main_data == 0) {
+@@ -2587,14 +2666,15 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
+     unsigned long header;
+ 
+     mad_bit_init(&peek, stream->next_frame);
++    if (mad_bit_length(&peek, &bufend_ptr) >= 57) {
++      header = mad_bit_read(&peek, 32);
++      if ((header & 0xffe60000L) /* syncword | layer */ == 0xffe20000L) {
++        if (!(header & 0x00010000L))  /* protection_bit */
++         mad_bit_skip(&peek, 16);  /* crc_check */
+ 
+-    header = mad_bit_read(&peek, 32);
+-    if ((header & 0xffe60000L) /* syncword | layer */ == 0xffe20000L) {
+-      if (!(header & 0x00010000L))  /* protection_bit */
+-       mad_bit_skip(&peek, 16);  /* crc_check */
+-
+-      next_md_begin =
+-       mad_bit_read(&peek, (header & 0x00080000L) /* ID */ ? 9 : 8);
++        next_md_begin =
++         mad_bit_read(&peek, (header & 0x00080000L) /* ID */ ? 9 : 8);
++      }
+     }
+ 
+     mad_bit_finish(&peek);
+@@ -2653,7 +2733,7 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
+   /* decode main_data */
+ 
+   if (result == 0) {
+-    error = III_decode(&ptr, frame, &si, nch);
++    error = III_decode(&ptr, frame, &si, nch, md_len);
+     if (error) {
+       stream->error = error;
+       result = -1;
diff --git a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
index e70c8e3ed1..0f89574b9a 100644
--- a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
+++ b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
@@ -16,12 +16,16 @@ SRC_URI = "https://downloads.sourceforge.net/mad/libmad-${PV}.tar.gz \
     file://obsolete_automake_macros.patch \
     file://automake-foreign.patch \
     file://0001-configure-Respect-the-cflags-from-environment.patch \
+    file://CVE-2017-8372_CVE-2017-8373.patch \
+    file://CVE-2017-8374.patch \
 "
 SRC_URI:append:toolchain-clang = " file://0004-Remove-clang-unsupported-compiler-flags.patch "
 
 SRC_URI[sha256sum] = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"
 
-S = "${WORKDIR}/libmad-${PV}"
+CVE_PRODUCT:append = " mad_libmad"
+
+S = "${UNPACKDIR}/libmad-${PV}"
 
 inherit autotools pkgconfig
 
@@ -34,3 +38,6 @@ do_configure:prepend () {
 }
 
 ARM_INSTRUCTION_SET = "arm"
+
+CVE_STATUS[CVE-2017-11552] = "cpe-incorrect: this CVE is for mpg321, not libmad"
+CVE_STATUS[CVE-2018-7263] = "cpe-incorrect: this CVE is for mpg321, not libmad"
diff --git a/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb b/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb
index 62c20c6122..9fcb8a1dc0 100644
--- a/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb
+++ b/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb
@@ -6,7 +6,6 @@ LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz"
-SRC_URI[md5sum] = "d6b665b335a6360e000976e770da7691"
 SRC_URI[sha256sum] = "3c05e05aebcbfcc044d9e8c2d4646cd8359be39a3f0ba8ce4e72a9094bee704f"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.5.2.bb b/meta-oe/recipes-multimedia/libopus/libopus_1.5.2.bb
index 02958ef023..642f34f71d 100644
--- a/meta-oe/recipes-multimedia/libopus/libopus_1.5.2.bb
+++ b/meta-oe/recipes-multimedia/libopus/libopus_1.5.2.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b365c2155d66e550e1447075d6744a5"
 SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz"
 SRC_URI[sha256sum] = "65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1"
 
-S = "${WORKDIR}/opus-${PV}"
+S = "${UNPACKDIR}/opus-${PV}"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb b/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb
index 596c5fe86d..fb822d7a0e 100644
--- a/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb
+++ b/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb
@@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=174b92049c2c697eb73112801662a07c"
 
 DEPENDS = "libopus"
 
-UPSTREAM_CHECK_URI = "https://github.com/xiph/libopusenc/releases"
+UPSTREAM_CHECK_URI = "https://github.com/xiph/libopusenc/tags"
+UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
 
 SRC_URI = "https://ftp.osuosl.org/pub/xiph/releases/opus/libopusenc-${PV}.tar.gz"
-SRC_URI[md5sum] = "f038ea0f4168d184c76b42d293697c57"
 SRC_URI[sha256sum] = "8298db61a8d3d63e41c1a80705baa8ce9ff3f50452ea7ec1c19a564fe106cbb9"
 
-S = "${WORKDIR}/libopusenc-${PV}"
+S = "${UNPACKDIR}/libopusenc-${PV}"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-multimedia/libxmp/libxmp_4.6.3.bb b/meta-oe/recipes-multimedia/libxmp/libxmp_4.6.3.bb
new file mode 100644
index 0000000000..c302f65ed5
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libxmp/libxmp_4.6.3.bb
@@ -0,0 +1,10 @@
+SUMMARY = "Extended Module Player Library"
+HOMEPAGE = "http://xmp.sourceforge.net/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://README;beginline=59;md5=ea030bd80f99071b0d3f9a9f752d1ca8"
+
+inherit cmake pkgconfig
+
+SRC_URI = "git://github.com/libxmp/libxmp.git;protocol=https;branch=master;tag=libxmp-${PV}"
+SRCREV = "bed660f8e530d399c38f27a5a7732f4e79740585"
+
diff --git a/meta-oe/recipes-multimedia/live555/live555_20210824.bb b/meta-oe/recipes-multimedia/live555/live555_20210824.bb
index 80c770c3e3..1622a97fe1 100644
--- a/meta-oe/recipes-multimedia/live555/live555_20210824.bb
+++ b/meta-oe/recipes-multimedia/live555/live555_20210824.bb
@@ -18,7 +18,7 @@ MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.or
 
 SRC_URI[sha256sum] = "ce95a1c79f6d18e959f9dc129b8529b711c60e76754acc285e60946303b923ec"
 
-S = "${WORKDIR}/live"
+S = "${UNPACKDIR}/live"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.11.1.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.11.1.bb
index e0712ba930..d7a2820a79 100644
--- a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.11.1.bb
+++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.11.1.bb
@@ -8,7 +8,6 @@ DEPENDS = "alsa-lib texinfo"
 SRC_URI = "\
     ${SOURCEFORGE_MIRROR}/project/mikmod/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
 "
-SRC_URI[md5sum] = "f69d7dd06d307e888f466fc27f4f680b"
 SRC_URI[sha256sum] = "ad9d64dfc8f83684876419ea7cd4ff4a41d8bcd8c23ef37ecb3a200a16b46d19"
 
 inherit autotools binconfig lib_package
diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo_7.351.0.bb b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.351.0.bb
new file mode 100644
index 0000000000..68a29dde91
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.351.0.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Reusable library for GPU-accelerated video/image rendering primitives"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da"
+
+DEPENDS += "fastfloat glad-native python3-mako-native python3-jinja2-native vulkan-headers"
+
+SRC_URI = "git://code.videolan.org/videolan/libplacebo.git;protocol=https;branch=v7.351"
+SRCREV = "3188549fba13bbdf3a5a98de2a38c2e71f04e21e"
+
+inherit meson pkgconfig
+
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'vulkan opengl', d)} lcms"
+
+PACKAGECONFIG[vulkan] =  "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader shaderc spirv-shader-generator"
+PACKAGECONFIG[glslang] = "-Dglslang=enabled,-Dglslang=disabled,glslang"
+PACKAGECONFIG[opengl] = "-Dopengl=enabled,-Dopengl=disabled"
+PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms"
+PACKAGECONFIG[demos] = "-Ddemos=true,-Ddemos=false,ffmpeg virtual/libsdl2 libsdl2-image"
+
+EXTRA_OEMESON = "-Dvulkan-registry=${STAGING_DATADIR}/vulkan/registry/vk.xml"
+
+do_install:append(){
+  if [ -f ${D}${libdir}/pkgconfig/libplacebo.pc ]; then
+    sed -i "s,${RECIPE_SYSROOT}${libdir}/libSPIRV.so,-lSPIRV,g" ${D}${libdir}/pkgconfig/libplacebo.pc
+    sed -i "s,${RECIPE_SYSROOT}${libdir}/libglslang.so,-lglslang,g" ${D}${libdir}/pkgconfig/libplacebo.pc
+  fi
+}
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb
deleted file mode 100644
index 0f50a6e8fe..0000000000
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb
+++ /dev/null
@@ -1,116 +0,0 @@
-SUMMARY = "Open Source multimedia player"
-DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more."
-SECTION = "multimedia"
-HOMEPAGE = "http://www.mpv.io/"
-
-DEPENDS = " \
-    zlib \
-    ffmpeg \
-    jpeg \
-    libv4l \
-    libass \
-"
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRCREV_mpv = "140ec21c89d671d392877a7f3b91d67e7d7b9239"
-SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.35;protocol=https \
-           https://waf.io/waf-2.0.25;name=waf;subdir=git \
-           "
-SRC_URI[waf.sha256sum] = "21199cd220ccf60434133e1fd2ab8c8e5217c3799199c82722543970dc8e38d5"
-
-S = "${WORKDIR}/git"
-
-inherit waf pkgconfig mime-xdg
-
-LDFLAGS:append:riscv64 = " -latomic"
-
-LUA ?= "lua"
-LUA:mips64  = ""
-LUA:powerpc64  = ""
-LUA:powerpc64le  = ""
-LUA:riscv64  = ""
-LUA:riscv32  = ""
-LUA:powerpc  = ""
-
-# Note: lua is required to get on-screen-display (controls)
-PACKAGECONFIG ??= " \
-    ${LUA} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \
-"
-
-PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext"
-PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv"
-PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"
-PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl"
-PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm"
-PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm"
-PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit"
-PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive"
-PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack"
-PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
-PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
-PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native libxkbcommon"
-
-python __anonymous() {
-    packageconfig = (d.getVar("PACKAGECONFIG") or "").split()
-    extras = []
-    if "x11" in packageconfig and "opengl" in packageconfig:
-        extras.append(" --enable-gl-x11")
-    if "x11" in packageconfig and "egl" in packageconfig:
-        extras.append(" --enable-egl-x11")
-    if "egl" in packageconfig and "drm" in packageconfig:
-        extras.append(" --enable-egl-drm")
-    if "vaapi" in packageconfig and "x11" in packageconfig:
-        extras.append(" --enable-vaapi-x11")
-    if "vaapi" in packageconfig and "drm" in packageconfig:
-        extras.append(" --enable-vaapi-drm")
-    if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig:
-        extras.append(" --enable-vaapi-x-egl")
-    if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig:
-        extras.append(" --enable-vdpau-gl-x11")
-    if "wayland" in packageconfig and "opengl" in packageconfig:
-        extras.append(" --enable-gl-wayland")
-    if "wayland" in packageconfig and "vaapi" in packageconfig:
-        extras.append(" --enable-vaapi-wayland")
-    if extras:
-        d.appendVar("EXTRA_OECONF", "".join(extras))
-}
-
-SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}"
-
-EXTRA_OECONF = " \
-    --prefix=${prefix} \
-    --target=${SIMPLE_TARGET_SYS} \
-    --confdir=${sysconfdir} \
-    --datadir=${datadir} \
-    --disable-manpage-build \
-    --disable-libbluray \
-    --disable-dvdnav \
-    --disable-cdda \
-    --disable-uchardet \
-    --disable-rubberband \
-    --disable-lcms2 \
-    --disable-vapoursynth \
-    ${PACKAGECONFIG_CONFARGS} \
-"
-
-do_configure:append() {
-    sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h
-}
-
-link_waf() {
-    ln -s waf-2.0.25 ${S}/waf
-}
-do_unpack[postfuncs] += "link_waf"
-
-FILES:${PN} += " \
-    ${datadir}/icons \
-    ${datadir}/zsh \
-    ${datadir}/bash-completion \
-    ${datadir}/metainfo \
-    "
-EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}"
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.40.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.40.0.bb
new file mode 100644
index 0000000000..3223dd69d7
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.40.0.bb
@@ -0,0 +1,102 @@
+SUMMARY = "Open Source multimedia player"
+DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more."
+SECTION = "multimedia"
+HOMEPAGE = "http://www.mpv.io/"
+
+DEPENDS = " \
+    zlib \
+    ffmpeg \
+    jpeg \
+    libv4l \
+    libass \
+    libdisplay-info \
+    libplacebo \
+"
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=570a9b3749dd0463a1778803b12a6dce"
+
+SRCREV = "e48ac7ce08462f5e33af6ef9deeac6fa87eef01e"
+SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/${@oe.utils.trim_version('${PV}', 2)};protocol=https"
+
+inherit meson pkgconfig mime-xdg
+
+LDFLAGS:append:riscv64 = " -latomic"
+
+LUA ?= "lua"
+LUA:mips64  = ""
+LUA:powerpc64  = ""
+LUA:powerpc64le  = ""
+LUA:riscv64  = ""
+LUA:riscv32  = ""
+LUA:powerpc  = ""
+
+# Note: lua is required to get on-screen-display (controls)
+PACKAGECONFIG ??= " \
+    libmpv \
+    ${LUA} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland opengl pipewire pulseaudio vulkan', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'egl', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'drm gbm', '', d)} \
+"
+
+PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext"
+PACKAGECONFIG[xv] = "-Dxv=enabled,-Dxv=disabled,libxv"
+PACKAGECONFIG[opengl] = "-Dgl=enabled,-Dgl=disabled,virtual/libgl"
+PACKAGECONFIG[egl] = "-Degl=enabled,-Degl=disabled,virtual/egl"
+PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm"
+PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/libgbm"
+PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,luajit"
+PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive"
+PACKAGECONFIG[lcms2] = "-Dlcms2=enabled,-Dlcms2=disabled,lcms"
+PACKAGECONFIG[libmpv] = "-Dlibmpv=true,-Dlibmpv=false"
+PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack"
+PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
+PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
+PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva"
+PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-headers"
+PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau nv-codec-headers"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon"
+
+python __anonymous() {
+    packageconfig = (d.getVar("PACKAGECONFIG") or "").split()
+    extras = []
+    if "x11" in packageconfig and "opengl" in packageconfig:
+        extras.append(" -Dgl-x11=enabled")
+    if "x11" in packageconfig and "egl" in packageconfig:
+        extras.append(" -Degl-x11=enabled")
+    if "egl" in packageconfig and "drm" in packageconfig:
+        extras.append(" -Degl-drm=enabled")
+    if "vaapi" in packageconfig and "x11" in packageconfig:
+        extras.append(" -Dvaapi-x11=enabled")
+    if "vaapi" in packageconfig and "drm" in packageconfig:
+        extras.append(" -Dvaapi-drm=enabled")
+    if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig:
+        extras.append(" -Dvdpau-gl-x11=enabled")
+    if "wayland" in packageconfig and "opengl" in packageconfig:
+        extras.append(" -Degl-wayland=enabled")
+    if "wayland" in packageconfig and "vaapi" in packageconfig:
+        extras.append(" -Dvaapi-wayland=enabled")
+    if extras:
+        d.appendVar("EXTRA_OEMESON", "".join(extras))
+}
+
+#SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}"
+
+EXTRA_OEMESON = " \
+    -Dmanpage-build=disabled \
+    -Dlibbluray=disabled \
+    -Ddvdnav=disabled \
+    -Dcdda=disabled \
+    -Duchardet=disabled \
+    -Drubberband=disabled \
+    -Dvapoursynth=disabled \
+    -Dshaderc=disabled \
+"
+
+do_configure:append() {
+    sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h
+}
+
+FILES:${PN} += "${datadir}"
+EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}"
diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb
index 012fc3a94d..29500bdb94 100644
--- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb
+++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb
@@ -14,7 +14,7 @@ inherit autotools features_check perlnative pkgconfig
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz"
+SRC_URI = "http://www.freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz"
 SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-pavucontrol-remove-canberra-gtk-support.patch', '', d)}"
 
 SRC_URI[sha256sum] = "ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a"
diff --git a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
index 87320a98e8..ed9f561a5e 100644
--- a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
+++ b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
@@ -11,6 +11,5 @@ inherit autotools gettext
 
 DEPENDS += "glib-2.0-native"
 
-SRC_URI = "http://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "d7387912cfd275282d1ec94483cb2f62"
+SRC_URI = "https://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2"
 SRC_URI[sha256sum] = "cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14"
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch
deleted file mode 100644
index 64c01e4977..0000000000
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 502c0302827cec3d2b2a69fb25189646685ef2ff Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <festevam@denx.de>
-Date: Fri, 12 Jan 2024 00:17:14 -0300
-Subject: [PATCH] keytable: meson: Restrict the installation of
- 50-rc_keymap.conf
-
-Currently, meson tries to install 50-rc_keymap.conf even if systemd
-is not used.
-
-Commit 01f2c6c58e6f ("keytable: restrict installation of 50-rc_keymap.conf"),
-only allowed 50-rc_keymap.conf to be installed when both BPF and systemd
-were used.
-
-Apply the same logic in meson to fix the problem.
-
-Signed-off-by: Fabio Estevam <festevam@denx.de>
-Signed-off-by: Sean Young <sean@mess.org>
-Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=a21924ec424c4744af6f2a794e0677eba35dd168]
----
- utils/keytable/meson.build | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build
-index 4130a4bea514..76ce329eae8e 100644
---- a/utils/keytable/meson.build
-+++ b/utils/keytable/meson.build
-@@ -69,6 +69,8 @@ ir_keytable_udev_rules = files(
- install_data(ir_keytable_udev_rules,
-              install_dir : ir_keytable_system_dir / 'rules.d')
-
-+if ir_bpf_enabled
-+if dep_systemd.found()
- if have_udevdsyscallfilter
-     ir_keytable_systemd_files = files(
-         '50-rc_keymap.conf',
-@@ -76,6 +78,8 @@ if have_udevdsyscallfilter
-     install_data(ir_keytable_systemd_files,
-                  install_dir : systemd_systemdir / 'systemd-udevd.service.d')
- endif
-+endif
-+endif
-
- # Install non-existing directory to create empty directory structure
- # See: https://github.com/mesonbuild/meson/issues/2904
---
-2.34.1
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch
new file mode 100644
index 0000000000..6c946d8c48
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch
@@ -0,0 +1,78 @@
+From 3867fcfa4389c7fa271705f1fd1d4bfb74bc1bd1 Mon Sep 17 00:00:00 2001
+From: Neel Gandhi <neel.gandhi@amd.com>
+Date: Wed, 5 Jun 2024 13:51:36 +0530
+Subject: [PATCH] media-ctl: Install media-ctl header and library files
+
+Install mediactl and v4l2subdev header and library
+files, which may be required by 3rd party applications
+to populate and control v4l2subdev device node tree
+
+Install of these files was removed in upstream commit
+0911dce53b08b0df3066be2c75f67e8a314d8729.
+
+Upstream-Status: Denied
+
+v4l-utils maintainers do not promise a stable API for this library, and
+do not currently have the time to do so. So exporting the API in this
+way is fine, as long as we understand that it will change and users of
+the API will need to adapt over time.
+
+Signed-off-by: Neel Gandhi <neel.gandhi@amd.com>
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ utils/media-ctl/meson.build | 28 +++++++++++++++++++++-------
+ 1 file changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build
+index 3a7b0c9a..40669b4c 100644
+--- a/utils/media-ctl/meson.build
++++ b/utils/media-ctl/meson.build
+@@ -3,14 +3,24 @@ libmediactl_sources = files(
+     'mediactl-priv.h',
+ )
+ 
++libmediactl_api = files(
++    'mediactl.h',
++    'v4l2subdev.h',
++)
++
++install_headers(libmediactl_api, subdir: 'mediactl')
++
+ libmediactl_deps = [
+     dep_libudev,
+ ]
+ 
+-libmediactl = static_library('mediactl',
+-                             libmediactl_sources,
+-                             dependencies : libmediactl_deps,
+-                             include_directories : v4l2_utils_incdir)
++libmediactl = library('mediactl',
++                      libmediactl_sources,
++                      soversion: '0',
++                      version: '0.0.0',
++                      install : true,
++                      dependencies : libmediactl_deps,
++                      include_directories : v4l2_utils_incdir)
+ 
+ dep_libmediactl = declare_dependency(link_with : libmediactl)
+ 
+@@ -18,9 +28,13 @@ libv4l2subdev_sources = files('libv4l2subdev.c')
+ libv4l2subdev_sources += media_bus_format_names_h
+ libv4l2subdev_sources += media_bus_format_codes_h
+ 
+-libv4l2subdev = static_library('v4l2subdev',
+-                               libv4l2subdev_sources,
+-                               include_directories : v4l2_utils_incdir)
++libv4l2subdev = library('v4l2subdev',
++                        libv4l2subdev_sources,
++                        soversion: '0',
++                        version: '0.0.0',
++                        install : true,
++                        dependencies : dep_libmediactl,
++                        include_directories : v4l2_utils_incdir)
+ 
+ dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev)
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
new file mode 100644
index 0000000000..8a009ae806
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
@@ -0,0 +1,49 @@
+From a422ddf7f8805d34ff1fbb46d335993c9cd05ead Mon Sep 17 00:00:00 2001
+From: Einar Jon Gunnarsson <tolvupostur@gmail.com>
+Date: Fri, 10 May 2024 11:56:17 +0200
+Subject: [PATCH] media-ctl: Install media-ctl pkg-config files
+
+libv4l2subdev/libmediactl can not be used in projects without the
+pkg-config files. This adds them as well.
+
+Upstream-Status: Denied
+
+This is an add-on to the previous patch:
+0001-media-ctl-Install-media-ctl-header-and-library-files.patch
+so same restrictions apply.
+
+Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
+---
+ utils/media-ctl/meson.build | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build
+index 40669b4c..6feba1af 100644
+--- a/utils/media-ctl/meson.build
++++ b/utils/media-ctl/meson.build
+@@ -38,6 +38,12 @@ libv4l2subdev = library('v4l2subdev',
+ 
+ dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev)
+ 
++pkg.generate(
++      libv4l2subdev,
++      name : 'libv4l2subdev',
++      version : meson.project_version(),
++      description : 'v4l2 subdev library')
++
+ media_ctl_sources = files(
+     'media-ctl.c',
+     'options.c',
+@@ -55,3 +61,9 @@ media_ctl = executable('media-ctl',
+                        dependencies : media_ctl_deps,
+                        install : true,
+                        include_directories : v4l2_utils_incdir)
++
++pkg.generate(
++     libmediactl,
++     name : 'libmediactl',
++     version : meson.project_version(),
++     description : 'v4l2 mediactl library')
+-- 
+2.43.5
+
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb
index 52759ef18e..0a3b5d28b6 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb
@@ -26,15 +26,15 @@ PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled"
 PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c"
 
 SRC_URI = "\
-    git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \
-    file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \
+    git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.28 \
+    file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \
+    file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \
 "
 
-SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1"
+SRCREV = "fc15e229d9d337e46d730f00647821adbbd58548"
 
-PV .= "+git"
 
-S = "${WORKDIR}/git"
+UPSTREAM_CHECK_GITTAGREGEX = "v4l-utils-(?P<pver>\d+(\.\d+)+)"
 
 EXTRA_OEMESON = "-Dudevdir=${base_libdir}/udev -Dv4l2-compliance-32=false -Dv4l2-ctl-32=false"
 
diff --git a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb
index 3069528301..87dc7a7be6 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb
@@ -2,23 +2,13 @@ SUMMARY = "Yet Another V4L2 Test Application"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
 
-SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master \
+SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master;protocol=https \
           "
-SRCREV = "65f740aa1758531fd810339bc1b7d1d33666e28a"
+SRCREV = "52c975e5542504ac10bed8b1d68df5c75951d202"
 
 PV = "0.0"
-S = "${WORKDIR}/git"
-
-EXTRA_OEMAKE = "-e MAKEFLAGS="
-
-# The yavta sources include copies of the headers required to build in the
-# include directory.  The Makefile uses CFLAGS to include these, but since
-# we override the CFLAGS then we need to add this include path back in.
-CFLAGS += "-I${S}/include"
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 yavta ${D}${bindir}
-}
 
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
 
+inherit meson
diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb
index 7384d2892f..651fbc4192 100644
--- a/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb
+++ b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https \
 
 SRCREV = "e03e8e29dc618e08e7baba9636e57ba1254874ce"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig lib_package
 
diff --git a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
index bd3d697885..04c4804c05 100644
--- a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
+++ b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
@@ -1,4 +1,4 @@
-From 1bbbf27a23c91dcc271b773a97153063461b986d Mon Sep 17 00:00:00 2001
+From c71898649e300d7e5700cd247d7ae994c7faa406 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 16 Aug 2011 16:04:35 +0200
 Subject: [PATCH] Upstream: not yet
@@ -11,10 +11,10 @@ Upstream-Status: Pending
  1 file changed, 16 insertions(+), 4 deletions(-)
 
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 93643f3de..e84198200 100644
+index 8220d5cbe..923daf8bc 100644
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
-@@ -692,6 +692,8 @@ process_common_cmdline() {
+@@ -699,6 +699,8 @@ process_common_cmdline() {
          ;;
        --prefix=*)
          prefix="${optval}"
@@ -23,7 +23,7 @@ index 93643f3de..e84198200 100644
          ;;
        --libdir=*)
          libdir="${optval}"
-@@ -721,13 +723,23 @@ process_cmdline() {
+@@ -728,13 +730,23 @@ process_cmdline() {
  }
  
  post_process_common_cmdline() {
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.14.1.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.15.2.bb
index f32c7842c3..a7cd76e0c7 100644
--- a/meta-oe/recipes-multimedia/webm/libvpx_1.14.1.bb
+++ b/meta-oe/recipes-multimedia/webm/libvpx_1.15.2.bb
@@ -7,12 +7,11 @@ LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4"
 
-SRCREV = "12f3a2ac603e8f10742105519e0cd03c3b8f71dd"
-SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \
+SRCREV = "d168454ecd099805c675d4a98c66f4891373302a"
+SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main;tag=v${PV} \
            file://libvpx-configure-support-blank-prefix.patch \
            "
 
-S = "${WORKDIR}/git"
 
 # ffmpeg links with this and fails
 # sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4'
diff --git a/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb b/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
index f900aca2d4..5023e4e842 100644
--- a/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
+++ b/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
@@ -1,4 +1,4 @@
-LICENSE= "MIT"
+LICENSE = "MIT"
 SUMMARY = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
 DEPENDS = "virtual/libx11 libxext"
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=db043791349ba57ad1169e1c92477cb6"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${BPN}/${BPN}_${PV}.tar.gz \
            file://auxdir.patch;striplevel=0"
-S = "${WORKDIR}/xpext-1.0"
+S = "${UNPACKDIR}/xpext-1.0"
 
 inherit autotools pkgconfig features_check
 # depends on virtual/libx11
@@ -16,5 +16,4 @@ REQUIRED_DISTRO_FEATURES = "x11"
 # Remove runtime dependency on empty package ${PN}
 RDEPENDS:${PN}-dev = ""
 
-SRC_URI[md5sum] = "1b0cb67b6f2bd7c4abef17648b062896"
 SRC_URI[sha256sum] = "a3b06f5188fd9effd0799ae31352b3cd65cb913b964e2c1a923ffa9d3c08abbe"
diff --git a/meta-oe/recipes-multimedia/xsp/xsp/0001-fix-incompatible-pointer-types-build-error-in-gcc-15.patch b/meta-oe/recipes-multimedia/xsp/xsp/0001-fix-incompatible-pointer-types-build-error-in-gcc-15.patch
new file mode 100644
index 0000000000..ffb1089423
--- /dev/null
+++ b/meta-oe/recipes-multimedia/xsp/xsp/0001-fix-incompatible-pointer-types-build-error-in-gcc-15.patch
@@ -0,0 +1,40 @@
+From e001efa4a50e43fca5d8918ee05a3bc37180262d Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Thu, 24 Apr 2025 18:10:25 +0900
+Subject: [PATCH] fix incompatible-pointer-types build error in gcc 15
+
+../Xsp/Xsp.c:37:9: error: initialization of 'int (*)(Display *, XExtCodes *)' from incompatible pointer type 'int (*)(void)' [-Wincompatible-pointer-types]
+   37 |         XSPCloseDisplay,                    /* close_display */
+      |         ^~~~~~~~~~~~~~~
+../Xsp/Xsp.c:37:9: note: (near initialization for 'xsp_extension_hooks.close_display')
+../Xsp/Xsp.c:23:12: note: 'XSPCloseDisplay' declared here
+   23 | static int XSPCloseDisplay();
+      |            ^~~~~~~~~~~~~~~
+In file included from ../Xsp/Xsp.c:6:
+../Xsp/Xsp.c:49:37: error: conflicting types for 'XSPCloseDisplay'; have 'int(Display *, XExtCodes *)'
+   49 | static XEXT_GENERATE_CLOSE_DISPLAY (XSPCloseDisplay, xsp_info)
+      |                                     ^~~~~~~~~~~~~~~
+../Xsp/Xsp.c:36:9: error: 'XSPCloseDisplay' undeclared here (not in a function); did you mean 'XCloseDisplay'?
+   36 |         XSPCloseDisplay,                    /* close_display */
+      |         ^~~~~~~~~~~~~~~
+      |         XCloseDisplay
+
+Upstream-Status: Inactive-Upstream [seems to be unmaintained]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ Xsp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Xsp.c b/Xsp.c
+index 28e2d6e..9bcc958 100644
+--- a/Xsp.c
++++ b/Xsp.c
+@@ -20,7 +20,7 @@ static XExtensionInfo _xsp_info_data;
+ static XExtensionInfo *xsp_info = &_xsp_info_data;
+ static /* const */ char *xsp_extension_name = XSP_NAME;
+ 
+-static int XSPCloseDisplay();
++static XEXT_CLOSE_DISPLAY_PROTO(XSPCloseDisplay);
+ static Bool XSPWireToEvent(Display *dpy, XEvent *event, xEvent *wire);
+ 
+ static Status XSPEventToWire(Display *dpy, XEvent *event, xEvent *wire);
diff --git a/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb b/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
index c611da48c0..5350cf1c65 100644
--- a/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
+++ b/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
@@ -1,15 +1,18 @@
-LICENSE= "MIT"
+LICENSE =  "MIT"
 SUMMARY = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
 DEPENDS = "virtual/libx11 libxext xpext"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea2bda168c508c7cd8afa567b2fcc549"
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${BPN}_${PV}.tar.gz \
-           file://xsp-fix-pc.patch"
-S = "${WORKDIR}/Xsp"
+           file://xsp-fix-pc.patch \
+           file://0001-fix-incompatible-pointer-types-build-error-in-gcc-15.patch \
+"
+S = "${UNPACKDIR}/Xsp"
 
 inherit autotools pkgconfig features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[md5sum] = "2a0d8d02228d4cbd28b6e07bb7c17cf5"
 SRC_URI[sha256sum] = "8b722b952b64841d996c70c3278499886c81bb5012991beed5f66f4158418f59"
+
+CVE_STATUS[CVE-2006-2658] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different xsp package compared to the one which has the CVE issue."
diff --git a/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch b/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch
index 18e7185649..d2c0e4df67 100644
--- a/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch
+++ b/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] libgeoclue: don't try to use g-ir-scanner when introspection
   http://errors.yoctoproject.org/Errors/Details/702778/
   geoclue/2.7.0-r0/recipe-sysroot/usr/bin/g-ir-scanner-wrapper: line 5: g-ir-scanner: command not found
 
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
 Upstream-Status: Pending
 
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
  libgeoclue/meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.7.1.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.2.bb
index 9fcd1e6f1e..48b2535a03 100644
--- a/meta-oe/recipes-navigation/geoclue/geoclue_2.7.1.bb
+++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.2.bb
@@ -10,14 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6"
 
 DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native"
 
-inherit meson pkgconfig gtk-doc gobject-introspection vala useradd
+inherit meson pkgconfig gtk-doc gobject-introspection vala
 
-SRCREV = "8a24f60969d4c235d9918796c38a6a9c42e10131"
+SRCREV = "ab0a7a447ac037d5043aa04df3030796bf47d94d"
 SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;branch=master \
     file://0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch \
 "
 
-S = "${WORKDIR}/git"
 
 # Without this line, package is declared a library and named libgeoclue*
 AUTO_LIBNAME_PKGS = ""
@@ -36,17 +35,6 @@ EXTRA_OEMESON += " \
     -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \
 "
 
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd"
-
-do_install:append() {
-    if ${@bb.utils.contains('PACKAGECONFIG', 'modem-gps', 'true', 'false', d)}; then
-        # Fix up permissions on polkit rules.d to work with rpm4 constraints
-        chmod 700 ${D}/${datadir}/polkit-1/rules.d
-        chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
-    fi
-}
-
 FILES:${PN} += " \
     ${datadir}/dbus-1/system-services \
     ${datadir}/polkit-1/rules.d \
diff --git a/meta-oe/recipes-navigation/geos/geos_3.12.1.bb b/meta-oe/recipes-navigation/geos/geos_3.13.1.bb
index 461652a5ad..ba01968052 100644
--- a/meta-oe/recipes-navigation/geos/geos_3.12.1.bb
+++ b/meta-oe/recipes-navigation/geos/geos_3.13.1.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "d6ea7e492224b51193e8244fe3ec17c4d44d0777f3c32ca4fb171140549a0d03"
+SRC_URI[sha256sum] = "df2c50503295f325e7c8d7b783aca8ba4773919cde984193850cf9e361dfd28c"
 
 inherit cmake pkgconfig binconfig
 
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/fix-pps_strerror_r.patch b/meta-oe/recipes-navigation/gpsd/gpsd/fix-pps_strerror_r.patch
new file mode 100644
index 0000000000..8942b39524
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd/fix-pps_strerror_r.patch
@@ -0,0 +1,51 @@
+From c72a489e2eb13296c7b514b7341033114abf430a Mon Sep 17 00:00:00 2001
+From: Miroslav Lichvar <mlichvar@redhat.com>
+Date: Mon, 22 Apr 2024 11:31:24 +0200
+Subject: [PATCH 1/2] SConscript: provide variable names to MergeFlags
+
+If the scons MergeFlags() function is provided with a list of
+compiler/linker options, it needs to guess what options belong where. If
+it doesn't recognize an option, it is silently ignored. There are also
+ambiguous options that could be both in CFLAGS and LINKFLAGS (e.g. -spec).
+
+Provide MergeFlags() with a dict instead of list to avoid the guesswork
+in order to pass all options, even if some are not recognized by scons.
+Switch LDFLAGS to LINKFLAGS for better compatibility with existing
+scripts.
+
+Upstream-Status: Submitted [https://gitlab.com/gpsd/gpsd/-/merge_requests/406]
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+
+---
+ SConscript | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/SConscript b/SConscript
+index dab481654..ee90d87c4 100644
+--- a/SConscript
++++ b/SConscript
+@@ -585,8 +585,8 @@ env['SC_PYTHON'] = sys.executable  # Path to SCons Python
+ # explicitly quote them or (better yet) use the "=" form of GNU option
+ # settings.
+ #
+-# Scons also uses different internal names than most other build-systems.
+-# So we rely on MergeFlags/ParseFlags to do the right thing for us.
++# Scons also uses different internal names than most other build-systems,
++# e.g. it uses LINKFLAGS instead of LDFLAGS.
+ #
+ # scons uses gcc, or clang, to link. Thus LDFLAGS does not serve its
+ # traditional function of providing arguments to ln. LDFLAGS set in the
+@@ -618,7 +618,10 @@ for i in ["ARFLAGS",
+           "SHLINKFLAGS",
+           ]:
+     if i in os.environ:
+-        env.MergeFlags(Split(os.getenv(i)))
++        t = i
++        if t == "LDFLAGS":
++            t = "LINKFLAGS"
++        env.MergeFlags({t: Split(os.getenv(i))})
+ 
+ 
+ # Keep scan-build options in the environment
+-- 
+GitLab
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.25.bb
index ddea8ad2e3..0d5232c88c 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.25.bb
@@ -4,11 +4,14 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7a5d174db44ec45f9638b2c747806821"
 DEPENDS = "dbus ncurses python3 pps-tools"
 PROVIDES = "virtual/gpsd"
+BUGTRACKER = "https://gitlab.com/gpsd/gpsd/-/issues"
+HOMEPAGE = "https://gpsd.io/"
 
 SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
            file://gpsd.init \
+           file://fix-pps_strerror_r.patch \
            "
-SRC_URI[sha256sum] = "00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c"
+SRC_URI[sha256sum] = "b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2"
 
 inherit scons update-rc.d python3-dir python3native systemd update-alternatives pkgconfig
 
@@ -26,6 +29,7 @@ CLEANBROKEN = "1"
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} usb"
 PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez5"
 PACKAGECONFIG[qt] = "qt='yes' qt_versioned=5,qt='no',qtbase"
+PACKAGECONFIG[pyserial] = ""
 PACKAGECONFIG[usb] = "usb='true',usb='false',libusb1"
 EXTRA_OESCONS = " \
     sysroot=${STAGING_DIR_TARGET} \
@@ -79,7 +83,7 @@ do_install:append() {
     fi
 }
 
-PACKAGES =+ "libgps python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils gps-utils-python"
+PACKAGES =+ "libgps python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gpsd-snmp gps-utils gps-utils-python"
 
 RPROVIDES:${PN}-dbg += "python-pygps-dbg"
 
@@ -104,6 +108,9 @@ CONFFILES:gpsd-conf = "${sysconfdir}/default/gpsd.default"
 SUMMARY:gpsd-gpsctl = "Tool for tweaking GPS modes"
 FILES:gpsd-gpsctl = "${bindir}/gpsctl"
 
+SUMMARY:gpsd-snmp = "MIB for using SNMP with gpsd"
+FILES:gpsd-snmp = "${datadir}/snmp"
+
 SUMMARY:gps-utils = "Utils used for simulating, monitoring,... a GPS"
 FILES:gps-utils = "\
     ${bindir}/cgps         \
@@ -143,7 +150,7 @@ FILES:python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}
 RDEPENDS:python3-pygps = " \
     python3-core \
     python3-io \
-    python3-pyserial \
+    ${@bb.utils.contains('PACKAGECONFIG', 'pyserial', 'python3-pyserial', '', d)} \
     python3-threading \
     python3-terminal \
     gpsd \
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch
new file mode 100644
index 0000000000..daef7fab49
--- /dev/null
+++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch
@@ -0,0 +1,29 @@
+From 406e841b3e011e1090f23dba12b12cdd9ec4707e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 24 Aug 2024 15:19:35 -0700
+Subject: [PATCH] wfs: Cover xmlNanoHTTPCleanup with LIBXML_HTTP_ENABLED
+
+libxml2 has deprecated internal http support [1]
+
+[1] https://www.gaia-gis.it/fossil/libspatialite/tktview?name=7c452740fe
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/wfs/wfs_in.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/wfs/wfs_in.c b/src/wfs/wfs_in.c
+index 1cfe39d..41ad2ab 100644
+--- a/src/wfs/wfs_in.c
++++ b/src/wfs/wfs_in.c
+@@ -4638,7 +4638,9 @@ SPATIALITE_DECLARE void
+ reset_wfs_http_connection (void)
+ {
+ /* Resets the libxml2 "nano HTTP": useful when changing the HTTP_PROXY settings */
++#ifdef LIBXML_HTTP_ENABLED
+     xmlNanoHTTPCleanup ();
++#endif
+ }
+ 
+ #else /* LIBXML2 isn't enabled */
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch
deleted file mode 100644
index 6f1c165f58..0000000000
--- a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Pending
-
-diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac
---- libspatialite-5.0.1/configure.ac    2021-03-08 08:57:18.748858216 +0100
-+++ libspatialite-5.0.1-new/configure.ac        2021-03-08 08:57:18.751858215 +0100
-@@ -96,7 +96,7 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_LIBTOOL_WIN32_DLL
--AC_PROG_LIBTOOL
-+LT_INIT
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch
index de6e50a58d..4b381eda88 100644
--- a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch
+++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch
@@ -1,13 +1,13 @@
 Upstream-Status: Pending
 
-diff -rupN libspatialite-5.0.1/spatialite.pc.in libspatialite-5.0.1-new/spatialite.pc.in
---- libspatialite-5.0.1/spatialite.pc.in        2021-02-07 16:53:46.000000000 +0100
-+++ libspatialite-5.0.1-new/spatialite.pc.in    2021-02-10 09:54:09.647552994 +0100
-@@ -8,5 +8,6 @@ includedir=@includedir@
+--- a/spatialite.pc.in
++++ b/spatialite.pc.in
+@@ -8,5 +8,7 @@ includedir=@includedir@
  Name: spatialite
  Description: Spatial SQL database engine based on SQLite
  Version: @VERSION@
--Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ -lm
-+Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ -lm
+-Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm
++Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm
 +Libs: -L${libdir} -lspatialite
++
  Cflags: -I${includedir}
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb b/meta-oe/recipes-navigation/libspatialite/libspatialite_5.1.0.bb
index f46b1083e1..0fe0bb1197 100644
--- a/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb
+++ b/meta-oe/recipes-navigation/libspatialite/libspatialite_5.1.0.bb
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e"
 
 SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \
            file://libspatialite_geos.patch \
-           file://libspatialite_macros.patch \
            file://libspatialite_pkgconfig.patch \
+           file://0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch \
 "
-
-SRC_URI[sha256sum] = "eecbc94311c78012d059ebc0fae86ea5ef6eecb13303e6e82b3753c1b3409e98"
+SRC_URI[sha256sum] = "43be2dd349daffe016dd1400c5d11285828c22fea35ca5109f21f3ed50605080"
 
 inherit autotools-brokensep pkgconfig
 
diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-configure-prototypes.patch b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-configure-prototypes.patch
new file mode 100644
index 0000000000..e1b7c6e8d5
--- /dev/null
+++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-configure-prototypes.patch
@@ -0,0 +1,39 @@
+From 3982a8925e15ea16df49891a700e7f9d9a10541c Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 9 Apr 2025 11:46:36 +0900
+Subject: [PATCH 1/3] configure prototypes
+
+  * Set to use function prototypes for ANSI_C
+  If PROTOTYPES is set in md5global.h, it uses PROTO_LIST(list) list instead of PROTO_LIST(list) ()
+  to provide parameterized prototyping.
+  Therefore, at the configure.ac stage, when using ANSI_C, PROTOTYPES should be defined.
+
+  * to fix the build error with gcc-15
+    Even though I added this configuration to fix the error, the error shown in the following patch still occurs.
+../../git/lib/md5.c:139:8: error: too many arguments to function 'MD5_memcpy'; expected 0, have 3
+  139 |        MD5_memcpy
+      |        ^~~~~~~~~~
+  140 |        ((POINTER)&context->buffer[index], (POINTER)input, partLen); MD5Transform
+      |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../git/lib/md5.c:62:13: note: declared here
+   62 | static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int));
+      |             ^~~~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/cyrusimap/cyrus-sasl/pull/873]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 2a0cf878..657e178b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,6 +88,7 @@ AC_ARG_ENABLE(obsolete_digest_attr,
+               enable_obsolete_digest_attr=yes)
+ 
+ AC_PROG_CC
++AC_C_PROTOTYPES
+ AX_PROG_CC_FOR_BUILD
+ AC_PROG_CPP
+ AC_PROG_AWK
diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0002-Fix-incompatible-pointer-types-error-with-gcc-15.patch b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0002-Fix-incompatible-pointer-types-error-with-gcc-15.patch
new file mode 100644
index 0000000000..df66ab86d1
--- /dev/null
+++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0002-Fix-incompatible-pointer-types-error-with-gcc-15.patch
@@ -0,0 +1,122 @@
+From 8ad219c21914ee9815c915e075052805efff9757 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 9 Apr 2025 15:42:13 +0900
+Subject: [PATCH 2/3] Fix incompatible-pointer-types error with gcc-15
+
+  * Fix incompatible-pointer-types error with gcc-15
+../../git/saslauthd/md5.c:400:14: error: passing argument 1 of 'MD5_memset' from incompatible pointer type [-Wincompatible-pointer-types]
+  400 |   MD5_memset(&k_ipad, 0, sizeof(k_ipad));
+      |              ^~~~~~~
+      |              |
+      |              unsigned char (*)[65]
+../../git/saslauthd/md5.c:335:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'unsigned char (*)[65]'
+  335 | POINTER output;
+      |         ^~~~~~
+In file included from ../../git/saslauthd/md5.c:29:
+../include/md5global.h:16:24: note: 'POINTER' declared here
+   16 | typedef unsigned char *POINTER;
+      |                        ^~~~~~~
+../../git/saslauthd/md5.c:401:14: error: passing argument 1 of 'MD5_memset' from incompatible pointer type [-Wincompatible-pointer-types]
+  401 |   MD5_memset(&k_opad, 0, sizeof(k_opad));
+      |              ^~~~~~~
+      |              |
+      |              unsigned char (*)[65]
+../../git/saslauthd/md5.c:335:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'unsigned char (*)[65]'
+  335 | POINTER output;
+      |         ^~~~~~
+../include/md5global.h:16:24: note: 'POINTER' declared here
+   16 | typedef unsigned char *POINTER;
+      |                        ^~~~~~~
+../../git/saslauthd/md5.c:402:14: error: passing argument 1 of 'MD5_memset' from incompatible pointer type [-Wincompatible-pointer-types]
+  402 |   MD5_memset(&tk, 0, sizeof(tk));
+      |              ^~~
+      |              |
+      |              unsigned char (*)[16]
+../../git/saslauthd/md5.c:335:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'unsigned char (*)[16]'
+  335 | POINTER output;
+      |         ^~~~~~
+../include/md5global.h:16:24: note: 'POINTER' declared here
+   16 | typedef unsigned char *POINTER;
+      |                        ^~~~~~~
+../../git/saslauthd/md5.c: In function '_saslauthd_hmac_md5_precalc':
+../../git/saslauthd/md5.c:427:14: error: passing argument 1 of 'MD5_memset' from incompatible pointer type [-Wincompatible-pointer-types]
+  427 |   MD5_memset(&hmac, 0, sizeof(hmac));
+      |              ^~~~~
+      |              |
+      |              HMAC_MD5_CTX * {aka struct HMAC_MD5_CTX_s *}
+../../git/saslauthd/md5.c:335:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'HMAC_MD5_CTX *' {aka 'struct HMAC_MD5_CTX_s *'}
+  335 | POINTER output;
+      |         ^~~~~~
+../include/md5global.h:16:24: note: 'POINTER' declared here
+   16 | typedef unsigned char *POINTER;
+      |                        ^~~~~~~
+../../git/saslauthd/md5.c: In function '_saslauthd_hmac_md5_import':
+../../git/saslauthd/md5.c:435:14: error: passing argument 1 of 'MD5_memset' from incompatible pointer type [-Wincompatible-pointer-types]
+  435 |   MD5_memset(hmac, 0, sizeof(HMAC_MD5_CTX));
+      |              ^~~~
+      |              |
+      |              HMAC_MD5_CTX * {aka struct HMAC_MD5_CTX_s *}
+../../git/saslauthd/md5.c:335:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'HMAC_MD5_CTX *' {aka 'struct HMAC_MD5_CTX_s *'}
+  335 | POINTER output;
+      |         ^~~~~~
+../include/md5global.h:16:24: note: 'POINTER' declared here
+   16 | typedef unsigned char *POINTER;
+      |                        ^~~~~~~
+../../git/saslauthd/md5.c: In function '_saslauthd_hmac_md5':
+../../git/saslauthd/md5.c:455:6: warning: old-style function definition [-Wold-style-definition]
+  455 | void _saslauthd_hmac_md5(text, text_len, key, key_len, digest)
+      |      ^~~~~~~~~~~~~~~~~~~
+../../git/saslauthd/md5.c:499:23: warning: passing argument 2 of 'MD5_memcpy' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  499 |   MD5_memcpy( k_ipad, key, key_len);
+      |                       ^~~
+../../git/saslauthd/md5.c:322:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'const unsigned char *'
+  322 | POINTER input;
+      |         ^~~~~
+../../git/saslauthd/md5.c:500:23: warning: passing argument 2 of 'MD5_memcpy' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+  500 |   MD5_memcpy( k_opad, key, key_len);
+      |                       ^~~
+../../git/saslauthd/md5.c:322:9: note: expected 'POINTER' {aka 'unsigned char *'} but argument is of type 'const unsigned char *'
+  322 | POINTER input;
+      |         ^~~~~
+
+Upstream-Status: Submitted [https://github.com/cyrusimap/cyrus-sasl/pull/873]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ saslauthd/md5.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/saslauthd/md5.c b/saslauthd/md5.c
+index d38425d2..c16922d8 100644
+--- a/saslauthd/md5.c
++++ b/saslauthd/md5.c
+@@ -397,9 +397,9 @@ void _saslauthd_hmac_md5_init(HMAC_MD5_CTX *hmac,
+   _saslauthd_MD5Update(&hmac->octx, k_opad, 64);     /* apply outer pad */
+ 
+   /* scrub the pads and key context (if used) */
+-  MD5_memset(&k_ipad, 0, sizeof(k_ipad));
+-  MD5_memset(&k_opad, 0, sizeof(k_opad));
+-  MD5_memset(&tk, 0, sizeof(tk));
++  MD5_memset(k_ipad, 0, sizeof(k_ipad));
++  MD5_memset(k_opad, 0, sizeof(k_opad));
++  MD5_memset(tk, 0, sizeof(tk));
+ 
+   /* and we're done. */
+ }
+@@ -424,7 +424,7 @@ void _saslauthd_hmac_md5_precalc(HMAC_MD5_STATE *state,
+     state->istate[lupe] = htonl(hmac.ictx.state[lupe]);
+     state->ostate[lupe] = htonl(hmac.octx.state[lupe]);
+   }
+-  MD5_memset(&hmac, 0, sizeof(hmac));
++  MD5_memset((POINTER)&hmac, 0, sizeof(hmac));
+ }
+ 
+ 
+@@ -432,7 +432,7 @@ void _saslauthd_hmac_md5_import(HMAC_MD5_CTX *hmac,
+                                HMAC_MD5_STATE *state)
+ {
+   unsigned lupe;
+-  MD5_memset(hmac, 0, sizeof(HMAC_MD5_CTX));
++  MD5_memset((POINTER)hmac, 0, sizeof(HMAC_MD5_CTX));
+   for (lupe = 0; lupe < 4; lupe++) {
+     hmac->ictx.state[lupe] = ntohl(state->istate[lupe]);
+     hmac->octx.state[lupe] = ntohl(state->ostate[lupe]);
diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0003-Add-compatibility-for-gcc-15-869.patch b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0003-Add-compatibility-for-gcc-15-869.patch
new file mode 100644
index 0000000000..924d39d301
--- /dev/null
+++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0003-Add-compatibility-for-gcc-15-869.patch
@@ -0,0 +1,530 @@
+From dcd29d8e5ee427b68f34fdede007fa4787caf464 Mon Sep 17 00:00:00 2001
+From: Rob Crittenden <rcritten@redhat.com>
+Date: Fri, 28 Feb 2025 12:07:25 -0500
+Subject: [PATCH 3/3] Add compatibility for gcc 15 (#869)
+
+Fedora 42 is going to use gcc 15 which changes some warnings into
+errors. Address the issues raised.
+
+The issues addressed include:
+- The RETURN macro is defined differently in two places. Rename one.
+- Both atexit and the sigint and sigterm actions call server_exit().
+  The function arguments diff. Introduce a new generic signal handler
+  to call server_exit() for sigint and sigterm signals.
+
+Signed-off-by: Rob Crittenden <rcritten@redhat.com>
+
+Upstream-Status: Backport [https://github.com/cyrusimap/cyrus-sasl/pull/869]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ lib/auxprop.c              |  2 +-
+ lib/canonusr.c             |  6 +++---
+ lib/client.c               |  6 +++---
+ lib/common.c               | 40 +++++++++++++++++++-------------------
+ lib/saslint.h              |  8 ++++----
+ lib/server.c               | 32 +++++++++++++++---------------
+ saslauthd/auth_sasldb.c    |  4 +---
+ saslauthd/saslauthd-main.c | 12 ++++++++----
+ saslauthd/saslauthd-main.h |  5 +++--
+ 9 files changed, 59 insertions(+), 56 deletions(-)
+
+diff --git a/lib/auxprop.c b/lib/auxprop.c
+index 1b0162db..0d465a2d 100644
+--- a/lib/auxprop.c
++++ b/lib/auxprop.c
+@@ -780,7 +780,7 @@ int sasl_auxprop_request(sasl_conn_t *conn, const char **propnames)
+     }
+     
+     result = prop_request(sconn->sparams->propctx, propnames);
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ }
+ 
+ 
+diff --git a/lib/canonusr.c b/lib/canonusr.c
+index 66f7e112..654a72ed 100644
+--- a/lib/canonusr.c
++++ b/lib/canonusr.c
+@@ -192,7 +192,7 @@ int _sasl_canon_user(sasl_conn_t *conn,
+        oparams->user = conn->user_buf;
+     }
+ 
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ }
+ 
+ /* Lookup all properties for authentication and/or authorization identity. */
+@@ -256,7 +256,7 @@ static int _sasl_auxprop_lookup_user_props (sasl_conn_t *conn,
+     }
+ #endif
+ 
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ }
+ 
+ /* default behavior:
+@@ -285,7 +285,7 @@ int _sasl_canon_user_lookup (sasl_conn_t *conn,
+                                                  oparams);
+     }
+ 
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ }
+ 
+ void _sasl_canonuser_free() 
+diff --git a/lib/client.c b/lib/client.c
+index 3784bb0e..281285b8 100644
+--- a/lib/client.c
++++ b/lib/client.c
+@@ -435,7 +435,7 @@ int sasl_client_new(const char *service,
+                           &client_idle, serverFQDN,
+                           iplocalport, ipremoteport,
+                           prompt_supp, &global_callbacks_client);
+-  if (result != SASL_OK) RETURN(*pconn, result);
++  if (result != SASL_OK) RETURN_VAL(*pconn, result);
+   
+   utils = _sasl_alloc_utils(*pconn, &global_callbacks_client);
+   if (utils == NULL) {
+@@ -879,7 +879,7 @@ int sasl_client_start(sasl_conn_t *conn,
+  done:
+     if (ordered_mechs != NULL)
+        c_conn->cparams->utils->free(ordered_mechs);
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ }
+ 
+ /* do a single authentication step.
+@@ -952,7 +952,7 @@ int sasl_client_step(sasl_conn_t *conn,
+       }
+   }  
+ 
+-  RETURN(conn,result);
++  RETURN_VAL(conn,result);
+ }
+ 
+ /* returns the length of all the mechanisms
+diff --git a/lib/common.c b/lib/common.c
+index d9104c89..e9d58d1b 100644
+--- a/lib/common.c
++++ b/lib/common.c
+@@ -303,7 +303,7 @@ int sasl_encode(sasl_conn_t *conn, const char *input,
+     
+     result = sasl_encodev(conn, &tmp, 1, output, outputlen);
+ 
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ }
+ 
+ /* Internal function that doesn't do any verification */
+@@ -389,7 +389,7 @@ _sasl_encodev (sasl_conn_t *conn,
+ 
+     (*p_num_packets)++;
+ 
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ }
+ 
+ /* security-encode an iovec */
+@@ -434,7 +434,7 @@ int sasl_encodev(sasl_conn_t *conn,
+        *output = conn->encode_buf->data;
+        *outputlen = (unsigned) conn->encode_buf->curlen;
+ 
+-        RETURN(conn, result);
++        RETURN_VAL(conn, result);
+     }
+ 
+     /* This might be better to check on a per-plugin basis, but I think
+@@ -592,7 +592,7 @@ cleanup:
+         sasl_FREE(cur_invec);
+     }
+ 
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ }
+  
+ /* output is only valid until next call to sasl_decode */
+@@ -609,7 +609,7 @@ int sasl_decode(sasl_conn_t *conn,
+     if(!conn->props.maxbufsize) {
+        sasl_seterror(conn, 0,
+                      "called sasl_decode with application that does not support security layers");
+-       RETURN(conn, SASL_TOOWEAK);
++       RETURN_VAL(conn, SASL_TOOWEAK);
+     }
+ 
+     if(conn->oparams.decode == NULL)
+@@ -623,7 +623,7 @@ int sasl_decode(sasl_conn_t *conn,
+        if(inputlen > conn->props.maxbufsize) {
+            sasl_seterror(conn, 0,
+                          "input too large for default sasl_decode");
+-           RETURN(conn,SASL_BUFOVER);
++           RETURN_VAL(conn,SASL_BUFOVER);
+        }
+ 
+        if(!conn->decode_buf)
+@@ -644,7 +644,7 @@ int sasl_decode(sasl_conn_t *conn,
+        /* NULL an empty buffer (for misbehaved applications) */
+        if (*outputlen == 0) *output = NULL;
+ 
+-        RETURN(conn, result);
++        RETURN_VAL(conn, result);
+     }
+ 
+     INTERROR(conn, SASL_FAIL);
+@@ -738,11 +738,11 @@ int _sasl_conn_init(sasl_conn_t *conn,
+ 
+   result = sasl_setprop(conn, SASL_IPLOCALPORT, iplocalport);
+   if(result != SASL_OK)
+-      RETURN(conn, result);
++      RETURN_VAL(conn, result);
+   
+   result = sasl_setprop(conn, SASL_IPREMOTEPORT, ipremoteport);
+   if(result != SASL_OK)
+-      RETURN(conn, result);
++      RETURN_VAL(conn, result);
+   
+   conn->encode_buf = NULL;
+   conn->context = NULL;
+@@ -787,7 +787,7 @@ int _sasl_conn_init(sasl_conn_t *conn,
+ 
+   if(result != SASL_OK) MEMERROR( conn );
+ 
+-  RETURN(conn, SASL_OK);
++  RETURN_VAL(conn, SASL_OK);
+ }
+ 
+ int _sasl_common_init(sasl_global_callbacks_t *global_callbacks)
+@@ -1068,11 +1068,11 @@ int sasl_getprop(sasl_conn_t *conn, int propnum, const void **pvalue)
+   } else if(result == SASL_NOTDONE) {
+       sasl_seterror(conn, SASL_NOLOG,
+                    "Information that was requested is not yet available.");
+-      RETURN(conn, result);
++      RETURN_VAL(conn, result);
+   } else if(result != SASL_OK) {
+       INTERROR(conn, result);
+   } else
+-      RETURN(conn, result); 
++      RETURN_VAL(conn, result);
+ }
+ 
+ /* set property in SASL connection state
+@@ -1146,7 +1146,7 @@ int sasl_setprop(sasl_conn_t *conn, int propnum, const void *value)
+       if(props->maxbufsize == 0 && props->min_ssf != 0) {
+          sasl_seterror(conn, 0,
+                        "Attempt to disable security layers (maxoutbuf == 0) with min_ssf > 0");
+-         RETURN(conn, SASL_TOOWEAK);
++         RETURN_VAL(conn, SASL_TOOWEAK);
+       }
+ 
+       conn->props = *props;
+@@ -1168,7 +1168,7 @@ int sasl_setprop(sasl_conn_t *conn, int propnum, const void *value)
+       } else if (_sasl_ipfromstring(ipremoteport, NULL, 0)
+                 != SASL_OK) {
+          sasl_seterror(conn, 0, "Bad IPREMOTEPORT value");
+-         RETURN(conn, SASL_BADPARAM);
++         RETURN_VAL(conn, SASL_BADPARAM);
+       } else {
+          strcpy(conn->ipremoteport, ipremoteport);
+          conn->got_ip_remote = 1;
+@@ -1209,7 +1209,7 @@ int sasl_setprop(sasl_conn_t *conn, int propnum, const void *value)
+       } else if (_sasl_ipfromstring(iplocalport, NULL, 0)
+                 != SASL_OK) {
+          sasl_seterror(conn, 0, "Bad IPLOCALPORT value");
+-         RETURN(conn, SASL_BADPARAM);
++         RETURN_VAL(conn, SASL_BADPARAM);
+       } else {
+          strcpy(conn->iplocalport, iplocalport);
+          conn->got_ip_local = 1;
+@@ -1302,7 +1302,7 @@ int sasl_setprop(sasl_conn_t *conn, int propnum, const void *value)
+       result = SASL_BADPARAM;
+   }
+   
+-  RETURN(conn, result);
++  RETURN_VAL(conn, result);
+ }
+ 
+ /* this is apparently no longer a user function */
+@@ -1708,7 +1708,7 @@ _sasl_proxy_policy(sasl_conn_t *conn,
+        (memcmp(auth_identity, requested_user, rlen) != 0)) {
+        sasl_seterror(conn, 0,
+                      "Requested identity not authenticated identity");
+-       RETURN(conn, SASL_BADAUTH);
++       RETURN_VAL(conn, SASL_BADAUTH);
+     }
+ 
+     return SASL_OK;
+@@ -1809,7 +1809,7 @@ int _sasl_getcallback(sasl_conn_t * conn,
+   *pproc = NULL;
+   *pcontext = NULL;
+   sasl_seterror(conn, SASL_NOLOG, "Unable to find a callback: %d", callbackid);
+-  RETURN(conn,SASL_FAIL);
++  RETURN_VAL(conn,SASL_FAIL);
+ }
+ 
+ 
+@@ -2405,10 +2405,10 @@ int sasl_listmech(sasl_conn_t *conn,
+     if(!conn) {
+        return SASL_BADPARAM;
+     } else if(conn->type == SASL_CONN_SERVER) {
+-       RETURN(conn, _sasl_server_listmech(conn, user, prefix, sep, suffix,
++       RETURN_VAL(conn, _sasl_server_listmech(conn, user, prefix, sep, suffix,
+                                           result, plen, pcount));
+     } else if (conn->type == SASL_CONN_CLIENT) {
+-       RETURN(conn, _sasl_client_listmech(conn, prefix, sep, suffix,
++       RETURN_VAL(conn, _sasl_client_listmech(conn, prefix, sep, suffix,
+                                           result, plen, pcount));
+     }
+     
+diff --git a/lib/saslint.h b/lib/saslint.h
+index ebade78f..77fbb1b5 100644
+--- a/lib/saslint.h
++++ b/lib/saslint.h
+@@ -74,22 +74,22 @@
+  *   memory errors.
+  *  -Only errors (error codes < SASL_OK) should be remembered
+  */
+-#define RETURN(conn, val) { if(conn && (val) < SASL_OK) \
++#define RETURN_VAL(conn, val) { if(conn && (val) < SASL_OK) \
+                                (conn)->error_code = (val); \
+                             return (val); }
+ #define MEMERROR(conn) {\
+     if(conn) sasl_seterror( (conn), 0, \
+                    "Out of Memory in " __FILE__ " near line %d", __LINE__ ); \
+-    RETURN(conn, SASL_NOMEM) }
++    RETURN_VAL(conn, SASL_NOMEM) }
+ #define PARAMERROR(conn) {\
+     if(conn) sasl_seterror( (conn), SASL_NOLOG, \
+                   "Parameter error in " __FILE__ " near line %d", __LINE__ ); \
+-    RETURN(conn, SASL_BADPARAM) }
++    RETURN_VAL(conn, SASL_BADPARAM) }
+ #define INTERROR(conn, val) {\
+     if(conn) sasl_seterror( (conn), 0, \
+                    "Internal Error %d in " __FILE__ " near line %d", (val),\
+                   __LINE__ ); \
+-    RETURN(conn, (val)) }
++    RETURN_VAL(conn, (val)) }
+ 
+ #ifndef PATH_MAX
+ # ifdef WIN32
+diff --git a/lib/server.c b/lib/server.c
+index bff461f8..4ea27643 100644
+--- a/lib/server.c
++++ b/lib/server.c
+@@ -155,7 +155,7 @@ int sasl_setpass(sasl_conn_t *conn,
+         (current_mech == NULL) ) {
+        sasl_seterror( conn, SASL_NOLOG,
+                   "No current SASL mechanism available");
+-       RETURN(conn, SASL_BADPARAM);
++       RETURN_VAL(conn, SASL_BADPARAM);
+     }
+ 
+     /* Do we want to store SASL_AUX_PASSWORD_PROP (plain text)?  and
+@@ -297,7 +297,7 @@ int sasl_setpass(sasl_conn_t *conn,
+        }
+     }
+ 
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ }
+ 
+ /* local mechanism which disposes of server */
+@@ -991,7 +991,7 @@ _sasl_transition(sasl_conn_t * conn,
+                              NULL, 0, SASL_SET_CREATE | flags);
+     }
+ 
+-    RETURN(conn,result);
++    RETURN_VAL(conn,result);
+ }
+ 
+ 
+@@ -1367,7 +1367,7 @@ static int do_authorization(sasl_server_conn_t *s_conn)
+                   (s_conn->user_realm ? (unsigned) strlen(s_conn->user_realm) : 0),
+                   s_conn->sparams->propctx);
+ 
+-    RETURN(&s_conn->base, ret);
++    RETURN_VAL(&s_conn->base, ret);
+ }
+ 
+ 
+@@ -1484,7 +1484,7 @@ int sasl_server_start(sasl_conn_t *conn,
+ 
+        if (result != SASL_OK) {
+            /* The library will eventually be freed, don't sweat it */
+-           RETURN(conn, result);
++           RETURN_VAL(conn, result);
+        }
+     }
+ 
+@@ -1573,7 +1573,7 @@ int sasl_server_start(sasl_conn_t *conn,
+        conn->oparams.doneflag = 0;
+     }
+     
+-    RETURN(conn,result);
++    RETURN_VAL(conn,result);
+ }
+ 
+ 
+@@ -1701,7 +1701,7 @@ int sasl_server_step(sasl_conn_t *conn,
+        conn->oparams.doneflag = 0;
+     }
+ 
+-    RETURN(conn, ret);
++    RETURN_VAL(conn, ret);
+ }
+ 
+ /* returns the length of all the mechanisms
+@@ -1950,7 +1950,7 @@ static int _sasl_checkpass(sasl_conn_t *conn,
+     if (result != SASL_OK)
+        sasl_seterror(conn, SASL_NOLOG, "checkpass failed");
+ 
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ }
+ 
+ /* check if a plaintext password is valid
+@@ -1990,7 +1990,7 @@ int sasl_checkpass(sasl_conn_t *conn,
+     result = _sasl_canon_user(conn, user, userlen,
+                              SASL_CU_AUTHID | SASL_CU_AUTHZID,
+                              &(conn->oparams));
+-    if(result != SASL_OK) RETURN(conn, result);
++    if(result != SASL_OK) RETURN_VAL(conn, result);
+     user = conn->oparams.user;
+ 
+     /* Check the password and lookup additional properties */
+@@ -2001,7 +2001,7 @@ int sasl_checkpass(sasl_conn_t *conn,
+       result = do_authorization((sasl_server_conn_t *)conn);
+     }
+ 
+-    RETURN(conn,result);
++    RETURN_VAL(conn,result);
+ }
+ 
+ /* check if a user exists on server
+@@ -2074,7 +2074,7 @@ int sasl_user_exists(sasl_conn_t *conn,
+        sasl_seterror(conn, SASL_NOLOG, "no plaintext password verifier?");
+     }
+ 
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ }
+ 
+ /* check if an apop exchange is valid
+@@ -2136,7 +2136,7 @@ int sasl_checkapop(sasl_conn_t *conn,
+     if (!user_end || strspn(user_end + 1, "0123456789abcdef") != 32) 
+     {
+         sasl_seterror(conn, 0, "Bad Digest");
+-        RETURN(conn,SASL_BADPROT);
++        RETURN_VAL(conn,SASL_BADPROT);
+     }
+  
+     user_len = (size_t)(user_end - response);
+@@ -2148,7 +2148,7 @@ int sasl_checkapop(sasl_conn_t *conn,
+     if(result != SASL_OK) 
+     {
+         sasl_FREE(user);
+-        RETURN(conn, result);
++        RETURN_VAL(conn, result);
+     }
+ 
+     /* erase the plaintext password */
+@@ -2163,7 +2163,7 @@ int sasl_checkapop(sasl_conn_t *conn,
+                                      &(conn->oparams));
+     sasl_FREE(user);
+ 
+-    if(result != SASL_OK) RETURN(conn, result);
++    if(result != SASL_OK) RETURN_VAL(conn, result);
+ 
+     /* Do APOP verification */
+     result = _sasl_auxprop_verify_apop(conn, conn->oparams.authid,
+@@ -2178,11 +2178,11 @@ int sasl_checkapop(sasl_conn_t *conn,
+        conn->oparams.authid = NULL;
+     }
+ 
+-    RETURN(conn, result);
++    RETURN_VAL(conn, result);
+ #else /* sasl_checkapop was disabled at compile time */
+     sasl_seterror(conn, SASL_NOLOG,
+        "sasl_checkapop called, but was disabled at compile time");
+-    RETURN(conn, SASL_NOMECH);
++    RETURN_VAL(conn, SASL_NOMECH);
+ #endif /* DO_SASL_CHECKAPOP */
+ }
+ 
+diff --git a/saslauthd/auth_sasldb.c b/saslauthd/auth_sasldb.c
+index b6aaa393..08db1892 100644
+--- a/saslauthd/auth_sasldb.c
++++ b/saslauthd/auth_sasldb.c
+@@ -51,9 +51,7 @@
+ #include "../sasldb/sasldb.h"
+ 
+ static int
+-vf(void *context __attribute__((unused)),
+-   char *file  __attribute__((unused)),
+-   int type  __attribute__((unused)))
++vf(void)
+ {
+     /* always say ok */ 
+     return SASL_OK;
+diff --git a/saslauthd/saslauthd-main.c b/saslauthd/saslauthd-main.c
+index ca5b7256..68ffd02f 100644
+--- a/saslauthd/saslauthd-main.c
++++ b/saslauthd/saslauthd-main.c
+@@ -593,7 +593,7 @@ void signal_setup() {
+        /**************************************************************
+         * Handler for SIGTERM
+         **************************************************************/
+-       act_sigterm.sa_handler = server_exit;
++       act_sigterm.sa_handler = handle_exit;
+        sigemptyset(&act_sigterm.sa_mask);
+ 
+        if (sigaction(SIGTERM, &act_sigterm, NULL) != 0) {
+@@ -606,7 +606,7 @@ void signal_setup() {
+        /**************************************************************
+         * Handler for SIGINT
+         **************************************************************/
+-       act_sigint.sa_handler = server_exit;
++       act_sigint.sa_handler = handle_exit;
+        sigemptyset(&act_sigint.sa_mask);
+ 
+        if (sigaction(SIGINT, &act_sigint, NULL) != 0) {
+@@ -876,7 +876,7 @@ pid_t have_baby() {
+ /*************************************************************
+  * Reap in all the dead children
+  **************************************************************/
+-void handle_sigchld() {
++void handle_sigchld(__attribute__((unused)) int sig) {
+        pid_t pid;
+ 
+        while ((pid = waitpid(-1, 0, WNOHANG)) > 0) {
+@@ -888,11 +888,15 @@ void handle_sigchld() {
+        return;
+ }
+ 
++void handle_exit(__attribute__((unused)) int sig) {
++       server_exit();
++}
++
+ 
+ /*************************************************************
+  * Do some final cleanup here.
+  **************************************************************/
+-void server_exit() {
++void server_exit(void) {
+ 
+        /*********************************************************
+         * If we're not the master process, don't do anything
+diff --git a/saslauthd/saslauthd-main.h b/saslauthd/saslauthd-main.h
+index 754626c6..29998f03 100644
+--- a/saslauthd/saslauthd-main.h
++++ b/saslauthd/saslauthd-main.h
+@@ -96,8 +96,9 @@ extern void   set_mech_option(const char *);
+ extern void    set_run_path(const char *);
+ extern void    signal_setup();
+ extern void    detach_tty();
+-extern void    handle_sigchld();
+-extern void    server_exit();
++extern void    handle_sigchld(int sig);
++extern void    handle_exit(int sig);
++extern void    server_exit(void);
+ extern pid_t   have_baby();
+ 
+ /* ipc api delcarations */
diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb
index a6703ecf8d..bd15b0bda8 100644
--- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb
+++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb
@@ -7,20 +7,23 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3f55e0974e3d6db00ca6f57f2d206396"
 
 SRCREV = "7a6b45b177070198fed0682bea5fa87c18abb084"
 
-SRC_URI = "git://github.com/cyrusimap/cyrus-sasl;protocol=https;branch=cyrus-sasl-2.1 \
-           file://avoid-to-call-AC_TRY_RUN.patch \
-           file://debian_patches_0014_avoid_pic_overwrite.diff \
-           file://0001-sample-Rename-dprintf-to-cyrus_dprintf.patch \
-           file://saslauthd.service \
-           file://saslauthd.conf \
-           file://CVE-2019-19906.patch \
-           file://CVE-2022-24407.patch \
-           file://0001-Fix-time.h-check.patch \
-           "
+SRC_URI = " \
+    git://github.com/cyrusimap/cyrus-sasl;protocol=https;branch=cyrus-sasl-2.1 \
+    file://avoid-to-call-AC_TRY_RUN.patch \
+    file://debian_patches_0014_avoid_pic_overwrite.diff \
+    file://0001-sample-Rename-dprintf-to-cyrus_dprintf.patch \
+    file://saslauthd.service \
+    file://saslauthd.conf \
+    file://CVE-2019-19906.patch \
+    file://CVE-2022-24407.patch \
+    file://0001-Fix-time.h-check.patch \
+    file://0001-configure-prototypes.patch \
+    file://0002-Fix-incompatible-pointer-types-error-with-gcc-15.patch \
+    file://0003-Add-compatibility-for-gcc-15-869.patch \
+"
 
 UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig useradd systemd
 
@@ -81,7 +84,6 @@ SYSTEMD_PACKAGES = "${PN}-bin"
 SYSTEMD_SERVICE:${PN}-bin = "saslauthd.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
-SRC_URI[md5sum] = "a7f4e5e559a0e37b3ffc438c9456e425"
 SRC_URI[sha256sum] = "8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3"
 
 PACKAGES =+ "${PN}-bin"
diff --git a/meta-oe/recipes-printing/cups/cups-filters/0001-Fix-build-failure-with-GCC-15-and-std-c23.patch b/meta-oe/recipes-printing/cups/cups-filters/0001-Fix-build-failure-with-GCC-15-and-std-c23.patch
new file mode 100644
index 0000000000..7165593608
--- /dev/null
+++ b/meta-oe/recipes-printing/cups/cups-filters/0001-Fix-build-failure-with-GCC-15-and-std-c23.patch
@@ -0,0 +1,28 @@
+From a31812e179f24f71199e7b1c823ecd212f10472f Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 24 Jan 2025 09:44:58 +0100
+Subject: [PATCH] Fix build failure with GCC 15 and -std=c23
+
+The newest standard has more strict data type checks, function pointers
+in function prototypes have to declare data types of its arguments.
+
+Upstream-Status: Backport [https://github.com/OpenPrinting/cups-filters/commit/9871a50b5c1f9c2caa2754aac1f5db70c886021b]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ filter/foomatic-rip/process.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/filter/foomatic-rip/process.h b/filter/foomatic-rip/process.h
+index f6e15f6..54a4292 100644
+--- a/filter/foomatic-rip/process.h
++++ b/filter/foomatic-rip/process.h
+@@ -18,7 +18,7 @@
+ #include <sys/wait.h>
+ 
+ 
+-pid_t start_process(const char *name, int (*proc_func)(), void *user_arg,
++pid_t start_process(const char *name, int (*proc_func)(FILE*, FILE*, void*), void *user_arg,
+                    FILE **fdin, FILE **fdout);
+ pid_t start_system_process(const char *name, const char *command, FILE **fdin,
+                           FILE **fdout);
diff --git a/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb b/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb
index efcd1aab8a..2f1a772dde 100644
--- a/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb
+++ b/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb
@@ -6,18 +6,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6d5b952b53dbe7752199903d082e5f07"
 DEPENDS = "libcupsfilters libppd glib-2.0 poppler"
 
 SRC_URI = " \
-        https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \
-        file://fix-make-race.patch \
+    https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \
+    file://fix-make-race.patch \
+    file://0001-Fix-build-failure-with-GCC-15-and-std-c23.patch \
 "
 SRC_URI[sha256sum] = "b5152e3dd148ed73835827ac2f219df7cf5808dbf9dbaec2aa0127b44de800d8"
 
+UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups-filters/releases"
+
 inherit autotools gettext pkgconfig github-releases
 
 EXTRA_OECONF += " \
-        --enable-imagefilters \
-        --enable-ghostscript --with-gs-path=${bindir}/gs \
-        --with-fontdir=${datadir}/fonts \
-        --localstatedir=${localstatedir} \
+    --enable-imagefilters \
+    --enable-ghostscript --with-gs-path=${bindir}/gs \
+    --with-fontdir=${datadir}/fonts \
+    --localstatedir=${localstatedir} \
 "
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
diff --git a/meta-oe/recipes-printing/cups/cups-pk-helper_0.2.7.bb b/meta-oe/recipes-printing/cups/cups-pk-helper_0.2.7.bb
index 4bf62006f4..81fdf2a7fb 100644
--- a/meta-oe/recipes-printing/cups/cups-pk-helper_0.2.7.bb
+++ b/meta-oe/recipes-printing/cups/cups-pk-helper_0.2.7.bb
@@ -7,7 +7,7 @@ DEPENDS = "cups polkit glib-2.0"
 
 inherit meson pkgconfig gettext features_check
 
-REQUIRED_DISTRO_FEATURES ="polkit"
+REQUIRED_DISTRO_FEATURES = "polkit"
 
 SRC_URI = " \
     https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${PV}.tar.xz \
diff --git a/meta-oe/recipes-printing/qpdf/qpdf_11.9.0.bb b/meta-oe/recipes-printing/qpdf/qpdf_12.2.0.bb
index 4778be42b5..8ed993aa78 100644
--- a/meta-oe/recipes-printing/qpdf/qpdf_11.9.0.bb
+++ b/meta-oe/recipes-printing/qpdf/qpdf_12.2.0.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}"
 
-SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main"
-SRCREV = "3b97c9bd266b7c32ea36d3536e22dab77412886d"
+SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "856d32c610334855d30e96d25eb5f9636fb62f08"
 
 inherit cmake pkgconfig gettext
 
@@ -20,7 +20,6 @@ EXTRA_OECMAKE = ' \
 LDFLAGS:append:mipsarch = " -latomic"
 LDFLAGS:append:riscv32 = " -latomic"
 
-S="${WORKDIR}/git"
 
 PACKAGECONFIG ?= "gnutls"
 PACKAGECONFIG[gnutls] = "-DREQUIRE_CRYPTO_GNUTLS=ON,-DREQUIRE_CRYPTO_OPENSSL=ON"
diff --git a/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch b/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch
index f2755d5c08..f37fbf63a7 100644
--- a/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch
+++ b/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch
@@ -1,4 +1,4 @@
-From 5cdc667aeb7a014cdc1f8c7df8f8080408773dbe Mon Sep 17 00:00:00 2001
+From 4f78fcb8728cd4bf31175b3fa610a5c003e915d1 Mon Sep 17 00:00:00 2001
 From: Li xin <lixin.fnst@cn.fujitsu.com>
 Date: Sun, 19 Jul 2015 02:42:58 +0900
 Subject: [PATCH] Fixed swig host contamination issue
@@ -19,7 +19,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/bindings/swig/python3/Makefile.am b/bindings/swig/python3/Makefile.am
-index c2c6def4..bcc2836c 100644
+index 428e40fa..f4dd45bc 100644
 --- a/bindings/swig/python3/Makefile.am
 +++ b/bindings/swig/python3/Makefile.am
 @@ -23,6 +23,7 @@
@@ -30,7 +30,7 @@ index c2c6def4..bcc2836c 100644
  LIBS = $(top_builddir)/lib/libaudit.la
  SWIG_FLAGS = -python
  SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES)
-@@ -37,7 +38,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/lib/audit_logging.h ${top_builddir}/lib/li
+@@ -35,7 +36,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/lib/audit_logging.h ${top_builddir}/lib/li
  _audit_la_LIBADD = ${top_builddir}/lib/libaudit.la
  nodist__audit_la_SOURCES  = audit_wrap.c
  audit.py audit_wrap.c: ${srcdir}/../src/auditswig.i 
@@ -40,10 +40,10 @@ index c2c6def4..bcc2836c 100644
  CLEANFILES = audit.py* audit_wrap.c *~
  
 diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i
-index 6b267844..5a4e442f 100644
+index 2760e516..5d0ea8b6 100644
 --- a/bindings/swig/src/auditswig.i
 +++ b/bindings/swig/src/auditswig.i
-@@ -50,7 +50,7 @@ typedef unsigned uid_t;
+@@ -52,7 +52,7 @@ typedef unsigned uid_t;
   */
  %ignore audit_rule_data::buf;
  
@@ -52,6 +52,3 @@ index 6b267844..5a4e442f 100644
  #define __extension__ /*nothing*/
  %include <stdint.i>
  %include "../lib/audit-records.h"
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch
deleted file mode 100644
index b1f324f22d..0000000000
--- a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 88c9b2c5cebebf13f90890baebbadc60d9fe8d16 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 23:57:03 -0700
-Subject: [PATCH] Replace __attribute_malloc__ with __attribute__((__malloc__))
-
-__attribute_malloc__ is not available on musl
-
-Fixes
-| ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator
-|         __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
-|         ^
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- audisp/plugins/remote/queue.h | 2 +-
- auparse/auparse.h             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/audisp/plugins/remote/queue.h b/audisp/plugins/remote/queue.h
-index 36b70d04..031507dc 100644
---- a/audisp/plugins/remote/queue.h
-+++ b/audisp/plugins/remote/queue.h
-@@ -53,7 +53,7 @@ void q_close(struct queue *q);
-  * On error, return NULL and set errno. */
- struct queue *q_open(int q_flags, const char *path, size_t num_entries,
-                     size_t entry_size)
--       __attribute_malloc__ __attr_dealloc (q_close, 1) __wur;
-+       __attribute__((__malloc__)) __attr_dealloc (q_close, 1) __wur;
- 
- /* Add DATA to tail of Q. Return 0 on success, -1 on error and set errno. */
- int q_append(struct queue *q, const char *data);
-diff --git a/auparse/auparse.h b/auparse/auparse.h
-index c27f1ff9..87c52965 100644
---- a/auparse/auparse.h
-+++ b/auparse/auparse.h
-@@ -55,7 +55,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au,
- void auparse_destroy(auparse_state_t *au);
- void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what);
- auparse_state_t *auparse_init(ausource_t source, const void *b)
--       __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
-+       __attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1);
- int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len)
-        __attr_access ((__read_only__, 2, 3));
- int auparse_feed(auparse_state_t *au, const char *data, size_t data_len)
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-security/audit/audit/audit-volatile.conf b/meta-oe/recipes-security/audit/audit/audit-volatile.conf
deleted file mode 100644
index 9cbe1547a3..0000000000
--- a/meta-oe/recipes-security/audit/audit/audit-volatile.conf
+++ /dev/null
@@ -1 +0,0 @@
-d  /var/log/audit 0750 root root -
diff --git a/meta-oe/recipes-security/audit/audit_4.0.1.bb b/meta-oe/recipes-security/audit/audit_4.0.5.bb
index c189cfea55..58100b206d 100644
--- a/meta-oe/recipes-security/audit/audit_4.0.1.bb
+++ b/meta-oe/recipes-security/audit/audit_4.0.5.bb
@@ -10,13 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \
            file://0001-Fixed-swig-host-contamination-issue.patch \
            file://auditd \
-           file://audit-volatile.conf \
           "
 
-SRC_URI:append:libc-musl = " file://0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch"
-
-S = "${WORKDIR}/git"
-SRCREV = "22ccbd984e493524050ac445f796e9a7e90e1149"
+SRCREV = "97c4ec3d68b5b199f2796d1e126c2144506bd228"
 
 inherit autotools python3targetconfig update-rc.d systemd
 
@@ -35,6 +31,7 @@ EXTRA_OECONF = " \
         --with-python3 \
         --with-arm \
         --with-aarch64 \
+        --with-riscv \
         --without-golang \
         --disable-gssapi-krb5 \
         --disable-zos-remote \
@@ -59,7 +56,9 @@ PACKAGES =+ "audispd-plugins"
 PACKAGES += "auditd ${PN}-python"
 
 FILES:${PN} = "${sysconfdir}/libaudit.conf ${libdir}/libau*.so.*"
-FILES:auditd = "${bindir}/* ${base_sbindir}/* ${sysconfdir}/* ${datadir}/audit-rules/* ${libexecdir}/*"
+FILES:auditd = "${bindir}/* ${base_sbindir}/* ${sysconfdir}/* \
+                ${datadir}/audit-rules/* ${libexecdir}/* \
+                ${nonarch_libdir}/tmpfiles.d/*.conf"
 FILES:audispd-plugins = "${sysconfdir}/audit/audisp-remote.conf \
         ${sysconfdir}/audit/plugins.d/au-remote.conf \
         ${sysconfdir}/audit/plugins.d/syslog.conf \
@@ -89,15 +88,20 @@ do_install:append() {
     # Based on the audit.spec "Copy default rules into place on new installation"
     install -m 0640 ${D}/etc/audit/rules.d/audit.rules ${D}/etc/audit/audit.rules
 
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        install -D -m 0644 ${UNPACKDIR}/audit-volatile.conf ${D}${sysconfdir}/tmpfiles.d/audit.conf
-    fi
-
     if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -D -m 0755 ${UNPACKDIR}/auditd ${D}/etc/init.d/auditd
-        rm -rf ${D}${libdir}/systemd
+    fi
+
+    if ! ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        rm -rf ${D}${nonarch_libdir}/systemd
+        rm -rf ${D}${nonarch_libdir}/tmpfiles.d
+
+        # Remove empty directory when enable multilib
+        rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}
     fi
 
     # Create /var/spool/audit directory for audisp-remote
     install -d -m 0700 ${D}${localstatedir}/spool/audit
 }
+
+CVE_PRODUCT = "linux:audit"
diff --git a/meta-oe/recipes-security/bubblewrap/bubblewrap/0001-Use-stdbool.h-for-booleans.patch b/meta-oe/recipes-security/bubblewrap/bubblewrap/0001-Use-stdbool.h-for-booleans.patch
new file mode 100644
index 0000000000..2566314ce3
--- /dev/null
+++ b/meta-oe/recipes-security/bubblewrap/bubblewrap/0001-Use-stdbool.h-for-booleans.patch
@@ -0,0 +1,633 @@
+From 4572dd9378c876349e02403cf7f6031c45281f85 Mon Sep 17 00:00:00 2001
+From: "Simon McVittie" <smcv@collabora.com>
+Date: Tue, 8 Apr 2025 16:29:18 +0900
+Subject: [PATCH] Use stdbool.h for booleans
+
+* backport fix from:
+  https://github.com/containers/bubblewrap/pull/660
+  But patch rework for this version.
+  In gcc 15, bool became a reserved keyword in C23, causing conflicts with our custom bool definition.
+
+  See also, https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
+
+* to fix:
+  http://errors.yoctoproject.org/Errors/Details/851183/
+  ../bubblewrap-0.10.0/utils.h:46:13: error: 'bool' cannot be defined via 'typedef'
+   46 | typedef int bool;
+      |             ^~~~
+
+Upstream-Status: Backport [https://github.com/containers/bubblewrap/pull/660]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ bind-mount.c |  20 ++++----
+ bubblewrap.c | 134 +++++++++++++++++++++++++--------------------------
+ utils.c      |  16 +++---
+ utils.h      |   5 +-
+ 4 files changed, 86 insertions(+), 89 deletions(-)
+
+diff --git a/bind-mount.c b/bind-mount.c
+index 2757cae..bf7f68d 100644
+--- a/bind-mount.c
++++ b/bind-mount.c
+@@ -76,7 +76,7 @@ match_token (const char *token, const char *token_end, const char *str)
+   if (token == token_end)
+     return *str == 0;
+ 
+-  return FALSE;
++  return false;
+ }
+ 
+ static unsigned long
+@@ -281,12 +281,12 @@ parse_mountinfo (int  proc_fd,
+         die ("Can't parse mountinfo line");
+       rest = line + consumed;
+ 
+-      rest = skip_token (rest, TRUE); /* mountroot */
++      rest = skip_token (rest, true); /* mountroot */
+       mountpoint = rest;
+-      rest = skip_token (rest, FALSE); /* mountpoint */
++      rest = skip_token (rest, false); /* mountpoint */
+       mountpoint_end = rest++;
+       options = rest;
+-      rest = skip_token (rest, FALSE); /* vfs options */
++      rest = skip_token (rest, false); /* vfs options */
+       options_end = rest;
+ 
+       *mountpoint_end = 0;
+@@ -324,7 +324,7 @@ parse_mountinfo (int  proc_fd,
+       MountInfoLine *parent = by_id[this->parent_id];
+       MountInfoLine **to_sibling;
+       MountInfoLine *sibling;
+-      bool covered = FALSE;
++      bool covered = false;
+ 
+       if (!has_path_prefix (this->mountpoint, root_mount))
+         continue;
+@@ -333,7 +333,7 @@ parse_mountinfo (int  proc_fd,
+         continue;
+ 
+       if (strcmp (parent->mountpoint, this->mountpoint) == 0)
+-        parent->covered = TRUE;
++        parent->covered = true;
+ 
+       to_sibling = &parent->first_child;
+       sibling = parent->first_child;
+@@ -344,7 +344,7 @@ parse_mountinfo (int  proc_fd,
+            * covered by the sibling, and we drop it. */
+           if (has_path_prefix (this->mountpoint, sibling->mountpoint))
+             {
+-              covered = TRUE;
++              covered = true;
+               break;
+             }
+ 
+@@ -499,7 +499,7 @@ bind_mount_result_to_string (bind_mount_result res,
+                              bool *want_errno_p)
+ {
+   char *string = NULL;
+-  bool want_errno = TRUE;
++  bool want_errno = true;
+ 
+   switch (res)
+     {
+@@ -521,7 +521,7 @@ bind_mount_result_to_string (bind_mount_result res,
+ 
+       case BIND_MOUNT_ERROR_FIND_DEST_MOUNT:
+         string = xasprintf ("Unable to find \"%s\" in mount table", failing_path);
+-        want_errno = FALSE;
++        want_errno = false;
+         break;
+ 
+       case BIND_MOUNT_ERROR_REMOUNT_DEST:
+@@ -557,7 +557,7 @@ die_with_bind_result (bind_mount_result res,
+                       ...)
+ {
+   va_list args;
+-  bool want_errno = TRUE;
++  bool want_errno = true;
+   char *message;
+ 
+   fprintf (stderr, "bwrap: ");
+diff --git a/bubblewrap.c b/bubblewrap.c
+index bc75da4..1504449 100644
+--- a/bubblewrap.c
++++ b/bubblewrap.c
+@@ -74,19 +74,19 @@ static bool opt_as_pid_1;
+ 
+ static const char *opt_argv0 = NULL;
+ static const char *opt_chdir_path = NULL;
+-static bool opt_assert_userns_disabled = FALSE;
+-static bool opt_disable_userns = FALSE;
+-static bool opt_unshare_user = FALSE;
+-static bool opt_unshare_user_try = FALSE;
+-static bool opt_unshare_pid = FALSE;
+-static bool opt_unshare_ipc = FALSE;
+-static bool opt_unshare_net = FALSE;
+-static bool opt_unshare_uts = FALSE;
+-static bool opt_unshare_cgroup = FALSE;
+-static bool opt_unshare_cgroup_try = FALSE;
+-static bool opt_needs_devpts = FALSE;
+-static bool opt_new_session = FALSE;
+-static bool opt_die_with_parent = FALSE;
++static bool opt_assert_userns_disabled = false;
++static bool opt_disable_userns = false;
++static bool opt_unshare_user = false;
++static bool opt_unshare_user_try = false;
++static bool opt_unshare_pid = false;
++static bool opt_unshare_ipc = false;
++static bool opt_unshare_net = false;
++static bool opt_unshare_uts = false;
++static bool opt_unshare_cgroup = false;
++static bool opt_unshare_cgroup_try = false;
++static bool opt_needs_devpts = false;
++static bool opt_new_session = false;
++static bool opt_die_with_parent = false;
+ static uid_t opt_sandbox_uid = -1;
+ static gid_t opt_sandbox_gid = -1;
+ static int opt_sync_fd = -1;
+@@ -476,7 +476,7 @@ report_child_exit_status (int exitc, int setup_finished_fd)
+     return;
+ 
+   output = xasprintf ("{ \"exit-code\": %i }\n", exitc);
+-  dump_info (opt_json_status_fd, output, FALSE);
++  dump_info (opt_json_status_fd, output, false);
+   close (opt_json_status_fd);
+   opt_json_status_fd = -1;
+   close (setup_finished_fd);
+@@ -621,7 +621,7 @@ do_init (int event_fd, pid_t initial_pid)
+ 
+   seccomp_programs_apply ();
+ 
+-  while (TRUE)
++  while (true)
+     {
+       pid_t child;
+       int status;
+@@ -765,16 +765,16 @@ prctl_caps (uint32_t *caps, bool do_cap_bounding, bool do_set_ambient)
+    */
+   for (cap = 0; cap <= CAP_LAST_CAP; cap++)
+     {
+-      bool keep = FALSE;
++      bool keep = false;
+       if (cap < 32)
+         {
+           if (CAP_TO_MASK_0 (cap) & caps[0])
+-            keep = TRUE;
++            keep = true;
+         }
+       else
+         {
+           if (CAP_TO_MASK_1 (cap) & caps[1])
+-            keep = TRUE;
++            keep = true;
+         }
+ 
+       if (keep && do_set_ambient)
+@@ -803,11 +803,11 @@ static void
+ drop_cap_bounding_set (bool drop_all)
+ {
+   if (!drop_all)
+-    prctl_caps (requested_caps, TRUE, FALSE);
++    prctl_caps (requested_caps, true, false);
+   else
+     {
+       uint32_t no_caps[2] = {0, 0};
+-      prctl_caps (no_caps, TRUE, FALSE);
++      prctl_caps (no_caps, true, false);
+     }
+ }
+ 
+@@ -816,7 +816,7 @@ set_ambient_capabilities (void)
+ {
+   if (is_privileged)
+     return;
+-  prctl_caps (requested_caps, FALSE, TRUE);
++  prctl_caps (requested_caps, false, true);
+ }
+ 
+ /* This acquires the privileges that the bwrap will need it to work.
+@@ -846,7 +846,7 @@ acquire_privs (void)
+       if (euid != 0)
+         die ("Unexpected setuid user %d, should be 0", euid);
+ 
+-      is_privileged = TRUE;
++      is_privileged = true;
+       /* We want to keep running as euid=0 until at the clone()
+        * operation because doing so will make the user namespace be
+        * owned by root, which makes it not ptrace:able by the user as
+@@ -867,7 +867,7 @@ acquire_privs (void)
+         die ("Unable to set fsuid (was %d)", (int)new_fsuid);
+ 
+       /* We never need capabilities after execve(), so lets drop everything from the bounding set */
+-      drop_cap_bounding_set (TRUE);
++      drop_cap_bounding_set (true);
+ 
+       /* Keep only the required capabilities for setup */
+       set_required_caps ();
+@@ -904,7 +904,7 @@ switch_to_user_with_privs (void)
+ {
+   /* If we're in a new user namespace, we got back the bounding set, clear it again */
+   if (opt_unshare_user || opt_userns_fd != -1)
+-    drop_cap_bounding_set (FALSE);
++    drop_cap_bounding_set (false);
+ 
+   /* If we switched to a new user namespace it may allow other uids/gids, so switch to the target one */
+   if (opt_userns_fd != -1)
+@@ -1211,7 +1211,7 @@ setup_newroot (bool unshare_pid,
+             parent_mode &= ~0005U;
+ 
+           dest = get_newroot_path (op->dest);
+-          if (mkdir_with_parents (dest, parent_mode, FALSE) != 0)
++          if (mkdir_with_parents (dest, parent_mode, false) != 0)
+             die_with_error ("Can't mkdir parents for %s", op->dest);
+         }
+ 
+@@ -1761,7 +1761,7 @@ parse_args_recurse (int          *argcp,
+             }
+ 
+           data_argv_copy = data_argv; /* Don't change data_argv, we need to free it */
+-          parse_args_recurse (&data_argc, &data_argv_copy, TRUE, total_parsed_argc_p);
++          parse_args_recurse (&data_argc, &data_argv_copy, true, total_parsed_argc_p);
+ 
+           argv += 1;
+           argc -= 1;
+@@ -1786,45 +1786,45 @@ parse_args_recurse (int          *argcp,
+            */
+           opt_unshare_user_try = opt_unshare_ipc = opt_unshare_pid =
+             opt_unshare_uts = opt_unshare_cgroup_try =
+-            opt_unshare_net = TRUE;
++            opt_unshare_net = true;
+         }
+       /* Begin here the older individual --unshare variants */
+       else if (strcmp (arg, "--unshare-user") == 0)
+         {
+-          opt_unshare_user = TRUE;
++          opt_unshare_user = true;
+         }
+       else if (strcmp (arg, "--unshare-user-try") == 0)
+         {
+-          opt_unshare_user_try = TRUE;
++          opt_unshare_user_try = true;
+         }
+       else if (strcmp (arg, "--unshare-ipc") == 0)
+         {
+-          opt_unshare_ipc = TRUE;
++          opt_unshare_ipc = true;
+         }
+       else if (strcmp (arg, "--unshare-pid") == 0)
+         {
+-          opt_unshare_pid = TRUE;
++          opt_unshare_pid = true;
+         }
+       else if (strcmp (arg, "--unshare-net") == 0)
+         {
+-          opt_unshare_net = TRUE;
++          opt_unshare_net = true;
+         }
+       else if (strcmp (arg, "--unshare-uts") == 0)
+         {
+-          opt_unshare_uts = TRUE;
++          opt_unshare_uts = true;
+         }
+       else if (strcmp (arg, "--unshare-cgroup") == 0)
+         {
+-          opt_unshare_cgroup = TRUE;
++          opt_unshare_cgroup = true;
+         }
+       else if (strcmp (arg, "--unshare-cgroup-try") == 0)
+         {
+-          opt_unshare_cgroup_try = TRUE;
++          opt_unshare_cgroup_try = true;
+         }
+       /* Begin here the newer --share variants */
+       else if (strcmp (arg, "--share-net") == 0)
+         {
+-          opt_unshare_net = FALSE;
++          opt_unshare_net = false;
+         }
+       /* End --share variants, other arguments begin */
+       else if (strcmp (arg, "--chdir") == 0)
+@@ -1841,11 +1841,11 @@ parse_args_recurse (int          *argcp,
+         }
+       else if (strcmp (arg, "--disable-userns") == 0)
+         {
+-          opt_disable_userns = TRUE;
++          opt_disable_userns = true;
+         }
+       else if (strcmp (arg, "--assert-userns-disabled") == 0)
+         {
+-          opt_assert_userns_disabled = TRUE;
++          opt_assert_userns_disabled = true;
+         }
+       else if (strcmp (arg, "--remount-ro") == 0)
+         {
+@@ -1975,7 +1975,7 @@ parse_args_recurse (int          *argcp,
+ 
+           op = setup_op_new (SETUP_MOUNT_DEV);
+           op->dest = argv[1];
+-          opt_needs_devpts = TRUE;
++          opt_needs_devpts = true;
+ 
+           argv += 1;
+           argc -= 1;
+@@ -2425,15 +2425,15 @@ parse_args_recurse (int          *argcp,
+         }
+       else if (strcmp (arg, "--new-session") == 0)
+         {
+-          opt_new_session = TRUE;
++          opt_new_session = true;
+         }
+       else if (strcmp (arg, "--die-with-parent") == 0)
+         {
+-          opt_die_with_parent = TRUE;
++          opt_die_with_parent = true;
+         }
+       else if (strcmp (arg, "--as-pid-1") == 0)
+         {
+-          opt_as_pid_1 = TRUE;
++          opt_as_pid_1 = true;
+         }
+       else if (strcmp (arg, "--cap-add") == 0)
+         {
+@@ -2441,7 +2441,7 @@ parse_args_recurse (int          *argcp,
+           if (argc < 2)
+             die ("--cap-add takes an argument");
+ 
+-          opt_cap_add_or_drop_used = TRUE;
++          opt_cap_add_or_drop_used = true;
+ 
+           if (strcasecmp (argv[1], "ALL") == 0)
+             {
+@@ -2467,7 +2467,7 @@ parse_args_recurse (int          *argcp,
+           if (argc < 2)
+             die ("--cap-drop takes an argument");
+ 
+-          opt_cap_add_or_drop_used = TRUE;
++          opt_cap_add_or_drop_used = true;
+ 
+           if (strcasecmp (argv[1], "ALL") == 0)
+             {
+@@ -2610,7 +2610,7 @@ parse_args (int          *argcp,
+ {
+   int total_parsed_argc = *argcp;
+ 
+-  parse_args_recurse (argcp, argvp, FALSE, &total_parsed_argc);
++  parse_args_recurse (argcp, argvp, false, &total_parsed_argc);
+ }
+ 
+ static void
+@@ -2656,7 +2656,7 @@ namespace_ids_read (pid_t  pid)
+       int r;
+ 
+       /* if we don't unshare this ns, ignore it */
+-      if (do_unshare && *do_unshare == FALSE)
++      if (do_unshare && *do_unshare == false)
+         continue;
+ 
+       r = fstatat (ns_fd, info->name, &st, 0);
+@@ -2691,7 +2691,7 @@ namespace_ids_write (int    fd,
+       output = xasprintf (",%s\"%s-namespace\": %ju",
+                           indent, info->name, nsid);
+ 
+-      dump_info (fd, output, TRUE);
++      dump_info (fd, output, true);
+     }
+ }
+ 
+@@ -2799,18 +2799,18 @@ main (int    argc,
+   /* We have to do this if we weren't installed setuid (and we're not
+    * root), so let's just DWIM */
+   if (!is_privileged && getuid () != 0 && opt_userns_fd == -1)
+-    opt_unshare_user = TRUE;
++    opt_unshare_user = true;
+ 
+ #ifdef ENABLE_REQUIRE_USERNS
+   /* In this build option, we require userns. */
+   if (is_privileged && getuid () != 0 && opt_userns_fd == -1)
+-    opt_unshare_user = TRUE;
++    opt_unshare_user = true;
+ #endif
+ 
+   if (opt_unshare_user_try &&
+       stat ("/proc/self/ns/user", &sbuf) == 0)
+     {
+-      bool disabled = FALSE;
++      bool disabled = false;
+ 
+       /* RHEL7 has a kernel module parameter that lets you enable user namespaces */
+       if (stat ("/sys/module/user_namespace/parameters/enable", &sbuf) == 0)
+@@ -2818,7 +2818,7 @@ main (int    argc,
+           cleanup_free char *enable = NULL;
+           enable = load_file_at (AT_FDCWD, "/sys/module/user_namespace/parameters/enable");
+           if (enable != NULL && enable[0] == 'N')
+-            disabled = TRUE;
++            disabled = true;
+         }
+ 
+       /* Check for max_user_namespaces */
+@@ -2827,7 +2827,7 @@ main (int    argc,
+           cleanup_free char *max_user_ns = NULL;
+           max_user_ns = load_file_at (AT_FDCWD, "/proc/sys/user/max_user_namespaces");
+           if (max_user_ns != NULL && strcmp(max_user_ns, "0\n") == 0)
+-            disabled = TRUE;
++            disabled = true;
+         }
+ 
+       /* Debian lets you disable *unprivileged* user namespaces. However this is not
+@@ -2835,7 +2835,7 @@ main (int    argc,
+          already, and there is not much we can do, its just a non-working setup. */
+ 
+       if (!disabled)
+-        opt_unshare_user = TRUE;
++        opt_unshare_user = true;
+     }
+ 
+   if (argc <= 0)
+@@ -2993,7 +2993,7 @@ main (int    argc,
+            */
+           write_uid_gid_map (ns_uid, real_uid,
+                              ns_gid, real_gid,
+-                             pid, TRUE, opt_needs_devpts);
++                             pid, true, opt_needs_devpts);
+         }
+ 
+       /* Initial launched process, wait for pid 1 or exec:ed command to exit */
+@@ -3002,7 +3002,7 @@ main (int    argc,
+         die_with_error ("Setting userns2 failed");
+ 
+       /* We don't need any privileges in the launcher, drop them immediately. */
+-      drop_privs (FALSE, FALSE);
++      drop_privs (false, false);
+ 
+       /* Optionally bind our lifecycle to that of the parent */
+       handle_die_with_parent ();
+@@ -3010,17 +3010,17 @@ main (int    argc,
+       if (opt_info_fd != -1)
+         {
+           cleanup_free char *output = xasprintf ("{\n    \"child-pid\": %i", pid);
+-          dump_info (opt_info_fd, output, TRUE);
+-          namespace_ids_write (opt_info_fd, FALSE);
+-          dump_info (opt_info_fd, "\n}\n", TRUE);
++          dump_info (opt_info_fd, output, true);
++          namespace_ids_write (opt_info_fd, false);
++          dump_info (opt_info_fd, "\n}\n", true);
+           close (opt_info_fd);
+         }
+       if (opt_json_status_fd != -1)
+         {
+           cleanup_free char *output = xasprintf ("{ \"child-pid\": %i", pid);
+-          dump_info (opt_json_status_fd, output, TRUE);
+-          namespace_ids_write (opt_json_status_fd, TRUE);
+-          dump_info (opt_json_status_fd, " }\n", TRUE);
++          dump_info (opt_json_status_fd, output, true);
++          namespace_ids_write (opt_json_status_fd, true);
++          dump_info (opt_json_status_fd, " }\n", true);
+         }
+ 
+       if (opt_userns_block_fd != -1)
+@@ -3116,7 +3116,7 @@ main (int    argc,
+ 
+       write_uid_gid_map (ns_uid, real_uid,
+                          ns_gid, real_gid,
+-                         -1, TRUE, FALSE);
++                         -1, true, false);
+     }
+ 
+   old_umask = umask (0);
+@@ -3177,7 +3177,7 @@ main (int    argc,
+       if (child == 0)
+         {
+           /* Unprivileged setup process */
+-          drop_privs (FALSE, TRUE);
++          drop_privs (false, true);
+           close (privsep_sockets[0]);
+           setup_newroot (opt_unshare_pid, privsep_sockets[1]);
+           exit (0);
+@@ -3289,11 +3289,11 @@ main (int    argc,
+         die_with_error ("unshare user ns");
+ 
+       /* We're in a new user namespace, we got back the bounding set, clear it again */
+-      drop_cap_bounding_set (FALSE);
++      drop_cap_bounding_set (false);
+ 
+       write_uid_gid_map (opt_sandbox_uid, ns_uid,
+                          opt_sandbox_gid, ns_gid,
+-                         -1, FALSE, FALSE);
++                         -1, false, false);
+     }
+ 
+   if (opt_disable_userns || opt_assert_userns_disabled)
+@@ -3306,7 +3306,7 @@ main (int    argc,
+     }
+ 
+   /* All privileged ops are done now, so drop caps we don't need */
+-  drop_privs (!is_privileged, TRUE);
++  drop_privs (!is_privileged, true);
+ 
+   if (opt_block_fd != -1)
+     {
+@@ -3370,7 +3370,7 @@ main (int    argc,
+ 
+       if (pid != 0)
+         {
+-          drop_all_caps (FALSE);
++          drop_all_caps (false);
+ 
+           /* Close fds in pid 1, except stdio and optionally event_fd
+              (for syncing pid 2 lifetime with monitor_child) and
+diff --git a/utils.c b/utils.c
+index 43c8d79..7c562b1 100644
+--- a/utils.c
++++ b/utils.c
+@@ -206,7 +206,7 @@ bool
+ has_path_prefix (const char *str,
+                  const char *prefix)
+ {
+-  while (TRUE)
++  while (true)
+     {
+       /* Skip consecutive slashes to reach next path
+          element */
+@@ -217,13 +217,13 @@ has_path_prefix (const char *str,
+ 
+       /* No more prefix path elements? Done! */
+       if (*prefix == 0)
+-        return TRUE;
++        return true;
+ 
+       /* Compare path element */
+       while (*prefix != 0 && *prefix != '/')
+         {
+           if (*str != *prefix)
+-            return FALSE;
++            return false;
+           str++;
+           prefix++;
+         }
+@@ -231,7 +231,7 @@ has_path_prefix (const char *str,
+       /* Matched prefix path element,
+          must be entire str path element */
+       if (*str != '/' && *str != 0)
+-        return FALSE;
++        return false;
+     }
+ }
+ 
+@@ -239,7 +239,7 @@ bool
+ path_equal (const char *path1,
+             const char *path2)
+ {
+-  while (TRUE)
++  while (true)
+     {
+       /* Skip consecutive slashes to reach next path
+          element */
+@@ -256,14 +256,14 @@ path_equal (const char *path1,
+       while (*path1 != 0 && *path1 != '/')
+         {
+           if (*path1 != *path2)
+-            return FALSE;
++            return false;
+           path1++;
+           path2++;
+         }
+ 
+       /* Matched path1 path element, must be entire path element */
+       if (*path2 != '/' && *path2 != 0)
+-        return FALSE;
++        return false;
+     }
+ }
+ 
+@@ -526,7 +526,7 @@ copy_file_data (int sfd,
+   char buffer[BUFSIZE];
+   ssize_t bytes_read;
+ 
+-  while (TRUE)
++  while (true)
+     {
+       bytes_read = read (sfd, buffer, BUFSIZE);
+       if (bytes_read == -1)
+diff --git a/utils.h b/utils.h
+index 9f17297..2c37ccb 100644
+--- a/utils.h
++++ b/utils.h
+@@ -24,6 +24,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdarg.h>
++#include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -41,10 +42,6 @@
+ 
+ #define N_ELEMENTS(arr) (sizeof (arr) / sizeof ((arr)[0]))
+ 
+-#define TRUE 1
+-#define FALSE 0
+-typedef int bool;
+-
+ #define PIPE_READ_END 0
+ #define PIPE_WRITE_END 1
+ 
diff --git a/meta-oe/recipes-security/bubblewrap/bubblewrap_0.9.0.bb b/meta-oe/recipes-security/bubblewrap/bubblewrap_0.10.0.bb
index c60c1dfd63..41ab0cfc32 100644
--- a/meta-oe/recipes-security/bubblewrap/bubblewrap_0.9.0.bb
+++ b/meta-oe/recipes-security/bubblewrap/bubblewrap_0.10.0.bb
@@ -5,8 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
 DEPENDS = "libcap"
 
-SRC_URI = "https://github.com/containers/${BPN}/releases/download/v${PV}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "c6347eaced49ac0141996f46bba3b089e5e6ea4408bc1c43bab9f2d05dd094e1"
+SRC_URI = " \
+    https://github.com/containers/${BPN}/releases/download/v${PV}/${BP}.tar.xz \
+    file://0001-Use-stdbool.h-for-booleans.patch \
+"
+SRC_URI[sha256sum] = "65d92cf44a63a51e1b7771f70c05013dce5bd6b0b2841c4b4be54b0c45565471"
 
 inherit autotools bash-completion github-releases manpages pkgconfig
 
diff --git a/meta-oe/recipes-security/kernel-hardening-checker/kernel-hardening-checker_0.6.10.bb b/meta-oe/recipes-security/kernel-hardening-checker/kernel-hardening-checker_0.6.10.bb
new file mode 100644
index 0000000000..e7610ac785
--- /dev/null
+++ b/meta-oe/recipes-security/kernel-hardening-checker/kernel-hardening-checker_0.6.10.bb
@@ -0,0 +1,34 @@
+SUMMARY = "A tool for checking the security hardening options of the Linux kernel"
+DESCRIPTION = "\
+    There are plenty of security hardening options for the Linux kernel; Kconfig \
+    options (compile-time); Kernel cmdline arguments (boot-time); Sysctl \
+    parameters (runtime). A lot of them have to be enabled manually to make the \
+    system more secure which is difficult to track. This tool helps with this \
+    task by checking and reporting about the settings compared to a list of \
+    recommendation. \
+"
+HOMEPAGE = "https://github.com/a13xp0p0v/kernel-hardening-checker"
+BUGTRACKER = "https://github.com/a13xp0p0v/kernel-hardening-checker/issues"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = "git://github.com/a13xp0p0v/kernel-hardening-checker;protocol=https;branch=master"
+SRCREV = "f4dbe258ff3d37489962ea9cf210192ae7ff9280"
+
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+RDEPENDS:${PN} = "\
+    python3-json \
+"
+
+# /boot/config is required for the analysis
+RRECOMMENDS:${PN}:class-target = "\
+    kernel-dev \
+"
+
+inherit setuptools3
+
+# allow to run on build host, if you don't want it in the image
+# oe-run-native kernel-hardening-checker-native kernel-hardening-checker ...
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.3.bb b/meta-oe/recipes-security/keyutils/keyutils_1.6.3.bb
index 7b3d728216..86f45656f6 100644
--- a/meta-oe/recipes-security/keyutils/keyutils_1.6.3.bb
+++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.3.bb
@@ -26,7 +26,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git;p
            "
 SRCREV = "cb3bb194cca88211cbfcdde2f10c0f43c3fb8ec3"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[manpages] = ""
diff --git a/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch b/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch
deleted file mode 100644
index 2ca18b0efb..0000000000
--- a/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch
+++ /dev/null
@@ -1,1720 +0,0 @@
-From bbbf474b2ebdbdac4d557e3351210f3fe2175c33 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Fri, 14 Feb 2020 10:09:55 +0000
-Subject: [PATCH] Make ndiff support python3
-
-Backport a patch from debian to make ndiff support
-python3.
-
-Refer to https://sources.debian.org/data/main/n/nmap/7.80+dfsg1-2/debian/patches/0004-Python3-port-of-ndiff.patch
-
-Upstream-Status: Pending
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- Makefile.in                   |  12 +-
- ndiff/ndiff.py                | 495 +++++++++++++++++-----------------
- ndiff/ndifftest.py            |  94 +++----
- ndiff/scripts/ndiff           |  14 +-
- ndiff/setup.py                |  34 +--
- ndiff/test-scans/anonymize.py |  18 +-
- 6 files changed, 333 insertions(+), 334 deletions(-)
- mode change 100644 => 100755 ndiff/setup.py
-
-diff --git a/Makefile.in b/Makefile.in
-index eee8863..32f86ba 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -35,6 +35,7 @@ ZENMAPDIR = @ZENMAPDIR@
- NDIFFDIR = @NDIFFDIR@
- NPINGDIR = @NPINGDIR@
- PYTHON = @PYTHON@
-+PYTHON3 = /usr/bin/env python3
- DEFS = @DEFS@ -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
- # With GCC, add extra security checks to source code.
- # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
-@@ -260,7 +261,7 @@ clean-zenmap:
-        rm -f $(ZENMAPDIR)/zenmapCore/Name.pyc
- 
- clean-ndiff:
--       -cd $(NDIFFDIR) && $(PYTHON) setup.py clean --all
-+       -cd $(NDIFFDIR) && $(PYTHON3) setup.py clean --all
- 
- clean-nping:
-        -cd $(NPINGDIR) && $(MAKE) clean
-@@ -368,6 +369,7 @@ tests/check_dns: $(OBJS)
- # this as the location of the interpreter whenever we're not doing a
- # local installation.
- DEFAULT_PYTHON_PATH = /usr/bin/env python
-+DEFAULT_PYTHON3_PATH = /usr/bin/env python3
- 
- build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py
- # When DESTDIR is defined, assume we're building an executable
-@@ -388,13 +390,13 @@ install-zenmap: $(ZENMAPDIR)/setup.py
-        ln -sf zenmap $(DESTDIR)$(bindir)/xnmap
- 
- build-ndiff:
--       cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
-+       cd $(NDIFFDIR) && $(PYTHON3) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON3_PATH)")
- 
- build-nping: $(NPINGDIR)/Makefile build-nbase build-nsock build-netutil $(NPINGDIR)/nping.h @DNET_BUILD@ @PCAP_BUILD@
-        @cd $(NPINGDIR) && $(MAKE)
- 
- install-ndiff:
--       cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)")
-+       cd $(NDIFFDIR) && $(PYTHON3) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)")
- 
- NSE_FILES = scripts/script.db scripts/*.nse
- NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc
-@@ -443,7 +445,7 @@ uninstall-zenmap:
-        rm -f $(DESTDIR)$(bindir)/xnmap
- 
- uninstall-ndiff:
--       cd $(NDIFFDIR) && $(PYTHON) setup.py uninstall
-+       cd $(NDIFFDIR) && $(PYTHON3) setup.py uninstall
- 
- uninstall-ncat:
-        @cd $(NCATDIR) && $(MAKE) uninstall
-@@ -458,7 +460,7 @@ check-ncat:
-        @cd $(NCATDIR) && $(MAKE) check
- 
- check-ndiff:
--       @cd $(NDIFFDIR) && $(PYTHON) ndifftest.py
-+       @cd $(NDIFFDIR) && $(PYTHON3) ndifftest.py
- 
- check-nsock:
-        @cd $(NSOCKDIR)/src && $(MAKE) check
-diff --git a/ndiff/ndiff.py b/ndiff/ndiff.py
-index 043273f..abbd1c5 100755
---- a/ndiff/ndiff.py
-+++ b/ndiff/ndiff.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Ndiff
- #
-@@ -26,11 +26,11 @@ xml.__path__ = [x for x in xml.__path__ if "_xmlplus" not in x]
- import xml.sax
- import xml.sax.saxutils
- import xml.dom.minidom
--from StringIO import StringIO
-+from io import StringIO
- 
- verbose = False
- 
--NDIFF_XML_VERSION = u"1"
-+NDIFF_XML_VERSION = "1"
- 
- 
- class OverrideEntityResolver(xml.sax.handler.EntityResolver):
-@@ -78,35 +78,35 @@ class Scan(object):
-     def write_nmaprun_open(self, writer):
-         attrs = {}
-         if self.scanner is not None:
--            attrs[u"scanner"] = self.scanner
-+            attrs["scanner"] = self.scanner
-         if self.args is not None:
--            attrs[u"args"] = self.args
-+            attrs["args"] = self.args
-         if self.start_date is not None:
--            attrs[u"start"] = "%d" % time.mktime(self.start_date.timetuple())
--            attrs[u"startstr"] = self.start_date.strftime(
-+            attrs["start"] = "%d" % time.mktime(self.start_date.timetuple())
-+            attrs["startstr"] = self.start_date.strftime(
-                     "%a %b %d %H:%M:%S %Y")
-         if self.version is not None:
--            attrs[u"version"] = self.version
--        writer.startElement(u"nmaprun", attrs)
-+            attrs["version"] = self.version
-+        writer.startElement("nmaprun", attrs)
- 
-     def write_nmaprun_close(self, writer):
--        writer.endElement(u"nmaprun")
-+        writer.endElement("nmaprun")
- 
-     def nmaprun_to_dom_fragment(self, document):
-         frag = document.createDocumentFragment()
--        elem = document.createElement(u"nmaprun")
-+        elem = document.createElement("nmaprun")
-         if self.scanner is not None:
--            elem.setAttribute(u"scanner", self.scanner)
-+            elem.setAttribute("scanner", self.scanner)
-         if self.args is not None:
--            elem.setAttribute(u"args", self.args)
-+            elem.setAttribute("args", self.args)
-         if self.start_date is not None:
-             elem.setAttribute(
--                    u"start", "%d" % time.mktime(self.start_date.timetuple()))
-+                    "start", "%d" % time.mktime(self.start_date.timetuple()))
-             elem.setAttribute(
--                    u"startstr",
-+                    "startstr",
-                     self.start_date.strftime("%a %b %d %H:%M:%S %Y"))
-         if self.version is not None:
--            elem.setAttribute(u"version", self.version)
-+            elem.setAttribute("version", self.version)
-         frag.appendChild(elem)
-         return frag
- 
-@@ -136,17 +136,17 @@ class Host(object):
- 
-     def format_name(self):
-         """Return a human-readable identifier for this host."""
--        address_s = u", ".join(a.s for a in sorted(self.addresses))
--        hostname_s = u", ".join(sorted(self.hostnames))
-+        address_s = ", ".join(a.s for a in sorted(self.addresses))
-+        hostname_s = ", ".join(sorted(self.hostnames))
-         if len(hostname_s) > 0:
-             if len(address_s) > 0:
--                return u"%s (%s)" % (hostname_s, address_s)
-+                return "%s (%s)" % (hostname_s, address_s)
-             else:
-                 return hostname_s
-         elif len(address_s) > 0:
-             return address_s
-         else:
--            return u"<no name>"
-+            return "<no name>"
- 
-     def add_port(self, port):
-         self.ports[port.spec] = port
-@@ -163,46 +163,46 @@ class Host(object):
-         return state is None or state in self.extraports
- 
-     def extraports_string(self):
--        list = [(count, state) for (state, count) in self.extraports.items()]
-+        locallist = [(count, state) for (state, count) in list(self.extraports.items())]
-         # Reverse-sort by count.
--        list.sort(reverse=True)
--        return u", ".join(
--                [u"%d %s ports" % (count, state) for (count, state) in list])
-+        locallist.sort(reverse=True)
-+        return ", ".join(
-+                ["%d %s ports" % (count, state) for (count, state) in locallist])
- 
-     def state_to_dom_fragment(self, document):
-         frag = document.createDocumentFragment()
-         if self.state is not None:
--            elem = document.createElement(u"status")
--            elem.setAttribute(u"state", self.state)
-+            elem = document.createElement("status")
-+            elem.setAttribute("state", self.state)
-             frag.appendChild(elem)
-         return frag
- 
-     def hostname_to_dom_fragment(self, document, hostname):
-         frag = document.createDocumentFragment()
--        elem = document.createElement(u"hostname")
--        elem.setAttribute(u"name", hostname)
-+        elem = document.createElement("hostname")
-+        elem.setAttribute("name", hostname)
-         frag.appendChild(elem)
-         return frag
- 
-     def extraports_to_dom_fragment(self, document):
-         frag = document.createDocumentFragment()
--        for state, count in self.extraports.items():
--            elem = document.createElement(u"extraports")
--            elem.setAttribute(u"state", state)
--            elem.setAttribute(u"count", unicode(count))
-+        for state, count in list(self.extraports.items()):
-+            elem = document.createElement("extraports")
-+            elem.setAttribute("state", state)
-+            elem.setAttribute("count", str(count))
-             frag.appendChild(elem)
-         return frag
- 
-     def os_to_dom_fragment(self, document, os):
-         frag = document.createDocumentFragment()
--        elem = document.createElement(u"osmatch")
--        elem.setAttribute(u"name", os)
-+        elem = document.createElement("osmatch")
-+        elem.setAttribute("name", os)
-         frag.appendChild(elem)
-         return frag
- 
-     def to_dom_fragment(self, document):
-         frag = document.createDocumentFragment()
--        elem = document.createElement(u"host")
-+        elem = document.createElement("host")
- 
-         if self.state is not None:
-             elem.appendChild(self.state_to_dom_fragment(document))
-@@ -211,13 +211,13 @@ class Host(object):
-             elem.appendChild(addr.to_dom_fragment(document))
- 
-         if len(self.hostnames) > 0:
--            hostnames_elem = document.createElement(u"hostnames")
-+            hostnames_elem = document.createElement("hostnames")
-             for hostname in self.hostnames:
-                 hostnames_elem.appendChild(
-                         self.hostname_to_dom_fragment(document, hostname))
-             elem.appendChild(hostnames_elem)
- 
--        ports_elem = document.createElement(u"ports")
-+        ports_elem = document.createElement("ports")
-         ports_elem.appendChild(self.extraports_to_dom_fragment(document))
-         for port in sorted(self.ports.values()):
-             if not self.is_extraports(port.state):
-@@ -226,13 +226,13 @@ class Host(object):
-             elem.appendChild(ports_elem)
- 
-         if len(self.os) > 0:
--            os_elem = document.createElement(u"os")
-+            os_elem = document.createElement("os")
-             for os in self.os:
-                 os_elem.appendChild(self.os_to_dom_fragment(document, os))
-             elem.appendChild(os_elem)
- 
-         if len(self.script_results) > 0:
--            hostscript_elem = document.createElement(u"hostscript")
-+            hostscript_elem = document.createElement("hostscript")
-             for sr in self.script_results:
-                 hostscript_elem.appendChild(sr.to_dom_fragment(document))
-             elem.appendChild(hostscript_elem)
-@@ -246,7 +246,7 @@ class Address(object):
-         self.s = s
- 
-     def __eq__(self, other):
--        return self.__cmp__(other) == 0
-+        return self.sort_key() == other.sort_key()
- 
-     def __ne__(self, other):
-         return not self.__eq__(other)
-@@ -254,8 +254,8 @@ class Address(object):
-     def __hash__(self):
-         return hash(self.sort_key())
- 
--    def __cmp__(self, other):
--        return cmp(self.sort_key(), other.sort_key())
-+    def __lt__(self, other):
-+        return self.sort_key() < other.sort_key()
- 
-     def __str__(self):
-         return str(self.s)
-@@ -264,21 +264,21 @@ class Address(object):
-         return self.s
- 
-     def new(type, s):
--        if type == u"ipv4":
-+        if type == "ipv4":
-             return IPv4Address(s)
--        elif type == u"ipv6":
-+        elif type == "ipv6":
-             return IPv6Address(s)
--        elif type == u"mac":
-+        elif type == "mac":
-             return MACAddress(s)
-         else:
--            raise ValueError(u"Unknown address type %s." % type)
-+            raise ValueError("Unknown address type %s." % type)
-     new = staticmethod(new)
- 
-     def to_dom_fragment(self, document):
-         frag = document.createDocumentFragment()
--        elem = document.createElement(u"address")
--        elem.setAttribute(u"addr", self.s)
--        elem.setAttribute(u"addrtype", self.type)
-+        elem = document.createElement("address")
-+        elem.setAttribute("addr", self.s)
-+        elem.setAttribute("addrtype", self.type)
-         frag.appendChild(elem)
-         return frag
- 
-@@ -287,21 +287,21 @@ class Address(object):
- 
- 
- class IPv4Address(Address):
--    type = property(lambda self: u"ipv4")
-+    type = property(lambda self: "ipv4")
- 
-     def sort_key(self):
-         return (0, self.s)
- 
- 
- class IPv6Address(Address):
--    type = property(lambda self: u"ipv6")
-+    type = property(lambda self: "ipv6")
- 
-     def sort_key(self):
-         return (1, self.s)
- 
- 
- class MACAddress(Address):
--    type = property(lambda self: u"mac")
-+    type = property(lambda self: "mac")
- 
-     def sort_key(self):
-         return (2, self.s)
-@@ -320,28 +320,25 @@ class Port(object):
- 
-     def state_string(self):
-         if self.state is None:
--            return u"unknown"
-+            return "unknown"
-         else:
--            return unicode(self.state)
-+            return str(self.state)
- 
-     def spec_string(self):
--        return u"%d/%s" % self.spec
-+        return "%d/%s" % self.spec
- 
--    def __cmp__(self, other):
--        d = cmp(self.spec, other.spec)
--        if d != 0:
--            return d
--        return cmp((self.spec, self.service, self.script_results),
--            (other.spec, other.service, other.script_results))
-+    def __lt__(self, other):
-+        return (self.spec, self.service, self.script_results) < (
-+            other.spec, other.service, other.script_results)
- 
-     def to_dom_fragment(self, document):
-         frag = document.createDocumentFragment()
--        elem = document.createElement(u"port")
--        elem.setAttribute(u"portid", unicode(self.spec[0]))
--        elem.setAttribute(u"protocol", self.spec[1])
-+        elem = document.createElement("port")
-+        elem.setAttribute("portid", str(self.spec[0]))
-+        elem.setAttribute("protocol", self.spec[1])
-         if self.state is not None:
--            state_elem = document.createElement(u"state")
--            state_elem.setAttribute(u"state", self.state)
-+            state_elem = document.createElement("state")
-+            state_elem.setAttribute("state", self.state)
-             elem.appendChild(state_elem)
-         elem.appendChild(self.service.to_dom_fragment(document))
-         for sr in self.script_results:
-@@ -385,7 +382,7 @@ class Service(object):
-         if len(parts) == 0:
-             return None
-         else:
--            return u"/".join(parts)
-+            return "/".join(parts)
- 
-     def version_string(self):
-         """Get a string like in the VERSION column of Nmap output."""
-@@ -395,17 +392,17 @@ class Service(object):
-         if self.version is not None:
-             parts.append(self.version)
-         if self.extrainfo is not None:
--            parts.append(u"(%s)" % self.extrainfo)
-+            parts.append("(%s)" % self.extrainfo)
- 
-         if len(parts) == 0:
-             return None
-         else:
--            return u" ".join(parts)
-+            return " ".join(parts)
- 
-     def to_dom_fragment(self, document):
-         frag = document.createDocumentFragment()
--        elem = document.createElement(u"service")
--        for attr in (u"name", u"product", u"version", u"extrainfo", u"tunnel"):
-+        elem = document.createElement("service")
-+        for attr in ("name", "product", "version", "extrainfo", "tunnel"):
-             v = getattr(self, attr)
-             if v is None:
-                 continue
-@@ -435,53 +432,53 @@ class ScriptResult(object):
-         result = []
-         lines = self.output.splitlines()
-         if len(lines) > 0:
--            lines[0] = self.id + u": " + lines[0]
-+            lines[0] = self.id + ": " + lines[0]
-         for line in lines[:-1]:
--            result.append(u"|  " + line)
-+            result.append("|  " + line)
-         if len(lines) > 0:
--            result.append(u"|_ " + lines[-1])
-+            result.append("|_ " + lines[-1])
-         return result
- 
-     def to_dom_fragment(self, document):
-         frag = document.createDocumentFragment()
--        elem = document.createElement(u"script")
--        elem.setAttribute(u"id", self.id)
--        elem.setAttribute(u"output", self.output)
-+        elem = document.createElement("script")
-+        elem.setAttribute("id", self.id)
-+        elem.setAttribute("output", self.output)
-         frag.appendChild(elem)
-         return frag
- 
- 
- def format_banner(scan):
-     """Format a startup banner more or less like Nmap does."""
--    scanner = u"Nmap"
--    if scan.scanner is not None and scan.scanner != u"nmap":
-+    scanner = "Nmap"
-+    if scan.scanner is not None and scan.scanner != "nmap":
-         scanner = scan.scanner
-     parts = [scanner]
-     if scan.version is not None:
-         parts.append(scan.version)
--    parts.append(u"scan")
-+    parts.append("scan")
-     if scan.start_date is not None:
--        parts.append(u"initiated %s" % scan.start_date.strftime(
-+        parts.append("initiated %s" % scan.start_date.strftime(
-             "%a %b %d %H:%M:%S %Y"))
-     if scan.args is not None:
--        parts.append(u"as: %s" % scan.args)
--    return u" ".join(parts)
-+        parts.append("as: %s" % scan.args)
-+    return " ".join(parts)
- 
- 
- def print_script_result_diffs_text(title, script_results_a, script_results_b,
-         script_result_diffs, f=sys.stdout):
--    table = Table(u"*")
-+    table = Table("*")
-     for sr_diff in script_result_diffs:
-         sr_diff.append_to_port_table(table)
-     if len(table) > 0:
--        print >> f
-+        print(file=f)
-         if len(script_results_b) == 0:
--            print >> f, u"-%s:" % title
-+            print("-%s:" % title, file=f)
-         elif len(script_results_a) == 0:
--            print >> f, u"+%s:" % title
-+            print("+%s:" % title, file=f)
-         else:
--            print >> f, u" %s:" % title
--        print >> f, table
-+            print(" %s:" % title, file=f)
-+        print(table, file=f)
- 
- 
- def script_result_diffs_to_dom_fragment(elem, script_results_a,
-@@ -489,13 +486,13 @@ def script_result_diffs_to_dom_fragment(elem, script_results_a,
-     if len(script_results_a) == 0 and len(script_results_b) == 0:
-         return document.createDocumentFragment()
-     elif len(script_results_b) == 0:
--        a_elem = document.createElement(u"a")
-+        a_elem = document.createElement("a")
-         for sr in script_results_a:
-             elem.appendChild(sr.to_dom_fragment(document))
-         a_elem.appendChild(elem)
-         return a_elem
-     elif len(script_results_a) == 0:
--        b_elem = document.createElement(u"b")
-+        b_elem = document.createElement("b")
-         for sr in script_results_b:
-             elem.appendChild(sr.to_dom_fragment(document))
-         b_elem.appendChild(elem)
-@@ -581,10 +578,10 @@ class ScanDiffText(ScanDiff):
-         banner_a = format_banner(self.scan_a)
-         banner_b = format_banner(self.scan_b)
-         if banner_a != banner_b:
--            print >> self.f, u"-%s" % banner_a
--            print >> self.f, u"+%s" % banner_b
-+            print("-%s" % banner_a, file=self.f)
-+            print("+%s" % banner_b, file=self.f)
-         elif verbose:
--            print >> self.f, u" %s" % banner_a
-+            print(" %s" % banner_a, file=self.f)
- 
-     def output_pre_scripts(self, pre_script_result_diffs):
-         print_script_result_diffs_text("Pre-scan script results",
-@@ -597,7 +594,7 @@ class ScanDiffText(ScanDiff):
-             post_script_result_diffs, self.f)
- 
-     def output_host_diff(self, h_diff):
--        print >> self.f
-+        print(file=self.f)
-         h_diff.print_text(self.f)
- 
-     def output_ending(self):
-@@ -622,8 +619,8 @@ class ScanDiffXML(ScanDiff):
- 
-     def output_beginning(self):
-         self.writer.startDocument()
--        self.writer.startElement(u"nmapdiff", {u"version": NDIFF_XML_VERSION})
--        self.writer.startElement(u"scandiff", {})
-+        self.writer.startElement("nmapdiff", {"version": NDIFF_XML_VERSION})
-+        self.writer.startElement("scandiff", {})
- 
-         if self.nmaprun_differs():
-             self.writer.frag_a(
-@@ -636,7 +633,7 @@ class ScanDiffXML(ScanDiff):
- 
-     def output_pre_scripts(self, pre_script_result_diffs):
-         if len(pre_script_result_diffs) > 0 or verbose:
--            prescript_elem = self.document.createElement(u"prescript")
-+            prescript_elem = self.document.createElement("prescript")
-             frag = script_result_diffs_to_dom_fragment(
-                 prescript_elem, self.scan_a.pre_script_results,
-                 self.scan_b.pre_script_results, pre_script_result_diffs,
-@@ -646,7 +643,7 @@ class ScanDiffXML(ScanDiff):
- 
-     def output_post_scripts(self, post_script_result_diffs):
-         if len(post_script_result_diffs) > 0 or verbose:
--            postscript_elem = self.document.createElement(u"postscript")
-+            postscript_elem = self.document.createElement("postscript")
-             frag = script_result_diffs_to_dom_fragment(
-                 postscript_elem, self.scan_a.post_script_results,
-                 self.scan_b.post_script_results, post_script_result_diffs,
-@@ -660,8 +657,8 @@ class ScanDiffXML(ScanDiff):
-         frag.unlink()
- 
-     def output_ending(self):
--        self.writer.endElement(u"scandiff")
--        self.writer.endElement(u"nmapdiff")
-+        self.writer.endElement("scandiff")
-+        self.writer.endElement("nmapdiff")
-         self.writer.endDocument()
- 
- 
-@@ -719,9 +716,9 @@ class HostDiff(object):
-         self.cost += os_cost
- 
-         extraports_a = tuple((count, state)
--                for (state, count) in self.host_a.extraports.items())
-+                for (state, count) in list(self.host_a.extraports.items()))
-         extraports_b = tuple((count, state)
--                for (state, count) in self.host_b.extraports.items())
-+                for (state, count) in list(self.host_b.extraports.items()))
-         if extraports_a != extraports_b:
-             self.extraports_changed = True
-             self.cost += 1
-@@ -747,69 +744,69 @@ class HostDiff(object):
-         # Names and addresses.
-         if self.id_changed:
-             if host_a.state is not None:
--                print >> f, u"-%s:" % host_a.format_name()
-+                print("-%s:" % host_a.format_name(), file=f)
-             if self.host_b.state is not None:
--                print >> f, u"+%s:" % host_b.format_name()
-+                print("+%s:" % host_b.format_name(), file=f)
-         else:
--            print >> f, u" %s:" % host_a.format_name()
-+            print(" %s:" % host_a.format_name(), file=f)
- 
-         # State.
-         if self.state_changed:
-             if host_a.state is not None:
--                print >> f, u"-Host is %s." % host_a.state
-+                print("-Host is %s." % host_a.state, file=f)
-             if host_b.state is not None:
--                print >> f, u"+Host is %s." % host_b.state
-+                print("+Host is %s." % host_b.state, file=f)
-         elif verbose:
--            print >> f, u" Host is %s." % host_b.state
-+            print(" Host is %s." % host_b.state, file=f)
- 
-         # Extraports.
-         if self.extraports_changed:
-             if len(host_a.extraports) > 0:
--                print >> f, u"-Not shown: %s" % host_a.extraports_string()
-+                print("-Not shown: %s" % host_a.extraports_string(), file=f)
-             if len(host_b.extraports) > 0:
--                print >> f, u"+Not shown: %s" % host_b.extraports_string()
-+                print("+Not shown: %s" % host_b.extraports_string(), file=f)
-         elif verbose:
-             if len(host_a.extraports) > 0:
--                print >> f, u" Not shown: %s" % host_a.extraports_string()
-+                print(" Not shown: %s" % host_a.extraports_string(), file=f)
- 
-         # Port table.
--        port_table = Table(u"** * * *")
-+        port_table = Table("** * * *")
-         if host_a.state is None:
--            mark = u"+"
-+            mark = "+"
-         elif host_b.state is None:
--            mark = u"-"
-+            mark = "-"
-         else:
--            mark = u" "
--        port_table.append((mark, u"PORT", u"STATE", u"SERVICE", u"VERSION"))
-+            mark = " "
-+        port_table.append((mark, "PORT", "STATE", "SERVICE", "VERSION"))
- 
-         for port in self.ports:
-             port_diff = self.port_diffs[port]
-             port_diff.append_to_port_table(port_table, host_a, host_b)
- 
-         if len(port_table) > 1:
--            print >> f, port_table
-+            print(port_table, file=f)
- 
-         # OS changes.
-         if self.os_changed or verbose:
-             if len(host_a.os) > 0:
-                 if len(host_b.os) > 0:
--                    print >> f, u" OS details:"
-+                    print(" OS details:", file=f)
-                 else:
--                    print >> f, u"-OS details:"
-+                    print("-OS details:", file=f)
-             elif len(host_b.os) > 0:
--                print >> f, u"+OS details:"
-+                print("+OS details:", file=f)
-             # os_diffs is a list of 5-tuples returned by
-             # difflib.SequenceMatcher.
-             for op, i1, i2, j1, j2 in self.os_diffs:
-                 if op == "replace" or op == "delete":
-                     for i in range(i1, i2):
--                        print >> f, "-  %s" % host_a.os[i]
-+                        print("-  %s" % host_a.os[i], file=f)
-                 if op == "replace" or op == "insert":
-                     for i in range(j1, j2):
--                        print >> f, "+  %s" % host_b.os[i]
-+                        print("+  %s" % host_b.os[i], file=f)
-                 if op == "equal":
-                     for i in range(i1, i2):
--                        print >> f, "   %s" % host_a.os[i]
-+                        print("   %s" % host_a.os[i], file=f)
- 
-         print_script_result_diffs_text("Host script results",
-             host_a.script_results, host_b.script_results,
-@@ -820,32 +817,32 @@ class HostDiff(object):
-         host_b = self.host_b
- 
-         frag = document.createDocumentFragment()
--        hostdiff_elem = document.createElement(u"hostdiff")
-+        hostdiff_elem = document.createElement("hostdiff")
-         frag.appendChild(hostdiff_elem)
- 
-         if host_a.state is None or host_b.state is None:
-             # The host is missing in one scan. Output the whole thing.
-             if host_a.state is not None:
--                a_elem = document.createElement(u"a")
-+                a_elem = document.createElement("a")
-                 a_elem.appendChild(host_a.to_dom_fragment(document))
-                 hostdiff_elem.appendChild(a_elem)
-             elif host_b.state is not None:
--                b_elem = document.createElement(u"b")
-+                b_elem = document.createElement("b")
-                 b_elem.appendChild(host_b.to_dom_fragment(document))
-                 hostdiff_elem.appendChild(b_elem)
-             return frag
- 
--        host_elem = document.createElement(u"host")
-+        host_elem = document.createElement("host")
- 
-         # State.
-         if host_a.state == host_b.state:
-             if verbose:
-                 host_elem.appendChild(host_a.state_to_dom_fragment(document))
-         else:
--            a_elem = document.createElement(u"a")
-+            a_elem = document.createElement("a")
-             a_elem.appendChild(host_a.state_to_dom_fragment(document))
-             host_elem.appendChild(a_elem)
--            b_elem = document.createElement(u"b")
-+            b_elem = document.createElement("b")
-             b_elem.appendChild(host_b.state_to_dom_fragment(document))
-             host_elem.appendChild(b_elem)
- 
-@@ -854,31 +851,31 @@ class HostDiff(object):
-         addrset_b = set(host_b.addresses)
-         for addr in sorted(addrset_a.intersection(addrset_b)):
-             host_elem.appendChild(addr.to_dom_fragment(document))
--        a_elem = document.createElement(u"a")
-+        a_elem = document.createElement("a")
-         for addr in sorted(addrset_a - addrset_b):
-             a_elem.appendChild(addr.to_dom_fragment(document))
-         if a_elem.hasChildNodes():
-             host_elem.appendChild(a_elem)
--        b_elem = document.createElement(u"b")
-+        b_elem = document.createElement("b")
-         for addr in sorted(addrset_b - addrset_a):
-             b_elem.appendChild(addr.to_dom_fragment(document))
-         if b_elem.hasChildNodes():
-             host_elem.appendChild(b_elem)
- 
-         # Host names.
--        hostnames_elem = document.createElement(u"hostnames")
-+        hostnames_elem = document.createElement("hostnames")
-         hostnameset_a = set(host_a.hostnames)
-         hostnameset_b = set(host_b.hostnames)
-         for hostname in sorted(hostnameset_a.intersection(hostnameset_b)):
-             hostnames_elem.appendChild(
-                     host_a.hostname_to_dom_fragment(document, hostname))
--        a_elem = document.createElement(u"a")
-+        a_elem = document.createElement("a")
-         for hostname in sorted(hostnameset_a - hostnameset_b):
-             a_elem.appendChild(
-                     host_a.hostname_to_dom_fragment(document, hostname))
-         if a_elem.hasChildNodes():
-             hostnames_elem.appendChild(a_elem)
--        b_elem = document.createElement(u"b")
-+        b_elem = document.createElement("b")
-         for hostname in sorted(hostnameset_b - hostnameset_a):
-             b_elem.appendChild(
-                     host_b.hostname_to_dom_fragment(document, hostname))
-@@ -887,15 +884,15 @@ class HostDiff(object):
-         if hostnames_elem.hasChildNodes():
-             host_elem.appendChild(hostnames_elem)
- 
--        ports_elem = document.createElement(u"ports")
-+        ports_elem = document.createElement("ports")
-         # Extraports.
-         if host_a.extraports == host_b.extraports:
-             ports_elem.appendChild(host_a.extraports_to_dom_fragment(document))
-         else:
--            a_elem = document.createElement(u"a")
-+            a_elem = document.createElement("a")
-             a_elem.appendChild(host_a.extraports_to_dom_fragment(document))
-             ports_elem.appendChild(a_elem)
--            b_elem = document.createElement(u"b")
-+            b_elem = document.createElement("b")
-             b_elem.appendChild(host_b.extraports_to_dom_fragment(document))
-             ports_elem.appendChild(b_elem)
-         # Port list.
-@@ -911,18 +908,18 @@ class HostDiff(object):
- 
-         # OS changes.
-         if self.os_changed or verbose:
--            os_elem = document.createElement(u"os")
-+            os_elem = document.createElement("os")
-             # os_diffs is a list of 5-tuples returned by
-             # difflib.SequenceMatcher.
-             for op, i1, i2, j1, j2 in self.os_diffs:
-                 if op == "replace" or op == "delete":
--                    a_elem = document.createElement(u"a")
-+                    a_elem = document.createElement("a")
-                     for i in range(i1, i2):
-                         a_elem.appendChild(host_a.os_to_dom_fragment(
-                             document, host_a.os[i]))
-                     os_elem.appendChild(a_elem)
-                 if op == "replace" or op == "insert":
--                    b_elem = document.createElement(u"b")
-+                    b_elem = document.createElement("b")
-                     for i in range(j1, j2):
-                         b_elem.appendChild(host_b.os_to_dom_fragment(
-                             document, host_b.os[i]))
-@@ -936,7 +933,7 @@ class HostDiff(object):
- 
-         # Host script changes.
-         if len(self.script_result_diffs) > 0 or verbose:
--            hostscript_elem = document.createElement(u"hostscript")
-+            hostscript_elem = document.createElement("hostscript")
-             host_elem.appendChild(script_result_diffs_to_dom_fragment(
-                 hostscript_elem, host_a.script_results,
-                 host_b.script_results, self.script_result_diffs,
-@@ -989,38 +986,38 @@ class PortDiff(object):
-             self.port_b.service.version_string()]
-         if a_columns == b_columns:
-             if verbose or self.script_result_diffs > 0:
--                table.append([u" "] + a_columns)
-+                table.append([" "] + a_columns)
-         else:
-             if not host_a.is_extraports(self.port_a.state):
--                table.append([u"-"] + a_columns)
-+                table.append(["-"] + a_columns)
-             if not host_b.is_extraports(self.port_b.state):
--                table.append([u"+"] + b_columns)
-+                table.append(["+"] + b_columns)
- 
-         for sr_diff in self.script_result_diffs:
-             sr_diff.append_to_port_table(table)
- 
-     def to_dom_fragment(self, document):
-         frag = document.createDocumentFragment()
--        portdiff_elem = document.createElement(u"portdiff")
-+        portdiff_elem = document.createElement("portdiff")
-         frag.appendChild(portdiff_elem)
-         if (self.port_a.spec == self.port_b.spec and
-                 self.port_a.state == self.port_b.state):
--            port_elem = document.createElement(u"port")
--            port_elem.setAttribute(u"portid", unicode(self.port_a.spec[0]))
--            port_elem.setAttribute(u"protocol", self.port_a.spec[1])
-+            port_elem = document.createElement("port")
-+            port_elem.setAttribute("portid", str(self.port_a.spec[0]))
-+            port_elem.setAttribute("protocol", self.port_a.spec[1])
-             if self.port_a.state is not None:
--                state_elem = document.createElement(u"state")
--                state_elem.setAttribute(u"state", self.port_a.state)
-+                state_elem = document.createElement("state")
-+                state_elem.setAttribute("state", self.port_a.state)
-                 port_elem.appendChild(state_elem)
-             if self.port_a.service == self.port_b.service:
-                 port_elem.appendChild(
-                         self.port_a.service.to_dom_fragment(document))
-             else:
--                a_elem = document.createElement(u"a")
-+                a_elem = document.createElement("a")
-                 a_elem.appendChild(
-                         self.port_a.service.to_dom_fragment(document))
-                 port_elem.appendChild(a_elem)
--                b_elem = document.createElement(u"b")
-+                b_elem = document.createElement("b")
-                 b_elem.appendChild(
-                         self.port_b.service.to_dom_fragment(document))
-                 port_elem.appendChild(b_elem)
-@@ -1028,10 +1025,10 @@ class PortDiff(object):
-                 port_elem.appendChild(sr_diff.to_dom_fragment(document))
-             portdiff_elem.appendChild(port_elem)
-         else:
--            a_elem = document.createElement(u"a")
-+            a_elem = document.createElement("a")
-             a_elem.appendChild(self.port_a.to_dom_fragment(document))
-             portdiff_elem.appendChild(a_elem)
--            b_elem = document.createElement(u"b")
-+            b_elem = document.createElement("b")
-             b_elem.appendChild(self.port_b.to_dom_fragment(document))
-             portdiff_elem.appendChild(b_elem)
- 
-@@ -1086,13 +1083,13 @@ class ScriptResultDiff(object):
-             for op, i1, i2, j1, j2 in diffs.get_opcodes():
-                 if op == "replace" or op == "delete":
-                     for k in range(i1, i2):
--                        table.append_raw(u"-" + a_lines[k])
-+                        table.append_raw("-" + a_lines[k])
-                 if op == "replace" or op == "insert":
-                     for k in range(j1, j2):
--                        table.append_raw(u"+" + b_lines[k])
-+                        table.append_raw("+" + b_lines[k])
-                 if op == "equal":
-                     for k in range(i1, i2):
--                        table.append_raw(u" " + a_lines[k])
-+                        table.append_raw(" " + a_lines[k])
- 
-     def to_dom_fragment(self, document):
-         frag = document.createDocumentFragment()
-@@ -1102,11 +1099,11 @@ class ScriptResultDiff(object):
-             frag.appendChild(self.sr_a.to_dom_fragment(document))
-         else:
-             if self.sr_a is not None:
--                a_elem = document.createElement(u"a")
-+                a_elem = document.createElement("a")
-                 a_elem.appendChild(self.sr_a.to_dom_fragment(document))
-                 frag.appendChild(a_elem)
-             if self.sr_b is not None:
--                b_elem = document.createElement(u"b")
-+                b_elem = document.createElement("b")
-                 b_elem.appendChild(self.sr_b.to_dom_fragment(document))
-                 frag.appendChild(b_elem)
-         return frag
-@@ -1120,7 +1117,7 @@ class Table(object):
-         copied to the output."""
-         self.widths = []
-         self.rows = []
--        self.prefix = u""
-+        self.prefix = ""
-         self.padding = []
-         j = 0
-         while j < len(template) and template[j] != "*":
-@@ -1145,7 +1142,7 @@ class Table(object):
- 
-         for i in range(len(row)):
-             if row[i] is None:
--                s = u""
-+                s = ""
-             else:
-                 s = str(row[i])
-             if i == len(self.widths):
-@@ -1167,7 +1164,7 @@ class Table(object):
-         for row in self.rows:
-             parts = [self.prefix]
-             i = 0
--            if isinstance(row, basestring):
-+            if isinstance(row, str):
-                 # A raw string.
-                 lines.append(row)
-             else:
-@@ -1176,13 +1173,13 @@ class Table(object):
-                     if i < len(self.padding):
-                         parts.append(self.padding[i])
-                     i += 1
--                lines.append(u"".join(parts).rstrip())
--        return u"\n".join(lines)
-+                lines.append("".join(parts).rstrip())
-+        return "\n".join(lines)
- 
- 
- def warn(str):
-     """Print a warning to stderr."""
--    print >> sys.stderr, str
-+    print(str, file=sys.stderr)
- 
- 
- class NmapContentHandler(xml.sax.handler.ContentHandler):
-@@ -1200,22 +1197,22 @@ class NmapContentHandler(xml.sax.handler.ContentHandler):
-         self.current_port = None
- 
-         self._start_elem_handlers = {
--            u"nmaprun": self._start_nmaprun,
--            u"host": self._start_host,
--            u"status": self._start_status,
--            u"address": self._start_address,
--            u"hostname": self._start_hostname,
--            u"extraports": self._start_extraports,
--            u"port": self._start_port,
--            u"state": self._start_state,
--            u"service": self._start_service,
--            u"script": self._start_script,
--            u"osmatch": self._start_osmatch,
--            u"finished": self._start_finished,
-+            "nmaprun": self._start_nmaprun,
-+            "host": self._start_host,
-+            "status": self._start_status,
-+            "address": self._start_address,
-+            "hostname": self._start_hostname,
-+            "extraports": self._start_extraports,
-+            "port": self._start_port,
-+            "state": self._start_state,
-+            "service": self._start_service,
-+            "script": self._start_script,
-+            "osmatch": self._start_osmatch,
-+            "finished": self._start_finished,
-         }
-         self._end_elem_handlers = {
--            u'host': self._end_host,
--            u'port': self._end_port,
-+            'host': self._end_host,
-+            'port': self._end_port,
-         }
- 
-     def parent_element(self):
-@@ -1245,68 +1242,68 @@ class NmapContentHandler(xml.sax.handler.ContentHandler):
-     def _start_nmaprun(self, name, attrs):
-         assert self.parent_element() is None
-         if "start" in attrs:
--            start_timestamp = int(attrs.get(u"start"))
-+            start_timestamp = int(attrs.get("start"))
-             self.scan.start_date = datetime.datetime.fromtimestamp(
-                     start_timestamp)
--        self.scan.scanner = attrs.get(u"scanner")
--        self.scan.args = attrs.get(u"args")
--        self.scan.version = attrs.get(u"version")
-+        self.scan.scanner = attrs.get("scanner")
-+        self.scan.args = attrs.get("args")
-+        self.scan.version = attrs.get("version")
- 
-     def _start_host(self, name, attrs):
--        assert self.parent_element() == u"nmaprun"
-+        assert self.parent_element() == "nmaprun"
-         self.current_host = Host()
-         self.scan.hosts.append(self.current_host)
- 
-     def _start_status(self, name, attrs):
--        assert self.parent_element() == u"host"
-+        assert self.parent_element() == "host"
-         assert self.current_host is not None
--        state = attrs.get(u"state")
-+        state = attrs.get("state")
-         if state is None:
-             warn(u'%s element of host %s is missing the "state" attribute; '
--                    'assuming \unknown\.' % (
-+                    r'assuming \unknown\.' % (
-                         name, self.current_host.format_name()))
-             return
-         self.current_host.state = state
- 
-     def _start_address(self, name, attrs):
--        assert self.parent_element() == u"host"
-+        assert self.parent_element() == "host"
-         assert self.current_host is not None
--        addr = attrs.get(u"addr")
-+        addr = attrs.get("addr")
-         if addr is None:
--            warn(u'%s element of host %s is missing the "addr" '
-+            warn('%s element of host %s is missing the "addr" '
-                     'attribute; skipping.' % (
-                         name, self.current_host.format_name()))
-             return
--        addrtype = attrs.get(u"addrtype", u"ipv4")
-+        addrtype = attrs.get("addrtype", "ipv4")
-         self.current_host.add_address(Address.new(addrtype, addr))
- 
-     def _start_hostname(self, name, attrs):
--        assert self.parent_element() == u"hostnames"
-+        assert self.parent_element() == "hostnames"
-         assert self.current_host is not None
--        hostname = attrs.get(u"name")
-+        hostname = attrs.get("name")
-         if hostname is None:
--            warn(u'%s element of host %s is missing the "name" '
-+            warn('%s element of host %s is missing the "name" '
-                     'attribute; skipping.' % (
-                         name, self.current_host.format_name()))
-             return
-         self.current_host.add_hostname(hostname)
- 
-     def _start_extraports(self, name, attrs):
--        assert self.parent_element() == u"ports"
-+        assert self.parent_element() == "ports"
-         assert self.current_host is not None
--        state = attrs.get(u"state")
-+        state = attrs.get("state")
-         if state is None:
--            warn(u'%s element of host %s is missing the "state" '
-+            warn('%s element of host %s is missing the "state" '
-                     'attribute; assuming "unknown".' % (
-                         name, self.current_host.format_name()))
-             state = None
-         if state in self.current_host.extraports:
--            warn(u'Duplicate extraports state "%s" in host %s.' % (
-+            warn('Duplicate extraports state "%s" in host %s.' % (
-                 state, self.current_host.format_name()))
- 
--        count = attrs.get(u"count")
-+        count = attrs.get("count")
-         if count is None:
--            warn(u'%s element of host %s is missing the "count" '
-+            warn('%s element of host %s is missing the "count" '
-                     'attribute; assuming 0.' % (
-                         name, self.current_host.format_name()))
-             count = 0
-@@ -1314,99 +1311,99 @@ class NmapContentHandler(xml.sax.handler.ContentHandler):
-             try:
-                 count = int(count)
-             except ValueError:
--                warn(u"Can't convert extraports count \"%s\" "
-+                warn("Can't convert extraports count \"%s\" "
-                         "to an integer in host %s; assuming 0." % (
--                            attrs[u"count"], self.current_host.format_name()))
-+                            attrs["count"], self.current_host.format_name()))
-                 count = 0
-         self.current_host.extraports[state] = count
- 
-     def _start_port(self, name, attrs):
--        assert self.parent_element() == u"ports"
-+        assert self.parent_element() == "ports"
-         assert self.current_host is not None
--        portid_str = attrs.get(u"portid")
-+        portid_str = attrs.get("portid")
-         if portid_str is None:
--            warn(u'%s element of host %s missing the "portid" '
-+            warn('%s element of host %s missing the "portid" '
-                     'attribute; skipping.' % (
-                         name, self.current_host.format_name()))
-             return
-         try:
-             portid = int(portid_str)
-         except ValueError:
--            warn(u"Can't convert portid \"%s\" to an integer "
-+            warn("Can't convert portid \"%s\" to an integer "
-                     "in host %s; skipping port." % (
-                         portid_str, self.current_host.format_name()))
-             return
--        protocol = attrs.get(u"protocol")
-+        protocol = attrs.get("protocol")
-         if protocol is None:
--            warn(u'%s element of host %s missing the "protocol" '
-+            warn('%s element of host %s missing the "protocol" '
-                     'attribute; skipping.' % (
-                         name, self.current_host.format_name()))
-             return
-         self.current_port = Port((portid, protocol))
- 
-     def _start_state(self, name, attrs):
--        assert self.parent_element() == u"port"
-+        assert self.parent_element() == "port"
-         assert self.current_host is not None
-         if self.current_port is None:
-             return
-         if "state" not in attrs:
--            warn(u'%s element of port %s is missing the "state" '
-+            warn('%s element of port %s is missing the "state" '
-                     'attribute; assuming "unknown".' % (
-                         name, self.current_port.spec_string()))
-             return
--        self.current_port.state = attrs[u"state"]
-+        self.current_port.state = attrs["state"]
-         self.current_host.add_port(self.current_port)
- 
-     def _start_service(self, name, attrs):
--        assert self.parent_element() == u"port"
-+        assert self.parent_element() == "port"
-         assert self.current_host is not None
-         if self.current_port is None:
-             return
--        self.current_port.service.name = attrs.get(u"name")
--        self.current_port.service.product = attrs.get(u"product")
--        self.current_port.service.version = attrs.get(u"version")
--        self.current_port.service.extrainfo = attrs.get(u"extrainfo")
--        self.current_port.service.tunnel = attrs.get(u"tunnel")
-+        self.current_port.service.name = attrs.get("name")
-+        self.current_port.service.product = attrs.get("product")
-+        self.current_port.service.version = attrs.get("version")
-+        self.current_port.service.extrainfo = attrs.get("extrainfo")
-+        self.current_port.service.tunnel = attrs.get("tunnel")
- 
-     def _start_script(self, name, attrs):
-         result = ScriptResult()
--        result.id = attrs.get(u"id")
-+        result.id = attrs.get("id")
-         if result.id is None:
--            warn(u'%s element missing the "id" attribute; skipping.' % name)
-+            warn('%s element missing the "id" attribute; skipping.' % name)
-             return
- 
--        result.output = attrs.get(u"output")
-+        result.output = attrs.get("output")
-         if result.output is None:
--            warn(u'%s element missing the "output" attribute; skipping.'
-+            warn('%s element missing the "output" attribute; skipping.'
-                     % name)
-             return
--        if self.parent_element() == u"prescript":
-+        if self.parent_element() == "prescript":
-             self.scan.pre_script_results.append(result)
--        elif self.parent_element() == u"postscript":
-+        elif self.parent_element() == "postscript":
-             self.scan.post_script_results.append(result)
--        elif self.parent_element() == u"hostscript":
-+        elif self.parent_element() == "hostscript":
-             self.current_host.script_results.append(result)
--        elif self.parent_element() == u"port":
-+        elif self.parent_element() == "port":
-             self.current_port.script_results.append(result)
-         else:
--            warn(u"%s element not inside prescript, postscript, hostscript, "
-+            warn("%s element not inside prescript, postscript, hostscript, "
-                     "or port element; ignoring." % name)
-             return
- 
-     def _start_osmatch(self, name, attrs):
--        assert self.parent_element() == u"os"
-+        assert self.parent_element() == "os"
-         assert self.current_host is not None
-         if "name" not in attrs:
--            warn(u'%s element of host %s is missing the "name" '
-+            warn('%s element of host %s is missing the "name" '
-                     'attribute; skipping.' % (
-                         name, self.current_host.format_name()))
-             return
--        self.current_host.os.append(attrs[u"name"])
-+        self.current_host.os.append(attrs["name"])
- 
-     def _start_finished(self, name, attrs):
--        assert self.parent_element() == u"runstats"
-+        assert self.parent_element() == "runstats"
-         if "time" in attrs:
--            end_timestamp = int(attrs.get(u"time"))
-+            end_timestamp = int(attrs.get("time"))
-             self.scan.end_date = datetime.datetime.fromtimestamp(end_timestamp)
- 
-     def _end_host(self, name):
-@@ -1425,23 +1422,23 @@ class XMLWriter (xml.sax.saxutils.XMLGenerator):
- 
-     def frag(self, frag):
-         for node in frag.childNodes:
--            node.writexml(self.f, newl=u"\n")
-+            node.writexml(self.f, newl="\n")
- 
-     def frag_a(self, frag):
--        self.startElement(u"a", {})
-+        self.startElement("a", {})
-         for node in frag.childNodes:
--            node.writexml(self.f, newl=u"\n")
--        self.endElement(u"a")
-+            node.writexml(self.f, newl="\n")
-+        self.endElement("a")
- 
-     def frag_b(self, frag):
--        self.startElement(u"b", {})
-+        self.startElement("b", {})
-         for node in frag.childNodes:
--            node.writexml(self.f, newl=u"\n")
--        self.endElement(u"b")
-+            node.writexml(self.f, newl="\n")
-+        self.endElement("b")
- 
- 
- def usage():
--    print u"""\
-+    print("""\
- Usage: %s [option] FILE1 FILE2
- Compare two Nmap XML files and display a list of their differences.
- Differences include host state changes, port state changes, and changes to
-@@ -1451,7 +1448,7 @@ service and OS detection.
-   -v, --verbose  also show hosts and ports that haven't changed.
-   --text         display output in text format (default)
-   --xml          display output in XML format\
--""" % sys.argv[0]
-+""" % sys.argv[0])
- 
- EXIT_EQUAL = 0
- EXIT_DIFFERENT = 1
-@@ -1459,8 +1456,8 @@ EXIT_ERROR = 2
- 
- 
- def usage_error(msg):
--    print >> sys.stderr, u"%s: %s" % (sys.argv[0], msg)
--    print >> sys.stderr, u"Try '%s -h' for help." % sys.argv[0]
-+    print("%s: %s" % (sys.argv[0], msg), file=sys.stderr)
-+    print("Try '%s -h' for help." % sys.argv[0], file=sys.stderr)
-     sys.exit(EXIT_ERROR)
- 
- 
-@@ -1471,7 +1468,7 @@ def main():
-     try:
-         opts, input_filenames = getopt.gnu_getopt(
-                 sys.argv[1:], "hv", ["help", "text", "verbose", "xml"])
--    except getopt.GetoptError, e:
-+    except getopt.GetoptError as e:
-         usage_error(e.msg)
-     for o, a in opts:
-         if o == "-h" or o == "--help":
-@@ -1481,15 +1478,15 @@ def main():
-             verbose = True
-         elif o == "--text":
-             if output_format is not None and output_format != "text":
--                usage_error(u"contradictory output format options.")
-+                usage_error("contradictory output format options.")
-             output_format = "text"
-         elif o == "--xml":
-             if output_format is not None and output_format != "xml":
--                usage_error(u"contradictory output format options.")
-+                usage_error("contradictory output format options.")
-             output_format = "xml"
- 
-     if len(input_filenames) != 2:
--        usage_error(u"need exactly two input filenames.")
-+        usage_error("need exactly two input filenames.")
- 
-     if output_format is None:
-         output_format = "text"
-@@ -1502,8 +1499,8 @@ def main():
-         scan_a.load_from_file(filename_a)
-         scan_b = Scan()
-         scan_b.load_from_file(filename_b)
--    except IOError, e:
--        print >> sys.stderr, u"Can't open file: %s" % str(e)
-+    except IOError as e:
-+        print("Can't open file: %s" % str(e), file=sys.stderr)
-         sys.exit(EXIT_ERROR)
- 
-     if output_format == "text":
-diff --git a/ndiff/ndifftest.py b/ndiff/ndifftest.py
-index 2fa4ae0..27fc525 100755
---- a/ndiff/ndifftest.py
-+++ b/ndiff/ndifftest.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Unit tests for Ndiff.
- 
-@@ -22,7 +22,7 @@ for x in dir(ndiff):
- sys.dont_write_bytecode = dont_write_bytecode
- del dont_write_bytecode
- 
--import StringIO
-+import io
- 
- 
- class scan_test(unittest.TestCase):
-@@ -52,7 +52,7 @@ class scan_test(unittest.TestCase):
-         scan.load_from_file("test-scans/single.xml")
-         host = scan.hosts[0]
-         self.assertEqual(len(host.ports), 5)
--        self.assertEqual(host.extraports.items(), [("filtered", 95)])
-+        self.assertEqual(list(host.extraports.items()), [("filtered", 95)])
- 
-     def test_extraports_multi(self):
-         """Test that the correct number of known ports is returned when there
-@@ -68,9 +68,9 @@ class scan_test(unittest.TestCase):
-         """Test that nmaprun information is recorded."""
-         scan = Scan()
-         scan.load_from_file("test-scans/empty.xml")
--        self.assertEqual(scan.scanner, u"nmap")
--        self.assertEqual(scan.version, u"4.90RC2")
--        self.assertEqual(scan.args, u"nmap -oX empty.xml -p 1-100")
-+        self.assertEqual(scan.scanner, "nmap")
-+        self.assertEqual(scan.version, "4.90RC2")
-+        self.assertEqual(scan.args, "nmap -oX empty.xml -p 1-100")
- 
-     def test_addresses(self):
-         """Test that addresses are recorded."""
-@@ -84,7 +84,7 @@ class scan_test(unittest.TestCase):
-         scan = Scan()
-         scan.load_from_file("test-scans/simple.xml")
-         host = scan.hosts[0]
--        self.assertEqual(host.hostnames, [u"scanme.nmap.org"])
-+        self.assertEqual(host.hostnames, ["scanme.nmap.org"])
- 
-     def test_os(self):
-         """Test that OS information is recorded."""
-@@ -99,7 +99,7 @@ class scan_test(unittest.TestCase):
-         scan.load_from_file("test-scans/complex.xml")
-         host = scan.hosts[0]
-         self.assertTrue(len(host.script_results) > 0)
--        self.assertTrue(len(host.ports[(22, u"tcp")].script_results) > 0)
-+        self.assertTrue(len(host.ports[(22, "tcp")].script_results) > 0)
- 
- # This test is commented out because Nmap XML doesn't store any information
- # about down hosts, not even the fact that they are down. Recovering the list
-@@ -128,16 +128,16 @@ class host_test(unittest.TestCase):
- 
-     def test_format_name(self):
-         h = Host()
--        self.assertTrue(isinstance(h.format_name(), basestring))
--        h.add_address(IPv4Address(u"127.0.0.1"))
--        self.assertTrue(u"127.0.0.1" in h.format_name())
-+        self.assertTrue(isinstance(h.format_name(), str))
-+        h.add_address(IPv4Address("127.0.0.1"))
-+        self.assertTrue("127.0.0.1" in h.format_name())
-         h.add_address(IPv6Address("::1"))
--        self.assertTrue(u"127.0.0.1" in h.format_name())
--        self.assertTrue(u"::1" in h.format_name())
--        h.add_hostname(u"localhost")
--        self.assertTrue(u"127.0.0.1" in h.format_name())
--        self.assertTrue(u"::1" in h.format_name())
--        self.assertTrue(u"localhost" in h.format_name())
-+        self.assertTrue("127.0.0.1" in h.format_name())
-+        self.assertTrue("::1" in h.format_name())
-+        h.add_hostname("localhost")
-+        self.assertTrue("127.0.0.1" in h.format_name())
-+        self.assertTrue("::1" in h.format_name())
-+        self.assertTrue("localhost" in h.format_name())
- 
-     def test_empty_get_port(self):
-         h = Host()
-@@ -197,8 +197,8 @@ class host_test(unittest.TestCase):
-         h = s.hosts[0]
-         self.assertEqual(len(h.ports), 5)
-         self.assertEqual(len(h.extraports), 1)
--        self.assertEqual(h.extraports.keys()[0], u"filtered")
--        self.assertEqual(h.extraports.values()[0], 95)
-+        self.assertEqual(list(h.extraports.keys())[0], "filtered")
-+        self.assertEqual(list(h.extraports.values())[0], 95)
-         self.assertEqual(h.state, "up")
- 
- 
-@@ -241,13 +241,13 @@ class port_test(unittest.TestCase):
-     """Test the Port class."""
-     def test_spec_string(self):
-         p = Port((10, "tcp"))
--        self.assertEqual(p.spec_string(), u"10/tcp")
-+        self.assertEqual(p.spec_string(), "10/tcp")
-         p = Port((100, "ip"))
--        self.assertEqual(p.spec_string(), u"100/ip")
-+        self.assertEqual(p.spec_string(), "100/ip")
- 
-     def test_state_string(self):
-         p = Port((10, "tcp"))
--        self.assertEqual(p.state_string(), u"unknown")
-+        self.assertEqual(p.state_string(), "unknown")
- 
- 
- class service_test(unittest.TestCase):
-@@ -255,47 +255,47 @@ class service_test(unittest.TestCase):
-     def test_compare(self):
-         """Test that services with the same contents compare equal."""
-         a = Service()
--        a.name = u"ftp"
--        a.product = u"FooBar FTP"
--        a.version = u"1.1.1"
--        a.tunnel = u"ssl"
-+        a.name = "ftp"
-+        a.product = "FooBar FTP"
-+        a.version = "1.1.1"
-+        a.tunnel = "ssl"
-         self.assertEqual(a, a)
-         b = Service()
--        b.name = u"ftp"
--        b.product = u"FooBar FTP"
--        b.version = u"1.1.1"
--        b.tunnel = u"ssl"
-+        b.name = "ftp"
-+        b.product = "FooBar FTP"
-+        b.version = "1.1.1"
-+        b.tunnel = "ssl"
-         self.assertEqual(a, b)
--        b.name = u"http"
-+        b.name = "http"
-         self.assertNotEqual(a, b)
-         c = Service()
-         self.assertNotEqual(a, c)
- 
-     def test_tunnel(self):
-         serv = Service()
--        serv.name = u"http"
--        serv.tunnel = u"ssl"
--        self.assertEqual(serv.name_string(), u"ssl/http")
-+        serv.name = "http"
-+        serv.tunnel = "ssl"
-+        self.assertEqual(serv.name_string(), "ssl/http")
- 
-     def test_version_string(self):
-         serv = Service()
--        serv.product = u"FooBar"
-+        serv.product = "FooBar"
-         self.assertTrue(len(serv.version_string()) > 0)
-         serv = Service()
--        serv.version = u"1.2.3"
-+        serv.version = "1.2.3"
-         self.assertTrue(len(serv.version_string()) > 0)
-         serv = Service()
--        serv.extrainfo = u"misconfigured"
-+        serv.extrainfo = "misconfigured"
-         self.assertTrue(len(serv.version_string()) > 0)
-         serv = Service()
--        serv.product = u"FooBar"
--        serv.version = u"1.2.3"
-+        serv.product = "FooBar"
-+        serv.version = "1.2.3"
-         # Must match Nmap output.
-         self.assertEqual(serv.version_string(),
--                u"%s %s" % (serv.product, serv.version))
--        serv.extrainfo = u"misconfigured"
-+                "%s %s" % (serv.product, serv.version))
-+        serv.extrainfo = "misconfigured"
-         self.assertEqual(serv.version_string(),
--                u"%s %s (%s)" % (serv.product, serv.version, serv.extrainfo))
-+                "%s %s (%s)" % (serv.product, serv.version, serv.extrainfo))
- 
- 
- class ScanDiffSub(ScanDiff):
-@@ -703,7 +703,7 @@ class scan_diff_xml_test(unittest.TestCase):
-         a.load_from_file("test-scans/empty.xml")
-         b = Scan()
-         b.load_from_file("test-scans/simple.xml")
--        f = StringIO.StringIO()
-+        f = io.StringIO()
-         self.scan_diff = ScanDiffXML(a, b, f)
-         self.scan_diff.output()
-         self.xml = f.getvalue()
-@@ -712,8 +712,8 @@ class scan_diff_xml_test(unittest.TestCase):
-     def test_well_formed(self):
-         try:
-             document = xml.dom.minidom.parseString(self.xml)
--        except Exception, e:
--            self.fail(u"Parsing XML diff output caused the exception: %s"
-+        except Exception as e:
-+            self.fail("Parsing XML diff output caused the exception: %s"
-                     % str(e))
- 
- 
-@@ -739,8 +739,8 @@ def host_apply_diff(host, diff):
-         host.os = diff.host_b.os[:]
- 
-     if diff.extraports_changed:
--        for state in host.extraports.keys():
--            for port in host.ports.values():
-+        for state in list(host.extraports.keys()):
-+            for port in list(host.ports.values()):
-                 if port.state == state:
-                     del host.ports[port.spec]
-         host.extraports = diff.host_b.extraports.copy()
-diff --git a/ndiff/scripts/ndiff b/ndiff/scripts/ndiff
-index 8517c07..4671e73 100755
---- a/ndiff/scripts/ndiff
-+++ b/ndiff/scripts/ndiff
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Ndiff
- #
-@@ -67,15 +67,15 @@ if INSTALL_LIB is not None and is_secure_dir(INSTALL_LIB):
- 
- try:
-     import ndiff
--except ImportError, e:
--    print >> sys.stderr, """\
-+except ImportError as e:
-+    print("""\
- Could not import the ndiff module: %s.
--I checked in these directories:""" % repr(e.message)
-+I checked in these directories:""" % repr(e), file=sys.stderr)
-     for dir in sys.path:
--        print >> sys.stderr, "    %s" % dir
--    print >> sys.stderr, """\
-+        print("    %s" % dir, file=sys.stderr)
-+    print("""\
- If you installed Ndiff in another directory, you may have to add the
--modules directory to the PYTHONPATH environment variable."""
-+modules directory to the PYTHONPATH environment variable.""", file=sys.stderr)
-     sys.exit(1)
- 
- import ndiff
-diff --git a/ndiff/setup.py b/ndiff/setup.py
-old mode 100644
-new mode 100755
-index b5e254c..c49bcf3
---- a/ndiff/setup.py
-+++ b/ndiff/setup.py
-@@ -94,7 +94,7 @@ class checked_install(distutils.command.install.install):
-         self.saved_prefix = sys.prefix
-         try:
-             distutils.command.install.install.finalize_options(self)
--        except distutils.errors.DistutilsPlatformError, e:
-+        except distutils.errors.DistutilsPlatformError as e:
-             raise distutils.errors.DistutilsPlatformError(str(e) + """
- Installing your distribution's python-dev package may solve this problem.""")
- 
-@@ -155,13 +155,13 @@ Installing your distribution's python-dev package may solve this problem.""")
- #!/usr/bin/env python
- import errno, os, os.path, sys
- 
--print 'Uninstall %(name)s'
-+print('Uninstall %(name)s')
- 
- answer = raw_input('Are you sure that you want to uninstall '
-     '%(name)s (yes/no) ')
- 
- if answer != 'yes' and answer != 'y':
--    print 'Not uninstalling.'
-+    print('Not uninstalling.')
-     sys.exit(0)
- 
- """ % {'name': APP_NAME}
-@@ -177,8 +177,8 @@ if answer != 'yes' and answer != 'y':
-                     # This should never happen (everything gets installed
-                     # inside the root), but if it does, be safe and don't
-                     # delete anything.
--                    uninstaller += ("print '%s was not installed inside "
--                        "the root %s; skipping.'\n" % (output, self.root))
-+                    uninstaller += ("print('%s was not installed inside "
-+                        "the root %s; skipping.')\n" % (output, self.root))
-                     continue
-                 output = path_strip_prefix(output, self.root)
-                 assert os.path.isabs(output)
-@@ -202,24 +202,24 @@ for path in INSTALLED_FILES:
-         dirs.append(path)
- # Delete the files.
- for file in files:
--    print "Removing '%s'." % file
-+    print("Removing '%s'." % file)
-     try:
-         os.remove(file)
--    except OSError, e:
--        print >> sys.stderr, '  Error: %s.' % str(e)
-+    except OSError as e:
-+        print('  Error: %s.' % str(e), file=sys.stderr)
- # Delete the directories. First reverse-sort the normalized paths by
- # length so that child directories are deleted before their parents.
- dirs = [os.path.normpath(dir) for dir in dirs]
- dirs.sort(key = len, reverse = True)
- for dir in dirs:
-     try:
--        print "Removing the directory '%s'." % dir
-+        print("Removing the directory '%s'." % dir)
-         os.rmdir(dir)
--    except OSError, e:
-+    except OSError as e:
-         if e.errno == errno.ENOTEMPTY:
--            print "Directory '%s' not empty; not removing." % dir
-+            print("Directory '%s' not empty; not removing." % dir)
-         else:
--            print >> sys.stderr, str(e)
-+            print(str(e), file=sys.stderr)
- """
- 
-         uninstaller_file = open(uninstaller_filename, 'w')
-@@ -227,7 +227,7 @@ for dir in dirs:
-         uninstaller_file.close()
- 
-         # Set exec bit for uninstaller
--        mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0555) & 07777
-+        mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0o555) & 0o7777
-         os.chmod(uninstaller_filename, mode)
- 
-     def write_installed_files(self):
-@@ -242,7 +242,7 @@ for dir in dirs:
-         try:
-             for output in self.get_installed_files():
-                 assert "\n" not in output
--                print >> f, output
-+                print(output, file=f)
-         finally:
-             f.close()
- 
-@@ -266,7 +266,7 @@ class my_uninstall(distutils.cmd.Command):
-         # Read the list of installed files.
-         try:
-             f = open(INSTALLED_FILES_NAME, "r")
--        except IOError, e:
-+        except IOError as e:
-             if e.errno == errno.ENOENT:
-                 log.error("Couldn't open the installation record '%s'. "
-                         "Have you installed yet?" % INSTALLED_FILES_NAME)
-@@ -289,7 +289,7 @@ class my_uninstall(distutils.cmd.Command):
-             try:
-                 if not self.dry_run:
-                     os.remove(file)
--            except OSError, e:
-+            except OSError as e:
-                 log.error(str(e))
-         # Delete the directories. First reverse-sort the normalized paths by
-         # length so that child directories are deleted before their parents.
-@@ -300,7 +300,7 @@ class my_uninstall(distutils.cmd.Command):
-                 log.info("Removing the directory '%s'." % dir)
-                 if not self.dry_run:
-                     os.rmdir(dir)
--            except OSError, e:
-+            except OSError as e:
-                 if e.errno == errno.ENOTEMPTY:
-                     log.info("Directory '%s' not empty; not removing." % dir)
-                 else:
-diff --git a/ndiff/test-scans/anonymize.py b/ndiff/test-scans/anonymize.py
-index 9ba612a..fd251fe 100755
---- a/ndiff/test-scans/anonymize.py
-+++ b/ndiff/test-scans/anonymize.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Anonymize an Nmap XML file, replacing host name and IP addresses with random
- # anonymous ones. Anonymized names will be consistent between runs of the
-@@ -20,20 +20,20 @@ r = random.Random()
- 
- 
- def hash(s):
--    digest = hashlib.sha512(s).hexdigest()
-+    digest = hashlib.sha512(s.encode()).hexdigest()
-     return int(digest, 16)
- 
- 
- def anonymize_mac_address(addr):
-     r.seed(hash(addr))
-     nums = (0, 0, 0) + tuple(r.randrange(256) for i in range(3))
--    return u":".join(u"%02X" % x for x in nums)
-+    return ":".join("%02X" % x for x in nums)
- 
- 
- def anonymize_ipv4_address(addr):
-     r.seed(hash(addr))
-     nums = (10,) + tuple(r.randrange(256) for i in range(3))
--    return u".".join(unicode(x) for x in nums)
-+    return ".".join(str(x) for x in nums)
- 
- 
- def anonymize_ipv6_address(addr):
-@@ -41,7 +41,7 @@ def anonymize_ipv6_address(addr):
-     # RFC 4193.
-     nums = (0xFD00 + r.randrange(256),)
-     nums = nums + tuple(r.randrange(65536) for i in range(7))
--    return u":".join("%04X" % x for x in nums)
-+    return ":".join("%04X" % x for x in nums)
- 
- # Maps to memoize address and host name conversions.
- hostname_map = {}
-@@ -54,11 +54,11 @@ def anonymize_hostname(name):
-     LETTERS = "acbdefghijklmnopqrstuvwxyz"
-     r.seed(hash(name))
-     length = r.randrange(5, 10)
--    prefix = u"".join(r.sample(LETTERS, length))
-+    prefix = "".join(r.sample(LETTERS, length))
-     num = r.randrange(1000)
--    hostname_map[name] = u"%s-%d.example.com" % (prefix, num)
-+    hostname_map[name] = "%s-%d.example.com" % (prefix, num)
-     if VERBOSE:
--        print >> sys.stderr, "Replace %s with %s" % (name, hostname_map[name])
-+        print("Replace %s with %s" % (name, hostname_map[name]), file=sys.stderr)
-     return hostname_map[name]
- 
- mac_re = re.compile(r'\b([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}\b')
-@@ -78,7 +78,7 @@ def anonymize_address(addr):
-     else:
-         assert False
-     if VERBOSE:
--        print >> sys.stderr, "Replace %s with %s" % (addr, address_map[addr])
-+        print("Replace %s with %s" % (addr, address_map[addr]), file=sys.stderr)
-     return address_map[addr]
- 
- 
--- 
-2.24.1
-
diff --git a/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch b/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch
deleted file mode 100644
index c43ff9f4d8..0000000000
--- a/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 562893e665a6c9e1b60c8b3242bab6fe78318b3b Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Fri, 14 Feb 2020 08:19:54 +0000
-Subject: [PATCH] configure.ac: make ndiff depend on python3
-
-Python 2 ceased being maintained on the 1st January 2020.
-We've already removed all users of it from oe-core, so
-let ndiff depend on python3.
-
-Upstream-Status: Pending
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- .../nmap/7.80-r0/nmap-7.80/configure.ac               | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9d2fff8..5ffdd55 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -237,16 +237,21 @@ if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x2"; then
-     HAVE_PYTHON2=true
- fi
- 
-+HAVE_PYTHON3=false
-+if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x3"; then
-+    HAVE_PYTHON3=true
-+fi
-+
- NDIFFDIR=ndiff
- 
- # Do they want Ndiff?
- AC_ARG_WITH(ndiff, AC_HELP_STRING([--without-ndiff], [Skip installation of the Ndiff utility]), [], [with_ndiff=check])
--if $HAVE_PYTHON2 ; then : ;
-+if $HAVE_PYTHON3 ; then : ;
- else
-   if test "$with_ndiff" = "check" ; then
--    AC_MSG_WARN([Not building Ndiff because Python 2.x with x>=4 was not found])
-+    AC_MSG_WARN([Not building Ndiff because Python3 was not found])
-   elif test "$with_ndiff" = "yes"; then
--    AC_MSG_FAILURE([--with-ndiff requires Python 2.x with x>=4])
-+    AC_MSG_FAILURE([--with-ndiff requires Python3])
-   fi
-   with_ndiff=no
- fi
--- 
-2.24.1
-
diff --git a/meta-oe/recipes-security/nmap/files/0001-fix-racing-between-build-ncat-and-build-lua.patch b/meta-oe/recipes-security/nmap/files/0001-fix-racing-between-build-ncat-and-build-lua.patch
new file mode 100644
index 0000000000..aad8b1ee92
--- /dev/null
+++ b/meta-oe/recipes-security/nmap/files/0001-fix-racing-between-build-ncat-and-build-lua.patch
@@ -0,0 +1,55 @@
+From 0cde425abfcacdde725dccff29d01c9fce7c3888 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Sun, 9 Feb 2025 00:45:36 +0000
+Subject: [PATCH] fix racing between build-ncat and build-lua
+
+There are two build-lua rules, one in Makefile.in, another in
+ncat/Makefile.in which is required by build-ncat
+
+Build them may cause potential racing
+
+$ bitbake lib32-nmap
+$ grep -e "Compiling liblua" -e 'nmap-7.95/liblua' -e ": error" -n patch-to/temp/log.do_compile
+Compiling liblua
+make[1]: Entering directory 'path-to/build/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+Compiling liblua
+make[2]: Entering directory 'path-to/build/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+make[2]: Leaving directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/recipe-sysroot-native/usr/bin/i686-wrsmllib32-linux/../../libexec/i686-wrsmllib32-linux/gcc/i686-wrsmllib32-linux/14.2.0/ld: ./../liblua/liblua.a: error adding symbols: no more archived files
+collect2: error: ld returned 1 exit status
+make[1]: Leaving directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+
+Explicitly make build-ncat depends on build-lua to avoid racing,
+after applying the patch
+...
+Compiling liblua
+make[1]: Entering directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+make[1]: Leaving directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+Compiling liblua
+make[2]: Entering directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+make[2]: Leaving directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+...
+
+Upstream-Status: Submitted [https://github.com/nmap/nmap/pull/3025]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e2f79c9..0e634a3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -159,7 +159,7 @@ build-netutil: libnetutil/Makefile
+        @echo Compiling libnetutil;
+        cd libnetutil && $(MAKE)
+ 
+-build-ncat: $(NCATDIR)/Makefile build-nbase build-nsock $(NCATDIR)/ncat.h @PCAP_BUILD@
++build-ncat: $(NCATDIR)/Makefile build-nbase build-nsock build-lua $(NCATDIR)/ncat.h @PCAP_BUILD@
+        cd $(NCATDIR) && $(MAKE)
+ 
+ build-lua: $(LIBLUADIR)/Makefile
+-- 
+2.47.1
+
diff --git a/meta-oe/recipes-security/nmap/files/0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch b/meta-oe/recipes-security/nmap/files/0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch
new file mode 100644
index 0000000000..bcb04250bb
--- /dev/null
+++ b/meta-oe/recipes-security/nmap/files/0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch
@@ -0,0 +1,165 @@
+From 364d089250d1acf459e9e8580161e7bb06268106 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@fujitsu.com>
+Date: Tue, 15 Oct 2024 02:47:38 +0000
+Subject: [PATCH] Fix off-by-one overflow in the IP protocol table.
+
+Fixes #2896, closes #2897, closes #2900
+
+Upstream-Status: Backport [https://github.com/nmap/nmap/commit/efa0dc36f2ecade6ba8d2ed25dd4d5fbffdea308]
+
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+---
+ CHANGELOG     |  3 +++
+ portlist.cc   |  8 ++++----
+ protocols.cc  |  6 +++---
+ protocols.h   |  2 ++
+ scan_lists.cc | 10 +++++-----
+ 5 files changed, 17 insertions(+), 12 deletions(-)
+
+diff --git a/CHANGELOG b/CHANGELOG
+index f01262c..5b204bd 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -1,5 +1,8 @@
+ #Nmap Changelog ($Id: CHANGELOG 38849 2024-04-18 17:16:42Z dmiller $); -*-text-*-
+ 
++o [GH#2900, GH#2896, GH#2897] Nmap is now able to scan IP protocol 255.
++  [nnposter]
++
+ Nmap 7.95 [2024-04-19]
+ 
+ o [Windows] Upgraded Npcap (our Windows raw packet capturing and
+diff --git a/portlist.cc b/portlist.cc
+index 8258853..cd08437 100644
+--- a/portlist.cc
++++ b/portlist.cc
+@@ -480,7 +480,7 @@ void PortList::setPortState(u16 portno, u8 protocol, int state, int *oldstate) {
+       state != PORT_CLOSEDFILTERED)
+     fatal("%s: attempt to add port number %d with illegal state %d\n", __func__, portno, state);
+ 
+-  assert(protocol!=IPPROTO_IP || portno<256);
++  assert(protocol!=IPPROTO_IP || portno<=MAX_IPPROTONUM);
+ 
+   bool created = false;
+   current = createPort(portno, protocol, &created);
+@@ -566,7 +566,7 @@ Port *PortList::nextPort(const Port *cur, Port *next,
+   if (cur) {
+     proto = INPROTO2PORTLISTPROTO(cur->proto);
+     assert(port_map[proto]!=NULL); // Hmm, it's not possible to handle port that doesn't have anything in map
+-    assert(cur->proto!=IPPROTO_IP || cur->portno<256);
++    assert(cur->proto!=IPPROTO_IP || cur->portno<=MAX_IPPROTONUM);
+     mapped_pno = port_map[proto][cur->portno];
+     mapped_pno++; //  we're interested in next port after current
+   } else { // running for the first time
+@@ -615,7 +615,7 @@ void PortList::mapPort(u16 *portno, u8 *protocol) const {
+   mapped_protocol = INPROTO2PORTLISTPROTO(*protocol);
+ 
+   if (*protocol == IPPROTO_IP)
+-    assert(*portno < 256);
++    assert(*portno <= MAX_IPPROTONUM);
+   if(port_map[mapped_protocol]==NULL || port_list[mapped_protocol]==NULL) {
+     fatal("%s(%i,%i): you're trying to access uninitialized protocol", __func__, *portno, *protocol);
+   }
+@@ -713,7 +713,7 @@ int PortList::port_list_count[PORTLIST_PROTO_MAX];
+  * should be sorted. */
+ void PortList::initializePortMap(int protocol, u16 *ports, int portcount) {
+   int i;
+-  int ports_max = (protocol == IPPROTO_IP) ? 256 : 65536;
++  int ports_max = (protocol == IPPROTO_IP) ? MAX_IPPROTONUM + 1 : 65536;
+   int proto = INPROTO2PORTLISTPROTO(protocol);
+ 
+   if (port_map[proto] != NULL || port_map_rev[proto] != NULL)
+diff --git a/protocols.cc b/protocols.cc
+index 76e42c7..85e55e4 100644
+--- a/protocols.cc
++++ b/protocols.cc
+@@ -79,7 +79,7 @@ struct strcmp_comparator {
+ 
+ // IP Protocol number is 8 bits wide
+ // protocol_table[IPPROTO_TCP] == {"tcp", 6}
+-static struct nprotoent *protocol_table[UCHAR_MAX];
++static struct nprotoent *protocol_table[MAX_IPPROTONUM + 1];
+ // proto_map["tcp"] = {"tcp", 6}
+ typedef std::map<const char *, struct nprotoent, strcmp_comparator> ProtoMap;
+ static ProtoMap proto_map;
+@@ -119,7 +119,7 @@ static int nmap_protocols_init() {
+     if (*p == '#' || *p == '\0')
+       continue;
+     res = sscanf(line, "%127s %hu", protocolname, &protno);
+-    if (res !=2 || protno > UCHAR_MAX) {
++    if (res !=2 || protno > MAX_IPPROTONUM) {
+       error("Parse error in protocols file %s line %d", filename, lineno);
+       continue;
+     }
+@@ -191,7 +191,7 @@ const struct nprotoent *nmap_getprotbynum(int num) {
+   if (nmap_protocols_init() == -1)
+     return NULL;
+ 
+-  assert(num >= 0 && num < UCHAR_MAX);
++  assert(num >= 0 && num <= MAX_IPPROTONUM);
+   return protocol_table[num];
+ }
+ 
+diff --git a/protocols.h b/protocols.h
+index 8934284..2de0aa4 100644
+--- a/protocols.h
++++ b/protocols.h
+@@ -79,6 +79,8 @@ int addprotocolsfromservmask(char *mask, u8 *porttbl);
+ const struct nprotoent *nmap_getprotbynum(int num);
+ const struct nprotoent *nmap_getprotbyname(const char *name);
+ 
++#define MAX_IPPROTONUM 255
++
+ #define MAX_IPPROTOSTRLEN 4
+ #define IPPROTO2STR(p)         \
+   ((p)==IPPROTO_TCP ? "tcp" :  \
+diff --git a/scan_lists.cc b/scan_lists.cc
+index f02e279..ebe1357 100644
+--- a/scan_lists.cc
++++ b/scan_lists.cc
+@@ -165,7 +165,7 @@ void getpts(const char *origexpr, struct scan_lists *ports) {
+       ports->udp_count++;
+     if (porttbl[i] & SCAN_SCTP_PORT)
+       ports->sctp_count++;
+-    if (porttbl[i] & SCAN_PROTOCOLS && i < 256)
++    if (porttbl[i] & SCAN_PROTOCOLS && i <= MAX_IPPROTONUM)
+       ports->prot_count++;
+   }
+ 
+@@ -192,7 +192,7 @@ void getpts(const char *origexpr, struct scan_lists *ports) {
+       ports->udp_ports[udpi++] = i;
+     if (porttbl[i] & SCAN_SCTP_PORT)
+       ports->sctp_ports[sctpi++] = i;
+-    if (porttbl[i] & SCAN_PROTOCOLS && i < 256)
++    if (porttbl[i] & SCAN_PROTOCOLS && i <= MAX_IPPROTONUM)
+       ports->prots[proti++] = i;
+   }
+ 
+@@ -388,7 +388,7 @@ static void getpts_aux(const char *origexpr, int nested, u8 *porttbl, int range_
+     } else if (isdigit((int) (unsigned char) *current_range)) {
+       rangestart = strtol(current_range, &endptr, 10);
+       if (range_type & SCAN_PROTOCOLS) {
+-        if (rangestart < 0 || rangestart > 255)
++        if (rangestart < 0 || rangestart > MAX_IPPROTONUM)
+           fatal("Protocols specified must be between 0 and 255 inclusive");
+       } else {
+         if (rangestart < 0 || rangestart > 65535)
+@@ -429,13 +429,13 @@ static void getpts_aux(const char *origexpr, int nested, u8 *porttbl, int range_
+       if (!*current_range || *current_range == ',' || *current_range == ']') {
+         /* Ended with a -, meaning up until the last possible port */
+         if (range_type & SCAN_PROTOCOLS)
+-          rangeend = 255;
++          rangeend = MAX_IPPROTONUM;
+         else
+           rangeend = 65535;
+       } else if (isdigit((int) (unsigned char) *current_range)) {
+         rangeend = strtol(current_range, &endptr, 10);
+         if (range_type & SCAN_PROTOCOLS) {
+-          if (rangeend < 0 || rangeend > 255)
++          if (rangeend < 0 || rangeend > MAX_IPPROTONUM)
+             fatal("Protocols specified must be between 0 and 255 inclusive");
+         } else {
+           if (rangeend < 0 || rangeend > 65535)
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch b/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch
index 356b5071bf..5669ccdf6a 100644
--- a/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch
+++ b/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch
@@ -10,20 +10,9 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
  Makefile.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index 1bb062c..cced2fb 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -311,7 +311,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py
- 
- install-zenmap: $(ZENMAPDIR)/setup.py
-        $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
--       cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
-+       cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --force $(if $(DESTDIR),--root "$(DESTDIR)")
-        $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
- # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
- # already a link.
-@@ -328,7 +328,7 @@ build-nping: $(NPINGDIR)/Makefile nbase_build nsock_build netutil_build $(NPINGD
+@@ -383,7 +383,7 @@ build-nping: $(NPINGDIR)/Makefile build-
         @cd $(NPINGDIR) && $(MAKE)
  
  install-ndiff:
@@ -32,6 +21,3 @@ index 1bb062c..cced2fb 100644
  
  NSE_FILES = scripts/script.db scripts/*.nse
  NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc
--- 
-1.9.1
-
diff --git a/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch b/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch
index cfe043af4b..a07061d4df 100644
--- a/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch
+++ b/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch
@@ -12,11 +12,9 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
  nmap-update/Makefile.in | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/ncat/Makefile.in b/ncat/Makefile.in
-index cfd306d..2166e08 100644
 --- a/ncat/Makefile.in
 +++ b/ncat/Makefile.in
-@@ -163,11 +163,11 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Makefile
+@@ -162,11 +162,11 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Make
  
  install: $(TARGET)
         @echo Installing Ncat;
@@ -30,19 +28,3 @@ index cfd306d..2166e08 100644
                 $(INSTALL) -c -m 644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)/; \
         fi
         $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1
-diff --git a/nmap-update/Makefile.in b/nmap-update/Makefile.in
-index 89ff928..93f48d8 100644
---- a/nmap-update/Makefile.in
-+++ b/nmap-update/Makefile.in
-@@ -37,7 +37,7 @@ $(NBASELIB):
-        cd $(NBASEDIR) && $(MAKE)
- 
- install: nmap-update
--       $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
-+       mkdir -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
-        $(INSTALL) -c -m 755 nmap-update $(DESTDIR)$(bindir)
-        $(STRIP) -x $(DESTDIR)$(bindir)/nmap-update
-        $(INSTALL) -c -m 644 ../docs/nmap-update.1 $(DESTDIR)$(mandir)/man1/
--- 
-1.9.1
-
diff --git a/meta-oe/recipes-security/nmap/nmap-7.92/0001-redefine-the-python-library-install-dir.patch b/meta-oe/recipes-security/nmap/nmap-7.92/0001-redefine-the-python-library-install-dir.patch
new file mode 100644
index 0000000000..6298f7ea26
--- /dev/null
+++ b/meta-oe/recipes-security/nmap/nmap-7.92/0001-redefine-the-python-library-install-dir.patch
@@ -0,0 +1,31 @@
+From 67b4614ea529460dca9326bfe5d355bad6f9bdee Mon Sep 17 00:00:00 2001
+From: Roy Li <rongqing.li@windriver.com>
+Date: Sun, 27 Apr 2025 16:33:08 +0800
+Subject: [PATCH] redefine the python library install dir
+
+If install-lib is not defined, it is always /usr/lib/, but it
+maybe /usr/lib64 for multilib
+
+Upstream-Status: Pending
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ccfceda..6b25d27 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -387,7 +387,7 @@ build-nping: $(NPINGDIR)/Makefile build-nbase build-nsock build-netutil $(NPINGD
+        @cd $(NPINGDIR) && $(MAKE)
+ 
+ install-ndiff:
+-       cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)")
++       cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)")
+ 
+ NSE_FILES = scripts/script.db scripts/*.nse
+ NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-security/nmap/nmap-7.92/0002-replace-.-shtool-mkdir-with-coreutils-mkdir-command.patch b/meta-oe/recipes-security/nmap/nmap-7.92/0002-replace-.-shtool-mkdir-with-coreutils-mkdir-command.patch
new file mode 100644
index 0000000000..f81e230b28
--- /dev/null
+++ b/meta-oe/recipes-security/nmap/nmap-7.92/0002-replace-.-shtool-mkdir-with-coreutils-mkdir-command.patch
@@ -0,0 +1,38 @@
+From 783333de42b06020f5c0852c415cd34972a773fb Mon Sep 17 00:00:00 2001
+From: Roy Li <rongqing.li@windriver.com>
+Date: Sun, 27 Apr 2025 16:35:11 +0800
+Subject: [PATCH] replace "./shtool mkdir" with coreutils mkdir command
+
+"./shtool mkdir" is used when mkdir has not -p parameter, but mkdir in
+today most release has supportted the -p parameter, not need to use
+shtool, and it can not fix the race if two process are running mkdir to
+create same dir
+
+Upstream-Status: Pending
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ ncat/Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ncat/Makefile.in b/ncat/Makefile.in
+index 4632a78..11a5e7c 100644
+--- a/ncat/Makefile.in
++++ b/ncat/Makefile.in
+@@ -166,11 +166,11 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Makefile
+ 
+ install: $(TARGET)
+        @echo Installing Ncat;
+-       $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
++       mkdir -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+        $(INSTALL) -c -m 755 ncat $(DESTDIR)$(bindir)/ncat
+        $(STRIP) -x $(DESTDIR)$(bindir)/ncat
+        if [ -n "$(DATAFILES)" ]; then \
+-               $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(pkgdatadir); \
++               mkdir -p -m 755 $(DESTDIR)$(pkgdatadir); \
+                $(INSTALL) -c -m 644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)/; \
+        fi
+        $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-security/nmap/nmap-7.92/0003-Include-time.h-header-to-pass-clang-compilation.patch b/meta-oe/recipes-security/nmap/nmap-7.92/0003-Include-time.h-header-to-pass-clang-compilation.patch
new file mode 100644
index 0000000000..b940124f98
--- /dev/null
+++ b/meta-oe/recipes-security/nmap/nmap-7.92/0003-Include-time.h-header-to-pass-clang-compilation.patch
@@ -0,0 +1,76 @@
+From e9d876bedc8a7bc96856ecf38bbeeafee2d5b206 Mon Sep 17 00:00:00 2001
+From: Peiran Hong <peiran.hong@windriver.com>
+Date: Fri, 20 Sep 2019 15:02:45 -0400
+Subject: [PATCH] Include time.h header to pass clang compilation
+
+Upstream-Status: Pending
+
+Signed-off-by: Peiran Hong <peiran.hong@windriver.com>
+---
+ nmap_error.cc       | 11 +----------
+ nping/EchoServer.cc |  1 +
+ osscan2.cc          |  1 +
+ service_scan.cc     |  1 +
+ 4 files changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/nmap_error.cc b/nmap_error.cc
+index 5ec938f..83ba6cc 100644
+--- a/nmap_error.cc
++++ b/nmap_error.cc
+@@ -67,16 +67,7 @@
+ #include "xml.h"
+ 
+ #include <errno.h>
+-#if TIME_WITH_SYS_TIME
+-# include <sys/time.h>
+-# include <time.h>
+-#else
+-# if HAVE_SYS_TIME_H
+-#  include <sys/time.h>
+-# else
+-#  include <time.h>
+-# endif
+-#endif
++#include <time.h>
+ 
+ extern NmapOps o;
+ 
+diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc
+index dea2851..c80efb4 100644
+--- a/nping/EchoServer.cc
++++ b/nping/EchoServer.cc
+@@ -69,6 +69,7 @@
+ #include "NpingOps.h"
+ #include "ProbeMode.h"
+ #include <signal.h>
++#include <time.h>
+ 
+ extern NpingOps o;
+ extern EchoServer es;
+diff --git a/osscan2.cc b/osscan2.cc
+index efe6da0..392c65f 100644
+--- a/osscan2.cc
++++ b/osscan2.cc
+@@ -80,6 +80,7 @@
+ 
+ #include <list>
+ #include <math.h>
++#include <time.h>
+ 
+ extern NmapOps o;
+ #ifdef WIN32
+diff --git a/service_scan.cc b/service_scan.cc
+index 66e0d92..161f2a1 100644
+--- a/service_scan.cc
++++ b/service_scan.cc
+@@ -77,6 +77,7 @@
+ #include "nmap_tty.h"
+ 
+ #include <errno.h>
++#include <time.h>
+ 
+ #if HAVE_OPENSSL
+ /* OpenSSL 1.0.0 needs _WINSOCKAPI_ to be defined, otherwise it loads
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-security/nmap/nmap-7.92/0004-Fix-building-with-libc.patch b/meta-oe/recipes-security/nmap/nmap-7.92/0004-Fix-building-with-libc.patch
new file mode 100644
index 0000000000..295abe6d50
--- /dev/null
+++ b/meta-oe/recipes-security/nmap/nmap-7.92/0004-Fix-building-with-libc.patch
@@ -0,0 +1,79 @@
+From 4c54b00e6f3749924532c2636eae01daff9e4bcd Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 20 Jan 2019 23:11:56 -0800
+Subject: [PATCH] Fix building with libc++
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ nping/EchoServer.cc | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc
+index c80efb4..914bd54 100644
+--- a/nping/EchoServer.cc
++++ b/nping/EchoServer.cc
+@@ -214,14 +214,14 @@ int EchoServer::nep_listen_socket(){
+         server_addr6.sin6_len = sizeof(struct sockaddr_in6);
+     #endif
+     /* Bind to local address and the specified port */
+-    if( bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
++    if( ::bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
+         nping_warning(QT_3, "Failed to bind to source address %s. Trying to bind to port %d...", IPtoa(server_addr6.sin6_addr), port);
+         /* If the bind failed for the supplied address, just try again with in6addr_any */
+         if( o.spoofSource() ){
+             server_addr6.sin6_addr = in6addr_any;
+-            if( bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
++            if( ::bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){
+                 nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno));
+-            }else{ 
++            }else{
+                 nping_print(VB_1, "Server bound to port %d", port);
+             }
+         }
+@@ -252,12 +252,12 @@ int EchoServer::nep_listen_socket(){
+ #endif
+ 
+     /* Bind to local address and the specified port */
+-    if( bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
++    if( ::bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
+         nping_warning(QT_3, "Failed to bind to source address %s. Trying to bind to port %d...", IPtoa(server_addr4.sin_addr), port);
+         /* If the bind failed for the supplied address, just try again with in6addr_any */
+         if( o.spoofSource() ){
+             server_addr4.sin_addr.s_addr=INADDR_ANY;
+-            if( bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
++            if( ::bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){
+                 nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno));
+             }else{
+                 nping_print(VB_1, "Server bound to port %d", port);
+@@ -493,7 +493,7 @@ clientid_t EchoServer::nep_match_headers(IPv4Header *ip4, IPv6Header *ip6, TCPHe
+                             nping_print(DBG_3, ";");
+                             /* The payload magic may affect the score only between
+                              * zero and 4 bytes. This is done to prevent long
+-                             * common strings like "GET / HTTP/1.1\r\n" 
++                             * common strings like "GET / HTTP/1.1\r\n"
+                              * increasing the score a lot and cause problems for
+                              * the matching logic. */
+                             current_score+= MIN(4, fspec->len)*FACTOR_PAYLOAD_MAGIC;
+@@ -503,7 +503,7 @@ clientid_t EchoServer::nep_match_headers(IPv4Header *ip4, IPv6Header *ip6, TCPHe
+                     default:
+                         nping_warning(QT_2, "Bogus field specifier found in client #%d context. Please report a bug", ctx->getIdentifier());
+                     break;
+-                }           
++                }
+             } /* End of field specifiers loop */
+ 
+             nping_print(DBG_3, "%s() current_score=%.02f candidate_score=%.02f", __func__, current_score, candidate_score);
+@@ -582,7 +582,7 @@ clientid_t EchoServer::nep_match_packet(const u8 *pkt, size_t pktlen){
+                 }else{
+                     if( (tcplen=tcp.validate())==OP_FAILURE){
+                         return CLIENT_NOT_FOUND;
+-                    }else{                        
++                    }else{
+                         if( (int)pktlen > (iplen+tcplen) ){
+                            if( payload.storeRecvData(pkt+iplen+tcplen, pktlen-iplen-tcplen)!=OP_FAILURE)
+                                payload_included=true;
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-security/nmap/nmap-7.92/0005-fix-racing-between-build-ncat-and-build-lua.patch b/meta-oe/recipes-security/nmap/nmap-7.92/0005-fix-racing-between-build-ncat-and-build-lua.patch
new file mode 100644
index 0000000000..f660719640
--- /dev/null
+++ b/meta-oe/recipes-security/nmap/nmap-7.92/0005-fix-racing-between-build-ncat-and-build-lua.patch
@@ -0,0 +1,55 @@
+From c1b436da46a7e3089b657f3f92308defc0ebb735 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Sun, 9 Feb 2025 00:45:36 +0000
+Subject: [PATCH] fix racing between build-ncat and build-lua
+
+There are two build-lua rules, one in Makefile.in, another in
+ncat/Makefile.in which is required by build-ncat
+
+Build them may cause potential racing
+
+$ bitbake lib32-nmap
+$ grep -e "Compiling liblua" -e 'nmap-7.95/liblua' -e ": error" -n patch-to/temp/log.do_compile
+Compiling liblua
+make[1]: Entering directory 'path-to/build/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+Compiling liblua
+make[2]: Entering directory 'path-to/build/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+make[2]: Leaving directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/recipe-sysroot-native/usr/bin/i686-wrsmllib32-linux/../../libexec/i686-wrsmllib32-linux/gcc/i686-wrsmllib32-linux/14.2.0/ld: ./../liblua/liblua.a: error adding symbols: no more archived files
+collect2: error: ld returned 1 exit status
+make[1]: Leaving directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+
+Explicitly make build-ncat depends on build-lua to avoid racing,
+after applying the patch
+...
+Compiling liblua
+make[1]: Entering directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+make[1]: Leaving directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+Compiling liblua
+make[2]: Entering directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+make[2]: Leaving directory 'path-to/tmp/work/corei7-32-wrsmllib32-linux/lib32-nmap/7.95/nmap-7.95/liblua'
+...
+
+Upstream-Status: Submitted [https://github.com/nmap/nmap/pull/3025]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6b25d27..b0a2719 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -159,7 +159,7 @@ build-netutil: libnetutil/Makefile
+        @echo Compiling libnetutil;
+        cd libnetutil && $(MAKE)
+ 
+-build-ncat: $(NCATDIR)/Makefile build-nbase build-nsock $(NCATDIR)/ncat.h @PCAP_BUILD@
++build-ncat: $(NCATDIR)/Makefile build-nbase build-nsock build-lua $(NCATDIR)/ncat.h @PCAP_BUILD@
+        cd $(NCATDIR) && $(MAKE)
+ 
+ build-lua: $(LIBLUADIR)/Makefile
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-security/nmap/nmap-7.92/0006-Fix-build-with-libpcap-1.10.5.patch b/meta-oe/recipes-security/nmap/nmap-7.92/0006-Fix-build-with-libpcap-1.10.5.patch
new file mode 100644
index 0000000000..4ee4a7295e
--- /dev/null
+++ b/meta-oe/recipes-security/nmap/nmap-7.92/0006-Fix-build-with-libpcap-1.10.5.patch
@@ -0,0 +1,47 @@
+From ba7b4a8cc570f0ce154f186fbe840f0ac23b2b96 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Mon, 28 Apr 2025 10:04:46 +0800
+Subject: [PATCH] Fix build with libpcap 1.10.5
+
+Fixes:
+In file included from /build/tmp/work/core2-64-poky-linux/nmap/7.92/recipe-sysroot/usr/include/pcap/pcap.h:130,
+                 from /build/tmp/work/core2-64-poky-linux/nmap/7.92/recipe-sysroot/usr/include/pcap.h:43,
+                 from tcpip.h:72,
+                 from nse_nsock.cc:4:
+nse_nsock.cc:36:3: error: expected identifier before 'int'
+   36 |   PCAP_SOCKET = lua_upvalueindex(3), /* pcap socket metatable */
+      |   ^~~~~~~~~~~
+nse_nsock.cc:36:3: error: expected '}' before 'int'
+nse_nsock.cc:33:6: note: to match this '{'
+   33 | enum {
+      |      ^
+nse_nsock.cc:36:15: error: expected unqualified-id before '=' token
+   36 |   PCAP_SOCKET = lua_upvalueindex(3), /* pcap socket metatable */
+      |               ^
+nse_nsock.cc:40:1: error: expected declaration before '}' token
+   40 | };
+      | ^
+
+Upstream-Status: Pending
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ nse_nsock.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/nse_nsock.cc b/nse_nsock.cc
+index 75ddeb6..a3c5186 100644
+--- a/nse_nsock.cc
++++ b/nse_nsock.cc
+@@ -29,6 +29,8 @@
+ 
+ #define DEFAULT_TIMEOUT 30000
+ 
++#undef PCAP_SOCKET
++
+ /* Upvalues for library variables */
+ enum {
+   NSOCK_POOL = lua_upvalueindex(1),
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-security/nmap/nmap_7.92.bb b/meta-oe/recipes-security/nmap/nmap_7.92.bb
new file mode 100644
index 0000000000..98969fe001
--- /dev/null
+++ b/meta-oe/recipes-security/nmap/nmap_7.92.bb
@@ -0,0 +1,66 @@
+SUMMARY = "network auditing tool"
+DESCRIPTION = "Nmap (Network Mapper) is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf"
+SECTION = "security"
+LICENSE = "GPL-2.0-only"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b8823a06822788010eae05b4f5e921b3"
+
+SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \
+           file://0001-redefine-the-python-library-install-dir.patch \
+           file://0002-replace-.-shtool-mkdir-with-coreutils-mkdir-command.patch \
+           file://0003-Include-time.h-header-to-pass-clang-compilation.patch \
+           file://0004-Fix-building-with-libc.patch \
+           file://0005-fix-racing-between-build-ncat-and-build-lua.patch \
+           file://0006-Fix-build-with-libpcap-1.10.5.patch \
+           "
+SRC_URI[sha256sum] = "a5479f2f8a6b0b2516767d2f7189c386c1dc858d997167d7ec5cfc798c7571a1" 
+
+UPSTREAM_CHECK_REGEX = "nmap-(?P<pver>\d+(\.\d+)+)\.tar"
+
+inherit autotools-brokensep pkgconfig python3native
+
+PACKAGECONFIG ?= "pcre ncat nping pcap"
+
+PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap"
+PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre"
+PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl"
+PACKAGECONFIG[ssh2] = "--with-openssh2=${STAGING_LIBDIR}/.., --without-openssh2, libssh2, libssh2"
+PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, zlib"
+
+# disable/enable packages
+PACKAGECONFIG[nping] = ",--without-nping,"
+PACKAGECONFIG[ncat] = ",--without-ncat,"
+PACKAGECONFIG[ndiff] = "--with-ndiff=yes,--without-ndiff,python3 python3-setuptools-native"
+PACKAGECONFIG[update] = ",--without-nmap-update,"
+
+EXTRA_OECONF = "--with-libdnet=included --with-liblinear=included --without-subversion --with-liblua=included"
+
+# zenmap needs python-pygtk which has been removed
+# it also only works with python2
+# disable for now until py3 is supported
+EXTRA_OECONF += "--without-zenmap"
+
+export PYTHON_SITEPACKAGES_DIR
+
+do_configure() {
+    autoconf
+    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
+    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
+    oe_runconf
+}
+
+do_install:append() {
+    for f in ndiff uninstall_ndiff; do
+        if [ -f ${D}${bindir}/$f ]; then
+            sed -i 's@^#!.*$@#!/usr/bin/env python3@g' ${D}${bindir}/$f
+        fi
+    done
+}
+
+FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat"
+
+RDEPENDS:${PN} += " \
+    python3-difflib \
+    python3-asyncio \
+    python3-xml \
+"
diff --git a/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-oe/recipes-security/nmap/nmap_7.95.bb
index f9fe82a91d..a892c1e910 100644
--- a/meta-oe/recipes-security/nmap/nmap_7.80.bb
+++ b/meta-oe/recipes-security/nmap/nmap_7.95.bb
@@ -1,28 +1,28 @@
 SUMMARY = "network auditing tool"
-DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf"
+DESCRIPTION = "Nmap (Network Mapper) is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf"
 SECTION = "security"
-LICENSE = "GPL-2.0-only"
+LICENSE = "NPSL"
 
-LIC_FILES_CHKSUM = "file://COPYING;beginline=7;endline=12;md5=66938a7e5b4c118eda78271de14874c2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=895af8527fe4bcb72f271fd1841fd2f6"
 
 SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \
            file://nmap-redefine-the-python-library-dir.patch \
            file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \
            file://0001-Include-time.h-header-to-pass-clang-compilation.patch \
            file://0002-Fix-building-with-libc.patch \
-           file://0001-Make-ndiff-support-python3.patch \
-           file://0001-configure.ac-make-ndiff-depend-on-python3.patch \
+           file://0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch \
+           file://0001-fix-racing-between-build-ncat-and-build-lua.patch \
            "
+SRC_URI[sha256sum] = "e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778" 
 
-SRC_URI[md5sum] = "d37b75b06d1d40f27b76d60db420a1f5"
-SRC_URI[sha256sum] = "fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa"
+UPSTREAM_CHECK_REGEX = "nmap-(?P<pver>\d+(\.\d+)+)\.tar"
 
 inherit autotools-brokensep pkgconfig python3native
 
-PACKAGECONFIG ?= "ncat nping pcap"
+PACKAGECONFIG ?= "pcre ncat nping pcap"
 
 PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap"
-PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre"
+PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre2"
 PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl"
 PACKAGECONFIG[ssh2] = "--with-openssh2=${STAGING_LIBDIR}/.., --without-openssh2, libssh2, libssh2"
 PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, zlib"
@@ -30,7 +30,7 @@ PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, z
 #disable/enable packages
 PACKAGECONFIG[nping] = ",--without-nping,"
 PACKAGECONFIG[ncat] = ",--without-ncat,"
-PACKAGECONFIG[ndiff] = "--with-ndiff=yes,--without-ndiff,python3"
+PACKAGECONFIG[ndiff] = "--with-ndiff=yes,--without-ndiff,python3 python3-setuptools-native"
 PACKAGECONFIG[update] = ",--without-nmap-update,"
 
 EXTRA_OECONF = "--with-libdnet=included --with-liblinear=included --without-subversion --with-liblua=included"
diff --git a/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch b/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch
new file mode 100644
index 0000000000..6e61aeac3c
--- /dev/null
+++ b/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch
@@ -0,0 +1,672 @@
+From 41968e7b742ad59046523a7eeb63514237fb63af Mon Sep 17 00:00:00 2001
+From: Neil Horman <nhorman@openssl.org>
+Date: Fri, 27 Oct 2023 14:57:37 -0400
+Subject: [PATCH] Prevent accessing of global c++ objects once they are deleted
+
+Fixes (Maybe) #729.
+Reset objects_deleted after reset is called.
+
+Upstream-Status: Submitted [https://github.com/opendnssec/SoftHSMv2/pull/742]
+---
+ src/lib/SoftHSM.cpp |   5 ++
+ src/lib/main.cpp    | 138 ++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 143 insertions(+)
+
+diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
+index 02c0f95..95bf208 100644
+--- a/src/lib/SoftHSM.cpp
++++ b/src/lib/SoftHSM.cpp
+@@ -89,6 +89,8 @@
+ 
+ // Initialise the one-and-only instance
+ 
++int objects_deleted = 0;
++
+ #ifdef HAVE_CXX11
+ 
+ std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
+@@ -406,6 +408,8 @@ void SoftHSM::reset()
+ {
+        if (instance.get())
+                instance.reset();
++
++       objects_deleted = 0;
+ }
+ 
+ // Constructor
+@@ -445,6 +449,7 @@ SoftHSM::~SoftHSM()
+ 
+        isInitialised = false;
+ 
++       objects_deleted = 1;
+        resetMutexFactoryCallbacks();
+ }
+ 
+diff --git a/src/lib/main.cpp b/src/lib/main.cpp
+index 2dfd0eb..e89f18c 100644
+--- a/src/lib/main.cpp
++++ b/src/lib/main.cpp
+@@ -49,6 +49,8 @@
+ #define PKCS_API
+ #endif
+ 
++extern int objects_deleted;
++
+ // PKCS #11 function list
+ static CK_FUNCTION_LIST functionList =
+ {
+@@ -130,6 +132,8 @@ PKCS_API CK_RV C_Initialize(CK_VOID_PTR pInitArgs)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Initialize(pInitArgs);
+        }
+        catch (...)
+@@ -145,6 +149,8 @@ PKCS_API CK_RV C_Finalize(CK_VOID_PTR pReserved)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Finalize(pReserved);
+        }
+        catch (...)
+@@ -160,6 +166,8 @@ PKCS_API CK_RV C_GetInfo(CK_INFO_PTR pInfo)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetInfo(pInfo);
+        }
+        catch (...)
+@@ -175,6 +183,8 @@ PKCS_API CK_RV C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                if (ppFunctionList == NULL_PTR) return CKR_ARGUMENTS_BAD;
+ 
+                *ppFunctionList = &functionList;
+@@ -194,6 +204,8 @@ PKCS_API CK_RV C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, CK
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetSlotList(tokenPresent, pSlotList, pulCount);
+        }
+        catch (...)
+@@ -209,6 +221,8 @@ PKCS_API CK_RV C_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetSlotInfo(slotID, pInfo);
+        }
+        catch (...)
+@@ -224,6 +238,8 @@ PKCS_API CK_RV C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetTokenInfo(slotID, pInfo);
+        }
+        catch (...)
+@@ -239,6 +255,8 @@ PKCS_API CK_RV C_GetMechanismList(CK_SLOT_ID slotID, CK_MECHANISM_TYPE_PTR pMech
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetMechanismList(slotID, pMechanismList, pulCount);
+        }
+        catch (...)
+@@ -254,6 +272,8 @@ PKCS_API CK_RV C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type, CK_
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetMechanismInfo(slotID, type, pInfo);
+        }
+        catch (...)
+@@ -269,6 +289,8 @@ PKCS_API CK_RV C_InitToken(CK_SLOT_ID slotID, CK_UTF8CHAR_PTR pPin, CK_ULONG ulP
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_InitToken(slotID, pPin, ulPinLen, pLabel);
+        }
+        catch (...)
+@@ -284,6 +306,8 @@ PKCS_API CK_RV C_InitPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pPin, CK_UL
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_InitPIN(hSession, pPin, ulPinLen);
+        }
+        catch (...)
+@@ -299,6 +323,8 @@ PKCS_API CK_RV C_SetPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pOldPin, CK_
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SetPIN(hSession, pOldPin, ulOldLen, pNewPin, ulNewLen);
+        }
+        catch (...)
+@@ -314,6 +340,8 @@ PKCS_API CK_RV C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApp
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_OpenSession(slotID, flags, pApplication, notify, phSession);
+        }
+        catch (...)
+@@ -329,6 +357,8 @@ PKCS_API CK_RV C_CloseSession(CK_SESSION_HANDLE hSession)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_CloseSession(hSession);
+        }
+        catch (...)
+@@ -344,6 +374,8 @@ PKCS_API CK_RV C_CloseAllSessions(CK_SLOT_ID slotID)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_CloseAllSessions(slotID);
+        }
+        catch (...)
+@@ -359,6 +391,8 @@ PKCS_API CK_RV C_GetSessionInfo(CK_SESSION_HANDLE hSession, CK_SESSION_INFO_PTR
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetSessionInfo(hSession, pInfo);
+        }
+        catch (...)
+@@ -374,6 +408,8 @@ PKCS_API CK_RV C_GetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetOperationState(hSession, pOperationState, pulOperationStateLen);
+        }
+        catch (...)
+@@ -389,6 +425,8 @@ PKCS_API CK_RV C_SetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SetOperationState(hSession, pOperationState, ulOperationStateLen, hEncryptionKey, hAuthenticationKey);
+        }
+        catch (...)
+@@ -404,6 +442,8 @@ PKCS_API CK_RV C_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, CK_UTF
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Login(hSession, userType, pPin, ulPinLen);
+        }
+        catch (...)
+@@ -419,6 +459,8 @@ PKCS_API CK_RV C_Logout(CK_SESSION_HANDLE hSession)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Logout(hSession);
+        }
+        catch (...)
+@@ -434,6 +476,8 @@ PKCS_API CK_RV C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemp
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_CreateObject(hSession, pTemplate, ulCount, phObject);
+        }
+        catch (...)
+@@ -449,6 +493,8 @@ PKCS_API CK_RV C_CopyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_CopyObject(hSession, hObject, pTemplate, ulCount, phNewObject);
+        }
+        catch (...)
+@@ -464,6 +510,8 @@ PKCS_API CK_RV C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DestroyObject(hSession, hObject);
+        }
+        catch (...)
+@@ -479,6 +527,8 @@ PKCS_API CK_RV C_GetObjectSize(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetObjectSize(hSession, hObject, pulSize);
+        }
+        catch (...)
+@@ -494,6 +544,8 @@ PKCS_API CK_RV C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetAttributeValue(hSession, hObject, pTemplate, ulCount);
+        }
+        catch (...)
+@@ -509,6 +561,8 @@ PKCS_API CK_RV C_SetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SetAttributeValue(hSession, hObject, pTemplate, ulCount);
+        }
+        catch (...)
+@@ -524,6 +578,8 @@ PKCS_API CK_RV C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pT
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_FindObjectsInit(hSession, pTemplate, ulCount);
+        }
+        catch (...)
+@@ -539,6 +595,8 @@ PKCS_API CK_RV C_FindObjects(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR ph
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_FindObjects(hSession, phObject, ulMaxObjectCount, pulObjectCount);
+        }
+        catch (...)
+@@ -554,6 +612,8 @@ PKCS_API CK_RV C_FindObjectsFinal(CK_SESSION_HANDLE hSession)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_FindObjectsFinal(hSession);
+        }
+        catch (...)
+@@ -569,6 +629,8 @@ PKCS_API CK_RV C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_EncryptInit(hSession, pMechanism, hObject);
+        }
+        catch (...)
+@@ -584,6 +646,8 @@ PKCS_API CK_RV C_Encrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Encrypt(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen);
+        }
+        catch (...)
+@@ -599,6 +663,8 @@ PKCS_API CK_RV C_EncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_EncryptUpdate(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen);
+        }
+        catch (...)
+@@ -614,6 +680,8 @@ PKCS_API CK_RV C_EncryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypted
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_EncryptFinal(hSession, pEncryptedData, pulEncryptedDataLen);
+        }
+        catch (...)
+@@ -629,6 +697,8 @@ PKCS_API CK_RV C_DecryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DecryptInit(hSession, pMechanism, hObject);
+        }
+        catch (...)
+@@ -644,6 +714,8 @@ PKCS_API CK_RV C_Decrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncryptedData,
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Decrypt(hSession, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen);
+        }
+        catch (...)
+@@ -659,6 +731,8 @@ PKCS_API CK_RV C_DecryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypte
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DecryptUpdate(hSession, pEncryptedData, ulEncryptedDataLen, pData, pDataLen);
+        }
+        catch (...)
+@@ -674,6 +748,8 @@ PKCS_API CK_RV C_DecryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DecryptFinal(hSession, pData, pDataLen);
+        }
+        catch (...)
+@@ -689,6 +765,8 @@ PKCS_API CK_RV C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DigestInit(hSession, pMechanism);
+        }
+        catch (...)
+@@ -704,6 +782,8 @@ PKCS_API CK_RV C_Digest(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Digest(hSession, pData, ulDataLen, pDigest, pulDigestLen);
+        }
+        catch (...)
+@@ -719,6 +799,8 @@ PKCS_API CK_RV C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DigestUpdate(hSession, pPart, ulPartLen);
+        }
+        catch (...)
+@@ -734,6 +816,8 @@ PKCS_API CK_RV C_DigestKey(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DigestKey(hSession, hObject);
+        }
+        catch (...)
+@@ -749,6 +833,8 @@ PKCS_API CK_RV C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest, CK
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DigestFinal(hSession, pDigest, pulDigestLen);
+        }
+        catch (...)
+@@ -764,6 +850,8 @@ PKCS_API CK_RV C_SignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanis
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignInit(hSession, pMechanism, hKey);
+        }
+        catch (...)
+@@ -779,6 +867,8 @@ PKCS_API CK_RV C_Sign(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ul
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Sign(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
+        }
+        catch (...)
+@@ -794,6 +884,8 @@ PKCS_API CK_RV C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_UL
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignUpdate(hSession, pPart, ulPartLen);
+        }
+        catch (...)
+@@ -809,6 +901,8 @@ PKCS_API CK_RV C_SignFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, C
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignFinal(hSession, pSignature, pulSignatureLen);
+        }
+        catch (...)
+@@ -824,6 +918,8 @@ PKCS_API CK_RV C_SignRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pM
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignRecoverInit(hSession, pMechanism, hKey);
+        }
+        catch (...)
+@@ -839,6 +935,8 @@ PKCS_API CK_RV C_SignRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_U
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignRecover(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
+        }
+        catch (...)
+@@ -854,6 +952,8 @@ PKCS_API CK_RV C_VerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_VerifyInit(hSession, pMechanism, hKey);
+        }
+        catch (...)
+@@ -869,6 +969,8 @@ PKCS_API CK_RV C_Verify(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_Verify(hSession, pData, ulDataLen, pSignature, ulSignatureLen);
+        }
+        catch (...)
+@@ -884,6 +986,8 @@ PKCS_API CK_RV C_VerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_VerifyUpdate(hSession, pPart, ulPartLen);
+        }
+        catch (...)
+@@ -899,6 +1003,8 @@ PKCS_API CK_RV C_VerifyFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature,
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_VerifyFinal(hSession, pSignature, ulSignatureLen);
+        }
+        catch (...)
+@@ -914,6 +1020,8 @@ PKCS_API CK_RV C_VerifyRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_VerifyRecoverInit(hSession, pMechanism, hKey);
+        }
+        catch (...)
+@@ -929,6 +1037,8 @@ PKCS_API CK_RV C_VerifyRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignatur
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_VerifyRecover(hSession, pSignature, ulSignatureLen, pData, pulDataLen);
+        }
+        catch (...)
+@@ -944,6 +1054,8 @@ PKCS_API CK_RV C_DigestEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DigestEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
+        }
+        catch (...)
+@@ -959,6 +1071,8 @@ PKCS_API CK_RV C_DecryptDigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DecryptDigestUpdate(hSession, pPart, ulPartLen, pDecryptedPart, pulDecryptedPartLen);
+        }
+        catch (...)
+@@ -974,6 +1088,8 @@ PKCS_API CK_RV C_SignEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SignEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
+        }
+        catch (...)
+@@ -989,6 +1105,8 @@ PKCS_API CK_RV C_DecryptVerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEn
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DecryptVerifyUpdate(hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen);
+        }
+        catch (...)
+@@ -1004,6 +1122,8 @@ PKCS_API CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GenerateKey(hSession, pMechanism, pTemplate, ulCount, phKey);
+        }
+        catch (...)
+@@ -1029,6 +1149,8 @@ PKCS_API CK_RV C_GenerateKeyPair
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GenerateKeyPair(hSession, pMechanism, pPublicKeyTemplate, ulPublicKeyAttributeCount, pPrivateKeyTemplate, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey);
+        }
+        catch (...)
+@@ -1052,6 +1174,8 @@ PKCS_API CK_RV C_WrapKey
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_WrapKey(hSession, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen);
+        }
+        catch (...)
+@@ -1077,6 +1201,8 @@ PKCS_API CK_RV C_UnwrapKey
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_UnwrapKey(hSession, pMechanism, hUnwrappingKey, pWrappedKey, ulWrappedKeyLen, pTemplate, ulCount, phKey);
+        }
+        catch (...)
+@@ -1100,6 +1226,8 @@ PKCS_API CK_RV C_DeriveKey
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_DeriveKey(hSession, pMechanism, hBaseKey, pTemplate, ulCount, phKey);
+        }
+        catch (...)
+@@ -1115,6 +1243,8 @@ PKCS_API CK_RV C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, CK_UL
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_SeedRandom(hSession, pSeed, ulSeedLen);
+        }
+        catch (...)
+@@ -1130,6 +1260,8 @@ PKCS_API CK_RV C_GenerateRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pRandomD
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GenerateRandom(hSession, pRandomData, ulRandomLen);
+        }
+        catch (...)
+@@ -1145,6 +1277,8 @@ PKCS_API CK_RV C_GetFunctionStatus(CK_SESSION_HANDLE hSession)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_GetFunctionStatus(hSession);
+        }
+        catch (...)
+@@ -1160,6 +1294,8 @@ PKCS_API CK_RV C_CancelFunction(CK_SESSION_HANDLE hSession)
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_CancelFunction(hSession);
+        }
+        catch (...)
+@@ -1175,6 +1311,8 @@ PKCS_API CK_RV C_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, CK_VOID_
+ {
+        try
+        {
++               if (objects_deleted == 1)
++                       return CKR_FUNCTION_FAILED;
+                return SoftHSM::i()->C_WaitForSlotEvent(flags, pSlot, pReserved);
+        }
+        catch (...)
+-- 
+2.42.0
+
diff --git a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb
index 930bca96ff..66f0488792 100644
--- a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb
+++ b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb
@@ -7,6 +7,7 @@ DEPENDS = "sqlite3"
 
 SRC_URI = "https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz \
            file://0001-avoid-unnecessary-check-for-sqlite3-binary.patch \
+           file://0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch \
 "
 SRC_URI[sha256sum] = "61249473054bcd1811519ef9a989a880a7bdcc36d317c9c25457fc614df475f2"
 
diff --git a/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_0.46.bb b/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_0.46.bb
new file mode 100644
index 0000000000..48f9a738bb
--- /dev/null
+++ b/meta-oe/recipes-security/spectre-meltdown-checker/spectre-meltdown-checker_0.46.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Hardware vulnerability and mitigation checker"
+DESCRIPTION = "\
+    Reptar, Downfall, Zenbleed, ZombieLoad, RIDL, Fallout, Foreshadow, Spectre, \
+    Meltdown vulnerability/mitigation checker for Linux & BSD \
+"
+HOMEPAGE = "https://github.com/speed47/spectre-meltdown-checker"
+BUGTRACKER = "https://github.com/speed47/spectre-meltdown-checker/issues"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://spectre-meltdown-checker.sh;beginline=2;endline=2;md5=3ae5399e70af7be9b93f72568069e2f4"
+
+SRC_URI = "git://github.com/speed47/spectre-meltdown-checker;protocol=https;branch=master"
+SRCREV = "b8f8c81d519435c0871b13f02b5c4a72c5bffd5e"
+
+
+# binutils: readelf,objdump might be used for deeper analysis
+# coreutils: dd with iflag=skip_bytes oflag=seek_bytes in some cases
+# kernel-dev: /boot/config is used
+# perl: sometimes used when other tools (dd, rdmsr/wdmsr) are missing
+RRECOMMENDS:${PN} = "\
+    binutils \
+    coreutils \
+    kernel-dev \
+    perl \
+"
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_compile[noexec] = "1"
+
+do_install() {
+    install -m 755 -D ${S}/${BPN}.sh ${D}${bindir}/${BPN}
+}
diff --git a/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.6.1.bb b/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.6.1.bb
index 86acdc7aa1..f172168335 100644
--- a/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.6.1.bb
+++ b/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.6.1.bb
@@ -8,7 +8,7 @@ SECTION = "System Environment/Kernel"
 SRC_URI = "http://jaist.dl.sourceforge.jp/tomoyo/70710/${BP}-20210910.tar.gz"
 SRC_URI[sha256sum] = "47a12cdb1fe7bbd0b2e3486150fe1e754fa9c869aeefd42fd311c4022b78010a"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING.tomoyo;md5=751419260aa954499f7abaabaa882bbe"
diff --git a/meta-oe/recipes-security/usbguard/usbguard/0001-Adapt-for-protobuf-30.0-API-changes.patch b/meta-oe/recipes-security/usbguard/usbguard/0001-Adapt-for-protobuf-30.0-API-changes.patch
new file mode 100644
index 0000000000..b7c5b10acd
--- /dev/null
+++ b/meta-oe/recipes-security/usbguard/usbguard/0001-Adapt-for-protobuf-30.0-API-changes.patch
@@ -0,0 +1,89 @@
+From 06ec6473c2ed1920a1d98d40fe992dea9f60b103 Mon Sep 17 00:00:00 2001
+From: Christian Heusel <christian@heusel.eu>
+Date: Tue, 11 Mar 2025 21:43:51 +0100
+Subject: [PATCH] Adapt for protobuf 30.0 API changes
+
+Fixes https://github.com/USBGuard/usbguard/issues/649
+
+Upstream-Status: Submitted [https://github.com/USBGuard/usbguard/pull/650]
+
+Link: https://protobuf.dev/support/migration/
+Signed-off-by: Christian Heusel <christian@heusel.eu>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/Library/IPCClientPrivate.cpp | 2 +-
+ src/Library/IPCClientPrivate.hpp | 2 +-
+ src/Library/IPCServerPrivate.cpp | 6 +++---
+ src/Library/IPCServerPrivate.hpp | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/Library/IPCClientPrivate.cpp b/src/Library/IPCClientPrivate.cpp
+index 6aa5201..452ecd4 100644
+--- a/src/Library/IPCClientPrivate.cpp
++++ b/src/Library/IPCClientPrivate.cpp
+@@ -225,7 +225,7 @@ namespace usbguard
+     std::string payload;
+     message.SerializeToString(&payload);
+     struct qb_ipc_request_header hdr;
+-    hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(message.GetTypeName());
++    hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(std::string(message.GetTypeName()));
+     hdr.size = sizeof hdr + payload.size();
+     struct iovec iov[2];
+     iov[0].iov_base = &hdr;
+diff --git a/src/Library/IPCClientPrivate.hpp b/src/Library/IPCClientPrivate.hpp
+index d92a1d4..a33022e 100644
+--- a/src/Library/IPCClientPrivate.hpp
++++ b/src/Library/IPCClientPrivate.hpp
+@@ -84,7 +84,7 @@ namespace usbguard
+     template<class T>
+     void registerHandler(MessageHandler::HandlerType method)
+     {
+-      const uint32_t type_number = IPC::messageTypeNameToNumber(T::default_instance().GetTypeName());
++      const uint32_t type_number = IPC::messageTypeNameToNumber(std::string(T::default_instance().GetTypeName()));
+       _handlers.emplace(type_number, MessageHandler::create<T>(*this, method));
+     }
+ 
+diff --git a/src/Library/IPCServerPrivate.cpp b/src/Library/IPCServerPrivate.cpp
+index 548a726..b976f02 100644
+--- a/src/Library/IPCServerPrivate.cpp
++++ b/src/Library/IPCServerPrivate.cpp
+@@ -311,7 +311,7 @@ namespace usbguard
+     message->SerializeToString(&payload);
+     struct qb_ipc_response_header hdr;
+     struct iovec iov[2];
+-    hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(message->GetTypeName());
++    hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(std::string(message->GetTypeName()));
+     hdr.size = sizeof hdr + payload.size();
+     hdr.error = 0;
+     iov[0].iov_base = &hdr;
+@@ -555,7 +555,7 @@ namespace usbguard
+     std::string payload;
+     message->SerializeToString(&payload);
+     struct qb_ipc_response_header hdr = { };
+-    hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(message->GetTypeName());
++    hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(std::string(message->GetTypeName()));
+     hdr.size = sizeof hdr + payload.size();
+     hdr.error = 0;
+     struct iovec iov[2];
+@@ -563,7 +563,7 @@ namespace usbguard
+     iov[0].iov_len = sizeof hdr;
+     iov[1].iov_base = (void*)payload.data();
+     iov[1].iov_len = payload.size();
+-    qbIPCBroadcastData(iov, 2, messageTypeNameToAccessControlSection(message->GetTypeName()));
++    qbIPCBroadcastData(iov, 2, messageTypeNameToAccessControlSection(std::string(message->GetTypeName())));
+     iov[0].iov_base = nullptr;
+     iov[1].iov_base = nullptr;
+   }
+diff --git a/src/Library/IPCServerPrivate.hpp b/src/Library/IPCServerPrivate.hpp
+index 25f9ac3..3b3dcc5 100644
+--- a/src/Library/IPCServerPrivate.hpp
++++ b/src/Library/IPCServerPrivate.hpp
+@@ -134,7 +134,7 @@ namespace usbguard
+     void registerHandler(MessageHandler::HandlerType method, IPCServer::AccessControl::Section section,
+       IPCServer::AccessControl::Privilege privilege)
+     {
+-      const uint32_t type_number = IPC::messageTypeNameToNumber(T::default_instance().GetTypeName());
++      const uint32_t type_number = IPC::messageTypeNameToNumber(std::string(T::default_instance().GetTypeName()));
+       _handlers.emplace(type_number, MessageHandler::create<T>(*this, method, section, privilege));
+     }
+ 
diff --git a/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb b/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb
index 752938057a..558f4347b6 100644
--- a/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb
+++ b/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb
@@ -12,7 +12,9 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "https://github.com/USBGuard/usbguard/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
-    file://0001-Add-and-use-pkgconfig-instead-of-libgcrypt-config.patch"
+    file://0001-Add-and-use-pkgconfig-instead-of-libgcrypt-config.patch \
+    file://0001-Adapt-for-protobuf-30.0-API-changes.patch \
+    "
 
 SRC_URI[sha256sum] = "707dad2938923202697f636c2b4e0be80f192242039a2af3fc7ac35d03f78551"
 
@@ -27,6 +29,8 @@ EXTRA_OECONF += "\
     --with-bundled-pegtl \
 "
 
+LDFLAGS:append:riscv32 = " -latomic"
+
 PACKAGECONFIG ?= "\
     openssl \
     ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \
diff --git a/meta-oe/recipes-shells/dash/dash_0.5.12.bb b/meta-oe/recipes-shells/dash/dash_0.5.12.bb
index 947ef702d7..1bf3625760 100644
--- a/meta-oe/recipes-shells/dash/dash_0.5.12.bb
+++ b/meta-oe/recipes-shells/dash/dash_0.5.12.bb
@@ -10,6 +10,8 @@ inherit autotools update-alternatives
 SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz"
 SRC_URI[sha256sum] = "6a474ac46e8b0b32916c4c60df694c82058d3297d8b385b74508030ca4a8f28a"
 
+CVE_PRODUCT = "dash:dash"
+
 EXTRA_OECONF += "--bindir=${base_bindir}"
 
 ALTERNATIVE:${PN} = "sh"
diff --git a/meta-oe/recipes-shells/mksh/mksh_59c.bb b/meta-oe/recipes-shells/mksh/mksh_59c.bb
index e3a8ca8b5e..d27320cf1f 100644
--- a/meta-oe/recipes-shells/mksh/mksh_59c.bb
+++ b/meta-oe/recipes-shells/mksh/mksh_59c.bb
@@ -15,7 +15,7 @@ UPSTREAM_CHECK_REGEX = "${BPN}-R(?P<pver>.*)\.tgz"
 
 inherit update-alternatives
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 ALTERNATIVE:${PN} = "sh"
 ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
diff --git a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch b/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch
deleted file mode 100644
index fb8fa3427f..0000000000
--- a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Origin: commit c187154f47697cdbf822c2f9d714d570ed4a0fd1
-From: Oliver Kiddle <opk@zsh.org>
-Date: Wed, 15 Dec 2021 01:56:40 +0100
-Subject: [PATCH 1/9] security/41: Don't perform PROMPT_SUBST evaluation on
- %F/%K arguments
-
-Mitigates CVE-2021-45444
-
-https://salsa.debian.org/debian/zsh/-/raw/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_1.patch?inline=false
-Upstream-Status: Backport
-CVE: CVE-2021-45444
-Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
----
- ChangeLog    |  5 +++++
- Src/prompt.c | 10 ++++++++++
- 2 files changed, 15 insertions(+)
-
-diff --git a/ChangeLog b/ChangeLog
-index 8d7dfc169..eb248ec06 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,8 @@
-+2022-01-27  dana  <dana@dana.is>
-+
-+       * Oliver Kiddle: security/41: Src/prompt.c: Prevent recursive
-+       PROMPT_SUBST
-+
- 2020-02-14  dana  <dana@dana.is>
- 
-        * unposted: Config/version.mk: Update for 5.8
-diff --git a/Src/prompt.c b/Src/prompt.c
-index b65bfb86b..91e21c8e9 100644
---- a/Src/prompt.c
-+++ b/Src/prompt.c
-@@ -244,6 +244,12 @@ parsecolorchar(zattr arg, int is_fg)
-        bv->fm += 2; /* skip over F{ */
-        if ((ep = strchr(bv->fm, '}'))) {
-            char oc = *ep, *col, *coll;
-+           int ops = opts[PROMPTSUBST], opb = opts[PROMPTBANG];
-+           int opp = opts[PROMPTPERCENT];
-+
-+           opts[PROMPTPERCENT] = 1;
-+           opts[PROMPTSUBST] = opts[PROMPTBANG] = 0;
-+
-            *ep = '\0';
-            /* expand the contents of the argument so you can use
-             * %v for example */
-@@ -252,6 +258,10 @@ parsecolorchar(zattr arg, int is_fg)
-            arg = match_colour((const char **)&coll, is_fg, 0);
-            free(col);
-            bv->fm = ep;
-+
-+           opts[PROMPTSUBST] = ops;
-+           opts[PROMPTBANG] = opb;
-+           opts[PROMPTPERCENT] = opp;
-        } else {
-            arg = match_colour((const char **)&bv->fm, is_fg, 0);
-            if (*bv->fm != '}')
--- 
-2.34.1
diff --git a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch b/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch
deleted file mode 100644
index e5b6d7cdc9..0000000000
--- a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 8a4d65ef6d0023ab9b238529410afb433553d2fa Mon Sep 17 00:00:00 2001
-From: Marc Cornellà <hello@mcornella.com>
-Date: Mon, 24 Jan 2022 09:43:28 +0100
-Subject: [PATCH 2/9] security/89: Add patch which can optionally be used to
- work around CVE-2021-45444 in VCS_Info
-Comment: Updated to use the same file name without blanks as actually
- used in the final 5.8.1 release.
-
-
-https://salsa.debian.org/debian/zsh/-/blob/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_2.patch
-Upstream-Status: Backport
-CVE: CVE-2021-45444
-Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
----
- ChangeLog                                    |  5 +
- Etc/CVE-2021-45444-VCS_Info-workaround.patch | 98 ++++++++++++++++++++
- 2 files changed, 103 insertions(+)
- create mode 100644 Etc/CVE-2021-45444-VCS_Info-workaround.patch
-
-diff --git a/ChangeLog b/ChangeLog
-index eb248ec06..9a05a09e1 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,5 +1,10 @@
- 2022-01-27  dana  <dana@dana.is>
- 
-+       * Marc Cornellà: security/89:
-+       Etc/CVE-2021-45444-VCS_Info-workaround.patch: Add patch which
-+       can optionally be used to work around recursive PROMPT_SUBST
-+       issue in VCS_Info
-+
-        * Oliver Kiddle: security/41: Src/prompt.c: Prevent recursive
-        PROMPT_SUBST
- 
-diff --git a/Etc/CVE-2021-45444-VCS_Info-workaround.patch b/Etc/CVE-2021-45444-VCS_Info-workaround.patch
-new file mode 100644
-index 000000000..13e54be77
---- /dev/null
-+++ b/Etc/CVE-2021-45444-VCS_Info-workaround.patch
-@@ -0,0 +1,98 @@
-+From 972887bbe5eb6a00e5f0e73781d6d73bfdcafb93 Mon Sep 17 00:00:00 2001
-+From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
-+Date: Mon, 24 Jan 2022 09:43:28 +0100
-+Subject: [PATCH] security/89: Partially work around CVE-2021-45444 in VCS_Info
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+This patch is a partial, VCS_Info-specific work-around for CVE-2021-45444,
-+which is mitigated in the shell itself in 5.8.1 and later versions. It is
-+offered for users who are concerned about an exploit but are unable to update
-+their binaries to receive the complete fix.
-+
-+The patch works around the vulnerability by pre-escaping values substituted
-+into format strings in VCS_Info. Please note that this may break some user
-+configurations that rely on those values being un-escaped (which is why it was
-+not included directly in 5.8.1). It may be possible to limit this breakage by
-+adjusting exactly which ones are pre-escaped, but of course this may leave
-+them vulnerable again.
-+
-+If applying the patch to the file system is inconvenient or not possible, the
-+following script can be used to idempotently patch the relevant function
-+running in memory (and thus must be re-run when the shell is restarted):
-+
-+
-+# Impacted versions go from v5.0.3 to v5.8 (v5.8.1 is the first patched version)
-+autoload -Uz is-at-least
-+if is-at-least 5.8.1 || ! is-at-least 5.0.3; then
-+  return
-+fi
-+
-+# Quote necessary $hook_com[<field>] items just before they are used
-+# in the line "VCS_INFO_hook 'post-backend'" of the VCS_INFO_formats
-+# function, where <field> is:
-+#
-+#   base:       the full path of the repository's root directory.
-+#   base-name:  the name of the repository's root directory.
-+#   branch:     the name of the currently checked out branch.
-+#   revision:   an identifier of the currently checked out revision.
-+#   subdir:     the path of the current directory relative to the
-+#               repository's root directory.
-+#   misc:       a string that may contain anything the vcs_info backend wants.
-+#
-+# This patch %-quotes these fields previous to their use in vcs_info hooks and
-+# the zformat call and, eventually, when they get expanded in the prompt.
-+# It's important to quote these here, and not later after hooks have modified the
-+# fields, because then we could be quoting % characters from valid prompt sequences,
-+# like %F{color}, %B, etc.
-+#
-+#  32   │ hook_com[subdir]="$(VCS_INFO_reposub ${hook_com[base]})"
-+#  33   │ hook_com[subdir_orig]="${hook_com[subdir]}"
-+#  34   │
-+#  35 + │ for tmp in base base-name branch misc revision subdir; do
-+#  36 + │     hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"
-+#  37 + │ done
-+#  38 + │
-+#  39   │ VCS_INFO_hook 'post-backend'
-+#
-+# This is especially important so that no command substitution is performed
-+# due to malicious input as a consequence of CVE-2021-45444, which affects
-+# zsh versions from 5.0.3 to 5.8.
-+#
-+autoload -Uz +X regexp-replace VCS_INFO_formats
-+
-+# We use $tmp here because it's already a local variable in VCS_INFO_formats
-+typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'
-+# Unique string to avoid reapplying the patch if this code gets called twice
-+typeset PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b
-+# Only patch the VCS_INFO_formats function if not already patched
-+if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then
-+  regexp-replace 'functions[VCS_INFO_formats]' \
-+    "VCS_INFO_hook 'post-backend'" \
-+    ': ${PATCH_ID}; ${PATCH}; ${MATCH}'
-+fi
-+unset PATCH PATCH_ID
-+
-+
-+---
-+ Functions/VCS_Info/VCS_INFO_formats | 4 ++++
-+ 1 file changed, 4 insertions(+)
-+
-+diff --git a/Functions/VCS_Info/VCS_INFO_formats b/Functions/VCS_Info/VCS_INFO_formats
-+index e0e1dc738..4d88e28b6 100644
-+--- a/Functions/VCS_Info/VCS_INFO_formats
-++++ b/Functions/VCS_Info/VCS_INFO_formats
-+@@ -32,6 +32,10 @@ hook_com[base-name_orig]="${hook_com[base_name]}"
-+ hook_com[subdir]="$(VCS_INFO_reposub ${hook_com[base]})"
-+ hook_com[subdir_orig]="${hook_com[subdir]}"
-+ 
-++for tmp in base base-name branch misc revision subdir; do
-++    hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"
-++done
-++
-+ VCS_INFO_hook 'post-backend'
-+ 
-+ ## description (for backend authors):
-+-- 
-+2.34.1
--- 
-2.34.1
diff --git a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch b/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch
deleted file mode 100644
index adfc00ae57..0000000000
--- a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 4abf2fc193fc2f3e680deecbf81289a7b02e245b Mon Sep 17 00:00:00 2001
-From: dana <dana@dana.is>
-Date: Tue, 21 Dec 2021 13:13:33 -0600
-Subject: [PATCH 3/9] CVE-2021-45444: Update NEWS/README
-
-https://salsa.debian.org/debian/zsh/-/blob/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_3.patch
-Upstream-Status: Backport
-CVE: CVE-2021-45444
-Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
----
- ChangeLog |  2 ++
- NEWS      | 20 ++++++++++++++++++++
- README    |  6 ++++++
- 3 files changed, 28 insertions(+)
-
-diff --git a/ChangeLog b/ChangeLog
-index 9a05a09e1..93b0bc337 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,5 +1,7 @@
- 2022-01-27  dana  <dana@dana.is>
- 
-+       * CVE-2021-45444: NEWS, README: Document preceding two changes
-+
-        * Marc Cornellà: security/89:
-        Etc/CVE-2021-45444-VCS_Info-workaround.patch: Add patch which
-        can optionally be used to work around recursive PROMPT_SUBST
-diff --git a/NEWS b/NEWS
-index 964e1633f..d34b3f79e 100644
---- a/NEWS
-+++ b/NEWS
-@@ -4,6 +4,26 @@ CHANGES FROM PREVIOUS VERSIONS OF ZSH
- 
- Note also the list of incompatibilities in the README file.
- 
-+Changes since 5.8
-+-----------------
-+
-+CVE-2021-45444: Some prompt expansion sequences, such as %F, support
-+'arguments' which are themselves expanded in case they contain colour
-+values, etc. This additional expansion would trigger PROMPT_SUBST
-+evaluation, if enabled. This could be abused to execute code the user
-+didn't expect. e.g., given a certain prompt configuration, an attacker
-+could trick a user into executing arbitrary code by having them check
-+out a Git branch with a specially crafted name.
-+
-+This is fixed in the shell itself by no longer performing PROMPT_SUBST
-+evaluation on these prompt-expansion arguments.
-+
-+Users who are concerned about an exploit but unable to update their
-+binaries may apply the partial work-around described in the file
-+'Etc/CVE-2021-45444 VCS_Info workaround.patch' included with the shell
-+source. [ Reported by RyotaK <security@ryotak.me>. Additional thanks to
-+Marc Cornellà <hello@mcornella.com>. ]
-+
- Changes since 5.7.1-test-3
- --------------------------
- 
-diff --git a/README b/README
-index 7f1dd5f92..c9e994ab3 100644
---- a/README
-+++ b/README
-@@ -31,6 +31,12 @@ Zsh is a shell with lots of features.  For a list of some of these, see the
- file FEATURES, and for the latest changes see NEWS.  For more
- details, see the documentation.
- 
-+Incompatibilities since 5.8
-+---------------------------
-+
-+PROMPT_SUBST expansion is no longer performed on arguments to prompt-
-+expansion sequences such as %F.
-+
- Incompatibilities since 5.7.1
- -----------------------------
- 
--- 
-2.34.1
diff --git a/meta-oe/recipes-shells/zsh/zsh_5.8.bb b/meta-oe/recipes-shells/zsh/zsh_5.9.bb
index 7602ff9f64..c03dfc2f83 100644
--- a/meta-oe/recipes-shells/zsh/zsh_5.8.bb
+++ b/meta-oe/recipes-shells/zsh/zsh_5.9.bb
@@ -10,14 +10,12 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=1a4c4cda3e8096d2fd483ff2f4514fec"
 
 DEPENDS = "ncurses bison-native libcap libpcre gdbm groff-native"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/5.8/${BP}.tar.xz \
-        file://CVE-2021-45444_1.patch \
-        file://CVE-2021-45444_2.patch \
-        file://CVE-2021-45444_3.patch \
-        "
-SRC_URI[sha256sum] = "dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BP}.tar.xz"
+SRC_URI[sha256sum] = "9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5"
 
-inherit autotools-brokensep gettext update-alternatives manpages
+inherit autotools gettext update-alternatives manpages
+
+EXTRA_AUTORECONF += "--exclude=aclocal"
 
 EXTRA_OECONF = " \
     --bindir=${base_bindir} \
@@ -34,7 +32,7 @@ EXTRA_OECONF = " \
 "
 
 # Configure respects --bindir from EXTRA_OECONF, but then Src/Makefile will read bindir from environment
-export bindir="${base_bindir}"
+export bindir = "${base_bindir}"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
@@ -43,20 +41,20 @@ ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
 ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}"
 ALTERNATIVE_PRIORITY = "90"
 
-export AUTOHEADER = "true"
+# Needed for manpages.bbclass, but they're always installed
+PACKAGECONFIG[manpages] = ""
 
-do_configure () {
-    gnu-configize --force ${S}
-    oe_runconf
+do_install:append() {
+    sed -i -e '1!b; s:^#!.*[ /]zsh:#!${bindir}/zsh:; s#/usr/local/bin#${bindir}#;' \
+        `find ${D}/usr/share/zsh/${PV}/functions -type f`
 }
 
 pkg_postinst:${PN} () {
     touch $D${sysconfdir}/shells
-    grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells
-    grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells
+    for i in zsh sh
+    do
+        grep -q "bin/$i" $D${sysconfdir}/shells || \
+            printf >> $D${sysconfdir}/shells \
+            "${bindir}/$i\n${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/$i\n', '', d)}"
+    done
 }
-
-# work around QA failures with usrmerge installing zsh in /usr/bin/zsh instead of /bin/zsh
-# ERROR: QA Issue: /usr/share/zsh/5.8/functions/zed contained in package zsh requires /bin/zsh, but no providers found in RDEPENDS:zsh? [file-rdeps]
-# like bash does since https://git.openembedded.org/openembedded-core/commit/?id=4759408677a4e60c5fa7131afcb5bc184cf2f90a
-RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/zsh', '', d)}"
diff --git a/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb
index 6d64ab71bf..85443984a2 100644
--- a/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb
+++ b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb
@@ -11,7 +11,6 @@ SRCREV = "812e2c56aed246931a667f16c28b096e34597016"
 
 FILES:${PN} = "${datadir}/ace-builds"
 
-S = "${WORKDIR}/git"
 
 DEPENDS += "rsync-native"
 
diff --git a/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-oe/recipes-support/anthy/anthy_9100h.bb
index f2bf52cdbc..1826e91697 100644
--- a/meta-oe/recipes-support/anthy/anthy_9100h.bb
+++ b/meta-oe/recipes-support/anthy/anthy_9100h.bb
@@ -1,4 +1,4 @@
-DESCRIPTION="Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text."
+DESCRIPTION = "Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text."
 HOMEPAGE = "http://anthy.sourceforge.jp"
 
 LICENSE = "LGPL-2.1-only & GPL-2.0-only"
@@ -14,9 +14,11 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \
 SRC_URI:append:class-target = " file://target-helpers.patch"
 SRC_URI:append:class-native = " file://native-helpers.patch"
 
-SRC_URI[md5sum] = "1f558ff7ed296787b55bb1c6cf131108"
 SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547"
 
+UPSTREAM_CHECK_URI = "https://osdn.net/projects/anthy/releases/"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>(\d+)+(\w*))"
+
 DEPENDS:class-target = "anthy-native"
 RDEPENDS:${PN}:class-target = "libanthy0"
 
diff --git a/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch b/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch
new file mode 100644
index 0000000000..5aa502916d
--- /dev/null
+++ b/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch
@@ -0,0 +1,37 @@
+From 7d76513b82a67e117d195a1b5a0d6c2e8591488b Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 10 Oct 2024 13:58:38 +0800
+Subject: [PATCH] tests: Remove blocking_adaptation.cpp
+
+The test failed to build with clang as below.
+../../../asio-1.30.2/src/tests/../../include/asio/execution/blocking_adaptation.hpp:216:13: error: call to 'query' is ambiguous
+  216 |             conditional_t<true, T, P>::query(static_cast<P&&>(p))
+      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../../asio-1.30.2/src/tests/../../include/asio/execution/blocking_adaptation.hpp:213:29: note: in instantiation of exception specification for 'query<asio::execution::detail::blocking_adaptation::allowed_t<>>' requested here
+  213 |       static constexpr auto query(P&& p)
+      |
+
+We can add the case back once the above build failure resolved then.
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ src/tests/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
+index 04f8a03..eab2d56 100644
+--- a/src/tests/Makefile.am
++++ b/src/tests/Makefile.am
+@@ -68,7 +68,6 @@ check_PROGRAMS = \
+        unit/error \
+        unit/execution/any_executor \
+        unit/execution/blocking \
+-       unit/execution/blocking_adaptation \
+        unit/execution/context_as \
+        unit/execution/executor \
+        unit/execution/invocable_archetype \
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/asio/asio/run-ptest b/meta-oe/recipes-support/asio/asio/run-ptest
new file mode 100644
index 0000000000..d37db0b315
--- /dev/null
+++ b/meta-oe/recipes-support/asio/asio/run-ptest
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+ptestdir=$(dirname "$(readlink -f "$0")")
+cd "$ptestdir"/tests || exit
+
+tests=$(find * -type f -executable)
+
+rm -rf test.log
+
+for f in $tests
+do
+    if test -x ./"$f"; then
+        if ./"$f" > test.log 2>&1; then
+            echo "PASS: $f"
+        else
+            echo "FAIL: $f"
+        fi
+    fi
+done
diff --git a/meta-oe/recipes-support/asio/asio_1.30.2.bb b/meta-oe/recipes-support/asio/asio_1.30.2.bb
index 6930381ecd..1f492b71eb 100644
--- a/meta-oe/recipes-support/asio/asio_1.30.2.bb
+++ b/meta-oe/recipes-support/asio/asio_1.30.2.bb
@@ -8,9 +8,12 @@ LICENSE = "BSL-1.0"
 
 DEPENDS = "openssl"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2 \
+           file://0001-tests-Remove-blocking_adaptation.cpp.patch \
+           file://run-ptest \
+"
 
-inherit autotools
+inherit autotools ptest
 
 ALLOW_EMPTY:${PN} = "1"
 
@@ -22,4 +25,16 @@ PACKAGECONFIG ??= "boost"
 
 PACKAGECONFIG[boost] = "--with-boost=${STAGING_LIBDIR},--without-boost,boost"
 
+TESTDIR = "src/tests"
+do_compile_ptest() {
+    echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile
+    oe_runmake -C ${TESTDIR} buildtest-TESTS
+}
+
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    # copy executables
+    find ${B}/${TESTDIR}/unit -type f -executable -exec cp {} ${D}${PTEST_PATH}/tests/ \;
+}
+
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/atop/atop/0001-Redefine-function-prototypes-solves-issue-322.patch b/meta-oe/recipes-support/atop/atop/0001-Redefine-function-prototypes-solves-issue-322.patch
new file mode 100644
index 0000000000..f55ad5318a
--- /dev/null
+++ b/meta-oe/recipes-support/atop/atop/0001-Redefine-function-prototypes-solves-issue-322.patch
@@ -0,0 +1,1154 @@
+From ece93ebc7b9ebbb73f92b2238a87b78ddbd4ca98 Mon Sep 17 00:00:00 2001
+From: Gerlof Langeveld <gerlof.langeveld@atoptool.nl>
+Date: Fri, 14 Mar 2025 15:39:30 +0100
+Subject: [PATCH] Redefine function prototypes (solves issue #322)
+
+Certain function prototypes did not explicitly define the
+calling argument types, specifically the prototypes for the
+convert functions defined in the 'detail_printdef' structure.
+These incomplete definitions cause a lot of errors when using
+gcc 1.15 which is based on C23.
+
+Upstream-Status: Backport [ece93eb Redefine function prototypes (solves issue #322)]
+---
+ atop.c        |   5 ++
+ atopacctd.c   |   5 ++
+ atopcat.c     |   6 ++
+ atopconvert.c |   1 +
+ atophide.c    |   5 ++
+ atopsar.c     |   4 ++
+ cgroups.c     |   7 +-
+ drawbar.c     |   4 ++
+ gpucom.c      |   4 ++
+ netatopif.c   |   4 ++
+ photoproc.c   |   4 ++
+ photosyst.c   |   5 ++
+ rawlog.c      |   4 ++
+ showgeneric.c |   4 ++
+ showlinux.h   |  11 ++-
+ showprocs.c   | 188 +++++++++++++++++++++++++-------------------------
+ various.c     |   4 ++
+ 17 files changed, 168 insertions(+), 97 deletions(-)
+
+diff --git a/atop.c b/atop.c
+index fe037fc..ac6aa6d 100644
+--- a/atop.c
++++ b/atop.c
+@@ -118,6 +118,10 @@
+ ** can be linked with 'atop'; the one to use can eventually be chosen
+ ** at runtime. 
+ */
++#define _POSIX_C_SOURCE        
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -128,6 +132,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <getopt.h>
+ #include <stdlib.h>
+ #include <signal.h>
+ #include <sys/utsname.h>
+diff --git a/atopacctd.c b/atopacctd.c
+index b16d6a6..c8816b6 100644
+--- a/atopacctd.c
++++ b/atopacctd.c
+@@ -36,6 +36,11 @@
+ ** it under the terms of the GNU General Public License version 2 as
+ ** published by the Free Software Foundation.
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
+diff --git a/atopcat.c b/atopcat.c
+index fb014a0..099a888 100644
+--- a/atopcat.c
++++ b/atopcat.c
+@@ -28,9 +28,15 @@
+ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ** --------------------------------------------------------------------------
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
++
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
++#include <getopt.h>
+ #include <fcntl.h>
+ #include <time.h>
+ #include <stdio.h>
+diff --git a/atopconvert.c b/atopconvert.c
+index fd34a85..9c083a6 100644
+--- a/atopconvert.c
++++ b/atopconvert.c
+@@ -32,6 +32,7 @@
+ #include <sys/param.h>
+ #include <sys/mman.h>
+ #include <sys/stat.h>
++#include <getopt.h>
+ #include <time.h>
+ #include <stdio.h>
+ #include <errno.h>
+diff --git a/atophide.c b/atophide.c
+index 0502262..313929e 100644
+--- a/atophide.c
++++ b/atophide.c
+@@ -31,6 +31,11 @@
+ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ** --------------------------------------------------------------------------
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
++
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/mman.h>
+diff --git a/atopsar.c b/atopsar.c
+index a3dd121..1cf13e8 100644
+--- a/atopsar.c
++++ b/atopsar.c
+@@ -28,6 +28,10 @@
+ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ** --------------------------------------------------------------------------
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
+diff --git a/cgroups.c b/cgroups.c
+index d617b48..4f1247c 100644
+--- a/cgroups.c
++++ b/cgroups.c
+@@ -27,6 +27,10 @@
+ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ** --------------------------------------------------------------------------
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -1189,7 +1193,8 @@ mergecgrouplist(struct cglinesel **cgroupselp, int newdepth,
+        //
+        cgroupsel = malloc(sizeof(struct cglinesel) * (ncgroups+nprocs));
+ 
+-       ptrverify(cgroupsel, "Malloc for cglinesel structs failed (%d)\n",
++       if (cgroupsel == NULL)
++               ptrverify(cgroupsel, "Malloc for cglinesel structs failed (%d)\n",
+                                        ncgroups + nprocs);
+ 
+        *cgroupselp = cgroupsel;
+diff --git a/drawbar.c b/drawbar.c
+index 0ab3b40..c8539bf 100644
+--- a/drawbar.c
++++ b/drawbar.c
+@@ -103,6 +103,10 @@
+ // horizontally scaled by the user, atop might switch from one model to
+ // the other.
+ /////////////////////////////////////////////////////////////////////////////
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
+ 
+ #include <sys/types.h>
+ #include <curses.h>
+diff --git a/gpucom.c b/gpucom.c
+index 1ff3818..25e7637 100644
+--- a/gpucom.c
++++ b/gpucom.c
+@@ -22,6 +22,10 @@
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ ** See the GNU General Public License for more details.
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
+diff --git a/netatopif.c b/netatopif.c
+index ea67142..d0e9c29 100644
+--- a/netatopif.c
++++ b/netatopif.c
+@@ -22,6 +22,10 @@
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ ** See the GNU General Public License for more details.
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
+ 
+ #include <sys/types.h>
+ #include <stdio.h>
+diff --git a/photoproc.c b/photoproc.c
+index 234007b..2b8de20 100644
+--- a/photoproc.c
++++ b/photoproc.c
+@@ -30,6 +30,10 @@
+ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ** --------------------------------------------------------------------------
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
+diff --git a/photosyst.c b/photosyst.c
+index 46fccd8..9012946 100644
+--- a/photosyst.c
++++ b/photosyst.c
+@@ -29,6 +29,11 @@
+ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ** --------------------------------------------------------------------------
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
++
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/rawlog.c b/rawlog.c
+index f46430d..541b75c 100644
+--- a/rawlog.c
++++ b/rawlog.c
+@@ -26,6 +26,10 @@
+ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ** --------------------------------------------------------------------------
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
+diff --git a/showgeneric.c b/showgeneric.c
+index 0722a64..a472501 100644
+--- a/showgeneric.c
++++ b/showgeneric.c
+@@ -29,6 +29,10 @@
+ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ** --------------------------------------------------------------------------
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
+diff --git a/showlinux.h b/showlinux.h
+index e082c72..72c57b9 100644
+--- a/showlinux.h
++++ b/showlinux.h
+@@ -102,9 +102,16 @@ typedef struct
+ {
+         char *head;                      // column header
+         char *configname;                // name as used to config print line
+-        char *(*doactiveconvert)();      // pointer to conv function
++
++       union {
++               char *(*doactiveconverts)(struct tstat *, int, int);
++               char *(*doactiveconvertc)(struct cgchainer *, struct tstat *,
++                                       int, int, count_t, int, int *);
++       } ac;
++                                        // pointer to conv function
+                                          // for active process
+-        char *(*doexitconvert)();        // pointer to conv function
++       char *(*doexitconvert)(struct tstat *, int, int);        
++                                        // pointer to conv function
+                                          // for exited process
+        char sortcrit;                   // sort criterion similar to showorder
+         int  width;                      // required width
+diff --git a/showprocs.c b/showprocs.c
+index 0db1e31..020cc85 100644
+--- a/showprocs.c
++++ b/showprocs.c
+@@ -510,7 +510,7 @@ showprocline(detail_printpair* elemptr, struct tstat *curstat,
+                 }
+                 else if (curstat->gen.state != 'E')  // active process
+                 {
+-                        printg("%s", curelem.pf->doactiveconvert(curstat, 
++                        printg("%s", curelem.pf->ac.doactiveconverts(curstat, 
+                                                         avgval, nsecs));
+                 }
+                 else                                 // exited process
+@@ -622,7 +622,7 @@ procprt_TID_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_TID = 
+-   { "TID", "TID", procprt_TID_ae, procprt_TID_ae, ' ', 5}; //DYNAMIC WIDTH!
++   { "TID", "TID", .ac.doactiveconverts = procprt_TID_ae, procprt_TID_ae, ' ', 5}; //DYNAMIC WIDTH!
+ /***************************************************************/
+ char *
+ procprt_PID_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -646,7 +646,7 @@ procprt_PID_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_PID = 
+-   { "PID", "PID", procprt_PID_a, procprt_PID_e, ' ', 5}; //DYNAMIC WIDTH!
++   { "PID", "PID", .ac.doactiveconverts = procprt_PID_a, procprt_PID_e, ' ', 5}; //DYNAMIC WIDTH!
+ /***************************************************************/
+ char *
+ procprt_PPID_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -670,7 +670,7 @@ procprt_PPID_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_PPID = 
+-   { "PPID", "PPID", procprt_PPID_a, procprt_PPID_e, ' ', 5}; //DYNAMIC WIDTH!
++   { "PPID", "PPID", .ac.doactiveconverts = procprt_PPID_a, procprt_PPID_e, ' ', 5}; //DYNAMIC WIDTH!
+ /***************************************************************/
+ char *
+ procprt_VPID_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -691,7 +691,7 @@ procprt_VPID_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_VPID = 
+-   { "VPID", "VPID", procprt_VPID_a, procprt_VPID_e, ' ', 5}; //DYNAMIC WIDTH!
++   { "VPID", "VPID", .ac.doactiveconverts = procprt_VPID_a, procprt_VPID_e, ' ', 5}; //DYNAMIC WIDTH!
+ /***************************************************************/
+ char *
+ procprt_CTID_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -709,7 +709,7 @@ procprt_CTID_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_CTID = 
+-   { " CTID", "CTID", procprt_CTID_a, procprt_CTID_e, ' ', 5};
++   { " CTID", "CTID", .ac.doactiveconverts = procprt_CTID_a, procprt_CTID_e, ' ', 5};
+ /***************************************************************/
+ char *
+ procprt_CID_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -738,7 +738,7 @@ procprt_CID_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_CID = 
+-   { "CID/POD        ", "CID", procprt_CID_a, procprt_CID_e, ' ', 15};
++   { "CID/POD        ", "CID", .ac.doactiveconverts = procprt_CID_a, procprt_CID_e, ' ', 15};
+ /***************************************************************/
+ char *
+ procprt_SYSCPU_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -750,7 +750,7 @@ procprt_SYSCPU_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_SYSCPU = 
+-   { "SYSCPU", "SYSCPU", procprt_SYSCPU_ae, procprt_SYSCPU_ae, ' ', 6};
++   { "SYSCPU", "SYSCPU", .ac.doactiveconverts = procprt_SYSCPU_ae, procprt_SYSCPU_ae, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_USRCPU_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -762,7 +762,7 @@ procprt_USRCPU_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_USRCPU = 
+-   { "USRCPU", "USRCPU", procprt_USRCPU_ae, procprt_USRCPU_ae, ' ', 6};
++   { "USRCPU", "USRCPU", .ac.doactiveconverts = procprt_USRCPU_ae, procprt_USRCPU_ae, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_VGROW_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -780,7 +780,7 @@ procprt_VGROW_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_VGROW = 
+-   { " VGROW", "VGROW", procprt_VGROW_a, procprt_VGROW_e, ' ', 6};
++   { " VGROW", "VGROW", .ac.doactiveconverts = procprt_VGROW_a, procprt_VGROW_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_RGROW_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -798,7 +798,7 @@ procprt_RGROW_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_RGROW = 
+-   { " RGROW", "RGROW", procprt_RGROW_a, procprt_RGROW_e, ' ', 6};
++   { " RGROW", "RGROW", .ac.doactiveconverts = procprt_RGROW_a, procprt_RGROW_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_MINFLT_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -810,7 +810,7 @@ procprt_MINFLT_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_MINFLT = 
+-   { "MINFLT", "MINFLT", procprt_MINFLT_ae, procprt_MINFLT_ae, ' ', 6};
++   { "MINFLT", "MINFLT", .ac.doactiveconverts = procprt_MINFLT_ae, procprt_MINFLT_ae, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_MAJFLT_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -822,7 +822,7 @@ procprt_MAJFLT_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_MAJFLT = 
+-   { "MAJFLT", "MAJFLT", procprt_MAJFLT_ae, procprt_MAJFLT_ae, ' ', 6};
++   { "MAJFLT", "MAJFLT", .ac.doactiveconverts = procprt_MAJFLT_ae, procprt_MAJFLT_ae, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_VSTEXT_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -840,7 +840,7 @@ procprt_VSTEXT_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_VSTEXT = 
+-   { "VSTEXT", "VSTEXT", procprt_VSTEXT_a, procprt_VSTEXT_e, ' ', 6};
++   { "VSTEXT", "VSTEXT", .ac.doactiveconverts = procprt_VSTEXT_a, procprt_VSTEXT_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_VSIZE_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -858,7 +858,7 @@ procprt_VSIZE_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_VSIZE = 
+-   { " VSIZE", "VSIZE", procprt_VSIZE_a, procprt_VSIZE_e, ' ', 6};
++   { " VSIZE", "VSIZE", .ac.doactiveconverts = procprt_VSIZE_a, procprt_VSIZE_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_RSIZE_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -876,7 +876,7 @@ procprt_RSIZE_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_RSIZE = 
+-   { " RSIZE", "RSIZE", procprt_RSIZE_a, procprt_RSIZE_e, ' ', 6};
++   { " RSIZE", "RSIZE", .ac.doactiveconverts = procprt_RSIZE_a, procprt_RSIZE_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_PSIZE_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -897,7 +897,7 @@ procprt_PSIZE_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_PSIZE = 
+-   { " PSIZE", "PSIZE", procprt_PSIZE_a, procprt_PSIZE_e, ' ', 6};
++   { " PSIZE", "PSIZE", .ac.doactiveconverts = procprt_PSIZE_a, procprt_PSIZE_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_VSLIBS_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -915,7 +915,7 @@ procprt_VSLIBS_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_VSLIBS = 
+-   { "VSLIBS", "VSLIBS", procprt_VSLIBS_a, procprt_VSLIBS_e, ' ', 6};
++   { "VSLIBS", "VSLIBS", .ac.doactiveconverts = procprt_VSLIBS_a, procprt_VSLIBS_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_VDATA_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -933,7 +933,7 @@ procprt_VDATA_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_VDATA = 
+-   { " VDATA", "VDATA", procprt_VDATA_a, procprt_VDATA_e, ' ', 6};
++   { " VDATA", "VDATA", .ac.doactiveconverts = procprt_VDATA_a, procprt_VDATA_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_VSTACK_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -951,7 +951,7 @@ procprt_VSTACK_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_VSTACK = 
+-   { "VSTACK", "VSTACK", procprt_VSTACK_a, procprt_VSTACK_e, ' ', 6};
++   { "VSTACK", "VSTACK", .ac.doactiveconverts = procprt_VSTACK_a, procprt_VSTACK_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_SWAPSZ_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -969,7 +969,7 @@ procprt_SWAPSZ_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_SWAPSZ = 
+-   { "SWAPSZ", "SWAPSZ", procprt_SWAPSZ_a, procprt_SWAPSZ_e, ' ', 6};
++   { "SWAPSZ", "SWAPSZ", .ac.doactiveconverts = procprt_SWAPSZ_a, procprt_SWAPSZ_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_LOCKSZ_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -987,7 +987,7 @@ procprt_LOCKSZ_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_LOCKSZ = 
+-   { "LOCKSZ", "LOCKSZ", procprt_LOCKSZ_a, procprt_LOCKSZ_e, ' ', 6};
++   { "LOCKSZ", "LOCKSZ", .ac.doactiveconverts = procprt_LOCKSZ_a, procprt_LOCKSZ_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_CMD_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1010,7 +1010,7 @@ procprt_CMD_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_CMD = 
+-   { "CMD           ", "CMD", procprt_CMD_a, procprt_CMD_e, ' ', 14};
++   { "CMD           ", "CMD", .ac.doactiveconverts = procprt_CMD_a, procprt_CMD_e, ' ', 14};
+ /***************************************************************/
+ char *
+ procprt_RUID_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -1023,7 +1023,7 @@ procprt_RUID_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_RUID = 
+-   { "RUID    ", "RUID", procprt_RUID_ae, procprt_RUID_ae, ' ', 8};
++   { "RUID    ", "RUID", .ac.doactiveconverts = procprt_RUID_ae, procprt_RUID_ae, ' ', 8};
+ /***************************************************************/
+ char *
+ procprt_EUID_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1042,7 +1042,7 @@ procprt_EUID_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_EUID = 
+-   { "EUID    ", "EUID", procprt_EUID_a, procprt_EUID_e, ' ', 8};
++   { "EUID    ", "EUID", .ac.doactiveconverts = procprt_EUID_a, procprt_EUID_e, ' ', 8};
+ /***************************************************************/
+ char *
+ procprt_SUID_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1061,7 +1061,7 @@ procprt_SUID_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_SUID = 
+-   { "SUID    ", "SUID", procprt_SUID_a, procprt_SUID_e, ' ', 8};
++   { "SUID    ", "SUID", .ac.doactiveconverts = procprt_SUID_a, procprt_SUID_e, ' ', 8};
+ /***************************************************************/
+ char *
+ procprt_FSUID_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1080,7 +1080,7 @@ procprt_FSUID_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_FSUID = 
+-   { "FSUID   ", "FSUID", procprt_FSUID_a, procprt_FSUID_e, ' ', 8};
++   { "FSUID   ", "FSUID", .ac.doactiveconverts = procprt_FSUID_a, procprt_FSUID_e, ' ', 8};
+ /***************************************************************/
+ char *
+ procprt_RGID_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -1093,7 +1093,7 @@ procprt_RGID_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_RGID = 
+-   { "RGID    ", "RGID", procprt_RGID_ae, procprt_RGID_ae, ' ', 8};
++   { "RGID    ", "RGID", .ac.doactiveconverts = procprt_RGID_ae, procprt_RGID_ae, ' ', 8};
+ /***************************************************************/
+ char *
+ procprt_EGID_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1112,7 +1112,7 @@ procprt_EGID_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_EGID = 
+-   { "EGID    ", "EGID", procprt_EGID_a, procprt_EGID_e, ' ', 8};
++   { "EGID    ", "EGID", .ac.doactiveconverts = procprt_EGID_a, procprt_EGID_e, ' ', 8};
+ /***************************************************************/
+ char *
+ procprt_SGID_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1131,7 +1131,7 @@ procprt_SGID_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_SGID = 
+-   { "SGID    ", "SGID", procprt_SGID_a, procprt_SGID_e, ' ', 8};
++   { "SGID    ", "SGID", .ac.doactiveconverts = procprt_SGID_a, procprt_SGID_e, ' ', 8};
+ /***************************************************************/
+ char *
+ procprt_FSGID_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1150,7 +1150,7 @@ procprt_FSGID_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_FSGID = 
+-   { "FSGID   ", "FSGID", procprt_FSGID_a, procprt_FSGID_e, ' ', 8};
++   { "FSGID   ", "FSGID", .ac.doactiveconverts = procprt_FSGID_a, procprt_FSGID_e, ' ', 8};
+ /***************************************************************/
+ char *
+ procprt_STDATE_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -1162,7 +1162,7 @@ procprt_STDATE_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_STDATE = 
+-   { "  STDATE  ", "STDATE", procprt_STDATE_ae, procprt_STDATE_ae, ' ', 10};
++   { "  STDATE  ", "STDATE", .ac.doactiveconverts = procprt_STDATE_ae, procprt_STDATE_ae, ' ', 10};
+ /***************************************************************/
+ char *
+ procprt_STTIME_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -1174,7 +1174,7 @@ procprt_STTIME_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_STTIME = 
+-   { " STTIME ", "STTIME", procprt_STTIME_ae, procprt_STTIME_ae, ' ', 8};
++   { " STTIME ", "STTIME", .ac.doactiveconverts = procprt_STTIME_ae, procprt_STTIME_ae, ' ', 8};
+ /***************************************************************/
+ char *
+ procprt_ENDATE_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1197,7 +1197,7 @@ procprt_ENDATE_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_ENDATE = 
+-   { "  ENDATE  ", "ENDATE", procprt_ENDATE_a, procprt_ENDATE_e, ' ', 10};
++   { "  ENDATE  ", "ENDATE", .ac.doactiveconverts = procprt_ENDATE_a, procprt_ENDATE_e, ' ', 10};
+ /***************************************************************/
+ char *
+ procprt_ENTIME_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1220,7 +1220,7 @@ procprt_ENTIME_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_ENTIME = 
+-   { " ENTIME ", "ENTIME", procprt_ENTIME_a, procprt_ENTIME_e, ' ', 8};
++   { " ENTIME ", "ENTIME", .ac.doactiveconverts = procprt_ENTIME_a, procprt_ENTIME_e, ' ', 8};
+ /***************************************************************/
+ char *
+ procprt_THR_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1238,7 +1238,7 @@ procprt_THR_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_THR = 
+-   { " THR", "THR", procprt_THR_a, procprt_THR_e, ' ', 4};
++   { " THR", "THR", .ac.doactiveconverts = procprt_THR_a, procprt_THR_e, ' ', 4};
+ /***************************************************************/
+ char *
+ procprt_TRUN_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1256,7 +1256,7 @@ procprt_TRUN_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_TRUN = 
+-   { "TRUN", "TRUN", procprt_TRUN_a, procprt_TRUN_e, ' ', 4};
++   { "TRUN", "TRUN", .ac.doactiveconverts = procprt_TRUN_a, procprt_TRUN_e, ' ', 4};
+ /***************************************************************/
+ char *
+ procprt_TSLPI_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1274,7 +1274,7 @@ procprt_TSLPI_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_TSLPI = 
+-   { "TSLPI", "TSLPI", procprt_TSLPI_a, procprt_TSLPI_e, ' ', 5};
++   { "TSLPI", "TSLPI", .ac.doactiveconverts = procprt_TSLPI_a, procprt_TSLPI_e, ' ', 5};
+ /***************************************************************/
+ char *
+ procprt_TSLPU_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1292,7 +1292,7 @@ procprt_TSLPU_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_TSLPU = 
+-   { "TSLPU", "TSLPU", procprt_TSLPU_a, procprt_TSLPU_e, ' ', 5};
++   { "TSLPU", "TSLPU", .ac.doactiveconverts = procprt_TSLPU_a, procprt_TSLPU_e, ' ', 5};
+ /***************************************************************/
+ char *
+ procprt_TIDLE_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1310,7 +1310,7 @@ procprt_TIDLE_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_TIDLE = 
+-   { "TIDLE", "TIDLE", procprt_TIDLE_a, procprt_TIDLE_e, ' ', 5};
++   { "TIDLE", "TIDLE", .ac.doactiveconverts = procprt_TIDLE_a, procprt_TIDLE_e, ' ', 5};
+ /***************************************************************/
+ #define SCHED_NORMAL   0
+ #define SCHED_FIFO     1
+@@ -1357,7 +1357,7 @@ procprt_POLI_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_POLI = 
+-   { "POLI", "POLI", procprt_POLI_a, procprt_POLI_e, ' ', 4};
++   { "POLI", "POLI", .ac.doactiveconverts = procprt_POLI_a, procprt_POLI_e, ' ', 4};
+ /***************************************************************/
+ char *
+ procprt_NICE_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1375,7 +1375,7 @@ procprt_NICE_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_NICE = 
+-   { "NICE", "NICE", procprt_NICE_a, procprt_NICE_e, ' ', 4};
++   { "NICE", "NICE", .ac.doactiveconverts = procprt_NICE_a, procprt_NICE_e, ' ', 4};
+ /***************************************************************/
+ char *
+ procprt_PRI_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1393,7 +1393,7 @@ procprt_PRI_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_PRI = 
+-   { "PRI", "PRI", procprt_PRI_a, procprt_PRI_e, ' ', 3};
++   { "PRI", "PRI", .ac.doactiveconverts = procprt_PRI_a, procprt_PRI_e, ' ', 3};
+ /***************************************************************/
+ char *
+ procprt_RTPR_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1411,7 +1411,7 @@ procprt_RTPR_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_RTPR = 
+-   { "RTPR", "RTPR", procprt_RTPR_a, procprt_RTPR_e, ' ', 4};
++   { "RTPR", "RTPR", .ac.doactiveconverts = procprt_RTPR_a, procprt_RTPR_e, ' ', 4};
+ /***************************************************************/
+ char *
+ procprt_CURCPU_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1429,7 +1429,7 @@ procprt_CURCPU_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_CURCPU = 
+-   { "CPUNR", "CPUNR", procprt_CURCPU_a, procprt_CURCPU_e, ' ', 5};
++   { "CPUNR", "CPUNR", .ac.doactiveconverts = procprt_CURCPU_a, procprt_CURCPU_e, ' ', 5};
+ /***************************************************************/
+ char *
+ procprt_ST_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1473,7 +1473,7 @@ procprt_ST_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_ST = 
+-   { "ST", "ST", procprt_ST_a, procprt_ST_e, ' ', 2};
++   { "ST", "ST", .ac.doactiveconverts = procprt_ST_a, procprt_ST_e, ' ', 2};
+ /***************************************************************/
+ char *
+ procprt_EXC_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1496,7 +1496,7 @@ procprt_EXC_e(struct tstat *curstat, int avgval, int nsecs)
+ 
+ 
+ detail_printdef procprt_EXC = 
+-   { "EXC", "EXC", procprt_EXC_a, procprt_EXC_e, ' ', 3};
++   { "EXC", "EXC", .ac.doactiveconverts = procprt_EXC_a, procprt_EXC_e, ' ', 3};
+ /***************************************************************/
+ char *
+ procprt_S_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1515,7 +1515,7 @@ procprt_S_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_S = 
+-   { "S", "S", procprt_S_a, procprt_S_e, ' ', 1};
++   { "S", "S", .ac.doactiveconverts = procprt_S_a, procprt_S_e, ' ', 1};
+ 
+ /***************************************************************/
+ char *
+@@ -1546,7 +1546,7 @@ procprt_COMMAND_LINE_ae(struct tstat *curstat, int avgval, int nsecs)
+ detail_printdef procprt_COMMAND_LINE = 
+        { "COMMAND-LINE (horizontal scroll with <- and -> keys)",
+        "COMMAND-LINE", 
+-        procprt_COMMAND_LINE_ae, procprt_COMMAND_LINE_ae, ' ', 0, 1};
++        .ac.doactiveconverts = procprt_COMMAND_LINE_ae, procprt_COMMAND_LINE_ae, ' ', 0, 1};
+ /***************************************************************/
+ char *
+ procprt_NPROCS_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -1558,7 +1558,7 @@ procprt_NPROCS_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_NPROCS = 
+-   { "NPROCS", "NPROCS", procprt_NPROCS_ae, procprt_NPROCS_ae, ' ', 6};
++   { "NPROCS", "NPROCS", .ac.doactiveconverts = procprt_NPROCS_ae, procprt_NPROCS_ae, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_RDDSK_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1580,7 +1580,7 @@ procprt_RDDSK_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_RDDSK = 
+-   { " RDDSK", "RDDSK", procprt_RDDSK_a, procprt_RDDSK_e, ' ', 6};
++   { " RDDSK", "RDDSK", .ac.doactiveconverts = procprt_RDDSK_a, procprt_RDDSK_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_WRDSK_a(struct tstat *curstat, int avgval, int nsecs) 
+@@ -1602,7 +1602,7 @@ procprt_WRDSK_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_WRDSK = 
+-   { " WRDSK", "WRDSK", procprt_WRDSK_a, procprt_WRDSK_e, ' ', 6};
++   { " WRDSK", "WRDSK", .ac.doactiveconverts = procprt_WRDSK_a, procprt_WRDSK_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_CWRDSK_a(struct tstat *curstat, int avgval, int nsecs) 
+@@ -1621,7 +1621,7 @@ procprt_CWRDSK_a(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_CWRDSK = 
+-   {" WRDSK", "CWRDSK", procprt_CWRDSK_a, procprt_WRDSK_e, ' ', 6};
++   {" WRDSK", "CWRDSK", .ac.doactiveconverts = procprt_CWRDSK_a, procprt_WRDSK_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_WCANCEL_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1643,7 +1643,7 @@ procprt_WCANCEL_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_WCANCEL = 
+-   {"WCANCL", "WCANCL", procprt_WCANCEL_a, procprt_WCANCEL_e, ' ', 6};
++   {"WCANCL", "WCANCL", .ac.doactiveconverts = procprt_WCANCEL_a, procprt_WCANCEL_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_TCPRCV_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1672,7 +1672,7 @@ procprt_TCPRCV_e(struct tstat *curstat, int avgval, int nsecs)
+ 
+ 
+ detail_printdef procprt_TCPRCV = 
+-   { "TCPRCV", "TCPRCV", procprt_TCPRCV_a, procprt_TCPRCV_e, ' ', 6};
++   { "TCPRCV", "TCPRCV", .ac.doactiveconverts = procprt_TCPRCV_a, procprt_TCPRCV_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_TCPRASZ_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1704,7 +1704,7 @@ procprt_TCPRASZ_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_TCPRASZ = 
+-   { "TCPRASZ", "TCPRASZ", procprt_TCPRASZ_a, procprt_TCPRASZ_e, ' ', 7};
++   { "TCPRASZ", "TCPRASZ", .ac.doactiveconverts = procprt_TCPRASZ_a, procprt_TCPRASZ_e, ' ', 7};
+ /***************************************************************/
+ char *
+ procprt_TCPSND_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1732,7 +1732,7 @@ procprt_TCPSND_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_TCPSND = 
+-   { "TCPSND", "TCPSND", procprt_TCPSND_a, procprt_TCPSND_e, ' ', 6};
++   { "TCPSND", "TCPSND", .ac.doactiveconverts = procprt_TCPSND_a, procprt_TCPSND_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_TCPSASZ_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1764,7 +1764,7 @@ procprt_TCPSASZ_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_TCPSASZ = 
+-   { "TCPSASZ", "TCPSASZ", procprt_TCPSASZ_a, procprt_TCPSASZ_e, ' ', 7};
++   { "TCPSASZ", "TCPSASZ", .ac.doactiveconverts = procprt_TCPSASZ_a, procprt_TCPSASZ_e, ' ', 7};
+ /***************************************************************/
+ char *
+ procprt_UDPRCV_a(struct tstat *curstat, int avgval, int nsecs)        
+@@ -1793,7 +1793,7 @@ procprt_UDPRCV_e(struct tstat *curstat, int avgval, int nsecs)
+ 
+ 
+ detail_printdef procprt_UDPRCV = 
+-   { "UDPRCV", "UDPRCV", procprt_UDPRCV_a, procprt_UDPRCV_e, ' ', 6};
++   { "UDPRCV", "UDPRCV", .ac.doactiveconverts = procprt_UDPRCV_a, procprt_UDPRCV_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_UDPRASZ_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1826,7 +1826,7 @@ procprt_UDPRASZ_e(struct tstat *curstat, int avgval, int nsecs)
+ 
+ 
+ detail_printdef procprt_UDPRASZ = 
+-   { "UDPRASZ", "UDPRASZ", procprt_UDPRASZ_a, procprt_UDPRASZ_e, ' ', 7};
++   { "UDPRASZ", "UDPRASZ", .ac.doactiveconverts = procprt_UDPRASZ_a, procprt_UDPRASZ_e, ' ', 7};
+ /***************************************************************/
+ char *
+ procprt_UDPSND_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1854,7 +1854,7 @@ procprt_UDPSND_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_UDPSND = 
+-   { "UDPSND", "UDPSND", procprt_UDPSND_a, procprt_UDPSND_e, ' ', 6};
++   { "UDPSND", "UDPSND", .ac.doactiveconverts = procprt_UDPSND_a, procprt_UDPSND_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_UDPSASZ_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1887,7 +1887,7 @@ procprt_UDPSASZ_e(struct tstat *curstat, int avgval, int nsecs)
+ 
+ 
+ detail_printdef procprt_UDPSASZ = 
+-   { "UDPSASZ", "UDPSASZ", procprt_UDPSASZ_a, procprt_UDPSASZ_e, ' ', 7};
++   { "UDPSASZ", "UDPSASZ", .ac.doactiveconverts = procprt_UDPSASZ_a, procprt_UDPSASZ_e, ' ', 7};
+ /***************************************************************/
+ char *
+ procprt_RNET_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1917,7 +1917,7 @@ procprt_RNET_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_RNET = 
+-   { " RNET", "RNET", procprt_RNET_a, procprt_RNET_e, ' ', 5};
++   { " RNET", "RNET", .ac.doactiveconverts = procprt_RNET_a, procprt_RNET_e, ' ', 5};
+ /***************************************************************/
+ char *
+ procprt_SNET_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1945,7 +1945,7 @@ procprt_SNET_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_SNET = 
+-   { " SNET", "SNET", procprt_SNET_a, procprt_SNET_e, ' ', 5};
++   { " SNET", "SNET", .ac.doactiveconverts = procprt_SNET_a, procprt_SNET_e, ' ', 5};
+ /***************************************************************/
+ char *
+ procprt_BANDWI_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -1974,7 +1974,7 @@ procprt_BANDWI_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_BANDWI = 
+-   { "   BANDWI", "BANDWI", procprt_BANDWI_a, procprt_BANDWI_e, ' ', 9};
++   { "   BANDWI", "BANDWI", .ac.doactiveconverts = procprt_BANDWI_a, procprt_BANDWI_e, ' ', 9};
+ /***************************************************************/
+ char *
+ procprt_BANDWO_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -2003,7 +2003,7 @@ procprt_BANDWO_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_BANDWO = 
+-   { "   BANDWO", "BANDWO", procprt_BANDWO_a, procprt_BANDWO_e, ' ', 9};
++   { "   BANDWO", "BANDWO", .ac.doactiveconverts = procprt_BANDWO_a, procprt_BANDWO_e, ' ', 9};
+ /***************************************************************/
+ static void
+ format_bandw(char *buf, count_t kbps)
+@@ -2069,7 +2069,7 @@ procprt_GPULIST_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_GPULIST = 
+-   { " GPUNUMS", "GPULIST", procprt_GPULIST_ae, procprt_GPULIST_ae, ' ', 8};
++   { " GPUNUMS", "GPULIST", .ac.doactiveconverts = procprt_GPULIST_ae, procprt_GPULIST_ae, ' ', 8};
+ /***************************************************************/
+ char *
+ procprt_GPUMEMNOW_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -2084,7 +2084,7 @@ procprt_GPUMEMNOW_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_GPUMEMNOW = 
+-   { "MEMNOW", "GPUMEM", procprt_GPUMEMNOW_ae, procprt_GPUMEMNOW_ae, ' ', 6};
++   { "MEMNOW", "GPUMEM", .ac.doactiveconverts = procprt_GPUMEMNOW_ae, procprt_GPUMEMNOW_ae, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_GPUMEMAVG_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -2103,7 +2103,7 @@ procprt_GPUMEMAVG_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_GPUMEMAVG = 
+-   { "MEMAVG", "GPUMEMAVG", procprt_GPUMEMAVG_ae, procprt_GPUMEMAVG_ae, ' ', 6};
++   { "MEMAVG", "GPUMEMAVG", .ac.doactiveconverts = procprt_GPUMEMAVG_ae, procprt_GPUMEMAVG_ae, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_GPUGPUBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -2121,7 +2121,7 @@ procprt_GPUGPUBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_GPUGPUBUSY = 
+-   { "GPUBUSY", "GPUGPUBUSY", procprt_GPUGPUBUSY_ae, procprt_GPUGPUBUSY_ae, ' ', 7};
++   { "GPUBUSY", "GPUGPUBUSY", .ac.doactiveconverts = procprt_GPUGPUBUSY_ae, procprt_GPUGPUBUSY_ae, ' ', 7};
+ /***************************************************************/
+ char *
+ procprt_GPUMEMBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -2139,7 +2139,7 @@ procprt_GPUMEMBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_GPUMEMBUSY = 
+-   { "MEMBUSY", "GPUMEMBUSY", procprt_GPUMEMBUSY_ae, procprt_GPUMEMBUSY_ae, ' ', 7};
++   { "MEMBUSY", "GPUMEMBUSY", .ac.doactiveconverts = procprt_GPUMEMBUSY_ae, procprt_GPUMEMBUSY_ae, ' ', 7};
+ /***************************************************************/
+ char *
+ procprt_WCHAN_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -2164,7 +2164,7 @@ procprt_WCHAN_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_WCHAN =
+-   { "WCHAN          ", "WCHAN", procprt_WCHAN_a, procprt_WCHAN_e, ' ', 15};
++   { "WCHAN          ", "WCHAN", .ac.doactiveconverts = procprt_WCHAN_a, procprt_WCHAN_e, ' ', 15};
+ /***************************************************************/
+ char *
+ procprt_RUNDELAY_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -2185,7 +2185,7 @@ procprt_RUNDELAY_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_RUNDELAY =
+-   { "RDELAY", "RDELAY", procprt_RUNDELAY_a, procprt_RUNDELAY_e, ' ', 6};
++   { "RDELAY", "RDELAY", .ac.doactiveconverts = procprt_RUNDELAY_a, procprt_RUNDELAY_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_BLKDELAY_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -2206,7 +2206,7 @@ procprt_BLKDELAY_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_BLKDELAY =
+-   { "BDELAY", "BDELAY", procprt_BLKDELAY_a, procprt_BLKDELAY_e, ' ', 6};
++   { "BDELAY", "BDELAY", .ac.doactiveconverts = procprt_BLKDELAY_a, procprt_BLKDELAY_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_NVCSW_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -2224,7 +2224,7 @@ procprt_NVCSW_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_NVCSW =
+-   { " NVCSW", "NVCSW", procprt_NVCSW_a, procprt_NVCSW_e, ' ', 6};
++   { " NVCSW", "NVCSW", .ac.doactiveconverts = procprt_NVCSW_a, procprt_NVCSW_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_NIVCSW_a(struct tstat *curstat, int avgval, int nsecs)
+@@ -2242,7 +2242,7 @@ procprt_NIVCSW_e(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_NIVCSW =
+-   { "NIVCSW", "NIVCSW", procprt_NIVCSW_a, procprt_NIVCSW_e, ' ', 6};
++   { "NIVCSW", "NIVCSW", .ac.doactiveconverts = procprt_NIVCSW_a, procprt_NIVCSW_e, ' ', 6};
+ /***************************************************************/
+ char *
+ procprt_SORTITEM_ae(struct tstat *curstat, int avgval, int nsecs)
+@@ -2251,7 +2251,7 @@ procprt_SORTITEM_ae(struct tstat *curstat, int avgval, int nsecs)
+ }
+ 
+ detail_printdef procprt_SORTITEM =   // width is dynamically defined!
+-   { 0, "SORTITEM", procprt_SORTITEM_ae, procprt_SORTITEM_ae, ' ', 4};
++   { 0, "SORTITEM", .ac.doactiveconverts = procprt_SORTITEM_ae, procprt_SORTITEM_ae, ' ', 4};
+ 
+ 
+ /***************************************************************/
+@@ -2382,7 +2382,7 @@ showcgroupline(detail_printpair* elemptr,
+ 
+                color = 0;
+ 
+-               buf = curelem.pf->doactiveconvert(cgchain, tstat,
++               buf = curelem.pf->ac.doactiveconvertc(cgchain, tstat,
+                                avgval, nsecs, cputicks, nrcpu, &color);
+ 
+                 if (screen)
+@@ -2513,7 +2513,7 @@ cgroup_CGROUP_PATH(struct cgchainer *cgchain, struct tstat *tstat,
+ 
+ detail_printdef cgroupprt_CGROUP_PATH = 
+        {"CGROUP (scroll: <- ->)    ", "CGRPATH", 
+-        cgroup_CGROUP_PATH, NULL, ' ', 26, 0};
++       .ac.doactiveconvertc = cgroup_CGROUP_PATH, NULL, ' ', 26, 0};
+ /***************************************************************/
+ char *
+ cgroup_CGRNPROCS(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2530,7 +2530,7 @@ cgroup_CGRNPROCS(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRNPROCS = 
+-   { "NPROCS", "CGRNPROCS", cgroup_CGRNPROCS, NULL, ' ', 6};
++   { "NPROCS", "CGRNPROCS", .ac.doactiveconvertc = cgroup_CGRNPROCS, NULL, ' ', 6};
+ /***************************************************************/
+ char *
+ cgroup_CGRNPROCSB(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2547,7 +2547,7 @@ cgroup_CGRNPROCSB(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRNPROCSB = 
+-   { "PBELOW", "CGRNPROCSB", cgroup_CGRNPROCSB, NULL, ' ', 6};
++   { "PBELOW", "CGRNPROCSB", .ac.doactiveconvertc = cgroup_CGRNPROCSB, NULL, ' ', 6};
+ /***************************************************************/
+ char *
+ cgroup_CGRCPUBUSY(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2599,7 +2599,7 @@ cgroup_CGRCPUBUSY(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRCPUBUSY =
+-   { "CPUBUSY", "CGRCPUBUSY", cgroup_CGRCPUBUSY, NULL, 'C', 7};
++   { "CPUBUSY", "CGRCPUBUSY", .ac.doactiveconvertc = cgroup_CGRCPUBUSY, NULL, 'C', 7};
+ /***************************************************************/
+ char *
+ cgroup_CGRCPUPSI(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2629,7 +2629,7 @@ cgroup_CGRCPUPSI(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRCPUPSI =
+-   { "CPUPS", "CGRCPUPSI", cgroup_CGRCPUPSI, NULL, ' ', 5};
++   { "CPUPS", "CGRCPUPSI", .ac.doactiveconvertc = cgroup_CGRCPUPSI, NULL, ' ', 5};
+ /***************************************************************/
+ char *
+ cgroup_CGRCPUMAX(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2672,7 +2672,7 @@ cgroup_CGRCPUMAX(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRCPUMAX =
+-   { "CPUMAX", "CGRCPUMAX", cgroup_CGRCPUMAX, NULL, ' ', 6};
++   { "CPUMAX", "CGRCPUMAX", .ac.doactiveconvertc = cgroup_CGRCPUMAX, NULL, ' ', 6};
+ /***************************************************************/
+ char *
+ cgroup_CGRCPUWGT(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2695,7 +2695,7 @@ cgroup_CGRCPUWGT(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRCPUWGT =
+-   { "CPUWGT", "CGRCPUWGT", cgroup_CGRCPUWGT, NULL, ' ', 6};
++   { "CPUWGT", "CGRCPUWGT", .ac.doactiveconvertc = cgroup_CGRCPUWGT, NULL, ' ', 6};
+ /***************************************************************/
+ char *
+ cgroup_CGRMEMORY(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2740,7 +2740,7 @@ cgroup_CGRMEMORY(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRMEMORY =
+-   { "MEMORY", "CGRMEMORY", cgroup_CGRMEMORY, NULL, 'M', 6};
++   { "MEMORY", "CGRMEMORY", .ac.doactiveconvertc = cgroup_CGRMEMORY, NULL, 'M', 6};
+ /***************************************************************/
+ char *
+ cgroup_CGRMEMPSI(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2770,7 +2770,7 @@ cgroup_CGRMEMPSI(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRMEMPSI =
+-   { "MEMPS", "CGRMEMPSI", cgroup_CGRMEMPSI, NULL, ' ', 5};
++   { "MEMPS", "CGRMEMPSI", .ac.doactiveconvertc = cgroup_CGRMEMPSI, NULL, ' ', 5};
+ /***************************************************************/
+ char *
+ cgroup_CGRMEMMAX(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2810,7 +2810,7 @@ cgroup_CGRMEMMAX(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRMEMMAX =
+-   { "MEMMAX", "CGRMEMMAX", cgroup_CGRMEMMAX, NULL, ' ', 6};
++   { "MEMMAX", "CGRMEMMAX", .ac.doactiveconvertc = cgroup_CGRMEMMAX, NULL, ' ', 6};
+ /***************************************************************/
+ char *
+ cgroup_CGRSWPMAX(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2835,7 +2835,7 @@ cgroup_CGRSWPMAX(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRSWPMAX =
+-   { "SWPMAX", "CGRSWPMAX", cgroup_CGRSWPMAX, NULL, ' ', 6};
++   { "SWPMAX", "CGRSWPMAX", .ac.doactiveconvertc = cgroup_CGRSWPMAX, NULL, ' ', 6};
+ /***************************************************************/
+ char *
+ cgroup_CGRDISKIO(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2864,7 +2864,7 @@ cgroup_CGRDISKIO(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRDISKIO =
+-   { "DISKIO", "CGRDISKIO", cgroup_CGRDISKIO, NULL, 'D', 6};
++   { "DISKIO", "CGRDISKIO", .ac.doactiveconvertc = cgroup_CGRDISKIO, NULL, 'D', 6};
+ /***************************************************************/
+ char *
+ cgroup_CGRDSKPSI(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2894,7 +2894,7 @@ cgroup_CGRDSKPSI(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRDSKPSI =
+-   { "DSKPS", "CGRDSKPSI", cgroup_CGRDSKPSI, NULL, ' ', 5};
++   { "DSKPS", "CGRDSKPSI", .ac.doactiveconvertc = cgroup_CGRDSKPSI, NULL, ' ', 5};
+ /***************************************************************/
+ char *
+ cgroup_CGRDSKWGT(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2917,7 +2917,7 @@ cgroup_CGRDSKWGT(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRDSKWGT =
+-   { "IOWGT", "CGRDSKWGT", cgroup_CGRDSKWGT, NULL, ' ', 5};
++   { "IOWGT", "CGRDSKWGT", .ac.doactiveconvertc = cgroup_CGRDSKWGT, NULL, ' ', 5};
+ /***************************************************************/
+ char *
+ cgroup_CGRPID(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2934,7 +2934,7 @@ cgroup_CGRPID(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRPID = 
+-   { "PID", "CGRPID", cgroup_CGRPID, NULL, ' ', 5}; //DYNAMIC WIDTH!
++   { "PID", "CGRPID", .ac.doactiveconvertc = cgroup_CGRPID, NULL, ' ', 5}; //DYNAMIC WIDTH!
+ /***************************************************************/
+ char *
+ cgroup_CGRCMD(struct cgchainer *cgchain, struct tstat *tstat,
+@@ -2963,5 +2963,5 @@ cgroup_CGRCMD(struct cgchainer *cgchain, struct tstat *tstat,
+ }
+ 
+ detail_printdef cgroupprt_CGRCMD = 
+-   { "CMD           ", "CGRCMD", cgroup_CGRCMD, NULL, ' ', 14};
++   { "CMD           ", "CGRCMD", .ac.doactiveconvertc = cgroup_CGRCMD, NULL, ' ', 14};
+ /***************************************************************/
+diff --git a/various.c b/various.c
+index c175c10..906a529 100644
+--- a/various.c
++++ b/various.c
+@@ -29,6 +29,10 @@
+ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ** --------------------------------------------------------------------------
+ */
++#define _POSIX_C_SOURCE
++#define _XOPEN_SOURCE
++#define _GNU_SOURCE
++#define _DEFAULT_SOURCE
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch b/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch
deleted file mode 100644
index facb257be6..0000000000
--- a/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From ffc8ba8d324243a923abe48e9758adecb03d24a4 Mon Sep 17 00:00:00 2001
-From: Peter Kjellerstedt <pkj@axis.com>
-Date: Tue, 12 Feb 2019 21:25:23 +0100
-Subject: [PATCH] atop.daily, atop.init, atop-pm.sh: Avoid using bash
-
-Avoid using bash and bashisms when not necesary. On some systems,
-e.g., embedded products, bash may not be available by default.
-
-Upstream-Status: Submitted [https://github.com/Atoptool/atop/pull/50]
-Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
----
- atop-pm.sh | 2 +-
- atop.daily | 4 ++--
- atop.init  | 4 ++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/atop-pm.sh b/atop-pm.sh
-index 7f41a86..3ff4ab5 100755
---- a/atop-pm.sh
-+++ b/atop-pm.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- case "$1" in
-        pre)    /usr/bin/systemctl stop atop
-diff --git a/atop.daily b/atop.daily
-index 57a9507..fe5a11b 100755
---- a/atop.daily
-+++ b/atop.daily
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- LOGOPTS="-R"                           # default options
- LOGINTERVAL=600                                # default interval in seconds
-@@ -38,7 +38,7 @@ then
- 
-        while ps -p `cat "$PIDFILE"` > /dev/null
-        do
--               let CNT+=1
-+               CNT=$((CNT + 1))
- 
-                if [ $CNT -gt 5 ]
-                then
-diff --git a/atop.init b/atop.init
-index e6e11dc..03c3f02 100755
---- a/atop.init
-+++ b/atop.init
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # atop         Startup script for the Atop process logging in background
- #
-@@ -47,7 +47,7 @@ case "$1" in
- 
-                while ps -p `cat $PIDFILE` > /dev/null
-                do
--                       let CNT+=1
-+                       CNT=$((CNT + 1))
- 
-                        if [ $CNT -gt 5 ]
-                        then
--- 
-2.12.0
-
diff --git a/meta-oe/recipes-support/atop/atop/fix-permissions.patch b/meta-oe/recipes-support/atop/atop/fix-permissions.patch
index 8488b38000..10f504b472 100644
--- a/meta-oe/recipes-support/atop/atop/fix-permissions.patch
+++ b/meta-oe/recipes-support/atop/atop/fix-permissions.patch
@@ -8,24 +8,32 @@ everyone could read.
 
 Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
+Signed-off-by: Tho Dat Nguyen <tho3.nguyen@lge.com>
 ---
- Makefile | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ Makefile | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 3bf5929..1221ee4 100644
+index a6f196b..7786f93 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -72,7 +72,7 @@ systemdinstall:       genericinstall
-                chmod 0644            $(DESTDIR)$(SYSDPATH)/atopacct.service
-                cp atop.cronsystemd   $(DESTDIR)$(CRNPATH)/atop
-                cp atop-pm.sh         $(DESTDIR)$(PMPATHD)
--               chmod 0711            $(DESTDIR)$(PMPATHD)/atop-pm.sh
-+               chmod 0755            $(DESTDIR)$(PMPATHD)/atop-pm.sh
+@@ -77,7 +77,7 @@ install:      genericinstall
+                cp atopacct.service    $(DESTDIR)$(SYSDPATH)
+                chmod 0644             $(DESTDIR)$(SYSDPATH)/atopacct.service
+                cp atop-pm.sh          $(DESTDIR)$(PMPATHD)
+-               chmod 0711             $(DESTDIR)$(PMPATHD)/atop-pm.sh
++               chmod 0755             $(DESTDIR)$(PMPATHD)/atop-pm.sh
                 #
                 # only when making on target system:
                 #
-@@ -97,11 +97,11 @@ sysvinstall:        genericinstall
+@@ -107,17 +107,17 @@ sysvinstall:      genericinstall
+                cp atopacct.init  $(DESTDIR)$(INIPATH)/atopacct
+                cp atop.cronsysv  $(DESTDIR)$(CRNPATH)/atop
+                cp atop.daily     $(DESTDIR)$(SCRPATH)
+-               chmod 0711        $(DESTDIR)$(SCRPATH)/atop.daily
++               chmod 0755        $(DESTDIR)$(SCRPATH)/atop.daily
+                touch             $(DESTDIR)$(LOGPATH)/dummy_before
+                touch             $(DESTDIR)$(LOGPATH)/dummy_after
                 #
                 if [   -d $(DESTDIR)$(PMPATH1) ];                       \
                 then    cp 45atoppm $(DESTDIR)$(PMPATH1);               \
@@ -39,21 +47,27 @@ index 3bf5929..1221ee4 100644
                 fi
                 #
                 #
-@@ -145,7 +145,7 @@ genericinstall:     atop atopacctd atopconvert
+@@ -160,7 +160,7 @@ genericinstall:     atop atopacctd atopconvert atopcat atophide
+                chmod 644               $(DESTDIR)$(DEFPATH)/atop
                 #
                 cp atop                 $(DESTDIR)$(BINPATH)/atop
-                chown root              $(DESTDIR)$(BINPATH)/atop
--               chmod 04711             $(DESTDIR)$(BINPATH)/atop
+-               chmod 0711              $(DESTDIR)$(BINPATH)/atop
 +               chmod 0755              $(DESTDIR)$(BINPATH)/atop
                 ln -sf atop             $(DESTDIR)$(BINPATH)/atopsar
                 cp atopacctd            $(DESTDIR)$(SBINPATH)/atopacctd
-                chown root              $(DESTDIR)$(SBINPATH)/atopacctd
-@@ -159,7 +159,7 @@ genericinstall:     atop atopacctd atopconvert
-                chown root              $(DESTDIR)$(BINPATH)/atopconvert
-                chmod 0711              $(DESTDIR)$(BINPATH)/atopconvert
-                cp atop.daily           $(DESTDIR)$(SCRPATH)
--               chmod 0711              $(DESTDIR)$(SCRPATH)/atop.daily
-+               chmod 0755              $(DESTDIR)$(SCRPATH)/atop.daily
+                chmod 0700              $(DESTDIR)$(SBINPATH)/atopacctd
+@@ -169,11 +169,11 @@ genericinstall:   atop atopacctd atopconvert atopcat atophide
+                cp atop                 $(DESTDIR)$(BINPATH)/atop-$(VERS)
+                ln -sf atop-$(VERS)     $(DESTDIR)$(BINPATH)/atopsar-$(VERS)
+                cp atopconvert          $(DESTDIR)$(BINPATH)/atopconvert
+-               chmod 0711              $(DESTDIR)$(BINPATH)/atopconvert
++               chmod 0755              $(DESTDIR)$(BINPATH)/atopconvert
+                cp atopcat              $(DESTDIR)$(BINPATH)/atopcat
+-               chmod 0711              $(DESTDIR)$(BINPATH)/atopcat
++               chmod 0755              $(DESTDIR)$(BINPATH)/atopcat
+                cp atophide             $(DESTDIR)$(BINPATH)/atophide
+-               chmod 0711              $(DESTDIR)$(BINPATH)/atophide
++               chmod 0755              $(DESTDIR)$(BINPATH)/atophide
                 cp man/atop.1           $(DESTDIR)$(MAN1PATH)
                 cp man/atopsar.1        $(DESTDIR)$(MAN1PATH)
                 cp man/atopconvert.1    $(DESTDIR)$(MAN1PATH)
diff --git a/meta-oe/recipes-support/atop/atop_2.4.0.bb b/meta-oe/recipes-support/atop/atop_2.11.0.bb
index 4b0e74227b..8eb8cd6b06 100644
--- a/meta-oe/recipes-support/atop/atop_2.4.0.bb
+++ b/meta-oe/recipes-support/atop/atop_2.11.0.bb
@@ -13,18 +13,23 @@ SECTION = "console/utils"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
-DEPENDS = "ncurses zlib"
+inherit pkgconfig
+
+DEPENDS = "ncurses zlib glib-2.0"
 
 SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \
            ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \
            file://fix-permissions.patch \
            file://sysvinit-implement-status.patch \
-           file://0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch \
+           file://0001-Redefine-function-prototypes-solves-issue-322.patch \
            "
-SRC_URI[md5sum] = "1077da884ed94f2bc3c81ac3ab970436"
-SRC_URI[sha256sum] = "be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69"
+SRC_URI[sha256sum] = "9b94c666602efff7bf402ecce706c347f38c39cb63498f9d39626861e5646e20"
+
+UPSTREAM_CHECK_URI = "https://atoptool.nl/downloadatop.php"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+).tar"
 
 CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
+TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_compile() {
     oe_runmake all
@@ -33,7 +38,7 @@ do_compile() {
 do_install() {
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \
-            PMPATHD=${systemd_unitdir}/system-sleep systemdinstall
+            PMPATHD=${systemd_unitdir}/system-sleep install
         install -d ${D}${sysconfdir}/tmpfiles.d
         install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf
         rm -f ${D}${systemd_system_unitdir}/atopacct.service
@@ -54,9 +59,9 @@ do_install() {
 
 inherit systemd
 
-SYSTEMD_SERVICE:${PN} = "atop.service atopgpu.service"
+SYSTEMD_SERVICE:${PN} = "atop.service atopgpu.service atop-rotate.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
-FILES:${PN} += "${systemd_unitdir}/system-sleep"
+FILES:${PN} += "${systemd_unitdir}/system-sleep ${systemd_system_unitdir}/atop-rotate.timer"
 
 RDEPENDS:${PN} = "procps"
diff --git a/meta-oe/recipes-support/augeas/augeas_1.12.0.bb b/meta-oe/recipes-support/augeas/augeas_1.12.0.bb
index 2c6d4cdc88..14e818253b 100644
--- a/meta-oe/recipes-support/augeas/augeas_1.12.0.bb
+++ b/meta-oe/recipes-support/augeas/augeas_1.12.0.bb
@@ -9,7 +9,6 @@ SRC_URI = "http://download.augeas.net/${BP}.tar.gz \
            file://sepbuildfix.patch \
            file://0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch \
           "
-SRC_URI[md5sum] = "74f1c7b8550f4e728486091f6b907175"
 SRC_URI[sha256sum] = "321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87"
 
 DEPENDS = "readline libxml2"
diff --git a/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb
index 6ec25bdd2b..c1e8863fb3 100644
--- a/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb
+++ b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb
@@ -15,8 +15,13 @@ SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \
            file://0003-Update-CXX-standard-to-CXX14.patch \
           "
 
-S = "${WORKDIR}/git/lang/c++"
+S = "${UNPACKDIR}/${BP}/lang/c++"
 
 inherit cmake pkgconfig
 
 BBCLASSEXTEND = "native nativesdk"
+
+# http://errors.yoctoproject.org/Errors/Details/766913/
+# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:304:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference]
+# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:370:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference]
+CXXFLAGS += "-Wno-error=dangling-reference"
diff --git a/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch b/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch
new file mode 100644
index 0000000000..bfe2ea6367
--- /dev/null
+++ b/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch
@@ -0,0 +1,59 @@
+From 52f051dbeefad0b7e73187becad6c33747b047d3 Mon Sep 17 00:00:00 2001
+From: Sahil Kang <sahil.kang@asilaycomputing.com>
+Date: Mon, 11 Mar 2024 03:01:21 -0700
+Subject: [PATCH] AVRO-3957: [C] Fix typos in docs and examples (#2795)
+
+* AVRO-3957: [C] Fix misformatted type in docs
+
+Signed-off-by: Sahil Kang <sahil.kang@asilaycomputing.com>
+Signed-off-by: Sahil Kang <sahilkang@google.com>
+
+* AVRO-3957: [C] Fix type in quickstop example
+
+This removes the following warning:
+
+  avro/lang/c/examples/quickstop.c:123:40: warning: incompatible pointer types passing 'int32_t **' (aka 'int **') to parameter of type
+        'const char **' [-Wincompatible-pointer-types]
+                          avro_value_get_string(&first_value, &p, &size);
+
+Signed-off-by: Sahil Kang <sahil.kang@asilaycomputing.com>
+Signed-off-by: Sahil Kang <sahilkang@google.com>
+
+---------
+
+Signed-off-by: Sahil Kang <sahil.kang@asilaycomputing.com>
+Signed-off-by: Sahil Kang <sahilkang@google.com>
+
+Upstream-Status: Backport [52f051dbee AVRO-3957: [C] Fix typos in docs and examples (#2795)]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ lang/c/docs/index.txt       | 2 +-
+ lang/c/examples/quickstop.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lang/c/docs/index.txt b/lang/c/docs/index.txt
+index a439a0526..df16f9d96 100644
+--- a/lang/c/docs/index.txt
++++ b/lang/c/docs/index.txt
+@@ -178,7 +178,7 @@ different versions of the Avro library.  That means that it's really
+ only safe to use these hash values internally within the context of a
+ single execution of a single application.
+ 
+-The +reset+ method “clears out” an +avro_value_t instance, making sure
++The +reset+ method “clears out” an +avro_value_t+ instance, making sure
+ that it's ready to accept the contents of a new value.  For scalars,
+ this is usually a no-op, since the new value will just overwrite the old
+ one.  For arrays and maps, this removes any existing elements from the
+diff --git a/lang/c/examples/quickstop.c b/lang/c/examples/quickstop.c
+index ff9e97005..b26dad10c 100644
+--- a/lang/c/examples/quickstop.c
++++ b/lang/c/examples/quickstop.c
+@@ -107,7 +107,7 @@ int print_person(avro_file_reader_t db, avro_schema_t reader_schema)
+        if (rval == 0) {
+                int64_t id;
+                int32_t age;
+-               int32_t *p;
++               const char *p;
+                size_t size;
+                avro_value_t id_value;
+                avro_value_t first_value;
diff --git a/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch b/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch
new file mode 100644
index 0000000000..8f7bbc868a
--- /dev/null
+++ b/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch
@@ -0,0 +1,386 @@
+From 03ea96b48f7e668abd9f3b33799635e4e50a526c Mon Sep 17 00:00:00 2001
+From: Sahil Kang <sahilkang@google.com>
+Date: Mon, 25 Mar 2024 04:41:41 -0700
+Subject: [PATCH] AVRO-3960: [C] Fix st ANYARGS warning (#2798)
+
+This removes the following warning:
+
+  avro/lang/c/src/st.c:240:13: warning: passing arguments to a function without a prototype is deprecated in all versions of C and is not
+        supported in C2x [-Wdeprecated-non-prototype]
+          hash_val = do_hash(key, table);
+
+Signed-off-by: Sahil Kang <sahil.kang@asilaycomputing.com>
+Signed-off-by: Sahil Kang <sahilkang@google.com>
+
+Upstream-Status: Backport [03ea96b48f AVRO-3960: [C] Fix st ANYARGS warning (#2798)]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ lang/c/src/datum.c          | 12 ++++++------
+ lang/c/src/datum_equal.c    |  4 ++--
+ lang/c/src/datum_size.c     |  2 +-
+ lang/c/src/datum_validate.c |  2 +-
+ lang/c/src/memoize.c        |  6 +++---
+ lang/c/src/schema.c         | 10 +++++-----
+ lang/c/src/st.c             | 34 ++++++++++++++++++----------------
+ lang/c/src/st.h             | 22 +++++++++-------------
+ 8 files changed, 45 insertions(+), 47 deletions(-)
+
+diff --git a/lang/c/src/datum.c b/lang/c/src/datum.c
+index 53dfa5ca0..5307c7a83 100644
+--- a/lang/c/src/datum.c
++++ b/lang/c/src/datum.c
+@@ -1095,7 +1095,7 @@ static void avro_datum_free(avro_datum_t datum)
+                                record = avro_datum_to_record(datum);
+                                avro_schema_decref(record->schema);
+                                st_foreach(record->fields_byname,
+-                                          HASH_FUNCTION_CAST char_datum_free_foreach, 0);
++                                          (hash_function_foreach) char_datum_free_foreach, 0);
+                                st_free_table(record->field_order);
+                                st_free_table(record->fields_byname);
+                                avro_freet(struct avro_record_datum_t, record);
+@@ -1123,7 +1123,7 @@ static void avro_datum_free(avro_datum_t datum)
+                                struct avro_map_datum_t *map;
+                                map = avro_datum_to_map(datum);
+                                avro_schema_decref(map->schema);
+-                               st_foreach(map->map, HASH_FUNCTION_CAST char_datum_free_foreach,
++                               st_foreach(map->map, (hash_function_foreach) char_datum_free_foreach,
+                                           0);
+                                st_free_table(map->map);
+                                st_free_table(map->indices_by_key);
+@@ -1135,7 +1135,7 @@ static void avro_datum_free(avro_datum_t datum)
+                                struct avro_array_datum_t *array;
+                                array = avro_datum_to_array(datum);
+                                avro_schema_decref(array->schema);
+-                               st_foreach(array->els, HASH_FUNCTION_CAST array_free_foreach, 0);
++                               st_foreach(array->els, (hash_function_foreach) array_free_foreach, 0);
+                                st_free_table(array->els);
+                                avro_freet(struct avro_array_datum_t, array);
+                        }
+@@ -1183,7 +1183,7 @@ avro_datum_reset(avro_datum_t datum)
+                {
+                        struct avro_array_datum_t *array;
+                        array = avro_datum_to_array(datum);
+-                       st_foreach(array->els, HASH_FUNCTION_CAST array_free_foreach, 0);
++                       st_foreach(array->els, (hash_function_foreach) array_free_foreach, 0);
+                        st_free_table(array->els);
+ 
+                        rval = avro_init_array(array);
+@@ -1198,7 +1198,7 @@ avro_datum_reset(avro_datum_t datum)
+                {
+                        struct avro_map_datum_t *map;
+                        map = avro_datum_to_map(datum);
+-                       st_foreach(map->map, HASH_FUNCTION_CAST char_datum_free_foreach, 0);
++                       st_foreach(map->map, (hash_function_foreach) char_datum_free_foreach, 0);
+                        st_free_table(map->map);
+                        st_free_table(map->indices_by_key);
+                        st_free_table(map->keys_by_index);
+@@ -1217,7 +1217,7 @@ avro_datum_reset(avro_datum_t datum)
+                        record = avro_datum_to_record(datum);
+                        rval = 0;
+                        st_foreach(record->fields_byname,
+-                                  HASH_FUNCTION_CAST datum_reset_foreach, (st_data_t) &rval);
++                                  (hash_function_foreach) datum_reset_foreach, (st_data_t) &rval);
+                        return rval;
+                }
+ 
+diff --git a/lang/c/src/datum_equal.c b/lang/c/src/datum_equal.c
+index 3875bea04..7e7c9b940 100644
+--- a/lang/c/src/datum_equal.c
++++ b/lang/c/src/datum_equal.c
+@@ -78,7 +78,7 @@ static int map_equal(struct avro_map_datum_t *a, struct avro_map_datum_t *b)
+        if (a->map->num_entries != b->map->num_entries) {
+                return 0;
+        }
+-       st_foreach(a->map, HASH_FUNCTION_CAST st_equal_foreach, (st_data_t) & args);
++       st_foreach(a->map, (hash_function_foreach) st_equal_foreach, (st_data_t) & args);
+        return args.rval;
+ }
+ 
+@@ -93,7 +93,7 @@ static int record_equal(struct avro_record_datum_t *a,
+        if (a->fields_byname->num_entries != b->fields_byname->num_entries) {
+                return 0;
+        }
+-       st_foreach(a->fields_byname, HASH_FUNCTION_CAST st_equal_foreach, (st_data_t) & args);
++       st_foreach(a->fields_byname, (hash_function_foreach) st_equal_foreach, (st_data_t) & args);
+        return args.rval;
+ }
+ 
+diff --git a/lang/c/src/datum_size.c b/lang/c/src/datum_size.c
+index be9b98004..3877f3138 100644
+--- a/lang/c/src/datum_size.c
++++ b/lang/c/src/datum_size.c
+@@ -126,7 +126,7 @@ size_map(avro_writer_t writer, const avro_encoding_t * enc,
+        if (datum->map->num_entries) {
+                size_accum(rval, size,
+                           enc->size_long(writer, datum->map->num_entries));
+-               st_foreach(datum->map, HASH_FUNCTION_CAST size_map_foreach, (st_data_t) & args);
++               st_foreach(datum->map, (hash_function_foreach) size_map_foreach, (st_data_t) & args);
+                size += args.size;
+        }
+        if (!args.rval) {
+diff --git a/lang/c/src/datum_validate.c b/lang/c/src/datum_validate.c
+index 6167bd63f..e997d3067 100644
+--- a/lang/c/src/datum_validate.c
++++ b/lang/c/src/datum_validate.c
+@@ -123,7 +123,7 @@ avro_schema_datum_validate(avro_schema_t expected_schema, avro_datum_t datum)
+                            { avro_schema_to_map(expected_schema)->values, 1
+                        };
+                        st_foreach(avro_datum_to_map(datum)->map,
+-                                  HASH_FUNCTION_CAST schema_map_validate_foreach,
++                                  (hash_function_foreach) schema_map_validate_foreach,
+                                   (st_data_t) & vst);
+                        return vst.rval;
+                }
+diff --git a/lang/c/src/memoize.c b/lang/c/src/memoize.c
+index 933fecbd0..e3602884d 100644
+--- a/lang/c/src/memoize.c
++++ b/lang/c/src/memoize.c
+@@ -52,8 +52,8 @@ avro_memoize_key_hash(avro_memoize_key_t *a)
+ 
+ 
+ static struct st_hash_type  avro_memoize_hash_type = {
+-       HASH_FUNCTION_CAST avro_memoize_key_cmp,
+-       HASH_FUNCTION_CAST avro_memoize_key_hash
++       (hash_function_compare) avro_memoize_key_cmp,
++       (hash_function_hash) avro_memoize_key_hash
+ };
+ 
+ 
+@@ -78,7 +78,7 @@ avro_memoize_free_key(avro_memoize_key_t *key, void *result, void *dummy)
+ void
+ avro_memoize_done(avro_memoize_t *mem)
+ {
+-       st_foreach((st_table *) mem->cache, HASH_FUNCTION_CAST avro_memoize_free_key, 0);
++       st_foreach((st_table *) mem->cache, (hash_function_foreach) avro_memoize_free_key, 0);
+        st_free_table((st_table *) mem->cache);
+        memset(mem, 0, sizeof(avro_memoize_t));
+ }
+diff --git a/lang/c/src/schema.c b/lang/c/src/schema.c
+index 2acad51a1..a4d8e9f89 100644
+--- a/lang/c/src/schema.c
++++ b/lang/c/src/schema.c
+@@ -137,7 +137,7 @@ static void avro_schema_free(avro_schema_t schema)
+                                if (record->space) {
+                                        avro_str_free(record->space);
+                                }
+-                               st_foreach(record->fields, HASH_FUNCTION_CAST record_free_foreach,
++                               st_foreach(record->fields, (hash_function_foreach) record_free_foreach,
+                                           0);
+                                st_free_table(record->fields_byname);
+                                st_free_table(record->fields);
+@@ -152,7 +152,7 @@ static void avro_schema_free(avro_schema_t schema)
+                                if (enump->space) {
+                                        avro_str_free(enump->space);
+                                }
+-                               st_foreach(enump->symbols, HASH_FUNCTION_CAST enum_free_foreach,
++                               st_foreach(enump->symbols, (hash_function_foreach) enum_free_foreach,
+                                           0);
+                                st_free_table(enump->symbols);
+                                st_free_table(enump->symbols_byname);
+@@ -189,7 +189,7 @@ static void avro_schema_free(avro_schema_t schema)
+                case AVRO_UNION:{
+                                struct avro_union_schema_t *unionp;
+                                unionp = avro_schema_to_union(schema);
+-                               st_foreach(unionp->branches, HASH_FUNCTION_CAST union_free_foreach,
++                               st_foreach(unionp->branches, (hash_function_foreach) union_free_foreach,
+                                           0);
+                                st_free_table(unionp->branches);
+                                st_free_table(unionp->branches_byname);
+@@ -1239,7 +1239,7 @@ avro_schema_from_json_root(json_t *root, avro_schema_t *schema)
+        /* json_dumpf(root, stderr, 0); */
+        rval = avro_schema_from_json_t(root, schema, named_schemas, NULL);
+        json_decref(root);
+-       st_foreach(named_schemas, HASH_FUNCTION_CAST named_schema_free_foreach, 0);
++       st_foreach(named_schemas, (hash_function_foreach) named_schema_free_foreach, 0);
+        st_free_table(named_schemas);
+        return rval;
+ }
+@@ -1455,7 +1455,7 @@ avro_schema_t avro_schema_copy(avro_schema_t schema)
+        }
+ 
+        new_schema = avro_schema_copy_root(schema, named_schemas);
+-       st_foreach(named_schemas, HASH_FUNCTION_CAST named_schema_free_foreach, 0);
++       st_foreach(named_schemas, (hash_function_foreach) named_schema_free_foreach, 0);
+        st_free_table(named_schemas);
+        return new_schema;
+ }
+diff --git a/lang/c/src/st.c b/lang/c/src/st.c
+index 27578289e..8437777cb 100644
+--- a/lang/c/src/st.c
++++ b/lang/c/src/st.c
+@@ -39,8 +39,8 @@ struct st_table_entry {
+ static int numcmp(long, long);
+ static int numhash(long);
+ static struct st_hash_type type_numhash = {
+-       HASH_FUNCTION_CAST numcmp,
+-       HASH_FUNCTION_CAST numhash
++       (hash_function_compare) numcmp,
++       (hash_function_hash) numhash
+ };
+ 
+ /*
+@@ -48,8 +48,8 @@ static struct st_hash_type type_numhash = {
+  */
+ static int strhash(const char *);
+ static struct st_hash_type type_strhash = {
+-       HASH_FUNCTION_CAST strcmp,
+-       HASH_FUNCTION_CAST strhash
++       (hash_function_compare) strcmp,
++       (hash_function_hash) strhash
+ };
+ 
+ static void rehash(st_table *);
+@@ -212,7 +212,7 @@ void st_free_table(st_table *table)
+ }
+ 
+ #define PTR_NOT_EQUAL(table, ptr, hash_val, key) \
+-((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (key), (ptr)->key)))
++((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (void*) (key), (void*) (ptr)->key)))
+ 
+ #ifdef HASH_LOG
+ #define COLLISION collision++
+@@ -237,7 +237,7 @@ int st_lookup(st_table *table, register st_data_t key, st_data_t *value)
+        unsigned int hash_val, bin_pos;
+        register st_table_entry *ptr;
+ 
+-       hash_val = do_hash(key, table);
++       hash_val = do_hash((void*) key, table);
+        FIND_ENTRY(table, ptr, hash_val, bin_pos);
+ 
+        if (ptr == 0) {
+@@ -272,7 +272,7 @@ int st_insert(register st_table *table, register st_data_t key, st_data_t value)
+        unsigned int hash_val, bin_pos;
+        register st_table_entry *ptr;
+ 
+-       hash_val = do_hash(key, table);
++       hash_val = do_hash((void*) key, table);
+        FIND_ENTRY(table, ptr, hash_val, bin_pos);
+ 
+        if (ptr == 0) {
+@@ -288,7 +288,7 @@ void st_add_direct(st_table *table,st_data_t key,st_data_t value)
+ {
+        unsigned int hash_val, bin_pos;
+ 
+-       hash_val = do_hash(key, table);
++       hash_val = do_hash((void*) key, table);
+        bin_pos = hash_val % table->num_bins;
+        ADD_DIRECT(table, key, value, hash_val, bin_pos);
+ }
+@@ -363,7 +363,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value)
+        st_table_entry *tmp;
+        register st_table_entry *ptr;
+ 
+-       hash_val = do_hash_bin(*key, table);
++       hash_val = do_hash_bin((void*) *key, table);
+        ptr = table->bins[hash_val];
+ 
+        if (ptr == 0) {
+@@ -372,7 +372,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value)
+                return 0;
+        }
+ 
+-       if (EQUAL(table, *key, ptr->key)) {
++       if (EQUAL(table, (void*) *key, (void*) ptr->key)) {
+                table->bins[hash_val] = ptr->next;
+                table->num_entries--;
+                if (value != 0)
+@@ -383,7 +383,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value)
+        }
+ 
+        for (; ptr->next != 0; ptr = ptr->next) {
+-               if (EQUAL(table, ptr->next->key, *key)) {
++               if (EQUAL(table, (void*) ptr->next->key, (void*) *key)) {
+                        tmp = ptr->next;
+                        ptr->next = ptr->next->next;
+                        table->num_entries--;
+@@ -403,7 +403,7 @@ int st_delete_safe(register st_table *table,register st_data_t *key,st_data_t *v
+        unsigned int hash_val;
+        register st_table_entry *ptr;
+ 
+-       hash_val = do_hash_bin(*key, table);
++       hash_val = do_hash_bin((void*) *key, table);
+        ptr = table->bins[hash_val];
+ 
+        if (ptr == 0) {
+@@ -413,7 +413,7 @@ int st_delete_safe(register st_table *table,register st_data_t *key,st_data_t *v
+        }
+ 
+        for (; ptr != 0; ptr = ptr->next) {
+-               if ((ptr->key != never) && EQUAL(table, ptr->key, *key)) {
++               if ((ptr->key != never) && EQUAL(table, (void*) ptr->key, (void*) *key)) {
+                        table->num_entries--;
+                        *key = ptr->key;
+                        if (value != 0)
+@@ -439,11 +439,11 @@ void st_cleanup_safe(st_table *table,st_data_t never)
+ {
+        int num_entries = table->num_entries;
+ 
+-       st_foreach(table, HASH_FUNCTION_CAST delete_never, never);
++       st_foreach(table, (hash_function_foreach) delete_never, never);
+        table->num_entries = num_entries;
+ }
+ 
+-int st_foreach(st_table *table,int (*func) (ANYARGS),st_data_t arg)
++int st_foreach(st_table *table,int (*func) (void*, void*, void*),st_data_t arg)
+ {
+        st_table_entry *ptr, *last, *tmp;
+        enum st_retval retval;
+@@ -452,7 +452,9 @@ int st_foreach(st_table *table,int (*func) (ANYARGS),st_data_t arg)
+        for (i = 0; i < table->num_bins; i++) {
+                last = 0;
+                for (ptr = table->bins[i]; ptr != 0;) {
+-                       retval = (enum st_retval) (*func) (ptr->key, ptr->record, arg);
++                       retval = (enum st_retval) (*func) ((void*) ptr->key,
++                                                          (void*) ptr->record,
++                                                          (void*) arg);
+                        switch (retval) {
+                        case ST_CHECK:  /* check if hash is modified during
+                                         * iteration */
+diff --git a/lang/c/src/st.h b/lang/c/src/st.h
+index cf8a22491..93da018bd 100644
+--- a/lang/c/src/st.h
++++ b/lang/c/src/st.h
+@@ -20,26 +20,22 @@ extern "C" {
+ 
+ #pragma GCC visibility push(hidden)
+ 
+-#ifndef ANYARGS
+- #ifdef __cplusplus
+-   #define ANYARGS ...
+- #else
+-   #define ANYARGS
+- #endif
+-#endif
+-
+ #ifdef _WIN32
+-  #define HASH_FUNCTION_CAST (int (__cdecl *)(ANYARGS))
++  typedef int (__cdecl *hash_function_compare)(void*, void*);
++  typedef int (__cdecl *hash_function_hash)(void*);
++  typedef int (__cdecl *hash_function_foreach)(void*, void*, void*);
+ #else
+-  #define HASH_FUNCTION_CAST
++  typedef int (*hash_function_compare)(void*, void*);
++  typedef int (*hash_function_hash)(void*);
++  typedef int (*hash_function_foreach)(void*, void*, void*);
+ #endif
+ 
+ typedef uintptr_t st_data_t;
+ typedef struct st_table st_table;
+ 
+ struct st_hash_type {
+-  int (*compare) (ANYARGS);
+-  int (*hash) (ANYARGS);
++  hash_function_compare compare;
++  hash_function_hash hash;
+ };
+ 
+ struct st_table {
+@@ -67,7 +63,7 @@ int st_delete _((st_table *, st_data_t *, st_data_t *));
+ int st_delete_safe _((st_table *, st_data_t *, st_data_t *, st_data_t));
+ int st_insert _((st_table *, st_data_t, st_data_t));
+ int st_lookup _((st_table *, st_data_t, st_data_t *));
+-int st_foreach _((st_table *, int (*)(ANYARGS), st_data_t));
++int st_foreach _((st_table *, hash_function_foreach, st_data_t));
+ void st_add_direct _((st_table *, st_data_t, st_data_t));
+ void st_free_table _((st_table *));
+ void st_cleanup_safe _((st_table *, st_data_t));
diff --git a/meta-oe/recipes-support/avro/avro-c_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb
index bb7f53e459..f7da323710 100644
--- a/meta-oe/recipes-support/avro/avro-c_1.11.3.bb
+++ b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb
@@ -8,10 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae"
 DEPENDS = "jansson zlib xz"
 
 BRANCH = "branch-1.11"
-SRCREV = "35ff8b997738e4d983871902d47bfb67b3250734"
-SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \
-          "
-
-S = "${WORKDIR}/git/lang/c"
+SRCREV = "579a36762293fa4c9f2831e27e7af7713a0838a0"
+SRC_URI = " \
+    git://github.com/apache/avro;branch=${BRANCH};protocol=https \
+    file://0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch;patchdir=../.. \
+    file://0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch;patchdir=../.. \
+"
+S = "${UNPACKDIR}/${BP}/lang/c"
 
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch b/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch
new file mode 100644
index 0000000000..bab1d1f301
--- /dev/null
+++ b/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch
@@ -0,0 +1,45 @@
+From 678c32f867931fd9f410b6e46ea8d101714c7ed5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= <l.goehrs@pengutronix.de>
+Date: Tue, 6 May 2025 07:45:36 +0200
+Subject: [PATCH] CMakeLists: do not use vendored libcurl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [upstream ticket https://github.com/nxp-imx/bcu/issues/17]
+
+Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
+---
+ CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 42158a2..ac840fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,17 +17,17 @@ pkg_check_modules(LIBFTDI REQUIRED libftdi1)
+ pkg_check_modules(LIBYAML REQUIRED yaml-0.1)
+ pkg_check_modules(LIBOPENSSL REQUIRED openssl)
+ pkg_check_modules(LIBUSB REQUIRED libusb-1.0)
++pkg_check_modules(LIBCURL REQUIRED libcurl)
+ project(bcu)
+-include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${PROJECT_SOURCE_DIR}/libftdi/src ${LIBYAML_INCLUDEDIR} ${PROJECT_SOURCE_DIR}/libcurl/include)
++include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${LIBYAML_INCLUDEDIR})
+ include_directories(${PROJECT_SOURCE_DIR})
+ 
+ message("operation system is ${CMAKE_SYSTEM}")
+ if (LINUX)
+         add_executable(bcu bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_https.c bcu_ftdi_eeprom.c)
+-        link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS})
+-        target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} ${PROJECT_SOURCE_DIR}/libcurl/build.bcu/lib/libcurl.a -lpthread -lssl -lcrypto -lm -ldl)
+-        execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR}
+-                         COMMAND ${PROJECT_SOURCE_DIR}/build_libs.sh ${PROJECT_SOURCE_DIR})
++        link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS} ${LIBCURL_LIBRARY_DIRS})
++        target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} ${LIBCURL_LIBRARIES} -lpthread -lssl -lcrypto -lm -ldl)
++        execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR})
+         install(TARGETS bcu DESTINATION bin)
+ elseif (MACOS)
+         add_executable(bcu_mac bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_https.c bcu_ftdi_eeprom.c)
+-- 
+2.39.5
+
diff --git a/meta-oe/recipes-support/bcu/bcu_1.1.115.bb b/meta-oe/recipes-support/bcu/bcu_1.1.115.bb
new file mode 100644
index 0000000000..260fba02a9
--- /dev/null
+++ b/meta-oe/recipes-support/bcu/bcu_1.1.115.bb
@@ -0,0 +1,22 @@
+SUMMARY = "NXP Board Control Utilities"
+DESCRIPTION = "The NXP Board Control Utilities are able to control various \
+               features of NXP i.MX evaluation boards (EVK) from a host \
+               computer. \
+               Features like resetting the board, selecting the boot mode, \
+               monitoring power consumption, programming the EEPROM and others"
+HOMEPAGE = "https://github.com/nxp-imx/bcu"
+SECTION = "devel"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6"
+
+SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;branch=master \
+           file://0001-CMakeLists-do-not-use-vendored-libcurl.patch \
+           "
+SRCREV = "f081c69c26e330cf03ec790051c415c4716509d9"
+
+
+DEPENDS = "curl libyaml libusb1 openssl libftdi"
+
+inherit cmake pkgconfig
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb
index a5a7a63657..3c8c41cc03 100644
--- a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb
+++ b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb
@@ -23,10 +23,9 @@ LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075"
 
 DEPENDS = "libatomic-ops"
 
-SRCREV = "e340b2e869e02718de9c9d7fa440ef4b35785388"
+SRCREV = "ee59af3722e56de8404de6cd0c21c2493cc4d855"
 SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.2.bb b/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.2.bb
new file mode 100644
index 0000000000..f49aa480da
--- /dev/null
+++ b/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.2.bb
@@ -0,0 +1,19 @@
+SUMMARY = "bmaptool alternative written in C++"
+DESCRIPTION = "bmap-writer is a command-line utility designed to efficiently write disk images \
+to storage devices using block mapping (BMAP). It serves as \
+a lightweight alternative to the Yocto BMAP tool, \
+bmap-writer is C++ based does not require Python and focuses solely on writing an image."
+HOMEPAGE = "https://github.com/embetrix/bmap-writer"
+SECTION = "console/utils"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e49f4652534af377a713df3d9dec60cb"
+
+SRC_URI = "git://github.com/embetrix/${BPN};branch=master;protocol=https"
+SRCREV = "7489280a7a1247f23543343aba4e95bf2f2e8fa6"
+
+DEPENDS = "libtinyxml2 libarchive"
+inherit cmake pkgconfig
+
+FILES:${PN} = "${bindir}"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb b/meta-oe/recipes-support/boost-sml/boost-sml_1.1.12.bb
index a48195a15d..0a2514237a 100644
--- a/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb
+++ b/meta-oe/recipes-support/boost-sml/boost-sml_1.1.12.bb
@@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=e4224ccaecb14d942c71d31bef20d78c"
 DEPENDS += "boost qemu-native"
 
 SRC_URI = "git://github.com/boost-ext/sml.git;protocol=https;branch=master"
-SRCREV = "b7df6180d20422b2724d26007aebb24066f2a6a9"
+SRCREV = "cd3ef80206b71463de96d6b682cfdc99703ec147"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-support/btop/btop_1.3.2.bb b/meta-oe/recipes-support/btop/btop_1.4.3.bb
index c473bf0a35..9a5a21c56d 100644
--- a/meta-oe/recipes-support/btop/btop_1.3.2.bb
+++ b/meta-oe/recipes-support/btop/btop_1.4.3.bb
@@ -4,10 +4,10 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SECTION = "console/utils"
 
-SRC_URI = "git://github.com/aristocratos/btop.git;protocol=https;branch=main"
-SRCREV = "fd2a2acdad6fbaad76846cb5e802cf2ae022d670"
+SRC_URI = "git://github.com/aristocratos/btop.git;protocol=https;branch=main;tag=v${PV} \
+           "
+SRCREV = "3f1ccd9f6c455fef6d4d8cfbc8ed71b86961323d"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-support/bvi/bvi_1.4.2.bb b/meta-oe/recipes-support/bvi/bvi_1.4.2.bb
new file mode 100644
index 0000000000..fb136e16a6
--- /dev/null
+++ b/meta-oe/recipes-support/bvi/bvi_1.4.2.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Binary VI editor"
+DESCRIPTION = "bvi is a visual editor for binary files."
+HOMEPAGE = "https://sourceforge.net/projects/bvi"
+SECTION = "console/utils"
+LICENSE = "GPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a36207309d382da27cd66fdaae922e3c"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz"
+SRC_URI[sha256sum] = "4bba16c2b496963a9b939336c0abcc8d488664492080ae43a86da18cf4ce94f2"
+
+DEPENDS += "ncurses"
+
+# The project uses old style C interfaces and it is not compatible with C23
+# it builds fine with C17, specifying gnu17 as the C dialect to use
+CFLAGS:append = " -std=gnu17 -Wno-old-style-definition"
+
+inherit pkgconfig autotools-brokensep
diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb
index ddd081e115..b6945f221d 100644
--- a/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb
+++ b/meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb
@@ -1,13 +1,13 @@
 # Copyright (c) 2012-2014 LG Electronics, Inc.
 SUMMARY = "c-ares is a C library that resolves names asynchronously."
-HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/"
+HOMEPAGE = "https://c-ares.org/"
 SECTION = "libs"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d3e72a10e08191f2ca1be3f3228d78f3"
 
-SRC_URI = "https://github.com/c-ares/c-ares/releases/download/cares-1_27_0/${BPN}-${PV}.tar.gz \
+SRC_URI = "https://github.com/c-ares/c-ares/releases/download/v${PV}/${BPN}-${PV}.tar.gz \
            file://run-ptest"
-SRC_URI[sha256sum] = "0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b"
+SRC_URI[sha256sum] = "7d935790e9af081c25c495fd13c2cfcda4792983418e96358ef6e7320ee06346"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
 PACKAGECONFIG[manpages] = ""
diff --git a/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.3.bb
index 8e38517448..058ede614e 100644
--- a/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb
+++ b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.3.bb
@@ -6,12 +6,11 @@ HOMEPAGE = "https://github.com/vsergeev/c-periphery"
 SECTION = "libs"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=be30d45bdc453f70a494c149c2168289"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e88456d0a60de4c71ff4d787c212f253"
 
 SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https;branch=master"
-SRCREV = "91f9678d2a35a3af3c633f20165bdde8bea32209"
+SRCREV = "911e989fe41eb90c7df274cb54555346caf2a632"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb
index bf62e8416e..9d905cc22e 100644
--- a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb
+++ b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb
@@ -17,7 +17,6 @@ SRC_URI = "https://launchpad.net/${BPN}/trunk/v${PV}/+download/${BPN}-${PV}.tar.
 
 UPSTREAM_CHECK_URI = "https://launchpad.net/frame/trunk"
 
-SRC_URI[md5sum] = "02baa941091c5d198cd1623b3ad36e68"
 SRC_URI[sha256sum] = "cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
diff --git a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb
index 139649b975..2ac535d258 100644
--- a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb
+++ b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb
@@ -27,7 +27,6 @@ SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.x
 
 UPSTREAM_CHECK_URI = "https://launchpad.net/geis/trunk"
 
-SRC_URI[md5sum] = "2ff9d76a3ea5794516bb02c9d1924faf"
 SRC_URI[sha256sum] = "8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb"
 
 EXTRA_OECONF = "--disable-integration-tests"
diff --git a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
index 067052c036..1a5900b78b 100644
--- a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
+++ b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
@@ -16,7 +16,6 @@ SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.b
 
 UPSTREAM_CHECK_URI = "https://launchpad.net/grail/trunk"
 
-SRC_URI[md5sum] = "0df1b3ec6167920f310e2effe6e2ad44"
 SRC_URI[sha256sum] = "5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3"
 
 REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}"
diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb
index 18db0721de..63500def05 100644
--- a/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb
+++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb
@@ -8,7 +8,6 @@ DEPENDS = "libeigen glog"
 SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https"
 SRCREV = "85331393dc0dff09f6fb9903ab0c4bfa3e134b01"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-support/ckermit/ckermit_302.bb b/meta-oe/recipes-support/ckermit/ckermit_302.bb
index 1ee776cefe..f5d6d9d4f8 100644
--- a/meta-oe/recipes-support/ckermit/ckermit_302.bb
+++ b/meta-oe/recipes-support/ckermit/ckermit_302.bb
@@ -11,9 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=932ca542d6c6cb8a59a0bcd76ab67cc3"
 SRC_URI = "http://www.kermitproject.org/ftp/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV} \
            file://0001-Fix-function-prototype-errors.patch \
            "
-SRC_URI[md5sum] = "eac4dbf18b45775e4cdee5a7c74762b0"
 SRC_URI[sha256sum] = "0d5f2cd12bdab9401b4c836854ebbf241675051875557783c332a6a40dac0711"
 
+UPSTREAM_CHECK_URI = "https://www.kermitproject.org/ck90.html"
+UPSTREAM_CHECK_REGEX = "cku(?P<pver>\d+)\.tar"
 
 export CC2 = "${CC}"
 export BINDIR = "${bindir}"
@@ -28,7 +29,7 @@ do_compile () {
     # The original makefile doesn't differentiate between CC and CC_FOR_BUILD,
     # so we build wart manually. Note that you need a ckwart.o with the proper
     # timestamp to make this hack work:
-    ${BUILD_CC} -c ckwart.c
+    ${BUILD_CC} -DMAINTYPE=int -c -o ckwart.o ckwart.c
     ${BUILD_CC} -o wart ckwart.o
     ./wart ckcpro.w ckcpro.c
 
@@ -45,7 +46,8 @@ do_compile () {
         -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \
         -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \
         -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \
-        -DNOARROWKEYS -DMAINTYPE=int"
+        -DNOARROWKEYS -DMAINTYPE=int \
+        -D_DEFAULT_SOURCE -ansi"
 }
 
 do_install () {
@@ -55,3 +57,11 @@ do_install () {
     rm ${D}${BINDIR}/kermit-sshsub
     (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb)
 }
+
+# This one is reproducible only on 32bit MACHINEs
+# http://errors.yoctoproject.org/Errors/Details/766966/
+# ckutio.c:12057:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types]
+# ckutio.c:12058:20: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types]
+# ckufio.c:5043:32: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types]
+# ckufio.c:5263:32: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-support/cli11/cli11_2.3.2.bb b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb
index ef3c951bbf..346ccd6c69 100644
--- a/meta-oe/recipes-support/cli11/cli11_2.3.2.bb
+++ b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb
@@ -11,7 +11,6 @@ SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \
             file://0001-Do-not-download-the-catch-framework-during-configure.patch"
 
 SRC_URI[sha256sum] = "ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc"
-S = "${WORKDIR}/git"
 
 do_configure:prepend() {
     mkdir -p ${S}/tests/catch2
diff --git a/meta-oe/recipes-support/cmark/cmark_0.31.0.bb b/meta-oe/recipes-support/cmark/cmark_0.31.1.bb
index ce8b4cd493..bbbb36dace 100644
--- a/meta-oe/recipes-support/cmark/cmark_0.31.0.bb
+++ b/meta-oe/recipes-support/cmark/cmark_0.31.1.bb
@@ -4,8 +4,7 @@ LICENSE = "BSD-2-Clause & MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62"
 
 SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https"
-SRCREV = "8fbf029685482827828b5858444157052f1b0a5f"
-S = "${WORKDIR}/git"
+SRCREV = "bb3678d7a73cb02d35c8876ecd097072636200a8"
 
 inherit cmake lib_package
 
diff --git a/meta-oe/recipes-support/colord/colord-native.bb b/meta-oe/recipes-support/colord/colord-native.bb
index 64dd94a9ed..2c79be4957 100644
--- a/meta-oe/recipes-support/colord/colord-native.bb
+++ b/meta-oe/recipes-support/colord/colord-native.bb
@@ -1,7 +1,5 @@
 require ${BPN}.inc
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-native:"
-
 inherit meson pkgconfig native
 
 DEPENDS += " \
diff --git a/meta-oe/recipes-support/colord/colord.bb b/meta-oe/recipes-support/colord/colord.bb
index e300222518..6eb9db8dab 100644
--- a/meta-oe/recipes-support/colord/colord.bb
+++ b/meta-oe/recipes-support/colord/colord.bb
@@ -1,28 +1,33 @@
 require ${BPN}.inc
 
-inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd pkgconfig
+inherit meson gobject-introspection gsettings gtk-doc gettext bash-completion systemd features_check useradd pkgconfig
 
 # polkit and gobject-introspection are mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data"
 GIR_MESON_OPTION = ""
 
 DEPENDS += " \
-    ${BPN}-native \
-    glib-2.0 \
-    lcms \
-    sqlite3 \
-    libgusb \
-    libgudev \
-    polkit \
+        ${BPN}-native \
+        dbus \
+        glib-2.0 \
+        lcms \
+        libgudev \
+        libgusb \
+        polkit \
+        sqlite3 \
 "
 
+RDEPENDS:${PN} += "hwdata"
+
 SRC_URI += " \
-    file://0001-Run-native-cd_idt8-cd_create_profile.patch \
+        file://0001-Run-native-cd_idt8-cd_create_profile.patch \
+        file://08a32b2379fb5582f4312e59bf51a2823df56276.patch \
 "
 
-EXTRA_OEMESON = " \
-    -Dman=false \
-    -Ddocs=false \
+EXTRA_OEMESON += " \
+        -Dman=false \
+        -Ddaemon_user=colord \
+        -Dpnp_ids=${datadir}/hwdata/pnp.ids \
 "
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
@@ -42,4 +47,5 @@ FILES:${PN} += " \
 "
 
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord"
+USERADD_PARAM:${PN} = "--system --user-group -s /bin/false colord"
+
diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
index a120b73114..a120b73114 100644
--- a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
+++ b/meta-oe/recipes-support/colord/colord/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
diff --git a/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch b/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch
new file mode 100644
index 0000000000..860e6ab4af
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch
@@ -0,0 +1,28 @@
+From 08a32b2379fb5582f4312e59bf51a2823df56276 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 29 Jan 2024 10:37:11 +0000
+Subject: [PATCH] Fix writing to the database with ProtectSystem=strict
+
+Fixes https://github.com/hughsie/colord/issues/166
+
+Upstream-Status: Backport [https://github.com/hughsie/colord/commit/08a32b2379fb5582f4312e59bf51a2823df56276]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ data/colord.service.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/data/colord.service.in b/data/colord.service.in
+index 6825d944..c358dc4b 100644
+--- a/data/colord.service.in
++++ b/data/colord.service.in
+@@ -17,6 +17,10 @@ ProtectControlGroups=true
+ RestrictRealtime=true
+ RestrictAddressFamilies=AF_UNIX
+ 
++ConfigurationDirectory=colord
++StateDirectory=colord
++CacheDirectory=colord
++
+ # drop all capabilities
+ CapabilityBoundingSet=~CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_IPC_OWNER CAP_NET_ADMIN CAP_SYS_RAWIO CAP_SYS_TIME CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE CAP_KILL CAP_MKNOD CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_RESOURCE CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_SYS_BOOT CAP_LINUX_IMMUTABLE CAP_IPC_LOCK CAP_SYS_CHROOT CAP_BLOCK_SUSPEND CAP_LEASE CAP_SYS_PACCT CAP_SYS_TTY_CONFIG CAP_WAKE_ALARM
+ 
diff --git a/meta-oe/recipes-support/colord/colord-native/Makefile b/meta-oe/recipes-support/colord/colord/Makefile
index 1e29e4f670..1e29e4f670 100644
--- a/meta-oe/recipes-support/colord/colord-native/Makefile
+++ b/meta-oe/recipes-support/colord/colord/Makefile
diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.4.bb b/meta-oe/recipes-support/composefs/composefs_1.0.8.bb
index aaf33b40ec..f2bae91f44 100644
--- a/meta-oe/recipes-support/composefs/composefs_1.0.4.bb
+++ b/meta-oe/recipes-support/composefs/composefs_1.0.8.bb
@@ -3,31 +3,27 @@ DESCRIPTION = "The composefs project combines several underlying Linux \
 features to provide a very flexible mechanism to support read-only mountable \
 filesystem trees, stacking on top of an underlying "lower" Linux filesystem."
 HOMEPAGE = "https://github.com/containers/composefs"
-LICENSE = "GPL-3.0-or-later & LGPL-2.0-or-later & Apache-2.0"
+LICENSE = "GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & Apache-2.0"
 LIC_FILES_CHKSUM = "\
     file://BSD-2-Clause.txt;md5=121c8a0a8fa5961a26b7863034ebcce8 \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
-    file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://COPYING;md5=5cbca48090f7fe0169186a551a5bf78c \
+    file://COPYING.GPL-2.0-only;md5=94fa01670a2a8f2d3ab2de15004e0848 \
+    file://COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \
     file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \
 "
 
-PV .= "+git${SRCPV}"
-SRCREV = "7623e4dc89f62ada5724d4e41d0a16d2671312f5"
+SRCREV = "858ce1b38e1534c2602eb431124b5dca706bc746"
 SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
+inherit meson
 
 DEPENDS = "openssl"
 
-EXTRA_OECONF += " \
-    --disable-man \
-    --without-fuse \
+EXTRA_OEMESON += " \
+    -Dman=disabled \
+    -Dfuse=disabled \
 "
 
-LDFLAGS:append:class-native = " -pthread"
-
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/consolation/consolation_0.0.9.bb b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb
index 17981b6e9b..a1523be376 100644
--- a/meta-oe/recipes-support/consolation/consolation_0.0.9.bb
+++ b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb
@@ -17,7 +17,6 @@ DEPENDS = " \
 SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git;branch=master"
 SRCREV = "5ef08f0cd6ede62de14de477b74fc3611108c676"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig systemd
 
diff --git a/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb b/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb
index bda5177fc4..4b8bf162fa 100644
--- a/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb
+++ b/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb
@@ -16,7 +16,6 @@ SRC_URI = "\
     file://a53f123040998744602f190944464af0e159ea19.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
@@ -28,3 +27,5 @@ do_install:append() {
     sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibConfig.cmake
     sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibTargets-noconfig.cmake
 }
+
+SKIP_RECIPE[cpp-netlib] ?= "Does not work with boost >= 1.87"
diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb
index aec7286404..ec7be4ad37 100644
--- a/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb
+++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb
@@ -12,8 +12,9 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste
            file://disable-outside-tests.patch "
 
 # tag 2.10.19
-SRCREV= "411a109150b270f23c8c97fa4ec9a0a4a98cdecf"
+SRCREV = "411a109150b270f23c8c97fa4ec9a0a4a98cdecf"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
+
+SKIP_RECIPE[cpprest] ?= "Needs websocketpp which does not yet work with boost >= 1.87"
diff --git a/meta-oe/recipes-support/cpulimit/cpulimit/0002-busy.c-Fix-incompatible-pointer-type-error.patch b/meta-oe/recipes-support/cpulimit/cpulimit/0002-busy.c-Fix-incompatible-pointer-type-error.patch
new file mode 100644
index 0000000000..c75cbe1950
--- /dev/null
+++ b/meta-oe/recipes-support/cpulimit/cpulimit/0002-busy.c-Fix-incompatible-pointer-type-error.patch
@@ -0,0 +1,51 @@
+From 86b71c49a373f78920d78c0e88f530f476b4fe70 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 26 Mar 2025 15:57:54 +0900
+Subject: [PATCH] busy.c: Fix incompatible pointer type error.
+
+Error occurs in gcc 15.0.1 environment.
+busy.c: In function 'main':
+busy.c:20:58: error: passing argument 3 of 'pthread_create' from incompatible pointer type [-Wincompatible-pointer-types]
+   20 |                 if ((ret = pthread_create(&thread, NULL, loop, NULL)) != 0)
+      |                                                          ^~~~
+      |                                                          |
+      |                                                          void * (*)(void)
+In file included from busy.c:3:
+recipe-sysroot/usr/include/pthread.h:204:36: note: expected 'void * (*)(void *)' but argument is of type 'void * (*)(void)'
+  204 |                            void *(*__start_routine) (void *),
+      |                            ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
+busy.c:6:7: note: 'loop' declared here
+    6 | void *loop()
+      |       ^~~~
+
+Set loop parameter to void* since it requires void* type argument.
+
+Signed-off-by: mark.yang <mark.yang@lge.com>
+
+Upstream-Status: Inactive-Upstream [lastcommit: 9 Years ago and lastrelease: 9 Years ago]
+---
+ tests/busy.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/busy.c b/tests/busy.c
+index b3afb7c..2d726eb 100644
+--- a/tests/busy.c
++++ b/tests/busy.c
+@@ -3,7 +3,7 @@
+ #include <pthread.h>
+ #include <unistd.h>
+ 
+-void *loop()
++void *loop(void *arg)
+ {
+        while(1);
+ }
+@@ -23,7 +23,7 @@ int main(int argc, char **argv) {
+                        exit(1);
+                }
+        }
+-       loop();
++       loop(NULL);
+        return 0;
+ }
+ 
\ No newline at end of file
diff --git a/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb
index f88d3b6ca1..676028efa1 100644
--- a/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb
+++ b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb
@@ -7,9 +7,9 @@ SRCREV ?= "f4d2682804931e7aea02a869137344bb5452a3cd"
 
 SRC_URI = "git://github.com/opsengine/cpulimit.git;protocol=https;branch=master \
            file://0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch \
+           file://0002-busy.c-Fix-incompatible-pointer-type-error.patch \
            "
 
-S = "${WORKDIR}/git"
 
 do_compile() {
     oe_runmake all
diff --git a/meta-oe/recipes-support/crucible/crucible-go-mods.inc b/meta-oe/recipes-support/crucible/crucible-go-mods.inc
new file mode 100644
index 0000000000..0123d8c966
--- /dev/null
+++ b/meta-oe/recipes-support/crucible/crucible-go-mods.inc
@@ -0,0 +1,155 @@
+SRC_URI += "\
+    gomod://cloud.google.com/go;version=v0.111.0;sha256sum=f17610c7b09a9582375daa59ec73761b0bd7ad313075710ebfb1c8f4fd63776a \
+    gomod://cloud.google.com/go;version=v0.26.0;mod=1;sha256sum=2218a34f20b971bc195216d4195f57520a2acbd85de7fc31acfc440266704c11 \
+    gomod://cloud.google.com/go/compute;version=v1.23.3;sha256sum=9214cf85837ea8b96bd61e56e297f06d3008b9d1fc81841e79aaad2940f3ed56 \
+    gomod://cloud.google.com/go/compute/metadata;version=v0.2.3;sha256sum=292864dbd0b1de37a968e285e949885e573384837d81cd3695be5ce2e2391887 \
+    gomod://cloud.google.com/go/iam;version=v1.1.5;sha256sum=7d218318eef5255587d6db35f2aa9952125881c640f6e04fe76d521c14d5d7f3 \
+    gomod://cloud.google.com/go/kms;version=v1.15.6;sha256sum=75e7a21b453cad66aae756e3d0c42a7550c299d62832a0361d6ea6396b4074a9 \
+    gomod://cloud.google.com/go/longrunning;version=v0.5.4;sha256sum=a3eb14ee47bfdbca7df05c0011bcd9a86997ae8ef0a12c3a44a340c7e9ce2c0f \
+    gomod://cloud.google.com/go/security;version=v1.15.5;sha256sum=f4dd23e113cad47462715d654c95de55c1c890b37cca8c79b47bb5a7c0ec9417 \
+    gomod://github.com/BurntSushi/toml;version=v0.3.1;mod=1;sha256sum=28021b4180a59c3993607a95b18e230dd0bc6bea5242ffe8ea8bbfb4f4f7b4d7 \
+    gomod://github.com/census-instrumentation/opencensus-proto;version=v0.2.1;mod=1;sha256sum=dae64639296402235b55587d14d2640615eb3736fa840e4327d3c15db63cc345 \
+    gomod://github.com/client9/misspell;version=v0.3.4;mod=1;sha256sum=d1bc362dddd96fb3a43ed4b92aaab70aa6c7ef5a500d7f09564e3eb24abcf0b8 \
+    gomod://github.com/cncf/udpa/go;version=v0.0.0-20191209042840-269d4d468f6f;mod=1;sha256sum=05f5d4a77a84be45dedc80ebac5a38ef2fd1c6ff3faedad9c00eb31231181218 \
+    gomod://github.com/davecgh/go-spew;version=v1.1.0;mod=1;sha256sum=bcb29393251237b79a17b6c19bf29134f43e8f438c3198988fcd461a1cdf05cc \
+    gomod://github.com/davecgh/go-spew;version=v1.1.1;mod=1;sha256sum=bcb29393251237b79a17b6c19bf29134f43e8f438c3198988fcd461a1cdf05cc \
+    gomod://github.com/envoyproxy/go-control-plane;version=v0.9.0;mod=1;sha256sum=2e0f3c5940c6930bce03f0c8cd1724dd93d4d30c6b1c5ae2ee4e3039f0215c07 \
+    gomod://github.com/envoyproxy/go-control-plane;version=v0.9.1-0.20191026205805-5f8ba28d4473;mod=1;sha256sum=2e0f3c5940c6930bce03f0c8cd1724dd93d4d30c6b1c5ae2ee4e3039f0215c07 \
+    gomod://github.com/envoyproxy/go-control-plane;version=v0.9.4;mod=1;sha256sum=6309f752f7d45b74c97e3f8e0e54fc47e604d965b528e60fa68a46317ecb44dc \
+    gomod://github.com/envoyproxy/protoc-gen-validate;version=v0.1.0;mod=1;sha256sum=c8e2e1bf931ad31ab4a5a32673eff764398fbf9cbc6c31bbf005c7c904fc69aa \
+    gomod://github.com/felixge/httpsnoop;version=v1.0.4;sha256sum=75aa471311265e9860df0e523400b4650ed0c1a33262786a421f07226792e494 \
+    gomod://github.com/ghodss/yaml;version=v1.0.0;sha256sum=c3f295d23c02c0b35e4d3b29053586e737cf9642df9615da99c0bda9bbacc624 \
+    gomod://github.com/go-logr/logr;version=v1.2.2;mod=1;sha256sum=519b1d6da5eeef675b4a1857d628f05f110a2b8cb3c423b715fea80d0975a518 \
+    gomod://github.com/go-logr/logr;version=v1.4.1;sha256sum=27d1c8d411fd8e42dc6202991d70afa630089700f1d002de5454d6c26f93674c \
+    gomod://github.com/go-logr/stdr;version=v1.2.2;sha256sum=9dd6893bf700198485ae699640b49bc1efbc6c73b37cb5792a0476e1fd8f7fef \
+    gomod://github.com/golang/glog;version=v0.0.0-20160126235308-23def4e6c14b;mod=1;sha256sum=9c9bafc0f52905afaa7164858b3a01a0cc3dc07da23030177ce487f727438958 \
+    gomod://github.com/golang/groupcache;version=v0.0.0-20200121045136-8c9f03a8e57e;mod=1;sha256sum=5117e2bb86f1cc7cc7489f9f2580fa17b2ef1e3a0a346bf64ed8063ca7b87663 \
+    gomod://github.com/golang/groupcache;version=v0.0.0-20210331224755-41bb18bfe9da;sha256sum=b27034e8fc013627543e1ad098cfc65329f2896df3da5cf3266cc9166f93f3a5 \
+    gomod://github.com/golang/mock;version=v1.1.1;mod=1;sha256sum=5c47c4f981ac63d37f1308647a20d75a148eb2a8f9cc0e7531f030afd0b229e0 \
+    gomod://github.com/golang/protobuf;version=v1.2.0;mod=1;sha256sum=c0a2031bf277087749d8ccc432449f6b1375787eac8641dd2f930074231aafb4 \
+    gomod://github.com/golang/protobuf;version=v1.3.2;mod=1;sha256sum=c0a2031bf277087749d8ccc432449f6b1375787eac8641dd2f930074231aafb4 \
+    gomod://github.com/golang/protobuf;version=v1.4.0;mod=1;sha256sum=0d092f7aa2877feb9e55aee2668286ebbf7e3d0711b1702d84c9225e4cca73f8 \
+    gomod://github.com/golang/protobuf;version=v1.4.0-rc.1;mod=1;sha256sum=eb386ed18bb8d6092974524bd0cda610ad87bee1a4485c9f01bccb713e7dab1e \
+    gomod://github.com/golang/protobuf;version=v1.4.0-rc.1.0.20200221234624-67d41d38c208;mod=1;sha256sum=78c95913aee9dfebd1e84f8b862e98bb1848d1d3e9f22aaf909c4ef4f7e7293d \
+    gomod://github.com/golang/protobuf;version=v1.4.0-rc.2;mod=1;sha256sum=e2622048b96cd87173bd9aeb801a1010807a412e89529509e9a5099f1fc69ab4 \
+    gomod://github.com/golang/protobuf;version=v1.4.0-rc.4.0.20200313231945-b860323f09d0;mod=1;sha256sum=1edf9512236391b88764083bde0391fc49864738432acfdcdd3229572dc71be1 \
+    gomod://github.com/golang/protobuf;version=v1.4.1;mod=1;sha256sum=b7ebbef0f2166a73c7ab79ec37a01b25206b6327e684e3898ba7cb75ecd6ec00 \
+    gomod://github.com/golang/protobuf;version=v1.4.3;mod=1;sha256sum=4bf5885d1ebdc6d270958379a741cd3b4f7aca016e874d8e8b1059110dfe9e15 \
+    gomod://github.com/golang/protobuf;version=v1.5.0;mod=1;sha256sum=738cbb1de96b67a6238ac3b8081cd8b1bfb0daebcf6c9bbe8cbdb6d73baecd19 \
+    gomod://github.com/golang/protobuf;version=v1.5.2;mod=1;sha256sum=7c8e7610527afd7724c7e8b7e843f132b0db61e8c9dd49dc589d430e8929bcc4 \
+    gomod://github.com/golang/protobuf;version=v1.5.3;sha256sum=93bda6e88d4a0a493a98b481de67a10000a755d15f16a800b49a6b96d1bd6f81 \
+    gomod://github.com/google/go-cmp;version=v0.2.0;mod=1;sha256sum=9c2736ea2c03fb1d94b2a1d496aa1a51726c764f158b9f6cde1d7465fc90f412 \
+    gomod://github.com/google/go-cmp;version=v0.3.0;mod=1;sha256sum=81df7917c225a9da7604b230d952fa278c60a8832c10d799385d134b05d5b087 \
+    gomod://github.com/google/go-cmp;version=v0.3.1;mod=1;sha256sum=81df7917c225a9da7604b230d952fa278c60a8832c10d799385d134b05d5b087 \
+    gomod://github.com/google/go-cmp;version=v0.4.0;mod=1;sha256sum=4036ab5636aa42bd313296cd3bfcb4c88912760c56a9e6655ae422d8767c80da \
+    gomod://github.com/google/go-cmp;version=v0.5.0;mod=1;sha256sum=4036ab5636aa42bd313296cd3bfcb4c88912760c56a9e6655ae422d8767c80da \
+    gomod://github.com/google/go-cmp;version=v0.5.3;mod=1;sha256sum=4036ab5636aa42bd313296cd3bfcb4c88912760c56a9e6655ae422d8767c80da \
+    gomod://github.com/google/go-cmp;version=v0.5.5;mod=1;sha256sum=4036ab5636aa42bd313296cd3bfcb4c88912760c56a9e6655ae422d8767c80da \
+    gomod://github.com/google/s2a-go;version=v0.1.7;sha256sum=4392e675b6f0ff0b90f970c0280d63e34b32d077e1f8c0abd1006ad0dbeb2f2e \
+    gomod://github.com/google/uuid;version=v1.1.2;mod=1;sha256sum=73da47b6338b00a082fd451aa35a3273d3adc09b8e9bba98dab01091e402af6e \
+    gomod://github.com/googleapis/enterprise-certificate-proxy;version=v0.3.2;sha256sum=56127cb8bea94f438c4e867f9217bdfc55865282953e54c74eee019575c1020e \
+    gomod://github.com/googleapis/gax-go/v2;version=v2.12.0;sha256sum=10ad5944b8bcce3f2cb9a215a0dda163de5b1f092e61b74a4e162d1eb8f7f7a2 \
+    gomod://github.com/pmezard/go-difflib;version=v1.0.0;mod=1;sha256sum=74b2e766eb215377864d587badf57e95521f692d2a7860b3c7759093f9c9bec2 \
+    gomod://github.com/prometheus/client_model;version=v0.0.0-20190812154241-14fe0d1b01d4;mod=1;sha256sum=8ae247f8b1ced742fbc4aa7ebc6b6c935172eaafa61a2be52ba0bd41286db031 \
+    gomod://github.com/smallstep/pkcs7;version=v0.0.0-20231107075624-be1870d87d13;sha256sum=7f8ed17d46a7dbc883d64b95718a1f6b7ec3bac4b5984741523701d20723ad14 \
+    gomod://github.com/stretchr/objx;version=v0.1.0;mod=1;sha256sum=1350354d52d2287a62336ecc0d56232d4c47699af9bba49c67c2b48254da98f1 \
+    gomod://github.com/stretchr/objx;version=v0.4.0;mod=1;sha256sum=31b2fdcdee870f0f61bffafafb96220967e5bca08a76a920d574216fc1f91355 \
+    gomod://github.com/stretchr/objx;version=v0.5.0;mod=1;sha256sum=cb326540efcb1274a6e4e970d7fc9de2e8062f08a058fc296d859025e62e807a \
+    gomod://github.com/stretchr/testify;version=v1.7.1;mod=1;sha256sum=fff8168d98e6a07156c454a1b6e925509f3177e96c155516d7f96b4079cca3bf \
+    gomod://github.com/stretchr/testify;version=v1.8.0;mod=1;sha256sum=e076074c1560ad1dda98b8b00fea6308c4b6ccd06ddd088d22db4626ed68f738 \
+    gomod://github.com/stretchr/testify;version=v1.8.1;mod=1;sha256sum=af1a5dcb331ace7a3f9fc1b5d7eee9c0bc82b4a2a182fe4cec2add217e2853d6 \
+    gomod://github.com/usbarmory/tamago;version=v0.0.0-20221201111136-9bb9b42304fa;mod=1;sha256sum=3735262e8a80c900b992a499da1076db95d5ecab3fd5237152e4e78fb28db944 \
+    gomod://github.com/yuin/goldmark;version=v1.4.13;mod=1;sha256sum=ee7fe4466203a01d3ac19adc134cdec99bc6de71992c28f3dd9a74480bff0603 \
+    gomod://go.opencensus.io;version=v0.24.0;sha256sum=203a767d7f8e7c1ebe5588220ad168d1e15b14ae70a636de7ca9a4a88a7e0d0c \
+    gomod://go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc;version=v0.47.0;sha256sum=efb13c3eb89199b0f677057a238017b06ffceb868ac55f4f649a31309ec0321d \
+    gomod://go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp;version=v0.47.0;sha256sum=476b9113a426e31a3802d8371c348ae3334c56acba9fc7228b886096c64647a1 \
+    gomod://go.opentelemetry.io/otel;version=v1.22.0;sha256sum=6c02668caef05c8221cf2fb43f4f2943de701f3c4fb69096f2f7da523f1c80d2 \
+    gomod://go.opentelemetry.io/otel/metric;version=v1.22.0;sha256sum=deb750b41631365dbda60fb872dc6901f16817e0b2646307fbfeb4eeb391e02f \
+    gomod://go.opentelemetry.io/otel/trace;version=v1.22.0;sha256sum=d63e40f32d614b00bedfa945eae95e2bc5fe867e167cd7dbfe7f90d96fa599d7 \
+    gomod://golang.org/x/crypto;version=v0.0.0-20190308221718-c2843e01d9a2;mod=1;sha256sum=33ed070a5a66e0960685ac5386440e1b59899e74d8a38a1180685e72a2195ded \
+    gomod://golang.org/x/crypto;version=v0.0.0-20200622213623-75b288015ac9;mod=1;sha256sum=b2b12d09f81915fbcf4226009e50f9efda8bd3757d2055d8ec07977e65bc6618 \
+    gomod://golang.org/x/crypto;version=v0.0.0-20210921155107-089bfa567519;mod=1;sha256sum=cd6311612a2aa4d0d7e03c41b3aa1fbc2d5f895ab3f61089fab80bfe9f8f5485 \
+    gomod://golang.org/x/crypto;version=v0.18.0;sha256sum=5413479720bbf5183144652805203a3df74800d2f281f611e82d3a7ec15f4325 \
+    gomod://golang.org/x/exp;version=v0.0.0-20190121172915-509febef88a4;mod=1;sha256sum=9ff1d07ca8c09458450eb5f4076aa0390ef5c7db0c7a942150e88258a78b5383 \
+    gomod://golang.org/x/lint;version=v0.0.0-20181026193005-c67002cb31c3;mod=1;sha256sum=169b05225c8e2729727e0679ae3911918dfe1c4b18bed5ee0fae29f9ed77b207 \
+    gomod://golang.org/x/lint;version=v0.0.0-20190227174305-5b3e6a55c961;mod=1;sha256sum=8e86b5869db58a7659e485b07dbce3beb1170a153631579e50f4cbf544bb1342 \
+    gomod://golang.org/x/lint;version=v0.0.0-20190313153728-d0100b6bd8b3;mod=1;sha256sum=79df4350b922a8d193782e5600f88280a2b9d41781bfb3760c09bf52ad3023bf \
+    gomod://golang.org/x/mod;version=v0.6.0-dev.0.20220419223038-86c51ed26bb4;mod=1;sha256sum=42d19023ff8f2eae700bc5495f371ecd998a22d19ba985d0af5f69900b254083 \
+    gomod://golang.org/x/net;version=v0.0.0-20180724234803-3673e40ba225;mod=1;sha256sum=3e08f487ddda1851b891df5b1d04bb1a01b84d6d702aa82d9efbccde0aa7df81 \
+    gomod://golang.org/x/net;version=v0.0.0-20180826012351-8a410e7b638d;mod=1;sha256sum=3e08f487ddda1851b891df5b1d04bb1a01b84d6d702aa82d9efbccde0aa7df81 \
+    gomod://golang.org/x/net;version=v0.0.0-20190213061140-3a22650c66bd;mod=1;sha256sum=3e08f487ddda1851b891df5b1d04bb1a01b84d6d702aa82d9efbccde0aa7df81 \
+    gomod://golang.org/x/net;version=v0.0.0-20190311183353-d8887717615a;mod=1;sha256sum=f7046769daac02beb57cbcc481280df59fb403c96fe8262282aba858c7f7fa4d \
+    gomod://golang.org/x/net;version=v0.0.0-20190404232315-eb5bcb51f2a3;mod=1;sha256sum=f7046769daac02beb57cbcc481280df59fb403c96fe8262282aba858c7f7fa4d \
+    gomod://golang.org/x/net;version=v0.0.0-20190620200207-3b0461eec859;mod=1;sha256sum=e6efdaf78a29503f080cf6d2615e289cfb1d9e3ab7d570f53668eca2b4ab41da \
+    gomod://golang.org/x/net;version=v0.0.0-20201110031124-69a78807bb2b;mod=1;sha256sum=66fc44a0644a506da780f7a22a5d73dd025d44a6e58740b62d27f74d7c3a4948 \
+    gomod://golang.org/x/net;version=v0.0.0-20210226172049-e18ecbb05110;mod=1;sha256sum=fef5896d103a0bce5055fdb5e96e830944334792437865347718edceb633348a \
+    gomod://golang.org/x/net;version=v0.0.0-20220722155237-a158d28d115b;mod=1;sha256sum=b315c52647d2da2f76e5cdb9d367e1d6727784236a9bffb612192b19b10a128d \
+    gomod://golang.org/x/net;version=v0.20.0;sha256sum=00adca2fa3315d397ecb886989998f03fefda7b81a0b5ebb3586acef273e0f29 \
+    gomod://golang.org/x/oauth2;version=v0.0.0-20180821212333-d2e6202438be;mod=1;sha256sum=cbbb618da87d4f943b54bfd4f4d3a2fff3610298f04fbeeb3db388cb075f351a \
+    gomod://golang.org/x/oauth2;version=v0.16.0;sha256sum=a6597a80e0461877b21bf5bda71423bfdc9e8701128e39c71ec3aa7e190c7ac3 \
+    gomod://golang.org/x/sync;version=v0.0.0-20180314180146-1d60e4601c6f;mod=1;sha256sum=421f6139686d5891f3dc5a563d0995780d3279f65cad4d225cea52686794161c \
+    gomod://golang.org/x/sync;version=v0.0.0-20181108010431-42b317875d0f;mod=1;sha256sum=421f6139686d5891f3dc5a563d0995780d3279f65cad4d225cea52686794161c \
+    gomod://golang.org/x/sync;version=v0.0.0-20190423024810-112230192c58;mod=1;sha256sum=421f6139686d5891f3dc5a563d0995780d3279f65cad4d225cea52686794161c \
+    gomod://golang.org/x/sync;version=v0.0.0-20220722155255-886fb9371eb4;mod=1;sha256sum=421f6139686d5891f3dc5a563d0995780d3279f65cad4d225cea52686794161c \
+    gomod://golang.org/x/sync;version=v0.6.0;sha256sum=7c75175297a3b368b806bd24c7401629df11dcc655e3c14470058282f101ca6a \
+    gomod://golang.org/x/sys;version=v0.0.0-20180830151530-49385e6e1522;mod=1;sha256sum=8969115e4a39108848324e79a1bd8a8445230e6e3aaccbe9f8057fb50fffc8c1 \
+    gomod://golang.org/x/sys;version=v0.0.0-20190215142949-d0b11bdaac8a;mod=1;sha256sum=8969115e4a39108848324e79a1bd8a8445230e6e3aaccbe9f8057fb50fffc8c1 \
+    gomod://golang.org/x/sys;version=v0.0.0-20190412213103-97732733099d;mod=1;sha256sum=181979e8bd57d2d9e064182da86c9a6111aa69755e888f08431ece4742aec343 \
+    gomod://golang.org/x/sys;version=v0.0.0-20200930185726-fdedc70b468f;mod=1;sha256sum=181979e8bd57d2d9e064182da86c9a6111aa69755e888f08431ece4742aec343 \
+    gomod://golang.org/x/sys;version=v0.0.0-20201119102817-f84b799fce68;mod=1;sha256sum=181979e8bd57d2d9e064182da86c9a6111aa69755e888f08431ece4742aec343 \
+    gomod://golang.org/x/sys;version=v0.0.0-20210615035016-665e8c7367d1;mod=1;sha256sum=f033333096fe198f3151deed93f2deba74e50bbfe7739134045bc3b7ce4a5024 \
+    gomod://golang.org/x/sys;version=v0.0.0-20220520151302-bc2c85ada10a;mod=1;sha256sum=f033333096fe198f3151deed93f2deba74e50bbfe7739134045bc3b7ce4a5024 \
+    gomod://golang.org/x/sys;version=v0.0.0-20220722155257-8c9f86f7a55f;mod=1;sha256sum=f033333096fe198f3151deed93f2deba74e50bbfe7739134045bc3b7ce4a5024 \
+    gomod://golang.org/x/sys;version=v0.16.0;sha256sum=0175809134fc12e040ea427e927036692127f2891b72e224e5153da543af604a \
+    gomod://golang.org/x/term;version=v0.0.0-20201126162022-7de9c90e9dd1;mod=1;sha256sum=4cbab14f7706771b271d995a1b3cc131fe5a246aadc7ee6d1ba6f0bd894781fa \
+    gomod://golang.org/x/term;version=v0.0.0-20210927222741-03fcf44c2211;mod=1;sha256sum=740794e2914f5cc87e25656c5843222b2c65665821205f45632a0477c8d3f79b \
+    gomod://golang.org/x/text;version=v0.14.0;sha256sum=b9814897e0e09cd576a7a013f066c7db537a3d538d2e0f60f0caee9bc1b3f4af \
+    gomod://golang.org/x/text;version=v0.3.0;mod=1;sha256sum=36879d586fd8001e84da8787190a11e4f78749e2a81dfe8b9b6931899fff31cf \
+    gomod://golang.org/x/text;version=v0.3.3;mod=1;sha256sum=fbb7a88ed140515e790eca7a10ffd319c9786b11c6a6c7e59f80f7fb37bb4542 \
+    gomod://golang.org/x/text;version=v0.3.7;mod=1;sha256sum=c45d669089427bc4635d07b185f9b9680332d1c48c75b3c49cb715b81a04a5b0 \
+    gomod://golang.org/x/text;version=v0.3.8;mod=1;sha256sum=0c06e8d4bc0c4eddce0f9ca01ad87dd9ff74cad7fa8ba166fe97d97d1deb27ae \
+    gomod://golang.org/x/time;version=v0.5.0;sha256sum=e0e5812d19aed367f79ac0ae0ce4770b6602c85f5cfb8d59f3f573c7487ea516 \
+    gomod://golang.org/x/tools;version=v0.0.0-20180917221912-90fa682c2a6e;mod=1;sha256sum=a0e02f0678fe62dc3c4b4bc77fa912c9b70de10fa9f7cf2f7aad0337392b52af \
+    gomod://golang.org/x/tools;version=v0.0.0-20190114222345-bf090417da8b;mod=1;sha256sum=a0e02f0678fe62dc3c4b4bc77fa912c9b70de10fa9f7cf2f7aad0337392b52af \
+    gomod://golang.org/x/tools;version=v0.0.0-20190226205152-f727befe758c;mod=1;sha256sum=2503823869125550d3f88bdef72820024fe27b141f44b81fc3b4f59ef78370eb \
+    gomod://golang.org/x/tools;version=v0.0.0-20190311212946-11955173bddd;mod=1;sha256sum=029638674bdf4fce7437ebc25cda0c8172674ec534b1d2edeb0b474c7d618f00 \
+    gomod://golang.org/x/tools;version=v0.0.0-20190524140312-2c0ae7006135;mod=1;sha256sum=135189df02315d75d62e27551d1accad1db5bd3c1a2a8756f63a69f73b1b5217 \
+    gomod://golang.org/x/tools;version=v0.0.0-20191119224855-298f0cb1881e;mod=1;sha256sum=88d479265f886f5e598d76c003d0f257b42dbf1b895d820a12b5ab0b3501aca1 \
+    gomod://golang.org/x/tools;version=v0.1.12;mod=1;sha256sum=2a8b9365898f0822face65ba089a1353e68a65d342f300ca317cceccde6421f3 \
+    gomod://golang.org/x/xerrors;version=v0.0.0-20190717185122-a985d3407aa7;mod=1;sha256sum=aa5e3ec9bb7b9f681609efac019d9de1a7ba7719248ff1eaa27e78882db3d7f5 \
+    gomod://golang.org/x/xerrors;version=v0.0.0-20191204190536-9bdfabe68543;mod=1;sha256sum=aa5e3ec9bb7b9f681609efac019d9de1a7ba7719248ff1eaa27e78882db3d7f5 \
+    gomod://google.golang.org/api;version=v0.160.0;sha256sum=3130cdcb9e9ab27b9ee8d2b0b3427b25e948ca2eb5000ab6c8ecea6411396b5c \
+    gomod://google.golang.org/appengine;version=v1.1.0;mod=1;sha256sum=d0fb3f328a95259ddeeb7ef934f2abae0327c6a052ff1ab05a2b882178a953b8 \
+    gomod://google.golang.org/appengine;version=v1.4.0;mod=1;sha256sum=f95b808fed2c6febb23a8d11e92743583b37861584d302349ada5ae02a3874dd \
+    gomod://google.golang.org/appengine;version=v1.6.8;mod=1;sha256sum=ef17709123a95906e09d1318b71489fd455bd6efbf6d404083b3137256df2423 \
+    gomod://google.golang.org/genproto;version=v0.0.0-20180817151627-c66870c02cf8;mod=1;sha256sum=4379a64312660353b2dadb20fd55d9968674bbc2bbcf09d50c0aba80111a64b2 \
+    gomod://google.golang.org/genproto;version=v0.0.0-20190819201941-24fa4b261c55;mod=1;sha256sum=4b8edb9554439c665a29e584eda81870cbb699092227d97ba8fa9641538d541d \
+    gomod://google.golang.org/genproto;version=v0.0.0-20200526211855-cb27e3aa2013;mod=1;sha256sum=4ec394d3eca73687d111a3e0e88808b100687302b463b17869bcd026016748bd \
+    gomod://google.golang.org/genproto;version=v0.0.0-20240116215550-a9fa1716bcac;sha256sum=e65fb3abc11c20b0910c40a3b269b79b06c2cdd6e7efab29a5ea50f18a62b7f9 \
+    gomod://google.golang.org/genproto/googleapis/api;version=v0.0.0-20240125205218-1f4bbc51befe;sha256sum=742068cead896163dbe16785d7e56c45d31335d478ea6d10f9188507531bcb52 \
+    gomod://google.golang.org/genproto/googleapis/rpc;version=v0.0.0-20240116215550-a9fa1716bcac;sha256sum=6a1f0ec363ac60b2c41801d1f303306f7a6768ec0ba8efe5b4e9257ff4a91ad5 \
+    gomod://google.golang.org/grpc;version=v1.19.0;mod=1;sha256sum=71de2597fd082e882ef08965ba0c3ee19d38f2df25920733cd434cf80a27ac35 \
+    gomod://google.golang.org/grpc;version=v1.23.0;mod=1;sha256sum=587c9b854d7f5f0181487c854a24fc4c01982e5641d302ce1d0f3d041951cb8b \
+    gomod://google.golang.org/grpc;version=v1.25.1;mod=1;sha256sum=3c4690179945744ec5b01279df99be86153fd386d6fa6b8ef9888ace428cb182 \
+    gomod://google.golang.org/grpc;version=v1.27.0;mod=1;sha256sum=8ad8b97a2a43c2c76572c43a01c469a6e8ec3b049e739a8d3353c9c2ee4cd3d6 \
+    gomod://google.golang.org/grpc;version=v1.33.2;mod=1;sha256sum=74c09c930b5587527ec7bedb25986cce9589e76f0676096abad1a03565b3cff2 \
+    gomod://google.golang.org/grpc;version=v1.61.0;sha256sum=6971b322a68f83ae2055391e5bd57dfb359e67509961a75229b825d2bd15564d \
+    gomod://google.golang.org/protobuf;version=v0.0.0-20200109180630-ec00e32a8dfd;mod=1;sha256sum=a23990efb67ee10bb16d1d1936109cefa4e4262ae3da8d0748efb691614dbb78 \
+    gomod://google.golang.org/protobuf;version=v0.0.0-20200221191635-4d8936d0db64;mod=1;sha256sum=a6d950dd2a7eb82e51cf459d3f61f614b09d730adb9e8094d5bf96b043f38174 \
+    gomod://google.golang.org/protobuf;version=v0.0.0-20200228230310-ab0ca4ff8a60;mod=1;sha256sum=3b808d19947fb29e4db24ed5cb88941afc1927f538d80ad6f880ae4664a5d016 \
+    gomod://google.golang.org/protobuf;version=v1.20.1-0.20200309200217-e05f789c0967;mod=1;sha256sum=420ec9fba7793b96dff1c5ae9983656e72e1c0bd1d14dda2398aec1b294780ff \
+    gomod://google.golang.org/protobuf;version=v1.21.0;mod=1;sha256sum=a532d488ff1097b330ff2e2929f39ecff8c2fa09dc7650b66ca5430c2d8303fb \
+    gomod://google.golang.org/protobuf;version=v1.22.0;mod=1;sha256sum=394a49462cbf6dca4dd86f3cf0e8ddcbb9adc9397f73e82fecae54c79e9e4d53 \
+    gomod://google.golang.org/protobuf;version=v1.23.0;mod=1;sha256sum=394a49462cbf6dca4dd86f3cf0e8ddcbb9adc9397f73e82fecae54c79e9e4d53 \
+    gomod://google.golang.org/protobuf;version=v1.23.1-0.20200526195155-81db48ad09cc;mod=1;sha256sum=394a49462cbf6dca4dd86f3cf0e8ddcbb9adc9397f73e82fecae54c79e9e4d53 \
+    gomod://google.golang.org/protobuf;version=v1.25.0;mod=1;sha256sum=6dea80873d2758a81de6d16bcf6a7f45a27f2ad4c047b7b4da1e88481a974903 \
+    gomod://google.golang.org/protobuf;version=v1.26.0;mod=1;sha256sum=08ec2e20f38efcb651462800069ece4891e252a261007fa9d5a1b157f516ee5f \
+    gomod://google.golang.org/protobuf;version=v1.26.0-rc.1;mod=1;sha256sum=b2c4fe1a66ff5be6eb7c0c5388f080d08821c327ac5cf975dee51d8b0fb49e9f \
+    gomod://google.golang.org/protobuf;version=v1.32.0;sha256sum=c2c117cf29abee8697dabdc69662accf66171bea0efa2749988867ae8ef2362d \
+    gomod://gopkg.in/check.v1;version=v0.0.0-20161208181325-20d25e280405;mod=1;sha256sum=5c306e0d633cd66a11b40e2e5fbbc6da42110db7d72ea3c1524ceb45ee40c33f \
+    gomod://gopkg.in/yaml.v2;version=v2.4.0;sha256sum=ede49e27c4cca6cdd2ec719aed8ea4d363710cceb3d411e7a786fbdec0d391fd \
+    gomod://gopkg.in/yaml.v3;version=v3.0.0-20200313102051-9f266ea9e77c;mod=1;sha256sum=21579860a20306fcf43b1bd234d1fba319499c77611b71c05f9bf3ba90dab939 \
+    gomod://gopkg.in/yaml.v3;version=v3.0.1;mod=1;sha256sum=21579860a20306fcf43b1bd234d1fba319499c77611b71c05f9bf3ba90dab939 \
+    gomod://honnef.co/go/tools;version=v0.0.0-20190102054323-c2f93a96b099;mod=1;sha256sum=b1c60837ea61335f14df64f3194c3cd92e0f628f6064806718950f0d7a1dbe9e \
+    gomod://honnef.co/go/tools;version=v0.0.0-20190523083050-ea95bdfd59fc;mod=1;sha256sum=b1c60837ea61335f14df64f3194c3cd92e0f628f6064806718950f0d7a1dbe9e \
+"
diff --git a/meta-oe/recipes-support/crucible/crucible-licenses.inc b/meta-oe/recipes-support/crucible/crucible-licenses.inc
new file mode 100644
index 0000000000..bba9dbfc86
--- /dev/null
+++ b/meta-oe/recipes-support/crucible/crucible-licenses.inc
@@ -0,0 +1,40 @@
+GO_MOD_LICENSES = "Apache-2.0 & BSD-3-Clause & MIT"
+
+LIC_FILES_CHKSUM += "\
+    file://pkg/mod/cloud.google.com/go/compute/metadata@v0.2.3/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://pkg/mod/cloud.google.com/go/iam@v1.1.5/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://pkg/mod/cloud.google.com/go/kms@v1.15.6/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://pkg/mod/cloud.google.com/go/longrunning@v0.5.4/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://pkg/mod/cloud.google.com/go/security@v1.15.5/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://pkg/mod/github.com/felixge/httpsnoop@v1.0.4/LICENSE.txt;md5=684da2bf3eed8fc8860e75ad84638225 \
+    file://pkg/mod/github.com/ghodss/yaml@v1.0.0/LICENSE;md5=0ceb9ff3b27d3a8cf451ca3785d73c71 \
+    file://pkg/mod/github.com/go-logr/logr@v1.4.1/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e \
+    file://pkg/mod/github.com/go-logr/stdr@v1.2.2/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+    file://pkg/mod/github.com/golang/groupcache@v0.0.0-20210331224755-41bb18bfe9da/LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5 \
+    file://pkg/mod/github.com/golang/protobuf@v1.5.3/LICENSE;md5=939cce1ec101726fa754e698ac871622 \
+    file://pkg/mod/github.com/google/s2a-go@v0.1.7/LICENSE.md;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://pkg/mod/github.com/googleapis/enterprise-certificate-proxy@v0.3.2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://pkg/mod/github.com/googleapis/gax-go/v2@v2.12.0/LICENSE;md5=0dd48ae8103725bd7b401261520cdfbb \
+    file://pkg/mod/github.com/smallstep/pkcs7@v0.0.0-20231107075624-be1870d87d13/LICENSE;md5=a9b2952d51b44eae97b6090117f60792 \
+    file://pkg/mod/go.opencensus.io@v0.24.0/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
+    file://pkg/mod/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc@v0.47.0/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+    file://pkg/mod/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp@v0.47.0/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+    file://pkg/mod/go.opentelemetry.io/otel/metric@v1.22.0/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+    file://pkg/mod/go.opentelemetry.io/otel/trace@v1.22.0/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+    file://pkg/mod/go.opentelemetry.io/otel@v1.22.0/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+    file://pkg/mod/golang.org/x/crypto@v0.18.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
+    file://pkg/mod/golang.org/x/net@v0.20.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
+    file://pkg/mod/golang.org/x/oauth2@v0.16.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
+    file://pkg/mod/golang.org/x/sync@v0.6.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
+    file://pkg/mod/golang.org/x/sys@v0.16.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
+    file://pkg/mod/golang.org/x/text@v0.14.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
+    file://pkg/mod/golang.org/x/time@v0.5.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
+    file://pkg/mod/google.golang.org/api@v0.160.0/LICENSE;md5=a651bb3d8b1c412632e28823bb432b40 \
+    file://pkg/mod/google.golang.org/api@v0.160.0/internal/third_party/uritemplates/LICENSE;md5=4ee4feb2b545c2231749e5c54ace343e \
+    file://pkg/mod/google.golang.org/genproto/googleapis/api@v0.0.0-20240125205218-1f4bbc51befe/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://pkg/mod/google.golang.org/genproto/googleapis/rpc@v0.0.0-20240116215550-a9fa1716bcac/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://pkg/mod/google.golang.org/genproto@v0.0.0-20240116215550-a9fa1716bcac/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://pkg/mod/google.golang.org/grpc@v1.61.0/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://pkg/mod/google.golang.org/protobuf@v1.32.0/LICENSE;md5=02d4002e9171d41a8fad93aa7faf3956 \
+    file://pkg/mod/gopkg.in/yaml.v2@v2.4.0/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e \
+"
diff --git a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb
index 4247263b5a..132395e023 100644
--- a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb
+++ b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb
@@ -1,20 +1,19 @@
 SUMMARY = "Utility that provides userspace support for reading and writing to the i.MX fuses"
-LICENSE = "BSD-3-Clause"
+
+LICENSE = "BSD-3-Clause & ${GO_MOD_LICENSES}"
 LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=201414b6610203caed355323b1ab3116"
+require ${BPN}-licenses.inc
 
-GO_IMPORT = "github.com/usbarmory/crucible"
 SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=${GO_SRCURI_DESTSUFFIX}"
+require ${BPN}-go-mods.inc
+
+SRCREV = "dec27cd4e0e0db106c0a21d429c04ca8d36bbdd5"
 
+
+GO_IMPORT = "github.com/usbarmory/crucible"
 GO_INSTALL = "\
     ${GO_IMPORT}/cmd/crucible \
     ${GO_IMPORT}/cmd/habtool \
 "
-SRCREV = "dec27cd4e0e0db106c0a21d429c04ca8d36bbdd5"
-
-export GOPROXY = "https://proxy.golang.org,direct"
-# Workaround for network access issue during compile step.
-# This needs to be fixed in the recipes buildsystem so that
-# it can be accomplished during do_fetch task.
-do_compile[network] = "1"
 
 inherit go-mod
diff --git a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb
index ece30a598b..04362db7e5 100644
--- a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb
+++ b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb
@@ -8,8 +8,7 @@ SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/
            https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README"
 SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile() {
     install -pm 644 ${UNPACKDIR}/ctapi-common.LICENSE LICENSE
diff --git a/meta-oe/recipes-support/ctre/ctre_3.9.0.bb b/meta-oe/recipes-support/ctre/ctre_3.9.0.bb
new file mode 100644
index 0000000000..901763f0ad
--- /dev/null
+++ b/meta-oe/recipes-support/ctre/ctre_3.9.0.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Fast compile-time regular expressions with support for matching/searching/capturing."
+HOMEPAGE = "https://github.com/hanickadot/compile-time-regular-expressions"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2e982d844baa4df1c80de75470e0c5cb"
+
+SRC_URI = "git://github.com/hanickadot/compile-time-regular-expressions.git;protocol=https;branch=main"
+SRCREV = "eb9577aae3515d14e6c5564f9aeb046d2e7c1124"
+
+
+inherit cmake
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[module] = "-DCTRE_MODULE=ON,-DCTRE_MODULE=OFF"
+PACKAGECONFIG[tests] = "-DCTRE_BUILD_TESTS=ON,-DCTRE_BUILD_TESTS=OFF"
+
+EXTRA_OECMAKE:append = " \
+-DCTRE_BUILD_PACKAGE=OFF \
+-DCTRE_BUILD_PACKAGE_DEB=OFF \
+-DCTRE_BUILD_PACKAGE_RPM=OFF \
+"
diff --git a/meta-oe/recipes-support/cxxopts/cxxopts_3.3.1.bb b/meta-oe/recipes-support/cxxopts/cxxopts_3.3.1.bb
new file mode 100644
index 0000000000..7b0cc05979
--- /dev/null
+++ b/meta-oe/recipes-support/cxxopts/cxxopts_3.3.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "A header-only lightweight C++ command line option parser."
+HOMEPAGE = "https://github.com/jarro2783/cxxopts"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8de00431559a76a1b43f6fd44f8f6689"
+
+SRC_URI = "git://github.com/jarro2783/cxxopts.git;protocol=https;branch=master"
+SRCREV = "44380e5a44706ab7347f400698c703eb2a196202"
+
+
+inherit cmake
+
+EXTRA_OECMAKE:append = " \
+-DCXXOPTS_BUILD_EXAMPLES=OFF \
+-DCXXOPTS_BUILD_TESTS=OFF \
+-DCXXOPTS_ENABLE_INSTALL=ON \
+-DCXXOPTS_ENABLE_WARNINGS=OFF \
+-DCXXOPTS_USE_UNICODE_HELP=OFF \
+"
diff --git a/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb b/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb
index f63348a328..5f33c27c52 100644
--- a/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb
+++ b/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb
@@ -11,7 +11,6 @@ SRCREV = "07ff8654a270ec9b410acd3152b60de9e9f941af"
 
 SRC_URI = "git://github.com/tlsa/libcyaml.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-support/daemonize/daemonize/0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch b/meta-oe/recipes-support/daemonize/daemonize/0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch
new file mode 100644
index 0000000000..3a79dba682
--- /dev/null
+++ b/meta-oe/recipes-support/daemonize/daemonize/0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch
@@ -0,0 +1,46 @@
+From c47fdcc0a900aea93b1967c20db42743171ab1ac Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Thu, 27 Mar 2025 16:46:42 +0900
+Subject: [PATCH] fix getopt.c too many arguments to function 'write' error in
+ gcc-15.0.1
+
+In the original code, write() was declared as 'extern int write();',
+which is interpreted as a function taking no parameters.
+This caused errors when actually calling it with 3 parameters.
+The current fix to declare it as 'extern int write(int, const void *, unsigned);'
+is the correct solution.
+This properly defines the write function to accept 3 parameters.
+
+../git/getopt.c: In function 'x_getopt':
+../git/getopt.c:51:16: error: too many arguments to function 'write'; expected 0, have 3
+   51 |         (void) write(2, argv[0], (unsigned)strlen(argv[0]));\
+      |                ^~~~~ ~
+../git/getopt.c:78:17: note: in expansion of macro 'ERR'
+   78 |                 ERR(": illegal option -- ", c);
+      |                 ^~~
+../git/getopt.c:48:20: note: declared here
+   48 |         extern int write();\
+      |                    ^~~~~
+      
+Upstream-Status: Submitted [https://github.com/bmc/daemonize/pull/37]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ getopt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/getopt.c b/getopt.c
+index 3f37c55..f298da7 100644
+--- a/getopt.c
++++ b/getopt.c
+@@ -45,7 +45,7 @@
+ #include <string.h>
+ 
+ #define ERR(s, c)      if(x_opterr){\
+-       extern int write();\
++       extern int write(int, const void *, unsigned);\
+        char errbuf[2];\
+        errbuf[0] = c; errbuf[1] = '\n';\
+        (void) write(2, argv[0], (unsigned)strlen(argv[0]));\
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-oe/recipes-support/daemonize/daemonize_git.bb
index f46dec59fc..bae04ca7a3 100644
--- a/meta-oe/recipes-support/daemonize/daemonize_git.bb
+++ b/meta-oe/recipes-support/daemonize/daemonize_git.bb
@@ -7,9 +7,10 @@ PV = "1.7.8"
 inherit autotools
 
 SRCREV = "18869a797dab12bf1c917ba3b4782fef484c407c"
-SRC_URI = "git://github.com/bmc/daemonize.git;branch=master;protocol=https \
+SRC_URI = " \
+    git://github.com/bmc/daemonize.git;branch=master;protocol=https \
+    file://0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch \
 "
 
-S = "${WORKDIR}/git"
 
 EXTRA_AUTORECONF += "--exclude=autoheader"
diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-fix-prototype-declaration-with-gcc-15.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-fix-prototype-declaration-with-gcc-15.patch
new file mode 100644
index 0000000000..8910b40ec5
--- /dev/null
+++ b/meta-oe/recipes-support/daemontools/daemontools/0001-fix-prototype-declaration-with-gcc-15.patch
@@ -0,0 +1,252 @@
+From d4e8b6638ede51dee635317baf86a43d40bc45d2 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Tue, 8 Apr 2025 14:02:04 +0900
+Subject: [PATCH] fix prototype declaration with gcc 15
+
+* Fix prototype declaration and too many arguments function errors due to outdated style
+byte_chr.c:9:1: error: number of arguments doesn't match prototype
+    9 | {
+      | ^
+In file included from byte_chr.c:3:
+byte.h:6:21: error: prototype declaration
+    6 | extern unsigned int byte_chr();
+      |                     ^~~~~~~~
+...
+./compile buffer_get.c
+buffer_get.c: In function 'oneread':
+buffer_get.c:12:9: error: too many arguments to function 'op'; expected 0, have 3
+   12 |     r = op(fd,buf,len);
+      |         ^~ ~~
+...
+supervise.c: In function 'doit':
+supervise.c:144:11: error: too many arguments to function 'wait_nohang'; expected 0, have 1
+  144 |       r = wait_nohang(&wstat);
+      |           ^~~~~~~~~~~ ~~~~~~
+
+Upstream-Status: Inactive-Upstream [lastrelease: 10 years ago]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/alloc.c      |  6 ++----
+ src/alloc.h      |  6 +++---
+ src/alloc_re.c   |  5 +----
+ src/buffer_get.c |  2 +-
+ src/buffer_put.c |  2 +-
+ src/byte.h       | 10 +++++-----
+ src/byte_chr.c   |  5 +----
+ src/byte_copy.c  |  5 +----
+ src/byte_cr.c    |  5 +----
+ src/byte_diff.c  |  5 +----
+ src/byte_rchr.c  |  5 +----
+ src/select.h2    |  1 -
+ src/wait.h       |  4 ++--
+ 13 files changed, 20 insertions(+), 41 deletions(-)
+
+diff --git a/src/alloc.c b/src/alloc.c
+index c741aa4..5b21993 100644
+--- a/src/alloc.c
++++ b/src/alloc.c
+@@ -12,8 +12,7 @@ static aligned realspace[SPACE / ALIGNMENT];
+ #define space ((char *) realspace)
+ static unsigned int avail = SPACE; /* multiple of ALIGNMENT; 0<=avail<=SPACE */
+ 
+-/*@null@*//*@out@*/char *alloc(n)
+-unsigned int n;
++/*@null@*//*@out@*/char *alloc(unsigned int n)
+ {
+   char *x;
+   n = ALIGNMENT + n - (n & (ALIGNMENT - 1)); /* XXX: could overflow */
+@@ -23,8 +22,7 @@ unsigned int n;
+   return x;
+ }
+ 
+-void alloc_free(x)
+-char *x;
++void alloc_free(char *x)
+ {
+   if (x >= space)
+     if (x < space + SPACE)
+diff --git a/src/alloc.h b/src/alloc.h
+index 21122fc..7a13178 100644
+--- a/src/alloc.h
++++ b/src/alloc.h
+@@ -3,8 +3,8 @@
+ #ifndef ALLOC_H
+ #define ALLOC_H
+ 
+-extern /*@null@*//*@out@*/char *alloc();
+-extern void alloc_free();
+-extern int alloc_re();
++extern /*@null@*//*@out@*/char *alloc(unsigned int n);
++extern void alloc_free(char *x);
++extern int alloc_re(char **x,unsigned int m,unsigned int n);
+ 
+ #endif
+diff --git a/src/alloc_re.c b/src/alloc_re.c
+index 1074609..5096fb1 100644
+--- a/src/alloc_re.c
++++ b/src/alloc_re.c
+@@ -3,10 +3,7 @@
+ #include "alloc.h"
+ #include "byte.h"
+ 
+-int alloc_re(x,m,n)
+-char **x;
+-unsigned int m;
+-unsigned int n;
++int alloc_re(char **x,unsigned int m,unsigned int n)
+ {
+   char *y;
+  
+diff --git a/src/buffer_get.c b/src/buffer_get.c
+index 3a6e1b6..2a38fa1 100644
+--- a/src/buffer_get.c
++++ b/src/buffer_get.c
+@@ -4,7 +4,7 @@
+ #include "byte.h"
+ #include "error.h"
+ 
+-static int oneread(int (*op)(),int fd,char *buf,unsigned int len)
++static int oneread(int (*op)(int, char *, unsigned int),int fd,char *buf,unsigned int len)
+ {
+   int r;
+ 
+diff --git a/src/buffer_put.c b/src/buffer_put.c
+index 23164b3..23d1d2b 100644
+--- a/src/buffer_put.c
++++ b/src/buffer_put.c
+@@ -5,7 +5,7 @@
+ #include "byte.h"
+ #include "error.h"
+ 
+-static int allwrite(int (*op)(),int fd,const char *buf,unsigned int len)
++static int allwrite(int (*op)(int, const char *, unsigned int),int fd,const char *buf,unsigned int len)
+ {
+   int w;
+ 
+diff --git a/src/byte.h b/src/byte.h
+index 09aab61..d5ccf83 100644
+--- a/src/byte.h
++++ b/src/byte.h
+@@ -3,11 +3,11 @@
+ #ifndef BYTE_H
+ #define BYTE_H
+ 
+-extern unsigned int byte_chr();
+-extern unsigned int byte_rchr();
+-extern void byte_copy();
+-extern void byte_copyr();
+-extern int byte_diff();
++extern unsigned int byte_chr(char* s,register unsigned int n,int c);
++extern unsigned int byte_rchr(char* s,register unsigned int n,int c);
++extern void byte_copy(register char* to,register unsigned int n,register char* from);
++extern void byte_copyr(register char* to,register unsigned int n,register char* from);
++extern int byte_diff(register char* s,register unsigned int n,register char* t);
+ extern void byte_zero();
+ 
+ #define byte_equal(s,n,t) (!byte_diff((s),(n),(t)))
+diff --git a/src/byte_chr.c b/src/byte_chr.c
+index fd56056..7fbcd61 100644
+--- a/src/byte_chr.c
++++ b/src/byte_chr.c
+@@ -2,10 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-unsigned int byte_chr(s,n,c)
+-char *s;
+-register unsigned int n;
+-int c;
++unsigned int byte_chr(char* s,register unsigned int n,int c)
+ {
+   register char ch;
+   register char *t;
+diff --git a/src/byte_copy.c b/src/byte_copy.c
+index 74c9e4a..917d795 100644
+--- a/src/byte_copy.c
++++ b/src/byte_copy.c
+@@ -2,10 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-void byte_copy(to,n,from)
+-register char *to;
+-register unsigned int n;
+-register char *from;
++void byte_copy(register char* to,register unsigned int n,register char* from)
+ {
+   for (;;) {
+     if (!n) return; *to++ = *from++; --n;
+diff --git a/src/byte_cr.c b/src/byte_cr.c
+index 52dc251..ac3ec67 100644
+--- a/src/byte_cr.c
++++ b/src/byte_cr.c
+@@ -2,10 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-void byte_copyr(to,n,from)
+-register char *to;
+-register unsigned int n;
+-register char *from;
++void byte_copyr(register char* to,register unsigned int n,register char* from)
+ {
+   to += n;
+   from += n;
+diff --git a/src/byte_diff.c b/src/byte_diff.c
+index 0c4d17b..e1ef257 100644
+--- a/src/byte_diff.c
++++ b/src/byte_diff.c
+@@ -2,10 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-int byte_diff(s,n,t)
+-register char *s;
+-register unsigned int n;
+-register char *t;
++int byte_diff(register char* s,register unsigned int n,register char* t)
+ {
+   for (;;) {
+     if (!n) return 0; if (*s != *t) break; ++s; ++t; --n;
+diff --git a/src/byte_rchr.c b/src/byte_rchr.c
+index 7ea9948..04391bf 100644
+--- a/src/byte_rchr.c
++++ b/src/byte_rchr.c
+@@ -2,10 +2,7 @@
+ 
+ #include "byte.h"
+ 
+-unsigned int byte_rchr(s,n,c)
+-char *s;
+-register unsigned int n;
+-int c;
++unsigned int byte_rchr(char* s,register unsigned int n,int c)
+ {
+   register char ch;
+   register char *t;
+diff --git a/src/select.h2 b/src/select.h2
+index 4bd4fcf..b7ac8c9 100644
+--- a/src/select.h2
++++ b/src/select.h2
+@@ -8,6 +8,5 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/select.h>
+-extern int select();
+ 
+ #endif
+diff --git a/src/wait.h b/src/wait.h
+index d294e9d..168d1bf 100644
+--- a/src/wait.h
++++ b/src/wait.h
+@@ -3,8 +3,8 @@
+ #ifndef WAIT_H
+ #define WAIT_H
+ 
+-extern int wait_pid();
+-extern int wait_nohang();
++extern int wait_pid(int* status, int pid);
++extern int wait_nohang(int* status);
+ extern int wait_stop();
+ extern int wait_stopnohang();
+ 
diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
index a35b54e3bc..cc83015e65 100644
--- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
+++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
@@ -24,14 +24,22 @@ SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \
     file://0001-daemontools-Fix-QA-Issue.patch \
     file://warnings.patch \
     file://0001-Fix-signature-of-main-function.patch \
+    file://0001-fix-prototype-declaration-with-gcc-15.patch \
 "
 
-SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc"
 SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f"
 
-S = "${WORKDIR}/admin/${BP}"
+UPSTREAM_CHECK_URI = "http://cr.yp.to/daemontools/install.html"
 
+S = "${UNPACKDIR}/admin/${BP}"
+
+# http://errors.yoctoproject.org/Errors/Details/766886/
+# pathexec_run.c:19:17: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types]
+# pathexec_run.c:19:22: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types]
+# pathexec_run.c:36:18: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types]
+# pathexec_run.c:36:23: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types]
 do_compile() {
+    export CC="$CC -Wno-error=incompatible-pointer-types"
     ./package/compile
 }
 
diff --git a/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb b/meta-oe/recipes-support/dc/double-conversion_3.3.1.bb
index a8fd88a9ad..31330faa17 100644
--- a/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb
+++ b/meta-oe/recipes-support/dc/double-conversion_3.3.1.bb
@@ -6,13 +6,12 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ea35644f0ec0d9767897115667e901f"
 
 
-S = "${WORKDIR}/git"
 
 SRC_URI = " \
         git://github.com/google/double-conversion.git;protocol=https;branch=master \
         file://run-ptest \
 "
-SRCREV = "4f7a25d8ced8c7cf6eee6fd09d6788eaa23c9afe"
+SRCREV = "ae0dbfeb9744efd216c95b30555049d75d47116a"
 
 inherit cmake ptest
 
diff --git a/meta-oe/recipes-support/devmem2/devmem2_2.0.bb b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb
index aee6bfe3da..e601755af4 100644
--- a/meta-oe/recipes-support/devmem2/devmem2_2.0.bb
+++ b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb
@@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf9862
 SRC_URI = "git://github.com/denix0/devmem2.git;protocol=https;branch=main"
 SRCREV = "5b395a946894eb4f4ef5d07c80a50a88573a541e"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
 
diff --git a/meta-oe/recipes-support/dhex/dhex/0001-Fix-function-declaration-conflict-error-with-empty-p.patch b/meta-oe/recipes-support/dhex/dhex/0001-Fix-function-declaration-conflict-error-with-empty-p.patch
new file mode 100644
index 0000000000..b4d7656aff
--- /dev/null
+++ b/meta-oe/recipes-support/dhex/dhex/0001-Fix-function-declaration-conflict-error-with-empty-p.patch
@@ -0,0 +1,38 @@
+From 86491a25b9057576234d1eaf4da020413e7259ad Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Tue, 8 Apr 2025 14:43:29 +0900
+Subject: [PATCH] Fix function declaration conflict error with empty parameters
+ in gcc-15
+
+* A strict error handling for function parameters in gcc-15 causes errors.
+output.c:9:6: error: conflicting types for 'initcolors'; have 'void(tOutput *)' {aka 'void(struct _tOutput *)'}
+    9 | void initcolors(tOutput* output)
+      |      ^~~~~~~~~~
+In file included from output.c:7:
+output.h:10:6: note: previous declaration of 'initcolors' with type 'void(void)'
+   10 | void initcolors();
+      |      ^~~~~~~~~~
+
+
+* This component is a personal project and is maintained through the maintainer's personal email. 
+  I have sent the patch via email and am waiting for a response.
+
+Upstream-Status: Pending
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ output.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/output.h b/output.h
+index cef29e9..b2b5e38 100644
+--- a/output.h
++++ b/output.h
+@@ -7,7 +7,7 @@
+ #include "machine_type.h"
+ #include "datatypes.h"
+ 
+-void initcolors();
++void initcolors(tOutput* output);
+ void colorpair(tOutput* output,uicolors uicol,short fg,short bg,int attr);
+ void pairsinit(tOutput* output);
+ void setcolor(tOutput* output,uicolors col);
diff --git a/meta-oe/recipes-support/dhex/dhex_0.69.bb b/meta-oe/recipes-support/dhex/dhex_0.69.bb
index 3cc870481f..f292cf8d4f 100644
--- a/meta-oe/recipes-support/dhex/dhex_0.69.bb
+++ b/meta-oe/recipes-support/dhex/dhex_0.69.bb
@@ -7,11 +7,13 @@ DEPENDS = "ncurses"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README.txt;beginline=229;endline=241;md5=6f252a421b65bcecf624382ba3c899da"
 
-SRC_URI = "http://www.dettus.net/dhex/dhex_0.69.tar.gz"
-SRC_URI[md5sum] = "64d557437fe110c19f23ed3e9bbcdd54"
+SRC_URI = " \
+        http://www.dettus.net/dhex/dhex_0.69.tar.gz \
+        file://0001-Fix-function-declaration-conflict-error-with-empty-p.patch \
+"
 SRC_URI[sha256sum] = "52730bcd1cf16bd4dae0de42531be9a4057535ec61ca38c0804eb8246ea6c41b"
 
-S = "${WORKDIR}/dhex_${PV}"
+S = "${UNPACKDIR}/dhex_${PV}"
 
 EXTRA_OEMAKE += "'CC=${CC}' 'LDFLAGS=${LDFLAGS}' 'CPPFLAGS=${CPPFLAGS}'"
 
diff --git a/meta-oe/recipes-support/digitemp/digitemp/0001-Fix-conflicting-prototype.patch b/meta-oe/recipes-support/digitemp/digitemp/0001-Fix-conflicting-prototype.patch
new file mode 100644
index 0000000000..484fc1c3a2
--- /dev/null
+++ b/meta-oe/recipes-support/digitemp/digitemp/0001-Fix-conflicting-prototype.patch
@@ -0,0 +1,32 @@
+From fa56b0f78d12f97ac44e0a367d413a9e88611d1c Mon Sep 17 00:00:00 2001
+From: Robert Scheck <robert-scheck@users.noreply.github.com>
+Date: Thu, 16 Jan 2025 21:24:41 +0100
+Subject: [PATCH] Fix conflicting prototype
+
+src/digitemp.c:171:6: error: conflicting types for ‘free_coupler’; have ‘void(int)’
+  171 | void free_coupler( int free_only )
+      |      ^~~~~~~~~~~~
+In file included from src/digitemp.c:78:
+src/digitemp.h:90:6: note: previous declaration of ‘free_coupler’ with type ‘void(void)’
+   90 | void free_coupler();
+      |      ^~~~~~~~~~~~
+
+Upstream-Status: Backport [https://github.com/bcl/digitemp/commit/fa56b0f78d12f97ac44e0a367d413a9e88611d1c]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/digitemp.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/digitemp.h b/src/digitemp.h
+index 06d50e9..e81a7be 100644
+--- a/src/digitemp.h
++++ b/src/digitemp.h
+@@ -87,7 +87,7 @@ struct _coupler {
+ 
+ /* Prototypes */
+ void usage();
+-void free_coupler();
++void free_coupler( int free_only );
+ float c2f( float temp );
+ int build_tf( char *time_format, char *format, int sensor, 
+               float temp_c, int humidity, unsigned char *sn );
diff --git a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb
index 6565097334..baddf42e6b 100644
--- a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb
+++ b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb
@@ -4,11 +4,13 @@ DEPENDS = "libusb1"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0"
 
-SRC_URI = "git://github.com/bcl/digitemp;branch=master;protocol=https"
+SRC_URI = " \
+    git://github.com/bcl/digitemp;branch=master;protocol=https \
+    file://0001-Fix-conflicting-prototype.patch \
+"
 
 SRCREV = "a162e63aad35358aab325388f3d5e88121606419"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "ds9097 ds9097u \
                 SYSTYPE='Linux' \
diff --git a/meta-oe/recipes-support/dool/dool_1.3.2.bb b/meta-oe/recipes-support/dool/dool_1.3.4.bb
index f7e403018c..d18f5c8b01 100644
--- a/meta-oe/recipes-support/dool/dool_1.3.2.bb
+++ b/meta-oe/recipes-support/dool/dool_1.3.4.bb
@@ -12,9 +12,8 @@ RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell pyth
 SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \
           "
 
-SRCREV = "b2862905be841232c9e36ce1e059d3fe34ef0cdf"
+SRCREV = "5068abef0a960c173a91e84a45e7fea1b0a802c0"
 
-S = "${WORKDIR}/git"
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
diff --git a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb
index 970844f982..578a2b8d3b 100644
--- a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb
+++ b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb
@@ -10,7 +10,6 @@ RDEPENDS:${PN} += "bash bash-completion"
 SRC_URI = "git://gitlab.com/driverctl/driverctl.git;branch=master;protocol=https"
 SRCREV = "2ba60536eb20ca0a6a751bd8b6501dba84ec45d3"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig systemd features_check
 
diff --git a/meta-oe/recipes-support/edid-decode/edid-decode_git.bb b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb
index 6eaec800ca..fc8681ca44 100644
--- a/meta-oe/recipes-support/edid-decode/edid-decode_git.bb
+++ b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb
@@ -6,10 +6,13 @@ SECTION = "console/utils"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592"
 
-SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master"
+SRC_URI = "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master"
 SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5"
 PV = "0.0+git"
-S = "${WORKDIR}/git"
+
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index dd5489e7db..aa0e86db12 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
 inherit autotools gettext update-alternatives
 
-SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz \
+SRC_URI = "https://downloads.yoctoproject.org/mirror/sources/${BP}.tar.gz \
            file://eject-2.1.5-error-return.patch \
            file://eject-2.1.1-verbose.patch \
            file://eject-2.1.5-spaces.patch \
@@ -13,10 +13,9 @@ SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz \
            file://0001-eject-Include-sys-sysmacros.h-for-major-minor.patch \
            "
 
-SRC_URI[md5sum] = "b96a6d4263122f1711db12701d79f738"
 SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 
 do_compile:prepend() {
diff --git a/meta-oe/recipes-support/enca/enca/cross.patch b/meta-oe/recipes-support/enca/enca/cross.patch
new file mode 100644
index 0000000000..7749dee088
--- /dev/null
+++ b/meta-oe/recipes-support/enca/enca/cross.patch
@@ -0,0 +1,68 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Subject: build make_hash with the build arch compiler
+
+Also note that we cannot include config.h in make_hash.c, because it is
+specific to the host architecture.
+
+Sourced from debian - https://salsa.debian.org/debian/enca/-/blob/master/debian/patches/cross.patch?ref_type=heads
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: enca-1.19/configure.ac
+===================================================================
+--- enca-1.19.orig/configure.ac
++++ enca-1.19/configure.ac
+@@ -35,6 +35,7 @@
+ dnl Checks for programs.
+ AC_PROG_AWK
+ AC_PROG_CC
++AX_PROG_CC_FOR_BUILD
+ AC_GNU_SOURCE
+ AC_AIX
+ AC_ISC_POSIX
+Index: enca-1.19/tools/Makefile.am
+===================================================================
+--- enca-1.19.orig/tools/Makefile.am
++++ enca-1.19/tools/Makefile.am
+@@ -2,7 +2,8 @@
+ noinst_HEADERS = encodings.h
+ noinst_SCRIPTS = expand_table.pl
+ 
+-make_hash_SOURCES = make_hash.c
++make_hash$(EXEEXT): make_hash.c
++       $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ $<
+ 
+ BUILT_SOURCES = $(noinst_HEADERS)
+ 
+Index: enca-1.19/tools/make_hash.c
+===================================================================
+--- enca-1.19.orig/tools/make_hash.c
++++ enca-1.19/tools/make_hash.c
+@@ -17,25 +17,9 @@
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+-#ifdef HAVE_CONFIG_H
+-#  include "config.h"
+-#endif /* HAVE_CONFIG_H */
+-
+ #include <stdlib.h>
+ #include <stdio.h>
+-
+-#ifdef HAVE_STRING_H
+-#  include <string.h>
+-#else /* HAVE_STRING_H */
+-#  ifdef HAVE_STRINGS_H
+-#    include <strings.h>
+-#  endif /* HAVE_STRINGS_H */
+-#endif /* HAVE_STRING_H */
+-
+-#ifdef HAVE_MEMORY_H
+-#  include <memory.h>
+-#endif /* HAVE_MEMORY_H */
+-
++#include <string.h>
+ #include <unistd.h>
+ #include <ctype.h>
+ 
diff --git a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch
deleted file mode 100644
index 756745d839..0000000000
--- a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Pending
-
---- enca-1.19/Makefile.am.orig  2006-06-29 15:34:55.000000000 +0100
-+++ enca-1.19/Makefile.am       2006-06-29 15:35:20.000000000 +0100
-@@ -1,7 +1,7 @@
- if MAINTAINER_MODE
--SUBDIRS = tools data script lib src devel-docs test
-+SUBDIRS = data script lib src devel-docs test
- else
--SUBDIRS = tools script lib src devel-docs
-+SUBDIRS = script lib src devel-docs
- endif
- man_MANS = man/enca.1
- 
diff --git a/meta-oe/recipes-support/enca/enca_1.19.bb b/meta-oe/recipes-support/enca/enca_1.19.bb
index 774f05f7c4..61da50ba52 100644
--- a/meta-oe/recipes-support/enca/enca_1.19.bb
+++ b/meta-oe/recipes-support/enca/enca_1.19.bb
@@ -2,33 +2,19 @@ SUMMARY = "Enca is an Extremely Naive Charset Analyser"
 SECTION = "libs"
 HOMEPAGE = "https://cihar.com/software/enca/"
 
-DEPENDS += "gettext-native"
+DEPENDS += "gettext-native autoconf-archive-native"
 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4"
 
 SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \
+    file://cross.patch \
     file://dont-run-tests.patch \
-    file://makefile-remove-tools.patch \
     file://libenca-003-iconv.patch \
-    file://0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch"
+    file://0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch \
+    "
 SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a"
 
 inherit autotools
 
-do_configure:prepend() {
-    # remove failing test which checks for something that isn't even used
-    sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' ${S}/configure.ac
-}
-
-do_configure:append() {
-    sed -i s:-I/usr/include::g ${B}/Makefile
-    sed -i s:-I/usr/include::g ${B}/*/Makefile
-}
-
-do_compile() {
-    cd ${S}/tools && ${BUILD_CC} -o make_hash make_hash.c
-    cd ${B}
-    oe_runmake
-}
-
+EXTRA_OECONF += "MKTEMP_PROG=mktemp"
diff --git a/meta-oe/recipes-support/epeg/epeg_git.bb b/meta-oe/recipes-support/epeg/epeg_git.bb
index e5277b1579..63c1455f25 100644
--- a/meta-oe/recipes-support/epeg/epeg_git.bb
+++ b/meta-oe/recipes-support/epeg/epeg_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/mattes/epeg.git;branch=master;protocol=https \
            file://0001-configure-Fix-checks-for-libjpeg-and-libexif.patch \
            "
 SRCREV = "9a175cd67eaa61fe45413d8da82da72936567047"
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb
index 147a8069fa..c80bf12ade 100644
--- a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb
+++ b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb
@@ -8,10 +8,9 @@ SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \
            file://0002-tr_languages-cast-string_ordinal-init-values.patch \
            file://0001-Drop-using-register-keyword-for-storage-classifier.patch \
 "
-SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3"
 SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659"
 
-S = "${WORKDIR}/espeak-${PV}-source"
+S = "${UNPACKDIR}/espeak-${PV}-source"
 
 DEPENDS = "portaudio-v19 qemu-helper-native"
 inherit siteinfo qemu
diff --git a/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb b/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb
index 491f10dda0..225d15cc7f 100644
--- a/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb
+++ b/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb
@@ -10,7 +10,6 @@ DEPENDS = "libevdev"
 SRCREV = "86a5627dbeac8d9d9bc34326a758d6a477e876e4"
 SRC_URI = "git://git@gitlab.freedesktop.org/libevdev/evemu.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 PV = "2.7.0+git"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb
deleted file mode 100644
index 958810cf7a..0000000000
--- a/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2"
-
-DEPENDS = "zlib expat brotli libinih"
-
-SRC_URI = "https://github.com/Exiv2/${BPN}/releases/download/v${PV}/${BP}-Source.tar.gz"
-SRC_URI[sha256sum] = "89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d"
-# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either
-# inherit dos2unix
-S = "${WORKDIR}/${BP}-Source"
-
-inherit cmake gettext
-
-do_install:append:class-target() {
-    # reproducibility: remove build host path
-    sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \
-        -e 's:${STAGING_DIR_HOST}::g'
-}
diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb
new file mode 100644
index 0000000000..c0fb32ab79
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb
@@ -0,0 +1,10 @@
+SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2"
+
+DEPENDS = "zlib expat brotli libinih"
+
+SRC_URI = "git://github.com/Exiv2/exiv2.git;protocol=https;branch=0.28.x"
+SRCREV = "a6a79ef064f131ffd03c110acce2d3edb84ffa2e"
+
+inherit cmake gettext
diff --git a/meta-oe/recipes-support/fbset/fbset-modes.bb b/meta-oe/recipes-support/fbset/fbset-modes.bb
index fcaf31795b..8ab79f6d7a 100644
--- a/meta-oe/recipes-support/fbset/fbset-modes.bb
+++ b/meta-oe/recipes-support/fbset/fbset-modes.bb
@@ -7,8 +7,7 @@ PV = "0.1.0"
 
 SRC_URI = "file://fb.modes"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d ${D}${sysconfdir}
diff --git a/meta-oe/recipes-support/fbset/fbset_2.1.bb b/meta-oe/recipes-support/fbset/fbset_2.1.bb
index 690fee0df3..e6f357fd4f 100644
--- a/meta-oe/recipes-support/fbset/fbset_2.1.bb
+++ b/meta-oe/recipes-support/fbset/fbset_2.1.bb
@@ -33,5 +33,4 @@ ALTERNATIVE_LINK_NAME[fbset] = "${sbindir}/fbset"
 ALTERNATIVE_TARGET[fbset] = "${sbindir}/fbset.real"
 ALTERNATIVE_PRIORITY[fbset] = "55"
 
-SRC_URI[md5sum] = "40ed9608f46d787bfb65fd1269f7f459"
 SRC_URI[sha256sum] = "517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338"
diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.10.bb b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb
index af7117da7b..52122b9c0c 100644
--- a/meta-oe/recipes-support/fftw/fftw_3.3.10.bb
+++ b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb
@@ -11,6 +11,8 @@ SRC_URI = " \
 "
 SRC_URI[sha256sum] = "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467"
 
+UPSTREAM_CHECK_URI = "http://www.fftw.org/download.html"
+
 inherit autotools pkgconfig ptest
 
 # we had multiple recipes in the past
diff --git a/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-oe/recipes-support/fltk/fltk-native.bb
index 3e8e2cdf77..322a28430f 100644
--- a/meta-oe/recipes-support/fltk/fltk-native.bb
+++ b/meta-oe/recipes-support/fltk/fltk-native.bb
@@ -4,6 +4,8 @@ DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native"
 
 SRC_URI += "file://fltk-native-link-libdl.patch"
 
+UPSTREAM_CHECK_URI = "https://www.fltk.org/software.php"
+
 inherit native
 
 EXTRA_OECMAKE += " \
diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb
index 82007c4cf4..4278a2fa3d 100644
--- a/meta-oe/recipes-support/fltk/fltk.bb
+++ b/meta-oe/recipes-support/fltk/fltk.bb
@@ -7,6 +7,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI += "file://0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch"
 
+UPSTREAM_CHECK_URI = "https://www.fltk.org/software.php"
+
 EXTRA_OECMAKE = " \
     -DOPTION_BUILD_SHARED_LIBS=ON \
     -DOPTION_USE_THREADS=ON \
diff --git a/meta-oe/recipes-support/fltk/fltk.inc b/meta-oe/recipes-support/fltk/fltk.inc
index b1bc83578f..0b2921095c 100644
--- a/meta-oe/recipes-support/fltk/fltk.inc
+++ b/meta-oe/recipes-support/fltk/fltk.inc
@@ -11,8 +11,8 @@ SRC_URI = " \
     file://0002-always-build-fluid-and-export-pointers.patch \
 "
 
-PV = "1.3.8"
-SRC_URI[sha256sum] = "1d9832409fc08c908c64ab40ad9fd8b0e8af5d203651eb9690b810f41e2f412d"
+PV = "1.3.9"
+SRC_URI[sha256sum] = "103441134915402808fd45424d4061778609437e804334434e946cfd26b196c2"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch
index d1cbb35479..0d47dac2dd 100644
--- a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch
+++ b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch
@@ -16,10 +16,10 @@ Content-Transfer-Encoding: 8bit
 |                                     ^
 | src/CMakeFiles/fltk.dir/build.make:1217: recipe for target 'src/CMakeFiles/fltk.dir/Fl_Preferences.cxx.o' failed
 
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
 Upstream-Status: Pending
 
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
  src/Fl_Preferences.cxx | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
diff --git a/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-for-GCC15-C23-build-failure.patch b/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-for-GCC15-C23-build-failure.patch
new file mode 100644
index 0000000000..ee27fe7906
--- /dev/null
+++ b/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-for-GCC15-C23-build-failure.patch
@@ -0,0 +1,42 @@
+From 5afe6492735938e0053ae78817399fa433f0f8c7 Mon Sep 17 00:00:00 2001
+From: "Pavel Cahyna" <pcahyna@redhat.com>
+Date: Tue, 8 Apr 2025 19:05:53 +0900
+Subject: [PATCH] Fix for GCC15 / C23 build failure
+
+* Import submitted patch from:
+  https://lists.gnu.org/archive/html/freeipmi-devel/2025-02/msg00000.html
+
+  to fix:
+  http://errors.yoctoproject.org/Errors/Details/851185/
+  Error occurs with gcc version 15.
+  In gcc-15, C23 is the default and 'bool' is used as a reserved keyword.
+  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/freeipmi-devel/2025-02/msg00000.html]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ common/toolcommon/tool-config-file-common.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/common/toolcommon/tool-config-file-common.c b/common/toolcommon/tool-config-file-common.c
+index 609e7a3..20dfad5 100644
+--- a/common/toolcommon/tool-config-file-common.c
++++ b/common/toolcommon/tool-config-file-common.c
+@@ -78,14 +78,14 @@ _config_file_bool (conffile_t cf,
+                    void *app_ptr,
+                    int app_data)
+ {
+-  int *bool;
++  int *value;
+ 
+   assert (data);
+   assert (optionname);
+   assert (option_ptr);
+ 
+-  bool = (int *)option_ptr;
+-  *bool = data->boolval;
++  value = (int *)option_ptr;
++  *value = data->boolval;
+   return (0);
+ }
+ 
diff --git a/meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb
new file mode 100644
index 0000000000..e04ebfb0c6
--- /dev/null
+++ b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb
@@ -0,0 +1,28 @@
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.ZRESEARCH;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.bmc-watchdog;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.ipmi-dcmi;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.ipmi-fru;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.ipmiconsole;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.ipmidetect;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.ipmimonitoring;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.ipmiping;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.ipmipower;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.ipmiseld;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.pstdout;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://COPYING.sunbmc;md5=c03f21cd76ff5caba6b890d1213cbfbb"
+
+SRC_URI = " \
+    ${GNU_MIRROR}/freeipmi/freeipmi-${PV}.tar.gz \
+    file://0001-Fix-for-GCC15-C23-build-failure.patch \
+"
+SRC_URI[sha256sum] = "d6929c354639f5ce75b5b1897e8b366eb63625c23e5c4590a7aea034fe2b8caf"
+
+DEPENDS = "libgcrypt"
+DEPENDS:append:libc-musl = " argp-standalone"
+
+inherit pkgconfig autotools
+
+EXTRA_OECONF = "--without-random-device"
+
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2024-32661.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2024-32661.patch
new file mode 100644
index 0000000000..002135b5e4
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2024-32661.patch
@@ -0,0 +1,27 @@
+From 71e463e31b4d69f4022d36bfc814592f56600793 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Sun, 21 Apr 2024 13:56:13 +0200
+Subject: [PATCH] [core,info] fix missing check in rdp_write_logon_info_v1
+
+CVE: CVE-2024-32661
+Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/71e463e31b4d69f4022d36bfc814592f56600793]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ libfreerdp/core/info.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libfreerdp/core/info.c b/libfreerdp/core/info.c
+index 7d6eec137..3395e4d2e 100644
+--- a/libfreerdp/core/info.c
++++ b/libfreerdp/core/info.c
+@@ -1322,6 +1322,10 @@ static BOOL rdp_write_logon_info_v1(wStream* s, logon_info* info)
+                return FALSE;
+ 
+        /* domain */
++       WINPR_ASSERT(info);
++       if (!info->domain || !info->username)
++               return FALSE;
++
+        ilen = ConvertToUnicode(CP_UTF8, 0, info->domain, -1, &wString, 0);
+ 
+        if (ilen < 0)
diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb
index b6974af739..284f61c137 100644
--- a/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb
@@ -10,7 +10,8 @@ inherit pkgconfig cmake
 SRCREV = "eda5c99686e15327f2f37b9cadf307e852b96adf"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
+
+CVE_PRODUCT = "freerdp"
 
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'pam pulseaudio wayland x11', d)} \
diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
index ee4d4530d6..18af3229d7 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
@@ -3,7 +3,7 @@
 
 DESCRIPTION = "FreeRDP RDP client & server library"
 HOMEPAGE = "http://www.freerdp.com"
-DEPENDS = "openssl alsa-lib libusb1"
+DEPENDS = "openssl libusb1"
 SECTION = "net"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
@@ -20,12 +20,11 @@ SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https
            file://0001-Fix-const-qualifier-error.patch \
            file://0002-Do-not-install-tools-a-CMake-targets.patch \
            file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \
+           file://CVE-2024-32661.patch \
            "
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += " \
-    -DWITH_ALSA=ON \
     -DWITH_FFMPEG=OFF \
     -DWITH_CUNIT=OFF \
     -DWITH_NEON=OFF \
@@ -37,7 +36,7 @@ EXTRA_OECMAKE += " \
 
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\
-    gstreamer cups pcsc server \
+    alsa gstreamer cups pcsc server \
 "
 
 X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile"
@@ -50,6 +49,7 @@ PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaud
 PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base"
 PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups"
 PACKAGECONFIG[server] = "-DWITH_SERVER=ON,-DWITH_SERVER=OFF"
+PACKAGECONFIG[alsa] = "-DWITH_ALSA=ON,-DWITH_ALSA=OFF,alsa-lib"
 
 PACKAGES =+ "libfreerdp"
 
@@ -92,3 +92,9 @@ python populate_packages:prepend () {
         description='FreeRDP plugin %s',
         prepend=True, extra_depends='')
 }
+
+CVE_STATUS[CVE-2024-32662] = "fixed-version: 2.x is not affected, bug was introduced in 3.0.0"
+
+# avoid http://errors.yoctoproject.org/Errors/Details/852862/
+# fixed in freerdp3 with https://github.com/FreeRDP/FreeRDP/pull/10553
+CFLAGS += "-std=gnu17"
diff --git a/meta-oe/recipes-support/function2/function2_4.2.4.bb b/meta-oe/recipes-support/function2/function2_4.2.4.bb
index 98d05f6e25..588e44deaa 100644
--- a/meta-oe/recipes-support/function2/function2_4.2.4.bb
+++ b/meta-oe/recipes-support/function2/function2_4.2.4.bb
@@ -8,7 +8,6 @@ PV .= "+git"
 
 SRC_URI += "gitsm://github.com/Naios/function2;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 inherit ptest
diff --git a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
index 47b070557d..5333c25a9c 100644
--- a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
+++ b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \
 SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz"
 SRC_URI[sha256sum] = "f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87"
 
-S = "${WORKDIR}/fuse-${PV}"
+S = "${UNPACKDIR}/fuse-${PV}"
 
 UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases"
 UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>3(\.\d+)+).tar.xz"
@@ -29,8 +29,9 @@ SRC_URI += " \
     file://run-ptest \
     file://fuse3.conf \
 "
-
+#python3-compile for filecmp module
 RDEPENDS:${PN}-ptest += " \
+    python3-compile \
     python3-pytest \
     python3-looseversion \
     bash \
diff --git a/meta-oe/recipes-support/gd/gd_2.3.3.bb b/meta-oe/recipes-support/gd/gd_2.3.3.bb
index cc2c1571e6..ea5c487c52 100644
--- a/meta-oe/recipes-support/gd/gd_2.3.3.bb
+++ b/meta-oe/recipes-support/gd/gd_2.3.3.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1;protocol=https \
 
 SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc"
 
-S = "${WORKDIR}/git"
 
 inherit autotools binconfig gettext pkgconfig
 
diff --git a/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb
index 4d97b1a419..2057caff78 100644
--- a/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb
+++ b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb"
 
 SRC_URI = "${GNU_MIRROR}/gengetopt/${BPN}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "ea165d618640dbdecb42ae4491337965"
 SRC_URI[sha256sum] = "b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac"
 
 inherit autotools texinfo
diff --git a/meta-oe/recipes-support/genimage/genimage_18.bb b/meta-oe/recipes-support/genimage/genimage_18.bb
new file mode 100644
index 0000000000..23169f5d44
--- /dev/null
+++ b/meta-oe/recipes-support/genimage/genimage_18.bb
@@ -0,0 +1,22 @@
+SUMMARY = "genimage - The image creation tool"
+DESCRIPTION = "Genimage is a tool for generating filesystem and disk/flash images \
+from a root filesystem tree or existing filesystem images."
+HOMEPAGE = "https://github.com/pengutronix/genimage"
+
+SECTION = "base"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "libconfuse"
+
+SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/genimage-${PV}.tar.xz"
+SRC_URI[sha256sum] = "ebc3f886c4d80064dd6c6d5e3c2e98e5a670078264108ce2f89ada8a2e13fedd"
+
+EXTRA_OECONF = "--enable-largefile"
+
+inherit pkgconfig autotools gettext github-releases
+
+GITHUB_BASE_URI = "https://github.com/pengutronix/genimage/releases"
+UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)*)"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb
index a9a867b575..8ea158eab3 100644
--- a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb
+++ b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb
@@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df"
 SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https"
 SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
-EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}"
+EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}"
 
 PACKAGES =+ "${PN}-bash-completion"
 FILES:${PN}-bash-completion += "${bindir}/gflags_completions.sh"
diff --git a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch
deleted file mode 100644
index 3732c62cd0..0000000000
--- a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 176230435cb4b64ff7f2d97f77a04579ad9ca239 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 18 Feb 2023 13:14:14 -0800
-Subject: [PATCH] Change SleepForMilliseconds parameter from unsigned int -> long
-
-Fixes following error on 32bit platforms
-
-src/googletest.h:631:35: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'long' in initializer list [-Wc++11-narrowing]
-  const struct timespec req = {0, t * 1000 * 1000};
-                                  ^~~~~~~~~~~~~~~
-
-Upstream-Status: Submitted [https://github.com/google/glog/pull/894]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/googletest.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/googletest.h b/src/googletest.h
-index 5761361..836b06c 100644
---- a/src/googletest.h
-+++ b/src/googletest.h
-@@ -625,7 +625,7 @@ class Thread {
- #endif
- };
- 
--static inline void SleepForMilliseconds(unsigned t) {
-+static inline void SleepForMilliseconds(long t) {
- #ifndef GLOG_OS_WINDOWS
- # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L
-   const struct timespec req = {0, t * 1000 * 1000};
--- 
-2.39.2
-
diff --git a/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-oe/recipes-support/glog/glog/libexecinfo.patch
deleted file mode 100644
index a791a40dbc..0000000000
--- a/meta-oe/recipes-support/glog/glog/libexecinfo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 19d00c15710840910a7397252c14d612746631fe Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 8 Mar 2021 14:58:40 -0800
-Subject: [PATCH] Link libexecinfo if its found, this is needed for musl based
- systems
-
-Fixes
-ld: libglog.so.0.4.0: undefined reference to `backtrace'
-| collect2: error: ld returned 1 exit status
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 846b444..1553358 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -162,6 +162,7 @@ cmake_pop_check_state ()
- check_cxx_symbol_exists (snprintf cstdio HAVE_SNPRINTF)
- 
- check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP)
-+check_library_exists (execinfo backtrace "" HAVE_EXECINFO)
- 
- check_cxx_source_compiles ("
- #include <cstdlib>
-@@ -629,6 +630,10 @@ if (Unwind_FOUND)
-   set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})")
- endif (Unwind_FOUND)
- 
-+if (HAVE_EXECINFO)
-+  target_link_libraries (glog PUBLIC execinfo)
-+endif (HAVE_EXECINFO)
-+
- if (HAVE_DBGHELP)
-   target_link_libraries (glog PRIVATE dbghelp)
-   set (glog_libraries_options_for_static_linking "${glog_libraries_options_for_static_linking} -ldbghelp")
diff --git a/meta-oe/recipes-support/glog/glog_0.6.0.bb b/meta-oe/recipes-support/glog/glog_0.7.1.bb
index ec39604f44..570d9a7e5f 100644
--- a/meta-oe/recipes-support/glog/glog_0.6.0.bb
+++ b/meta-oe/recipes-support/glog/glog_0.7.1.bb
@@ -4,17 +4,14 @@ macros."
 HOMEPAGE = "https://github.com/google/glog"
 
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=583a6ead531ca3cd5a2ea593a2888800"
 
 SRC_URI = " \
     git://github.com/google/glog.git;branch=master;protocol=https \
-    file://libexecinfo.patch \
-    file://0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch \
 "
 
-SRCREV = "b33e3bad4c46c8a6345525fd822af355e5ef9446"
+SRCREV = "7b134a5c82c0c0b5698bb6bf7a835b230c5638e4"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
@@ -24,6 +21,7 @@ PACKAGECONFIG:remove:riscv32 = "unwind 64bit-atomics"
 PACKAGECONFIG:remove:mipsarch = "64bit-atomics"
 PACKAGECONFIG:remove:armv5 = "64bit-atomics"
 PACKAGECONFIG:remove:armv6 = "64bit-atomics"
+PACKAGECONFIG:remove:powerpc = "64bit-atomics"
 
 PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo"
 PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo"
diff --git a/meta-oe/recipes-support/gnulib/gnulib_202401.bb b/meta-oe/recipes-support/gnulib/gnulib_202401.bb
index 41675d3587..f3fbb94ae8 100644
--- a/meta-oe/recipes-support/gnulib/gnulib_202401.bb
+++ b/meta-oe/recipes-support/gnulib/gnulib_202401.bb
@@ -16,7 +16,6 @@ SRCREV = "c99c8d491850dc3a6e0b8604a2729d8bc5c0eff1"
 SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=stable-${PV};protocol=https \
 "
 
-S = "${WORKDIR}/git"
 
 do_install () {
     install -d ${D}/${datadir}/gnulib
@@ -32,6 +31,5 @@ do_packagedata[noexec] = "1"
 deltask package_write_ipk
 deltask package_write_deb
 deltask package_write_rpm
-deltask do_deploy_archives 
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch
deleted file mode 100644
index 3017314abe..0000000000
--- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7f0e99af540a333108b92d792923ec7fc9e9fad9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 28 May 2024 20:14:54 -0700
-Subject: [PATCH] cycleclock: Fix type conversion to match function return type
- (#1794)
-
-fixes build with clang19
-
-src/cycleclock.h:208:52: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long long') to 'int64_t' (aka 'long long') [-Werror,-Wsign-conversion]
-  208 |   return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo;
-      |   ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~
-1 error generated.
-
-Upstream-Status: Backport [https://github.com/google/benchmark/commit/7f0e99af540a333108b92d792923ec7fc9e9fad9]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/cycleclock.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/cycleclock.h b/src/cycleclock.h
-index a25843760..c657414e5 100644
---- a/src/cycleclock.h
-+++ b/src/cycleclock.h
-@@ -205,7 +205,8 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
-       "sub %0, zero, %0\n"
-       "and %1, %1, %0\n"
-       : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1));
--  return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo;
-+  return static_cast<int64_t>((static_cast<uint64_t>(cycles_hi1) << 32) |
-+                              cycles_lo);
- #else
-   uint64_t cycles;
-   asm volatile("rdtime %0" : "=r"(cycles));
diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch
deleted file mode 100644
index cc22a7e8a9..0000000000
--- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 54bca09aca6ccec41f852cb1f834463bc51290d0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 10 Jun 2024 21:45:22 -0700
-Subject: [PATCH] cycleclock: Fix type conversion to match function return type
- on riscv64
-
-Fixes builds with clang
-
-src/cycleclock.h:213:10: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long') to 'int64_t' (aka 'long') [-Werror,-Wsign-conversion]
-     213 |   return cycles;
-         |   ~~~~~~ ^~~~~~
-   1 error generated.
-
-Upstream-Status: Submitted [https://github.com/google/benchmark/pull/1802]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/cycleclock.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cycleclock.h b/src/cycleclock.h
-index c657414..bd62f5d 100644
---- a/src/cycleclock.h
-+++ b/src/cycleclock.h
-@@ -210,7 +210,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
- #else
-   uint64_t cycles;
-   asm volatile("rdtime %0" : "=r"(cycles));
--  return cycles;
-+  return static_cast<int64_t>(cycles);
- #endif
- #elif defined(__e2k__) || defined(__elbrus__)
-   struct timeval tv;
diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.4.bb
index 706862f24a..4558aa13d6 100644
--- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb
+++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.4.bb
@@ -4,12 +4,9 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main \
-           file://0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch \
-           file://0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch"
-SRCREV = "a4cf155615c63e019ae549e31703bf367df5b471"
+SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "eddb0241389718a23a42db6af5f0164b6e0139af"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = " \
     -DBUILD_SHARED_LIBS=yes \
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch
deleted file mode 100644
index 2ea54e48c9..0000000000
--- a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 06605158852f9364519391fa11070ba5ec4303e9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 2 Sep 2017 08:07:17 -0700
-Subject: [PATCH] disbale heap checkers and debug allocator on musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 68fd51c..4cb71fe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,6 +53,8 @@ case "$host" in
-              need_nanosleep=no;;
-    *-cygwin*) default_enable_cpu_profiler=no;;
-    *-linux*) default_enable_heap_checker=yes; heap_checker_supported=yes;;
-+   *-musl*) default_enable_heap_checker=no; default_enable_heap_profiler=no;
-+            default_enable_debugalloc=no; default_enable_libunwind=no;
- esac
- 
- # Currently only backtrace works on s390 and OSX.
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch
deleted file mode 100644
index 1142df0be9..0000000000
--- a/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From d675808d300278a9e7143428cfecf3fda61cc9a2 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Thu, 21 Mar 2024 10:59:29 +0000
-Subject: [PATCH] src/mmap_hook.cc: Fix build for 32bit machine
-
-Fixed build error on 32bit machine:
-
-../git/src/mmap_hook.cc:309:31: error: static assertion failed
- 309 | static_assert(sizeof(int32_t) == sizeof(off_t), "");
-
-This is because oe's off_t is 64bit on both 32 and 64bit system, which is the
-default value of glibc, so the assertion would be failed on 32bit system, and
-remove mmap() and mmap64() to fix the redefined error.
-
-Upstream-Status: Inappropriate [OE-Specific]
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- src/mmap_hook.cc | 22 ----------------------
- 1 file changed, 22 deletions(-)
-
-diff --git a/src/mmap_hook.cc b/src/mmap_hook.cc
-index 0a0f62f..27425e4 100644
---- a/src/mmap_hook.cc
-+++ b/src/mmap_hook.cc
-@@ -302,30 +302,8 @@ void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t off) _
- 
- #define HOOKED_MMAP
- 
--#elif defined(DEFINED_DO_MMAP) && defined(__linux__) && !GOOD_LINUX_SYSTEM
--// Linuxes with 32-bit off_t. We're being careful with mmap64 being
--// 64-bit and mmap being 32-bit.
--
--static_assert(sizeof(int32_t) == sizeof(off_t), "");
--
--extern "C" void* mmap64(void* start, size_t length, int prot, int flags, int fd, int64_t off)
--  __THROW ATTRIBUTE_SECTION(malloc_hook);
--extern "C" void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t off)
--  __THROW ATTRIBUTE_SECTION(malloc_hook);
--
--void* mmap(void *start, size_t length, int prot, int flags, int fd, off_t off) __THROW {
--  return do_mmap_with_hooks(start, length, prot, flags, fd, off);
--}
--
--void* mmap64(void *start, size_t length, int prot, int flags, int fd, int64_t off) __THROW {
--  return do_mmap_with_hooks(start, length, prot, flags, fd, off);
--}
--
--#define HOOKED_MMAP
--
- #endif  // Linux/32-bit off_t case
- 
--
- #ifdef HOOKED_MMAP
- 
- extern "C" int munmap(void* start, size_t length) __THROW ATTRIBUTE_SECTION(malloc_hook);
--- 
-2.35.5
-
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0002-src-base-elf_mem_image.cc-fix-build-for-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/0002-src-base-elf_mem_image.cc-fix-build-for-musl.patch
new file mode 100644
index 0000000000..eae71be8fc
--- /dev/null
+++ b/meta-oe/recipes-support/gperftools/gperftools/0002-src-base-elf_mem_image.cc-fix-build-for-musl.patch
@@ -0,0 +1,35 @@
+From 02ff9fcc74ba64aeb22fcc553f30657bd2b62930 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Wed, 26 Feb 2025 23:46:56 -0800
+Subject: [PATCH 2/3] src/base/elf_mem_image.cc: fix build for musl
+
+Include header file for musl to avoid error below:
+
+  error: '__WORDSIZE' was not declared in this scope
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ src/base/elf_mem_image.cc | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/base/elf_mem_image.cc b/src/base/elf_mem_image.cc
+index d2ca1a5..89dc0e4 100644
+--- a/src/base/elf_mem_image.cc
++++ b/src/base/elf_mem_image.cc
+@@ -38,6 +38,11 @@
+ 
+ #ifdef HAVE_ELF_MEM_IMAGE  // defined in elf_mem_image.h
+ 
++// for musl __WORDSIZE definition
++#if !defined(__GLIBC__)
++#include <sys/reg.h>
++#endif
++
+ #include <stddef.h>   // for size_t, ptrdiff_t
+ #include "base/logging.h"
+ 
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0003-Makefile.am-disable-building-noinst-tests-for-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/0003-Makefile.am-disable-building-noinst-tests-for-musl.patch
new file mode 100644
index 0000000000..01ecdd5336
--- /dev/null
+++ b/meta-oe/recipes-support/gperftools/gperftools/0003-Makefile.am-disable-building-noinst-tests-for-musl.patch
@@ -0,0 +1,32 @@
+From 3bb5707c6a6a0d2061c79c556cbe4a87efea02ab Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Thu, 27 Feb 2025 00:44:34 -0800
+Subject: [PATCH 3/3] Makefile.am: disable building noinst tests for musl
+
+Build fails for musl + qemuppc64 about ld failing to find
+symbols in libucontext. Until a real solution is found,
+we need this workaround.
+
+Upstream-Status: Inappropriate [OE Specific]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 9fa24c0..7dd1b60 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -938,7 +938,7 @@ endif WITH_HEAP_PROFILER_OR_CHECKER
+ # This should always include $(TESTS), but may also include other
+ # binaries that you compile but don't want automatically installed.
+ # We'll add to this later, on a library-by-library basis
+-noinst_PROGRAMS += $(TESTS)
++#noinst_PROGRAMS += $(TESTS)
+ 
+ # http://linux.die.net/man/1/pkg-config, http://pkg-config.freedesktop.org/wiki
+ pkgconfigdir = $(libdir)/pkgconfig
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch b/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch
deleted file mode 100644
index 15eacc8993..0000000000
--- a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 564f800e3e24647c095f7a321bf3ebdccfbf762d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 2 Sep 2017 12:02:04 -0700
-Subject: [PATCH] Disable libunwind on aarch64
-
-Fixes hangs when using libtcmalloc.so
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- configure.ac | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,6 +76,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [re
-                   [default_enable_libunwind=yes
-                    default_tcmalloc_pagesize=8])
- 
-+# Disable libunwind linking on aarch64 by default.
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [return __aarch64__])],
-+                  [default_enable_libunwind=no],
-+                  [default_enable_libunwind=yes])
-+
- AC_ARG_ENABLE([cpu-profiler],
-               [AS_HELP_STRING([--disable-cpu-profiler],
-                               [do not build the cpu profiler])],
diff --git a/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch
index 800fa3a84f..e5061840bc 100644
--- a/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch
+++ b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch
@@ -1,20 +1,21 @@
-From 328805fd16930deefda400a77e9c2c5d17d04d29 Mon Sep 17 00:00:00 2001
+From 1526be49b8c49719459ef15c93090fdbdc10f3cb Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 13 Mar 2021 00:42:25 -0800
-Subject: [PATCH] Compatibility fixes for musl.
+Subject: [PATCH 1/3] Compatibility fixes for musl.
 
----
 Upstream-Status: Pending
 
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
  src/getpc.h                        | 4 ++++
  src/stacktrace_powerpc-linux-inl.h | 8 ++++++--
  2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/src/getpc.h b/src/getpc.h
-index 87d18b6..c569731 100644
+index c14c9d0..cf4866b 100644
 --- a/src/getpc.h
 +++ b/src/getpc.h
-@@ -68,6 +68,10 @@
+@@ -61,6 +61,10 @@
  typedef ucontext ucontext_t;
  #endif
  
@@ -59,3 +60,6 @@ index 883e7d2..212bd25 100644
        }
  #endif
  
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.15.bb b/meta-oe/recipes-support/gperftools/gperftools_2.16.bb
index bd3b2afaea..c0fe586f6d 100644
--- a/meta-oe/recipes-support/gperftools/gperftools_2.15.bb
+++ b/meta-oe/recipes-support/gperftools/gperftools_2.16.bb
@@ -10,18 +10,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"
 
 DEPENDS:append:libc-musl = " libucontext"
 
-SRCREV = "365060c4213a48adb27f63d5dfad41b3dfbdd62e"
-SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https \
-           file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \
-           file://disable_libunwind_aarch64.patch \
-           file://0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch \
-           "
+SRCREV = "e1014dead2029b341d06027b4f2b5562d799d5b1"
+SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https"
 
-SRC_URI:append:libc-musl = " file://ppc-musl.patch"
+SRC_URI:append:libc-musl = " \
+        file://ppc-musl.patch \
+        file://0002-src-base-elf_mem_image.cc-fix-build-for-musl.patch \
+        file://0003-Makefile.am-disable-building-noinst-tests-for-musl.patch \
+        "
 
 inherit autotools
 
-S = "${WORKDIR}/git"
 
 # On mips, we have the following error.
 #   do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008
diff --git a/meta-oe/recipes-support/gpm/gpm/0001-Avoid-shadowing-ncurses-functions.patch b/meta-oe/recipes-support/gpm/gpm/0001-Avoid-shadowing-ncurses-functions.patch
new file mode 100644
index 0000000000..ad10c9848c
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm/0001-Avoid-shadowing-ncurses-functions.patch
@@ -0,0 +1,234 @@
+From 8acd38879bcdeb34700ab1989e0dd6245af04706 Mon Sep 17 00:00:00 2001
+From: NHOrus <jy6x2b32pie9@yahoo.com>
+Date: Tue, 11 Feb 2025 18:42:47 +0400
+Subject: [PATCH 1/3] Avoid shadowing ncurses functions. This fails with GCC-15
+ and other compilers implementing C23 Added prefix gpm_ to raw() and noraw()
+ used in two files because they are implemented in same two files, and are
+ static. Same with scr_dump() and src_restore() in yacc source file
+
+Upstream-Status: Submitted [https://github.com/telmich/gpm/pull/49]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/prog/gpm-root.y   | 10 +++++-----
+ src/prog/hltest.c     | 11 +++++------
+ src/prog/mouse-test.c | 24 ++++++++++++------------
+ 3 files changed, 22 insertions(+), 23 deletions(-)
+
+diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
+index 76c896c..800e51b 100644
+--- a/src/prog/gpm-root.y
++++ b/src/prog/gpm-root.y
+@@ -941,7 +941,7 @@ static unsigned short clear_sel_args[6]={0, 0,0, 0,0, 4};
+ static unsigned char *clear_sel_arg= (unsigned char *)clear_sel_args+1;
+ 
+ /*------------*/
+-static inline void scr_dump(int fd, FILE *f, unsigned char *buffer, int vc)
++static inline void gpm_scr_dump(int fd, FILE *f, unsigned char *buffer, int vc)
+ {
+    int dumpfd;
+    char dumpname[20];
+@@ -960,7 +960,7 @@ static inline void scr_dump(int fd, FILE *f, unsigned char *buffer, int vc)
+ }
+ 
+ /*------------*/
+-static inline void scr_restore(int fd, FILE *f, unsigned char *buffer, int vc)
++static inline void gpm_scr_restore(int fd, FILE *f, unsigned char *buffer, int vc)
+ {
+    int dumpfd;
+    char dumpname[20];
+@@ -1002,7 +1002,7 @@ Posted *postmenu(int fd, FILE *f, Draw *draw, int x, int y, int console)
+    if (!new) return NULL;
+    new->draw=draw;
+    new->dump=dump=malloc(opt_buf);
+-   scr_dump(fd,f,dump,console);
++   gpm_scr_dump(fd,f,dump,console);
+    lines=dump[0]; columns=dump[1];
+    i=(columns*dump[3]+dump[2])*2+1; /* where to get it */
+    if (i<0) i=1;
+@@ -1060,7 +1060,7 @@ Posted *postmenu(int fd, FILE *f, Draw *draw, int x, int y, int console)
+    for (i=0; i<draw->width; i++) PUTC(HORLINE,draw->bord,draw->back);
+    PUTC(LRCORNER,draw->bord,draw->back);
+ 
+-   scr_restore(fd,f,dump,console);
++   gpm_scr_restore(fd,f,dump,console);
+    free(dump);
+ 
+ #undef PUTC
+@@ -1077,7 +1077,7 @@ Posted *unpostmenu(int fd, FILE *f, Posted *which, int vc)
+ {
+    Posted *prev=which->prev;
+ 
+-   scr_restore(fd,f,which->dump, vc);
++   gpm_scr_restore(fd,f,which->dump, vc);
+    ioctl(fd,TCXONC,TCOON); /* activate the console */  
+    free(which->dump);
+    free(which);
+diff --git a/src/prog/hltest.c b/src/prog/hltest.c
+index cce0abc..a916873 100644
+--- a/src/prog/hltest.c
++++ b/src/prog/hltest.c
+@@ -80,7 +80,6 @@ int wid,hei,vcsize;
+ unsigned short clear_sel_args[6]={0, 0,0, 0,0, 4};
+ unsigned char *clear_sel_arg= (unsigned char *)clear_sel_args+1;
+ 
+-
+ static inline int scrdump(char *buf)
+ {
+    clear_sel_arg[0]=2;  /* clear_selection */
+@@ -99,7 +98,7 @@ static inline int scrrestore(char *buf)
+ 
+ 
+ /* I don't like curses, so I'm doing low level stuff here */
+-static void raw(void)
++static void gpm_raw(void)
+ {
+ struct termios it;
+ 
+@@ -115,7 +114,7 @@ tcsetattr(fileno(stdin),TCSANOW,&it);
+ 
+ }
+ 
+-static void noraw(void)
++static void gpm_noraw(void)
+ {
+ struct termios it;
+ 
+@@ -136,7 +135,7 @@ void killed(int signo)
+ {
+    CLEAR;
+    fprintf(stderr,"hltest: killed by signal %i\r\n",signo);
+-   noraw();
++   gpm_noraw();
+    exit(0);
+ }
+ 
+@@ -525,7 +524,7 @@ int main(int argc, char **argv)
+    gpm_roi_handler=xhandler;
+    gpm_roi_data=NULL;
+ 
+-   raw();
++   gpm_raw();
+    newmsg(0,NULL); /* init data structures */
+    while((c=Gpm_Getchar())!=EOF) {
+       char s[32];
+@@ -538,6 +537,6 @@ int main(int argc, char **argv)
+    newmsg(roi ? ((WinInfo *)roi->clientdata)->number : 0,s);
+    }
+ 
+-   noraw();
++   gpm_noraw();
+    exit(0);
+ }
+diff --git a/src/prog/mouse-test.c b/src/prog/mouse-test.c
+index d7d1027..0db3560 100644
+--- a/src/prog/mouse-test.c
++++ b/src/prog/mouse-test.c
+@@ -106,7 +106,7 @@ return 0;
+ /*----------------------------------------------------------------------------- 
+    Place the description here.
+  -----------------------------------------------------------------------------*/
+-static void raw(void)
++static void gpm_raw(void)
+ {
+    struct termios it;
+ 
+@@ -125,7 +125,7 @@ static void raw(void)
+ /*----------------------------------------------------------------------------- 
+    Place the description here.
+  -----------------------------------------------------------------------------*/
+-static void noraw(void)
++static void gpm_noraw(void)
+ {
+    struct termios it;
+ 
+@@ -144,7 +144,7 @@ static void noraw(void)
+ void killed(int signo)
+ {
+    fprintf(stderr,"mouse-test: killed by signal %i\r\n",signo);
+-   noraw();
++   gpm_noraw();
+    exit(0);
+ }
+ 
+@@ -196,7 +196,7 @@ int mousereopen(int oldfd, const char *name, Gpm_Type *type)
+ 
+ int noneofthem(void)
+ {
+-   noraw();
++   gpm_noraw();
+    printf("\n\nSomething went wrong, I didn't manage to detect your"
+         "protocol\n\nFeel free to report your problems to the author\n");
+    exit(1);
+@@ -336,7 +336,7 @@ int main(int argc, char **argv)
+    I_serial=mice->init; /* the first one has I_serial */
+ 
+    signal(SIGINT,killed);   /* control-C kills us */
+-   raw();
++   gpm_raw();
+ 
+ /*====================================== First of all, detect the device */
+ 
+@@ -568,7 +568,7 @@ int main(int argc, char **argv)
+    /* why checking and not using return value ??? */
+    CHECKFAIL(typecount);
+    if (typecount==1) {
+-      noraw();
++      gpm_noraw();
+       printf("\n\n\nWell, it seems like your mouse is already detected:\n"
+       "it is on the device \"%s\", and speaks the protocol \"%s\"\n",
+       mousename,list->this->name);
+@@ -587,7 +587,7 @@ int main(int argc, char **argv)
+    } while(i!='y' && i!='n');
+ 
+    if (i=='n') {
+-      noraw();
++      gpm_noraw();
+       printf("\nThen, you should use the \"bare\" protocol on \"%s\"\n",
+           mousename);
+       exit(0);
+@@ -634,7 +634,7 @@ int main(int argc, char **argv)
+    for (pending=0,i=0;i<got-16;i++)
+       if(!memcmp(buf+i,buf+i+8,8)) pending++;
+    if (pending > 3) {
+-      noraw();
++      gpm_noraw();
+       printf("\nYour mouse seems to be a 'mman' one  on \"%s\" (%i matches)\n",
+           mousename,pending);
+       exit(0);
+@@ -660,7 +660,7 @@ int main(int argc, char **argv)
+          continue;
+       }
+           if (pending>3) {
+-             noraw();
++             gpm_noraw();
+              printf("\nYour mouse seems to be a '%s' one on \"%s\" (%i matches)\n",
+                   cur->this->name,mousename,pending);
+              exit(0);
+@@ -695,7 +695,7 @@ int main(int argc, char **argv)
+          for (pending=0,i=0;i<got-20;i++)
+             if(!memcmp(buf+i,buf+i+10,10)) pending++;
+          if (pending>3) {
+-            noraw();
++            gpm_noraw();
+             printf("\nYour mouse becomes a 3-buttons ('-t msc') one when\n"
+                 "gpm gets '-o %s' on it command line, and X gets\n"
+                 "%s in XF86Config\nThe device is \"%s\"",
+@@ -726,7 +726,7 @@ int main(int argc, char **argv)
+    for (pending=0,i=0;i<got-20;i++)
+       if(!memcmp(buf+i,buf+i+10,10)) pending++;
+    if (pending>3) {
+-      noraw();
++      gpm_noraw();
+       printf("\nWorked. You should keep the button pressed every time the\n"
+           "computer boots, and run gpm in '-R' mode in order to ignore\n"
+           "such hassle when starting X\n\nStill better, but a better mouse\n"
+@@ -734,7 +734,7 @@ int main(int argc, char **argv)
+ 
+       exit(0);
+    }
+-   noraw();
++   gpm_noraw();
+    printf("\nI'm lost. Can't tell you how to use your middle button\n");
+    return 0;
+ }
+
diff --git a/meta-oe/recipes-support/gpm/gpm/0002-Fix-function-definition-in-yacc-source-file-until-va.patch b/meta-oe/recipes-support/gpm/gpm/0002-Fix-function-definition-in-yacc-source-file-until-va.patch
new file mode 100644
index 0000000000..4534de9be4
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm/0002-Fix-function-definition-in-yacc-source-file-until-va.patch
@@ -0,0 +1,81 @@
+From 155873ed357a94f06e7e7032e27acba58bba8214 Mon Sep 17 00:00:00 2001
+From: NHOrus <jy6x2b32pie9@yahoo.com>
+Date: Tue, 11 Feb 2025 19:01:48 +0400
+Subject: [PATCH 2/3] Fix function definition in yacc source file until valid
+ C23. Fill empty argument lists with values. Add 0 as third argument for
+ two-argument function, it will be ignored at call site.
+
+Upstream-Status: Submitted [https://github.com/telmich/gpm/pull/49]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/prog/gpm-root.y | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
+index 800e51b..f06872c 100644
+--- a/src/prog/gpm-root.y
++++ b/src/prog/gpm-root.y
+@@ -128,7 +128,7 @@ typedef struct DrawItem {
+    char *name;
+    char *arg;   /* a cmd string */
+    void *clientdata;  /* a (Draw *) for menus or whatever   */
+-   int (*fun)();
++   int (*fun)(int, struct DrawItem *, int);
+    struct DrawItem *next;
+ } DrawItem;
+ 
+@@ -159,7 +159,7 @@ int yyerror(char *s);
+ int yylex(void);
+ 
+ DrawItem *cfg_cat(DrawItem *, DrawItem *);
+-DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(), void *detail);
++DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(int,  DrawItem *, int), void *detail);
+ 
+ 
+ /*===================================================================*
+@@ -195,7 +195,7 @@ int f_pipe(int mode, DrawItem *self, int uid);
+       char *string;
+       Draw *draw;
+       DrawItem *item;
+-      int (*fun)();
++      int (*fun)(int,  DrawItem *, int);
+       }
+ 
+ %token <string> T_STRING
+@@ -284,7 +284,7 @@ struct tokenName tokenList[] = {
+ struct funcName {
+    char *name;
+    int token;
+-   int (*fun)();
++   int (*fun)(int,  DrawItem *, int);
+    };
+ struct funcName funcList[] = {
+    {"f.debug",T_FUNC,f_debug},
+@@ -390,7 +390,7 @@ Draw *cfg_alloc(void)
+ 
+ /*---------------------------------------------------------------------*/
+ /* malloc an empty DrawItem and fill it */
+-DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(), void *detail)
++DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(int,  DrawItem *, int), void *detail)
+ {
+    DrawItem *new=calloc(1,sizeof(DrawItem));
+ 
+@@ -405,7 +405,7 @@ DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(), void *detail)
+ 
+       case 'F': /* a function without args */
+          new->fun=fun;
+-         if (fun) fun(F_CREATE,new);
++         if (fun) fun(F_CREATE,new,0);
+          break;
+ 
+       case 'M':
+@@ -1047,7 +1047,7 @@ Posted *postmenu(int fd, FILE *f, Draw *draw, int x, int y, int console)
+    }
+    /* sides and items */
+    for (item=draw->menu; y++, item; item=item->next) {
+-         if (item->fun) (*(item->fun))(F_POST,item);
++         if (item->fun) (*(item->fun))(F_POST,item,0);
+          GOTO(x,y); PUTC(VERLINE,draw->bord,draw->back);
+          for (i=0;i<item->pad;i++) PUTC(' ',draw->fore,draw->back);
+          PUTS(item->name,draw->fore,draw->back); i+=strlen(item->name);
+
diff --git a/meta-oe/recipes-support/gpm/gpm/0003-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch b/meta-oe/recipes-support/gpm/gpm/0003-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch
new file mode 100644
index 0000000000..0913c809c8
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm/0003-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch
@@ -0,0 +1,37 @@
+From d8224863233ae64310a1ee91b9f4e77daf9cfd10 Mon Sep 17 00:00:00 2001
+From: NHOrus <jy6x2b32pie9@yahoo.com>
+Date: Sat, 22 Feb 2025 01:12:32 +0400
+Subject: [PATCH 3/3] Add incomplete type definition for WINDOW in Gpm_Wgetch()
+
+Window handle is an opaque pointer that Gpm_Wgetch() passes
+through straight to ncurses if it's not null and calls getch
+if it's null. Code doesn't care what's inside the handle
+as long as it agrees with curses definition.
+
+Upstream-Status: Submitted [https://github.com/telmich/gpm/pull/49]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ src/headers/gpm.h | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/headers/gpm.h b/src/headers/gpm.h
+index fe52e53..b944d4b 100644
+--- a/src/headers/gpm.h
++++ b/src/headers/gpm.h
+@@ -268,7 +268,14 @@ Gpm_Roi * Gpm_LowerRoi(Gpm_Roi *which, Gpm_Roi *after);
+ /* libcurses.c */
+ /* #include <curses.h>  Hmm... seems risky */
+ 
+-extern int Gpm_Wgetch();
++/* Window handle is an opaque pointer that Gpm_Wgetch()
++ * passes through to ncurses if it's not null and calls getch
++ * if it's null. Code doesn't care what's inside the handle
++ * as long as it agrees with curses definition.
++*/
++typedef struct _win_st WINDOW;
++
++extern int Gpm_Wgetch(WINDOW *);
+ #define Gpm_Getch() (Gpm_Wgetch(NULL))
+ 
+ /* libxtra.c */
+
diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb
index 25e5414a35..155e56bdef 100644
--- a/meta-oe/recipes-support/gpm/gpm_git.bb
+++ b/meta-oe/recipes-support/gpm/gpm_git.bb
@@ -15,15 +15,21 @@ DEPENDS = "ncurses bison-native"
 SRC_URI = "git://github.com/telmich/gpm;protocol=https;branch=master \
            file://init \
            file://gpm.service.in \
+           file://0001-Avoid-shadowing-ncurses-functions.patch \
+           file://0002-Fix-function-definition-in-yacc-source-file-until-va.patch \
+           file://0003-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep update-rc.d systemd texinfo
 
 INITSCRIPT_NAME = "gpm"
 INITSCRIPT_PARAMS = "defaults"
 
+# Avoid line statements with bison/yacc
+# ERROR: lib32-gpm-1.99.7+gite82d1a653ca94aa4ed12441424da6ce780b1e530-r0 do_package_qa: QA Issue: File /usr/src/debug/lib32-gpm/1.99.7+gite82d1a653ca94aa4ed12441424da6ce780b1e530/src/prog/gpm-root.c in package lib32-gpm-src contains reference to TMPDIR [buildpaths]
+EXTRA_OEMAKE = "YFLAGS='-l'"
+
 do_configure:prepend() {
     (cd ${S};./autogen.sh;cd -)
 }
diff --git a/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb
index c82b529f96..c0eb3e02d8 100644
--- a/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb
+++ b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb
@@ -18,9 +18,9 @@ SRC_URI = "http://grsecurity.net/stable/${BP}.tar.gz \
            "
 SRC_URI[sha256sum] = "2459290f367a47c8a1ce4ea2ec08359799ea33dc15ed4436439596ce88284fb9"
 
-S = "${WORKDIR}/gradm"
+UPSTREAM_CHECK_URI = "https://grsecurity.net/download"
 
-inherit autotools-brokensep
+S = "${UNPACKDIR}/gradm"
 
 do_compile() {
     oe_runmake 'CC=${CC}'                               \
diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb
index 5528e87e6c..0956eb121c 100644
--- a/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb
+++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb
@@ -13,7 +13,7 @@ inherit autotools
 
 BBCLASSEXTEND = "native"
 
-S = "${WORKDIR}/${BPN}-2.8"
+S = "${UNPACKDIR}/${BPN}-2.8"
 
 EXTRA_OECONF += "--enable-ipv6 --enable-c-locale"
 PARALLEL_MAKE = ""
diff --git a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
index 75feccb87c..5930a8c95c 100644
--- a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
+++ b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
@@ -15,7 +15,6 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/hddtemp/hddtemp-0.3-beta15.tar.bz2 \
            file://init \
 "
 
-SRC_URI[md5sum] = "8b829339e1ae9df701684ec239021bb8"
 SRC_URI[sha256sum] = "618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b"
 
 LIC_FILES_CHKSUM = "file://GPL-2;md5=eb723b61539feef013de476e68b5c50a"
diff --git a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch
index 68d9c3a3cf..0d016ccb4c 100644
--- a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch
+++ b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch
@@ -1,6 +1,6 @@
-From 4fa437782261c0da785d4574ad3a03700f624e66 Mon Sep 17 00:00:00 2001
+From 9f5afd99cce93e68996deb2b5fa7c32737d279fe Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
-Date: Tue, 19 Sep 2023 02:56:09 +0000
+Date: Tue, 16 Jul 2024 17:54:29 +0800
 Subject: [PATCH] cmake: remove build flags
 
 Don't generate the build host related info and reemove the build flags
@@ -11,11 +11,10 @@ Upstream-Status: Inappropriate [oe specific]
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
  config/cmake/libhdf5.settings.cmake.in | 18 +++++++++---------
- src/H5make_libsettings.c               | 17 -----------------
- 2 files changed, 9 insertions(+), 26 deletions(-)
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
-index f60f0de..f4433c0 100644
+index deb07ed..6f255c4 100644
 --- a/config/cmake/libhdf5.settings.cmake.in
 +++ b/config/cmake/libhdf5.settings.cmake.in
 @@ -23,23 +23,23 @@ Linking Options:
@@ -28,7 +27,7 @@ index f60f0de..f4433c0 100644
                       AM_LDFLAGS: @AM_LDFLAGS@
                  Extra libraries: @LINK_LIBS@
 -                       Archiver: @CMAKE_AR@
--                       AR_FLAGS: 
+-                       AR_FLAGS:
 -                         Ranlib: @CMAKE_RANLIB@
 +                       Archiver:
 +                       AR_FLAGS:
@@ -63,34 +62,6 @@ index f60f0de..f4433c0 100644
                     H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
                     AM C++ Flags: @AM_CXXFLAGS@
               Shared C++ Library: @H5_ENABLE_SHARED_LIB@
-diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c
-index 2661288..7c0f84f 100644
---- a/src/H5make_libsettings.c
-+++ b/src/H5make_libsettings.c
-@@ -205,23 +205,6 @@ information about the library build configuration\n";
-     fprintf(rawoutstream, "/* Generated automatically by H5make_libsettings -- do not edit */\n\n\n");
-     fputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */
- 
--    fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday,
--            1900 + tm->tm_year);
--    if (pwd || real_name[0] || host_name[0]) {
--        fprintf(rawoutstream, " *\t\t\t");
--        if (real_name[0])
--            fprintf(rawoutstream, "%s <", real_name);
--#ifdef H5_HAVE_GETPWUID
--        if (pwd)
--            fputs(pwd->pw_name, rawoutstream);
--#endif
--        if (host_name[0])
--            fprintf(rawoutstream, "@%s", host_name);
--        if (real_name[0])
--            fprintf(rawoutstream, ">");
--        fputc('\n', rawoutstream);
--    }
--
-     fprintf(rawoutstream, " *\n * Purpose:\t\t");
- 
-     for (s = purpose; *s; s++) {
 -- 
-2.35.5
+2.25.1
 
diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb
index b8a81bb0b7..edaf5710e1 100644
--- a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb
+++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb
@@ -5,18 +5,18 @@ HOMEPAGE = "https://www.hdfgroup.org/"
 SECTION = "libs"
 
 LICENSE = "HDF5"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998"
+LIC_FILES_CHKSUM = "file://COPYING;md5=adebb1ecf1b3b80c13359e18ef67301e"
 
 inherit cmake siteinfo qemu multilib_header multilib_script
 
 DEPENDS += "qemu-native zlib"
 
 SRC_URI = " \
-    https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \
+    https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.4/src/${BPN}-${PV}.tar.gz \
     file://0002-Remove-suffix-shared-from-shared-library-name.patch \
     file://0001-cmake-remove-build-flags.patch \
 "
-SRC_URI[sha256sum] = "ea3c5e257ef322af5e77fc1e52ead3ad6bf3bb4ac06480dd17ee3900d7a24cfb"
+SRC_URI[sha256sum] = "019ac451d9e1cf89c0482ba2a06f07a46166caf23f60fea5ef3c37724a318e03"
 
 FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*"
 
@@ -37,6 +37,7 @@ $qemu_binary "\$@"
 EOF
         chmod +x ${WORKDIR}/qemuwrapper
 }
+gen_emu:class-native = ""
 
 do_unpack[postfuncs] += "gen_emu"
 
@@ -44,10 +45,13 @@ MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \
                      ${PN}:${bindir}/h5hlcc \
 "
 
+do_configure:append() {
+    sed -i -e 's|${WORKDIR}||g' ${B}/src/libhdf5.settings
+    sed -i -e 's|${WORKDIR}||g' ${B}/src/H5build_settings.c
+}
+
 do_install:append() {
     # Used for generating config files on target
-    install -m 755 ${B}/bin/H5detect ${D}${bindir}
-    install -m 755 ${B}/bin/H5make_libsettings ${D}${bindir}
     oe_multilib_header H5pubconf.h
     # remove the buildpath
     sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc
diff --git a/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb b/meta-oe/recipes-support/hidapi/hidapi_0.15.0.bb
index c7a487ba5c..7d2c87d02d 100644
--- a/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb
+++ b/meta-oe/recipes-support/hidapi/hidapi_0.15.0.bb
@@ -11,5 +11,4 @@ RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16"
 inherit autotools pkgconfig
 
 SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master"
-SRCREV = "d3013f0af3f4029d82872c1a9487ea461a56dee4"
-S = "${WORKDIR}/git"
+SRCREV = "d6b2a974608dec3b76fb1e36c189f22b9cf3650c"
diff --git a/meta-oe/recipes-support/hstr/hstr_3.1.0.bb b/meta-oe/recipes-support/hstr/hstr_3.1.0.bb
index a641feef6f..0ee900ca3d 100644
--- a/meta-oe/recipes-support/hstr/hstr_3.1.0.bb
+++ b/meta-oe/recipes-support/hstr/hstr_3.1.0.bb
@@ -10,7 +10,7 @@ SRC_URI = "https://github.com/dvorka/hstr/releases/download/3.1/hstr-${PV}-tarba
            file://0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch \
            file://0001-Use-OE-specific-checks-for-ncurses.patch"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 SRC_URI[sha256sum] = "4dabf61f045f022bac8bc909e5fd96041af6c53df56d97dfa3cfbf49af4453a5"
 
diff --git a/meta-oe/recipes-support/htop/htop_3.3.0.bb b/meta-oe/recipes-support/htop/htop_3.3.0.bb
index cd5b766f0f..efb89bf3ae 100644
--- a/meta-oe/recipes-support/htop/htop_3.3.0.bb
+++ b/meta-oe/recipes-support/htop/htop_3.3.0.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \
 "
 SRCREV = "68c970c7ef4a0682760ed570b3d82388ae7ccf54"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb
index 0ec426afb9..7f6fba995c 100644
--- a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb
+++ b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb
@@ -135,9 +135,11 @@ RDEPENDS:${PN} = "hunspell"
 
 PV = "0.0.0+git"
 SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee"
-SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=main;protocol=https"
+
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 do_install() {
     for LANGUAGE in `ls -d1 ${S}/dictionaries/*` ; do
diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb
index afe75472a5..67a51f5c9f 100644
--- a/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb
+++ b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = " \
 SRCREV = "2969be996acad84b91ab3875b1816636fe61a40e"
 SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gettext
 
diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.383.bb b/meta-oe/recipes-support/hwdata/hwdata_0.383.bb
deleted file mode 100644
index cfa6ae0e45..0000000000
--- a/meta-oe/recipes-support/hwdata/hwdata_0.383.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Hardware identification and configuration data"
-HOMEPAGE = "https://github.com/vcrhonek/hwdata"
-SECTION = "System/Base"
-
-LICENSE = "GPL-2.0-or-later | XFree86-1.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
-
-SRCREV = "229069b51b488bc776602d82315188cd1fbf4887"
-SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https"
-
-S = "${WORKDIR}/git"
-
-inherit allarch
-
-do_configure() {
-    ${S}/configure --datadir=${datadir} --libdir=${libdir}
-}
-
-do_compile[noexec] = "1"
-
-do_install() {
-    oe_runmake install DESTDIR=${D}
-}
-
-FILES:${PN} = "${libdir}/* \
-               ${datadir}/* "
diff --git a/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb
index 8218b08084..03eb7ccbf1 100644
--- a/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb
+++ b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb
@@ -13,5 +13,4 @@ PV = "1.0.1+git"
 SRCREV = "ecae6c6e8ca6b6bad080a1c73f10ffd0e67d75a7"
 SRC_URI = "git://github.com/libimobiledevice/idevicerestore;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch b/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch
deleted file mode 100644
index 41fccc3ab0..0000000000
--- a/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7136a908a056d0e36c89b6e1c39adff8ce2bb1d4 Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <armccurdy@gmail.com>
-Date: Wed, 1 Nov 2017 13:17:34 -0700
-Subject: [PATCH] avoid obsolete gnutls apis
-
-The gnutls_*_set_priority() family of functions was marked deprecated
-in gnutls 2.12.x and removed completely in 3.5.x. These functions
-have been superceded by gnutls_priority_set_direct(), which was added
-in gnutls 2.2.0 (released 2007-12-14).
-
-Rather than simply update the custom gnutls_*_set_priority() calls to
-use gnutls_priority_set_direct(), drop the custom priority selection
-completely and use the recommended approach of letting gnutls pick a
-reasonable set of defaults.
-
-Upstream-Status: Pending
-
-Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
----
- src/tls-gnutls.c | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/src/tls-gnutls.c b/src/tls-gnutls.c
-index d7b7c91..749e9ef 100644
---- a/src/tls-gnutls.c
-+++ b/src/tls-gnutls.c
-@@ -48,11 +48,6 @@ tls_pull (struct ikstls_data *data, char *buffer, size_t len)
- static int
- tls_handshake (struct ikstls_data **datap, ikstransport *trans, void *sock)
- {
--       const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
--       const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
--       const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
--       const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
--       const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
-        struct ikstls_data *data;
-        int ret;
- 
-@@ -81,11 +76,8 @@ tls_handshake (struct ikstls_data **datap, ikstransport *trans, void *sock)
-                return IKS_NOMEM;
-        }
- 
--       gnutls_protocol_set_priority (data->sess, protocol_priority);
--       gnutls_cipher_set_priority(data->sess, cipher_priority);
--       gnutls_compression_set_priority(data->sess, comp_priority);
--       gnutls_kx_set_priority(data->sess, kx_priority);
--       gnutls_mac_set_priority(data->sess, mac_priority);
-+       gnutls_set_default_priority (data->sess);
-+
-        gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred);
- 
-        gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push);
--- 
-1.9.1
-
diff --git a/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch b/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch
deleted file mode 100644
index 05accdd9c8..0000000000
--- a/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 17a5cf8f70b86d8a2195562e2d9dcccb4fa35c83 Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <armccurdy@gmail.com>
-Date: Tue, 31 Oct 2017 20:05:58 -0700
-Subject: [PATCH] fix configure option parsing
-
-Don't over-write with_openssl etc by trying to set to $enablevar
-
-Upstream-Status: Pending
-
-Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
----
- configure.ac | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 82e6d2d..823e6c1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,17 +56,17 @@ fi
- dnl Options for overriding TLS checks
- AC_ARG_WITH([openssl],
-   AS_HELP_STRING([--without-openssl],[disable checking for openssl]),
--  [with_openssl=$enableval],
--  [with_openssl=yes]
-+  [],
-+  [with_openssl=auto]
- )
- AC_ARG_WITH([gnutls],
-   AS_HELP_STRING([--without-gnutls],[disable checking for GNU TLS]),
--  [with_gnutls=$enableval],
--  [with_gnutls=yes]
-+  [],
-+  [with_gnutls=auto]
- )
- 
- dnl Check OpenSSL
--if test "x$with_openssl" = "xyes"; then
-+if test "x$with_openssl" != "xno"; then
-   PKG_CHECK_MODULES([OPENSSL], openssl >= 0.9.8, have_openssl=yes, have_openssl=no)
-   if test "x$have_openssl" = "xyes"; then
-     LIBOPENSSL_CFLAGS="$OPENSSL_CFLAGS"
-@@ -78,7 +78,7 @@ if test "x$with_openssl" = "xyes"; then
- fi
- 
- dnl Check GNU TLS
--if test "x$with_gnutls" = "xyes"; then
-+if test "x$with_gnutls" != "xno"; then
-   if test "x$have_openssl" != "xyes"; then
-     PKG_CHECK_MODULES([GNUTLS], gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no)
-     if test "x$have_gnutls" = "xyes"; then
-@@ -94,7 +94,7 @@ fi
- dnl Option for overriding Python check
- AC_ARG_ENABLE([python],
-   AS_HELP_STRING([--disable-python],[disable checking for Python bindings]),
--  [with_python=$enableval],
-+  [],
-   [with_python=yes]
- )
- 
--- 
-1.9.1
-
diff --git a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb
deleted file mode 100644
index 017e7d26a6..0000000000
--- a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Fast and portable XML parser and Jabber protocol library"
-HOMEPAGE = "https://github.com/meduketto/iksemel"
-SECTION = "libs"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
-
-SRCREV = "978b733462e41efd5db72bc9974cb3b0d1d5f6fa"
-PV = "1.5+git"
-
-SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https;branch=master \
-           file://fix-configure-option-parsing.patch \
-           file://avoid-obsolete-gnutls-apis.patch"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig lib_package texinfo
-
-# TLS support requires either openssl or gnutls (if both are enabled openssl will be used).
-PACKAGECONFIG ?= "gnutls"
-
-PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
-PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
-
-EXTRA_OECONF = "--disable-python"
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb
new file mode 100644
index 0000000000..10d2150998
--- /dev/null
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb
@@ -0,0 +1,183 @@
+SUMMARY = "ImageMagick is an image conversion toolkit"
+SECTION = "console/utils"
+HOMEPAGE = "https://www.imagemagick.org/"
+DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \
+editing raster and vector image files. It can read and write over 200 image file formats."
+LICENSE = "ImageMagick"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2f9de66264141265b203cde9902819ea \
+                    file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed"
+# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
+DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool"
+
+BASE_PV = "${@d.getVar('PV').split('-')[0]}"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>([0-9][\.|_|-]?)+)"
+
+SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https"
+SRCREV = "a2d96f40e707ba54b57e7d98c3277d3ea6611ace"
+
+
+inherit autotools pkgconfig update-alternatives
+export ac_cv_sys_file_offset_bits = "64"
+
+EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --enable-largefile"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} cxx webp xml"
+PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus"
+PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz"
+PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
+PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
+PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg"
+PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
+PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg"
+PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools"
+PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
+PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
+PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt"
+PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2"
+
+do_install:append:class-target() {
+    for file in MagickCore-config.im7 MagickWand-config.im7; do
+        sed -i 's,${STAGING_DIR_TARGET},,g' "${D}${bindir}/$file"
+    done
+
+    if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then
+        sed -i 's,${STAGING_DIR_TARGET},,g' "${D}${bindir}/Magick++-config.im7"
+    fi
+
+    if ${@bb.utils.contains('PACKAGECONFIG', 'xml', 'true', 'false', d)}; then
+        xml_config="${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml"
+        sed -i 's,${S},,g' "$xml_config"
+        sed -i 's,${B},,g' "$xml_config"
+        sed -i 's,${RECIPE_SYSROOT},,g' "$xml_config"
+    fi
+
+    if ${@bb.utils.contains_any('PACKAGECONFIG', 'webp openjpeg', 'true', 'false', d)}; then
+        sed -i 's,${HOSTTOOLS_DIR},${bindir},g' "${D}${sysconfdir}/ImageMagick-7/delegates.xml"
+    fi
+}
+
+FILES:${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \
+                ${datadir}/ImageMagick-7"
+
+FILES:${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a"
+
+FILES:${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*"
+
+BBCLASSEXTEND = "native nativesdk"
+
+ALTERNATIVE_PRIORITY = "100"
+
+ALTERNATIVE:${PN} = "animate compare composite conjure convert display \
+    identify import magick-script mogrify montage stream"
+
+ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7"
+ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im7"
+ALTERNATIVE_TARGET[composite] = "${bindir}/composite.im7"
+ALTERNATIVE_TARGET[conjure] = "${bindir}/conjure.im7"
+ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im7"
+ALTERNATIVE_TARGET[display] = "${bindir}/display.im7"
+ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im7"
+ALTERNATIVE_TARGET[import] = "${bindir}/import.im7"
+ALTERNATIVE_TARGET[magick-script] = "${bindir}/magick-script.im7"
+ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7"
+ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7"
+ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7"
+
+ALTERNATIVE:${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \
+    convert.1 display.1 identify.1 import.1 magick-script.1 mogrify.1 montage.1 stream.1"
+
+ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1"
+ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im7.1"
+ALTERNATIVE_LINK_NAME[compare.1] = "${mandir}/man1/compare.1"
+ALTERNATIVE_TARGET[compare.1] = "${mandir}/man1/compare.im7.1"
+ALTERNATIVE_LINK_NAME[composite.1] = "${mandir}/man1/composite.1"
+ALTERNATIVE_TARGET[composite.1] = "${mandir}/man1/composite.im7.1"
+ALTERNATIVE_LINK_NAME[conjure.1] = "${mandir}/man1/conjure.1"
+ALTERNATIVE_TARGET[conjure.1] = "${mandir}/man1/conjure.im7.1"
+ALTERNATIVE_LINK_NAME[convert.1] = "${mandir}/man1/convert.1"
+ALTERNATIVE_TARGET[convert.1] = "${mandir}/man1/convert.im7.1"
+ALTERNATIVE_LINK_NAME[display.1] = "${mandir}/man1/display.1"
+ALTERNATIVE_TARGET[display.1] = "${mandir}/man1/display.im7.1"
+ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1"
+ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im7.1"
+ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1"
+ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im7.1"
+ALTERNATIVE_LINK_NAME[magick-script.1] = "${mandir}/man1/magick-script.1"
+ALTERNATIVE_TARGET[magick-script.1] = "${mandir}/man1/magick-script.im7.1"
+ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1"
+ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im7.1"
+ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1"
+ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1"
+ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1"
+ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1"
+
+CVE_STATUS[CVE-2007-1667] = "cpe-incorrect: CVE should not include a CPE for imagemagick"
+CVE_STATUS[CVE-2014-9804] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9805] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9806] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9807] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9808] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9809] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9810] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9811] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9812] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9813] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9814] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9815] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9816] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9817] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9818] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9819] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9820] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9821] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9822] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9823] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9824] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9825] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9826] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9827] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9828] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9829] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9830] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9831] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9848] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9852] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9853] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9854] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2014-9907] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-10062] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-10"
+CVE_STATUS[CVE-2016-10144] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.7-1"
+CVE_STATUS[CVE-2016-10145] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.7-1"
+CVE_STATUS[CVE-2016-10146] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.6-8"
+CVE_STATUS[CVE-2016-5118] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-7"
+CVE_STATUS[CVE-2016-7513] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7514] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0"
+CVE_STATUS[CVE-2016-7515] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7516] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7517] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7518] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7519] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7520] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7521] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7522] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7523] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7524] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7525] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7526] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7527] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7528] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7529] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7530] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7531] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0"
+CVE_STATUS[CVE-2016-7532] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7533] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7534] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7535] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7536] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7537] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2016-7538] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
+CVE_STATUS[CVE-2017-5506] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4"
+CVE_STATUS[CVE-2017-5509] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4"
+CVE_STATUS[CVE-2017-5510] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4"
+CVE_STATUS[CVE-2017-5511] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-3"
+CVE_STATUS[CVE-2023-5341] = "fixed-version: this is fixed in 7.1.1-19"
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb
deleted file mode 100644
index 61dc1b795e..0000000000
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb
+++ /dev/null
@@ -1,121 +0,0 @@
-SUMMARY = "ImageMagick is an image conversion toolkit"
-SECTION = "console/utils"
-HOMEPAGE = "https://www.imagemagick.org/"
-DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \
-editing raster and vector image files. It can read and write over 200 image file formats."
-LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2f9de66264141265b203cde9902819ea \
-                    file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed"
-# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
-DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool"
-
-BASE_PV := "${PV}"
-PV .= "-26"
-SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https"
-SRCREV = "570a9a048bb0e3a5c221ca87be9408ae35f711e2"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig update-alternatives
-export ac_cv_sys_file_offset_bits="64"
-
-EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --enable-largefile"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} cxx webp xml"
-PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus"
-PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz"
-PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
-PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
-PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg"
-PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
-PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg"
-PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools"
-PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
-PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
-PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt"
-PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2"
-
-do_install:append:class-target() {
-    for file in MagickCore-config.im7 MagickWand-config.im7 Magick++-config.im7; do
-        sed -i 's,${STAGING_DIR_TARGET},,g' ${D}${bindir}/"$file"
-    done
-    sed -i 's,${S},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml
-    sed -i 's,${B},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml
-    sed -i 's,${RECIPE_SYSROOT},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml
-    sed -i 's,${HOSTTOOLS_DIR},${bindir},g' ${D}${sysconfdir}/ImageMagick-7/delegates.xml
-}
-
-FILES:${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \
-                ${datadir}/ImageMagick-7"
-
-FILES:${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a"
-
-FILES:${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*"
-
-BBCLASSEXTEND = "native nativesdk"
-
-ALTERNATIVE_PRIORITY = "100"
-
-ALTERNATIVE:${PN} = "animate compare composite conjure convert display \
-    identify import magick-script mogrify montage stream"
-
-ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7"
-ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im7"
-ALTERNATIVE_TARGET[composite] = "${bindir}/composite.im7"
-ALTERNATIVE_TARGET[conjure] = "${bindir}/conjure.im7"
-ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im7"
-ALTERNATIVE_TARGET[display] = "${bindir}/display.im7"
-ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im7"
-ALTERNATIVE_TARGET[import] = "${bindir}/import.im7"
-ALTERNATIVE_TARGET[magick-script] = "${bindir}/magick-script.im7"
-ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7"
-ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7"
-ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7"
-
-ALTERNATIVE:${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \
-    convert.1 display.1 identify.1 import.1 magick-script.1 mogrify.1 montage.1 stream.1"
-
-ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1"
-ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im7.1"
-ALTERNATIVE_LINK_NAME[compare.1] = "${mandir}/man1/compare.1"
-ALTERNATIVE_TARGET[compare.1] = "${mandir}/man1/compare.im7.1"
-ALTERNATIVE_LINK_NAME[composite.1] = "${mandir}/man1/composite.1"
-ALTERNATIVE_TARGET[composite.1] = "${mandir}/man1/composite.im7.1"
-ALTERNATIVE_LINK_NAME[conjure.1] = "${mandir}/man1/conjure.1"
-ALTERNATIVE_TARGET[conjure.1] = "${mandir}/man1/conjure.im7.1"
-ALTERNATIVE_LINK_NAME[convert.1] = "${mandir}/man1/convert.1"
-ALTERNATIVE_TARGET[convert.1] = "${mandir}/man1/convert.im7.1"
-ALTERNATIVE_LINK_NAME[display.1] = "${mandir}/man1/display.1"
-ALTERNATIVE_TARGET[display.1] = "${mandir}/man1/display.im7.1"
-ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1"
-ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im7.1"
-ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1"
-ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im7.1"
-ALTERNATIVE_LINK_NAME[magick-script.1] = "${mandir}/man1/magick-script.1"
-ALTERNATIVE_TARGET[magick-script.1] = "${mandir}/man1/magick-script.im7.1"
-ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1"
-ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im7.1"
-ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1"
-ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1"
-ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1"
-ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1"
-
-CVE_STATUS[CVE-2014-9804] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9805] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9806] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9807] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9808] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9809] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9810] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9811] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9812] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9813] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9814] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9815] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9816] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9817] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9818] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9819] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9820] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2014-9821] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
-CVE_STATUS[CVE-2016-7531] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0"
diff --git a/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.3.bb
index 422d96359c..f4905e3c0b 100644
--- a/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb
+++ b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.3.bb
@@ -3,13 +3,12 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f8d2fc4954306888fd0e4b27bef83525"
 
 # v2.7.6
-SRCREV = "9e6661278572009a92a8e125c9b339232a9735a1"
-SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master \
+SRCREV = "72f7fa621357299bb6c8f5d29b4efbafcbd34bf7"
+SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master;tag=v${PV} \
            file://ldflags.patch \
 "
-S = "${WORKDIR}/git"
 
-DEPENDS= "openssl lua libpcre2"
+DEPENDS = "openssl lua libpcre2"
 
 EXTRA_OEMAKE:append = " PREFIX=${prefix}"
 
diff --git a/meta-oe/recipes-support/imx-cst/imx-cst/0001-fix-missing-makefile-rule-dependency.patch b/meta-oe/recipes-support/imx-cst/imx-cst/0001-fix-missing-makefile-rule-dependency.patch
new file mode 100644
index 0000000000..ce7626ab31
--- /dev/null
+++ b/meta-oe/recipes-support/imx-cst/imx-cst/0001-fix-missing-makefile-rule-dependency.patch
@@ -0,0 +1,45 @@
+From 73509cb22ffab827dc3e3ccda2781683b8e8296d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
+Date: Mon, 2 Jun 2025 11:07:08 +0200
+Subject: [PATCH] fix missing makefile rule dependency
+
+During, the package build with an high CPU load we can face
+a build failed issue, caused by the header file cst_parser.h not present
+when compiling cst_lexer.c, which depend on cst_parser.h:
+| x86_64-poky-linux-gcc  ... -c cst_lexer.c -o cst_lexer.d
+| ../../code/front_end/src/cst_lexer.l:21:10: fatal error:
+|cst_parser.h: No such file or directory
+|    21 | #include "cst_parser.h"
+|       |          ^~~~~~~~~~~~~~
+| compilation terminated.
+
+The file cst_parser.h is generated during compilation
+by a makefile rule which also generate cst_parser.c
+
+To fix the issue, makefile rule needed to be update
+in order for compilation of cst_lexer.c to be done,
+always after the generation of cst_parser.h and .c
+
+Upstream-Status: Submitted [https://community.nxp.com/t5/Other-NXP-Products/Package-imx-code-signing-tool-3-4-0-dfsg-2-build-issue/m-p/2108575#M28853]
+
+Signed-off-by: Kelefa Sane <kelefa.sane@smile.fr>
+---
+ code/build/make/rules.mk | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/code/build/make/rules.mk b/code/build/make/rules.mk
+index 7720e4b..239108b 100644
+--- a/code/build/make/rules.mk
++++ b/code/build/make/rules.mk
+@@ -35,6 +35,11 @@ LFLAGS  := -t
+        @echo "Link $@"
+        $(LD) $^ $(LDFLAGS) -o $@
+ 
++# Compilation of cst_lexer.c require cst_parser.h 
++# (cst_lexer.c include cst_parser.h) which is generated
++# by the same makefile genrating cst_parser.c
++cst_lexer.o: cst_parser.c
++
+ %.o: %.c
+        @echo "Compile $@"
+        # generate dependency file
diff --git a/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb b/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb
new file mode 100644
index 0000000000..3b57f4ed81
--- /dev/null
+++ b/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb
@@ -0,0 +1,40 @@
+SUMMARY = "i.MX code signing tool"
+DESCRIPTION = "Code signing support that integrates the HABv4 and AHAB library for i.MX processors"
+LICENSE = "BSD-3-Clause & Apache-2.0"
+
+LIC_FILES_CHKSUM = "\
+    file://LICENSE.bsd3;md5=14aba05f9fa6c25527297c8aac95fcf6 \
+    file://LICENSE.hidapi;md5=e0ea014f523f64f0adb13409055ee59e \
+    file://LICENSE.openssl;md5=3441526b1df5cc01d812c7dfc218cea6 \
+"
+
+DEPENDS = "byacc-native flex-native openssl"
+
+# debian: 3.4.0+dfsg-2
+DEBIAN_PGK_NAME = "imx-code-signing-tool"
+DEBIAN_PGK_VERSION = "${PV}+dfsg"
+
+SRC_URI = "\
+    ${DEBIAN_MIRROR}/main/i/${DEBIAN_PGK_NAME}/${DEBIAN_PGK_NAME}_${DEBIAN_PGK_VERSION}.orig.tar.xz \
+    file://0001-fix-missing-makefile-rule-dependency.patch \
+"
+
+SRC_URI[sha256sum] = "52ee3cee3bc500a42095f73c4584e223b4b9d2dfc1cd3e5df965c5952eba8c8d"
+
+S = "${UNPACKDIR}/${DEBIAN_PGK_NAME}-${DEBIAN_PGK_VERSION}"
+
+EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" AR="${AR}" OBJCOPY="${OBJCOPY}"'
+
+do_compile() {
+    oe_runmake -C code/obj.linux64 OSTYPE=linux64 ENCRYPTION=yes COPTIONS="${CFLAGS} ${CPPFLAGS}" LDOPTIONS="${LDFLAGS}"
+    oe_runmake -C add-ons/hab_csf_parser COPTS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
+}
+
+do_install () {
+    install -d ${D}${bindir}
+    install -m 755 ${S}/code/obj.linux64/cst ${D}${bindir}/
+    install -m 755 ${S}/code/obj.linux64/srktool ${D}${bindir}
+    install -m 755 ${S}/add-ons/hab_csf_parser/csf_parser ${D}${bindir}
+}
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/inih/libinih_58.bb b/meta-oe/recipes-support/inih/libinih_58.bb
index 2bcf2b4bd4..0ebeec6851 100644
--- a/meta-oe/recipes-support/inih/libinih_58.bb
+++ b/meta-oe/recipes-support/inih/libinih_58.bb
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7a95d2af90376e85a05318794e6f202"
 
 SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 SRCREV = "5cc5e2c24642513aaa5b19126aad42d0e4e0923e"
 
 inherit meson pkgconfig
diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb b/meta-oe/recipes-support/iniparser/iniparser_4.2.6.bb
index 8c6c60a79a..9ab713ee92 100644
--- a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb
+++ b/meta-oe/recipes-support/iniparser/iniparser_4.2.6.bb
@@ -4,10 +4,9 @@ HOMEPAGE = "https://gitlab.com/iniparser/iniparser"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678"
 SRCBRANCH = "main"
-SRCREV = "762715ca6cdba9dcf31a5af9297b444f3b5b8c00"
+SRCREV = "4bef811283e0ec1658c60e09950bd5a1ddc92e4b"
 
 SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}"
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch
deleted file mode 100644
index 3b195aae4f..0000000000
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6a57ff26d695aaad096b798879a5dbc5af2cedf5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 20 Dec 2022 10:46:50 -0800
-Subject: [PATCH] configure: Add AC_SYS_LARGEFILE autoconf macro
-
-This will define _FILE_OFFSET_BITS to be 64 if off_t is 64bit
-and we do not need to define lfs64 functions
-
-Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index bddf14d..b89a266 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,6 +17,9 @@ AC_PROG_CC
- AM_INIT_AUTOMAKE
- LT_INIT
- 
-+# Add option for largefile support
-+AC_SYS_LARGEFILE
-+
- AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN)
- 
- AC_ARG_ENABLE(doxygen,
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch
deleted file mode 100644
index 931244830c..0000000000
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6c3ce01a281a9aa661494d24a862219fc9e2b460 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 16 Dec 2021 14:57:55 -0800
-Subject: [PATCH 2/2] libinotifytools: Bridge differences between
- musl/glibc/kernel fnotify.h
-
-System detects to use sys/fnotify.h and then assumes glibc's definitions
-but musl has definitions of its own. perhaps portable thing would be to
-use linux/fnotify.h interface directly on linux irrespective of libc
-
-See the differences discussion here [1]
-
-[1] https://inbox.vuxu.org/musl/20191112220151.GC27331@x230/T/#ma8700992467200c8792e0fa8508eae656b81aeba
-
-Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/154]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libinotifytools/src/inotifytools.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c
-index 902eac2..2b96395 100644
---- a/libinotifytools/src/inotifytools.c
-+++ b/libinotifytools/src/inotifytools.c
-@@ -55,6 +55,12 @@ struct fanotify_event_fid {
-        struct fanotify_event_info_fid info;
-        struct file_handle handle;
- };
-+
-+#ifndef __GLIBC__
-+#define val __val
-+#define __kernel_fsid_t fsid_t
-+#endif
-+
- #endif
- 
- /**
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch
deleted file mode 100644
index c0784ecc73..0000000000
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From c6093ad63b92f5d25e6826d1c49dc7cee86d3747 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 20 Dec 2022 10:48:10 -0800
-Subject: [PATCH] replace stat64/lstat64 with stat/lstat
-
-lfs64 functions are not needed when off_t is 64-bit
-Additionally this fixes build with musl which does not
-export these functions without defining _LARGEFILE64_SOURCE
-
-Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libinotifytools/src/inotifytools.c               | 8 ++++----
- libinotifytools/src/inotifytools/inotify-nosys.h | 5 -----
- libinotifytools/src/inotifytools/inotifytools.h  | 5 -----
- src/common.c                                     | 4 ++--
- src/common.h                                     | 6 +-----
- 5 files changed, 7 insertions(+), 21 deletions(-)
-
-diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c
-index 50f6135..3e17ac6 100644
---- a/libinotifytools/src/inotifytools.c
-+++ b/libinotifytools/src/inotifytools.c
-@@ -1750,14 +1750,14 @@ int inotifytools_watch_recursively_with_exclude(char const* path,
- 
-        static struct dirent * ent;
-        char * next_file;
--       static struct stat64 my_stat;
-+       static struct stat my_stat;
-        ent = readdir( dir );
-        // Watch each directory within this directory
-        while ( ent ) {
-                if ( (0 != strcmp( ent->d_name, "." )) &&
-                     (0 != strcmp( ent->d_name, ".." )) ) {
-                        nasprintf(&next_file,"%s%s", my_path, ent->d_name);
--                       if ( -1 == lstat64( next_file, &my_stat ) ) {
-+                       if ( -1 == lstat( next_file, &my_stat ) ) {
-                                error = errno;
-                                free( next_file );
-                                if ( errno != EACCES ) {
-@@ -1840,9 +1840,9 @@ int inotifytools_error() {
-  * @internal
-  */
- static int isdir( char const * path ) {
--       static struct stat64 my_stat;
-+       static struct stat my_stat;
- 
--       if ( -1 == lstat64( path, &my_stat ) ) {
-+       if ( -1 == lstat( path, &my_stat ) ) {
-                if (errno == ENOENT) return 0;
-                fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno));
-                return 0;
-diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h
-index 01aa45e..97166d4 100644
---- a/libinotifytools/src/inotifytools/inotify-nosys.h
-+++ b/libinotifytools/src/inotifytools/inotify-nosys.h
-@@ -13,11 +13,6 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
--#ifdef __FreeBSD__
--#define stat64 stat
--#define lstat64 lstat
--#endif
--
- /*
-  * struct inotify_event - structure read from the inotify device for each event
-  *
-diff --git a/libinotifytools/src/inotifytools/inotifytools.h b/libinotifytools/src/inotifytools/inotifytools.h
-index 49936ae..2ec4358 100644
---- a/libinotifytools/src/inotifytools/inotifytools.h
-+++ b/libinotifytools/src/inotifytools/inotifytools.h
-@@ -1,11 +1,6 @@
- #ifndef _inotifytools_H
- #define _inotifytools_H
- 
--#ifdef __FreeBSD__
--#define stat64 stat
--#define lstat64 lstat
--#endif
--
- #ifdef __cplusplus
- extern "C"
- {
-diff --git a/src/common.c b/src/common.c
-index 5a6fda1..885286e 100644
---- a/src/common.c
-+++ b/src/common.c
-@@ -45,9 +45,9 @@ void print_event_descriptions() {
- }
- 
- int isdir(char const *path) {
--    static struct stat64 my_stat;
-+    static struct stat my_stat;
- 
--    if (-1 == lstat64(path, &my_stat)) {
-+    if (-1 == lstat(path, &my_stat)) {
-         if (errno == ENOENT)
-             return 0;
-         fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno));
-diff --git a/src/common.h b/src/common.h
-index 12d3dde..7f1e34a 100644
---- a/src/common.h
-+++ b/src/common.h
-@@ -1,13 +1,9 @@
- #ifndef COMMON_H
- #define COMMON_H
- 
--#ifdef __FreeBSD__
--#define stat64 stat
--#define lstat64 lstat
--#ifdef ENABLE_FANOTIFY
-+#if defined(__FreeBSD__) && defined(ENABLE_FANOTIFY)
- #error "FreeBSD does not support fanotify"
- #endif
--#endif
- 
- #include <stdbool.h>
- 
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_4.23.9.0.bb
index 8a0ae17ad7..cb77dc81b0 100644
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb
+++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_4.23.9.0.bb
@@ -4,15 +4,11 @@ SECTION = "console/devel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6"
 
-SRCREV = "c8bdbc0a2ed822fc7c67c5c3e102d89fe27fb2d0"
+SRCREV = "5c2ab772338bcbe516306bf8cf1059ddf2fa6bb7"
 
 SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \
-           file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \
-           file://0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch \
-           file://0003-replace-stat64-lstat64-with-stat-lstat.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-support/joe/joe_4.6.bb b/meta-oe/recipes-support/joe/joe_4.6.bb
index ed0bf337b5..510d8f8498 100644
--- a/meta-oe/recipes-support/joe/joe_4.6.bb
+++ b/meta-oe/recipes-support/joe/joe_4.6.bb
@@ -11,5 +11,4 @@ PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-termin
 
 inherit autotools-brokensep mime-xdg
 
-SRC_URI[md5sum] = "9017484e6116830d846678b625ea5c43"
 SRC_URI[sha256sum] = "495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de"
diff --git a/meta-oe/recipes-support/jsoncons/jsoncons_1.3.2.bb b/meta-oe/recipes-support/jsoncons/jsoncons_1.3.2.bb
new file mode 100644
index 0000000000..314f67928a
--- /dev/null
+++ b/meta-oe/recipes-support/jsoncons/jsoncons_1.3.2.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "A C++, header-only library for constructing JSON and JSON-like data formats."
+HOMEPAGE = "https://github.com/danielaparker/jsoncons"
+
+LICENSE = "BSL-1.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6ee7f7ed2001e4cde4679fdb8926f820"
+
+SRC_URI = "git://github.com/danielaparker/jsoncons.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "64b9da1e9f15eeff4ec9d6bc856538db542118f2"
+
+
+inherit cmake
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[tests] = "-DJSONCONS_BUILD_TESTS=ON,-DJSONCONS_BUILD_TESTS=OFF"
diff --git a/meta-oe/recipes-support/lcms/lcms_2.16.bb b/meta-oe/recipes-support/lcms/lcms_2.16.bb
index 8135f83a05..87b0979200 100644
--- a/meta-oe/recipes-support/lcms/lcms_2.16.bb
+++ b/meta-oe/recipes-support/lcms/lcms_2.16.bb
@@ -10,7 +10,7 @@ DEPENDS = "tiff"
 
 BBCLASSEXTEND = "native nativesdk"
 
-S = "${WORKDIR}/lcms2-${PV}"
+S = "${UNPACKDIR}/lcms2-${PV}"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-support/lcov/lcov_1.16.bb b/meta-oe/recipes-support/lcov/lcov_1.16.bb
index 22d68814ee..a889b3fa82 100755
--- a/meta-oe/recipes-support/lcov/lcov_1.16.bb
+++ b/meta-oe/recipes-support/lcov/lcov_1.16.bb
@@ -9,13 +9,13 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 RDEPENDS:${PN} += " \
+    libjson-perl \
     perl \
-    perl-module-filehandle \
-    perl-module-getopt-std \
-    perl-module-digest-md5 \
-    perl-module-digest-sha \
+    perl-module-compress-zlib \
     perl-module-constant \
     perl-module-cwd \
+    perl-module-digest-md5 \
+    perl-module-digest-sha \
     perl-module-errno \
     perl-module-file-basename \
     perl-module-file-copy \
@@ -25,12 +25,16 @@ RDEPENDS:${PN} += " \
     perl-module-file-spec-functions \
     perl-module-file-spec-unix \
     perl-module-file-temp \
+    perl-module-filehandle \
     perl-module-getopt-long \
+    perl-module-getopt-std \
     perl-module-list-util \
+    perl-module-load \
+    perl-module-metadata \    
     perl-module-mro \
     perl-module-overload \
-    perl-module-overloading \
     perl-module-overload-numbers \
+    perl-module-overloading \
     perl-module-parent \
     perl-module-pod-usage \
     perl-module-posix \
@@ -47,9 +51,11 @@ RDEPENDS:${PN}:append:class-target = " \
     gcov-symlinks \
 "
 SRC_URI = "https://github.com/linux-test-project/lcov/releases/download/v${PV}/lcov-${PV}.tar.gz"
-SRC_URI[md5sum] = "bfee0cef50d7b7bd1df03bfadf68dcef"
 SRC_URI[sha256sum] = "987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b"
 
+UPSTREAM_CHECK_URI = "https://github.com/linux-test-project/lcov/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
 do_install() {
     oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} LCOV_PERL_PATH="/usr/bin/env perl"
 }
diff --git a/meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb b/meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb
new file mode 100644
index 0000000000..344bf119b9
--- /dev/null
+++ b/meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb
@@ -0,0 +1,29 @@
+SUMMARY = "LGI is gobject-introspection based dynamic Lua binding to GObject based libraries."
+HOMEPAGE = "https://https://github.com/pavouk/lgi"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a77b7838f84aa753d37f88fd9c9ccf7d"
+
+SRC_URI = "git://github.com/pavouk/lgi.git;protocol=https;branch=master"
+
+DEPENDS = " \
+        luajit \
+        luajit-native \
+        cairo \
+        gobject-introspection \
+        gobject-introspection-native \
+"
+
+SRCREV = "d7666f77e7ee33907c84f5efdef32aef2e1cc196"
+SRCPV = "${PV}+${SRCREV}"
+
+inherit meson pkgconfig
+
+EXTRA_OEMESON += "--buildtype release -Dtests=false"
+
+FILES:${PN} = "${libdir} ${datadir}"
+
+# ppc64/riscv64/riscv32 is not supported on luajit
+COMPATIBLE_HOST:riscv32 = "null"
+COMPATIBLE_HOST:riscv64 = "null"
+COMPATIBLE_HOST:powerpc64 = "null"
+COMPATIBLE_HOST:powerpc64le = "null"
diff --git a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
index f747ecbf72..89b2dff0ba 100644
--- a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
+++ b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
@@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1"
 DEPENDS = "udev"
 
 SRCREV = "de6258940960443038b4c1651dfda3620075e870"
-SRC_URI = "git://git.0pointer.de/libatasmart.git;branch=master \
+SRC_URI = "git://git.0pointer.net/libatasmart.git;protocol=http;branch=master \
            file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit autotools lib_package pkgconfig
 
diff --git a/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb
index e0683b177b..4a1052e75b 100644
--- a/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb
+++ b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/libb64/libb64;protocol=https;branch=master \
            file://0001-examples-Use-proper-function-prototype-for-main.patch \
            "
 
-S = "${WORKDIR}/git"
 
 CFLAGS += "-fPIC"
 
diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb
index daa01bfc3d..ef2a6c76fb 100644
--- a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb
+++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb
@@ -6,9 +6,8 @@ SECTION = "devel/lib"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
 
-S = "${WORKDIR}/git"
 
-SRCREV = "6e83cc6f6dff4f126fc79284e0c3c1c50123380d"
+SRCREV = "9da72b2732508b0ba0ceed27f5e50bc276ef31f2"
 SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https"
 
 inherit gettext autotools pkgconfig python3native
diff --git a/meta-oe/recipes-support/libcanberra/files/0001-Determine-audio-buffer-size-for-a-time-of-500ms.patch b/meta-oe/recipes-support/libcanberra/files/0001-Determine-audio-buffer-size-for-a-time-of-500ms.patch
new file mode 100644
index 0000000000..b8ad041850
--- /dev/null
+++ b/meta-oe/recipes-support/libcanberra/files/0001-Determine-audio-buffer-size-for-a-time-of-500ms.patch
@@ -0,0 +1,42 @@
+From 86488a7fc209ac08dd92c9d50a77e3330e7aedd9 Mon Sep 17 00:00:00 2001
+From: Patrick Zacharias <1475802+Fighter19@users.noreply.github.com>
+Date: Thu, 7 Nov 2024 14:03:29 +0100
+Subject: [PATCH] Determine audio buffer size for a time of 500ms
+
+On some hardware like the SGTL5000, not specifying a buffer size
+results to EINVAL being returned.
+
+This code sets the buffer time to 500ms and the period time to a fourth of that,
+or whatever is nearest to that.
+
+Upstream-Status: Pending
+---
+ src/alsa.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/src/alsa.c b/src/alsa.c
+index bebcc4a..ac26578 100644
+--- a/src/alsa.c
++++ b/src/alsa.c
+@@ -258,6 +258,21 @@ static int open_alsa(ca_context *c, struct outstanding *out) {
+         if ((ret = snd_pcm_hw_params_set_channels(out->pcm, hwparams, ca_sound_file_get_nchannels(out->file))) < 0)
+                 goto finish;
+ 
++        unsigned int buffer_time = 0;
++        if ((ret = snd_pcm_hw_params_get_buffer_time_max(hwparams, &buffer_time, 0)) < 0)
++                goto finish;
++
++        // Cap the buffer time to 500ms
++        if (buffer_time > 500000)
++                buffer_time = 500000;
++
++        unsigned int period_time = buffer_time / 4;
++        if ((ret = snd_pcm_hw_params_set_period_time_near(out->pcm, hwparams, &period_time, 0)) < 0)
++                goto finish;
++
++        if ((ret = snd_pcm_hw_params_set_buffer_time_near(out->pcm, hwparams, &buffer_time, 0)) < 0)
++                goto finish;
++
+         if ((ret = snd_pcm_hw_params(out->pcm, hwparams)) < 0)
+                 goto finish;
+ 
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
index 95c9479588..7eac53ae90 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
@@ -13,8 +13,8 @@ SRC_URI = " \
     file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \
     file://0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch \
     file://0001-remove-dropped-templates.patch \
+    file://0001-Determine-audio-buffer-size-for-a-time-of-500ms.patch \
 "
-SRC_URI[md5sum] = "34cb7e4430afaf6f447c4ebdb9b42072"
 SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72"
 
 EXTRA_OECONF = "\
diff --git a/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch b/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch
new file mode 100644
index 0000000000..86ee6902f2
--- /dev/null
+++ b/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch
@@ -0,0 +1,41 @@
+From 395cd70a8c28a4ea408a227d745fe20ed8af9105 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 10 Sep 2024 18:11:40 -0700
+Subject: [PATCH] Fix instances of
+ -Wmissing-template-arg-list-after-template-kw.
+
+Clang has a new warning that requires a template argument list after using
+the template keyword. Remove uses of the template keyword when we're not
+specifying types.
+
+See https://github.com/llvm/llvm-project/issues/94194 for the upstream
+clang changes
+
+Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/835]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/cereal/types/tuple.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/cereal/types/tuple.hpp b/include/cereal/types/tuple.hpp
+index 80c68075..5c79eca9 100644
+--- a/include/cereal/types/tuple.hpp
++++ b/include/cereal/types/tuple.hpp
+@@ -95,7 +95,7 @@ namespace cereal
+       template <class Archive, class ... Types> inline
+       static void apply( Archive & ar, std::tuple<Types...> & tuple )
+       {
+-        serialize<Height - 1>::template apply( ar, tuple );
++        serialize<Height - 1>::apply( ar, tuple );
+         ar( CEREAL_NVP_(tuple_element_name<Height - 1>::c_str(),
+             std::get<Height - 1>( tuple )) );
+       }
+@@ -116,7 +116,7 @@ namespace cereal
+   template <class Archive, class ... Types> inline
+   void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, std::tuple<Types...> & tuple )
+   {
+-    tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::template apply( ar, tuple );
++    tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::apply( ar, tuple );
+   }
+ } // namespace cereal
+ 
diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb
index 6ad20d6370..7d4a352a31 100644
--- a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb
+++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb
@@ -22,10 +22,10 @@ SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \
            file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \
            file://0001-cmake-Use-idirafter-instead-of-isystem.patch \
            file://0001-doctest-Do-not-use-unnamed-class.patch \
+           file://0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch \
            file://run-ptest \
 "
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig ptest
 
diff --git a/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch b/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch
new file mode 100644
index 0000000000..aa9fab86e6
--- /dev/null
+++ b/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch
@@ -0,0 +1,48 @@
+From b684f4cc25821b6e86a58576f864e4b12dfdfecc Mon Sep 17 00:00:00 2001
+From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
+Date: Sat, 5 Jun 2021 22:57:51 +0200
+Subject: [PATCH] only apply search path logic to relative pathnames
+
+Adding any directory to the search path via cfg_add_searchpath breaks
+lookup of absolute paths. So change the logic in cfg_searchpath() to
+ignore the search path when the given filename is absolute, and merely
+check that for existence.
+
+This is technically an ABI change, but the current behaviour is quite
+unusual and unexpected.
+
+Upstream-Status: Backport [https://github.com/libconfuse/libconfuse/pull/155]
+
+Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
+---
+ src/confuse.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/confuse.c b/src/confuse.c
+index 2ea0254..19b56e3 100644
+--- a/src/confuse.c
++++ b/src/confuse.c
+@@ -1746,12 +1746,20 @@ DLLIMPORT char *cfg_searchpath(cfg_searchpath_t *p, const char *file)
+                return NULL;
+        }
+ 
++       if (file[0] == '/') {
++               fullpath = strdup(file);
++               if (!fullpath)
++                       return NULL;
++               goto check;
++       }
++
+        if ((fullpath = cfg_searchpath(p->next, file)) != NULL)
+                return fullpath;
+ 
+        if ((fullpath = cfg_make_fullpath(p->dir, file)) == NULL)
+                return NULL;
+ 
++check:
+ #ifdef HAVE_SYS_STAT_H
+        err = stat((const char *)fullpath, &st);
+        if ((!err) && S_ISREG(st.st_mode))
+-- 
+2.31.1
+
diff --git a/meta-oe/recipes-support/libconfuse/files/CVE-2022-40320.patch b/meta-oe/recipes-support/libconfuse/files/CVE-2022-40320.patch
new file mode 100755
index 0000000000..52296b9c0f
--- /dev/null
+++ b/meta-oe/recipes-support/libconfuse/files/CVE-2022-40320.patch
@@ -0,0 +1,42 @@
+From d73777c2c3566fb2647727bb56d9a2295b81669b Mon Sep 17 00:00:00 2001
+From: Joachim Wiberg <troglobit@gmail.com>
+Date: Fri, 2 Sep 2022 16:12:46 +0200
+Subject: [PATCH] Fix #163: unterminated username used with getpwnam()
+
+Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+
+CVE: CVE-2022-40320
+Upstream-Status: Backport [https://github.com/libconfuse/libconfuse/commit/d73777c2c3566fb2647727bb56d9a2295b81669b]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ src/confuse.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/confuse.c b/src/confuse.c
+index 6d1fdbd..05566b5 100644
+--- a/src/confuse.c
++++ b/src/confuse.c
+@@ -1872,17 +1872,20 @@ DLLIMPORT char *cfg_tilde_expand(const char *filename)
+                        file = filename + 1;
+                } else {
+                        /* ~user or ~user/path */
+-                       char *user;
++                       char *user; /* ~user or ~user/path */
++                       size_t len;
+ 
+                        file = strchr(filename, '/');
+                        if (file == 0)
+                                file = filename + strlen(filename);
+ 
+-                       user = malloc(file - filename);
++                       len = file - filename - 1;
++                       user = malloc(len + 1);
+                        if (!user)
+                                return NULL;
+ 
+-                       strncpy(user, filename + 1, file - filename - 1);
++                       strncpy(user, &filename[1], len);
++                       user[len] = 0;
+                        passwd = getpwnam(user);
+                        free(user);
+                }
diff --git a/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb b/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb
new file mode 100644
index 0000000000..20966a535c
--- /dev/null
+++ b/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb
@@ -0,0 +1,15 @@
+SUMMARY = "libConfuse is a configuration file parser library"
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=42fa47330d4051cd219f7d99d023de3a"
+
+SRC_URI = "https://github.com/libconfuse/libconfuse/releases/download/v${PV}/confuse-${PV}.tar.gz"
+SRC_URI[sha256sum] = "3a59ded20bc652eaa8e6261ab46f7e483bc13dad79263c15af42ecbb329707b8"
+
+SRC_URI += "file://0001-only-apply-search-path-logic-to-relative-pathnames.patch"
+SRC_URI += "file://CVE-2022-40320.patch"
+
+inherit autotools-brokensep pkgconfig gettext
+
+S = "${UNPACKDIR}/confuse-${PV}"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb
index cf2d933169..d825f8fdee 100644
--- a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb
+++ b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb
@@ -21,7 +21,6 @@ inherit cmake
 
 EXTRA_OECMAKE = "-DCPPKAFKA_BUILD_SHARED=ON"
 
-S = "${WORKDIR}/git"
 
 do_install:append(){
     chrpath -d ${D}${libdir}/libcppkafka.so.${BASEPV}
diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-Fix-gcc-15-incompatible-pointer-types-error.patch b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-Fix-gcc-15-incompatible-pointer-types-error.patch
new file mode 100644
index 0000000000..74ff091c94
--- /dev/null
+++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-Fix-gcc-15-incompatible-pointer-types-error.patch
@@ -0,0 +1,41 @@
+From 7b5318037b2a21a592e8a85c9724c1dc35078426 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Thu, 3 Apr 2025 20:42:03 +0900
+Subject: [PATCH] Fix gcc 15 incompatible-pointer-types error
+
+* Fix incompatible pointer type error in signal function parameter
+TOPDIR/tmp/work/core2-64-oe-linux/libcyusbserial/1.0.0+git/git/tools/cyusbserialtest.c:101:22: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
+  101 |     signal (SIGUSR1, deviceHotPlug);
+      |                      ^~~~~~~~~~~~~
+      |                      |
+      |                      void (*)(void)
+In file included from TOPDIR/tmp/work/core2-64-oe-linux/libcyusbserial/1.0.0+git/git/tools/cyusbserialtest.c:25:
+TOPDIR/tmp/work/core2-64-oe-linux/libcyusbserial/1.0.0+git/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)
+      |                                          ~~~~~~~~~~~~~~~^~~~~~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/libcyusbserial/1.0.0+git/git/tools/cyusbserialtest.c:83:6: note: 'deviceHotPlug' declared here
+   83 | void deviceHotPlug () {
+      |      ^~~~~~~~~~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/libcyusbserial/1.0.0+git/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
+   72 | typedef void (*__sighandler_t) (int);
+      |                ^~~~~~~~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/cyrozap/libcyusbserial/pull/7]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ tools/cyusbserialtest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/cyusbserialtest.c b/tools/cyusbserialtest.c
+index 9f21249..92e91a1 100644
+--- a/tools/cyusbserialtest.c
++++ b/tools/cyusbserialtest.c
+@@ -80,7 +80,7 @@ int getUserInput()
+     return output;
+ }
+ 
+-void deviceHotPlug () {
++void deviceHotPlug (int sig) {
+     CY_RETURN_STATUS rStatus;
+     deviceAddedRemoved = true;
+     selectedDeviceNum = -1;
diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb
index dd7f457b10..939e7db24e 100644
--- a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb
+++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb
@@ -10,9 +10,9 @@ PV = "1.0.0+git"
 SRCREV = "655e2d544183d094f0e2d119c7e0c6206a0ddb3f"
 SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https \
     file://0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch \
+    file://0001-Fix-gcc-15-incompatible-pointer-types-error.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc
deleted file mode 100644
index 592109b951..0000000000
--- a/meta-oe/recipes-support/libee/libee.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "An Event Expression Library inspired by CEE"
-DESCRIPTION = "The core idea of libee is to provide a small \
-but hopefully convenient API layer above the CEE standard."
-
-HOMEPAGE = "http://www.libee.org"
-SECTION = "base"
-
-LICENSE = "LGPL-2.1-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1c2687de35e36ba3b999136236a66cd6"
-
-SRC_URI = "http://www.libee.org/download/files/download/${BPN}-${PV}.tar.gz\
-           file://libee-parallel-make.patch \
-           file://run-ptest \
-           file://ezapi1.sh \
-"
-
-inherit autotools ptest pkgconfig
-
-DEPENDS += "libestr"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench', '', d)}"
-
-PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
-PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,,"
-
-TESTDIR = "tests"
-
-# We presume the tests we are going to install so just build them directly.
-#
-do_compile_ptest() {
-    oe_runmake -C ${TESTDIR} genfile ezapi1
-}
-
-do_install_ptest() {
-    install -d ${D}${PTEST_PATH}
-    install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH}
-    install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH}
-    install -m 0755 ${UNPACKDIR}/ezapi1.sh ${D}${PTEST_PATH}
-}
diff --git a/meta-oe/recipes-support/libee/libee/ezapi1.sh b/meta-oe/recipes-support/libee/libee/ezapi1.sh
deleted file mode 100755
index e9db5e614b..0000000000
--- a/meta-oe/recipes-support/libee/libee/ezapi1.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-echo ---------------------------------------------------------------------------
-echo A very basic test for the event class
-echo ---------------------------------------------------------------------------
-rm -f infile
-./genfile 100 > infile
-./ezapi1 -iinfile
-if [ $? -ne 0 ] ; then
-   echo "FAIL: $0"
-   exit 1
-fi
-echo "PASS: $0"
-rm -f infile
diff --git a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch
deleted file mode 100644
index 8bb23aafca..0000000000
--- a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fix parallel compiling problem
-
-without specifying libee_convert_DEPENDENCIES = libee.la, libee_convert
-can't find libee.la when linking as libee is not generated yet.
- 
-Upstream-Status: Pending
-
-Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 08aaa9e..f0c78f7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -46,5 +46,6 @@ libee_la_LDFLAGS = -version-info 0:0:0
- libee_convert_SOURCES = convert.c
- libee_convert_CPPFLAGS =  -I$(top_srcdir) $(LIBEE_CFLAGS) $(LIBESTR_CFLAGS) $(LIBXML2_CFLAGS)
- libee_convert_LDADD = $(LIBEE_LIBS) $(LIBXML2_LIBS) $(LIBESTR_LIBS)
-+libee_convert_DEPENDENCIES = libee.la
- 
- include_HEADERS = 
diff --git a/meta-oe/recipes-support/libee/libee/run-ptest b/meta-oe/recipes-support/libee/libee/run-ptest
deleted file mode 100755
index 3cb6607645..0000000000
--- a/meta-oe/recipes-support/libee/libee/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-#
-./ezapi1.sh
diff --git a/meta-oe/recipes-support/libee/libee_0.4.1.bb b/meta-oe/recipes-support/libee/libee_0.4.1.bb
deleted file mode 100644
index ef2c20db5a..0000000000
--- a/meta-oe/recipes-support/libee/libee_0.4.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI[md5sum] = "7bbf4160876c12db6193c06e2badedb2"
-SRC_URI[sha256sum] = "c0dac01938593deee06c3d161e4eda4ecc0fd7317e1321bd96e301aceb7fb027"
diff --git a/meta-oe/recipes-support/libeigen/libeigen/0002-Remove-LGPL-Code-and-references.patch b/meta-oe/recipes-support/libeigen/libeigen/0002-Remove-LGPL-Code-and-references.patch
new file mode 100644
index 0000000000..2d19bc23c8
--- /dev/null
+++ b/meta-oe/recipes-support/libeigen/libeigen/0002-Remove-LGPL-Code-and-references.patch
@@ -0,0 +1,1040 @@
+From e63a6950dbebf4dd95e5c74c423c06fd65df5182 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= <cantonios@google.com>
+Date: Wed, 8 Feb 2023 01:25:06 +0000
+Subject: [PATCH] Remove LGPL Code and references.
+
+Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/commit/e256ad1823c2eddd6954241ddc99bfeb7bb29cb3]
+---
+ COPYING.LGPL                                  | 502 ------------------
+ COPYING.README                                |  16 +-
+ Eigen/src/Core/util/NonMPL2.h                 |   3 -
+ .../IncompleteCholesky.h                      |   3 +-
+ bench/tensors/eigen_sycl_bench.sh             |   1 -
+ bench/tensors/eigen_sycl_bench_contract.sh    |   2 +-
+ doc/PreprocessorDirectives.dox                |   3 -
+ test/CMakeLists.txt                           |   1 -
+ test/mpl2only.cpp                             |  24 -
+ unsupported/Eigen/IterativeSolvers            |   6 -
+ .../IterativeSolvers/ConstrainedConjGrad.h    | 187 -------
+ .../IterativeSolvers/IterationController.h    | 154 ------
+ 12 files changed, 4 insertions(+), 898 deletions(-)
+ delete mode 100644 COPYING.LGPL
+ delete mode 100644 Eigen/src/Core/util/NonMPL2.h
+ delete mode 100644 test/mpl2only.cpp
+ delete mode 100644 unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
+ delete mode 100644 unsupported/Eigen/src/IterativeSolvers/IterationController.h
+
+diff --git a/COPYING.LGPL b/COPYING.LGPL
+deleted file mode 100644
+index 4362b4915..000000000
+--- a/COPYING.LGPL
++++ /dev/null
+@@ -1,502 +0,0 @@
+-                  GNU LESSER GENERAL PUBLIC LICENSE
+-                       Version 2.1, February 1999
+-
+- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+- Everyone is permitted to copy and distribute verbatim copies
+- of this license document, but changing it is not allowed.
+-
+-[This is the first released version of the Lesser GPL.  It also counts
+- as the successor of the GNU Library Public License, version 2, hence
+- the version number 2.1.]
+-
+-                            Preamble
+-
+-  The licenses for most software are designed to take away your
+-freedom to share and change it.  By contrast, the GNU General Public
+-Licenses are intended to guarantee your freedom to share and change
+-free software--to make sure the software is free for all its users.
+-
+-  This license, the Lesser General Public License, applies to some
+-specially designated software packages--typically libraries--of the
+-Free Software Foundation and other authors who decide to use it.  You
+-can use it too, but we suggest you first think carefully about whether
+-this license or the ordinary General Public License is the better
+-strategy to use in any particular case, based on the explanations below.
+-
+-  When we speak of free software, we are referring to freedom of use,
+-not price.  Our General Public Licenses are designed to make sure that
+-you have the freedom to distribute copies of free software (and charge
+-for this service if you wish); that you receive source code or can get
+-it if you want it; that you can change the software and use pieces of
+-it in new free programs; and that you are informed that you can do
+-these things.
+-
+-  To protect your rights, we need to make restrictions that forbid
+-distributors to deny you these rights or to ask you to surrender these
+-rights.  These restrictions translate to certain responsibilities for
+-you if you distribute copies of the library or if you modify it.
+-
+-  For example, if you distribute copies of the library, whether gratis
+-or for a fee, you must give the recipients all the rights that we gave
+-you.  You must make sure that they, too, receive or can get the source
+-code.  If you link other code with the library, you must provide
+-complete object files to the recipients, so that they can relink them
+-with the library after making changes to the library and recompiling
+-it.  And you must show them these terms so they know their rights.
+-
+-  We protect your rights with a two-step method: (1) we copyright the
+-library, and (2) we offer you this license, which gives you legal
+-permission to copy, distribute and/or modify the library.
+-
+-  To protect each distributor, we want to make it very clear that
+-there is no warranty for the free library.  Also, if the library is
+-modified by someone else and passed on, the recipients should know
+-that what they have is not the original version, so that the original
+-author's reputation will not be affected by problems that might be
+-introduced by others.
+-
+-  Finally, software patents pose a constant threat to the existence of
+-any free program.  We wish to make sure that a company cannot
+-effectively restrict the users of a free program by obtaining a
+-restrictive license from a patent holder.  Therefore, we insist that
+-any patent license obtained for a version of the library must be
+-consistent with the full freedom of use specified in this license.
+-
+-  Most GNU software, including some libraries, is covered by the
+-ordinary GNU General Public License.  This license, the GNU Lesser
+-General Public License, applies to certain designated libraries, and
+-is quite different from the ordinary General Public License.  We use
+-this license for certain libraries in order to permit linking those
+-libraries into non-free programs.
+-
+-  When a program is linked with a library, whether statically or using
+-a shared library, the combination of the two is legally speaking a
+-combined work, a derivative of the original library.  The ordinary
+-General Public License therefore permits such linking only if the
+-entire combination fits its criteria of freedom.  The Lesser General
+-Public License permits more lax criteria for linking other code with
+-the library.
+-
+-  We call this license the "Lesser" General Public License because it
+-does Less to protect the user's freedom than the ordinary General
+-Public License.  It also provides other free software developers Less
+-of an advantage over competing non-free programs.  These disadvantages
+-are the reason we use the ordinary General Public License for many
+-libraries.  However, the Lesser license provides advantages in certain
+-special circumstances.
+-
+-  For example, on rare occasions, there may be a special need to
+-encourage the widest possible use of a certain library, so that it becomes
+-a de-facto standard.  To achieve this, non-free programs must be
+-allowed to use the library.  A more frequent case is that a free
+-library does the same job as widely used non-free libraries.  In this
+-case, there is little to gain by limiting the free library to free
+-software only, so we use the Lesser General Public License.
+-
+-  In other cases, permission to use a particular library in non-free
+-programs enables a greater number of people to use a large body of
+-free software.  For example, permission to use the GNU C Library in
+-non-free programs enables many more people to use the whole GNU
+-operating system, as well as its variant, the GNU/Linux operating
+-system.
+-
+-  Although the Lesser General Public License is Less protective of the
+-users' freedom, it does ensure that the user of a program that is
+-linked with the Library has the freedom and the wherewithal to run
+-that program using a modified version of the Library.
+-
+-  The precise terms and conditions for copying, distribution and
+-modification follow.  Pay close attention to the difference between a
+-"work based on the library" and a "work that uses the library".  The
+-former contains code derived from the library, whereas the latter must
+-be combined with the library in order to run.
+-
+-                  GNU LESSER GENERAL PUBLIC LICENSE
+-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+-
+-  0. This License Agreement applies to any software library or other
+-program which contains a notice placed by the copyright holder or
+-other authorized party saying it may be distributed under the terms of
+-this Lesser General Public License (also called "this License").
+-Each licensee is addressed as "you".
+-
+-  A "library" means a collection of software functions and/or data
+-prepared so as to be conveniently linked with application programs
+-(which use some of those functions and data) to form executables.
+-
+-  The "Library", below, refers to any such software library or work
+-which has been distributed under these terms.  A "work based on the
+-Library" means either the Library or any derivative work under
+-copyright law: that is to say, a work containing the Library or a
+-portion of it, either verbatim or with modifications and/or translated
+-straightforwardly into another language.  (Hereinafter, translation is
+-included without limitation in the term "modification".)
+-
+-  "Source code" for a work means the preferred form of the work for
+-making modifications to it.  For a library, complete source code means
+-all the source code for all modules it contains, plus any associated
+-interface definition files, plus the scripts used to control compilation
+-and installation of the library.
+-
+-  Activities other than copying, distribution and modification are not
+-covered by this License; they are outside its scope.  The act of
+-running a program using the Library is not restricted, and output from
+-such a program is covered only if its contents constitute a work based
+-on the Library (independent of the use of the Library in a tool for
+-writing it).  Whether that is true depends on what the Library does
+-and what the program that uses the Library does.
+-
+-  1. You may copy and distribute verbatim copies of the Library's
+-complete source code as you receive it, in any medium, provided that
+-you conspicuously and appropriately publish on each copy an
+-appropriate copyright notice and disclaimer of warranty; keep intact
+-all the notices that refer to this License and to the absence of any
+-warranty; and distribute a copy of this License along with the
+-Library.
+-
+-  You may charge a fee for the physical act of transferring a copy,
+-and you may at your option offer warranty protection in exchange for a
+-fee.
+-
+-  2. You may modify your copy or copies of the Library or any portion
+-of it, thus forming a work based on the Library, and copy and
+-distribute such modifications or work under the terms of Section 1
+-above, provided that you also meet all of these conditions:
+-
+-    a) The modified work must itself be a software library.
+-
+-    b) You must cause the files modified to carry prominent notices
+-    stating that you changed the files and the date of any change.
+-
+-    c) You must cause the whole of the work to be licensed at no
+-    charge to all third parties under the terms of this License.
+-
+-    d) If a facility in the modified Library refers to a function or a
+-    table of data to be supplied by an application program that uses
+-    the facility, other than as an argument passed when the facility
+-    is invoked, then you must make a good faith effort to ensure that,
+-    in the event an application does not supply such function or
+-    table, the facility still operates, and performs whatever part of
+-    its purpose remains meaningful.
+-
+-    (For example, a function in a library to compute square roots has
+-    a purpose that is entirely well-defined independent of the
+-    application.  Therefore, Subsection 2d requires that any
+-    application-supplied function or table used by this function must
+-    be optional: if the application does not supply it, the square
+-    root function must still compute square roots.)
+-
+-These requirements apply to the modified work as a whole.  If
+-identifiable sections of that work are not derived from the Library,
+-and can be reasonably considered independent and separate works in
+-themselves, then this License, and its terms, do not apply to those
+-sections when you distribute them as separate works.  But when you
+-distribute the same sections as part of a whole which is a work based
+-on the Library, the distribution of the whole must be on the terms of
+-this License, whose permissions for other licensees extend to the
+-entire whole, and thus to each and every part regardless of who wrote
+-it.
+-
+-Thus, it is not the intent of this section to claim rights or contest
+-your rights to work written entirely by you; rather, the intent is to
+-exercise the right to control the distribution of derivative or
+-collective works based on the Library.
+-
+-In addition, mere aggregation of another work not based on the Library
+-with the Library (or with a work based on the Library) on a volume of
+-a storage or distribution medium does not bring the other work under
+-the scope of this License.
+-
+-  3. You may opt to apply the terms of the ordinary GNU General Public
+-License instead of this License to a given copy of the Library.  To do
+-this, you must alter all the notices that refer to this License, so
+-that they refer to the ordinary GNU General Public License, version 2,
+-instead of to this License.  (If a newer version than version 2 of the
+-ordinary GNU General Public License has appeared, then you can specify
+-that version instead if you wish.)  Do not make any other change in
+-these notices.
+-
+-  Once this change is made in a given copy, it is irreversible for
+-that copy, so the ordinary GNU General Public License applies to all
+-subsequent copies and derivative works made from that copy.
+-
+-  This option is useful when you wish to copy part of the code of
+-the Library into a program that is not a library.
+-
+-  4. You may copy and distribute the Library (or a portion or
+-derivative of it, under Section 2) in object code or executable form
+-under the terms of Sections 1 and 2 above provided that you accompany
+-it with the complete corresponding machine-readable source code, which
+-must be distributed under the terms of Sections 1 and 2 above on a
+-medium customarily used for software interchange.
+-
+-  If distribution of object code is made by offering access to copy
+-from a designated place, then offering equivalent access to copy the
+-source code from the same place satisfies the requirement to
+-distribute the source code, even though third parties are not
+-compelled to copy the source along with the object code.
+-
+-  5. A program that contains no derivative of any portion of the
+-Library, but is designed to work with the Library by being compiled or
+-linked with it, is called a "work that uses the Library".  Such a
+-work, in isolation, is not a derivative work of the Library, and
+-therefore falls outside the scope of this License.
+-
+-  However, linking a "work that uses the Library" with the Library
+-creates an executable that is a derivative of the Library (because it
+-contains portions of the Library), rather than a "work that uses the
+-library".  The executable is therefore covered by this License.
+-Section 6 states terms for distribution of such executables.
+-
+-  When a "work that uses the Library" uses material from a header file
+-that is part of the Library, the object code for the work may be a
+-derivative work of the Library even though the source code is not.
+-Whether this is true is especially significant if the work can be
+-linked without the Library, or if the work is itself a library.  The
+-threshold for this to be true is not precisely defined by law.
+-
+-  If such an object file uses only numerical parameters, data
+-structure layouts and accessors, and small macros and small inline
+-functions (ten lines or less in length), then the use of the object
+-file is unrestricted, regardless of whether it is legally a derivative
+-work.  (Executables containing this object code plus portions of the
+-Library will still fall under Section 6.)
+-
+-  Otherwise, if the work is a derivative of the Library, you may
+-distribute the object code for the work under the terms of Section 6.
+-Any executables containing that work also fall under Section 6,
+-whether or not they are linked directly with the Library itself.
+-
+-  6. As an exception to the Sections above, you may also combine or
+-link a "work that uses the Library" with the Library to produce a
+-work containing portions of the Library, and distribute that work
+-under terms of your choice, provided that the terms permit
+-modification of the work for the customer's own use and reverse
+-engineering for debugging such modifications.
+-
+-  You must give prominent notice with each copy of the work that the
+-Library is used in it and that the Library and its use are covered by
+-this License.  You must supply a copy of this License.  If the work
+-during execution displays copyright notices, you must include the
+-copyright notice for the Library among them, as well as a reference
+-directing the user to the copy of this License.  Also, you must do one
+-of these things:
+-
+-    a) Accompany the work with the complete corresponding
+-    machine-readable source code for the Library including whatever
+-    changes were used in the work (which must be distributed under
+-    Sections 1 and 2 above); and, if the work is an executable linked
+-    with the Library, with the complete machine-readable "work that
+-    uses the Library", as object code and/or source code, so that the
+-    user can modify the Library and then relink to produce a modified
+-    executable containing the modified Library.  (It is understood
+-    that the user who changes the contents of definitions files in the
+-    Library will not necessarily be able to recompile the application
+-    to use the modified definitions.)
+-
+-    b) Use a suitable shared library mechanism for linking with the
+-    Library.  A suitable mechanism is one that (1) uses at run time a
+-    copy of the library already present on the user's computer system,
+-    rather than copying library functions into the executable, and (2)
+-    will operate properly with a modified version of the library, if
+-    the user installs one, as long as the modified version is
+-    interface-compatible with the version that the work was made with.
+-
+-    c) Accompany the work with a written offer, valid for at
+-    least three years, to give the same user the materials
+-    specified in Subsection 6a, above, for a charge no more
+-    than the cost of performing this distribution.
+-
+-    d) If distribution of the work is made by offering access to copy
+-    from a designated place, offer equivalent access to copy the above
+-    specified materials from the same place.
+-
+-    e) Verify that the user has already received a copy of these
+-    materials or that you have already sent this user a copy.
+-
+-  For an executable, the required form of the "work that uses the
+-Library" must include any data and utility programs needed for
+-reproducing the executable from it.  However, as a special exception,
+-the materials to be distributed need not include anything that is
+-normally distributed (in either source or binary form) with the major
+-components (compiler, kernel, and so on) of the operating system on
+-which the executable runs, unless that component itself accompanies
+-the executable.
+-
+-  It may happen that this requirement contradicts the license
+-restrictions of other proprietary libraries that do not normally
+-accompany the operating system.  Such a contradiction means you cannot
+-use both them and the Library together in an executable that you
+-distribute.
+-
+-  7. You may place library facilities that are a work based on the
+-Library side-by-side in a single library together with other library
+-facilities not covered by this License, and distribute such a combined
+-library, provided that the separate distribution of the work based on
+-the Library and of the other library facilities is otherwise
+-permitted, and provided that you do these two things:
+-
+-    a) Accompany the combined library with a copy of the same work
+-    based on the Library, uncombined with any other library
+-    facilities.  This must be distributed under the terms of the
+-    Sections above.
+-
+-    b) Give prominent notice with the combined library of the fact
+-    that part of it is a work based on the Library, and explaining
+-    where to find the accompanying uncombined form of the same work.
+-
+-  8. You may not copy, modify, sublicense, link with, or distribute
+-the Library except as expressly provided under this License.  Any
+-attempt otherwise to copy, modify, sublicense, link with, or
+-distribute the Library is void, and will automatically terminate your
+-rights under this License.  However, parties who have received copies,
+-or rights, from you under this License will not have their licenses
+-terminated so long as such parties remain in full compliance.
+-
+-  9. You are not required to accept this License, since you have not
+-signed it.  However, nothing else grants you permission to modify or
+-distribute the Library or its derivative works.  These actions are
+-prohibited by law if you do not accept this License.  Therefore, by
+-modifying or distributing the Library (or any work based on the
+-Library), you indicate your acceptance of this License to do so, and
+-all its terms and conditions for copying, distributing or modifying
+-the Library or works based on it.
+-
+-  10. Each time you redistribute the Library (or any work based on the
+-Library), the recipient automatically receives a license from the
+-original licensor to copy, distribute, link with or modify the Library
+-subject to these terms and conditions.  You may not impose any further
+-restrictions on the recipients' exercise of the rights granted herein.
+-You are not responsible for enforcing compliance by third parties with
+-this License.
+-
+-  11. If, as a consequence of a court judgment or allegation of patent
+-infringement or for any other reason (not limited to patent issues),
+-conditions are imposed on you (whether by court order, agreement or
+-otherwise) that contradict the conditions of this License, they do not
+-excuse you from the conditions of this License.  If you cannot
+-distribute so as to satisfy simultaneously your obligations under this
+-License and any other pertinent obligations, then as a consequence you
+-may not distribute the Library at all.  For example, if a patent
+-license would not permit royalty-free redistribution of the Library by
+-all those who receive copies directly or indirectly through you, then
+-the only way you could satisfy both it and this License would be to
+-refrain entirely from distribution of the Library.
+-
+-If any portion of this section is held invalid or unenforceable under any
+-particular circumstance, the balance of the section is intended to apply,
+-and the section as a whole is intended to apply in other circumstances.
+-
+-It is not the purpose of this section to induce you to infringe any
+-patents or other property right claims or to contest validity of any
+-such claims; this section has the sole purpose of protecting the
+-integrity of the free software distribution system which is
+-implemented by public license practices.  Many people have made
+-generous contributions to the wide range of software distributed
+-through that system in reliance on consistent application of that
+-system; it is up to the author/donor to decide if he or she is willing
+-to distribute software through any other system and a licensee cannot
+-impose that choice.
+-
+-This section is intended to make thoroughly clear what is believed to
+-be a consequence of the rest of this License.
+-
+-  12. If the distribution and/or use of the Library is restricted in
+-certain countries either by patents or by copyrighted interfaces, the
+-original copyright holder who places the Library under this License may add
+-an explicit geographical distribution limitation excluding those countries,
+-so that distribution is permitted only in or among countries not thus
+-excluded.  In such case, this License incorporates the limitation as if
+-written in the body of this License.
+-
+-  13. The Free Software Foundation may publish revised and/or new
+-versions of the Lesser General Public License from time to time.
+-Such new versions will be similar in spirit to the present version,
+-but may differ in detail to address new problems or concerns.
+-
+-Each version is given a distinguishing version number.  If the Library
+-specifies a version number of this License which applies to it and
+-"any later version", you have the option of following the terms and
+-conditions either of that version or of any later version published by
+-the Free Software Foundation.  If the Library does not specify a
+-license version number, you may choose any version ever published by
+-the Free Software Foundation.
+-
+-  14. If you wish to incorporate parts of the Library into other free
+-programs whose distribution conditions are incompatible with these,
+-write to the author to ask for permission.  For software which is
+-copyrighted by the Free Software Foundation, write to the Free
+-Software Foundation; we sometimes make exceptions for this.  Our
+-decision will be guided by the two goals of preserving the free status
+-of all derivatives of our free software and of promoting the sharing
+-and reuse of software generally.
+-
+-                            NO WARRANTY
+-
+-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+-
+-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+-DAMAGES.
+-
+-                     END OF TERMS AND CONDITIONS
+-
+-           How to Apply These Terms to Your New Libraries
+-
+-  If you develop a new library, and you want it to be of the greatest
+-possible use to the public, we recommend making it free software that
+-everyone can redistribute and change.  You can do so by permitting
+-redistribution under these terms (or, alternatively, under the terms of the
+-ordinary General Public License).
+-
+-  To apply these terms, attach the following notices to the library.  It is
+-safest to attach them to the start of each source file to most effectively
+-convey the exclusion of warranty; and each file should have at least the
+-"copyright" line and a pointer to where the full notice is found.
+-
+-    <one line to give the library's name and a brief idea of what it does.>
+-    Copyright (C) <year>  <name of author>
+-
+-    This library is free software; you can redistribute it and/or
+-    modify it under the terms of the GNU Lesser General Public
+-    License as published by the Free Software Foundation; either
+-    version 2.1 of the License, or (at your option) any later version.
+-
+-    This library is distributed in the hope that it will be useful,
+-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-    Lesser General Public License for more details.
+-
+-    You should have received a copy of the GNU Lesser General Public
+-    License along with this library; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-
+-Also add information on how to contact you by electronic and paper mail.
+-
+-You should also get your employer (if you work as a programmer) or your
+-school, if any, to sign a "copyright disclaimer" for the library, if
+-necessary.  Here is a sample; alter the names:
+-
+-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+-
+-  <signature of Ty Coon>, 1 April 1990
+-  Ty Coon, President of Vice
+-
+-That's all there is to it!
+diff --git a/COPYING.README b/COPYING.README
+index de5b63215..11af93ca7 100644
+--- a/COPYING.README
++++ b/COPYING.README
+@@ -2,17 +2,5 @@ Eigen is primarily MPL2 licensed. See COPYING.MPL2 and these links:
+   http://www.mozilla.org/MPL/2.0/
+   http://www.mozilla.org/MPL/2.0/FAQ.html
+ 
+-Some files contain third-party code under BSD or LGPL licenses, whence the other
+-COPYING.* files here.
+-
+-All the LGPL code is either LGPL 2.1-only, or LGPL 2.1-or-later.
+-For this reason, the COPYING.LGPL file contains the LGPL 2.1 text.
+-
+-If you want to guarantee that the Eigen code that you are #including is licensed
+-under the MPL2 and possibly more permissive licenses (like BSD), #define this
+-preprocessor symbol:
+-  EIGEN_MPL2_ONLY
+-For example, with most compilers, you could add this to your project CXXFLAGS:
+-  -DEIGEN_MPL2_ONLY
+-This will cause a compilation error to be generated if you #include any code that is
+-LGPL licensed.
++Some files contain third-party code under BSD or other MPL2-compatible licenses,
++whence the other COPYING.* files here.
+\ No newline at end of file
+diff --git a/Eigen/src/Core/util/NonMPL2.h b/Eigen/src/Core/util/NonMPL2.h
+deleted file mode 100644
+index 1af67cf18..000000000
+--- a/Eigen/src/Core/util/NonMPL2.h
++++ /dev/null
+@@ -1,3 +0,0 @@
+-#ifdef EIGEN_MPL2_ONLY
+-#error Including non-MPL2 code in EIGEN_MPL2_ONLY mode
+-#endif
+diff --git a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h
+index 7803fd817..1a5d7faeb 100644
+--- a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h
++++ b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h
+@@ -24,8 +24,7 @@ namespace Eigen {
+   * \tparam Scalar the scalar type of the input matrices
+   * \tparam _UpLo The triangular part that will be used for the computations. It can be Lower
+     *               or Upper. Default is Lower.
+-  * \tparam _OrderingType The ordering method to use, either AMDOrdering<> or NaturalOrdering<>. Default is AMDOrdering<int>,
+-  *                       unless EIGEN_MPL2_ONLY is defined, in which case the default is NaturalOrdering<int>.
++  * \tparam _OrderingType The ordering method to use, either AMDOrdering<> or NaturalOrdering<>. Default is AMDOrdering<int>.
+   *
+   * \implsparsesolverconcept
+   *
+diff --git a/bench/tensors/eigen_sycl_bench.sh b/bench/tensors/eigen_sycl_bench.sh
+index 3f67b3d86..4cb8f7be4 100755
+--- a/bench/tensors/eigen_sycl_bench.sh
++++ b/bench/tensors/eigen_sycl_bench.sh
+@@ -10,7 +10,6 @@ benchmark_main.cc \
+ -march=native \
+ -O3 \
+ -DNDEBUG \
+--DEIGEN_MPL2_ONLY \
+ -DEIGEN_USE_SYCL=1 \
+ -DEIGEN_SYCL_LOCAL_MEM=1 \
+ -no-serial-memop \
+diff --git a/bench/tensors/eigen_sycl_bench_contract.sh b/bench/tensors/eigen_sycl_bench_contract.sh
+index 73fd6c4a0..3ab0138a1 100644
+--- a/bench/tensors/eigen_sycl_bench_contract.sh
++++ b/bench/tensors/eigen_sycl_bench_contract.sh
+@@ -1,7 +1,7 @@
+ rm -f tensor_contract_sycl_bench
+ : "${COMPUTECPP_PACKAGE_ROOT_DIR:?Need to set COMPUTECPP_PACKAGE_ROOT_DIR}"
+ echo "COMPUTECPP_PACKAGE_ROOT_DIR is set to: "$COMPUTECPP_PACKAGE_ROOT_DIR
+-${COMPUTECPP_PACKAGE_ROOT_DIR}/bin/compute++  tensor_contract_sycl_bench.cc -I ../../ -I ${COMPUTECPP_PACKAGE_ROOT_DIR}/include/ -std=c++11 -O3 -DNDEBUG -DEIGEN_MPL2_ONLY -DEIGEN_USE_SYCL=1 -no-serial-memop -mllvm -inline-threshold=10000 -fsycl-ih-last -sycl-driver -Xclang -cl-mad-enable -lOpenCL -lComputeCpp -lpthread -o tensor_contract_sycl_bench ${@:1}
++${COMPUTECPP_PACKAGE_ROOT_DIR}/bin/compute++  tensor_contract_sycl_bench.cc -I ../../ -I ${COMPUTECPP_PACKAGE_ROOT_DIR}/include/ -std=c++11 -O3 -DNDEBUG -DEIGEN_USE_SYCL=1 -no-serial-memop -mllvm -inline-threshold=10000 -fsycl-ih-last -sycl-driver -Xclang -cl-mad-enable -lOpenCL -lComputeCpp -lpthread -o tensor_contract_sycl_bench ${@:1}
+ export LD_LIBRARY_PATH=${COMPUTECPP_PACKAGE_ROOT_DIR}/lib:$LD_LIBRARY_PATH
+ ./tensor_contract_sycl_bench
+ 
+diff --git a/doc/PreprocessorDirectives.dox b/doc/PreprocessorDirectives.dox
+index 0f545b086..b7d59ccbc 100644
+--- a/doc/PreprocessorDirectives.dox
++++ b/doc/PreprocessorDirectives.dox
+@@ -92,9 +92,6 @@ run time. However, these assertions do cost time and can thus be turned off.
+  - \b eigen_assert - macro with one argument that is used inside %Eigen for assertions. By default, it is
+    basically defined to be \c assert, which aborts the program if the assertion is violated. Redefine this
+    macro if you want to do something else, like throwing an exception.
+- - \b EIGEN_MPL2_ONLY - disable non MPL2 compatible features, or in other words disable the features which
+-   are still under the LGPL.
+-
+ 
+ \section TopicPreprocessorDirectivesPerformance Alignment, vectorization and performance tweaking
+ 
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 5136f82aa..9f557743a 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -277,7 +277,6 @@ ei_add_test(special_numbers)
+ ei_add_test(rvalue_types)
+ ei_add_test(dense_storage)
+ ei_add_test(ctorleak)
+-ei_add_test(mpl2only)
+ ei_add_test(inplace_decomposition)
+ ei_add_test(half_float)
+ ei_add_test(bfloat16_float)
+diff --git a/test/mpl2only.cpp b/test/mpl2only.cpp
+deleted file mode 100644
+index 296350d08..000000000
+--- a/test/mpl2only.cpp
++++ /dev/null
+@@ -1,24 +0,0 @@
+-// This file is part of Eigen, a lightweight C++ template library
+-// for linear algebra.
+-//
+-// Copyright (C) 2015 Gael Guennebaud <gael.guennebaud@inria.fr>
+-//
+-// This Source Code Form is subject to the terms of the Mozilla
+-// Public 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/.
+-
+-#ifndef EIGEN_MPL2_ONLY
+-#define EIGEN_MPL2_ONLY
+-#endif
+-#include <Eigen/Dense>
+-#include <Eigen/SparseCore>
+-#include <Eigen/SparseLU>
+-#include <Eigen/SparseQR>
+-#include <Eigen/Sparse>
+-#include <Eigen/IterativeLinearSolvers>
+-#include <Eigen/Eigen>
+-
+-int main()
+-{
+-  return 0;
+-}
+diff --git a/unsupported/Eigen/IterativeSolvers b/unsupported/Eigen/IterativeSolvers
+index a3f58d676..f045fb607 100644
+--- a/unsupported/Eigen/IterativeSolvers
++++ b/unsupported/Eigen/IterativeSolvers
+@@ -19,7 +19,6 @@
+   * \defgroup IterativeLinearSolvers_Module Iterative solvers module
+   * This module aims to provide various iterative linear and non linear solver algorithms.
+   * It currently provides:
+-  *  - a constrained conjugate gradient
+   *  - a Householder GMRES implementation
+   *  - an IDR(s) implementation
+   *  - a DGMRES implementation
+@@ -33,11 +32,6 @@
+ 
+ #include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
+ 
+-#ifndef EIGEN_MPL2_ONLY
+-#include "src/IterativeSolvers/IterationController.h"
+-#include "src/IterativeSolvers/ConstrainedConjGrad.h"
+-#endif
+-
+ #include "src/IterativeSolvers/IncompleteLU.h"
+ #include "src/IterativeSolvers/GMRES.h"
+ #include "src/IterativeSolvers/DGMRES.h"
+diff --git a/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h b/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
+deleted file mode 100644
+index e7d70f39d..000000000
+--- a/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
++++ /dev/null
+@@ -1,187 +0,0 @@
+-// This file is part of Eigen, a lightweight C++ template library
+-// for linear algebra.
+-//
+-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.fr>
+-
+-/* NOTE The functions of this file have been adapted from the GMM++ library */
+-
+-//========================================================================
+-//
+-// Copyright (C) 2002-2007 Yves Renard
+-//
+-// This file is a part of GETFEM++
+-//
+-// Getfem++ is free software; you can redistribute it and/or modify
+-// it under the terms of the GNU Lesser General Public License as
+-// published by the Free Software Foundation; version 2.1 of the License.
+-//
+-// This program is distributed in the hope that it will be useful,
+-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-// GNU Lesser General Public License for more details.
+-// You should have received a copy of the GNU Lesser General Public
+-// License along with this program; if not, write to the Free Software
+-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301,
+-// USA.
+-//
+-//========================================================================
+-
+-#include "../../../../Eigen/src/Core/util/NonMPL2.h"
+-
+-#ifndef EIGEN_CONSTRAINEDCG_H
+-#define EIGEN_CONSTRAINEDCG_H
+-
+-#include "../../../../Eigen/Core"
+-
+-namespace Eigen { 
+-
+-namespace internal {
+-
+-/** \ingroup IterativeLinearSolvers_Module
+-  * Compute the pseudo inverse of the non-square matrix C such that
+-  * \f$ CINV = (C * C^T)^{-1} * C \f$ based on a conjugate gradient method.
+-  *
+-  * This function is internally used by constrained_cg.
+-  */
+-template <typename CMatrix, typename CINVMatrix>
+-void pseudo_inverse(const CMatrix &C, CINVMatrix &CINV)
+-{
+-  // optimisable : copie de la ligne, precalcul de C * trans(C).
+-  typedef typename CMatrix::Scalar Scalar;
+-  typedef typename CMatrix::Index Index;
+-  // FIXME use sparse vectors ?
+-  typedef Matrix<Scalar,Dynamic,1> TmpVec;
+-
+-  Index rows = C.rows(), cols = C.cols();
+-
+-  TmpVec d(rows), e(rows), l(cols), p(rows), q(rows), r(rows);
+-  Scalar rho, rho_1, alpha;
+-  d.setZero();
+-
+-  typedef Triplet<double> T;
+-  std::vector<T> tripletList;
+-    
+-  for (Index i = 0; i < rows; ++i)
+-  {
+-    d[i] = 1.0;
+-    rho = 1.0;
+-    e.setZero();
+-    r = d;
+-    p = d;
+-
+-    while (rho >= 1e-38)
+-    { /* conjugate gradient to compute e             */
+-      /* which is the i-th row of inv(C * trans(C))  */
+-      l = C.transpose() * p;
+-      q = C * l;
+-      alpha = rho / p.dot(q);
+-      e +=  alpha * p;
+-      r += -alpha * q;
+-      rho_1 = rho;
+-      rho = r.dot(r);
+-      p = (rho/rho_1) * p + r;
+-    }
+-
+-    l = C.transpose() * e; // l is the i-th row of CINV
+-    // FIXME add a generic "prune/filter" expression for both dense and sparse object to sparse
+-    for (Index j=0; j<l.size(); ++j)
+-      if (l[j]<1e-15)
+-       tripletList.push_back(T(i,j,l(j)));
+-
+-       
+-    d[i] = 0.0;
+-  }
+-  CINV.setFromTriplets(tripletList.begin(), tripletList.end());
+-}
+-
+-
+-
+-/** \ingroup IterativeLinearSolvers_Module
+-  * Constrained conjugate gradient
+-  *
+-  * Computes the minimum of \f$ 1/2((Ax).x) - bx \f$ under the constraint \f$ Cx \le f \f$
+-  */
+-template<typename TMatrix, typename CMatrix,
+-         typename VectorX, typename VectorB, typename VectorF>
+-void constrained_cg(const TMatrix& A, const CMatrix& C, VectorX& x,
+-                       const VectorB& b, const VectorF& f, IterationController &iter)
+-{
+-  using std::sqrt;
+-  typedef typename TMatrix::Scalar Scalar;
+-  typedef typename TMatrix::Index Index;
+-  typedef Matrix<Scalar,Dynamic,1>  TmpVec;
+-
+-  Scalar rho = 1.0, rho_1, lambda, gamma;
+-  Index xSize = x.size();
+-  TmpVec  p(xSize), q(xSize), q2(xSize),
+-          r(xSize), old_z(xSize), z(xSize),
+-          memox(xSize);
+-  std::vector<bool> satured(C.rows());
+-  p.setZero();
+-  iter.setRhsNorm(sqrt(b.dot(b))); // gael vect_sp(PS, b, b)
+-  if (iter.rhsNorm() == 0.0) iter.setRhsNorm(1.0);
+-
+-  SparseMatrix<Scalar,RowMajor> CINV(C.rows(), C.cols());
+-  pseudo_inverse(C, CINV);
+-
+-  while(true)
+-  {
+-    // computation of residual
+-    old_z = z;
+-    memox = x;
+-    r = b;
+-    r += A * -x;
+-    z = r;
+-    bool transition = false;
+-    for (Index i = 0; i < C.rows(); ++i)
+-    {
+-      Scalar al = C.row(i).dot(x) - f.coeff(i);
+-      if (al >= -1.0E-15)
+-      {
+-        if (!satured[i])
+-        {
+-          satured[i] = true;
+-          transition = true;
+-        }
+-        Scalar bb = CINV.row(i).dot(z);
+-        if (bb > 0.0)
+-          // FIXME: we should allow that: z += -bb * C.row(i);
+-          for (typename CMatrix::InnerIterator it(C,i); it; ++it)
+-            z.coeffRef(it.index()) -= bb*it.value();
+-      }
+-      else
+-        satured[i] = false;
+-    }
+-
+-    // descent direction
+-    rho_1 = rho;
+-    rho = r.dot(z);
+-
+-    if (iter.finished(rho)) break;
+-    if (transition || iter.first()) gamma = 0.0;
+-    else gamma = (std::max)(0.0, (rho - old_z.dot(z)) / rho_1);
+-    p = z + gamma*p;
+-
+-    ++iter;
+-    // one dimensionnal optimization
+-    q = A * p;
+-    lambda = rho / q.dot(p);
+-    for (Index i = 0; i < C.rows(); ++i)
+-    {
+-      if (!satured[i])
+-      {
+-        Scalar bb = C.row(i).dot(p) - f[i];
+-        if (bb > 0.0)
+-          lambda = (std::min)(lambda, (f.coeff(i)-C.row(i).dot(x)) / bb);
+-      }
+-    }
+-    x += lambda * p;
+-    memox -= x;
+-  }
+-}
+-
+-} // end namespace internal
+-
+-} // end namespace Eigen
+-
+-#endif // EIGEN_CONSTRAINEDCG_H
+diff --git a/unsupported/Eigen/src/IterativeSolvers/IterationController.h b/unsupported/Eigen/src/IterativeSolvers/IterationController.h
+deleted file mode 100644
+index a116e09e2..000000000
+--- a/unsupported/Eigen/src/IterativeSolvers/IterationController.h
++++ /dev/null
+@@ -1,154 +0,0 @@
+-// This file is part of Eigen, a lightweight C++ template library
+-// for linear algebra.
+-//
+-// Copyright (C) 2008-2009 Gael Guennebaud <gael.guennebaud@inria.fr>
+-
+-/* NOTE The class IterationController has been adapted from the iteration
+- *      class of the GMM++ and ITL libraries.
+- */
+-
+-//=======================================================================
+-// Copyright (C) 1997-2001
+-// Authors: Andrew Lumsdaine <lums@osl.iu.edu> 
+-//          Lie-Quan Lee     <llee@osl.iu.edu>
+-//
+-// This file is part of the Iterative Template Library
+-//
+-// You should have received a copy of the License Agreement for the
+-// Iterative Template Library along with the software;  see the
+-// file LICENSE.  
+-//
+-// Permission to modify the code and to distribute modified code is
+-// granted, provided the text of this NOTICE is retained, a notice that
+-// the code was modified is included with the above COPYRIGHT NOTICE and
+-// with the COPYRIGHT NOTICE in the LICENSE file, and that the LICENSE
+-// file is distributed with the modified code.
+-//
+-// LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.
+-// By way of example, but not limitation, Licensor MAKES NO
+-// REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
+-// PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE COMPONENTS
+-// OR DOCUMENTATION WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS
+-// OR OTHER RIGHTS.
+-//=======================================================================
+-
+-//========================================================================
+-//
+-// Copyright (C) 2002-2007 Yves Renard
+-//
+-// This file is a part of GETFEM++
+-//
+-// Getfem++ is free software; you can redistribute it and/or modify
+-// it under the terms of the GNU Lesser General Public License as
+-// published by the Free Software Foundation; version 2.1 of the License.
+-//
+-// This program is distributed in the hope that it will be useful,
+-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-// GNU Lesser General Public License for more details.
+-// You should have received a copy of the GNU Lesser General Public
+-// License along with this program; if not, write to the Free Software
+-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301,
+-// USA.
+-//
+-//========================================================================
+-
+-#include "../../../../Eigen/src/Core/util/NonMPL2.h"
+-
+-#ifndef EIGEN_ITERATION_CONTROLLER_H
+-#define EIGEN_ITERATION_CONTROLLER_H
+-
+-namespace Eigen { 
+-
+-/** \ingroup IterativeLinearSolvers_Module
+-  * \class IterationController
+-  *
+-  * \brief Controls the iterations of the iterative solvers
+-  *
+-  * This class has been adapted from the iteration class of GMM++ and ITL libraries.
+-  *
+-  */
+-class IterationController
+-{
+-  protected :
+-    double m_rhsn;        ///< Right hand side norm
+-    size_t m_maxiter;     ///< Max. number of iterations
+-    int m_noise;          ///< if noise > 0 iterations are printed
+-    double m_resmax;      ///< maximum residual
+-    double m_resminreach, m_resadd;
+-    size_t m_nit;         ///< iteration number
+-    double m_res;         ///< last computed residual
+-    bool m_written;
+-    void (*m_callback)(const IterationController&);
+-  public :
+-
+-    void init()
+-    {
+-      m_nit = 0; m_res = 0.0; m_written = false;
+-      m_resminreach = 1E50; m_resadd = 0.0;
+-      m_callback = 0;
+-    }
+-
+-    IterationController(double r = 1.0E-8, int noi = 0, size_t mit = size_t(-1))
+-      : m_rhsn(1.0), m_maxiter(mit), m_noise(noi), m_resmax(r) { init(); }
+-
+-    void operator ++(int) { m_nit++; m_written = false; m_resadd += m_res; }
+-    void operator ++() { (*this)++; }
+-
+-    bool first() { return m_nit == 0; }
+-
+-    /* get/set the "noisyness" (verbosity) of the solvers */
+-    int noiseLevel() const { return m_noise; }
+-    void setNoiseLevel(int n) { m_noise = n; }
+-    void reduceNoiseLevel() { if (m_noise > 0) m_noise--; }
+-
+-    double maxResidual() const { return m_resmax; }
+-    void setMaxResidual(double r) { m_resmax = r; }
+-
+-    double residual() const { return m_res; }
+-
+-    /* change the user-definable callback, called after each iteration */
+-    void setCallback(void (*t)(const IterationController&))
+-    {
+-      m_callback = t;
+-    }
+-
+-    size_t iteration() const { return m_nit; }
+-    void setIteration(size_t i) { m_nit = i; }
+-
+-    size_t maxIterarions() const { return m_maxiter; }
+-    void setMaxIterations(size_t i) { m_maxiter = i; }
+-
+-    double rhsNorm() const { return m_rhsn; }
+-    void setRhsNorm(double r) { m_rhsn = r; }
+-
+-    bool converged() const { return m_res <= m_rhsn * m_resmax; }
+-    bool converged(double nr)
+-    {
+-      using std::abs;
+-      m_res = abs(nr); 
+-      m_resminreach = (std::min)(m_resminreach, m_res);
+-      return converged();
+-    }
+-    template<typename VectorType> bool converged(const VectorType &v)
+-    { return converged(v.squaredNorm()); }
+-
+-    bool finished(double nr)
+-    {
+-      if (m_callback) m_callback(*this);
+-      if (m_noise > 0 && !m_written)
+-      {
+-        converged(nr);
+-        m_written = true;
+-      }
+-      return (m_nit >= m_maxiter || converged(nr));
+-    }
+-    template <typename VectorType>
+-    bool finished(const MatrixBase<VectorType> &v)
+-    { return finished(double(v.squaredNorm())); }
+-
+-};
+-
+-} // end namespace Eigen
+-
+-#endif // EIGEN_ITERATION_CONTROLLER_H
diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb
index 72044427dd..f5f874941a 100644
--- a/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb
+++ b/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb
@@ -1,20 +1,24 @@
 DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms."
 HOMEPAGE = "http://eigen.tuxfamily.org/"
-LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPL-2.0-only & LGPL-2.1-only & MINPACK"
+LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPL-2.0-only & Minpack"
+# The GPL code is only used for benchmark tests and does not affect what is installed.
+LICENSE:${PN} = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & Minpack"
+LICENSE:${PN}-dbg = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & Minpack"
+LICENSE:${PN}-dev = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & Minpack"
 LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \
+                    file://COPYING.APACHE;md5=8de23b8e93c63005353056b2475e9aa5 \
                     file://COPYING.BSD;md5=2dd0510ee95e59ca28834b875bc96596 \
                     file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
                     file://COPYING.MINPACK;md5=71d91b0f75ce79a75d3108a72bef8116 \
 "
 
 SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \
     file://0001-Default-eigen_packet_wrapper-constructor.patch \
+    file://0002-Remove-LGPL-Code-and-references.patch \
 "
 
 SRCREV = "3147391d946bb4b6c68edd901f2add6ac1f31f8c"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-support/libestr/libestr_0.1.11.bb b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb
index 2ebf2757d7..2490947f5d 100644
--- a/meta-oe/recipes-support/libestr/libestr_0.1.11.bb
+++ b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb
@@ -5,9 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9d6c993486c18262afba4ca5bcb894d0"
 
 SRC_URI = "http://libestr.adiscon.com/files/download/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "1f25a2332750d4bfacfb314235fedff0"
 SRC_URI[sha256sum] = "46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024"
 
 UPSTREAM_CHECK_URI = "http://libestr.adiscon.com/download/"
 
+CVE_PRODUCT = "adiscon:libestr"
+
 inherit autotools
diff --git a/meta-oe/recipes-support/libfann/libfann_git.bb b/meta-oe/recipes-support/libfann/libfann_git.bb
index 40f91ac43d..2f68ea95a8 100644
--- a/meta-oe/recipes-support/libfann/libfann_git.bb
+++ b/meta-oe/recipes-support/libfann/libfann_git.bb
@@ -14,6 +14,5 @@ SRC_URI = "git://github.com/libfann/fann.git;branch=master;protocol=https \
 
 PV = "2.2.0+git"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
diff --git a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb b/meta-oe/recipes-support/libfido2/libfido2_1.16.0.bb
index d453d0ab97..09d34603d6 100644
--- a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb
+++ b/meta-oe/recipes-support/libfido2/libfido2_1.16.0.bb
@@ -7,10 +7,10 @@ LICENSE = "BSD-2-Clause"
 SECTION = "libs/network"
 DEPENDS = "libcbor openssl zlib udev"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5f14cb32bdf2b87063e0a2d20c4178d0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=20be19aaa222f71738712b26f7f8717b"
 
 SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz"
-SRC_URI[sha256sum] = "3601792e320032d428002c4cce8499a4c7b803319051a25a0c9f1f138ffee45a"
+SRC_URI[sha256sum] = "8c2b6fb279b5b42e9ac92ade71832e485852647b53607c43baaafbbcecea04e4"
 
 inherit cmake pkgconfig manpages
 
diff --git a/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch b/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch
new file mode 100644
index 0000000000..b2735f8059
--- /dev/null
+++ b/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch
@@ -0,0 +1,45 @@
+From cdb28383402d248dbc6062f4391b038375c52385 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 17 Jul 2020 21:25:03 +0200
+Subject: [PATCH] CMakeLists.txt: fix paths when FTDIPP is set
+
+Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP
+is enabled as suggested by Aurelien Jarno in
+http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html
+
+Without this change, the libftdi1.pc config file defines the include
+path as /usr/local/include/libftdipp1 while the ftdi.h file is actually
+installed in /usr/local/include/libftdi1
+
+This is an issue for example for libsigrok which will fail on:
+
+In file included from src/hardware/asix-sigma/protocol.c:27:
+src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory
+   28 | #include <ftdi.h>
+      |          ^~~~~~~~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Upstream-Status: Backport [http://developer.intra2net.com/git/?p=libftdi;a=patch;h=cdb28383402d248dbc6062f4391b038375c52385]
+---
+ CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5aecafc..3b0b87c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -136,7 +136,7 @@ endif ()
+
+ add_subdirectory(src)
+ if ( FTDIPP )
+-  project(libftdipp1 C CXX)
++  project(libftdi1 C CXX)
+   add_subdirectory(ftdipp)
+ endif ()
+ if ( PYTHON_BINDINGS )
+--
+1.7.1
+
diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.5.bb b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb
index eae1c02f04..8c30eca0e7 100644
--- a/meta-oe/recipes-support/libftdi/libftdi_1.5.bb
+++ b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb
@@ -4,17 +4,22 @@ including the popular bitbang mode."
 HOMEPAGE = "http://www.intra2net.com/en/developer/libftdi/"
 SECTION = "libs"
 LICENSE = "LGPL-2.1-only & GPL-2.0-only"
-LIC_FILES_CHKSUM= "\
+LIC_FILES_CHKSUM = "\
     file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \
     file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
 "
 
 DEPENDS = "libusb1 python3 swig-native"
 
-SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2"
+SRC_URI = "\
+    http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2 \
+    file://CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch \
+"
 SRC_URI[sha256sum] = "7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049"
 
-S = "${WORKDIR}/${BPN}1-${PV}"
+UPSTREAM_CHECK_URI = "http://www.intra2net.com/en/developer/libftdi/download.php"
+
+S = "${UNPACKDIR}/${BPN}1-${PV}"
 
 inherit cmake binconfig pkgconfig python3native
 
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch
deleted file mode 100644
index ac1eff510b..0000000000
--- a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch
+++ /dev/null
@@ -1,530 +0,0 @@
-From 0d3e1b3923a1fac80e9d75d8b5e33cd36f4fe659 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 May 2024 09:03:22 -0700
-Subject: [PATCH] bindings: cxx: Migrate C++ tests to use Catch2 v3
-
-Catch2 v3.x has API changes which needs to be addressed
-in the tests themselves, hence this changeset is to fix
-those.
-
-Upstream-Status: Submitted [https://lore.kernel.org/linux-gpio/20240531184223.3949069-1-raj.khem@gmail.com/T/#u]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
----
- bindings/cxx/tests/Makefile.am              |  2 +-
- bindings/cxx/tests/gpiod-cxx-test-main.cpp  |  3 +--
- bindings/cxx/tests/helpers.hpp              |  8 +++---
- bindings/cxx/tests/tests-chip-info.cpp      | 30 ++++++++++-----------
- bindings/cxx/tests/tests-chip.cpp           | 14 +++++-----
- bindings/cxx/tests/tests-edge-event.cpp     |  2 +-
- bindings/cxx/tests/tests-info-event.cpp     |  2 +-
- bindings/cxx/tests/tests-line-config.cpp    |  2 +-
- bindings/cxx/tests/tests-line-info.cpp      | 22 +++++++--------
- bindings/cxx/tests/tests-line-request.cpp   | 16 +++++------
- bindings/cxx/tests/tests-line-settings.cpp  |  2 +-
- bindings/cxx/tests/tests-line.cpp           |  2 +-
- bindings/cxx/tests/tests-misc.cpp           |  2 +-
- bindings/cxx/tests/tests-request-config.cpp | 10 +++----
- configure.ac                                |  4 +--
- 15 files changed, 60 insertions(+), 61 deletions(-)
-
-diff --git a/bindings/cxx/tests/Makefile.am b/bindings/cxx/tests/Makefile.am
-index fbf80a1..d9284da 100644
---- a/bindings/cxx/tests/Makefile.am
-+++ b/bindings/cxx/tests/Makefile.am
-@@ -4,7 +4,7 @@
- AM_CXXFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include
- AM_CXXFLAGS += -I$(top_srcdir)/tests/gpiosim/
- AM_CXXFLAGS += -Wall -Wextra -g -std=gnu++17 $(CATCH2_CFLAGS)
--AM_LDFLAGS = -pthread
-+AM_LDFLAGS = -pthread $(CATCH2_LIBS)
- LDADD = $(top_builddir)/bindings/cxx/libgpiodcxx.la
- LDADD += $(top_builddir)/tests/gpiosim/libgpiosim.la
- 
-diff --git a/bindings/cxx/tests/gpiod-cxx-test-main.cpp b/bindings/cxx/tests/gpiod-cxx-test-main.cpp
-index 11bf8e5..ec48286 100644
---- a/bindings/cxx/tests/gpiod-cxx-test-main.cpp
-+++ b/bindings/cxx/tests/gpiod-cxx-test-main.cpp
-@@ -1,5 +1,4 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2017-2021 Bartosz Golaszewski <bartekgola@gmail.com>
- 
--#define CATCH_CONFIG_MAIN
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
-diff --git a/bindings/cxx/tests/helpers.hpp b/bindings/cxx/tests/helpers.hpp
-index 62d9827..62bbdf5 100644
---- a/bindings/cxx/tests/helpers.hpp
-+++ b/bindings/cxx/tests/helpers.hpp
-@@ -4,13 +4,13 @@
- #ifndef __GPIOD_CXX_TEST_HELPERS_HPP__
- #define __GPIOD_CXX_TEST_HELPERS_HPP__
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <regex>
- #include <string>
- #include <sstream>
- #include <system_error>
- 
--class system_error_matcher : public Catch::MatcherBase<::std::system_error>
-+class system_error_matcher : public Catch::Matchers::MatcherBase<::std::system_error>
- {
- public:
-        explicit system_error_matcher(int expected_errno);
-@@ -21,7 +21,7 @@ private:
-        ::std::error_condition _m_cond;
- };
- 
--class regex_matcher : public Catch::MatcherBase<::std::string>
-+class regex_matcher : public Catch::Matchers::MatcherBase<::std::string>
- {
- public:
-        explicit regex_matcher(const ::std::string& pattern);
-@@ -33,7 +33,7 @@ private:
-        ::std::string _m_repr;
- };
- 
--template<class T> class stringify_matcher : public Catch::MatcherBase<T>
-+template<class T> class stringify_matcher : public Catch::Matchers::MatcherBase<T>
- {
- public:
-        explicit stringify_matcher(const ::std::string& expected) : _m_expected(expected)
-diff --git a/bindings/cxx/tests/tests-chip-info.cpp b/bindings/cxx/tests/tests-chip-info.cpp
-index 717c387..2c54f53 100644
---- a/bindings/cxx/tests/tests-chip-info.cpp
-+++ b/bindings/cxx/tests/tests-chip-info.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- #include <sstream>
- 
-@@ -24,12 +24,12 @@ TEST_CASE("chip_info properties can be read", "[chip-info][chip]")
- 
-        SECTION("get chip name")
-        {
--               REQUIRE_THAT(info.name(), Catch::Equals(sim.name()));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name()));
-        }
- 
-        SECTION("get chip label")
-        {
--               REQUIRE_THAT(info.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("get num_lines")
-@@ -52,12 +52,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
-        {
-                auto copy(info);
- 
--               REQUIRE_THAT(copy.name(), Catch::Equals(sim.name()));
--               REQUIRE_THAT(copy.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(copy.num_lines() == 4);
- 
--               REQUIRE_THAT(info.name(), Catch::Equals(sim.name()));
--               REQUIRE_THAT(info.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(info.num_lines() == 4);
-        }
- 
-@@ -67,12 +67,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
- 
-                copy = info;
- 
--               REQUIRE_THAT(copy.name(), Catch::Equals(sim.name()));
--               REQUIRE_THAT(copy.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(copy.num_lines() == 4);
- 
--               REQUIRE_THAT(info.name(), Catch::Equals(sim.name()));
--               REQUIRE_THAT(info.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(info.num_lines() == 4);
-        }
- 
-@@ -80,8 +80,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
-        {
-                auto moved(std::move(info));
- 
--               REQUIRE_THAT(moved.name(), Catch::Equals(sim.name()));
--               REQUIRE_THAT(moved.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(moved.num_lines() == 4);
-        }
- 
-@@ -91,8 +91,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
- 
-                moved = ::std::move(info);
- 
--               REQUIRE_THAT(moved.name(), Catch::Equals(sim.name()));
--               REQUIRE_THAT(moved.label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name()));
-+               REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(moved.num_lines() == 4);
-        }
- }
-diff --git a/bindings/cxx/tests/tests-chip.cpp b/bindings/cxx/tests/tests-chip.cpp
-index c5ec19b..1ab7add 100644
---- a/bindings/cxx/tests/tests-chip.cpp
-+++ b/bindings/cxx/tests/tests-chip.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- #include <sstream>
- #include <system_error>
-@@ -48,9 +48,9 @@ TEST_CASE("chip constructor works", "[chip]")
-                        .build();
- 
-                ::gpiod::chip first(sim.dev_path());
--               REQUIRE_THAT(first.get_info().label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(first.get_info().label(), Catch::Matchers::Equals("foobar"));
-                ::gpiod::chip second(::std::move(first));
--               REQUIRE_THAT(second.get_info().label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(second.get_info().label(), Catch::Matchers::Equals("foobar"));
-        }
- }
- 
-@@ -70,9 +70,9 @@ TEST_CASE("chip operators work", "[chip]")
- 
-                ::gpiod::chip moved_chip(moved_sim.dev_path());
- 
--               REQUIRE_THAT(chip.get_info().label(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("foobar"));
-                chip = ::std::move(moved_chip);
--               REQUIRE_THAT(chip.get_info().label(), Catch::Equals("moved"));
-+               REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("moved"));
-        }
- 
-        SECTION("boolean operator")
-@@ -94,7 +94,7 @@ TEST_CASE("chip properties can be read", "[chip]")
- 
-        SECTION("get device path")
-        {
--               REQUIRE_THAT(chip.path(), Catch::Equals(sim.dev_path()));
-+               REQUIRE_THAT(chip.path(), Catch::Matchers::Equals(sim.dev_path()));
-        }
- 
-        SECTION("get file descriptor")
-@@ -169,7 +169,7 @@ TEST_CASE("stream insertion operator works for chip", "[chip]")
-                            "\", label=\"foobar\", num_lines=4))";
- 
-                buf << chip;
--               REQUIRE_THAT(buf.str(), Catch::Equals(expected.str()));
-+               REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str()));
-        }
- 
-        SECTION("closed chip")
-diff --git a/bindings/cxx/tests/tests-edge-event.cpp b/bindings/cxx/tests/tests-edge-event.cpp
-index 19a6ab3..db387be 100644
---- a/bindings/cxx/tests/tests-edge-event.cpp
-+++ b/bindings/cxx/tests/tests-edge-event.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <chrono>
- #include <gpiod.hpp>
- #include <sstream>
-diff --git a/bindings/cxx/tests/tests-info-event.cpp b/bindings/cxx/tests/tests-info-event.cpp
-index 21c0ef0..f7ae309 100644
---- a/bindings/cxx/tests/tests-info-event.cpp
-+++ b/bindings/cxx/tests/tests-info-event.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <chrono>
- #include <filesystem>
- #include <gpiod.hpp>
-diff --git a/bindings/cxx/tests/tests-line-config.cpp b/bindings/cxx/tests/tests-line-config.cpp
-index 5e439a1..2f510fb 100644
---- a/bindings/cxx/tests/tests-line-config.cpp
-+++ b/bindings/cxx/tests/tests-line-config.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- 
- #include "gpiosim.hpp"
-diff --git a/bindings/cxx/tests/tests-line-info.cpp b/bindings/cxx/tests/tests-line-info.cpp
-index 21211f2..8589da3 100644
---- a/bindings/cxx/tests/tests-line-info.cpp
-+++ b/bindings/cxx/tests/tests-line-info.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- #include <string>
- 
-@@ -35,9 +35,9 @@ TEST_CASE("get_line_info() works", "[chip][line-info]")
-                auto info = chip.get_line_info(0);
- 
-                REQUIRE(info.offset() == 0);
--               REQUIRE_THAT(info.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(info.used());
--               REQUIRE_THAT(info.consumer(), Catch::Equals("hog"));
-+               REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("hog"));
-                REQUIRE(info.direction() == ::gpiod::line::direction::OUTPUT);
-                REQUIRE_FALSE(info.active_low());
-                REQUIRE(info.bias() == ::gpiod::line::bias::UNKNOWN);
-@@ -74,9 +74,9 @@ TEST_CASE("line properties can be retrieved", "[line-info]")
-                auto info6 = chip.get_line_info(6);
- 
-                REQUIRE(info4.offset() == 4);
--               REQUIRE_THAT(info4.name(), Catch::Equals("baz"));
-+               REQUIRE_THAT(info4.name(), Catch::Matchers::Equals("baz"));
-                REQUIRE(info4.used());
--               REQUIRE_THAT(info4.consumer(), Catch::Equals("hog4"));
-+               REQUIRE_THAT(info4.consumer(), Catch::Matchers::Equals("hog4"));
-                REQUIRE(info4.direction() == direction::OUTPUT);
-                REQUIRE(info4.edge_detection() == edge::NONE);
-                REQUIRE_FALSE(info4.active_low());
-@@ -102,10 +102,10 @@ TEST_CASE("line_info can be copied and moved")
-        {
-                auto copy(info);
-                REQUIRE(copy.offset() == 2);
--               REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
-                /* info can still be used */
-                REQUIRE(info.offset() == 2);
--               REQUIRE_THAT(info.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("assignment operator works")
-@@ -113,17 +113,17 @@ TEST_CASE("line_info can be copied and moved")
-                auto copy = chip.get_line_info(0);
-                copy = info;
-                REQUIRE(copy.offset() == 2);
--               REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
-                /* info can still be used */
-                REQUIRE(info.offset() == 2);
--               REQUIRE_THAT(info.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("move constructor works")
-        {
-                auto copy(::std::move(info));
-                REQUIRE(copy.offset() == 2);
--               REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("move assignment operator works")
-@@ -131,7 +131,7 @@ TEST_CASE("line_info can be copied and moved")
-                auto copy = chip.get_line_info(0);
-                copy = ::std::move(info);
-                REQUIRE(copy.offset() == 2);
--               REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
-        }
- }
- 
-diff --git a/bindings/cxx/tests/tests-line-request.cpp b/bindings/cxx/tests/tests-line-request.cpp
-index 9632ae0..af8b979 100644
---- a/bindings/cxx/tests/tests-line-request.cpp
-+++ b/bindings/cxx/tests/tests-line-request.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- #include <sstream>
- #include <stdexcept>
-@@ -20,7 +20,7 @@ using pull = ::gpiosim::chip::pull;
- 
- namespace {
- 
--class value_matcher : public Catch::MatcherBase<value>
-+class value_matcher : public Catch::Matchers::MatcherBase<value>
- {
- public:
-        value_matcher(pull pull, bool active_low = false)
-@@ -117,7 +117,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]")
-                auto info = chip.get_line_info(2);
- 
-                REQUIRE(info.used());
--               REQUIRE_THAT(info.consumer(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("empty consumer")
-@@ -130,7 +130,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]")
-                auto info = chip.get_line_info(2);
- 
-                REQUIRE(info.used());
--               REQUIRE_THAT(info.consumer(), Catch::Equals("?"));
-+               REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("?"));
-        }
- }
- 
-@@ -380,7 +380,7 @@ TEST_CASE("line_request can be moved", "[line-request]")
-                auto moved(::std::move(request));
- 
-                REQUIRE(moved.fd() == fd);
--               REQUIRE_THAT(moved.offsets(), Catch::Equals(offs));
-+               REQUIRE_THAT(moved.offsets(), Catch::Matchers::Equals(offs));
-        }
- 
-        SECTION("move assignment operator works")
-@@ -388,7 +388,7 @@ TEST_CASE("line_request can be moved", "[line-request]")
-                another = ::std::move(request);
- 
-                REQUIRE(another.fd() == fd);
--               REQUIRE_THAT(another.offsets(), Catch::Equals(offs));
-+               REQUIRE_THAT(another.offsets(), Catch::Matchers::Equals(offs));
-        }
- }
- 
-@@ -484,7 +484,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]")
-        {
-                buf << request;
- 
--               REQUIRE_THAT(buf.str(), Catch::Equals(expected.str()));
-+               REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str()));
-        }
- 
-        SECTION("request released")
-@@ -493,7 +493,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]")
- 
-                buf << request;
- 
--               REQUIRE_THAT(buf.str(), Catch::Equals("gpiod::line_request(released)"));
-+               REQUIRE_THAT(buf.str(), Catch::Matchers::Equals("gpiod::line_request(released)"));
-        }
- }
- 
-diff --git a/bindings/cxx/tests/tests-line-settings.cpp b/bindings/cxx/tests/tests-line-settings.cpp
-index dc821bb..2690331 100644
---- a/bindings/cxx/tests/tests-line-settings.cpp
-+++ b/bindings/cxx/tests/tests-line-settings.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- 
- #include "helpers.hpp"
-diff --git a/bindings/cxx/tests/tests-line.cpp b/bindings/cxx/tests/tests-line.cpp
-index 319012a..abd0e08 100644
---- a/bindings/cxx/tests/tests-line.cpp
-+++ b/bindings/cxx/tests/tests-line.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <gpiod.hpp>
- 
- #include "helpers.hpp"
-diff --git a/bindings/cxx/tests/tests-misc.cpp b/bindings/cxx/tests/tests-misc.cpp
-index f06dc39..33fc3fa 100644
---- a/bindings/cxx/tests/tests-misc.cpp
-+++ b/bindings/cxx/tests/tests-misc.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <filesystem>
- #include <gpiod.hpp>
- #include <string>
-diff --git a/bindings/cxx/tests/tests-request-config.cpp b/bindings/cxx/tests/tests-request-config.cpp
-index 66eb748..d71e91b 100644
---- a/bindings/cxx/tests/tests-request-config.cpp
-+++ b/bindings/cxx/tests/tests-request-config.cpp
-@@ -1,7 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0-or-later
- // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
- 
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
- #include <cstddef>
- #include <gpiod.hpp>
- #include <string>
-@@ -33,7 +33,7 @@ TEST_CASE("request_config can be moved", "[request-config]")
-        SECTION("move constructor works")
-        {
-                auto moved(::std::move(cfg));
--               REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(moved.event_buffer_size() == 64);
-        }
- 
-@@ -43,7 +43,7 @@ TEST_CASE("request_config can be moved", "[request-config]")
- 
-                moved = ::std::move(cfg);
- 
--               REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar"));
-                REQUIRE(moved.event_buffer_size() == 64);
-        }
- }
-@@ -55,7 +55,7 @@ TEST_CASE("request_config mutators work", "[request-config]")
-        SECTION("set consumer")
-        {
-                cfg.set_consumer("foobar");
--               REQUIRE_THAT(cfg.consumer(), Catch::Equals("foobar"));
-+               REQUIRE_THAT(cfg.consumer(), Catch::Matchers::Equals("foobar"));
-        }
- 
-        SECTION("set event_buffer_size")
-@@ -77,7 +77,7 @@ TEST_CASE("request_config stream insertion operator works", "[request-config]")
- 
-        ::std::string expected("gpiod::request_config(consumer='foobar', event_buffer_size=32)");
- 
--       REQUIRE_THAT(buf.str(), Catch::Equals(expected));
-+       REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected));
- }
- 
- } /* namespace */
-diff --git a/configure.ac b/configure.ac
-index a2370c5..216007e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -206,9 +206,9 @@ then
- 
-        if test "x$with_tests" = xtrue
-        then
--               PKG_CHECK_MODULES([CATCH2], [catch2],, [
-+               PKG_CHECK_MODULES([CATCH2], [catch2-with-main],, [
-                        AC_LANG_PUSH([C++])
--                       AC_CHECK_HEADERS([catch2/catch.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch.hpp])])
-+                       AC_CHECK_HEADERS([catch2/catch_all.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch_all.hpp])])
-                        AC_LANG_POP([C++])
-                ])
-        fi
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-manager.init b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-manager.init
new file mode 100644
index 0000000000..e36755eea2
--- /dev/null
+++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-manager.init
@@ -0,0 +1,76 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:             gpio-manager
+# Required-Start:       $remote_fs $syslog
+# Required-Stop:        $remote_fs $syslog
+# Default-Start:        2 3 4 5
+# Default-Stop:         1
+# Short-Description:    Centralized GPIO manager daemon
+### END INIT INFO
+#
+# -*- coding: utf-8 -*-
+# Debian init.d script for gpio-manager
+# Copyright (c) 2024 Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+
+# set -e
+
+# Source function library.
+. /etc/init.d/functions
+
+DAEMON=/usr/bin/gpio-manager
+NAME=gpio-manager
+PIDFILE=/var/run/gpio-manager/pid
+DESC="GPIO manager daemon"
+
+test -x $DAEMON || exit 0
+test "$ENABLED" != "0" || exit 0
+
+do_start()
+{
+        mkdir -p "`dirname $PIDFILE`"
+        if [ -e $PIDFILE ]; then
+                PIDDIR=/proc/$(cat $PIDFILE)
+                if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+                        echo "$DESC already started; not starting."
+                else
+                        echo "Removing stale PID file $PIDFILE."
+                        rm -f $PIDFILE
+                fi
+        fi
+
+        echo -n "Starting $DESC: "
+        start-stop-daemon --user gpio-manager --background --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON
+        echo "$NAME."
+}
+
+do_stop()
+{
+        echo -n "Stopping $DESC: "
+        start-stop-daemon --stop --quiet --pidfile $PIDFILE
+        echo "$NAME."
+        rm -f $PIDFILE
+}
+
+case "$1" in
+        start)
+                do_start
+        ;;
+        stop)
+                do_stop
+        ;;
+        status)
+                status $DAEMON
+                exit $?
+        ;;
+        restart)
+                do_stop
+                sleep 1
+                do_start
+        ;;
+        *)
+                echo "Usage: /etc/init.d/$NAME {start|stop|status|restart}" >&2
+                exit 1
+        ;;
+esac
+
+exit 0
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest
index 29ec0d1027..eae172116f 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest
+++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest
@@ -1,24 +1,43 @@
 #!/bin/sh
 
-testbins="gpiod-test gpio-tools-test.bash gpiod-cxx-test"
-
 ptestdir=$(dirname "$(readlink -f "$0")")
 cd $ptestdir/tests
 
+export GPIODBUS_TEST_DAEMON_PATH="$ptestdir/tests/gpio-manager"
+export PATH="$ptestdir/tests/:$PATH"
+
 # libgpiod v2 uses gpio-sim - a configfs-based testing module. We need to
 # make sure configfs is mounted before running any tests.
 modprobe configfs
 mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config
 
-for testbin in $testbins; do
-        if test -e ./$testbin; then
-                ./$testbin > ./$testbin.out 2>&1
-                if [ $? -ne 0 ]; then
-                        echo "FAIL: $testbin"
-                else
-                        echo "PASS: $testbin"
-                fi
+# Make sure the daemon is not running during tests.
+systemctl stop gpio-manager 2> /dev/null > /dev/null
+service gpio-manager stop 2> /dev/null > /dev/null
+
+run_one_test() {
+        testbin="$1"
+
+        ./$testbin > ./$testbin.out 2>&1
+        if [ $? -ne 0 ]; then
+                echo "FAIL: $testbin"
         else
-                echo "SKIP: $testbin"
+                echo "PASS: $testbin"
         fi
-done
+}
+
+run_one_test gpiod-test
+run_one_test gpio-tools-test.bash
+run_one_test gpiod-cxx-test
+run_one_test gpiod-glib-test
+
+# Wait for the leftover uevents to be emitted before running DBus tests.
+udevadm settle
+run_one_test gpiodbus-test
+
+udevadm settle
+gpio-manager 2> /dev/null > /dev/null &
+GPIO_MANAGER_PID=$!
+run_one_test gpiocli-test.bash
+kill $GPIO_MANAGER_PID
+wait $GPIO_MANAGER_PID
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-oe/recipes-support/libgpiod/libgpiod.inc
index 7b68f77d20..fb309c5644 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod.inc
+++ b/meta-oe/recipes-support/libgpiod/libgpiod.inc
@@ -53,4 +53,3 @@ do_install_ptest() {
         install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/
     done
 }
-
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
index 0795839492..009cf9897a 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
@@ -7,17 +7,13 @@ SRC_URI += "file://0001-bindings-cxx-disable-tests.patch"
 
 SRC_URI[sha256sum] = "ae280f697bf035a1fb780c9972e5c81d0d2712b7ab6124fb3fba24619daa72bc"
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-1.x:"
 
 inherit python3native
 
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2"
 PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3"
 
-# Always build tools - they don't have any additional
-# requirements over the library.
-EXTRA_OECONF = "--enable-tools"
-
 PACKAGES =+ "${PN}-python"
 FILES:${PN}-tools += "${bindir}/gpiofind"
 FILES:${PN}-ptest += " \
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb
deleted file mode 100644
index b4665c1567..0000000000
--- a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-require libgpiod.inc
-
-LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \
-    file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \
-"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:"
-
-SRC_URI += "file://0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch"
-SRC_URI[sha256sum] = "7a148a5a7d1c97a1abb40474b9a392b6edd7a42fe077dfd7ff42cfba24308548"
-
-# Enable all project features for ptest
-PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit"
-PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit"
-
-PACKAGES =+ "${PN}-ptest-dev"
-FILES:${PN}-tools += "${bindir}/gpionotify"
-FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*"
-FILES:${PN}-ptest-dev += "${includedir}/gpiosim.h"
-
-RDEPENDS:${PN}-ptest += " \
-    ${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2 bash', '', d)} \
-"
-RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs"
-
-do_install_ptest:append() {
-    install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/
-    install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/
-    install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h
-}
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.2.1.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.1.bb
new file mode 100644
index 0000000000..93c3e3b92d
--- /dev/null
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.1.bb
@@ -0,0 +1,104 @@
+require libgpiod.inc
+
+inherit systemd update-rc.d useradd gobject-introspection
+
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \
+    file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \
+"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-2.x:"
+
+SRC_URI += "file://gpio-manager.init"
+
+SRC_URI[sha256sum] = "0e948049c309b87c220fb24ee0d605d7cd5b72f22376e608470903fffa2d4b18"
+
+# Enable all project features for ptest
+PACKAGECONFIG[tests] = " \
+    --enable-tests --enable-tools --enable-bindings-cxx --enable-bindings-glib --enable-gpioset-interactive --enable-dbus, \
+    --disable-tests, \
+    kmod util-linux glib-2.0 catch2 libedit glib-2.0-native libgudev, \
+    bash ${VIRTUAL-RUNTIME_dbus} glib-2.0-utils libgpiod-manager-cfg shunit2 \
+"
+PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit"
+PACKAGECONFIG[glib] = "--enable-bindings-glib,--disable-bindings-glib,glib-2.0 glib-2.0-native"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,glib-2.0 glib-2.0-native libgudev,${VIRTUAL-RUNTIME_dbus}"
+
+PACKAGES =+ "${PN}-gpiosim ${PN}-glib ${PN}-manager ${PN}-manager-cfg ${PN}-cli"
+FILES:${PN}-tools += "${bindir}/gpionotify"
+FILES:${PN}-gpiosim += "${libdir}/libgpiosim.so.*"
+FILES:${PN}-gpiosim-dev += "${includedir}/gpiosim.h"
+FILES:${PN}-glib += "${libdir}/libgpiod-glib.so.*"
+FILES:${PN}-manager += " \
+    ${bindir}/gpio-manager \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_system_unitdir}/gpio-manager.service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${sysconfdir}/init.d/gpio-manager', '', d)} \
+"
+FILES:${PN}-manager-cfg += " \
+    ${sysconfdir}/dbus-1/system.d/io.gpiod1.conf \
+    ${datadir}/dbus-1/interfaces/io.gpiod1.xml \
+    ${nonarch_base_libdir}/udev/rules.d/90-gpio.rules \
+"
+FILES:${PN}-cli += "${bindir}/gpiocli"
+
+RDEPENDS:${PN}-manager += "${VIRTUAL-RUNTIME_dbus} ${PN}-manager-cfg"
+RDEPENDS:${PN}-cli += "${PN}-manager"
+
+SYSTEMD_PACKAGES = "${PN}-manager"
+
+python __anonymous() {
+    distro_features = d.getVar("DISTRO_FEATURES").split()
+    packageconfig = d.getVar("PACKAGECONFIG").split()
+    pn = d.getVar("PN")
+
+    if "systemd" in distro_features and "dbus" in packageconfig:
+        d.appendVar("EXTRA_OECONF", " --enable-systemd")
+        # We need to set it conditionally or else the systemd class will look
+        # for the file that we don't install with systemd support disabled.
+        d.setVar("SYSTEMD_SERVICE:{}-manager".format(pn), "gpio-manager.service")
+    else:
+        d.appendVar("EXTRA_OECONF", " --disable-systemd")
+
+    # Disable gobject introspection set by the bbclass if we don't want it.
+    if not any(cfg in ["glib", "dbus", "ptest"] for cfg in packageconfig):
+        d.setVar("GI_DATA_ENABLED", "False")
+}
+
+UPDATERCPN = "${PN}-manager"
+INITSCRIPT_NAME = "gpio-manager"
+INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 0 1 6 ."
+
+USERADD_PACKAGES = "${PN}-manager"
+GROUPADD_PARAM:${PN}-manager = "--system gpio"
+USERADD_PARAM:${PN}-manager = "--system -M -s /bin/nologin -g gpio gpio-manager"
+
+RDEPENDS:${PN}-ptest += " \
+    ${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2 bash', '', d)} \
+"
+RRECOMMENDS:${PN}-gpiosim += "kernel-module-gpio-sim kernel-module-configfs"
+INSANE_SKIP:${PN}-ptest += "buildpaths"
+
+do_compile:prepend() {
+    export GIR_EXTRA_LIBS_PATH="${B}/lib/.libs"
+}
+
+do_install:append() {
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${UNPACKDIR}/gpio-manager.init ${D}${sysconfdir}/init.d/gpio-manager
+    fi
+}
+
+do_install_ptest:append() {
+    install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/
+    install -m 0644 ${S}/tests/scripts/gpiod-bash-test-helper.inc ${D}${PTEST_PATH}/tests/
+    install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h
+    install -m 0755 ${B}/bindings/glib/tests/.libs/gpiod-glib-test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/dbus/tests/.libs/gpiodbus-test ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${S}/dbus/client/gpiocli-test.bash ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/dbus/manager/.libs/gpio-manager ${D}${PTEST_PATH}/tests/
+    install -m 0755 ${B}/dbus/client/.libs/gpiocli ${D}${PTEST_PATH}/tests/
+}
diff --git a/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb b/meta-oe/recipes-support/libgusb/libgusb_0.4.9.bb
index 491b6a7a1d..9007574fc6 100644
--- a/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb
+++ b/meta-oe/recipes-support/libgusb/libgusb_0.4.9.bb
@@ -2,17 +2,19 @@ SUMMARY = "GUsb is a GObject wrapper for libusb1"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
-DEPENDS = "glib-2.0 libusb"
+DEPENDS = "glib-2.0 libusb json-glib"
+RDEPENDS:${PN} = "hwdata"
 
-inherit meson gobject-introspection gtk-doc gettext vala
+inherit meson gobject-introspection gi-docgen gettext vala pkgconfig
 
 PACKAGECONFIG:class-target ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}"
 PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false"
 
-EXTRA_OEMESON:append:class-native = " -Dtests=false -Dintrospection=false"
+EXTRA_OEMESON:class-native += "-Dtests=false  -Dintrospection=false"
+
+GIDOCGEN_MESON_OPTION = 'docs'
 
 SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main;protocol=https"
-SRCREV = "332d5b987ffecb824426e88518e05547faf2b520"
-S = "${WORKDIR}/git"
+SRCREV = "ed31c8134d80d006bd45450e84180be2a7c0742e"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/libharu/libharu_2.4.4.bb b/meta-oe/recipes-support/libharu/libharu_2.4.5.bb
index 02dc499e03..0ad4bd92c0 100644
--- a/meta-oe/recipes-support/libharu/libharu_2.4.4.bb
+++ b/meta-oe/recipes-support/libharu/libharu_2.4.5.bb
@@ -9,8 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=924546dab2bef90e370d7c0c090ddcf0"
 DEPENDS += "libpng zlib"
 
 SRC_URI = "git://github.com/libharu/libharu.git;branch=master;protocol=https"
-SRCREV = "0c598becaadaef8e3d12b883f9fc2864a118c12d"
+SRCREV = "8fe5a738541a04642885fb7a75b2b5b9c5b416fa"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
diff --git a/meta-oe/recipes-support/libiio/libiio_0.25.bb b/meta-oe/recipes-support/libiio/libiio_0.26.bb
index 2c6d2b5145..ecd9223600 100644
--- a/meta-oe/recipes-support/libiio/libiio_0.25.bb
+++ b/meta-oe/recipes-support/libiio/libiio_0.26.bb
@@ -4,12 +4,11 @@ SECTION = "libs"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c"
 
-SRCREV = "b6028fdeef888ab45f7c1dd6e4ed9480ae4b55e3"
+SRCREV = "a0eca0d2bf10326506fb762f0eec14255b27bef5"
 
-SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=main"
+SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=libiio-v0"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 SETUPTOOLS_SETUP_PATH ?= "${B}/bindings/python/"
 
diff --git a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb
index ff976ed975..0478ef3403 100644
--- a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb
+++ b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb
@@ -9,11 +9,14 @@ HOMEPAGE = "http://www.iodbc.org/"
 
 LICENSE = "LGPL-2.0-only | BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \
-                    file://LICENSE.BSD;md5=ff3a66a194e500df485da930da7f2c62 \
+                    file://LICENSE.BSD;md5=5b36348a404e1d65b57df8d33fd6e414 \
                     "
 
 SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "c74541e3327fc9a1c7ccf103645471c67bc014542d70f572476eb07c0b2dd43c"
+SRC_URI[sha256sum] = "3898b32d07961360f6f2cf36db36036b719a230e476469258a80f32243e845fa"
+
+UPSTREAM_CHECK_URI = "https://github.com/openlink/iODBC/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit autotools
 
@@ -28,3 +31,9 @@ EXTRA_OECONF += " --prefix=/usr/local \
 
 inherit multilib_script
 MULTILIB_SCRIPTS = "${PN}:${bindir}/iodbc-config"
+
+# avoid http://errors.yoctoproject.org/Errors/Details/852861/
+CFLAGS += "-std=gnu17"
+# http://errors.yoctoproject.org/Errors/Details/853276/
+# libiodbc-3.52.16/iodbcinst/unicode.c:1565:16: error: initialization of 'ucs4_t *' {aka 'unsigned int *'} from incompatible pointer type 'wchar_t *' {aka 'long int *'} [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb
index 38ffd032ab..f4e26a65fc 100644
--- a/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb
+++ b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb
@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=https;branch=main"
 
 SRCREV = "ab3f67fc4fad88cdf07b258c08e4164e06bf7506"
 
-S = "${WORKDIR}/git"
 
 JQUERYCOOKIEDIR = "${datadir}/javascript/jquery-cookie"
 JQUERYCOOKIEDOCDIR = "${docdir}/libjs-jquery-cookie"
diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb b/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb
index b6147ffeb2..cbf5700a5b 100644
--- a/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb
+++ b/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb
@@ -3,7 +3,6 @@ SECTION = "console/network"
 HOMEPAGE = "https://github.com/globalizejs/globalize"
 LICENSE = "MIT"
 
-S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4db68fb4d1d9986d736b35039f2ad9ea"
 
diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb
index 63dfc6fa78..88fbc109ee 100644
--- a/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb
+++ b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV}"
 
 SRCREV = "c8c1af84e4b90b4aea31466aad09bf877619e943"
 
-S = "${WORKDIR}/git"
 
 do_install() {
         install -d ${D}${datadir}/javascript/jquery-icheck/
diff --git a/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb
index 4f0d8e5548..be8a29d998 100644
--- a/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb
+++ b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb
@@ -7,11 +7,13 @@ SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/${BPN}_${PV}~d
 
 SRC_URI[sha256sum] = "e04d192c2356e9d4c2b2c7d83fde9408713212b53c4d106e5b9e46c1a56da33b"
 
+UPSTREAM_CHECK_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
 JQUERYDIR = "${datadir}/javascript/jquery"
 JQUERYDOCDIR = "${docdir}/libjs-jquery"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d -m 0755 ${D}${JQUERYDIR}
diff --git a/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
index e639ce59d8..ffd26d263c 100644
--- a/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
+++ b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
@@ -4,10 +4,9 @@ LICENSE = "GPL-2.0-only & MIT & AFL-2.1"
 LIC_FILES_CHKSUM = "file://MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9"
 
 SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/universe/s/sizzle/sizzle_1.10.18.orig.tar.gz"
-SRC_URI[md5sum] = "91477c1edeef9f8100ffd6c4d31725b5"
 SRC_URI[sha256sum] = "8e04ab84bb74b2e338dffc63cd2e52b007f1d8af01b3d25da4d2e07f2b5890f8"
 
-S = "${WORKDIR}/sizzle-${PV}"
+S = "${UNPACKDIR}/sizzle-${PV}"
 
 SIZZLEDIR = "${S}/dist"
 
diff --git a/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb b/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb
deleted file mode 100644
index d0463a640d..0000000000
--- a/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.1.0 Standard Annex 14, Revision 22"
-HOMEPAGE = "http://vimgadgets.sourceforge.net/liblinebreak/"
-SECTION = "libs"
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=3715191da62bafb5cfc4ff36195b2ec3"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/vimgadgets/liblinebreak/${PV}/liblinebreak-${PV}.tar.gz"
-SRC_URI[md5sum] = "d18039259001ccb24b5dd4648c49c5ad"
-SRC_URI[sha256sum] = "9efcb0cb1afc75ad1e92d2b2dbf4d9c77b072d6656c5f1a150af8b718d0c7b76"
-
-inherit autotools
diff --git a/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb b/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb
index db05422699..2e59401892 100644
--- a/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb
+++ b/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 DEPENDS = "libevdev libgudev"
 
 SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz"
-SRC_URI[sha256sum] = "cddd5c02a131072c19c6cde6f2cb2cd57eae7dacb50d14c337efd980baa51a51"
+SRC_URI[sha256sum] = "29366be5452f60a74c65fc64ffe2d74eddd4e6e6824c2cefa567a43bd92b688f"
 
 inherit meson pkgconfig gobject-introspection ptest vala
 
diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb
index 4d4a5ff109..a2de42d946 100644
--- a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb
+++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb
@@ -16,7 +16,6 @@ SRC_URI += "git://github.com/LadislavSopko/mimetic/;branch=master;protocol=https
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 CXXFLAGS += "-Wno-narrowing -std=c++14"
 
diff --git a/meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb b/meta-oe/recipes-support/libmxml/libmxml_4.0.4.bb
index 54582e7047..d692774f08 100644
--- a/meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb
+++ b/meta-oe/recipes-support/libmxml/libmxml_4.0.4.bb
@@ -5,8 +5,7 @@ HOMEPAGE = "https://www.msweet.org/mxml/"
 BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues"
 
 SRC_URI = "git://github.com/michaelrsweet/mxml.git;branch=master;protocol=https"
-SRCREV = "804c4f4d922e4ca240ce2cad3ec7bc5d00c08691"
-S = "${WORKDIR}/git"
+SRCREV = "0d5afc4278d7a336d554602b951c2979c3f8f296"
 
 # Package does not support out of tree builds.
 inherit autotools-brokensep
diff --git a/meta-oe/recipes-support/libnice/libnice_0.1.22.bb b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb
index 175e10fdf6..4b932029ee 100644
--- a/meta-oe/recipes-support/libnice/libnice_0.1.22.bb
+++ b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb
@@ -11,6 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \
 SRC_URI = "http://nice.freedesktop.org/releases/${BP}.tar.gz"
 SRC_URI[sha256sum] = "a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e"
 
+UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/libnice/libnice/-/tags"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
 DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}"
 
 PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp"
diff --git a/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch b/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch
new file mode 100644
index 0000000000..8734d443bb
--- /dev/null
+++ b/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch
@@ -0,0 +1,41 @@
+From 14328a9a429fd84ddd1a3ed4fb0eb9643c61fa58 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Mon, 7 Apr 2025 13:23:57 +0800
+Subject: [PATCH] mock.c: fix checking of HAVE_GLIBC_IOCTL
+
+Commit [ 0d8d0a55 build: do not include config.h globally ]
+changed to always pass -DHAVE_GLIBC_IOCTL=[0|1], and this causes
+a regression, for system without glibc ioctl, -DHAVE_GLIBC_IOCTL=0
+is passed, and causes error:
+../git/test/ioctl/mock.c:123:5: error: conflicting types for 'ioctl'; have 'int(int,  long unsigned int, ...)'
+  123 | int ioctl(int fd, unsigned long request, ...)
+      |     ^~~~~
+In file included from ../git/test/ioctl/mock.c:9:
+pathto/usr/include/sys/ioctl.h:115:5: note: previous declaration of 'ioctl' with type 'int(int,  int, ...)'
+  115 | int ioctl (int, int, ...);
+
+Fixed by checking value of HAVE_GLIBC_IOCTL in mock.c
+
+Upstream-Status: Submitted [https://github.com/linux-nvme/libnvme/pull/985]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ test/ioctl/mock.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/ioctl/mock.c b/test/ioctl/mock.c
+index 7402b45c..da3caba8 100644
+--- a/test/ioctl/mock.c
++++ b/test/ioctl/mock.c
+@@ -118,7 +118,7 @@ void end_mock_cmds(void)
+        } \
+ })
+ 
+-#ifdef HAVE_GLIBC_IOCTL
++#if defined(HAVE_GLIBC_IOCTL) && HAVE_GLIBC_IOCTL == 1
+ typedef int (*ioctl_func_t)(int, unsigned long, void *);
+ int ioctl(int fd, unsigned long request, ...)
+ #else
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libnvme/libnvme_1.9.bb b/meta-oe/recipes-support/libnvme/libnvme_1.12.bb
index 1e03b4e7ad..95d18a1ed0 100644
--- a/meta-oe/recipes-support/libnvme/libnvme_1.9.bb
+++ b/meta-oe/recipes-support/libnvme/libnvme_1.12.bb
@@ -11,12 +11,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
                     file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \
                     file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2"
 DEPENDS = "json-c"
-SRCREV = "80c5cf2aa45f4afc7571dc48850fae3fd62828af"
+SRCREV = "5ec1f5284ecb0eda481f3d2d61236fbc5b46164f"
 
-SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master"
+SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master \
+           file://0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
-EXTRA_OEMESON += "-Dkeyutils=disabled -Dopenssl=disabled -Dpython=disabled"
+PACKAGECONFIG ??= "keyutils openssl"
+
+PACKAGECONFIG[keyutils] = "-Dkeyutils=enabled,-Dkeyutils=disabled,keyutils"
+PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl"
+PACKAGECONFIG[python] = "-Dpython=enabled,-Dpython=disabled,python"
diff --git a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb
index d4b8170873..3e3f9137cf 100644
--- a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb
+++ b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb
@@ -12,7 +12,6 @@ DEPENDS = "curl openssl"
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BP}.tar.gz \
            file://0001-Support-OpenSSL-1.1.0.patch \
            "
-SRC_URI[md5sum] = "689b46c2b3ab1a39735ac33f714c4f7f"
 SRC_URI[sha256sum] = "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-support/liboop/liboop/0001-Use-pkg-config-to-find-tcl.patch b/meta-oe/recipes-support/liboop/liboop/0001-Use-pkg-config-to-find-tcl.patch
new file mode 100644
index 0000000000..24249b9360
--- /dev/null
+++ b/meta-oe/recipes-support/liboop/liboop/0001-Use-pkg-config-to-find-tcl.patch
@@ -0,0 +1,48 @@
+From 5dad843ca0860d6d7be443ddc850566584b8004a Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Sun, 16 Feb 2025 21:09:02 +0100
+Subject: [PATCH] Use pkg-config to find tcl
+
+Instead of using hardcoded path for the tcl include folder
+use pkg-config to find the proper values.
+
+That way it won't use the system folders for cross-compilation.
+
+Also, extend the number of tcl versions to check (at the time of
+this commit oe-core provides version 8.6)
+
+Upstream-Status: Pending
+---
+ configure.ac | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e95956e..3d0dc82 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,18 +71,17 @@ if test xno != x$with_glib; then
+ fi
+ 
+ if test xno != x$with_tcl; then
+-  for version in 8.4 8.3 8.2 8.1 8.0 ; do
+-    CPPFLAGS="$save_cppflags -I/usr/include/tcl$version"
+-    AC_CHECK_LIB(tcl$version,Tcl_Main,[
+-    AC_CHECK_HEADER(tcl.h,[
++  save_cppflags="$CPPFLAGS"
++  for version in "" 8.4 8.3 8.2 8.1 8.0 ; do
++    PKG_CHECK_EXISTS(tcl$version,,continue)
++    PKG_CHECK_MODULES(TCL, tcl$version, [
+       LIBOOP_LIBS="liboop-tcl.la $LIBOOP_LIBS"
+       AC_DEFINE(HAVE_TCL)
+-      TCL_INCLUDES="-I/usr/include/tcl$version"
+-      TCL_LIBS="-ltcl$version"
++      TCL_INCLUDES="$TCL_CFLAGS"
++      CPPFLAGS="$save_cppflags $TCL_CFLAGS"
+       break
+-    ])])
++  ])
+   done
+-  CPPFLAGS="$save_cppflags"
+ fi
+ 
+ if test xyes = x$with_libwww; then
diff --git a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch b/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch
deleted file mode 100644
index 0521aaeaff..0000000000
--- a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Pending
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,7 +71,7 @@
- fi
- 
- if test xno != x$with_tcl; then
--  for version in 8.4 8.3 8.2 8.1 8.0 ; do
-+  for version in "" 8.4 8.3 8.2 8.1 8.0 ; do
-     CPPFLAGS="$save_cppflags -I/usr/include/tcl$version"
-     AC_CHECK_LIB(tcl$version,Tcl_Main,[
-     AC_CHECK_HEADER(tcl.h,[
diff --git a/meta-oe/recipes-support/liboop/liboop_1.0.1.bb b/meta-oe/recipes-support/liboop/liboop_1.0.1.bb
index 7ad88b7402..19da1d1aa9 100644
--- a/meta-oe/recipes-support/liboop/liboop_1.0.1.bb
+++ b/meta-oe/recipes-support/liboop/liboop_1.0.1.bb
@@ -1,19 +1,18 @@
 DESCRIPTION = "Liboop is a low-level event loop management library for POSIX-based operating systems"
 HOMEPAGE = "http://www.lysator.liu.se/liboop/"
-LICENSE = "GPL-2.0-only"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8b54f38ccbd44feb80ab90e01af8b700"
 
 SRC_URI = "http://ftp.lysator.liu.se/pub/liboop/liboop-${PV}.tar.gz \
-           file://tcl_dev.patch \
+           file://0001-Use-pkg-config-to-find-tcl.patch \
 "
 
-SRC_URI[md5sum] = "f2b3dff17355fd9a6e2229caca8993f0"
 SRC_URI[sha256sum] = "56af16ad65e7397dadc8268e37ff6f67431db390c60c75e21a33e12b0e0d17e0"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
 PACKAGECONFIG[glib] = "--with-glib,--without-glib,glib-2.0 libpcre"
-PACKAGECONFIG[tcl] = "--with-tcl,--without-tcl,tcl"
+PACKAGECONFIG[tcl] = "--with-tcl,--without-tcl,tcl8"
 
 EXTRA_OECONF += "--without-adns -without-libwww"
 
diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
deleted file mode 100644
index 467c6b4baf..0000000000
--- a/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5bbdd06503456784c5ffa22409e8bab50470d673 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 27 Nov 2023 15:11:45 +0100
-Subject: [PATCH] osinfo: Make xmlError struct constant in
- propagate_libxml_error()
-
-In libxml2 commit v2.12.0~14 the API changed so that
-xmlGetLastError() returns pointer to a constant xmlError struct.
-Reflect this change in our code.
-
-Upstream-Status: Backport [https://gitlab.com/libosinfo/libosinfo/-/merge_requests/155]
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- osinfo/osinfo_install_script.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
-index 5800f37..303245a 100644
---- a/osinfo/osinfo_install_script.c
-+++ b/osinfo/osinfo_install_script.c
-@@ -769,7 +769,7 @@ static void propagate_libxml_error(GError **error, const char *format, ...) G_GN
- 
- static void propagate_libxml_error(GError **error, const char *format, ...)
- {
--    xmlErrorPtr err = xmlGetLastError();
-+    const xmlError *err = xmlGetLastError();
-     char *prefix;
-     va_list ap;
- 
--- 
-2.44.0
-
diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0adf38535637ec668e658d43f04f60f11f51574f.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0adf38535637ec668e658d43f04f60f11f51574f.patch
new file mode 100644
index 0000000000..f76aef8b25
--- /dev/null
+++ b/meta-oe/recipes-support/libosinfo/libosinfo/0adf38535637ec668e658d43f04f60f11f51574f.patch
@@ -0,0 +1,86 @@
+From 0adf38535637ec668e658d43f04f60f11f51574f Mon Sep 17 00:00:00 2001
+From: Roman Bogorodskiy <bogorodskiy@gmail.com>
+Date: Thu, 10 Apr 2025 13:54:02 +0200
+Subject: [PATCH] loader: don't use libxml2 deprecated APIs
+
+Address the following items:
+
+ - Deprecated direct access to buf's content
+ - Mismatching error function signature
+ - Deprecated direct access to ctxt's lastError
+
+Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+
+Upstream-Status: Backport [https://gitlab.com/libosinfo/libosinfo/-/commit/0adf38535637ec668e658d43f04f60f11f51574f.patch]
+---
+ osinfo/osinfo_loader.c | 42 +++++++++++++++++++++++-------------------
+ 1 file changed, 23 insertions(+), 19 deletions(-)
+
+diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
+index 0a9004af..b3fd4535 100644
+--- a/osinfo/osinfo_loader.c
++++ b/osinfo/osinfo_loader.c
+@@ -354,7 +354,7 @@ osinfo_loader_doc(const char *xpath,
+         xmlXPathFreeObject(obj);
+         OSINFO_LOADER_SET_ERROR(err, "Cannot format stylesheet");
+     }
+-    ret = g_strdup((char *)buf->content);
++    ret = g_strdup((char *)xmlBufferContent(buf));
+ 
+     xmlBufferFree(buf);
+     xmlXPathFreeObject(obj);
+@@ -1902,28 +1902,32 @@ static void osinfo_loader_root(OsinfoLoader *loader,
+ }
+ 
+ static void
+-catchXMLError(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...)
++catchXMLError(void *ctx, const char *msg, ...)
+ {
+     xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
++    const xmlError *xmlErr = NULL;
++    g_autofree gchar *xmlmsg = NULL;
+ 
+-    if (ctxt && ctxt->_private) {
+-        GError **err = ctxt->_private;
+-        if (!error_is_set(err)) {
+-            gchar *xmlmsg;
+-            if (ctxt->lastError.file) {
+-                xmlmsg = g_strdup_printf("%s:%d: %s",
+-                                         ctxt->lastError.file,
+-                                         ctxt->lastError.line,
+-                                         ctxt->lastError.message);
+-            } else {
+-                xmlmsg = g_strdup_printf("at line %d: %s",
+-                                         ctxt->lastError.line,
+-                                         ctxt->lastError.message);
+-            }
+-            OSINFO_LOADER_SET_ERROR(ctxt->_private, xmlmsg);
+-            g_free(xmlmsg);
+-        }
++    if (!ctxt || !ctxt->_private)
++        return;
++
++    if (error_is_set(ctxt->_private))
++        return;
++
++    if (!(xmlErr = xmlCtxtGetLastError(ctx)))
++        return;
++
++    if (xmlErr->file) {
++        xmlmsg = g_strdup_printf("%s:%d: %s",
++                                 xmlErr->file,
++                                 xmlErr->line,
++                                 xmlErr->message);
++    } else {
++        xmlmsg = g_strdup_printf("at line %d: %s",
++                                 xmlErr->line,
++                                 xmlErr->message);
+     }
++    OSINFO_LOADER_SET_ERROR(ctxt->_private, xmlmsg);
+ }
+ 
+ static void osinfo_loader_process_xml(OsinfoLoader *loader,
+-- 
+GitLab
+
diff --git a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb b/meta-oe/recipes-support/libosinfo/libosinfo_1.12.0.bb
index 8ef7ac3df0..2462786aae 100644
--- a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb
+++ b/meta-oe/recipes-support/libosinfo/libosinfo_1.12.0.bb
@@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI = " \
         git://gitlab.com/libosinfo/libosinfo.git;branch=main;protocol=https \
         file://0001-meson.build-allow-crosscompiling-gir.patch \
-        file://0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch \
+        file://0adf38535637ec668e658d43f04f60f11f51574f.patch \
 "
 
-SRCREV = "ca9dd5b810dc04ea38048ae9be491654c8596ef9"
+SRCREV = "b505ef5161d2552102a743acd4ad83298d3d8f99"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig gtk-doc gobject-introspection vala
 
@@ -32,4 +31,4 @@ EXTRA_OEMESON += " \
         -Dwith-usb-ids-path=${datadir}/hwdata/usb.ids \
 "
 
-RDEPENDS:${PN} = "hwdata"
+RDEPENDS:${PN} = "hwdata osinfo-db"
diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.12.0.bb b/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.12.0.bb
new file mode 100644
index 0000000000..ee75c39eee
--- /dev/null
+++ b/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.12.0.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Tools for managing the libosinfo database files"
+HOMEPAGE = "https://libosinfo.org"
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS = "glib-2.0 json-glib libarchive libsoup"
+
+SRC_URI = "git://gitlab.com/libosinfo/osinfo-db-tools.git;branch=main;protocol=https \
+           "
+SRCREV = "e5564be303bfac49cc3490bd0fada342cd65566f"
+
+
+inherit meson pkgconfig
+
+do_configure:prepend () {
+    sed -i 's/-Werror//' ${S}/meson.build
+}
+
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db_20250606.bb b/meta-oe/recipes-support/libosinfo/osinfo-db_20250606.bb
new file mode 100644
index 0000000000..33e17234ce
--- /dev/null
+++ b/meta-oe/recipes-support/libosinfo/osinfo-db_20250606.bb
@@ -0,0 +1,20 @@
+SUMMARY = "osinfo-db provides the database files for use with the libosinfo library"
+HOMEPAGE = "https://libosinfo.org"
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS = "osinfo-db-tools-native"
+
+SRC_URI = "git://gitlab.com/libosinfo/osinfo-db.git;branch=main;protocol=https"
+
+SRCREV = "62f8adceb8ee88e643a134f2cfaf04fc11b9fc51"
+
+
+inherit allarch autotools-brokensep
+
+EXTRA_OEMAKE = "OSINFO_DB_TARGET='--dir ${datadir}/osinfo'"
+
+do_configure[noexec] = "1"
+
+FILES:${PN} = "${datadir}/osinfo"
diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.12.bb b/meta-oe/recipes-support/libp11/libp11_0.4.13.bb
index 2237782009..1731d350ae 100644
--- a/meta-oe/recipes-support/libp11/libp11_0.4.12.bb
+++ b/meta-oe/recipes-support/libp11/libp11_0.4.13.bb
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
 DEPENDS = "libtool openssl"
 
 SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https"
-SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf"
+
+SRCREV = "6d669183c7b241ce47ecce28744837ad92814f5c"
 
 UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb b/meta-oe/recipes-support/libpaper/libpaper_2.2.6.bb
index a45ffe1849..4acf7fd473 100644
--- a/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb
+++ b/meta-oe/recipes-support/libpaper/libpaper_2.2.6.bb
@@ -2,7 +2,10 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "https://github.com/rrthomas/libpaper/releases/download/v${PV}/libpaper-${PV}.tar.gz"
-SRC_URI[sha256sum] = "1fda0cf64efa46b9684a4ccc17df4386c4cc83254805419222c064bf62ea001f"
+SRC_URI[sha256sum] = "500d39dc58768ee09688738c8b5bfe07640ba2fd6c25a6dc78810eb69c719e93"
+
+UPSTREAM_CHECK_URI = "https://github.com/rrthomas/libpaper/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit perlnative autotools
 
diff --git a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb
index 4d089f3b79..01425c6db0 100644
--- a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb
+++ b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb
@@ -4,8 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1501ae0aa3c8544e63f08d6f7bf88a6f"
 
 SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https"
 SRCREV = "1ef70158d7fde1ced6aaddb0b9443c32a7121d3d"
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
 DEPENDS = "jpeg jasper lcms"
+
+CVE_STATUS[CVE-2020-22628] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2"
+CVE_STATUS[CVE-2023-1729] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2"
diff --git a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb
index 15e1ee2438..97eb105d46 100644
--- a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb
+++ b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb
@@ -5,7 +5,6 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 
 SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "45031ab15ca93e50c19886a38bc1814a"
 SRC_URI[sha256sum] = "ddc4e32721cdfe680d964aaede68ac606a20cd17dd2ba70e2d7e0692086ab57c"
 
 inherit autotools
diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
index 6148e7cb08..968094daff 100644
--- a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
+++ b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
@@ -16,7 +16,6 @@ DEPENDS = "zlib openssl zstd"
 
 inherit cmake
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${datadir}"
 
diff --git a/meta-oe/recipes-support/librsync/librsync_2.3.4.bb b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb
index 3cad665389..c8dfafa2aa 100644
--- a/meta-oe/recipes-support/librsync/librsync_2.3.4.bb
+++ b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 
 SRC_URI = "git://github.com/librsync/librsync.git;branch=master;protocol=https"
 SRCREV = "e364852674780e43d578e4239128ff7014190ed3"
-S = "${WORKDIR}/git"
 
 DEPENDS = "popt"
 
diff --git a/meta-oe/recipes-support/libserialmodule/libserialmodule_1.0.8.bb b/meta-oe/recipes-support/libserialmodule/libserialmodule_1.0.8.bb
new file mode 100644
index 0000000000..245d501b8a
--- /dev/null
+++ b/meta-oe/recipes-support/libserialmodule/libserialmodule_1.0.8.bb
@@ -0,0 +1,12 @@
+SUMMARY = "A library for Serial/COM"
+DESCRIPTION = "Async C/C++ I/O with COM/Serial Port Library."
+HOMEPAGE = "https://github.com/thuanalg/libserialmodule"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=22cdd382a6275cb4c2e75c517952ac7c"
+DEPENDS = "libsimplelog"
+SRC_URI = "git://git@github.com/thuanalg/libserialmodule.git;branch=main;protocol=https;tag=v${PV}"
+SRCREV = "f89f98ff0c9d0aaee2624d40addb0687a74c5d81"
+inherit cmake
+EXTRA_OECMAKE = "-DUNIX_LINUX=1 -DMETA_OPENEMBEDDED=1"
+
diff --git a/meta-oe/recipes-support/libsimplelog/libsimplelog_1.0.8.bb b/meta-oe/recipes-support/libsimplelog/libsimplelog_1.0.8.bb
new file mode 100644
index 0000000000..31dce12155
--- /dev/null
+++ b/meta-oe/recipes-support/libsimplelog/libsimplelog_1.0.8.bb
@@ -0,0 +1,18 @@
+
+SUMMARY = "simplelog-topc - Simple, STABLE, powerful of logging library in ANSI C/C++. Ready for billion records."
+DESCRIPTION = "Async and Fast C/C++ multi-thread logger with topics. No external dependencies."
+HOMEPAGE = "https://github.com/thuanalg/simplelog-topic"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=22cdd382a6275cb4c2e75c517952ac7c"
+
+SRC_URI = "git://github.com/thuanalg/simplelog-topic.git;branch=main;protocol=https;tag=v${PV}"
+
+SRCREV = "093d80b4006042b75a433a5e63760ae9bebad142"
+
+
+inherit cmake
+
+# Specify any options you want to pass to cmake using EXTRA_OECMAKE:
+EXTRA_OECMAKE += "-DUNIX_LINUX=1"
+
+
diff --git a/meta-oe/recipes-support/libsmi/libsmi/0001-Fix-build-failure-with-gcc-15.patch b/meta-oe/recipes-support/libsmi/libsmi/0001-Fix-build-failure-with-gcc-15.patch
new file mode 100644
index 0000000000..69af5f5141
--- /dev/null
+++ b/meta-oe/recipes-support/libsmi/libsmi/0001-Fix-build-failure-with-gcc-15.patch
@@ -0,0 +1,154 @@
+From ea4bc4aad22455f8f37030f5915c4a94d76fd5e7 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Mon, 7 Apr 2025 18:57:26 +0900
+Subject: [PATCH] Fix build failure with gcc-15
+
+* see more details: http://errors.yoctoproject.org/Errors/Details/851179/
+
+yang-data.c:594:9: error: too many arguments to function 'yangparse'; expected 0, have 1
+  594 |         yangparse(parser);
+      |         ^~~~~~~~~ ~~~~~~
+In file included from scanner-yang.h:19,
+                 from yang-data.c:47:
+parser-yang.h:16:12: note: declared here
+   16 | extern int yangparse();
+      |            ^~~~~~~~~
+In file included from parser-yang.c:346:
+parser-yang.tab.h:170:5: error: conflicting types for 'yangparse'; have 'int(struct Parser *)'
+  170 | int yangparse (struct Parser *parserPtr);
+      |     ^~~~~~~~~
+In file included from parser-yang.y:40:
+parser-yang.h:16:12: note: previous declaration of 'yangparse' with type 'int(void)'
+   16 | extern int yangparse();
+      |            ^~~~~~~~~
+make[2]: *** [Makefile:573: yang-data.lo] Error 1
+make[2]: *** Waiting for unfinished jobs....
+smi-data.c: In function 'loadModule':
+smi-data.c:4658:9: error: too many arguments to function 'smiparse'; expected 0, have 1
+ 4658 |         smiparse((void *)&parser);
+      |         ^~~~~~~~ ~~~~~~~~~~~~~~~
+smi-data.c:42:12: note: declared here
+   42 | extern int smiparse();
+      |            ^~~~~~~~
+parser-smi.c:1515:5: error: conflicting types for 'smiparse'; have 'int(struct Parser *)'
+ 1515 | int smiparse (struct Parser *parserPtr);
+      |     ^~~~~~~~
+In file included from parser-smi.y:37:
+parser-smi.h:27:12: note: previous declaration of 'smiparse' with type 'int(void)'
+   27 | extern int smiparse();
+      |            ^~~~~~~~
+parser-smi.c:63:25: error: conflicting types for 'smiparse'; have 'int(struct Parser *)'
+   63 | #define yyparse         smiparse
+      |                         ^~~~~~~~
+parser-smi.c:3207:1: note: in expansion of macro 'yyparse'
+ 3207 | yyparse (struct Parser *parserPtr)
+      | ^~~~~~~
+parser-smi.h:27:12: note: previous declaration of 'smiparse' with type 'int(void)'
+   27 | extern int smiparse();
+      |            ^~~~~~~~
+parser-yang.c:68:25: error: conflicting types for 'yangparse'; have 'int(struct Parser *)'
+   68 | #define yyparse         yangparse
+      |                         ^~~~~~~~~
+parser-yang.c:2312:1: note: in expansion of macro 'yyparse'
+ 2312 | yyparse (struct Parser *parserPtr)
+      | ^~~~~~~
+parser-yang.h:16:12: note: previous declaration of 'yangparse' with type 'int(void)'
+   16 | extern int yangparse();
+      |            ^~~~~~~~~
+In file included from scanner-yang.l:31:
+parser-yang.tab.h:170:5: error: conflicting types for 'yangparse'; have 'int(struct Parser *)'
+  170 | int yangparse (struct Parser *parserPtr);
+      |     ^~~~~~~~~
+In file included from scanner-yang.l:30:
+parser-yang.h:16:12: note: previous declaration of 'yangparse' with type 'int(void)'
+   16 | extern int yangparse();
+      |            ^~~~~~~~~
+scanner-yang.l: In function 'yangEnterLexRecursion':
+scanner-yang.l:79:1: warning: old-style function definition [-Wold-style-definition]
+   79 |
+      | ^
+make[2]: *** [Makefile:573: smi-data.lo] Error 1
+In file included from parser-smi.y:36:
+parser-smi.c: In function 'smiparse':
+parser-smi.c:10265:29: warning: passing argument 1 of 'smiyyerror' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+10265 |         yyerror (parserPtr, yymsgp);
+      |                             ^~~~~~
+error.h:25:44: note: in definition of macro 'yyerror'
+   25 | #define yyerror(parserPtr, msg) smiyyerror(msg, parserPtr)
+      |                                            ^~~
+In file included from parser-smi.y:40:
+smi-check.h:71:30: note: expected 'char *' but argument is of type 'const char *'
+   71 | extern void smiyyerror(char *msg, Parser *parserPtr);
+      |                        ~~~~~~^~~
+make[2]: *** [Makefile:573: parser-yang.lo] Error 1
+make[2]: *** [Makefile:573: parser-smi.lo] Error 1
+make[2]: *** [Makefile:573: scanner-yang.lo] Error 1
+In file included from scanner-smi.l:34:
+parser-smi.tab.h:192:5: error: conflicting types for 'smiparse'; have 'int(struct Parser *)'
+  192 | int smiparse (struct Parser *parserPtr);
+      |     ^~~~~~~~
+In file included from util.h:22,
+                 from scanner-smi.l:32:
+parser-smi.h:27:12: note: previous declaration of 'smiparse' with type 'int(void)'
+   27 | extern int smiparse();
+      |            ^~~~~~~~
+scanner-smi.l: In function 'smiEnterLexRecursion':
+scanner-smi.l:76:1: warning: old-style function definition [-Wold-style-definition]
+   76 | smiEnterLexRecursion(file)
+      | ^~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Submitted [https://lists.ibr.cs.tu-bs.de/hyperkitty/list/libsmi@ibr.cs.tu-bs.de/thread/XUW4E575ALYHCAM33OEMU5V2LKUOYAVA/]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ lib/parser-smi.h  | 2 +-
+ lib/parser-yang.h | 4 ++--
+ lib/smi-data.c    | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/parser-smi.h b/lib/parser-smi.h
+index 90d7ec2..c2a3d1f 100644
+--- a/lib/parser-smi.h
++++ b/lib/parser-smi.h
+@@ -24,7 +24,7 @@
+ 
+ 
+ 
+-extern int smiparse();
++extern int smiparse(struct Parser *parserPtr);
+ 
+ 
+ 
+diff --git a/lib/parser-yang.h b/lib/parser-yang.h
+index dbfec46..f008cd6 100644
+--- a/lib/parser-yang.h
++++ b/lib/parser-yang.h
+@@ -6,14 +6,14 @@
+ #include <stdio.h>
+ 
+ #include "yang-data.h"
+-
++#include "smi-data.h"
+ 
+ 
+ #define YYERROR_VERBOSE
+ 
+ 
+ 
+-extern int yangparse();
++extern int yangparse(struct Parser *parserPtr);
+ 
+ 
+ 
+diff --git a/lib/smi-data.c b/lib/smi-data.c
+index c9d95a4..773bc01 100644
+--- a/lib/smi-data.c
++++ b/lib/smi-data.c
+@@ -39,7 +39,7 @@
+ 
+ #ifdef BACKEND_SMI
+ #include "scanner-smi.h"
+-extern int smiparse();
++extern int smiparse(struct Parser *parserPtr);
+ #endif
+ 
+ #ifdef BACKEND_SMING
diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
index 1f7442af07..85eac33369 100644
--- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
+++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
@@ -9,11 +9,14 @@ SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \
            file://libsmi-fix-the-test-dump-files.patch \
            file://0001-Define-createIdentifierRef-prototype-in-yang-complex.patch \
            file://0001-parser-yang-Define-_DEFAULT_SOURCE.patch \
+           file://0001-Fix-build-failure-with-gcc-15.patch \
           "
 
-SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11"
 SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3"
 
+UPSTREAM_CHECK_URI = "https://repology.org/project/libsmi/information"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
+
 DEPENDS += "bison-native flex-native wget-native gawk-native"
 
 inherit autotools-brokensep update-alternatives
diff --git a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb
index 5969220a41..958f3cf5a1 100644
--- a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb
+++ b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb
@@ -12,7 +12,6 @@ inherit autotools pkgconfig python3-dir
 SRCREV = "fd1ad6e7823fa76d8db0d3c5884faffa8ffddafb"
 SRC_URI = "git://github.com/jackmitch/libsoc.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 BOARD ??= "devboard"
 
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch
new file mode 100644
index 0000000000..d75594bb4f
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch
@@ -0,0 +1,74 @@
+From 52c5859b82fe79f2c32d883e048d218e0d7f2182 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Wed, 30 Apr 2025 14:59:55 +0800
+Subject: [PATCH] CVE-2025-32911
+
+CVE: CVE-2025-32911 CVE-2025-32913
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/422/commits]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-message-headers.c | 13 +++++++++----
+ tests/header-parsing-test.c    | 15 +++++++++++++++
+ 2 files changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
+index 39ad14a..78b2455 100644
+--- a/libsoup/soup-message-headers.c
++++ b/libsoup/soup-message-headers.c
+@@ -1454,10 +1454,15 @@ soup_message_headers_get_content_disposition (SoupMessageHeaders  *hdrs,
+         */
+        if (params && g_hash_table_lookup_extended (*params, "filename",
+                                                    &orig_key, &orig_value)) {
+-               char *filename = strrchr (orig_value, '/');
+-
+-               if (filename)
+-                       g_hash_table_insert (*params, g_strdup (orig_key), filename + 1);
++                if (orig_value) {
++                        char *filename = strrchr (orig_value, '/');
++
++                        if (filename)
++                                g_hash_table_insert (*params, g_strdup (orig_key), g_strdup(filename + 1));
++                } else {
++                        /* filename with no value isn't valid. */
++                        g_hash_table_remove (*params, "filename");
++                }
+        }
+        return TRUE;
+ }
+diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
+index 946f118..752196e 100644
+--- a/tests/header-parsing-test.c
++++ b/tests/header-parsing-test.c
+@@ -1034,6 +1034,7 @@ do_param_list_tests (void)
+ #define RFC5987_TEST_HEADER_FALLBACK "attachment; filename*=Unknown''t%FF%FF%FFst.txt; filename=\"test.txt\""
+ #define RFC5987_TEST_HEADER_NO_TYPE  "filename=\"test.txt\""
+ #define RFC5987_TEST_HEADER_NO_TYPE_2  "filename=\"test.txt\"; foo=bar"
++#define RFC5987_TEST_HEADER_EMPTY_FILENAME ";filename"
+ 
+ static void
+ do_content_disposition_tests (void)
+@@ -1133,6 +1134,20 @@ do_content_disposition_tests (void)
+        g_assert_cmpstr (filename, ==, RFC5987_TEST_FALLBACK_FILENAME);
+         parameter2 = g_hash_table_lookup (params, "foo");
+         g_assert_cmpstr (parameter2, ==, "bar");
++       g_hash_table_destroy (params);
++
++        /* Empty filename */
++       soup_message_headers_clear (hdrs);
++       soup_message_headers_append (hdrs, "Content-Disposition",
++                                                                RFC5987_TEST_HEADER_EMPTY_FILENAME);
++       if (!soup_message_headers_get_content_disposition (hdrs,
++                                                                                                          &disposition,
++                                                                                                          &params)) {
++                       soup_test_assert (FALSE, "empty filename decoding FAILED");
++                       return;
++       }
++       g_free (disposition);
++       g_assert_false (g_hash_table_contains (params, "filename"));
+        g_hash_table_destroy (params);
+ 
+        soup_message_headers_free (hdrs);
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
new file mode 100644
index 0000000000..d867e5bc17
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
@@ -0,0 +1,44 @@
+From ced3c5d8cad0177b297666343f1561799dfefb0d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 22 Nov 2023 18:49:10 -0800
+Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
+
+Fixes build errors about missing function prototypes with clang-17
+
+Fixes
+| ../libsoup-2.74.3/libsoup/soup-xmlrpc-old.c:512:8: error: call to undeclared function 'xmlParseMemory'; ISO C99 and later do not support implicit function declarations
+
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/385]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libsoup/soup-xmlrpc-old.c | 1 +
+ libsoup/soup-xmlrpc.c     | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libsoup/soup-xmlrpc-old.c b/libsoup/soup-xmlrpc-old.c
+index c57086b6..527e3b23 100644
+--- a/libsoup/soup-xmlrpc-old.c
++++ b/libsoup/soup-xmlrpc-old.c
+@@ -11,6 +11,7 @@
+ 
+ #include <string.h>
+ 
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+ 
+ #include "soup-xmlrpc-old.h"
+diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc.c
+index 42dcda9c..e991cbf0 100644
+--- a/libsoup/soup-xmlrpc.c
++++ b/libsoup/soup-xmlrpc.c
+@@ -17,6 +17,7 @@
+ 
+ #include <string.h>
+ #include <errno.h>
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+ #include "soup-xmlrpc.h"
+ #include "soup.h"
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-possibly-uninitialized-warnings.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-possibly-uninitialized-warnings.patch
new file mode 100644
index 0000000000..fcd442c13a
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-possibly-uninitialized-warnings.patch
@@ -0,0 +1,43 @@
+From 1159686379184a1c899eabb2174258aba5e0fd79 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Mon, 20 Sep 2021 15:41:31 -0500
+Subject: [PATCH] Fix possibly uninitialized warnings
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/fb98e9a8c3062c75357b961543af091de2dd5459]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-websocket-connection.c | 2 +-
+ tests/samesite-test.c               | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c
+index 65c1492..585d45c 100644
+--- a/libsoup/soup-websocket-connection.c
++++ b/libsoup/soup-websocket-connection.c
+@@ -471,7 +471,7 @@ send_message (SoupWebsocketConnection *self,
+        GByteArray *bytes;
+        gsize frame_len;
+        guint8 *outer;
+-       guint8 mask_offset;
++       guint8 mask_offset = 0;
+        GBytes *filtered_bytes;
+        GList *l;
+        GError *error = NULL;
+diff --git a/tests/samesite-test.c b/tests/samesite-test.c
+index 0b081b2..60c9b8e 100644
+--- a/tests/samesite-test.c
++++ b/tests/samesite-test.c
+@@ -60,6 +60,9 @@ assert_highest_policy_visible (GSList *cookies, SoupSameSitePolicy policy)
+        case SOUP_SAME_SITE_POLICY_NONE:
+                expected_count = 1;
+                break;
++       default:
++               g_assert_not_reached ();
++               break;
+        }
+ 
+        g_assert_cmpuint (size, ==, expected_count);
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Remove-http-and-https-aliases-support-test.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Remove-http-and-https-aliases-support-test.patch
new file mode 100644
index 0000000000..0d4139ec08
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Remove-http-and-https-aliases-support-test.patch
@@ -0,0 +1,145 @@
+From 0e3bfa22b23451531caf8cc30b1771ac6a41fcad Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <cgarcia@igalia.com>
+Date: Thu, 11 Feb 2021 10:47:09 +0100
+Subject: [PATCH] Remove http and https aliases support test
+
+Upstream has removed the whole function of http and https aliases
+support, this commit partially cherry pick it, only remove the test to
+mute the warning:
+| ../libsoup-2.74.3/tests/server-test.c: In function 'do_one_server_aliases_test':
+| ../libsoup-2.74.3/tests/server-test.c:180:17: warning: 'g_socket_client_set_tls_validation_flags' is deprecated [-Wdeprecated-declarations]
+|   180 |                 g_socket_client_set_tls_validation_flags (client, 0);
+|       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/111ae4ebe7cc2e389573cff5b9ac76509d6cbac0]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ tests/server-test.c | 104 --------------------------------------------
+ 1 file changed, 104 deletions(-)
+
+diff --git a/tests/server-test.c b/tests/server-test.c
+index 8976103..cb7e815 100644
+--- a/tests/server-test.c
++++ b/tests/server-test.c
+@@ -154,108 +154,6 @@ do_star_test (ServerData *sd, gconstpointer test_data)
+        soup_uri_free (star_uri);
+ }
+ 
+-static void
+-do_one_server_aliases_test (SoupURI    *uri,
+-                           const char *alias,
+-                           gboolean    succeed)
+-{
+-       GSocketClient *client;
+-       GSocketConnectable *addr;
+-       GSocketConnection *conn;
+-       GInputStream *in;
+-       GOutputStream *out;
+-       GError *error = NULL;
+-       GString *req;
+-       static char buf[1024];
+-
+-       debug_printf (1, "  %s via %s\n", alias, uri->scheme);
+-
+-       /* There's no way to make libsoup's client side send an absolute
+-        * URI (to a non-proxy server), so we have to fake this.
+-        */
+-
+-       client = g_socket_client_new ();
+-       if (uri->scheme == SOUP_URI_SCHEME_HTTPS) {
+-               g_socket_client_set_tls (client, TRUE);
+-               g_socket_client_set_tls_validation_flags (client, 0);
+-       }
+-       addr = g_network_address_new (uri->host, uri->port);
+-
+-       conn = g_socket_client_connect (client, addr, NULL, &error);
+-       g_object_unref (addr);
+-       g_object_unref (client);
+-       if (!conn) {
+-               g_assert_no_error (error);
+-               g_error_free (error);
+-               return;
+-       }
+-
+-       in = g_io_stream_get_input_stream (G_IO_STREAM (conn));
+-       out = g_io_stream_get_output_stream (G_IO_STREAM (conn));
+-
+-       req = g_string_new (NULL);
+-       g_string_append_printf (req, "GET %s://%s:%d HTTP/1.1\r\n",
+-                               alias, uri->host, uri->port);
+-       g_string_append_printf (req, "Host: %s:%d\r\n",
+-                               uri->host, uri->port);
+-       g_string_append (req, "Connection: close\r\n\r\n");
+-
+-       if (!g_output_stream_write_all (out, req->str, req->len, NULL, NULL, &error)) {
+-               g_assert_no_error (error);
+-               g_error_free (error);
+-               g_object_unref (conn);
+-               g_string_free (req, TRUE);
+-               return;
+-       }
+-       g_string_free (req, TRUE);
+-
+-       if (!g_input_stream_read_all (in, buf, sizeof (buf), NULL, NULL, &error)) {
+-               g_assert_no_error (error);
+-               g_error_free (error);
+-               g_object_unref (conn);
+-               return;
+-       }
+-
+-       if (succeed)
+-               g_assert_true (g_str_has_prefix (buf, "HTTP/1.1 200 "));
+-       else
+-               g_assert_true (g_str_has_prefix (buf, "HTTP/1.1 400 "));
+-
+-       g_io_stream_close (G_IO_STREAM (conn), NULL, NULL);
+-       g_object_unref (conn);
+-}
+-
+-static void
+-do_server_aliases_test (ServerData *sd, gconstpointer test_data)
+-{
+-       char *http_aliases[] = { "dav", NULL };
+-       char *https_aliases[] = { "davs", NULL };
+-       char *http_good[] = { "http", "dav", NULL };
+-       char *http_bad[] = { "https", "davs", "fred", NULL };
+-       char *https_good[] = { "https", "davs", NULL };
+-       char *https_bad[] = { "http", "dav", "fred", NULL };
+-       int i;
+-
+-       g_test_bug ("703694");
+-
+-       g_object_set (G_OBJECT (sd->server),
+-                     SOUP_SERVER_HTTP_ALIASES, http_aliases,
+-                     SOUP_SERVER_HTTPS_ALIASES, https_aliases,
+-                     NULL);
+-
+-       for (i = 0; http_good[i]; i++)
+-               do_one_server_aliases_test (sd->base_uri, http_good[i], TRUE);
+-       for (i = 0; http_bad[i]; i++)
+-               do_one_server_aliases_test (sd->base_uri, http_bad[i], FALSE);
+-
+-       if (tls_available) {
+-               for (i = 0; https_good[i]; i++)
+-                       do_one_server_aliases_test (sd->ssl_base_uri, https_good[i], TRUE);
+-               for (i = 0; https_bad[i]; i++)
+-                       do_one_server_aliases_test (sd->ssl_base_uri, https_bad[i], FALSE);
+-       }
+-}
+-
+ static void
+ do_dot_dot_test (ServerData *sd, gconstpointer test_data)
+ {
+@@ -1382,8 +1280,6 @@ main (int argc, char **argv)
+ 
+        g_test_add ("/server/OPTIONS *", ServerData, NULL,
+                    server_setup, do_star_test, server_teardown);
+-       g_test_add ("/server/aliases", ServerData, NULL,
+-                   server_setup, do_server_aliases_test, server_teardown);
+        g_test_add ("/server/..-in-path", ServerData, NULL,
+                    server_setup, do_dot_dot_test, server_teardown);
+        g_test_add ("/server/ipv6", ServerData, NULL,
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch
new file mode 100644
index 0000000000..04713850e1
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch
@@ -0,0 +1,150 @@
+From 4a2bb98e03d79146c729dca52c8d6edc635218ff Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Mon, 8 Jul 2024 12:33:15 -0500
+Subject: [PATCH] headers: Strictly don't allow NUL bytes
+
+In the past (2015) this was allowed for some problematic sites. However Chromium also does not allow NUL bytes in either header names or values these days. So this should no longer be a problem.
+
+CVE: CVE-2024-52530
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/402/diffs?commit_id=04df03bc092ac20607f3e150936624d4f536e68b]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-headers.c      | 15 +++------
+ tests/header-parsing-test.c | 62 +++++++++++++++++--------------------
+ 2 files changed, 32 insertions(+), 45 deletions(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index eec28ad..e5d3c03 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -50,13 +50,14 @@ soup_headers_parse (const char *str, int len, SoupMessageHeaders *dest)
+         * ignorable trailing whitespace.
+         */
+ 
++       /* No '\0's are allowed */
++       if (memchr (str, '\0', len))
++               return FALSE;
++
+        /* Skip over the Request-Line / Status-Line */
+        headers_start = memchr (str, '\n', len);
+        if (!headers_start)
+                return FALSE;
+-       /* No '\0's in the Request-Line / Status-Line */
+-       if (memchr (str, '\0', headers_start - str))
+-               return FALSE;
+ 
+        /* We work on a copy of the headers, which we can write '\0's
+         * into, so that we don't have to individually g_strndup and
+@@ -68,14 +69,6 @@ soup_headers_parse (const char *str, int len, SoupMessageHeaders *dest)
+        headers_copy[copy_len] = '\0';
+        value_end = headers_copy;
+ 
+-       /* There shouldn't be any '\0's in the headers already, but
+-        * this is the web we're talking about.
+-        */
+-       while ((p = memchr (headers_copy, '\0', copy_len))) {
+-               memmove (p, p + 1, copy_len - (p - headers_copy));
+-               copy_len--;
+-       }
+-
+        while (*(value_end + 1)) {
+                name = value_end + 1;
+                name_end = strchr (name, ':');
+diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
+index 752196e..c1d3b33 100644
+--- a/tests/header-parsing-test.c
++++ b/tests/header-parsing-test.c
+@@ -358,24 +358,6 @@ static struct RequestTest {
+          }
+        },
+ 
+-       { "NUL in header name", "760832",
+-         "GET / HTTP/1.1\r\nHost\x00: example.com\r\n", 36,
+-         SOUP_STATUS_OK,
+-         "GET", "/", SOUP_HTTP_1_1,
+-         { { "Host", "example.com" },
+-           { NULL }
+-         }
+-       },
+-
+-       { "NUL in header value", "760832",
+-         "GET / HTTP/1.1\r\nHost: example\x00" "com\r\n", 35,
+-         SOUP_STATUS_OK,
+-         "GET", "/", SOUP_HTTP_1_1,
+-         { { "Host", "examplecom" },
+-           { NULL }
+-         }
+-       },
+-
+        /************************/
+        /*** INVALID REQUESTS ***/
+        /************************/
+@@ -448,6 +430,21 @@ static struct RequestTest {
+          SOUP_STATUS_EXPECTATION_FAILED,
+          NULL, NULL, -1,
+          { { NULL } }
++       },
++
++       // https://gitlab.gnome.org/GNOME/libsoup/-/issues/377
++       { "NUL in header name", NULL,
++         "GET / HTTP/1.1\r\nHost\x00: example.com\r\n", 36,
++         SOUP_STATUS_BAD_REQUEST,
++         NULL, NULL, -1,
++         { { NULL } }
++       },
++
++       { "NUL in header value", NULL,
++         "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28,
++         SOUP_STATUS_BAD_REQUEST,
++           NULL, NULL, -1,
++         { { NULL } }
+        }
+ };
+ static const int num_reqtests = G_N_ELEMENTS (reqtests);
+@@ -620,22 +617,6 @@ static struct ResponseTest {
+            { NULL } }
+        },
+ 
+-       { "NUL in header name", "760832",
+-         "HTTP/1.1 200 OK\r\nF\x00oo: bar\r\n", 28,
+-         SOUP_HTTP_1_1, SOUP_STATUS_OK, "OK",
+-         { { "Foo", "bar" },
+-           { NULL }
+-         }
+-       },
+-
+-       { "NUL in header value", "760832",
+-         "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28,
+-         SOUP_HTTP_1_1, SOUP_STATUS_OK, "OK",
+-         { { "Foo", "bar" },
+-           { NULL }
+-         }
+-       },
+-
+        /********************************/
+        /*** VALID CONTINUE RESPONSES ***/
+        /********************************/
+@@ -768,6 +749,19 @@ static struct ResponseTest {
+          { { NULL }
+          }
+        },
++
++       // https://gitlab.gnome.org/GNOME/libsoup/-/issues/377
++       { "NUL in header name", NULL,
++         "HTTP/1.1 200 OK\r\nF\x00oo: bar\r\n", 28,
++         -1, 0, NULL,
++         { { NULL } }
++       },
++
++       { "NUL in header value", "760832",
++         "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28,
++         -1, 0, NULL,
++         { { NULL } }
++       },
+ };
+ static const int num_resptests = G_N_ELEMENTS (resptests);
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch
new file mode 100644
index 0000000000..9de0310c8d
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch
@@ -0,0 +1,39 @@
+From 8331e681c85c3b1893d8d5193783f631bfc07acb Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 16 May 2025 13:42:08 +0800
+Subject: [PATCH] tests: Add test for passing invalid UTF-8 to
+ soup_header_parse_semi_param_list()
+
+CVE: CVE-2024-52531
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/407/diffs?commit_id=825fda3425546847b42ad5270544e9388ff349fe]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ tests/header-parsing-test.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
+index b811115..cfcc003 100644
+--- a/tests/header-parsing-test.c
++++ b/tests/header-parsing-test.c
+@@ -836,6 +836,17 @@ static struct ParamListTest {
+            { "filename", "t\xC3\xA9st.txt" },
+          },
+        },
++
++/* This tests invalid UTF-8 data which *should* never be passed here but it was designed to be robust against it. */
++       { TRUE,
++         "invalid*=\x69\x27\x27\x93\x93\x93\x93\xff\x61\x61\x61\x61\x61\x61\x61\x62\x63\x64\x65\x0a; filename*=iso-8859-1''\x69\x27\x27\x93\x93\x93\x93\xff\x61\x61\x61\x61\x61\x61\x61\x62\x63\x64\x65\x0a; foo",
++          {
++               { "filename", "i''\302\223\302\223\302\223\302\223\303\277aaaaaaabcde" },
++               { "invalid", "\302\223\302\223\302\223\302\223\303\277aaaaaaabcde" },
++               { "foo", NULL },
++          },
++       }
++
+ };
+ static const int num_paramlisttests = G_N_ELEMENTS (paramlisttests);
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch
new file mode 100644
index 0000000000..740c28c016
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch
@@ -0,0 +1,133 @@
+From 12523a592f1216450d18706bcf6c16e0f1ab0ce0 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 16 May 2025 13:52:37 +0800
+Subject: [PATCH] headers: Be more robust against invalid input when
+ parsing params
+
+If you pass invalid input to a function such as soup_header_parse_param_list_strict()
+it can cause an overflow if it decodes the input to UTF-8.
+
+This should never happen with valid UTF-8 input which libsoup's client API
+ensures, however it's server API does not currently.
+
+CVE: CVE-2024-52531
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/407/diffs?commit_id=a35222dd0bfab2ac97c10e86b95f762456628283]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-headers.c | 45 +++++++++++++++++++++---------------------
+ 1 file changed, 23 insertions(+), 22 deletions(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index 67905b2..39e8d34 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -642,8 +642,9 @@ soup_header_contains (const char *header, const char *token)
+ }
+ 
+ static void
+-decode_quoted_string (char *quoted_string)
++decode_quoted_string_inplace (GString *quoted_gstring)
+ {
++       char *quoted_string = quoted_gstring->str;
+        char *src, *dst;
+ 
+        src = quoted_string + 1;
+@@ -657,10 +658,11 @@ decode_quoted_string (char *quoted_string)
+ }
+ 
+ static gboolean
+-decode_rfc5987 (char *encoded_string)
++decode_rfc5987_inplace (GString *encoded_gstring)
+ {
+        char *q, *decoded;
+        gboolean iso_8859_1 = FALSE;
++       const char *encoded_string = encoded_gstring->str;
+ 
+        q = strchr (encoded_string, '\'');
+        if (!q)
+@@ -689,14 +691,7 @@ decode_rfc5987 (char *encoded_string)
+                decoded = utf8;
+        }
+ 
+-       /* If encoded_string was UTF-8, then each 3-character %-escape
+-        * will be converted to a single byte, and so decoded is
+-        * shorter than encoded_string. If encoded_string was
+-        * iso-8859-1, then each 3-character %-escape will be
+-        * converted into at most 2 bytes in UTF-8, and so it's still
+-        * shorter.
+-        */
+-       strcpy (encoded_string, decoded);
++       g_string_assign (encoded_gstring, decoded);
+        g_free (decoded);
+        return TRUE;
+ }
+@@ -706,15 +701,16 @@ parse_param_list (const char *header, char delim, gboolean strict)
+ {
+        GHashTable *params;
+        GSList *list, *iter;
+-       char *item, *eq, *name_end, *value;
+-       gboolean override, duplicated;
+ 
+        params = g_hash_table_new_full (soup_str_case_hash, 
+                                        soup_str_case_equal,
+-                                       g_free, NULL);
++                                       g_free, g_free);
+ 
+        list = parse_list (header, delim);
+        for (iter = list; iter; iter = iter->next) {
++               char *item, *eq, *name_end;
++               gboolean override, duplicated;
++               GString *parsed_value = NULL;
+                item = iter->data;
+                override = FALSE;
+ 
+@@ -729,19 +725,19 @@ parse_param_list (const char *header, char delim, gboolean strict)
+ 
+                        *name_end = '\0';
+ 
+-                       value = (char *)skip_lws (eq + 1);
++                       parsed_value = g_string_new ((char *)skip_lws (eq + 1));
+ 
+                        if (name_end[-1] == '*' && name_end > item + 1) {
+                                name_end[-1] = '\0';
+-                               if (!decode_rfc5987 (value)) {
++                               if (!decode_rfc5987_inplace (parsed_value)) {
++                                       g_string_free (parsed_value, TRUE);
+                                        g_free (item);
+                                        continue;
+                                }
+                                override = TRUE;
+-                       } else if (*value == '"')
+-                               decode_quoted_string (value);
+-               } else
+-                       value = NULL;
++                       } else if (parsed_value->str[0] == '"')
++                               decode_quoted_string_inplace (parsed_value);
++                       }
+ 
+                duplicated = g_hash_table_lookup_extended (params, item, NULL, NULL);
+ 
+@@ -749,11 +745,16 @@ parse_param_list (const char *header, char delim, gboolean strict)
+                        soup_header_free_param_list (params);
+                        params = NULL;
+                        g_slist_foreach (iter, (GFunc)g_free, NULL);
++                       if (parsed_value)
++                               g_string_free (parsed_value, TRUE);
+                        break;
+-               } else if (override || !duplicated)
+-                       g_hash_table_replace (params, item, value);
+-               else
++               } else if (override || !duplicated) {
++                       g_hash_table_replace (params, item, parsed_value ? g_string_free (parsed_value, FALSE) : NULL);
++               } else {
++                       if (parsed_value)
++                               g_string_free (parsed_value, TRUE);
+                        g_free (item);
++               }
+        }
+ 
+        g_slist_free (list);
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch
new file mode 100644
index 0000000000..cb1f096110
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch
@@ -0,0 +1,37 @@
+From a693d49bff058fc20a448dc4e7d324ff0dc6597e Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <qignacio@amazon.com>
+Date: Wed, 11 Sep 2024 11:52:11 +0200
+Subject: [PATCH 1/3] websocket: process the frame as soon as we read data
+
+Otherwise we can enter in a read loop because we were not
+validating the data until the all the data was read.
+
+Fixes #391
+
+CVE: CVE-2024-52532
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be#f1d67ca0386b145ea201cf88d27f72724d7c6715]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-websocket-connection.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c
+index a4095e1..65c1492 100644
+--- a/libsoup/soup-websocket-connection.c
++++ b/libsoup/soup-websocket-connection.c
+@@ -1140,9 +1140,8 @@ soup_websocket_connection_read (SoupWebsocketConnection *self)
+                }
+ 
+                pv->incoming->len = len + count;
+-       } while (count > 0);
+-
+-       process_incoming (self);
++               process_incoming (self);
++       } while (count > 0 && !pv->close_sent && !pv->io_closing);
+ 
+        if (end) {
+                if (!pv->close_sent || !pv->close_received) {
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch
new file mode 100644
index 0000000000..dcadafe944
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch
@@ -0,0 +1,43 @@
+From f5b76410de1318f49844dacf6e68692522b6c856 Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <qignacio@amazon.com>
+Date: Wed, 2 Oct 2024 11:17:19 +0200
+Subject: [PATCH] websocket-test: disconnect error copy after the test ends
+
+Otherwise the server will have already sent a few more wrong
+bytes and the client will continue getting errors to copy
+but the error is already != NULL and it will assert
+
+CVE: CVE-2024-52532
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/29b96fab2512666d7241e46c98cc45b60b795c0c]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ tests/websocket-test.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tests/websocket-test.c b/tests/websocket-test.c
+index 5e40cf3..1ec9ff6 100644
+--- a/tests/websocket-test.c
++++ b/tests/websocket-test.c
+@@ -1331,8 +1331,9 @@ test_receive_invalid_encode_length_64 (Test *test,
+        GError *error = NULL;
+        InvalidEncodeLengthTest context = { test, NULL };
+        guint i;
++       guint error_id;
+ 
+-       g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
++       error_id = g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
+        g_signal_connect (test->client, "message", G_CALLBACK (on_binary_message), &received);
+ 
+        /* We use 127(\x7f) as payload length with 65535 extended length */
+@@ -1345,6 +1346,7 @@ test_receive_invalid_encode_length_64 (Test *test,
+        WAIT_UNTIL (error != NULL || received != NULL);
+        g_assert_error (error, SOUP_WEBSOCKET_ERROR, SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR);
+        g_clear_error (&error);
++       g_signal_handler_disconnect (test->client, error_id);
+        g_assert_null (received);
+ 
+         g_thread_join (thread);
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch
new file mode 100644
index 0000000000..ab6af72291
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch
@@ -0,0 +1,48 @@
+From d97bb2e340f5a6d7e56a7738403f9d18bc406b70 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Wed, 13 Nov 2024 14:14:23 +0000
+Subject: [PATCH 3/3] websocket-test: Disconnect error signal in another place
+
+This is the same change as commit 29b96fab "websocket-test: disconnect
+error copy after the test ends", and is done for the same reason, but
+replicating it into a different function.
+
+Fixes: 6adc0e3e "websocket: process the frame as soon as we read data"
+Resolves: https://gitlab.gnome.org/GNOME/libsoup/-/issues/399
+Signed-off-by: Simon McVittie <smcv@debian.org>
+
+CVE: CVE-2024-52532
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/commit/4c9e75c6676a37b6485620c332e568e1a3f530ff]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ tests/websocket-test.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/websocket-test.c b/tests/websocket-test.c
+index 2b19a7b..0699a06 100644
+--- a/tests/websocket-test.c
++++ b/tests/websocket-test.c
+@@ -1300,8 +1300,9 @@ test_receive_invalid_encode_length_16 (Test *test,
+        GError *error = NULL;
+        InvalidEncodeLengthTest context = { test, NULL };
+        guint i;
++       guint error_id;
+ 
+-       g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
++       error_id = g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
+        g_signal_connect (test->client, "message", G_CALLBACK (on_binary_message), &received);
+ 
+        /* We use 126(~) as payload length with 125 extended length */
+@@ -1314,6 +1315,7 @@ test_receive_invalid_encode_length_16 (Test *test,
+        WAIT_UNTIL (error != NULL || received != NULL);
+        g_assert_error (error, SOUP_WEBSOCKET_ERROR, SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR);
+        g_clear_error (&error);
++        g_signal_handler_disconnect (test->client, error_id);
+        g_assert_null (received);
+ 
+        g_thread_join (thread);
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch
new file mode 100644
index 0000000000..106f907168
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch
@@ -0,0 +1,56 @@
+From 2eacbd762332795e00692ddab2515c6da23198d3 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Mon, 12 May 2025 14:06:41 +0800
+Subject: [PATCH] sniffer: Add better coverage of skip_insignificant_space()
+
+CVE: CVE-2025-2784
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/435/diffs?commit_id=242a10fbb12dbdc12d254bd8fc8669a0ac055304;
+ https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/442/diffs?commit_id=c415ad0b6771992e66c70edf373566c6e247089d]
+
+Test code is not added since it uses some functions not defined in
+version 2.74. These tests are not used now, so just ignore them.
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-content-sniffer.c |  9 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
+index 5f2896e..9554636 100644
+--- a/libsoup/soup-content-sniffer.c
++++ b/libsoup/soup-content-sniffer.c
+@@ -612,8 +612,10 @@ sniff_text_or_binary (SoupContentSniffer *sniffer, SoupBuffer *buffer)
+ }
+ 
+ static gboolean
+-skip_insignificant_space (const char *resource, int *pos, int resource_length)
++skip_insignificant_space (const char *resource, gsize *pos, gsize resource_length)
+ {
++       if (*pos >= resource_length)
++               return TRUE;
+        while ((resource[*pos] == '\x09') ||
+               (resource[*pos] == '\x20') ||
+               (resource[*pos] == '\x0A') ||
+@@ -632,7 +634,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer)
+ {
+        const char *resource = (const char *)buffer->data;
+        int resource_length = MIN (512, buffer->length);
+-       int pos = 0;
++       gsize pos = 0;
+ 
+        if (resource_length < 3)
+                goto text_html;
+@@ -642,9 +644,6 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer)
+                pos = 3;
+ 
+  look_for_tag:
+-       if (pos > resource_length)
+-               goto text_html;
+-
+        if (skip_insignificant_space (resource, &pos, resource_length))
+                goto text_html;
+
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch
new file mode 100644
index 0000000000..c032846ef0
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch
@@ -0,0 +1,29 @@
+From 5709dfffb6fdc5b66ce001bf82a755ad8ad1d992 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Mon, 28 Oct 2024 12:29:48 -0500
+Subject: [PATCH] Fix using int instead of size_t for strcspn return
+
+CVE: CVE-2025-32050
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/9bb0a55de55c6940ced811a64fbca82fe93a9323]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-headers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index 9707ca0..67905b2 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -902,7 +902,7 @@ append_param_quoted (GString    *string,
+                     const char *name,
+                     const char *value)
+ {
+-       int len;
++       gsize len;
+ 
+        g_string_append (string, name);
+        g_string_append (string, "=\"");
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch
new file mode 100644
index 0000000000..34bc8113a4
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch
@@ -0,0 +1,32 @@
+From f4a67a9a3033586edaee715d40d5992e02d32893 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Sat, 16 Nov 2024 12:07:30 -0600
+Subject: [PATCH] Fix heap buffer overflow in soup_content_sniffer_sniff
+
+Co-Author: Ar Jun <pkillarjun@protonmail.com>
+
+CVE: CVE-2025-32052
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/commit/f182429e5b1fc034050510da20c93256c4fa9652#500da7cfde649872c49169be34b03a1c42a53ddb]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-content-sniffer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
+index 9554636..eac9e7b 100644
+--- a/libsoup/soup-content-sniffer.c
++++ b/libsoup/soup-content-sniffer.c
+@@ -504,7 +504,7 @@ sniff_unknown (SoupContentSniffer *sniffer, SoupBuffer *buffer,
+                        guint index_pattern = 0;
+                        gboolean skip_row = FALSE;
+ 
+-                       while ((index_stream < resource_length) &&
++                       while ((index_stream < resource_length - 1) &&
+                               (index_pattern <= type_row->pattern_length)) {
+                                /* Skip insignificant white space ("WS" in the spec) */
+                                if (type_row->pattern[index_pattern] == ' ') {
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch
new file mode 100644
index 0000000000..0d829d6200
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch
@@ -0,0 +1,39 @@
+From d9bcffd6cd5e8ec32889a594f7348d67a5101b3a Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Mon, 12 May 2025 13:58:42 +0800
+Subject: [PATCH] Fix heap buffer overflow in
+ soup-content-sniffer.c:sniff_feed_or_html()
+
+CVE: CVE-2025-32053
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/eaed42ca8d40cd9ab63764e3d63641180505f40a]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-content-sniffer.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
+index 967ec61..5f2896e 100644
+--- a/libsoup/soup-content-sniffer.c
++++ b/libsoup/soup-content-sniffer.c
+@@ -620,7 +620,7 @@ skip_insignificant_space (const char *resource, int *pos, int resource_length)
+               (resource[*pos] == '\x0D')) {
+                *pos = *pos + 1;
+ 
+-               if (*pos > resource_length)
++               if (*pos >= resource_length)
+                        return TRUE;
+        }
+ 
+@@ -682,7 +682,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer)
+                do {
+                        pos++;
+ 
+-                       if (pos > resource_length)
++                       if ((pos + 1) > resource_length)
+                                goto text_html;
+                } while (resource[pos] != '>');
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch
new file mode 100644
index 0000000000..c33ebf8056
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch
@@ -0,0 +1,71 @@
+From 4b8809cca4bbcbf9514314d86227f985362258b0 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Wed, 12 Feb 2025 11:30:02 -0600
+Subject: [PATCH] headers: Handle parsing only newlines
+
+Closes #404
+Closes #407
+
+CVE: CVE-2025-32906
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/af5b9a4a3945c52b940d5ac181ef51bb12011f1f]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-headers.c      |  4 ++--
+ tests/header-parsing-test.c | 11 +++++++++++
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index e5d3c03..87bb3dc 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -185,7 +185,7 @@ soup_headers_parse_request (const char          *str,
+        /* RFC 2616 4.1 "servers SHOULD ignore any empty line(s)
+         * received where a Request-Line is expected."
+         */
+-       while ((*str == '\r' || *str == '\n') && len > 0) {
++       while (len > 0 && (*str == '\r' || *str == '\n')) {
+                str++;
+                len--;
+        }
+@@ -369,7 +369,7 @@ soup_headers_parse_response (const char          *str,
+         * after a response, which we then see prepended to the next
+         * response on that connection.
+         */
+-       while ((*str == '\r' || *str == '\n') && len > 0) {
++       while (len > 0 && (*str == '\r' || *str == '\n')) {
+                str++;
+                len--;
+        }
+diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
+index c1d3b33..b811115 100644
+--- a/tests/header-parsing-test.c
++++ b/tests/header-parsing-test.c
+@@ -6,6 +6,10 @@ typedef struct {
+        const char *name, *value;
+ } Header;
+ 
++static char only_newlines[] = {
++        '\n', '\n', '\n', '\n'
++};
++
+ static struct RequestTest {
+        const char *description;
+        const char *bugref;
+@@ -445,6 +449,13 @@ static struct RequestTest {
+          SOUP_STATUS_BAD_REQUEST,
+            NULL, NULL, -1,
+          { { NULL } }
++       },
++
++       { "Only newlines", NULL,
++         only_newlines, sizeof (only_newlines),
++         SOUP_STATUS_BAD_REQUEST,
++           NULL, NULL, -1,
++         { { NULL } }
+        }
+ };
+ static const int num_reqtests = G_N_ELEMENTS (reqtests);
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch
new file mode 100644
index 0000000000..41dd3ff3f4
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch
@@ -0,0 +1,39 @@
+From 8158b4084dcba2a233dfcb7359c53ab2840148f7 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 15 Apr 2025 12:17:39 +0200
+Subject: [PATCH 1/2] soup-message-headers: Correct merge of ranges
+
+It had been skipping every second range, which generated an array
+of a lot of insane ranges, causing large memory usage by the server.
+
+Closes #428
+
+Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452>
+
+CVE: CVE-2025-32907
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452/diffs?commit_id=9bb92f7a685e31e10e9e8221d0342280432ce836]
+
+Test part not applied since test codes use some functions not in this
+version
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-message-headers.c |   1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
+index 78b2455..00b9763 100644
+--- a/libsoup/soup-message-headers.c
++++ b/libsoup/soup-message-headers.c
+@@ -1024,6 +1024,7 @@ soup_message_headers_get_ranges_internal (SoupMessageHeaders  *hdrs,
+                        if (cur->start <= prev->end) {
+                                prev->end = MAX (prev->end, cur->end);
+                                g_array_remove_index (array, i);
++                               i--;
+                        }
+                }
+        }
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch
new file mode 100644
index 0000000000..2f5366348d
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch
@@ -0,0 +1,38 @@
+From e6e088e62c10ab91fa2f2ad5c122332aa7cde97c Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Mon, 12 May 2025 16:55:37 +0800
+Subject: [PATCH] content-sniffer: Handle sniffing resource shorter than
+ 4 bytes
+
+CVE: CVE-2025-32909
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/commit/ba4c3a6f988beff59e45801ab36067293d24ce92]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-content-sniffer.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
+index eac9e7b..73d2245 100644
+--- a/libsoup/soup-content-sniffer.c
++++ b/libsoup/soup-content-sniffer.c
+@@ -227,9 +227,14 @@ sniff_mp4 (SoupContentSniffer *sniffer, SoupBuffer *buffer)
+ {
+        const char *resource = (const char *)buffer->data;
+        guint resource_length = MIN (512, buffer->length);
+-       guint32 box_size = *((guint32*)resource);
++       guint32 box_size;
+        guint i;
+ 
++       if (resource_length < sizeof (guint32))
++               return FALSE;
++
++       box_size = *((guint32*)resource);
++
+ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+        box_size = ((box_size >> 24) |
+                    ((box_size << 8) & 0x00FF0000) |
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch
new file mode 100644
index 0000000000..c1dc6860f2
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch
@@ -0,0 +1,32 @@
+From a7e711d0f162c6edc8acad2a96981d4890784ea3 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Mon, 12 May 2025 17:02:55 +0800
+Subject: [PATCH] auth-digest: Handle missing realm/nonce in authenticate
+ header
+
+CVE: CVE-2025-32910
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=e40df6d48a1cbab56f5d15016cc861a503423cfe]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-auth-digest.c |  3 +++
+ 1 files changed, 3 insertions(+)
+
+diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
+index e8ba990..0ab3499 100644
+--- a/libsoup/soup-auth-digest.c
++++ b/libsoup/soup-auth-digest.c
+@@ -142,6 +142,9 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
+        guint qop_options;
+        gboolean ok = TRUE;
+ 
++        if (!soup_auth_get_realm (auth))
++               return FALSE;
++
+        g_free (priv->domain);
+        g_free (priv->nonce);
+        g_free (priv->opaque);
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch
new file mode 100644
index 0000000000..019a35e3be
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch
@@ -0,0 +1,94 @@
+From eccfca1074fc485a0b60dfb9c8385429a226bf73 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 16 May 2025 13:19:38 +0800
+Subject: [PATCH] auth-digest: Handle missing nonce
+
+CVE: CVE-2025-32910
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=405a8a34597a44bd58c4759e7d5e23f02c3b556a]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-auth-digest.c | 45 ++++++++++++++++++++++++++++----------
+ 1 files changed, 28 insertions(+), 10 deletions(-)
+
+diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
+index 0ab3499..10a8591 100644
+--- a/libsoup/soup-auth-digest.c
++++ b/libsoup/soup-auth-digest.c
+@@ -132,6 +132,19 @@ soup_auth_digest_get_qop (SoupAuthDigestQop qop)
+        return g_string_free (out, FALSE);
+ }
+ 
++static gboolean
++validate_params (SoupAuthDigest *auth_digest)
++{
++       SoupAuthDigestPrivate *priv = soup_auth_digest_get_instance_private (auth_digest);
++
++       if (priv->qop || priv->algorithm == SOUP_AUTH_DIGEST_ALGORITHM_MD5_SESS) {
++               if (!priv->nonce)
++                       return FALSE;
++       }
++
++       return TRUE;
++}
++
+ static gboolean
+ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
+                         GHashTable *auth_params)
+@@ -169,17 +182,22 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
+        if (priv->algorithm == -1)
+                ok = FALSE;
+ 
+-       stale = g_hash_table_lookup (auth_params, "stale");
+-       if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp)
+-               recompute_hex_a1 (priv);
+-       else {
+-               g_free (priv->user);
+-               priv->user = NULL;
+-               g_free (priv->cnonce);
+-               priv->cnonce = NULL;
+-               memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
+-               memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
+-        }
++       if (!validate_params (auth_digest))
++               ok = FALSE;
++
++       if (ok) {
++               stale = g_hash_table_lookup (auth_params, "stale");
++               if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp)
++                       recompute_hex_a1 (priv);
++               else {
++                       g_free (priv->user);
++                       priv->user = NULL;
++                       g_free (priv->cnonce);
++                       priv->cnonce = NULL;
++                       memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
++                       memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
++               }
++       }
+ 
+        return ok;
+ }
+@@ -359,6 +377,8 @@ soup_auth_digest_compute_response (const char        *method,
+        if (qop) {
+                char tmp[9];
+ 
++               g_assert (cnonce);
++
+                g_snprintf (tmp, 9, "%.8x", nc);
+                g_checksum_update (checksum, (guchar *)tmp, strlen (tmp));
+                g_checksum_update (checksum, (guchar *)":", 1);
+@@ -422,6 +442,9 @@ soup_auth_digest_get_authorization (SoupAuth *auth, SoupMessage *msg)
+        g_return_val_if_fail (uri != NULL, NULL);
+        url = soup_uri_to_string (uri, TRUE);
+ 
++       g_assert (priv->nonce);
++       g_assert (!priv->qop || priv->cnonce);
++
+        soup_auth_digest_compute_response (msg->method, url, priv->hex_a1,
+                                           priv->qop, priv->nonce,
+                                           priv->cnonce, priv->nc,
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch
new file mode 100644
index 0000000000..bdf4d64ca3
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch
@@ -0,0 +1,28 @@
+From 74c95d54fe42041fe161cb74c76d942ffd37a5dd Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 16 May 2025 13:21:43 +0800
+Subject: [PATCH] auth-digest: Fix leak
+
+CVE: CVE-2025-32910
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=ea16eeacb052e423eb5c3b0b705e5eab34b13832]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-auth-digest.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
+index 10a8591..6d965d2 100644
+--- a/libsoup/soup-auth-digest.c
++++ b/libsoup/soup-auth-digest.c
+@@ -66,6 +66,7 @@ soup_auth_digest_finalize (GObject *object)
+        g_free (priv->nonce);
+        g_free (priv->domain);
+        g_free (priv->cnonce);
++       g_free (priv->opaque);
+ 
+        memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
+        memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch
new file mode 100644
index 0000000000..b3ce9d8bc3
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch
@@ -0,0 +1,32 @@
+From 0984dddb11daf14fdf5ca24077cd0ebda796439a Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 16 May 2025 13:25:32 +0800
+Subject: [PATCH] auth-digest: Handle missing nonce
+
+CVE: CVE-2025-32912
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/commit/cd077513f267e43ce4b659eb18a1734d8a369992?merge_request_iid=434
+https://gitlab.gnome.org/GNOME/libsoup/-/commit/910ebdcd3dd82386717a201c13c834f3a63eed7f]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-auth-digest.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
+index 6d965d2..f1621ec 100644
+--- a/libsoup/soup-auth-digest.c
++++ b/libsoup/soup-auth-digest.c
+@@ -156,7 +156,7 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
+        guint qop_options;
+        gboolean ok = TRUE;
+ 
+-        if (!soup_auth_get_realm (auth))
++       if (!soup_auth_get_realm (auth) || !g_hash_table_lookup (auth_params, "nonce"))
+                return FALSE;
+ 
+        g_free (priv->domain);
+
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch
new file mode 100644
index 0000000000..9f3bb21a25
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch
@@ -0,0 +1,35 @@
+From ac844b9fc7945c38ea21fb7cf1a49a5c226d7c9c Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Mon, 12 May 2025 16:17:20 +0800
+Subject: [PATCH] Resolve "(CVE-2025-32914) (#YWH-PGM9867-23) OOB Read on
+ libsoup through function "soup_multipart_new_from_message" in
+ soup-multipart.c leads to crash or exit of process"
+
+CVE: CVE-2025-32914
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/450/diffs?commit_id=5bfcf8157597f2d327050114fb37ff600004dbcf]
+
+Test code are not added since some functions not aligned with version
+2.74.3
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-multipart.c |  2 +-
+ 1 files changed, 1 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
+index a7e550f..dd93973 100644
+--- a/libsoup/soup-multipart.c
++++ b/libsoup/soup-multipart.c
+@@ -181,7 +181,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers,
+                        return NULL;
+                }
+ 
+-               split = strstr (start, "\r\n\r\n");
++               split = g_strstr_len (start, body_end - start, "\r\n\r\n");
+                if (!split || split > end) {
+                        soup_multipart_free (multipart);
+                        soup_buffer_free (flattened);
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch
new file mode 100644
index 0000000000..874f62e7ad
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch
@@ -0,0 +1,38 @@
+From 52a0f9234d384b9dab368835b22e5a5a01542168 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 16 May 2025 14:16:10 +0800
+Subject: [PATCH] auth-digest: fix crash in
+ soup_auth_digest_get_protection_space()
+
+We need to validate the Domain parameter in the WWW-Authenticate header.
+
+Unfortunately this crash only occurs when listening on default ports 80
+and 443, so there's no good way to test for this. The test would require
+running as root.
+
+Fixes #440
+
+CVE: CVE-2025-4476
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/e64c221f9c7d09b48b610c5626b3b8c400f0907c?merge_request_iid=457]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-auth-digest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
+index f1621ec..a2dc560 100644
+--- a/libsoup/soup-auth-digest.c
++++ b/libsoup/soup-auth-digest.c
+@@ -229,7 +229,7 @@ soup_auth_digest_get_protection_space (SoupAuth *auth, SoupURI *source_uri)
+                        uri = soup_uri_new (d);
+                        if (uri && uri->scheme == source_uri->scheme &&
+                            uri->port == source_uri->port &&
+-                           !strcmp (uri->host, source_uri->host))
++                           !g_strcmp0 (uri->host, source_uri->host))
+                                dir = g_strdup (uri->path);
+                        else
+                                dir = NULL;
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch
new file mode 100644
index 0000000000..c970661694
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch
@@ -0,0 +1,61 @@
+From 81e03c538d6a102406114567f4f1c468033ce2e4 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Thu, 26 Dec 2024 18:31:42 -0600
+Subject: [PATCH] soup_header_parse_quality_list: Fix leak
+
+When iterating over the parsed list we now steal the allocated strings that we want and then free_full the list which may contain remaining strings.
+
+CVE: CVE-2025-46420
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/421/diffs?commit_id=c9083869ec2a3037e6df4bd86b45c419ba295f8e]
+
+ Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-headers.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index 87bb3dc..9707ca0 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -528,7 +528,7 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
+        GSList *unsorted;
+        QualityItem *array;
+        GSList *sorted, *iter;
+-       char *item, *semi;
++       char *semi;
+        const char *param, *equal, *value;
+        double qval;
+        int n;
+@@ -541,9 +541,8 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
+        unsorted = soup_header_parse_list (header);
+        array = g_new0 (QualityItem, g_slist_length (unsorted));
+        for (iter = unsorted, n = 0; iter; iter = iter->next) {
+-               item = iter->data;
+                qval = 1.0;
+-               for (semi = strchr (item, ';'); semi; semi = strchr (semi + 1, ';')) {
++               for (semi = strchr (iter->data, ';'); semi; semi = strchr (semi + 1, ';')) {
+                        param = skip_lws (semi + 1);
+                        if (*param != 'q')
+                                continue;
+@@ -575,15 +574,15 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
+                if (qval == 0.0) {
+                        if (unacceptable) {
+                                *unacceptable = g_slist_prepend (*unacceptable,
+-                                                                item);
++                                                                g_steal_pointer (&iter->data));
+                        }
+                } else {
+-                       array[n].item = item;
++                       array[n].item = g_steal_pointer (&iter->data);
+                        array[n].qval = qval;
+                        n++;
+                }
+        }
+-       g_slist_free (unsorted);
++       g_slist_free_full (unsorted, g_free);
+ 
+        qsort (array, n, sizeof (QualityItem), sort_by_qval);
+        sorted = NULL;
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch
new file mode 100644
index 0000000000..3318093400
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch
@@ -0,0 +1,47 @@
+From 5eb225f02bb35de56cfeedd87bde716bf1cb750b Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Wed, 5 Feb 2025 16:18:10 -0600
+Subject: [PATCH] session: Strip authentication credentails on
+ cross-origin redirect
+
+This should match the behavior of Firefox and Safari but not of Chromium.
+
+CVE: CVE-2025-46421
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/436/diffs?commit_id=3e5c26415811f19e7737238bb23305ffaf96f66b]
+
+Test code not added since it included some headers not in version 2.74.3
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-session.c |  8 ++++-
+ 2 files changed, 85 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
+index 83421ef..8d6ac61 100644
+--- a/libsoup/soup-session.c
++++ b/libsoup/soup-session.c
+@@ -1189,12 +1189,18 @@ soup_session_redirect_message (SoupSession *session, SoupMessage *msg)
+                                                   SOUP_ENCODING_NONE);
+        }
+ 
++       /* Strip all credentials on cross-origin redirect. */
++       if (!soup_uri_host_equal (soup_message_get_uri (msg), new_uri)) {
++               soup_message_headers_remove (msg->request_headers, "Authorization");
++               soup_message_set_auth (msg, NULL);
++       }
++
+        soup_message_set_uri (msg, new_uri);
+        soup_uri_free (new_uri);
+ 
+        soup_session_requeue_message (session, msg);
+        return TRUE;
+-}
++}
+ 
+ static void
+ redirect_handler (SoupMessage *msg, gpointer user_data)
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch
new file mode 100644
index 0000000000..b15b8c763d
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch
@@ -0,0 +1,38 @@
+From dfdc9b3cc73e6fe88cc12792ba00e14642572339 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 15 May 2025 17:49:11 +0200
+Subject: [PATCH] soup-multipart: Verify boundary limits for multipart body
+
+It could happen that the boundary started at a place which resulted into
+a negative number, which in an unsigned integer is a very large value.
+Check the body size is not a negative value before setting it.
+
+Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/449
+
+Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463>
+
+CVE: CVE-2025-4948
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463/diffs?commit_id=f2f28afe0b3b2b3009ab67d6874457ec6bac70c0]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-multipart.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
+index dd93973..ce2fc10 100644
+--- a/libsoup/soup-multipart.c
++++ b/libsoup/soup-multipart.c
+@@ -214,7 +214,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers,
+                 */
+                part_body = soup_buffer_new_subbuffer (flattened,
+                                                       split - flattened->data,
+-                                                      end - 2 - split);
++                                                      end - 2 >= split ? end - 2 - split : 0);
+                g_ptr_array_add (multipart->bodies, part_body);
+ 
+                start = end;
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch
new file mode 100644
index 0000000000..7bc3e8da99
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch
@@ -0,0 +1,37 @@
+From a7d0c58608ed830bedfb6b92aea11e00feb55aa9 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 19 May 2025 17:48:27 +0200
+Subject: [PATCH] soup-multipart: Verify array bounds before accessing its
+ members
+
+The boundary could be at a place which, calculated, pointed
+before the beginning of the array. Check the bounds, to avoid
+read out of the array bounds.
+
+Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/447
+
+CVE: CVE-2025-4969
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/467/diffs?commit_id=b5b4dd10d4810f0c87b4eaffe88504f06e502f33]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-multipart.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
+index ce2fc10..a29cdf0 100644
+--- a/libsoup/soup-multipart.c
++++ b/libsoup/soup-multipart.c
+@@ -108,7 +108,7 @@ find_boundary (const char *start, const char *end,
+                        continue;
+ 
+                /* Check that it's at start of line */
+-               if (!(b == start || (b[-1] == '\n' && b[-2] == '\r')))
++               if (!(b == start || (b - start >= 2 && b[-1] == '\n' && b[-2] == '\r')))
+                        continue;
+ 
+                /* Check for "--" or "\r\n" after boundary */
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
new file mode 100644
index 0000000000..cbc886a2cb
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
@@ -0,0 +1,86 @@
+SUMMARY = "An HTTP library implementation in C"
+DESCRIPTION = "libsoup is an HTTP client/server library for GNOME. It uses GObjects \
+and the glib main loop, to integrate well with GNOME applications."
+HOMEPAGE = "https://wiki.gnome.org/Projects/libsoup"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+SECTION = "x11/gnome/libs"
+LICENSE = "LGPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl"
+
+SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
+
+SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
+           file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch \
+           file://0001-CVE-2025-32911.patch \
+           file://0001-Fix-possibly-uninitialized-warnings.patch \
+           file://0001-Remove-http-and-https-aliases-support-test.patch \
+           file://CVE-2024-52532-1.patch \
+           file://CVE-2024-52532-2.patch \
+           file://CVE-2024-52532-3.patch \
+           file://CVE-2025-32053.patch \
+           file://CVE-2025-2784.patch \
+           file://CVE-2024-52530.patch \
+           file://CVE-2025-32906.patch \
+           file://CVE-2025-32914.patch \
+           file://CVE-2025-46420.patch \
+           file://CVE-2025-46421.patch \
+           file://CVE-2025-32050.patch \
+           file://CVE-2025-32052.patch \
+           file://CVE-2025-32909.patch \
+           file://CVE-2025-32910-1.patch \
+           file://CVE-2025-32910-2.patch \
+           file://CVE-2025-32910-3.patch \
+           file://CVE-2025-32912.patch \
+           file://CVE-2024-52531-1.patch \
+           file://CVE-2024-52531-2.patch \
+           file://CVE-2025-4476.patch \
+           file://CVE-2025-32907.patch \
+           file://CVE-2025-4948.patch \
+           file://CVE-2025-4969.patch \
+"
+SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"
+
+CVE_PRODUCT = "libsoup"
+
+S = "${UNPACKDIR}/libsoup-${PV}"
+
+inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc
+
+UPSTREAM_CHECK_REGEX = "libsoup-(?P<pver>2(\.(?!99)\d+)+)\.tar"
+
+GIR_MESON_ENABLE_FLAG = 'enabled'
+GIR_MESON_DISABLE_FLAG = 'disabled'
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[brotli] = "-Dbrotli=enabled,-Dbrotli=disabled,brotli"
+# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards
+PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false"
+PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5"
+PACKAGECONFIG[ntlm] = "-Dntlm=enabled,-Dntlm=disabled"
+PACKAGECONFIG[sysprof] = "-Dsysprof=enabled,-Dsysprof=disabled,sysprof"
+
+# Tell libsoup where the target ntlm_auth is installed
+do_write_config:append:class-target() {
+    cat >${WORKDIR}/soup.cross <<EOF
+[binaries]
+ntlm_auth = '${bindir}/ntlm_auth'
+EOF
+}
+EXTRA_OEMESON:append:class-target = " --cross-file ${WORKDIR}/soup.cross"
+
+EXTRA_OEMESON += "-Dvapi=disabled -Dtls_check=false"
+
+GTKDOC_MESON_OPTION = "gtk_doc"
+
+# When built without gnome support, libsoup-2.4 will contain only one shared lib
+# and will therefore become subject to renaming by debian.bbclass. Prevent
+# renaming in order to keep the package name consistent regardless of whether
+# gnome support is enabled or disabled.
+DEBIAN_NOAUTONAME:${PN} = "1"
+
+# glib-networking is needed for SSL, proxies, etc.
+RRECOMMENDS:${PN} = "glib-networking"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch b/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch
new file mode 100644
index 0000000000..2df9a18c68
--- /dev/null
+++ b/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch
@@ -0,0 +1,33 @@
+From 92f6c3d8fa26d9019ba27e0c1aa894517ada93b9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 11 Apr 2025 17:47:05 -0700
+Subject: [PATCH] Backport API introduced in openssl 3.5.0
+
+This commit [1] introduced this new API which is used by pem.h from
+openssl and it should be provided by asn1.h which is vendored here so
+it goes out of sync and causes build errors e.g
+
+In file included from ./os_stub/cryptlib_openssl/pk/x509.c:18:
+/usr/include/openssl/pem.h:399:28: error: unknown type name 'OSSL_i2d_of_void_ctx'
+  399 | int PEM_ASN1_write_bio_ctx(OSSL_i2d_of_void_ctx *i2d, void *vctx,
+
+[1] https://github.com/openssl/openssl/commit/35f6e7ea02b599d5aaf220b4720cbadd946d8023
+
+Upstream-Status: Submitted [https://github.com/DMTF/libspdm/pull/3033]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ os_stub/openssllib/openssl_gen/openssl/asn1.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/os_stub/openssllib/openssl_gen/openssl/asn1.h b/os_stub/openssllib/openssl_gen/openssl/asn1.h
+index a90152ee..fcfbe42e 100644
+--- a/os_stub/openssllib/openssl_gen/openssl/asn1.h
++++ b/os_stub/openssllib/openssl_gen/openssl/asn1.h
+@@ -368,6 +368,7 @@ typedef struct ASN1_VALUE_st ASN1_VALUE;
+ 

+ typedef void *d2i_of_void(void **, const unsigned char **, long);

+ typedef int i2d_of_void(const void *, unsigned char **);

++typedef int OSSL_i2d_of_void_ctx(const void *, unsigned char **, void *vctx);

+ 

+ /*-

+  * The following macros and typedefs allow an ASN1_ITEM

diff --git a/meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb b/meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb
new file mode 100644
index 0000000000..c6bbd1716b
--- /dev/null
+++ b/meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb
@@ -0,0 +1,83 @@
+SUMMARY = "DMTF's Reference Implementation of SPDM"
+DESCRIPTION = "libspdm is a reference implementation of the DMTF’s Security Protocols and \
+Data Models (SPDM). This is used to enable authentication, attestation and key exchange to \
+assist in providing infrastructure security enablement"
+HOMEPAGE = "https://github.com/DMTF/libspdm"
+BUGTRACKER = "https://github.com/DMTF/libspdm/issues"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8f9b59a81a88da8e812af43728b72dd7"
+
+DEPENDS = "openssl"
+
+SRC_URI = "git://github.com/DMTF/libspdm.git;branch=main;protocol=https \
+           file://0001-Backport-API-introduced-in-openssl-3.5.0.patch"
+SRCREV = "1be116c7b7713fa9003e1bd53b53a34758549eb9"
+
+
+inherit cmake
+
+LIBSPDM_CFLAGS = "\
+        ${OECMAKE_C_FLAGS} \
+        -DLIBSPDM_ENABLE_CAPABILITY_EVENT_CAP=0 \
+        -DLIBSPDM_ENABLE_CAPABILITY_MEL_CAP=0 \
+        -DLIBSPDM_ENABLE_CAPABILITY_GET_KEY_PAIR_INFO_CAP=0 \
+        -DLIBSPDM_ENABLE_CAPABILITY_SET_KEY_PAIR_INFO_CAP=0 \
+        -DLIBSPDM_HAL_PASS_SPDM_CONTEXT=1 \
+        -DLIBSPDM_ENABLE_CAPABILITY_ENDPOINT_INFO_CAP=0 \
+        "
+
+LIBSPDM_CFLAGS:append:toolchain-gcc = " -fPIE"
+
+def get_spdm_multiarch(bb, d):
+    target_arch = d.getVar('TARGET_ARCH')
+    multiarch_options = {
+        "x86_64":  "x64",
+        "i586":    "ia32",
+        "i686":    "ia32",
+        "arm":     "arm",
+        "aarch64": "aarch64",
+        "riscv32": "riscv32",
+        "riscv64": "riscv64",
+        "ppc64le": "ppc64le",
+    }
+
+    if target_arch in multiarch_options :
+        return multiarch_options[target_arch]
+
+    bb.error("unsupported architecture '%s'" % target_arch)
+
+EXTRA_OECMAKE += "\
+    -DARCH=${@get_spdm_multiarch(bb, d)} \
+        -DTOOLCHAIN=NONE \
+        -DTARGET=Release \
+        -DCRYPTO=openssl \
+        -DENABLE_BINARY_BUILD=1 \
+        -DCOMPILED_LIBCRYPTO_PATH=${libdir} \
+        -DCOMPILED_LIBSSL_PATH=${libdir} \
+        -DDISABLE_TESTS=1 \
+        -DDISABLE_EDDSA=1 \
+        -DCMAKE_C_FLAGS='${LIBSPDM_CFLAGS}' \
+        "
+
+do_install () {
+    install -d ${D}/${libdir}
+    install -m 0644 lib/* ${D}/${libdir}/
+
+    install -d ${D}/${includedir}/${BPN}/
+    cp -rf ${S}/include/* ${D}/${includedir}/${BPN}/
+
+    install -d ${D}/${includedir}/${BPN}/os_stub/spdm_crypt_ext_lib
+    cp -rf ${S}/os_stub/spdm_crypt_ext_lib/*.h ${D}/${includedir}/${BPN}/os_stub/spdm_crypt_ext_lib/
+}
+
+FILES:${PN} += "${libdir}/*.a"
+FILES:${PN} += "${includedir}/${BPN}/*.h"
+FILES:${PN} += "${includedir}/${BPN}/os_stub/spdm_crypt_ext_lib/*.h"
+
+COMPATIBLE_HOST:powerpc = "null"
+COMPATIBLE_HOST:powerpc64 = "null"
+COMPATIBLE_HOST:mipsarchn32 = "null"
+COMPATIBLE_HOST:mipsarcho32 = "null"
+COMPATIBLE_HOST:mipsarchn64 = "null"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch b/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch
new file mode 100644
index 0000000000..21af9a5a19
--- /dev/null
+++ b/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch
@@ -0,0 +1,37 @@
+From 98a330971f4344619b698d4603a45bd31d6935d9 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Sun, 15 Sep 2024 20:31:55 +0800
+Subject: [PATCH] CompilerChecks.cmake: drop -Wunused-variable flag
+
+Drop -Wunused-variable flag to fix build with clang:
+
+libssh/0.11.1/git/src/threads/libgcrypt.c:29:1: error: unused variable 'gcry_threads_pthread' [-Werror,-Wunused-variable]
+   29 | GCRY_THREAD_OPTION_PTHREAD_IMPL;
+      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+libssh/0.11.1/recipe-sysroot/usr/include/gcrypt.h:217:33: note: expanded from macro 'GCRY_THREAD_OPTION_PTHREAD_IMPL'
+  217 |   static struct gcry_thread_cbs gcry_threads_pthread = {                \
+      |                                 ^~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ CompilerChecks.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake
+index 9719e699..ec15fa2a 100644
+--- a/CompilerChecks.cmake
++++ b/CompilerChecks.cmake
+@@ -48,7 +48,7 @@ if (UNIX)
+     add_c_compiler_flag("-Werror=implicit-int" SUPPORTED_COMPILER_FLAGS)
+     add_c_compiler_flag("-Wint-conversion" SUPPORTED_COMPILER_FLAGS)
+     add_c_compiler_flag("-Werror=int-conversion" SUPPORTED_COMPILER_FLAGS)
+-    add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS)
++    #add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS)
+ 
+     check_c_compiler_flag("-Wformat" REQUIRED_FLAGS_WFORMAT)
+     if (REQUIRED_FLAGS_WFORMAT)
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch b/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch
deleted file mode 100644
index d2d1fb5955..0000000000
--- a/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 49a8ae4d6f77434ed9f7a601b9df488b921e4a22 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 20 Mar 2023 21:59:19 -0700
-Subject: [PATCH] libgcrypt.c: Fix prototype of des3_encrypt/des3_decrypt
-
-This is to match the prototype for callback functions which are now emitted as
-errors by clang16
-
-Fixes
-
-TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:903:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types]
-    .encrypt     = des3_encrypt,
-                   ^~~~~~~~~~~~
-TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:904:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types]
-    .decrypt     = des3_decrypt
-                   ^~~~~~~~~~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- src/libgcrypt.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libgcrypt.c b/src/libgcrypt.c
-index f410d997..e3f66781 100644
---- a/src/libgcrypt.c
-+++ b/src/libgcrypt.c
-@@ -416,12 +416,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) {
- }
- 
- static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in,
--    void *out, unsigned long len) {
-+    void *out, size_t len) {
-   gcry_cipher_encrypt(cipher->key[0], out, len, in, len);
- }
- 
- static void des3_decrypt(struct ssh_cipher_struct *cipher, void *in,
--    void *out, unsigned long len) {
-+    void *out, size_t len) {
-   gcry_cipher_decrypt(cipher->key[0], out, len, in, len);
- }
- 
diff --git a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch
index d6bc75c3a6..4803ff81d8 100644
--- a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch
+++ b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch
@@ -1,4 +1,4 @@
-From 69a89e8f015802f61637fed0d3791d20a594f298 Mon Sep 17 00:00:00 2001
+From 99fcb71903cca8458bcd6c0d5b676619a9710dab Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Wed, 15 Mar 2023 16:51:58 +0800
 Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host
@@ -9,16 +9,15 @@ not required by unittests, we can skip the search.
 Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-
 ---
  tests/CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index f5c30061..885c926a 100644
+index 89b95d08..e481534c 100644
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
-@@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES
+@@ -96,6 +96,7 @@ set(TEST_TARGET_LIBRARIES
  
  add_subdirectory(unittests)
  
@@ -26,11 +25,14 @@ index f5c30061..885c926a 100644
  # OpenSSH Capabilities are required for all unit tests
  find_program(SSH_EXECUTABLE NAMES ssh)
  if (SSH_EXECUTABLE)
-@@ -302,6 +303,7 @@ if (CLIENT_TESTING OR SERVER_TESTING)
+@@ -345,6 +346,7 @@ endif (WITH_PKCS11_URI)
+ file(COPY gss/kdcsetup.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gss FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
  
-     message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}")
- endif ()
+ message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}")
 +endif ()
  
  configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h)
  
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/libssh/libssh_0.10.6.bb b/meta-oe/recipes-support/libssh/libssh_0.11.1.bb
index 31f29c1b7d..bb2b0dc466 100644
--- a/meta-oe/recipes-support/libssh/libssh_0.10.6.bb
+++ b/meta-oe/recipes-support/libssh/libssh_0.11.1.bb
@@ -6,14 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0"
 
 DEPENDS = "zlib openssl"
 
-SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10 \
+SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.11 \
            file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \
-           file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \
            file://run-ptest \
           "
-SRCREV = "10e09e273f69e149389b3e0e5d44b8c221c2e7f6"
 
-S = "${WORKDIR}/git"
+SRC_URI:append:toolchain-clang = " file://0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch"
+
+SRCREV = "854795c654eda518ed6de6c1ebb4e2107fcb2e73"
+
 
 inherit cmake ptest
 
diff --git a/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb
index be2935a385..d462d3018f 100644
--- a/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb
+++ b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/snowballstem/snowball.git;branch=master;protocol=htt
            file://0001-Build-so-lib.patch \
            "
 SRCREV = "48a67a2831005f49c48ec29a5837640e23e54e6b"
-S = "${WORKDIR}/git"
 
 LIBVER = "0.0.0"
 
diff --git a/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch b/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch
new file mode 100644
index 0000000000..f0fd2a4aa1
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch
@@ -0,0 +1,53 @@
+From 9426ac3d232e2f90c571979a2166c5e1328967d1 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <j.w.r.degoede@hhs.nl>
+Date: Tue, 15 Oct 2013 14:39:04 +0200
+Subject: [PATCH] Fix missing prototype compiler warnings
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/30e5556d1c9323e9f1887b28d42581c2954b53c9]
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/append.c  | 2 ++
+ lib/output.c  | 1 +
+ lib/wrapper.c | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/lib/append.c b/lib/append.c
+index 13e1ace..e8bd89d 100644
+--- a/lib/append.c
++++ b/lib/append.c
+@@ -13,6 +13,8 @@
+ #include <internal.h>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sys/param.h>
+diff --git a/lib/output.c b/lib/output.c
+index a2db929..a5262ee 100644
+--- a/lib/output.c
++++ b/lib/output.c
+@@ -13,6 +13,7 @@
+ #include <internal.h>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <pwd.h>
+ #include <grp.h>
+ #include <time.h>
+diff --git a/lib/wrapper.c b/lib/wrapper.c
+index 4cd0652..44cc435 100644
+--- a/lib/wrapper.c
++++ b/lib/wrapper.c
+@@ -13,6 +13,7 @@
+ #include <internal.h>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/param.h>
+ #include <dirent.h>
+ #include <errno.h>
diff --git a/meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch b/meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch
new file mode 100644
index 0000000000..b1ecb552bc
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch
@@ -0,0 +1,44 @@
+From c0a89709860acae5ef67727db7b23db385703bf6 Mon Sep 17 00:00:00 2001
+From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>
+Date: Tue, 15 Oct 2013 14:39:05 +0200
+Subject: [PATCH] Fix invalid memory de-reference issue
+
+Bug: https://bugzilla.redhat.com/551415
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/560911b694055b0c677431cf85d4d0d5ebd1a3fd]
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/libtar.h | 1 +
+ lib/util.c   | 4 +---
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/lib/libtar.h b/lib/libtar.h
+index 55f509a..7fc4d03 100644
+--- a/lib/libtar.h
++++ b/lib/libtar.h
+@@ -172,6 +172,7 @@ int th_write(TAR *t);
+ #define TH_ISDIR(t)    ((t)->th_buf.typeflag == DIRTYPE \
+                         || S_ISDIR((mode_t)oct_to_int((t)->th_buf.mode)) \
+                         || ((t)->th_buf.typeflag == AREGTYPE \
++                            && strlen((t)->th_buf.name) \
+                             && ((t)->th_buf.name[strlen((t)->th_buf.name) - 1] == '/')))
+ #define TH_ISFIFO(t)   ((t)->th_buf.typeflag == FIFOTYPE \
+                         || S_ISFIFO((mode_t)oct_to_int((t)->th_buf.mode)))
+diff --git a/lib/util.c b/lib/util.c
+index 31e8315..11438ef 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -148,9 +148,7 @@ oct_to_int(char *oct)
+ {
+        int i;
+ 
+-       sscanf(oct, "%o", &i);
+-
+-       return i;
++       return sscanf(oct, "%o", &i) == 1 ? i : 0;
+ }
+ 
+ 
diff --git a/meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch b/meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch
new file mode 100644
index 0000000000..627c270163
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch
@@ -0,0 +1,101 @@
+From d998b9f75c79aab68255dace641dd30db239eff6 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Tue, 15 Oct 2013 19:48:41 -0400
+Subject: [PATCH] fix file descriptor leaks reported by cppcheck
+
+Bug: https://bugzilla.redhat.com/785760
+
+Authored by Kamil Dudka <kdudka@redhat.com>.
+
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/abd0274e6b2f708e9eaa29414b07b3f542cec694]
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/append.c    | 14 +++++++++-----
+ lib/extract.c   |  4 ++++
+ libtar/libtar.c |  3 +++
+ 3 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/lib/append.c b/lib/append.c
+index e8bd89d..ff58532 100644
+--- a/lib/append.c
++++ b/lib/append.c
+@@ -216,6 +216,7 @@ tar_append_regfile(TAR *t, const char *realname)
+        int filefd;
+        int i, j;
+        size_t size;
++       int rv = -1;
+ 
+        filefd = open(realname, O_RDONLY);
+        if (filefd == -1)
+@@ -234,25 +235,28 @@ tar_append_regfile(TAR *t, const char *realname)
+                {
+                        if (j != -1)
+                                errno = EINVAL;
+-                       return -1;
++                       goto fail;
+                }
+                if (tar_block_write(t, &block) == -1)
+-                       return -1;
++                       goto fail;
+        }
+ 
+        if (i > 0)
+        {
+                j = read(filefd, &block, i);
+                if (j == -1)
+-                       return -1;
++                       goto fail;
+                memset(&(block[i]), 0, T_BLOCKSIZE - i);
+                if (tar_block_write(t, &block) == -1)
+-                       return -1;
++                       goto fail;
+        }
+ 
++       /* success! */
++       rv = 0;
++fail:
+        close(filefd);
+ 
+-       return 0;
++       return rv;
+ }
+ 
+ 
+diff --git a/lib/extract.c b/lib/extract.c
+index 36357e7..9fc6ad5 100644
+--- a/lib/extract.c
++++ b/lib/extract.c
+@@ -228,13 +228,17 @@ tar_extract_regfile(TAR *t, char *realname)
+                {
+                        if (k != -1)
+                                errno = EINVAL;
++                       close(fdout);
+                        return -1;
+                }
+ 
+                /* write block to output file */
+                if (write(fdout, buf,
+                          ((i > T_BLOCKSIZE) ? T_BLOCKSIZE : i)) == -1)
++               {
++                       close(fdout);
+                        return -1;
++               }
+        }
+ 
+        /* close output file */
+diff --git a/libtar/libtar.c b/libtar/libtar.c
+index 9fa92b2..bb5644c 100644
+--- a/libtar/libtar.c
++++ b/libtar/libtar.c
+@@ -83,7 +83,10 @@ gzopen_frontend(char *pathname, int oflags, int mode)
+                return -1;
+ 
+        if ((oflags & O_CREAT) && fchmod(fd, mode))
++       {
++               close(fd);
+                return -1;
++       }
+ 
+        gzf = gzdopen(fd, gzoflags);
+        if (!gzf)
diff --git a/meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch b/meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch
new file mode 100644
index 0000000000..90809ad846
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch
@@ -0,0 +1,26 @@
+From f6c5cba59444ecda9bbc22b8e8e57fd1015a688d Mon Sep 17 00:00:00 2001
+From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>
+Date: Tue, 15 Oct 2013 20:02:58 -0400
+Subject: [PATCH] fix memleak on tar_open() failure
+
+Authored by Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>.
+
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/36629a41208375f5105427e98078127551692028]
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/handle.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/handle.c b/lib/handle.c
+index 33a262c..002d23c 100644
+--- a/lib/handle.c
++++ b/lib/handle.c
+@@ -82,6 +82,7 @@ tar_open(TAR **t, const char *pathname, tartype_t *type,
+        (*t)->fd = (*((*t)->type->openfunc))(pathname, oflags, mode);
+        if ((*t)->fd == -1)
+        {
++               libtar_hash_free((*t)->h, NULL);
+                free(*t);
+                return -1;
+        }
diff --git a/meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch b/meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch
new file mode 100644
index 0000000000..f88bcbf9cf
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch
@@ -0,0 +1,119 @@
+From e3888e452aee72e0d658185ac20e8e63bed1aff8 Mon Sep 17 00:00:00 2001
+From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>
+Date: Tue, 15 Oct 2013 20:05:04 -0400
+Subject: [PATCH] fix memleaks in libtar sample program
+
+Authored by Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>.
+
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/f3c711cf3054ff366a1a3500cdc8c64ecc2d2da6]
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ libtar/libtar.c | 29 ++++++++++++++++++-----------
+ 1 file changed, 18 insertions(+), 11 deletions(-)
+
+diff --git a/libtar/libtar.c b/libtar/libtar.c
+index bb5644c..23f8741 100644
+--- a/libtar/libtar.c
++++ b/libtar/libtar.c
+@@ -253,6 +253,7 @@ extract(char *tarfile, char *rootdir)
+        if (tar_extract_all(t, rootdir) != 0)
+        {
+                fprintf(stderr, "tar_extract_all(): %s\n", strerror(errno));
++               tar_close(t);
+                return -1;
+        }
+ 
+@@ -270,12 +271,13 @@ extract(char *tarfile, char *rootdir)
+ 
+ 
+ void
+-usage()
++usage(void *rootdir)
+ {
+        printf("Usage: %s [-C rootdir] [-g] [-z] -x|-t filename.tar\n",
+               progname);
+        printf("       %s [-C rootdir] [-g] [-z] -c filename.tar ...\n",
+               progname);
++       free(rootdir);
+        exit(-1);
+ }
+ 
+@@ -292,6 +294,7 @@ main(int argc, char *argv[])
+        int c;
+        int mode = 0;
+        libtar_list_t *l;
++       int return_code = -2;
+ 
+        progname = basename(argv[0]);
+ 
+@@ -313,17 +316,17 @@ main(int argc, char *argv[])
+                        break;
+                case 'c':
+                        if (mode)
+-                               usage();
++                               usage(rootdir);
+                        mode = MODE_CREATE;
+                        break;
+                case 'x':
+                        if (mode)
+-                               usage();
++                               usage(rootdir);
+                        mode = MODE_EXTRACT;
+                        break;
+                case 't':
+                        if (mode)
+-                               usage();
++                               usage(rootdir);
+                        mode = MODE_LIST;
+                        break;
+ #ifdef HAVE_LIBZ
+@@ -332,7 +335,7 @@ main(int argc, char *argv[])
+                        break;
+ #endif /* HAVE_LIBZ */
+                default:
+-                       usage();
++                       usage(rootdir);
+                }
+ 
+        if (!mode || ((argc - optind) < (mode == MODE_CREATE ? 2 : 1)))
+@@ -341,7 +344,7 @@ main(int argc, char *argv[])
+                printf("argc - optind == %d\tmode == %d\n", argc - optind,
+                       mode);
+ #endif
+-               usage();
++               usage(rootdir);
+        }
+ 
+ #ifdef DEBUG
+@@ -351,21 +354,25 @@ main(int argc, char *argv[])
+        switch (mode)
+        {
+        case MODE_EXTRACT:
+-               return extract(argv[optind], rootdir);
++               return_code = extract(argv[optind], rootdir);
++               break;
+        case MODE_CREATE:
+                tarfile = argv[optind];
+                l = libtar_list_new(LIST_QUEUE, NULL);
+                for (c = optind + 1; c < argc; c++)
+                        libtar_list_add(l, argv[c]);
+-               return create(tarfile, rootdir, l);
++               return_code = create(tarfile, rootdir, l);
++               libtar_list_free(l, NULL);
++               break;
+        case MODE_LIST:
+-               return list(argv[optind]);
++               return_code = list(argv[optind]);
++               break;
+        default:
+                break;
+        }
+ 
+-       /* NOTREACHED */
+-       return -2;
++       free(rootdir);
++       return return_code;
+ }
+ 
+ 
diff --git a/meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch b/meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch
new file mode 100644
index 0000000000..beba45405e
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch
@@ -0,0 +1,89 @@
+From edbee9832475347183a841a8fd5be71f74e10392 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Wed, 23 Oct 2013 15:04:22 +0200
+Subject: [PATCH] decode: avoid using a static buffer in th_get_pathname()
+
+A solution suggested by Chris Frey:
+https://lists.feep.net:8080/pipermail/libtar/2013-October/000377.html
+
+Note this can break programs that expect sizeof(TAR) to be fixed.
+
+Authored by Kamil Dudka <kdudka@redhat.com>.
+
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/ec613af2e9371d7a3e1f7c7a6822164a4255b4d1]
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/decode.c | 24 +++++++++++++++++-------
+ lib/handle.c |  1 +
+ lib/libtar.h |  3 +++
+ 3 files changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/lib/decode.c b/lib/decode.c
+index c16ea2d..edb2185 100644
+--- a/lib/decode.c
++++ b/lib/decode.c
+@@ -26,20 +26,30 @@
+ char *
+ th_get_pathname(TAR *t)
+ {
+-       static TLS_THREAD char filename[MAXPATHLEN];
+-
+        if (t->th_buf.gnu_longname)
+                return t->th_buf.gnu_longname;
+ 
+-       if (t->th_buf.prefix[0] != '\0')
++       /* allocate the th_pathname buffer if not already */
++       if (t->th_pathname == NULL)
++       {
++               t->th_pathname = malloc(MAXPATHLEN * sizeof(char));
++               if (t->th_pathname == NULL)
++                       /* out of memory */
++                       return NULL;
++       }
++
++       if (t->th_buf.prefix[0] == '\0')
++       {
++               snprintf(t->th_pathname, MAXPATHLEN, "%.100s", t->th_buf.name);
++       }
++       else
+        {
+-               snprintf(filename, sizeof(filename), "%.155s/%.100s",
++               snprintf(t->th_pathname, MAXPATHLEN, "%.155s/%.100s",
+                         t->th_buf.prefix, t->th_buf.name);
+-               return filename;
+        }
+ 
+-       snprintf(filename, sizeof(filename), "%.100s", t->th_buf.name);
+-       return filename;
++       /* will be deallocated in tar_close() */
++       return t->th_pathname;
+ }
+ 
+ 
+diff --git a/lib/handle.c b/lib/handle.c
+index 002d23c..a19c046 100644
+--- a/lib/handle.c
++++ b/lib/handle.c
+@@ -122,6 +122,7 @@ tar_close(TAR *t)
+                libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY
+                                        ? free
+                                        : (libtar_freefunc_t)tar_dev_free));
++       free(t->th_pathname);
+        free(t);
+ 
+        return i;
+diff --git a/lib/libtar.h b/lib/libtar.h
+index 7fc4d03..08a8e0f 100644
+--- a/lib/libtar.h
++++ b/lib/libtar.h
+@@ -85,6 +85,9 @@ typedef struct
+        int options;
+        struct tar_header th_buf;
+        libtar_hash_t *h;
++
++       /* introduced in libtar 1.2.21 */
++       char *th_pathname;
+ }
+ TAR;
+ 
diff --git a/meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch b/meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch
new file mode 100644
index 0000000000..2d8f21171b
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch
@@ -0,0 +1,30 @@
+From bc8ec7d940d7ffc870638521bd134098d2efa5df Mon Sep 17 00:00:00 2001
+From: Chris Frey <cdfrey@foursquare.net>
+Date: Thu, 24 Oct 2013 17:55:12 -0400
+Subject: [PATCH] Check for NULL before freeing th_pathname
+
+Thanks to Harald Koch for pointing out that AIX 4 and 5 still need this.
+
+Authored by Chris Frey <cdfrey@foursquare.net>.
+
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/495d0c0eabc5648186e7d58ad54b508d14af38f4]
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/handle.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/handle.c b/lib/handle.c
+index a19c046..28a7dc2 100644
+--- a/lib/handle.c
++++ b/lib/handle.c
+@@ -122,7 +122,8 @@ tar_close(TAR *t)
+                libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY
+                                        ? free
+                                        : (libtar_freefunc_t)tar_dev_free));
+-       free(t->th_pathname);
++       if (t->th_pathname != NULL)
++               free(t->th_pathname);
+        free(t);
+ 
+        return i;
diff --git a/meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch b/meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch
new file mode 100644
index 0000000000..edbd636b23
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch
@@ -0,0 +1,26 @@
+From c64dfdc6ec5bc752aafd1ac16a380f47602197c4 Mon Sep 17 00:00:00 2001
+From: Chris Frey <cdfrey@foursquare.net>
+Date: Thu, 24 Oct 2013 17:58:47 -0400
+Subject: [PATCH] Added stdlib.h for malloc() in lib/decode.c
+
+Authored by Chris Frey <cdfrey@foursquare.net>.
+
+Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/20aa09bd7775094a2beb0f136c2c7d9e9fd6c7e6]
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/decode.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/decode.c b/lib/decode.c
+index edb2185..35312be 100644
+--- a/lib/decode.c
++++ b/lib/decode.c
+@@ -13,6 +13,7 @@
+ #include <internal.h>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/param.h>
+ #include <pwd.h>
+ #include <grp.h>
diff --git a/meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch b/meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch
new file mode 100644
index 0000000000..7b39df4254
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch
@@ -0,0 +1,100 @@
+From b469d621c0143e652c51bb238fd2060135aa2009 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Tue, 6 Nov 2018 17:24:05 +0100
+Subject: [PATCH] libtar: fix programming mistakes detected by static analysis
+
+Authored by Kamil Dudka <kdudka@redhat.com>.
+
+meta-openembedded uses Debian's release tarball [1]. Debian uses
+repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has
+been inactive since 2013 [3].
+
+Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
+
+[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
+[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
+[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/append.c    |  7 +++++++
+ lib/wrapper.c   | 11 +++++++----
+ libtar/libtar.c |  1 +
+ 3 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/lib/append.c b/lib/append.c
+index ff58532..6386a50 100644
+--- a/lib/append.c
++++ b/lib/append.c
+@@ -110,9 +110,16 @@ tar_append_file(TAR *t, const char *realname, const char *savename)
+                td->td_dev = s.st_dev;
+                td->td_h = libtar_hash_new(256, (libtar_hashfunc_t)ino_hash);
+                if (td->td_h == NULL)
++               {
++                       free(td);
+                        return -1;
++               }
+                if (libtar_hash_add(t->h, td) == -1)
++               {
++                       libtar_hash_free(td->td_h, free);
++                       free(td);
+                        return -1;
++               }
+        }
+        libtar_hashptr_reset(&hp);
+        if (libtar_hash_getkey(td->td_h, &hp, &(s.st_ino),
+diff --git a/lib/wrapper.c b/lib/wrapper.c
+index 44cc435..2d3f5b9 100644
+--- a/lib/wrapper.c
++++ b/lib/wrapper.c
+@@ -97,6 +97,7 @@ tar_append_tree(TAR *t, char *realdir, char *savedir)
+        struct dirent *dent;
+        DIR *dp;
+        struct stat s;
++       int ret = -1;
+ 
+ #ifdef DEBUG
+        printf("==> tar_append_tree(0x%lx, \"%s\", \"%s\")\n",
+@@ -130,24 +131,26 @@ tar_append_tree(TAR *t, char *realdir, char *savedir)
+                                 dent->d_name);
+ 
+                if (lstat(realpath, &s) != 0)
+-                       return -1;
++                       goto fail;
+ 
+                if (S_ISDIR(s.st_mode))
+                {
+                        if (tar_append_tree(t, realpath,
+                                            (savedir ? savepath : NULL)) != 0)
+-                               return -1;
++                               goto fail;
+                        continue;
+                }
+ 
+                if (tar_append_file(t, realpath,
+                                    (savedir ? savepath : NULL)) != 0)
+-                       return -1;
++                       goto fail;
+        }
+ 
++       ret = 0;
++fail:
+        closedir(dp);
+ 
+-       return 0;
++       return ret;
+ }
+ 
+ 
+diff --git a/libtar/libtar.c b/libtar/libtar.c
+index 23f8741..ac339e7 100644
+--- a/libtar/libtar.c
++++ b/libtar/libtar.c
+@@ -92,6 +92,7 @@ gzopen_frontend(char *pathname, int oflags, int mode)
+        if (!gzf)
+        {
+                errno = ENOMEM;
++               close(fd);
+                return -1;
+        }
+ 
diff --git a/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch b/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch
new file mode 100644
index 0000000000..93b35cbcd3
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch
@@ -0,0 +1,160 @@
+From 2c81f47508fa6bce9df84e3b43dfb16dffb742a0 Mon Sep 17 00:00:00 2001
+From: Raphael Geissert <geissert@debian.org>
+Date: Thu, 12 Sep 2024 15:51:05 +0300
+Subject: [PATCH] Avoid directory traversal when extracting archives
+
+Description of the vulnerability from the NIST CVE tracker [1]:
+
+    Multiple directory traversal vulnerabilities in the (1)
+    tar_extract_glob and (2) tar_extract_all functions in libtar 1.2.20
+    and earlier allow remote attackers to overwrite arbitrary files via
+    a .. (dot dot) in a crafted tar file.
+
+Imported from the Debian libtar package 1.2.20-8 [2]. Original Debian
+description:
+
+    Author: Raphael Geissert <geissert@debian.org>
+    Bug-Debian: https://bugs.debian.org/731860
+    Description: Avoid directory traversal when extracting archives
+    by skipping over leading slashes and any prefix containing ".." components.
+    Forwarded: yes
+
+meta-openembedded uses Debian's release tarball [3]. Debian uses
+repo.or.cz/libtar.git as their upstream [4]. repo.or.cz/libtar.git has
+been inactive since 2013 [5].
+
+CVE: CVE-2013-4420
+
+Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
+
+Comments: Added the commit message
+
+[1] https://nvd.nist.gov/vuln/detail/CVE-2013-4420
+[2] https://sources.debian.org/patches/libtar/1.2.20-8/CVE-2013-4420.patch/
+[3] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
+[4] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
+[5] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/decode.c   | 33 +++++++++++++++++++++++++++++++--
+ lib/extract.c  |  8 ++++----
+ lib/internal.h |  1 +
+ lib/output.c   |  4 ++--
+ 4 files changed, 38 insertions(+), 8 deletions(-)
+
+diff --git a/lib/decode.c b/lib/decode.c
+index 35312be..edd5f2e 100644
+--- a/lib/decode.c
++++ b/lib/decode.c
+@@ -22,13 +22,42 @@
+ # include <string.h>
+ #endif
+ 
++char *
++safer_name_suffix (char const *file_name)
++{
++       char const *p, *t;
++       p = t = file_name;
++       while (*p == '/') t = ++p;
++       while (*p)
++       {
++               while (p[0] == '.' && p[0] == p[1] && p[2] == '/')
++               {
++                       p += 3;
++                       t = p;
++               }
++               /* advance pointer past the next slash */
++               while (*p && (p++)[0] != '/');
++       }
++
++       if (!*t)
++       {
++               t = ".";
++       }
++
++       if (t != file_name)
++       {
++               /* TODO: warn somehow that the path was modified */
++       }
++       return (char*)t;
++}
++
+ 
+ /* determine full path name */
+ char *
+ th_get_pathname(TAR *t)
+ {
+        if (t->th_buf.gnu_longname)
+-               return t->th_buf.gnu_longname;
++               return safer_name_suffix(t->th_buf.gnu_longname);
+ 
+        /* allocate the th_pathname buffer if not already */
+        if (t->th_pathname == NULL)
+@@ -50,7 +79,7 @@ th_get_pathname(TAR *t)
+        }
+ 
+        /* will be deallocated in tar_close() */
+-       return t->th_pathname;
++       return safer_name_suffix(t->th_pathname);
+ }
+ 
+ 
+diff --git a/lib/extract.c b/lib/extract.c
+index 9fc6ad5..4ff1a95 100644
+--- a/lib/extract.c
++++ b/lib/extract.c
+@@ -302,14 +302,14 @@ tar_extract_hardlink(TAR * t, char *realname)
+        if (mkdirhier(dirname(filename)) == -1)
+                return -1;
+        libtar_hashptr_reset(&hp);
+-       if (libtar_hash_getkey(t->h, &hp, th_get_linkname(t),
++       if (libtar_hash_getkey(t->h, &hp, safer_name_suffix(th_get_linkname(t)),
+                               (libtar_matchfunc_t)libtar_str_match) != 0)
+        {
+                lnp = (char *)libtar_hashptr_data(&hp);
+                linktgt = &lnp[strlen(lnp) + 1];
+        }
+        else
+-               linktgt = th_get_linkname(t);
++               linktgt = safer_name_suffix(th_get_linkname(t));
+ 
+ #ifdef DEBUG
+        printf("  ==> extracting: %s (link to %s)\n", filename, linktgt);
+@@ -347,9 +347,9 @@ tar_extract_symlink(TAR *t, char *realname)
+ 
+ #ifdef DEBUG
+        printf("  ==> extracting: %s (symlink to %s)\n",
+-              filename, th_get_linkname(t));
++              filename, safer_name_suffix(th_get_linkname(t)));
+ #endif
+-       if (symlink(th_get_linkname(t), filename) == -1)
++       if (symlink(safer_name_suffix(th_get_linkname(t)), filename) == -1)
+        {
+ #ifdef DEBUG
+                perror("symlink()");
+diff --git a/lib/internal.h b/lib/internal.h
+index da7be7f..f05ca4f 100644
+--- a/lib/internal.h
++++ b/lib/internal.h
+@@ -21,3 +21,4 @@
+ #define TLS_THREAD
+ #endif
+ 
++char* safer_name_suffix(char const*);
+diff --git a/lib/output.c b/lib/output.c
+index a5262ee..af754f1 100644
+--- a/lib/output.c
++++ b/lib/output.c
+@@ -124,9 +124,9 @@ th_print_long_ls(TAR *t)
+                else
+                        printf(" link to ");
+                if ((t->options & TAR_GNU) && t->th_buf.gnu_longlink != NULL)
+-                       printf("%s", t->th_buf.gnu_longlink);
++                       printf("%s", safer_name_suffix(t->th_buf.gnu_longlink));
+                else
+-                       printf("%.100s", t->th_buf.linkname);
++                       printf("%.100s", safer_name_suffix(t->th_buf.linkname));
+        }
+ 
+        putchar('\n');
diff --git a/meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch b/meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch
new file mode 100644
index 0000000000..0a2773fae2
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch
@@ -0,0 +1,42 @@
+From e590423f62cf5bc922ff4a1f7eab9bf7d65ee472 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Tue, 4 Oct 2022 10:39:35 +0200
+Subject: [PATCH] free memory allocated by gnu_long* fields
+
+Authored by Kamil Dudka <kdudka@redhat.com>.
+
+meta-openembedded uses Debian's release tarball [1]. Debian uses
+repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has
+been inactive since 2013 [3].
+
+CVE: CVE-2021-33640 CVE-2021-33645 CVE-2021-33646
+
+Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
+
+[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
+[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
+[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/handle.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/lib/handle.c b/lib/handle.c
+index 28a7dc2..18bd8dc 100644
+--- a/lib/handle.c
++++ b/lib/handle.c
+@@ -122,8 +122,11 @@ tar_close(TAR *t)
+                libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY
+                                        ? free
+                                        : (libtar_freefunc_t)tar_dev_free));
+-       if (t->th_pathname != NULL)
+-               free(t->th_pathname);
++
++       free(t->th_pathname);
++       free(t->th_buf.gnu_longname);
++       free(t->th_buf.gnu_longlink);
++
+        free(t);
+ 
+        return i;
diff --git a/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch b/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch
new file mode 100644
index 0000000000..a61cc3b6a9
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch
@@ -0,0 +1,52 @@
+From c778d234c396e78bacef7c9bff0dd2bb9fb6aac8 Mon Sep 17 00:00:00 2001
+From: shixuantong <1726671442@qq.com>
+Date: Wed, 6 Apr 2022 17:40:57 +0800
+Subject: [PATCH] Ensure that sz is greater than 0.
+
+Authored by shixuantong <1726671442@qq.com>.
+
+meta-openembedded uses Debian's release tarball [1]. Debian uses
+repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has
+been inactive since 2013 [3].
+
+CVE: CVE-2021-33643 CVE-2021-33644
+
+Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
+
+[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
+[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
+[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
+
+Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
+---
+ lib/block.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/lib/block.c b/lib/block.c
+index 092bc28..f12c4bc 100644
+--- a/lib/block.c
++++ b/lib/block.c
+@@ -118,6 +118,11 @@ th_read(TAR *t)
+        if (TH_ISLONGLINK(t))
+        {
+                sz = th_get_size(t);
++               if ((int)sz <= 0)
++               {
++                       errno = EINVAL;
++                       return -1;
++               }
+                blocks = (sz / T_BLOCKSIZE) + (sz % T_BLOCKSIZE ? 1 : 0);
+                if (blocks > ((size_t)-1 / T_BLOCKSIZE))
+                {
+@@ -168,6 +173,11 @@ th_read(TAR *t)
+        if (TH_ISLONGNAME(t))
+        {
+                sz = th_get_size(t);
++               if ((int)sz <= 0)
++               {
++                       errno = EINVAL;
++                       return -1;
++               }
+                blocks = (sz / T_BLOCKSIZE) + (sz % T_BLOCKSIZE ? 1 : 0);
+                if (blocks > ((size_t)-1 / T_BLOCKSIZE))
+                {
diff --git a/meta-oe/recipes-support/libtar/libtar_1.2.20.bb b/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
index f93d9c09a5..a17509d2e5 100644
--- a/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
+++ b/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
@@ -8,11 +8,22 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=61cbac6719ae682ce6cd45b5c11e21af"
 SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz \
            file://fix_libtool_sysroot.patch \
            file://0002-Do-not-strip-libtar.patch \
+           file://0003-Fix-missing-prototype-compiler-warnings.patch \
+           file://0004-Fix-invalid-memory-de-reference-issue.patch \
+           file://0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch \
+           file://0006-fix-memleak-on-tar_open-failure.patch \
+           file://0007-fix-memleaks-in-libtar-sample-program.patch \
+           file://0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch \
+           file://0009-Check-for-NULL-before-freeing-th_pathname.patch \
+           file://0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch \
+           file://0011-libtar-fix-programming-mistakes-detected-by-static-a.patch \
+           file://CVE-2021-33643-CVE-2021-33644.patch \
+           file://CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch \
+           file://CVE-2013-4420.patch \
            "
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
-SRC_URI[md5sum] = "6ced95ab3a4b33fbfe2dfb231d156cdb"
 SRC_URI[sha256sum] = "50f24c857a7ef1cb092e6508758b86d06f1188508f897f3e6b40c573e8879109"
 
 inherit autotools-brokensep
diff --git a/meta-oe/recipes-support/libteam/libteam_1.32.bb b/meta-oe/recipes-support/libteam/libteam_1.32.bb
index 508cbb13bb..4686f4be5c 100644
--- a/meta-oe/recipes-support/libteam/libteam_1.32.bb
+++ b/meta-oe/recipes-support/libteam/libteam_1.32.bb
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \
            "
 SRCREV = "8b843e93cee1dab61fb79b01791201cdad45e1d1"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig ptest
 
diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2021-42260.patch b/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2021-42260.patch
new file mode 100644
index 0000000000..8fc623744c
--- /dev/null
+++ b/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2021-42260.patch
@@ -0,0 +1,27 @@
+Description: In stamp always advance the pointer if *p= 0xef
+ .
+ The current implementation only advanced if 0xef is followed
+ by two non-zero bytes. In case of malformed input (0xef should be
+ the start byte of a three byte character) this leads to an infinite
+ loop. (CVE-2021-42260)
+Origin: https://sourceforge.net/p/tinyxml/git/merge-requests/1/
+
+CVE: CVE-2021-42260
+Upstream-Status: Inactive-Upstream [lastrelease: 2011]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+
+--- a/tinyxmlparser.cpp
++++ b/tinyxmlparser.cpp
+@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding )
+                                                else
+                                                        { p +=3; ++col; }       // A normal character.
+                                        }
++                                       else
++                                       {
++                                               // TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so
++                                               // there is something wrong here. Just advance the pointer to evade infinite loops
++                                               ++p;
++                                       }
+                                }
+                                else
+                                {
diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2023-34194.patch b/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2023-34194.patch
new file mode 100644
index 0000000000..a94806daad
--- /dev/null
+++ b/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2023-34194.patch
@@ -0,0 +1,31 @@
+From: Guilhem Moulin <guilhem@debian.org>
+Date: Sat, 30 Dec 2023 14:15:54 +0100
+Subject: Avoid reachable assertion via crafted XML document with a '\0'
+ located after whitespace
+
+Bug: https://www.forescout.com/resources/sierra21-vulnerabilities
+Bug-Debian: https://bugs.debian.org/1059315
+Bug-Debian: https://security-tracker.debian.org/tracker/CVE-2023-34194
+
+CVE: CVE-2023-34194
+Upstream-Status: Inactive-Upstream [lastrelease: 2011]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ tinyxmlparser.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tinyxmlparser.cpp b/tinyxmlparser.cpp
+index 8aa0dfa..1601962 100644
+--- a/tinyxmlparser.cpp
++++ b/tinyxmlparser.cpp
+@@ -1606,6 +1606,10 @@ const char* TiXmlDeclaration::Parse( const char* p, TiXmlParsingData* data, TiXm
+                }
+ 
+                p = SkipWhiteSpace( p, _encoding );
++               if ( !p || !*p )
++               {
++                       break;
++               }
+                if ( StringEqual( p, "version", true, _encoding ) )
+                {
+                        TiXmlAttribute attrib;
diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
index 6fbdd071e8..b91a455aff 100644
--- a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
+++ b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
@@ -5,15 +5,18 @@ HOMEPAGE = "http://www.sourceforge.net/projects/tinyxml"
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://readme.txt;md5=f8f366f3370dda889f60faa7db162cf4"
 SECTION = "libs"
+CVE_PRODUCT = "tinyxml"
 
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tinyxml/tinyxml_${@'${PV}'.replace('.', '_')}.tar.gz \
            file://enforce-use-stl.patch \
-           file://entity-encoding.patch"
-SRC_URI[md5sum] = "c1b864c96804a10526540c664ade67f0"
+           file://entity-encoding.patch \
+           file://CVE-2021-42260.patch \
+           file://CVE-2023-34194.patch \
+"
 SRC_URI[sha256sum] = "15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593"
 
-S = "${WORKDIR}/tinyxml"
+S = "${UNPACKDIR}/tinyxml"
 
 EXTRA_CXXFLAGS = "-I. -fPIC"
 
diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_11.0.0.bb
index bcd309282b..89e6eca99b 100644
--- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb
+++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_11.0.0.bb
@@ -3,12 +3,12 @@ HOMEPAGE = "https://leethomason.github.io/tinyxml2"
 SECTION = "libs"
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd"
+CVE_PRODUCT = "tinyxml2"
 
-SRCREV = "321ea883b7190d4e85cae5512a12e5eaa8f8731f"
+SRCREV = "9148bdf719e997d1f474be6bcc7943881046dba1"
 SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https \
            file://run-ptest"
 
-S = "${WORKDIR}/git"
 
 inherit meson ptest
 
diff --git a/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb b/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb
index 4d6c06240d..28c474e1dd 100644
--- a/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb
+++ b/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/libtom/libtommath.git;protocol=https;branch=master"
 
 SRCREV = "95d80fd8229d05dd6cb4ec88bc8d4f5377ff00ef"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'LIBPATH=${libdir}' 'CFLAGS=${CFLAGS}'"
 
diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch
new file mode 100644
index 0000000000..f744812a3f
--- /dev/null
+++ b/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch
@@ -0,0 +1,39 @@
+From c55874bc28f66d606527b940d4bd0f266bbaaa2c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 17 Feb 2025 11:51:19 -0800
+Subject: [PATCH] test: Including missing string.h for memcpy
+
+Fixes
+accept-test.c:39:2: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+
+Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1351]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ test/232c93d07b74.c | 1 +
+ test/accept-test.c  | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/test/232c93d07b74.c b/test/232c93d07b74.c
+index d3053b9..d5677d3 100644
+--- a/test/232c93d07b74.c
++++ b/test/232c93d07b74.c
+@@ -10,6 +10,7 @@
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <assert.h>
++#include <string.h>
+ 
+ #include <pthread.h>
+ #include <errno.h>
+diff --git a/test/accept-test.c b/test/accept-test.c
+index 99f6080..142b2de 100644
+--- a/test/accept-test.c
++++ b/test/accept-test.c
+@@ -7,6 +7,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <assert.h>
++#include <string.h>
+ #include "liburing.h"
+ #include "helpers.h"
+ 
diff --git a/meta-oe/recipes-support/liburing/liburing_2.6.bb b/meta-oe/recipes-support/liburing/liburing_2.9.bb
index fc3fe1cac1..a645a8e4c4 100644
--- a/meta-oe/recipes-support/liburing/liburing_2.6.bb
+++ b/meta-oe/recipes-support/liburing/liburing_2.9.bb
@@ -9,20 +9,21 @@ SECTION = "libs"
 LICENSE = "LGPL-2.1-only | MIT"
 LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af"
 
-SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https"
-SRCREV = "f7dcc1ea60819475dffd3a45059e16f04381bee7"
+SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \
+           file://0001-test-Including-missing-string.h-for-memcpy.patch"
+SRCREV = "08468cc3830185c75f9e7edefd88aa01e5c2f8ab"
 
-S = "${WORKDIR}/git"
 
 DEPENDS:append:libc-musl = " libucontext"
 XCFLAGS = "-pthread"
 XCFLAGS:append:libc-musl = " -lucontext"
 
 USELIBC = ""
-# clang-18 on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro
+# clang-18+ on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro
 # this does not happen for gcc or older clang, so link with libc since we need memset API
 # -fno-builtin-memset does not help
 USELIBC:riscv64:toolchain-clang = "--use-libc"
+USELIBC:riscv32 = "--use-libc"
 EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'"
 do_configure() {
     ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC}
diff --git a/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb
index 57f1f54387..960f547f94 100644
--- a/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb
+++ b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb
@@ -28,7 +28,6 @@ SRC_URI = " \
     file://run-ptest \
 "
 SRCREV = "c497eff1ae8c4cfd4fdff370f04c78fa0584f4f3"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb-compat-0.1/releases"
 
diff --git a/meta-oe/recipes-support/libusbg/libusbg_git.bb b/meta-oe/recipes-support/libusbg/libusbg_git.bb
index 716d9c4ce4..84f97aab2c 100644
--- a/meta-oe/recipes-support/libusbg/libusbg_git.bb
+++ b/meta-oe/recipes-support/libusbg/libusbg_git.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/libusbg/libusbg.git;branch=master;protocol=https \
            file://0001-Fix-out-of-tree-builds.patch \
           "
 
-S = "${WORKDIR}/git"
 
 ALTERNATIVE:${PN} = "gadget-acm-ecm show-gadgets"
 ALTERNATIVE_LINK_NAME[gadget-acm-ecm] = "${bindir}/gadget-acm-ecm"
diff --git a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb
index c79dd092cd..f3870203ad 100644
--- a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb
+++ b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb
@@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 SRC_URI = "file://usbgx.default"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb
index bc40f029cd..7b12b911d8 100644
--- a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb
+++ b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb
@@ -18,7 +18,6 @@ SRC_URI = " \
     file://usbgx.service \
 "
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "examples gadget-schemes libconfig"
 PACKAGECONFIG[libconfig] = "--with-libconfig=yes,--without-libconfig,libconfig"
@@ -35,12 +34,12 @@ SYSTEMD_AUTO_ENABLE:${PN}-examples = "${@bb.utils.contains('PACKAGECONFIG', 'exa
 INITSCRIPT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '${PN}-examples', '', d)}"
 INITSCRIPT_NAME = "usbgx"
 INITSCRIPT_PARAMS = "defaults"
-INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '1', '0', d)}"
+INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '', '1', d)}"
 
 do_install:append() {
     install -Dm 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-start
     sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start
-    install -m 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-stop
+    install -m 0755 ${UNPACKDIR}/gadget-stop ${D}${bindir}/gadget-stop
     sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-stop
 
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
diff --git a/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb b/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb
index 0d2cd135c6..cc28860b04 100644
--- a/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb
+++ b/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git;branch=mas
            file://0002-Proper-macro-path-generation.patch \
            "
 
-S = "${WORKDIR}/git/${BPN}"
+S = "${UNPACKDIR}/${BP}/${BPN}"
 
 CFLAGS += "-DLIBEXECDIR=${libexecdir}"
 
diff --git a/meta-oe/recipes-support/links/links-x11_2.26.bb b/meta-oe/recipes-support/links/links-x11_2.26.bb
index 713919bca1..c1601ab7d9 100644
--- a/meta-oe/recipes-support/links/links-x11_2.26.bb
+++ b/meta-oe/recipes-support/links/links-x11_2.26.bb
@@ -13,7 +13,7 @@ SRC_URI += " file://links2.desktop \
 SRC_URI[sha256sum] = "f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb"
 SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47"
 
-S = "${WORKDIR}/links-${PV}"
+S = "${UNPACKDIR}/links-${PV}"
 
 EXTRA_OECONF = "--enable-graphics \
                 --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
diff --git a/meta-oe/recipes-support/links/links_2.29.bb b/meta-oe/recipes-support/links/links_2.29.bb
index e3a15d1819..311d84e484 100644
--- a/meta-oe/recipes-support/links/links_2.29.bb
+++ b/meta-oe/recipes-support/links/links_2.29.bb
@@ -9,3 +9,5 @@ EXTRA_OECONF = "--enable-graphics \
                 --without-directfb --without-pmshell --without-atheos \
                 --without-x"
 SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998"
+
+CVE_STATUS[CVE-2008-3319] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different links package compared to the one which has the CVE issue."
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
deleted file mode 100644
index 86edcc2e42..0000000000
--- a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 2cc2315eecaa48fd24792aaa889dc7d9fb96978b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 20 Mar 2017 22:18:44 -0700
-Subject: [PATCH] Makefiles: Respect environment variables and add LDFLAGS to
- linker cmdline
-
-Fixes QA errors about GNU_HASH
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- mib-modules/Makefile | 10 +++++-----
- tools/Makefile       |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/mib-modules/Makefile b/mib-modules/Makefile
-index 0d54c9b..051d4d2 100644
---- a/mib-modules/Makefile
-+++ b/mib-modules/Makefile
-@@ -17,13 +17,13 @@ TARG                = iscsiTargetMib.so
- OBJS           = iscsiTargetMib.o iscsiMib.o scsiMib.o ipsAuthMib.o \
-                iscsiAuthData.o
- 
--CC             = gcc
--CFLAGS         = -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
-+CC             ?= gcc
-+CFLAGS         += -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
- CFLAGS         += -I../include -Wall -Werror
- #CFLAGS                +=$(AUTO_CFLAGS)
- 
--LD             = gcc -shared
--
-+LD             ?= gcc
-+LDFLAGS                += -shared
- INSTALL                = install
- 
- all: $(TARG)
-@@ -32,7 +32,7 @@ all: $(TARG)
-        $(CC) $(CFLAGS) -o $@ -c $<
- 
- $(TARG): $(OBJS)
--       $(LD) -o $@ $(OBJS)
-+       $(LD) -o $@ $(OBJS) $(LDFLAGS)
- 
- clean:
-        rm -f $(OBJS) $(TARG)
-diff --git a/tools/Makefile b/tools/Makefile
-index 79ed3cd..ffd9bf3 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -6,7 +6,7 @@ ISCSI_NAME_OBJS      = $(ISCSI_NAME_SRCS:.c=.o)
- all:: $(ISCSI_NAME) 
- 
- $(ISCSI_NAME): $(ISCSI_NAME_OBJS)
--       $(CC) -o $@ $(CFLAGS) $(ISCSI_NAME_OBJS) 
-+       $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(ISCSI_NAME_OBJS) 
- 
- clean:
-        rm -f $(ISCSI_NAME_OBJS) $(ISCSI_NAME) 
--- 
-2.12.0
-
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
deleted file mode 100644
index 844e5acf90..0000000000
--- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
+++ /dev/null
@@ -1,75 +0,0 @@
-SUMMARY = "lio-utils"
-DESCRIPTION = "a simple low-level configuration tool set for the Target+iSCSI (LIO)"
-HOMEPAGE = "http://linux-iscsi.org/index.php/Lio-utils"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df"
-
-PV = "4.1+git"
-
-SRC_URI = "git://github.com/Datera/lio-utils.git;branch=master;protocol=https \
-           file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \
-           "
-SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e"
-S = "${WORKDIR}/git"
-
-inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)}
-
-EXTRA_OEMAKE += "DESTDIR=${D}"
-
-do_compile() {
-    cd ${S}/tcm-py
-    distutils_do_compile
-
-    cd ${S}/lio-py
-    distutils_do_compile
-
-    if test -d ${S}/tools; then
-        oe_runmake -C ${S}/tools
-    fi
-}
-
-do_install() {
-    cd ${S}/tcm-py
-    distutils_do_install
-
-    cd ${S}/lio-py
-    distutils_do_install
-
-    SITE_PACKAGES=${D}/${PYTHON_SITEPACKAGES_DIR}
-    install -d ${D}/${sbindir}
-    for var in tcm_node tcm_dump tcm_loop tcm_fabric lio_dump lio_node; do
-        if [ ! -h ${D}/${sbindir}/${var} ];then
-            chmod a+x ${SITE_PACKAGES}/${var}.py
-            ln -s ${PYTHON_SITEPACKAGES_DIR}/${var}.py ${D}/${sbindir}/${var}
-        fi
-    done
-
-    if test -d ${S}/tools; then
-        oe_runmake -C ${S}/tools install
-    fi
-
-    install -d ${D}/etc/target/
-    install -d ${D}/etc/init.d/
-    install -m 755 ${S}/scripts/rc.target ${D}/etc/init.d/
-    install -m 755 ${S}/conf/tcm_start.default ${D}/etc/target/tcm_start.sh
-    install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh
-}
-
-SKIP_RECIPE[lio-utils] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}"
-
-RDEPENDS:${PN} += "python-stringold python-subprocess python-shell \
-    python-datetime python-textutils python-crypt python-netclient python-email \
-    bash"
-
-FILES:${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*"
-
-# http://errors.yoctoproject.org/Errors/Details/184712/
-# python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory
-CLEANBROKEN = "1"
-
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
-
-
diff --git a/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb b/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb
index a52ca25da4..5fe3006524 100644
--- a/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb
+++ b/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Locking devices library"
 SECTION = "libs"
 LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM="file://LICENSE;md5=d8045f3b8f929c1cb29a1e3fd737b499"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 
 PE = "1"
 SRC_URI = "http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_${PV}.orig.tar.gz \
diff --git a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
index 7d9b9d50f8..a0bd40b03a 100644
--- a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
+++ b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
@@ -8,7 +8,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0001-Use-the-API-properly-in-the-example-format-security-.patch \
           "
 
-SRC_URI[md5sum] = "0d94919136e1d16b68427562e74cb3dd"
 SRC_URI[sha256sum] = "5991020192f52cc40fa852fbf6bbf5bd5db5d5d00aa9905c67f6f0eadeed48ea"
 
 PACKAGECONFIG ??= "expat"
diff --git a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb
index 729857eb62..d51e51387b 100644
--- a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb
+++ b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb
@@ -8,10 +8,12 @@ SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}.tar.gz \
           "
 SRC_URI[sha256sum] = "696113659e426540625274a8b251052cc04306d8ee5c42a0c7639f39ca90c9d6"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 inherit autotools pkgconfig
 
+EXTRA_AUTORECONF += "-I m4"
+
 EXTRA_OECONF = "\
     --enable-doxygen=no \
     --enable-dot=no \
@@ -20,3 +22,7 @@ EXTRA_OECONF = "\
 "
 
 CXXFLAGS += "-std=c++14"
+
+do_install:append() {
+        sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${bindir}/log4cpp-config
+}
diff --git a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb b/meta-oe/recipes-support/logwarn/logwarn_1.0.17.bb
index 3549cb2153..6be82979a4 100644
--- a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb
+++ b/meta-oe/recipes-support/logwarn/logwarn_1.0.17.bb
@@ -11,8 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI = "https://s3.amazonaws.com/archie-public/${BPN}/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "e544a6230673ea54f7430bf817bb39d8"
-SRC_URI[sha256sum] = "8dbfcf9b28c782ab3bddd6a620d4fb95d1b0ffcbe93276996cdc4800aa9aebd1"
+SRC_URI[sha256sum] = "062d197349f4a43d8f69887fc642cb58b59a8e2cc54cc951d5c1c6abc4809a9a"
+
+UPSTREAM_CHECK_URI = "https://github.com/archiecobbs/logwarn/tags"
+UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)"
 
 inherit autotools-brokensep
 
diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
deleted file mode 100644
index f4b0f913d8..0000000000
--- a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f261b2f1bc16c32a55a22e28bf1b2f15ac6c7a88 Mon Sep 17 00:00:00 2001
-From: Kai Kang <kai.kang@windriver.com>
-Date: Wed, 6 Dec 2023 10:24:46 +0800
-Subject: [PATCH] configure.ac: check egrep
-
-The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed
-from configure.ac, then it fails to substitute '@EGREP@':
-
-|     [GEN] command-lines-input.h
-| /bin/bash: line 2: @EGREP@: command not found
-|     [GEN] command-count.h
-
-Call AC_PROG_EGREP to fix the error.
-
-Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4]
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index c2dbf3c9f..d9e7964c3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,6 +88,7 @@ AC_PROG_EGREP
- AC_PROG_MAKE_SET
- AC_PROG_MKDIR_P
- AC_PROG_RANLIB
-+AC_PROG_EGREP
- AC_CHECK_TOOL([READELF], [readelf])
- AC_CHECK_TOOL(AR, ar)
- AC_PATH_TOOL(CFLOW_CMD, cflow)
diff --git a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
index e11ac5ac08..1f6b89f2b6 100644
--- a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
+++ b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
@@ -1,4 +1,4 @@
-From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001
+From 65a04547541894b3ec56bd70510b164810cd64b3 Mon Sep 17 00:00:00 2001
 From: Dengke Du <dengke.du@windriver.com>
 Date: Tue, 25 Oct 2016 11:49:40 +0000
 Subject: [PATCH] implement libc specific reopen_stream
@@ -21,7 +21,7 @@ Upstream-Status: Pending
  2 files changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/lib/log/log.c b/lib/log/log.c
-index 7b88252f0..e1720098a 100644
+index 90905e629..ed69662d0 100644
 --- a/lib/log/log.c
 +++ b/lib/log/log.c
 @@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_
@@ -45,10 +45,10 @@ index 7b88252f0..e1720098a 100644
  void init_log_fn(lvm2_log_fn_t log_fn)
  {
 diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
-index 3fd23a521..c2ee39905 100644
+index 22ae1e3bb..b0928bc04 100644
 --- a/tools/lvmcmdline.c
 +++ b/tools/lvmcmdline.c
-@@ -3380,7 +3380,7 @@ static int _check_standard_fds(void)
+@@ -3407,7 +3407,7 @@ static int _check_standard_fds(void)
         int err = is_valid_fd(STDERR_FILENO);
  
         if (!is_valid_fd(STDIN_FILENO) &&
@@ -57,7 +57,7 @@ index 3fd23a521..c2ee39905 100644
                 if (err)
                         perror("stdin stream open");
                 else
-@@ -3390,7 +3390,7 @@ static int _check_standard_fds(void)
+@@ -3417,7 +3417,7 @@ static int _check_standard_fds(void)
         }
  
         if (!is_valid_fd(STDOUT_FILENO) &&
@@ -66,7 +66,7 @@ index 3fd23a521..c2ee39905 100644
                 if (err)
                         perror("stdout stream open");
                 /* else no stdout */
-@@ -3398,7 +3398,7 @@ static int _check_standard_fds(void)
+@@ -3425,7 +3425,7 @@ static int _check_standard_fds(void)
         }
  
         if (!is_valid_fd(STDERR_FILENO) &&
diff --git a/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
index 83a7f936b1..2fcbc12b22 100644
--- a/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
+++ b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
@@ -1,4 +1,4 @@
-From 4e7f4ea0bf89726255612a2a382c064e5923fbcd Mon Sep 17 00:00:00 2001
+From c7a63e17fc841eab5874aa5dc4e848e2bf300bf0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 25 Mar 2024 13:07:28 -0700
 Subject: [PATCH] include libgen.h for basename
@@ -16,12 +16,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/lib/device/device_id.c b/lib/device/device_id.c
-index 2b183810a..53467cbbb 100644
+index a3f341bfc..0c05eb151 100644
 --- a/lib/device/device_id.c
 +++ b/lib/device/device_id.c
-@@ -26,6 +26,7 @@
- #include "lib/datastruct/str_list.h"
- #include "lib/metadata/metadata-exported.h"
+@@ -27,6 +27,7 @@
+ #include "lib/display/display.h"
+ #include "device_mapper/misc/dm-ioctl.h"
  
 +#include <libgen.h>
  #include <sys/stat.h>
diff --git a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
index 6435c3fd92..ac5c440e4e 100644
--- a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
+++ b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
@@ -1,4 +1,4 @@
-From b30f842d5d200a8217a47465d6cdd99d3805ba76 Mon Sep 17 00:00:00 2001
+From 53a879b5a285722f0cb0ee42607c1cd1102b79be Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Tue, 31 Jul 2018 15:04:29 +0800
 Subject: [PATCH] tweak MODPROBE_CMD for cross compile
@@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index c8d81e16c..7c1c04627 100644
+index e5e5e71ce..3af73c781 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1689,8 +1689,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
+@@ -1742,8 +1742,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
  ])
  
  ################################################################################
diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
index e7aaad4d0e..f7a85b4b3f 100644
--- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
+++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
@@ -1,4 +1,4 @@
-From e0e06b77e067da6a01dd9b0d5582a0a1709c655d Mon Sep 17 00:00:00 2001
+From 8657541b91b4f2bd05ce14ec9899ff5f9f3b7d4c Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Mon, 26 Nov 2018 14:59:55 +0800
 Subject: [PATCH] do not build manual
@@ -57,10 +57,10 @@ index 06c4b1823..90df7b09c 100644
  
  ifeq ("@INTL@", "yes")
 diff --git a/configure.ac b/configure.ac
-index 7c1c04627..5364dd68e 100644
+index 3af73c781..f32d1f376 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2022,7 +2022,6 @@ libdaemon/server/Makefile
+@@ -2076,7 +2076,6 @@ libdaemon/server/Makefile
  libdm/Makefile
  libdm/dm-tools/Makefile
  libdm/libdevmapper.pc
diff --git a/meta-oe/recipes-support/lvm2/libdevmapper.bb b/meta-oe/recipes-support/lvm2/libdevmapper.bb
index be558ce1d2..3b4439c3ae 100644
--- a/meta-oe/recipes-support/lvm2/libdevmapper.bb
+++ b/meta-oe/recipes-support/lvm2/libdevmapper.bb
@@ -5,6 +5,8 @@ require lvm2.inc
 
 DEPENDS += "autoconf-archive-native"
 
+inherit nopackages
+
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_install() {
diff --git a/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-oe/recipes-support/lvm2/lvm2.bb
index 868f5a249e..f569424e27 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.bb
+++ b/meta-oe/recipes-support/lvm2/lvm2.bb
@@ -1,7 +1,6 @@
 require lvm2.inc
 
 SRC_URI += " \
-            file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \
             file://tweak-for-lvmdbusd.patch \
            "
 
@@ -38,7 +37,7 @@ do_install:append() {
     || true
 }
 
-PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules"
+PACKAGE_BEFORE_PN = "${PN}-scripts"
 
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \
@@ -57,21 +56,30 @@ LVM2_PACKAGECONFIG:append:class-target = " \
 "
 
 PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev"
-PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules"
+PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,"
 
 PACKAGES =+ "libdevmapper"
 FILES:libdevmapper = " \
     ${libdir}/libdevmapper.so.* \
     ${sbindir}/dmsetup \
     ${sbindir}/dmstats \
+    ${nonarch_base_libdir}/udev/rules.d/10-dm.rules \
+    ${nonarch_base_libdir}/udev/rules.d/13-dm-disk.rules \
+    ${nonarch_base_libdir}/udev/rules.d/95-dm-notify.rules \
 "
 
 FILES:${PN} += " \
     ${libdir}/device-mapper/*.so \
-    ${systemd_system_unitdir}/lvm2-pvscan@.service \
+    ${systemd_system_unitdir} \
     ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \
     ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \
+    ${nonarch_base_libdir}/udev/rules.d/11-dm-lvm.rules \
+    ${nonarch_base_libdir}/udev/rules.d/69-dm-lvm.rules \
 "
+# Remove /lib/udev from FILES:${PN} so that any new rules files that are added
+# upstream will have to be explicitly added to either FILES:${PN} or
+# FILES:libdevmapper.
+FILES:${PN}:remove = "${nonarch_base_libdir}/udev"
 
 FILES:${PN}-scripts = " \
     ${sbindir}/blkdeactivate \
@@ -79,11 +87,8 @@ FILES:${PN}-scripts = " \
     ${sbindir}/lvmconf \
     ${sbindir}/lvmdump \
 "
-# Specified explicitly for the udev rules, just in case that it does not get picked
-# up automatically:
-FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
+
 RDEPENDS:${PN} = "bash"
-RDEPENDS:${PN}-udevrules = "libdevmapper"
 RDEPENDS:${PN}:append:class-target = " libdevmapper"
 RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
 
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 29cc7425ba..0ff17aed5c 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -15,18 +15,39 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
            file://0005-do-not-build-manual.patch \
            file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \
            file://reproducible-build.patch \
-           file://0001-configure.ac-check-egrep.patch \
            file://0001-include-libgen.h-for-basename.patch \
            "
 
-SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f"
-S = "${WORKDIR}/git"
-PV = "2.03.24"
+SRCREV = "8817523c5682a7fd83770d3f58a99c436f7e73f7"
+PV = "2.03.32"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
 
 inherit autotools-brokensep pkgconfig systemd
 
+def get_dm_version(p):
+    import re
+
+    fn = p + '/VERSION_DM'
+    try:
+        f = open(fn, 'r')
+    except IOError:
+        return None
+
+    lines = f.readlines()
+    f.close()
+    for line in lines:
+        m = re.match(r'(\w+)[-. ](\w+)[-. ](\w+)', line.strip())
+        if m:
+            return ".".join([m.group(1), m.group(2), m.group(3)])
+
+    return None
+
+DM_VERSION = '${@get_dm_version("${S}")}'
+python do_package:prepend() {
+    d.setVar('PKGV:libdevmapper', d.getVar("DM_VERSION"))
+}
+
 LVM2_PACKAGECONFIG = "dmeventd"
 LVM2_PACKAGECONFIG:append:class-target = " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
@@ -59,7 +80,3 @@ EXTRA_OECONF = "--with-user= \
                 --with-thin-repair=${sbindir}/thin_repair \
                 --with-thin-restore=${sbindir}/thin_restore \
 "
-
-# gold doesn't like multiple dm_bitset_parse_list definitions in libdm/.exported_symbols.DM_1_02_138 and libdm/.exported_symbols.DM_1_02_129
-# after it was uncommented in the later in 2.03.12 with https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab
-LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd", '', d)}"
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
deleted file mode 100644
index 96a3d64fdf..0000000000
--- a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 2ff2a867db8d3e1c660d191a1805f9e355169c80 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Tue, 2 Mar 2021 01:33:05 -0800
-Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found
-
-In oe-core (util-linux and coreutils), the commands locates in
-${bindir} rather than /bin, add BINDIR to configure it
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- configure.ac                | 3 +++
- scripts/blkdeactivate.sh.in | 7 ++++---
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d9e7964c3..9dfdcfe01 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1704,6 +1704,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [
- 
- SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))"
- 
-+BINDIR="$(eval echo $(eval echo $bindir))"
-+
- SBINDIR="$(eval echo $(eval echo $sbindir))"
- LVM_PATH="$SBINDIR/lvm"
- AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])
-@@ -1944,6 +1946,7 @@ AC_SUBST(PYTHON2DIR)
- AC_SUBST(PYTHON3)
- AC_SUBST(PYTHON3DIR)
- AC_SUBST(RT_LIBS)
-+AC_SUBST(BINDIR)
- AC_SUBST(SBINDIR)
- AC_SUBST(SELINUX_LIBS)
- AC_SUBST(SELINUX_PC)
-diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
-index 7c517b87b..7ef1bb766 100644
---- a/scripts/blkdeactivate.sh.in
-+++ b/scripts/blkdeactivate.sh.in
-@@ -42,13 +42,14 @@ VDO="/bin/vdo"
- 
- sbindir="@SBINDIR@"
- DMSETUP="$sbindir/dmsetup"
-+bindir="@BINDIR@"
- LVM="$sbindir/lvm"
- 
- if "$UMOUNT" --help | grep -- "--all-targets" >"$DEV_DIR/null"; then
-        UMOUNT_OPTS="--all-targets "
- else
-        UMOUNT_OPTS=""
--       FINDMNT="/bin/findmnt -r --noheadings -u -o TARGET"
-+       FINDMNT="$bindir/findmnt -r --noheadings -u -o TARGET"
-        FINDMNT_READ="read -r mnt"
- fi
- DMSETUP_OPTS=""
-@@ -57,10 +58,10 @@ MDADM_OPTS=""
- MPATHD_OPTS=""
- VDO_OPTS=""
- 
--LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
-+LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
- LSBLK_VARS="local devtype local kname local name local mnt"
- LSBLK_READ="read -r devtype kname name mnt"
--SORT_MNT="/bin/sort -r -u -k 4"
-+SORT_MNT="$bindir/sort -r -u -k 4"
- 
- # Do not show tool errors by default (only done/skipping summary
- # message provided by this script) and no verbose mode by default.
diff --git a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb
index ccc21f418c..01e7645ef9 100644
--- a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb
+++ b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb
@@ -8,7 +8,8 @@ SRC_URI = " \
     http://www.maier-komor.de/software/mbuffer/mbuffer-20140310.tgz \
 "
 
-SRC_URI[md5sum] = "9937d7f666c19a2e6b2499b04dbecc44"
+UPSTREAM_CHECK_URI = "http://www.maier-komor.de/mbuffer.html"
+
 SRC_URI[sha256sum] = "ab90b6fdce16db2bf08bcda0bc5d2bfb053a9a163d2a24f95fbf246460549b99"
 
 inherit autotools
diff --git a/meta-oe/recipes-support/mcelog/mce-inject_git.bb b/meta-oe/recipes-support/mcelog/mce-inject_git.bb
index a228c3cc06..c8ffb65fa1 100644
--- a/meta-oe/recipes-support/mcelog/mce-inject_git.bb
+++ b/meta-oe/recipes-support/mcelog/mce-inject_git.bb
@@ -6,7 +6,7 @@ SECTION = "System Environment/Base"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git;branch=master"
 
-SRCREV = "4cbe46321b4a81365ff3aafafe63967264dbfec5"
+SRCREV = "ca81c1dbed5c7e30fe79d44953ccfeaab98d2b4f"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
@@ -15,10 +15,11 @@ DEPENDS = "bison-native"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://README;beginline=30;md5=94c18755082a2da9c9cf97cba3ad47d6"
 
-S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux'
 
-inherit autotools-brokensep
+EXTRA_OEMAKE = "CFLAGS='${CFLAGS}'"
 
-EXTRA_OEMAKE = "destdir=${D} CFLAGS='${CFLAGS}'"
+do_install() {
+    oe_runmake 'destdir=${D}' install
+}
diff --git a/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch b/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch
index 969bfc17cf..80b9ae23b3 100644
--- a/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch
+++ b/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] gcov_merge.py/scov_merge.py: switch to python3
 
 Make gcov_merge.py and scov_merge.py port to python3.
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/andikleen/mce-test/pull/8]
 
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
diff --git a/meta-oe/recipes-support/mcelog/mce-test/0001-ltp-pan-fix-wait_handler-declaration.patch b/meta-oe/recipes-support/mcelog/mce-test/0001-ltp-pan-fix-wait_handler-declaration.patch
new file mode 100644
index 0000000000..3b2e9502ae
--- /dev/null
+++ b/meta-oe/recipes-support/mcelog/mce-test/0001-ltp-pan-fix-wait_handler-declaration.patch
@@ -0,0 +1,47 @@
+From 3f1f2d143a1e365bb0451609d08194756951099a Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Tue, 22 Apr 2025 18:03:24 +0000
+Subject: [PATCH] ltp-pan: fix wait_handler declaration
+
+to match definition in:
+tools/ltp-pan/ltp-pan.c:wait_handler( int sig )
+
+* fixes build with gcc-15:
+  http://errors.yoctoproject.org/Errors/Details/852857/
+
+ltp-pan.c: In function 'main':
+ltp-pan.c:459:19: error: assignment to '__sighandler_t' {aka 'void (*)(int)'} from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types]
+  459 |     sa.sa_handler = wait_handler;
+      |                   ^
+In file included from ltp-pan.c:67:
+zoolib.h:52:6: note: 'wait_handler' declared here
+   52 | void wait_handler();
+      |      ^~~~~~~~~~~~
+In file included from TOPDIR/tmp/work/core2-64-oe-linux/mce-test/20230601+git/recipe-sysroot/usr/include/sys/param.h:28,
+                 from ltp-pan.c:56:
+TOPDIR/tmp/work/core2-64-oe-linux/mce-test/20230601+git/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
+   72 | typedef void (*__sighandler_t) (int);
+      |                ^~~~~~~~~~~~~~
+ltp-pan.c:489:17: error: too many arguments to function 'wait_handler'; expected 0, have 1
+  489 |                 wait_handler(SIGINT);
+      |                 ^~~~~~~~~~~~ ~~~~~~
+
+Upstream-Status: Submitted [https://github.com/andikleen/mce-test/pull/9]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ tools/ltp-pan/zoolib.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/ltp-pan/zoolib.h b/tools/ltp-pan/zoolib.h
+index 8b4049e..34ce76f 100644
+--- a/tools/ltp-pan/zoolib.h
++++ b/tools/ltp-pan/zoolib.h
+@@ -49,7 +49,7 @@ extern char zoo_error[ZELEN];
+ int lock_file( FILE *fp, short ltype, char **errmsg );
+ /* FILE *open_file( char *file, char *mode, char **errmsg ); */
+ 
+-void wait_handler();
++void wait_handler(int sig);
+ 
+ /*  char *zoo_active( void ); */
+ /* zoo_getname(): create a filename to use for the zoo
diff --git a/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-oe/recipes-support/mcelog/mce-test_git.bb
index 05e98e86ed..3b96210633 100644
--- a/meta-oe/recipes-support/mcelog/mce-test_git.bb
+++ b/meta-oe/recipes-support/mcelog/mce-test_git.bb
@@ -11,17 +11,17 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git;branch=master \
-           file://makefile-remove-ldflags.patch \
-           file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \
-          "
-SRCREV = "025014dedca39d2b8a57a82e52286e72e157d73a"
-PV = "20222810+git"
+    file://makefile-remove-ldflags.patch \
+    file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \
+    file://0001-ltp-pan-fix-wait_handler-declaration.patch \
+"
+SRCREV = "9d11fc3e05eae7b454efeb5941beded56f80445b"
+PV = "20230601+git"
 
 RDEPENDS:${PN} = "mcelog mce-inject dialog bash"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
-S ="${WORKDIR}/git"
 
 EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'"
 
diff --git a/meta-oe/recipes-support/mcelog/mcelog_199.bb b/meta-oe/recipes-support/mcelog/mcelog_204.bb
index 0a48fc48ce..c3d082aa67 100644
--- a/meta-oe/recipes-support/mcelog/mcelog_199.bb
+++ b/meta-oe/recipes-support/mcelog/mcelog_204.bb
@@ -10,12 +10,11 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;
            file://run-ptest \
            "
 
-SRCREV = "c17897deb52daab300c585a6a6c2456d062d80cf"
+SRCREV = "ad244c6b60fcbd08a5d73497bfb3487983801598"
 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-S = "${WORKDIR}/git"
 
 inherit ptest
 
diff --git a/meta-oe/recipes-support/md4c/md4c_0.5.2.bb b/meta-oe/recipes-support/md4c/md4c_0.5.2.bb
index 6c409666fc..59f2e430aa 100644
--- a/meta-oe/recipes-support/md4c/md4c_0.5.2.bb
+++ b/meta-oe/recipes-support/md4c/md4c_0.5.2.bb
@@ -6,7 +6,6 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=383f39920f391605af6e8e46e60e2378"
 
 
-S = "${WORKDIR}/git"
 
 SRC_URI = " \
         git://github.com/mity/md4c.git;protocol=https;branch=master \
diff --git a/meta-oe/recipes-support/mg/mg_20230501.bb b/meta-oe/recipes-support/mg/mg_20230501.bb
index ee00003977..04811f1bdd 100644
--- a/meta-oe/recipes-support/mg/mg_20230501.bb
+++ b/meta-oe/recipes-support/mg/mg_20230501.bb
@@ -14,7 +14,6 @@ SRC_URI:append:libc-musl = "\
            file://0001-Undefine-REGEX-for-musl-based-systems.patch \
            "
 
-S = "${WORKDIR}/git"
 
 # CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?=
 EXTRA_OEMAKE = "\
diff --git a/meta-oe/recipes-support/mime-support/mime-support_3.62.bb b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb
index 46def2a23c..1c0aec13e3 100644
--- a/meta-oe/recipes-support/mime-support/mime-support_3.62.bb
+++ b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb
@@ -12,7 +12,7 @@ RRECOMMENDS:${PN} = "file"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}.tar.gz"
 SRC_URI[sha256sum] = "54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a"
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 inherit update-alternatives
 
diff --git a/meta-oe/recipes-support/minini/minini_1.2.b.bb b/meta-oe/recipes-support/minini/minini_1.2.b.bb
index 4a73f12129..582f183938 100644
--- a/meta-oe/recipes-support/minini/minini_1.2.b.bb
+++ b/meta-oe/recipes-support/minini/minini_1.2.b.bb
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=eb21481ad45c5578ae8c8d37b8c8d76d"
 
 SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/minini/minIni_12b.zip;subdir=${BP}"
 
-SRC_URI[md5sum] = "32740621098e3f0a321c7c23f4bcbc5d"
 SRC_URI[sha256sum] = "b08839af74acb36061fb76e1123bf56711bc5cf7a08b32e189b0ad78a2e888e2"
 
 do_configure[noexec] = "1"
diff --git a/meta-oe/recipes-support/monit/monit_5.34.0.bb b/meta-oe/recipes-support/monit/monit_5.35.2.bb
index 7c3869789c..97020d1953 100644
--- a/meta-oe/recipes-support/monit/monit_5.34.0.bb
+++ b/meta-oe/recipes-support/monit/monit_5.35.2.bb
@@ -6,8 +6,9 @@ causal actions in error situations."
 HOMEPAGE = "http://mmonit.com/monit/"
 
 LICENSE = "AGPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \
-                    file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92"
+LIC_FILES_CHKSUM = "file://COPYING;md5=79ca9f26f1ecb1e377e90383109ede64 \
+                    file://libmonit/COPYING;md5=44aaa0a664332e9568add09f1ddb01cb \
+                    "
 
 SRC_URI = " \
         https://mmonit.com/monit/dist/monit-${PV}.tar.gz \
@@ -15,11 +16,14 @@ SRC_URI = " \
         file://monitrc \
 "
 
-SRC_URI[sha256sum] = "37f514cd8973bbce104cb8517ff3fc504052a083703eee0d0e873db26b919820"
+SRC_URI[sha256sum] = "4dfef54329e63d9772a9e1c36ac99bc41173b79963dc0d8235f2c32f4b9e078f"
 
 DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt"
 
 inherit autotools-brokensep systemd update-rc.d
+# brokensep because | ../../monit-5.34.4/libmonit/src/util/Str.c:26:10: fatal error: Config.h: No such file or directory
+
+EXTRA_AUTORECONF += "-I config"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
 PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
@@ -38,10 +42,6 @@ INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME:${PN} = "monit"
 INITSCRIPT_PARAMS:${PN} = "defaults 89"
 
-do_configure:prepend() {
-    rm -rf ${S}/m4/*
-}
-
 do_install:append() {
 
     # Configuration file
diff --git a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb
index 371281d6e4..8b674db926 100644
--- a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb
+++ b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb
@@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b1e6a340187c1cf716513439d07c1d79"
 
 SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${BPN}-src-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "65c90fb5150d7176b65b793f0faa7377"
 SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"
 
+UPSTREAM_CHECK_URI = "https://www.mcternan.me.uk//mscgen/"
+
 DEPENDS = "gd "
 
 inherit autotools gettext pkgconfig
diff --git a/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb
index b4f4651e37..4c68e7adf4 100644
--- a/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb
+++ b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb
@@ -11,6 +11,9 @@ SRC_URI = "https://github.com/msktutil/msktutil/releases/download/${PV}/${BP}.ta
            file://0001-configure.ac-Remove-native-include-path.patch"
 SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d"
 
+UPSTREAM_CHECK_URI = "https://github.com/msktutil/msktutil/releases/"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
+
 DEPENDS += "krb5 cyrus-sasl openldap"
 
 inherit autotools
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
index 74ae1530cb..909fd77ba2 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
@@ -1,7 +1,7 @@
-From 1e1ba9ecc16895bf472eae345d44631b65629611 Mon Sep 17 00:00:00 2001
+From 68160e86472b197107c60bf6e5a3d126040e85b6 Mon Sep 17 00:00:00 2001
 From: Benjamin Marzinski <bmarzins@redhat.com>
 Date: Thu, 13 Apr 2017 07:22:23 -0500
-Subject: [PATCH 01/12] RH: fixup udev rules for redhat
+Subject: [PATCH] RH: fixup udev rules for redhat
 
 The multipath rules need to run after scsi_id is run. This means moving
 them after 60-persistent-storage.rules for redhat. Redhat also uses a
@@ -18,17 +18,20 @@ Rebase to 0.9.8
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 
 Upstream-Status: Pending
+
+Rebase to 0.10.0
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---
- Makefile.inc        | 2 +-
- kpartx/kpartx.rules | 2 +-
- multipath/Makefile  | 4 ++--
+ Makefile.inc           | 2 +-
+ kpartx/kpartx.rules.in | 2 +-
+ multipath/Makefile     | 4 ++--
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.inc b/Makefile.inc
-index 5668e638..de89b21f 100644
+index 729618bd..69521882 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -59,7 +59,7 @@ tmpfilesdir   := $(systemd_prefix)lib/tmpfiles.d
+@@ -62,7 +62,7 @@ tmpfilesdir   := $(systemd_prefix)lib/tmpfiles.d
  modulesloaddir := $(systemd_prefix)lib/modules-load.d
  libudevdir     := $(systemd_prefix)lib/udev
  udevrulesdir   := $(libudevdir)/rules.d
@@ -37,16 +40,16 @@ index 5668e638..de89b21f 100644
  mandir         := $(usr_prefix)share/man
  LIB            := $(if $(shell test -d /lib64 && echo 1),lib64,lib)
  syslibdir      := $(prefix)$(LIB)
-diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
-index 1969dee0..d2b28233 100644
---- a/kpartx/kpartx.rules
-+++ b/kpartx/kpartx.rules
+diff --git a/kpartx/kpartx.rules.in b/kpartx/kpartx.rules.in
+index 9d879609..2049eb8f 100644
+--- a/kpartx/kpartx.rules.in
++++ b/kpartx/kpartx.rules.in
 @@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end"
  GOTO="kpartx_end"
  
  LABEL="run_kpartx"
--RUN+="/sbin/kpartx -un -p -part /dev/$name"
-+RUN+="/sbin/kpartx -un /dev/$name"
+-RUN+="@BINDIR@/kpartx -un -p -part /dev/$name"
++RUN+="@BINDIR@/kpartx -un /dev/$name"
  
  LABEL="kpartx_end"
 diff --git a/multipath/Makefile b/multipath/Makefile
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch
new file mode 100644
index 0000000000..128a0c4d8d
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch
@@ -0,0 +1,28 @@
+From 1d444772db14f4acb8d47b874462b0cc171ab672 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 17 Feb 2025 12:01:59 -0800
+Subject: [PATCH] libmpathutils/uxsock.c: Include string.h for memcpy
+
+Fixes
+uxsock.c:72:2: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+
+Upstream-Status: Submitted [https://lore.kernel.org/dm-devel/20250217200503.4166910-1-raj.khem@gmail.com/T/#u]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: Benjamin Marzinski <bmarzins@redhat.com>
+Cc: Martin Wilck <mwilck@suse.com>
+---
+ libmpathutil/uxsock.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libmpathutil/uxsock.c b/libmpathutil/uxsock.c
+index 2135476d..a474874e 100644
+--- a/libmpathutil/uxsock.c
++++ b/libmpathutil/uxsock.c
+@@ -8,6 +8,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <stdarg.h>
++#include <string.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch
deleted file mode 100644
index 0365a7ef64..0000000000
--- a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 389286b25a903be62ce7f964246824fcc20c4c67 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 26 Mar 2024 18:56:55 -0700
-Subject: [PATCH] libmultipath: always use glibc basename()
-
-There is a use of basename() which expects it to be GNU version of
-basename, which is not available in other libcs e.g. musl on Linux
-therefore provide a version for such cases
-
-Upstream-Status: Submitted [https://github.com/opensvc/multipath-tools/pull/84]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libmultipath/configure.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/libmultipath/configure.c b/libmultipath/configure.c
-index 4ecf6ba4..e81cc67c 100644
---- a/libmultipath/configure.c
-+++ b/libmultipath/configure.c
-@@ -43,6 +43,19 @@
- #include "sysfs.h"
- #include "io_err_stat.h"
- 
-+#ifndef __GLIBC__
-+/*
-+ * glibc's non-destructive version of basename()
-+ * License: LGPL-2.1-or-later
-+ */
-+static const char *__basename(const char *filename)
-+{
-+       char *p = strrchr(filename, '/');
-+       return p ? p + 1 : filename;
-+}
-+#define basename(x) __basename(x)
-+#endif
-+
- /* group paths in pg by host adapter
-  */
- int group_by_host_adapter(struct pathgroup *pgp, vector adapters)
--- 
-2.44.0
-
diff --git a/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
index 4b24bd2d35..a578280491 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
@@ -1,7 +1,7 @@
-From bb6db01cc19940bb5162c1cc0c9b5f8e4c209822 Mon Sep 17 00:00:00 2001
+From e3449e163d7fe9bf1e188f0e28962f0659e9652d Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Fri, 1 Mar 2024 10:34:06 +0800
-Subject: [PATCH 02/12] RH: Remove the property blacklist exception builtin
+Subject: [PATCH] RH: Remove the property blacklist exception builtin
 
 Multipath set the default property blacklist exceptions to
 (ID_SCSI_VPD|ID_WWN).  This has the effect of blacklisting some internal
@@ -13,21 +13,19 @@ it.
 
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 
-Upsteam-Status: Pending
+Upstream-Status: Pending
 
 [OP: Rebase to 0.9.3]
 Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
 
 Rebase to 0.9.8
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
-Upstream-Status: Pending
 ---
  libmultipath/blacklist.c | 16 +++++-----------
  1 file changed, 5 insertions(+), 11 deletions(-)
 
 diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
-index 75100b20..4fdaca76 100644
+index 17e1b54a..2cfb18b8 100644
 --- a/libmultipath/blacklist.c
 +++ b/libmultipath/blacklist.c
 @@ -221,15 +221,6 @@ setup_default_blist (struct config * conf)
diff --git a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
index 54b3bdc863..649f1fa778 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
@@ -1,7 +1,7 @@
-From de8ee3480ec7479ed014c197a9d747403f6e0237 Mon Sep 17 00:00:00 2001
+From 2fe1037b8198bd00961d8df48e684296758127d1 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Fri, 23 Nov 2018 17:25:15 +0800
-Subject: [PATCH 03/12] RH: don't start without a config file
+Subject: [PATCH] RH: don't start without a config file
 
 If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist
 all devices when running multipath.  A completely blank configuration file
@@ -28,7 +28,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  5 files changed, 23 insertions(+)
 
 diff --git a/libmultipath/config.c b/libmultipath/config.c
-index 83fa7369..8a3a8f37 100644
+index 8b424d18..d8fafa1f 100644
 --- a/libmultipath/config.c
 +++ b/libmultipath/config.c
 @@ -26,6 +26,7 @@
@@ -39,7 +39,7 @@ index 83fa7369..8a3a8f37 100644
  
  /*
   * We don't support re-initialization after
-@@ -959,6 +960,23 @@ int _init_config (const char *file, struct config *conf)
+@@ -937,6 +938,23 @@ int init_config__ (const char *file, struct config *conf)
                 }
                 factorize_hwtable(conf->hwtable, builtin_hwtable_size, file);
                 validate_pctable(conf->overrides, 0, file);
@@ -64,7 +64,7 @@ index 83fa7369..8a3a8f37 100644
  
         conf->processed_main_config = 1;
 diff --git a/libmultipath/config.h b/libmultipath/config.h
-index 384193ab..158cebf0 100644
+index 5b4ebf8c..2302eacc 100644
 --- a/libmultipath/config.h
 +++ b/libmultipath/config.h
 @@ -10,6 +10,7 @@
@@ -76,7 +76,7 @@ index 384193ab..158cebf0 100644
  enum devtypes {
         DEV_NONE,
 diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in
-index 780bf852..2c518378 100644
+index 2ac1972f..cc248231 100644
 --- a/multipath/multipath.rules.in
 +++ b/multipath/multipath.rules.in
 @@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath"
@@ -88,7 +88,7 @@ index 780bf852..2c518378 100644
  ENV{DEVTYPE}!="partition", GOTO="test_dev"
  IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH"
 diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in
-index f1cab3ff..5ae21db1 100644
+index 7bc8806e..315884eb 100644
 --- a/multipathd/multipathd.8.in
 +++ b/multipathd/multipathd.8.in
 @@ -49,6 +49,8 @@ map regains its maximum performance and redundancy.
@@ -101,7 +101,7 @@ index f1cab3ff..5ae21db1 100644
  .
  .\" ----------------------------------------------------------------------------
 diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in
-index 6d03ff71..0cd85102 100644
+index b6a25b31..f78bb91b 100644
 --- a/multipathd/multipathd.service.in
 +++ b/multipathd/multipathd.service.in
 @@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target
@@ -112,6 +112,3 @@ index 6d03ff71..0cd85102 100644
  Before=initrd-cleanup.service
  DefaultDependencies=no
  Conflicts=shutdown.target
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
index 91477a44cb..6556d4af85 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
@@ -1,7 +1,7 @@
-From f1b74f21875d6d9f0a5ac3d67df40a28b167052a Mon Sep 17 00:00:00 2001
+From dd4f005ab3b38cee2776dcb0a0661c5a01befd00 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 26 Nov 2018 09:19:17 +0800
-Subject: [PATCH 04/12] RH: use rpm optflags if present
+Subject: [PATCH] RH: use rpm optflags if present
 
 Use the passed in optflags when compiling as an RPM, and keep the
 default flags as close as possible to the current fedora flags, while
@@ -16,15 +16,18 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
 
 Rebase to 0.9.8
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
+
+Rebase to 0.10.0
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---
  Makefile.inc | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.inc b/Makefile.inc
-index de89b21f..6ac632ff 100644
+index 69521882..2127f208 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -95,7 +95,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
+@@ -99,7 +99,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
  MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \
                         echo "modprobe@dm_multipath.service")
  
@@ -38,18 +41,18 @@ index de89b21f..6ac632ff 100644
 +                  -Werror=implicit-function-declaration -Wno-sign-compare \
 +                  -Wno-unused-parameter -Werror=cast-qual \
 +                  -Werror=discarded-qualifiers
- WARNFLAGS      := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
-                  -Werror=implicit-function-declaration -Werror=format-security \
-                  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS)
-@@ -105,7 +113,7 @@ CPPFLAGS    := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
-                   -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(configdir)\" \
-                   -DDEFAULT_CONFIGFILE=\"$(configfile)\" -DSTATE_DIR=\"$(statedir)\" \
+ 
+ # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development.
+ WARN_ONLY       :=
+@@ -115,7 +123,7 @@ CPPFLAGS    := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
+                   -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(TGTDIR)$(configdir)\" \
+                   -DDEFAULT_CONFIGFILE=\"$(TGTDIR)$(configfile)\" -DSTATE_DIR=\"$(TGTDIR)$(statedir)\" \
                    -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
--CFLAGS         := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
-+CFLAGS         := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe
+-CFLAGS         := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
++CFLAGS         := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe \
+                   -fexceptions
  BIN_CFLAGS     := -fPIE -DPIE
  LIB_CFLAGS     := -fPIC
- SHARED_FLAGS   := -shared
 -- 
 2.25.1
 
diff --git a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
index c6089612b3..e7ea374cd1 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
@@ -1,7 +1,7 @@
-From 8f52504859704466667e042baf437c2b6272ffb9 Mon Sep 17 00:00:00 2001
+From 4035b48b512b5010b1c33aeba8c58cf2705bca83 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 26 Nov 2018 09:55:12 +0800
-Subject: [PATCH 05/12] RH: add mpathconf
+Subject: [PATCH] RH: add mpathconf
 
 mpathconf is a program (largely based on lvmcomf) to help users
 configure /etc/multipath.conf and enable or disable multipathing.  It
@@ -29,10 +29,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  create mode 100644 multipath/mpathconf.8
 
 diff --git a/libmultipath/config.c b/libmultipath/config.c
-index 8a3a8f37..a40b41ab 100644
+index d8fafa1f..cba7994b 100644
 --- a/libmultipath/config.c
 +++ b/libmultipath/config.c
-@@ -962,6 +962,7 @@ int _init_config (const char *file, struct config *conf)
+@@ -940,6 +940,7 @@ int init_config__ (const char *file, struct config *conf)
                 validate_pctable(conf->overrides, 0, file);
         } else {
                 condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
@@ -648,6 +648,3 @@ index 00000000..4cd32672
 +.BR service (8),
 +.SH AUTHOR
 +Benjamin Marzinski <bmarzins@redhat.com>
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
index 8df7de3b48..04160eaac5 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
@@ -1,7 +1,7 @@
-From f93248d8e3598ccdc42b6d639107917c9cda268c Mon Sep 17 00:00:00 2001
+From bd65cdc704666dd4153779c74cdbb2cac6efea71 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 26 Sep 2019 16:29:48 +0800
-Subject: [PATCH 06/12] RH: add wwids from kernel cmdline mpath.wwids with -A
+Subject: [PATCH] RH: add wwids from kernel cmdline mpath.wwids with -A
 
 This patch adds another option to multipath, "-A", which reads
 /proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds
@@ -27,7 +27,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  2 files changed, 45 insertions(+)
 
 diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
-index 591cd09b..b01f1b85 100644
+index aac18c04..68f8e373 100644
 --- a/libmultipath/wwids.c
 +++ b/libmultipath/wwids.c
 @@ -439,3 +439,47 @@ int unmark_failed_wwid(const char *wwid)
@@ -79,7 +79,7 @@ index 591cd09b..b01f1b85 100644
 +       return ret;
 +}
 diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h
-index 0c6ee54d..e32a0b0e 100644
+index ee47ad9f..1ed0d85e 100644
 --- a/libmultipath/wwids.h
 +++ b/libmultipath/wwids.h
 @@ -17,6 +17,7 @@ int remember_wwid(char *wwid);
diff --git a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
index c64b8aeabc..b435e6d677 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
@@ -1,7 +1,7 @@
-From 49d0b0279f54ceb96878e8e72e828efbb84a534c Mon Sep 17 00:00:00 2001
+From 9f1075f82ecd39a9960f868eef890baf2ba36d4e Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Fri, 1 Mar 2024 11:45:10 +0800
-Subject: [PATCH 07/12] RH: warn on invalid regex instead of failing
+Subject: [PATCH] RH: warn on invalid regex instead of failing
 
 multipath.conf used to allow "*" as a match everything regular expression,
 instead of requiring ".*". Instead of erroring when the old style
@@ -23,7 +23,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 34 insertions(+), 6 deletions(-)
 
 diff --git a/libmultipath/dict.c b/libmultipath/dict.c
-index 5af036b7..e494419d 100644
+index a06a6138..a734ba9b 100644
 --- a/libmultipath/dict.c
 +++ b/libmultipath/dict.c
 @@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr)
@@ -61,7 +61,7 @@ index 5af036b7..e494419d 100644
  static int
  set_yes_no(vector strvec, void *ptr, const char *file, int line_nr)
  {
-@@ -1798,7 +1826,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec,           \
+@@ -1854,7 +1882,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec,           \
         if (!conf->option)                                              \
                 return 1;                                               \
                                                                         \
@@ -70,7 +70,7 @@ index 5af036b7..e494419d 100644
         if (!buff)                                                      \
                 return 1;                                               \
                                                                         \
-@@ -1818,7 +1846,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \
+@@ -1874,7 +1902,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \
         if (!conf->option)                                              \
                 return 1;                                               \
                                                                         \
@@ -79,7 +79,7 @@ index 5af036b7..e494419d 100644
         if (!buff)                                                      \
                 return 1;                                               \
                                                                         \
-@@ -1924,16 +1952,16 @@ device_handler(struct config *conf, vector strvec, const char *file,
+@@ -1980,16 +2008,16 @@ device_handler(struct config *conf, vector strvec, const char *file,
         return 0;
  }
  
diff --git a/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
index 1fa1f3be27..9ea255cbcb 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
@@ -1,7 +1,7 @@
-From fcba3e0d4c8448a2510025acb255c7335413bf56 Mon Sep 17 00:00:00 2001
+From 87e19d273c46fe78933627fc4e8046e3a76da47a Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 26 Nov 2018 11:12:01 +0800
-Subject: [PATCH 08/12] RH: reset default find_mutipaths value to off
+Subject: [PATCH] RH: reset default find_mutipaths value to off
 
 Upstream has changed to default find_multipaths to "strict". For now
 Redhat will retain the previous default of "off".
@@ -17,10 +17,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
-index 64b633f2..a06a8a41 100644
+index 02f7e57c..98dd66f7 100644
 --- a/libmultipath/defaults.h
 +++ b/libmultipath/defaults.h
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@
  #define DEFAULT_NO_PATH_RETRY  NO_PATH_RETRY_UNDEF
  #define DEFAULT_VERBOSITY      2
  #define DEFAULT_REASSIGN_MAPS  0
diff --git a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
index 041b79a9af..661e38f684 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
@@ -1,7 +1,7 @@
-From 7452549e572b1c40aefe25524bf4bbbf34c952e5 Mon Sep 17 00:00:00 2001
+From c22c897e7c55fc0b8c5bdd113a0357654ee895ae Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Tue, 4 Jun 2019 11:39:39 +0800
-Subject: [PATCH 09/12] multipath-tools: modify create-config.mk for
+Subject: [PATCH] multipath-tools: modify create-config.mk for
  cross-compilation
 
 Do not look for systemd info on the host, and allow us to pass in CFLAGS
@@ -21,7 +21,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 4 deletions(-)
 
 diff --git a/create-config.mk b/create-config.mk
-index 4d318b96..a65975ba 100644
+index 8bd2c20c..40d2446a 100644
 --- a/create-config.mk
 +++ b/create-config.mk
 @@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0)
diff --git a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch
index b48720b8a1..cf053680f6 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch
@@ -1,7 +1,7 @@
-From 5d2fa3c5975266a6c02214afa6254e6eeeb1baad Mon Sep 17 00:00:00 2001
+From c34c65a3f5ddec22cb417872f90c2c9540a1847b Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 26 Nov 2018 11:17:41 +0800
-Subject: [PATCH 10/12] Subject: [PATCH] Always use devmapper
+Subject: [PATCH] Always use devmapper
 
 Do not try to compute several _API_ make variables
 from host information when cross-compiling.
@@ -21,7 +21,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 8 insertions(+), 28 deletions(-)
 
 diff --git a/create-config.mk b/create-config.mk
-index a65975ba..8ba592f4 100644
+index 40d2446a..f5eb2803 100644
 --- a/create-config.mk
 +++ b/create-config.mk
 @@ -79,34 +79,14 @@ URCU_VERSION = $(shell \
diff --git a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
index abaea2cfb6..0c5015142c 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
@@ -1,7 +1,7 @@
-From 949070286692dfff89213792571da233fe82e440 Mon Sep 17 00:00:00 2001
+From 698361847e6fae321bc277a5fc518b2bd55751b8 Mon Sep 17 00:00:00 2001
 From: Wang Mingyu <wangmy@cn.fujitsu.com>
 Date: Sun, 10 May 2020 21:22:53 +0800
-Subject: [PATCH 11/12] fix bug of do_compile and do_install
+Subject: [PATCH] fix bug of do_compile and do_install
 
 when multiple processes make run in parallel,
 because of dependency error will occur.
@@ -18,10 +18,10 @@ Upstream-Status: Pending
  1 file changed, 10 insertions(+)
 
 diff --git a/Makefile b/Makefile
-index 4df5f161..065249c2 100644
+index f06f7faa..690dc050 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -91,6 +91,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath
+@@ -94,6 +94,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath
  libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath
  mpathpersist multipathd:  libmpathpersist
  
diff --git a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
index 2f774940d6..f47d8afe4b 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
@@ -1,7 +1,7 @@
-From 7a46f43682641436464579d8bf76c382e71ea557 Mon Sep 17 00:00:00 2001
+From 69ee17207574ca032c3cb46a3db99736de3eedf8 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Mon, 25 May 2020 23:22:55 -0700
-Subject: [PATCH 12/12] add explicit dependency on libraries
+Subject: [PATCH] add explicit dependency on libraries
 
 [snip]
 gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist
@@ -24,10 +24,10 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
-index 065249c2..0444c2ea 100644
+index 690dc050..b775f949 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -90,6 +90,7 @@ libmultipath: libmpathutil
+@@ -93,6 +93,7 @@ libmultipath: libmpathutil
  libmpathpersist libmpathvalid multipath multipathd: libmultipath
  libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath
  mpathpersist multipathd:  libmpathpersist
diff --git a/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch b/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch
new file mode 100644
index 0000000000..4cca7decb8
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch
@@ -0,0 +1,29 @@
+From bcb052a8dadbd0a837986b1e15924b469fc59edc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
+Date: Thu, 3 Apr 2025 10:08:49 +0200
+Subject: [PATCH] libdmmp/Makefile: Fix KBUILD_BUILD_TIMESTAMP usage
+
+Add missing $ (Makefile need to escape '$' as '$$')
+
+Upstream-Status: Submitted [https://lore.kernel.org/dm-devel/20250404122902.2750036-1-sofiane.hamam@smile.fr/]
+
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+Signed-off-by: Sofiane HAMAM <sofiane.hamam@smile.fr>
+Signed-off-by: Kelefa Sane <kelefa.sane@smile.fr>
+---
+ libdmmp/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libdmmp/Makefile b/libdmmp/Makefile
+index 172ba045..7e0e2509 100644
+--- a/libdmmp/Makefile
++++ b/libdmmp/Makefile
+@@ -74,7 +74,7 @@ doc: docs/man/dmmp_strerror.3
+ docs/man/dmmp_strerror.3:      $(HEADERS)
+        $(Q)TEMPFILE=$(shell mktemp); \
+        cat $^ | perl docs/doc-preclean.pl >$$TEMPFILE; \
+-       [ "$KBUILD_BUILD_TIMESTAMP" ] || \
++       [ "$$KBUILD_BUILD_TIMESTAMP" ] || \
+            KBUILD_BUILD_TIMESTAMP=`git log -n1 --pretty=%cd --date=iso -- $^`; \
+        export KBUILD_BUILD_TIMESTAMP; \
+        LC_ALL=C \
diff --git a/meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch b/meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch
new file mode 100644
index 0000000000..aad46c229b
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch
@@ -0,0 +1,41 @@
+From 6e231d887c20b2139db75e6dc6c20107273aaacd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
+Date: Thu, 3 Apr 2025 10:25:30 +0200
+Subject: [PATCH] libdmmp/Makefile: Add target docs/man/dmmp_strerror.3 to
+ .PHONY list
+
+When cloning git repos, depending on the order of written to the disk, target
+docs/man/dmmp_strerror.3 is more recent that the prerequisite
+libdmmp/libdmmp.h this leads to a non reproducible behavior:
+Sometimes, the timestamps are updated in the man pages, sometimes not.
+
+Upstream-Status: Denied
+
+https://lore.kernel.org/dm-devel/72355f1d0984647e91f8c50f1c2295071af49e33.camel@suse.com/
+The patch has been rejected by upstream, who will update the timestamps of the 
+manpages with a new commit.
+In order to be reproducible without having a random result, forcing the target
+rebuild by adding it to .PHONY is the more acceptable solution, the alternative
+would have been to use the make -B option which consider all target has
+obsolete and rebuild them all, which is less efficient.
+
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+Signed-off-by: Sofiane HAMAM <sofiane.hamam@smile.fr>
+Signed-off-by: Kelefa Sane <kelefa.sane@smile.fr>
+---
+ libdmmp/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libdmmp/Makefile b/libdmmp/Makefile
+index 7e0e2509..187bcb8c 100644
+--- a/libdmmp/Makefile
++++ b/libdmmp/Makefile
+@@ -20,7 +20,7 @@ CFLAGS += $(LIB_CFLAGS) -fvisibility=hidden
+ LIBDEPS += $(shell $(PKG_CONFIG) --libs json-c) -L$(mpathcmddir) -lmpathcmd -lpthread
+ 
+ all: $(LIBS) doc
+-.PHONY:        doc clean install uninstall check speed_test dep_clean
++.PHONY:        doc clean install uninstall check speed_test dep_clean docs/man/dmmp_strerror.3
+ 
+ $(LIBS): $(OBJS)
+        $(Q)$(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(LIBDEPS)
diff --git a/meta-oe/recipes-support/multipath-tools/files/multipathd.oe b/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
index 3bdf875e3c..3bdf875e3c 100755..100644
--- a/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
+++ b/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.1.bb
index 374cda3b4e..07bc84ce8b 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.1.bb
@@ -29,7 +29,7 @@ DEPENDS = "libdevmapper \
 
 LICENSE = "GPL-2.0-only"
 
-SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=master \
+SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=stable-0.11.y \
            file://multipathd.oe \
            file://multipath.conf.example \
            file://0001-RH-fixup-udev-rules-for-redhat.patch \
@@ -41,17 +41,18 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=ma
            file://0007-RH-warn-on-invalid-regex-instead-of-failing.patch \
            file://0008-RH-reset-default-find_mutipaths-value-to-off.patch \
            file://0009-multipath-tools-modify-create-config.mk-for-cross-co.patch \
-           file://0010-Subject-PATCH-Always-use-devmapper.patch \
+           file://0010-Always-use-devmapper.patch \
            file://0011-fix-bug-of-do_compile-and-do_install.patch \
            file://0012-add-explicit-dependency-on-libraries.patch \
-           file://0001-libmultipath-always-use-glibc-basename.patch \
+           file://0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch \
+           file://0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch \
+           file://0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch \
            "
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f"
 
-SRCREV = "3daacfdfd110b24a3a7d5a276dcf8512b7039199"
+SRCREV = "cb8de98b2cc3b62fd1a578ba479c0820778e9c02"
 
-S = "${WORKDIR}/git"
 
 inherit systemd pkgconfig
 
@@ -73,6 +74,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
 EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \
                 OPTFLAGS="${CFLAGS}" \
                 prefix=${prefix} \
+                etc_prefix=${sysconfdir} \
                 bindir=${base_sbindir} \
                 LIB=${base_libdir} libdir=${base_libdir}/multipath \
                 usrlibdir=${libdir} \
@@ -82,6 +84,7 @@ EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \
                 modulesloaddir=${sysconfdir}/modules-load.d \
                 tmpfilesdir=${sysconfdir}/tmpfiles.d \
                 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \
+                KBUILD_BUILD_TIMESTAMP="$(date -u -d "@$SOURCE_DATE_EPOCH" +"%Y-%m-%d %H:%M:%S +0000")" \
                '
 
 do_install() {
diff --git a/meta-oe/recipes-support/nano/nano_8.0.bb b/meta-oe/recipes-support/nano/nano_8.3.bb
index 56aa47f641..d1af89ef8d 100644
--- a/meta-oe/recipes-support/nano/nano_8.0.bb
+++ b/meta-oe/recipes-support/nano/nano_8.3.bb
@@ -7,13 +7,13 @@ SECTION = "console/utils"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
 
-DEPENDS = "ncurses file"
+DEPENDS = "ncurses"
 RDEPENDS:${PN} = "ncurses-terminfo-base"
 
 PV_MAJOR = "${@d.getVar('PV').split('.')[0]}"
 
 SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz"
-SRC_URI[sha256sum] = "c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4"
+SRC_URI[sha256sum] = "551b717b2e28f7e90f749323686a1b5bbbd84cfa1390604d854a3ca3778f111e"
 
 UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano"
 
diff --git a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
index b10c23984d..b4db0c0f64 100644
--- a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
+++ b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/projectNe10/Ne10.git;branch=master;protocol=https \
            "
 SRCREV = "18c4c982a595dad069cd8df4932aefb1d257591f"
 
-S = "${WORKDIR}/git"
 PV .= "+git"
 
 inherit cmake
@@ -26,6 +25,7 @@ NE10_TARGET_ARCH:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","
 NE10_TARGET_ARCH:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}"
 
 EXTRA_OECMAKE = '-DGNULINUX_PLATFORM=ON -DNE10_BUILD_SHARED=ON -DNE10_LINUX_TARGET_ARCH="${NE10_TARGET_ARCH}"'
+CFLAGS += "-Wa,--noexecstack"
 
 do_install() {
     install -d ${D}${libdir}
diff --git a/meta-oe/recipes-support/neon/neon_0.33.0.bb b/meta-oe/recipes-support/neon/neon_0.33.0.bb
index a0333f4560..0ab6d25f53 100644
--- a/meta-oe/recipes-support/neon/neon_0.33.0.bb
+++ b/meta-oe/recipes-support/neon/neon_0.33.0.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \
                     file://src/ne_utils.h;beginline=1;endline=20;md5=34c8e338bfa0237561e68d30c3c71133"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \
+SRC_URI = "https://notroj.github.io/neon/neon-${PV}.tar.gz \
            file://pkgconfig.patch \
            file://0001-Disable-installing-documentation.patch \
            file://run-ptest \
@@ -13,34 +13,31 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \
 
 SRC_URI[sha256sum] = "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8"
 
-inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest
+inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest gettext
+
+EXTRA_AUTORECONF += "-I macros"
 
 # Enable gnutls or openssl, not both
-PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib nls"
-PACKAGECONFIG:class-native = "expat gnutls webdav zlib nls"
-PACKAGECONFIG:remove:libc-musl = "nls"
+PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib"
+PACKAGECONFIG:class-native = "expat gnutls webdav zlib"
 
 PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat"
 PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
 PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5"
 PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
 PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2"
-PACKAGECONFIG[nls] = ",--disable-nls,gettext-native"
 PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
 PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav,"
 PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
 
 EXTRA_OECONF += "--enable-shared --enable-threadsafe-ssl=posix"
 
-# Do not install into /usr/local
-EXTRA_OEMAKE:append:class-native = " prefix=${prefix_native}"
-
 do_configure:prepend() {
     echo "${PV}" > ${S}/.version
 }
 
 do_compile:append() {
-    if ${@bb.utils.contains('PACKAGECONFIG', 'nls', 'true', 'false', d)}; then
+    if ${@bb.utils.contains('USE_NLS', 'yes', 'true', 'false', d)}; then
         oe_runmake compile-gmo
     fi
     oe_runmake -C test
diff --git a/meta-oe/recipes-support/nmon/nmon_16m.bb b/meta-oe/recipes-support/nmon/nmon_16m.bb
index 1779dd2273..4e7abb2123 100644
--- a/meta-oe/recipes-support/nmon/nmon_16m.bb
+++ b/meta-oe/recipes-support/nmon/nmon_16m.bb
@@ -14,12 +14,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \
 SRC_URI[lmon.sha256sum] = "2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1"
 SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/nmon/files/"
+UPSTREAM_CHECK_REGEX = "lmon(?P<pver>.*).c"
+
 CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM"
 LDFLAGS += "-ltinfo -lncursesw -lm"
 ASNEEDED:pn-nmon = ""
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile() {
     ${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon
diff --git a/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch b/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch
deleted file mode 100644
index 8515075fe0..0000000000
--- a/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d24dc9bebaefbd8abf32707bad5efc0c811c0cd4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 18 Jan 2023 13:04:56 -0800
-Subject: [PATCH] Fix -Wincompatible-function-pointer-types
-
-Fixes warnings with clang16
-testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointe r-types]
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- pr/tests/testfile.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c
-index 79d8a05..42aa6a7 100644
---- a/pr/tests/testfile.c
-+++ b/pr/tests/testfile.c
-@@ -123,7 +123,7 @@ PRThread* create_new_thread(PRThreadType type,
-     if (native_thread) {
- #if defined(_PR_PTHREADS)
-         pthread_t tid;
--        if (!pthread_create(&tid, NULL, start, arg)) {
-+        if (!pthread_create(&tid, NULL, (void*(*)(void*))start, arg)) {
-             return((PRThread *) tid);
-         }
-         else {
-@@ -573,7 +573,7 @@ static PRInt32 RunDirTest(void)
- 
-         thrarg.done= 0;
-         t = create_new_thread(PR_USER_THREAD,
--                              DirTest, &thrarg,
-+                              (void (*)(void *))DirTest, &thrarg,
-                               PR_PRIORITY_NORMAL,
-                               PR_LOCAL_THREAD,
-                               PR_UNJOINABLE_THREAD,
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta-oe/recipes-support/nspr/nspr/0001-remove-rpath-from-tests.patch
index 7ba59ed644..5cb14b5781 100644
--- a/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0001-remove-rpath-from-tests.patch
@@ -1,5 +1,7 @@
-Author: Andrei Gherzan <andrei@gherzan.ro>
-Date:   Thu Feb 9 00:03:38 2012 +0200
+From 63eb483f7feb05917402731d8f21b396630ef202 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@gherzan.ro>
+Date: Thu, 9 Feb 2012 00:03:38 +0200
+Subject: [PATCH] remove rpath from tests
 
 Avoid QA warnings by removing hardcoded rpath from binaries.
 
@@ -8,14 +10,18 @@ WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-p
 in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait
 [...]
 
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
 Upstream-Status: Pending
 
-Index: nspr/pr/tests/Makefile.in
-===================================================================
---- nspr.orig/pr/tests/Makefile.in
-+++ nspr/pr/tests/Makefile.in
-@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS)
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+---
+ pr/tests/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in
+index 20e2f99..56c73e1 100644
+--- a/pr/tests/Makefile.in
++++ b/pr/tests/Makefile.in
+@@ -260,7 +260,7 @@ ifeq ($(OS_ARCH), SunOS)
  endif # SunOS
  
  ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
@@ -24,3 +30,6 @@ Index: nspr/pr/tests/Makefile.in
      ifeq ($(USE_PTHREADS),1)
          EXTRA_LIBS = -lpthread
      endif
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta-oe/recipes-support/nspr/nspr/0002-Fix-build-failure-on-x86_64.patch
index f12acc8548..9e1928e376 100644
--- a/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0002-Fix-build-failure-on-x86_64.patch
@@ -1,21 +1,24 @@
-Fix build failure on x86_64
+From f68f2535e98231ab362b6bbbe7cc4718b2c72aa9 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 31 Dec 2024 10:25:15 +0800
+Subject: [PATCH] Fix build failure on x86_64
 
 When the target_cpu is x86_64, we should assume that the pkg uses 64bit,
 only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a
 opposite logic before.
 
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-
 Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 ---
- configure.in |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ configure.in | 16 ++++++----------
+ 1 file changed, 6 insertions(+), 10 deletions(-)
 
-Index: nspr/configure.in
-===================================================================
---- nspr.orig/configure.in
-+++ nspr/configure.in
-@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve
+diff --git a/configure.in b/configure.in
+index 1a3e489..04419d9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1590,28 +1590,24 @@ tools are selected during the Xcode/Developer Tools installation.])
          PR_MD_ASFILES=os_Linux_ia64.s
          ;;
      x86_64)
@@ -49,4 +52,7 @@ Index: nspr/configure.in
 -            PR_MD_ASFILES=os_Linux_ppc.s
          fi
          ;;
-     esac    
+     esac
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta-oe/recipes-support/nspr/nspr/0003-Add-nios2-support.patch
index dab2a4e291..3d1bbd31a7 100644
--- a/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0003-Add-nios2-support.patch
@@ -1,21 +1,23 @@
-From 4760065a58153e4dae24e4e437a5136592c624bc Mon Sep 17 00:00:00 2001
+From 09a67d3945f1fde8372532ef2e19af20db2112cd Mon Sep 17 00:00:00 2001
 From: Marek Vasut <marex@denx.de>
 Date: Sat, 30 Jan 2016 07:18:02 +0100
 Subject: [PATCH] Add nios2 support
 
 Add support for the nios2 CPU.
 
-Signed-off-by: Marek Vasut <marex@denx.de>
 Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ]
 
+Signed-off-by: Marek Vasut <marex@denx.de>
 ---
- pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++
+ pr/include/md/_linux.cfg | 45 ++++++++++++++++++++++++++++++++++++++++
  pr/include/md/_linux.h   |  4 +++-
  2 files changed, 48 insertions(+), 1 deletion(-)
 
+diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
+index 009d5e5..77c13df 100644
 --- a/pr/include/md/_linux.cfg
 +++ b/pr/include/md/_linux.cfg
-@@ -975,6 +975,51 @@
+@@ -979,6 +979,51 @@
  #define PR_BYTES_PER_WORD_LOG2   2
  #define PR_BYTES_PER_DWORD_LOG2  3
  
@@ -67,6 +69,8 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
  #elif defined(__or1k__)
  
  #undef  IS_LITTLE_ENDIAN
+diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
+index ad57d08..45a2231 100644
 --- a/pr/include/md/_linux.h
 +++ b/pr/include/md/_linux.h
 @@ -55,6 +55,8 @@
@@ -78,7 +82,7 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
  #elif defined(__or1k__)
  #define _PR_SI_ARCHITECTURE "or1k"
  #elif defined(__riscv) && (__riscv_xlen == 32)
-@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn
+@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
  #define _MD_ATOMIC_SET                _PR_x86_64_AtomicSet
  #endif
  
@@ -87,3 +91,6 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
  #if defined(__GNUC__)
  /* Use GCC built-in functions */
  #define _PR_HAVE_ATOMIC_OPS
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta-oe/recipes-support/nspr/nspr/0004-md-Fix-build-with-musl.patch
index 09855a03dc..75d184bb3b 100644
--- a/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0004-md-Fix-build-with-musl.patch
@@ -1,4 +1,4 @@
-From 5f6fcaeb0b7a319c8afd32ddb48b3515b63a6c0c Mon Sep 17 00:00:00 2001
+From e8cab35851949cd4b7498d56978c5e7907841f32 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 18 Sep 2017 17:22:43 -0700
 Subject: [PATCH] md: Fix build with musl
@@ -7,17 +7,17 @@ The MIPS specific header <sgidefs.h> is not provided by musl
 linux kernel headers provide <asm/sgidefs.h> which has same definitions
 
 Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  pr/include/md/_linux.cfg | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
-index aa3af78..899826f 100644
+index 77c13df..3eb2faf 100644
 --- a/pr/include/md/_linux.cfg
 +++ b/pr/include/md/_linux.cfg
-@@ -511,7 +511,7 @@
+@@ -515,7 +515,7 @@
  #error "Unknown MIPS endianness."
  #endif
  
@@ -26,3 +26,6 @@ index aa3af78..899826f 100644
  
  #define IS_64
  
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta-oe/recipes-support/nspr/nspr/0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
index 90fe45f34d..470ada591a 100644
--- a/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
@@ -1,4 +1,4 @@
-From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001
+From 161c955f32dd350413de076b7cad588fa4bdc4de Mon Sep 17 00:00:00 2001
 From: Mingli Yu <Mingli.Yu@windriver.com>
 Date: Fri, 16 Nov 2018 13:52:49 +0800
 Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME
@@ -23,10 +23,10 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
  4 files changed, 4 insertions(+), 28 deletions(-)
 
 diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
-index e737791..b578476 100644
+index fa8c783..74b4bdd 100644
 --- a/lib/ds/Makefile.in
 +++ b/lib/ds/Makefile.in
-@@ -114,13 +114,7 @@ GARBAGE += $(TINC)
+@@ -104,13 +104,7 @@ GARBAGE += $(TINC)
  
  $(TINC):
         @$(MAKE_OBJDIR)
@@ -42,10 +42,10 @@ index e737791..b578476 100644
  
  $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
 diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
-index e8a6d9f..978ed28 100644
+index 9ef2007..21abd6f 100644
 --- a/lib/libc/src/Makefile.in
 +++ b/lib/libc/src/Makefile.in
-@@ -116,13 +116,7 @@ GARBAGE += $(TINC)
+@@ -106,13 +106,7 @@ GARBAGE += $(TINC)
  
  $(TINC):
         @$(MAKE_OBJDIR)
@@ -61,10 +61,10 @@ index e8a6d9f..978ed28 100644
  
  $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
 diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
-index aeb2944..f318097 100644
+index 5865ab8..a00d20c 100644
 --- a/lib/prstreams/Makefile.in
 +++ b/lib/prstreams/Makefile.in
-@@ -116,13 +116,7 @@ endif
+@@ -102,13 +102,7 @@ endif
  
  $(TINC):
         @$(MAKE_OBJDIR)
@@ -80,10 +80,10 @@ index aeb2944..f318097 100644
  
  $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
 diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
-index 19c5a69..b4ac31c 100644
+index a9e86f5..bbcbb67 100644
 --- a/pr/src/Makefile.in
 +++ b/pr/src/Makefile.in
-@@ -326,13 +326,7 @@ GARBAGE += $(TINC)
+@@ -291,13 +291,7 @@ GARBAGE += $(TINC)
  
  $(TINC):
         @$(MAKE_OBJDIR)
@@ -99,5 +99,5 @@ index 19c5a69..b4ac31c 100644
  
  $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
 -- 
-2.7.4
+2.25.1
 
diff --git a/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch b/meta-oe/recipes-support/nspr/nspr/0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch
index 6ebc9c4ae6..fa7dbcc474 100644
--- a/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch
@@ -1,4 +1,4 @@
-From 13e9d66c24d1dce5179805ae5e1bf940409b4914 Mon Sep 17 00:00:00 2001
+From 88bf2abc07ae56ed1bcc9e915add0b3d9ed66c7b Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Wed, 10 Aug 2022 15:21:07 +0800
 Subject: [PATCH] config/nspr-config.in: don't pass LDFLAGS
diff --git a/meta-oe/recipes-support/nspr/nspr_4.35.bb b/meta-oe/recipes-support/nspr/nspr_4.36.bb
index abd750b138..c129362539 100644
--- a/meta-oe/recipes-support/nspr/nspr_4.35.bb
+++ b/meta-oe/recipes-support/nspr/nspr_4.36.bb
@@ -6,13 +6,12 @@ LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d
 SECTION = "libs/network"
 
 SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
-           file://remove-rpath-from-tests.patch \
-           file://fix-build-on-x86_64.patch \
-           file://0002-Add-nios2-support.patch \
-           file://0001-md-Fix-build-with-musl.patch \
-           file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \
-           file://0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch \
-           file://0001-Fix-Wincompatible-function-pointer-types.patch \
+           file://0001-remove-rpath-from-tests.patch \
+           file://0002-Fix-build-failure-on-x86_64.patch \
+           file://0003-Add-nios2-support.patch \
+           file://0004-md-Fix-build-with-musl.patch  \
+           file://0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \
+           file://0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch \
            file://nspr.pc.in \
            "
 
@@ -24,11 +23,11 @@ CACHED_CONFIGUREVARS:append:libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE
 UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
 UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
 
-SRC_URI[sha256sum] = "7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f"
+SRC_URI[sha256sum] = "55dec317f1401cd2e5dba844d340b930ab7547f818179a4002bce62e6f1c6895"
 
 CVE_PRODUCT = "netscape_portable_runtime"
 
-S = "${WORKDIR}/nspr-${PV}/nspr"
+S = "${UNPACKDIR}/nspr-${PV}/nspr"
 
 RDEPENDS:${PN}-dev += "perl"
 TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
index 2385fd3b9d..5733bb068f 100644
--- a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
+++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
@@ -1,21 +1,21 @@
-From 46ab1ca6e6fb8e1196e0665a54506dff370f8f2a Mon Sep 17 00:00:00 2001
+From c15470d6b52986a8e41f9be4579c88ed80413b44 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 22 Feb 2017 11:36:11 +0200
 Subject: [PATCH] nss: fix support cross compiling
 
 Let some make variables be assigned from outside makefile.
 
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [oe specific]
+
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
 ---
  nss/coreconf/arch.mk    | 4 ++--
  nss/lib/freebl/Makefile | 6 ++++++
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
-index 17e9fae..bc4180a 100644
+index 711d19d..a163d24 100644
 --- a/nss/coreconf/arch.mk
 +++ b/nss/coreconf/arch.mk
 @@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s))
@@ -33,7 +33,7 @@ index 17e9fae..bc4180a 100644
  
  
 diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index eeee90a..7ee8736 100644
+index e744314..0ebfc92 100644
 --- a/nss/lib/freebl/Makefile
 +++ b/nss/lib/freebl/Makefile
 @@ -36,6 +36,12 @@ ifdef USE_64
@@ -49,3 +49,6 @@ index eeee90a..7ee8736 100644
  ifdef USE_ABI32_FPU
         DEFINES += -DNSS_USE_ABI32_FPU
  endif
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch
index 8c715cc447..19fa5a7261 100644
--- a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
+++ b/meta-oe/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch
@@ -1,11 +1,11 @@
-From 73edfbdf33fe4e41724e7e947033d8caeec8f3d0 Mon Sep 17 00:00:00 2001
+From 621023bc696d3d26a4179dbbafb42d79bef1faf9 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
 Subject: [PATCH] nss:no rpath for cross compiling
 
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [oe specific]
 
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
  nss/cmd/platlibs.mk | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -26,3 +26,6 @@ index 6401778..e5c4e16 100644
  endif
  endif
  
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-oe/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch
index 735b06b5ca..61b7565739 100644
--- a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
+++ b/meta-oe/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch
@@ -1,14 +1,14 @@
-From 2ce67b1f4b1f582d556ae058da10698bbaa0edc1 Mon Sep 17 00:00:00 2001
+From 6aec640342088498cb1b0a2e395eb3da297a48b4 Mon Sep 17 00:00:00 2001
 From: Ovidiu Panait <ovidiu.panait@windriver.com>
 Date: Mon, 13 Jul 2020 12:12:31 +0300
 Subject: [PATCH] nss: fix incorrect shebang of perl
 
 Replace incorrect shebang of perl with `#!/usr/bin/env perl'.
 
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 Upstream-Status: Pending
-Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
 
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
 ---
  nss/cmd/signver/examples/1/form.pl       | 2 +-
  nss/cmd/signver/examples/1/signedForm.pl | 2 +-
@@ -89,3 +89,6 @@ index f29f60a..850332a 100755
  
  ########################################################################
  #
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-oe/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch
index 4c9bea30c0..fa4c5bacbf 100644
--- a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
+++ b/meta-oe/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch
@@ -1,7 +1,7 @@
-From f613c9a9107435a40d91329f33f12cfb16927f07 Mon Sep 17 00:00:00 2001
+From 72c3150300975524bb0001b5a731f077852c95ab Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
-Subject: [PATCH] nss,nspr: Add recipes
+Subject: [PATCH] nss: disable Wvarargs with clang
 
 clang 3.9 add this warning to rightly flag undefined
 behavior, we relegate this to be just a warning instead
@@ -20,9 +20,9 @@ see
 https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start
 for more details
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  nss/coreconf/Werror.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -40,3 +40,6 @@ index a569a49..687fe58 100644
        # -Wno-parentheses-equality : because clang warns about macro expansions
        WARNING_CFLAGS += $(call disable_warning,parentheses-equality)
        ifdef BUILD_OPT
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-oe/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch
index 589b4d5e7f..f12a278ef2 100644
--- a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch
+++ b/meta-oe/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch
@@ -1,22 +1,22 @@
-From cbd367160338847b28fc801a12c74f1c8b5b03ee Mon Sep 17 00:00:00 2001
+From 5935755eef43ac7cb8f4567e7bed5892180f954c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
-Subject: [PATCH] nss does not build on mips with clang because wrong types are
- used?
+Subject: [PATCH] nss: does not build on mips with clang because wrong types
+ are used
 
 pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare]
      if (addend < MP_DIGIT_MAX) {
        ~~~~~~ ^ ~~~~~~~~~~~~
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  nss/lib/freebl/pqg.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c
-index 1b03278..ad895b7 100644
+index 62d46b5..8c8665d 100644
 --- a/nss/lib/freebl/pqg.c
 +++ b/nss/lib/freebl/pqg.c
 @@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H)
@@ -30,3 +30,6 @@ index 1b03278..ad895b7 100644
            SECItem *seedout)
  {
      mp_int s, sum, modulus, tmp;
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-oe/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch
index a1897f88d8..afe11821af 100644
--- a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
+++ b/meta-oe/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch
@@ -1,4 +1,4 @@
-From f9b2b1c738576a17460aebd005f511f427aa1974 Mon Sep 17 00:00:00 2001
+From 895e76e75dbb993a8f445072c190a9db4ee50d15 Mon Sep 17 00:00:00 2001
 From: Wenzong Fan <wenzong.fan@windriver.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
 Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit
@@ -15,17 +15,15 @@ on host to install built files, it doesn't need any cross-compling or
 multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this
 error.
 
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-===================================================
-
 ---
  nss/coreconf/nsinstall/Makefile | 7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile
-index 08dfbc2..e97fb5f 100644
+index 337cbeb..dd77fbe 100644
 --- a/nss/coreconf/nsinstall/Makefile
 +++ b/nss/coreconf/nsinstall/Makefile
 @@ -18,6 +18,13 @@ INTERNAL_TOOLS  = 1
@@ -39,6 +37,9 @@ index 08dfbc2..e97fb5f 100644
 +LDFLAGS =
 +# CFLAGS =
 +
- ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
+ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  PROGRAM                =
  TARGETS                =
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
index b7f1b01a14..63f822be25 100644
--- a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
+++ b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
@@ -1,4 +1,4 @@
-From 7c8f367faf8848a43a414079189e10270d6c0fcc Mon Sep 17 00:00:00 2001
+From 459ee39104228a958a0999e1a7d4c43e4e6fe4f0 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 18 Dec 2019 12:29:50 +0100
 Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto
@@ -7,15 +7,15 @@ Not all current hardware supports it, particularly anything
 prior to armv8 does not.
 
 Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  nss/lib/freebl/Makefile | 3 +++
  nss/lib/freebl/gcm.c    | 2 ++
  2 files changed, 5 insertions(+)
 
 diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index 7ee8736..f9b4925 100644
+index 0ebfc92..3ee7623 100644
 --- a/nss/lib/freebl/Makefile
 +++ b/nss/lib/freebl/Makefile
 @@ -142,6 +142,8 @@ endif
@@ -33,10 +33,10 @@ index 7ee8736..f9b4925 100644
  endif
 +endif
  
- ifeq (OS2,$(OS_TARGET))
-     ASFILES  = mpi_x86_os2.s
+ ifeq (,$(filter-out WINNT,$(OS_TARGET)))
+ ifndef USE_64
 diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
-index 2dae724..9ee7fc8 100644
+index a2f63a6..743158e 100644
 --- a/nss/lib/freebl/gcm.c
 +++ b/nss/lib/freebl/gcm.c
 @@ -18,6 +18,7 @@
@@ -53,5 +53,5 @@ index 2dae724..9ee7fc8 100644
  #endif
 +#endif
  
- /* Forward declarations */
- SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
+ #if defined(__ARM_NEON) || defined(__ARM_NEON__)
+ #include <arm_neon.h>
diff --git a/meta-oe/recipes-support/nss/nss_3.101.bb b/meta-oe/recipes-support/nss/nss_3.112.bb
index 5a01efb7e4..cf0b20d48b 100644
--- a/meta-oe/recipes-support/nss/nss_3.101.bb
+++ b/meta-oe/recipes-support/nss/nss_3.112.bb
@@ -22,21 +22,21 @@ VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '
 
 SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \
            file://nss.pc.in \
-           file://0001-nss-fix-support-cross-compiling.patch \
-           file://nss-no-rpath-for-cross-compiling.patch \
-           file://nss-fix-incorrect-shebang-of-perl.patch \
-           file://disable-Wvarargs-with-clang.patch \
-           file://pqg.c-ULL_addend.patch \
            file://blank-cert9.db \
            file://blank-key4.db \
            file://system-pkcs11.txt \
-           file://nss-fix-nsinstall-build.patch \
-           file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
+           file://0001-nss-fix-support-cross-compiling.patch \
+           file://0002-nss-no-rpath-for-cross-compiling.patch \
+           file://0003-nss-fix-incorrect-shebang-of-perl.patch \
+           file://0004-nss-disable-Wvarargs-with-clang.patch \
+           file://0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch  \
+           file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \
+           file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
            "
-SRC_URI[sha256sum] = "859748f0b4b7bb51e7e600ae5a88ef4d71f93e6964b1beed2727784dd9ed85e7"
+SRC_URI[sha256sum] = "33ae72d43b275957252adc8639e84229d3ae692a57b6191b059d9456b8568a68"
 
-UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
-UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
+UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/"
+UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)"
 
 inherit siteinfo
 
diff --git a/meta-oe/recipes-support/onig/onig_6.9.9.bb b/meta-oe/recipes-support/onig/onig_6.9.10.bb
index b29437db1e..f285c2ed73 100644
--- a/meta-oe/recipes-support/onig/onig_6.9.9.bb
+++ b/meta-oe/recipes-support/onig/onig_6.9.10.bb
@@ -14,7 +14,10 @@ SRC_URI = "\
     file://run-ptest \
 "
 
-SRC_URI[sha256sum] = "60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf"
+SRC_URI[sha256sum] = "2a5cfc5ae259e4e97f86b68dfffc152cdaffe94e2060b770cb827238d769fc05"
+
+UPSTREAM_CHECK_URI = "https://github.com/kkos/oniguruma/releases/"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 BINCONFIG = "${bindir}/onig-config"
 
diff --git a/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb
index 6cacd3722c..7390d83bcc 100644
--- a/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb
+++ b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https;branch=master"
 
 SRCREV = "748c3930a9b9cb826e631d77439e2cb8f84f5bcf"
 
-S = "${WORKDIR}/git"
 
 DEPENDS += "opencl-headers virtual/opencl-icd"
 
diff --git a/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch b/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch
new file mode 100644
index 0000000000..73c9d06667
--- /dev/null
+++ b/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch
@@ -0,0 +1,65 @@
+From c4351058da555e1e6a2b4b15d913baee80f55865 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@fujitsu.com>
+Date: Thu, 27 Jun 2024 06:27:18 +0000
+Subject: Fix incompatible pointer type error with gcc option 
+ -Wincompatible-pointer-types
+
+| ../../../openct-0.6.20/src/ifd/ifdhandler.c: In function 'ifdhandler_run':
+| ../../../openct-0.6.20/src/ifd/ifdhandler.c:239:52: error: passing argument 2 of 'ifd_get_eventfd' from incompatible pointer type [-Wincompatible-pointer-types]
+|   239 |                 sock->fd = ifd_get_eventfd(reader, &sock->events);
+|       |                                                    ^~~~~~~~~~~~~
+|       |                                                    |
+|       |                                                    int *
+| In file included from ../../../openct-0.6.20/src/ifd/internal.h:17,
+|                  from ../../../openct-0.6.20/src/ifd/ifdhandler.c:7:
+| ../../../openct-0.6.20/src/include/openct/ifd.h:182:65: note: expected 'short int *' but argument is of type 'int *'
+|   182 | extern int                      ifd_get_eventfd(ifd_reader_t *, short *);
+|       |                                                                 ^~~~~~~
+
+| ../../../openct-0.6.20/src/ifd/process.c: In function 'do_memory_write':
+| ../../../openct-0.6.20/src/ifd/process.c:461:61: error: passing argument 4 of 'ct_tlv_get_opaque' from incompatible pointer type [-Wincompatible-pointer-types]
+|   461 |             || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len))
+|       |                                                             ^~~~~~~~~
+|       |                                                             |
+|       |                                                             unsigned int *
+| In file included from ../../../openct-0.6.20/src/ifd/process.c:20:
+| ../../../openct-0.6.20/src/include/openct/tlv.h:40:62: note: expected 'size_t *' {aka 'long unsigned int *'} but argument is of type 'unsigned int *'
+|    40 |                                 ifd_tag_t, unsigned char **, size_t *);
+
+Upstream-Status: Submitted
+
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+---
+ src/ifd/ifdhandler.c | 2 +-
+ src/ifd/process.c    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ifd/ifdhandler.c b/src/ifd/ifdhandler.c
+index 12686c9..ebd1b53 100644
+--- a/src/ifd/ifdhandler.c
++++ b/src/ifd/ifdhandler.c
+@@ -236,7 +236,7 @@ static void ifdhandler_run(ifd_reader_t * reader)
+                sock->fd = -1;
+        }
+        else {
+-               sock->fd = ifd_get_eventfd(reader, &sock->events);
++               sock->fd = ifd_get_eventfd(reader, (short int *)&sock->events);
+        }
+        if (sock->fd == -1) {
+                ifd_debug(1, "events inactive for reader %s", reader->name);
+diff --git a/src/ifd/process.c b/src/ifd/process.c
+index 4563bdf..7088a76 100644
+--- a/src/ifd/process.c
++++ b/src/ifd/process.c
+@@ -458,7 +458,7 @@ static int do_memory_write(ifd_reader_t * reader, int unit,
+                return IFD_ERROR_INVALID_SLOT;
+ 
+        if (ct_tlv_get_int(args, CT_TAG_ADDRESS, &address) == 0
+-           || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len))
++           || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, (size_t *)&data_len))
+                return IFD_ERROR_MISSING_ARG;
+ 
+        rc = ifd_card_write_memory(reader, unit, address, data, data_len);
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb
index e4b99089f5..c7b0d0d56d 100644
--- a/meta-oe/recipes-support/openct/openct_0.6.20.bb
+++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb
@@ -18,11 +18,13 @@ SRC_URI = " \
     file://openct.init \
     file://openct.sysconfig \
     file://openct.service \
+    file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \
 "
 
-SRC_URI[md5sum] = "a1da3358ab798f1cb9232f1dbababc21"
 SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d181a68"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/opensc/files/openct/"
+
 LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
@@ -30,7 +32,7 @@ inherit systemd
 SYSTEMD_SERVICE:${PN} += "openct.service "
 SYSTEMD_AUTO_ENABLE = "enable"
 
-EXTRA_OECONF=" \
+EXTRA_OECONF = " \
     --disable-static \
     --enable-usb \
     --enable-pcsc \
@@ -82,3 +84,8 @@ do_install () {
 }
 
 BBCLASSEXTEND = "native"
+
+# http://errors.yoctoproject.org/Errors/Details/766890/
+# openct-0.6.20/src/ifd/ifdhandler.c:239:52: error: passing argument 2 of 'ifd_get_eventfd' from incompatible pointer type [-Wincompatible-pointer-types]
+# openct-0.6.20/src/ifd/process.c:461:61: error: passing argument 4 of 'ct_tlv_get_opaque' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-support/opencv/ade_0.1.2.bb b/meta-oe/recipes-support/opencv/ade_0.1.2.bb
index 93b14ad4f3..b54c28d624 100644
--- a/meta-oe/recipes-support/opencv/ade_0.1.2.bb
+++ b/meta-oe/recipes-support/opencv/ade_0.1.2.bb
@@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 inherit cmake
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release"
 
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch
new file mode 100644
index 0000000000..b35335c35e
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch
@@ -0,0 +1,50 @@
+From ba6eb8d95292f4631a3b8de09bfaa59e43c17226 Mon Sep 17 00:00:00 2001
+From: adsha-quic <quic_adsha@quicinc.com>
+Date: Wed, 16 Apr 2025 18:54:40 +0530
+Subject: [PATCH] FROMLIST: Merge pull request #27214 from CodeLinaro:fastcv_lib_hash_update
+
+Signed-off-by: Alexander Smorkalov <alexander.smorkalov@opencv.ai>
+Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/27214]
+
+---
+ 3rdparty/fastcv/fastcv.cmake | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/3rdparty/fastcv/fastcv.cmake b/3rdparty/fastcv/fastcv.cmake
+index 5c81c11300..6fee4ce4ce 100644
+--- a/3rdparty/fastcv/fastcv.cmake
++++ b/3rdparty/fastcv/fastcv.cmake
+@@ -1,23 +1,23 @@
+ function(download_fastcv root_dir)
+ 
+   # Commit SHA in the opencv_3rdparty repo
+-  set(FASTCV_COMMIT "f4413cc2ab7233fdfc383a4cded402c072677fb0")
++  set(FASTCV_COMMIT "8d86e68dad8b80b8575a8d3cf401d3ee96c24148")
+ 
+   # Define actual FastCV versions
+   if(ANDROID)
+     if(AARCH64)
+       message(STATUS "Download FastCV for Android aarch64")
+-      set(FCV_PACKAGE_NAME  "fastcv_android_aarch64_2024_12_11.tgz")
+-      set(FCV_PACKAGE_HASH  "9dac41e86597305f846212dae31a4a88")
++      set(FCV_PACKAGE_NAME  "fastcv_android_aarch64_2025_04_08.tgz")
++      set(FCV_PACKAGE_HASH  "e028966a1d1b2f3f0bc5967d316e8b64")
+     else()
+       message(STATUS "Download FastCV for Android armv7")
+-      set(FCV_PACKAGE_NAME  "fastcv_android_arm32_2024_12_11.tgz")
+-      set(FCV_PACKAGE_HASH  "fe2d30334180b17e3031eee92aac43b6")
++      set(FCV_PACKAGE_NAME  "fastcv_android_arm32_2025_04_08.tgz")
++      set(FCV_PACKAGE_HASH  "6fc1e812a4b3ef392469d2283e037ffe")
+     endif()
+   elseif(UNIX AND NOT APPLE AND NOT IOS AND NOT XROS)
+     if(AARCH64)
+-      set(FCV_PACKAGE_NAME  "fastcv_linux_aarch64_2025_02_12.tgz")
+-      set(FCV_PACKAGE_HASH  "33ac2a59cf3e7d6402eee2e010de1202")
++      set(FCV_PACKAGE_NAME  "fastcv_linux_aarch64_2025_04_08.tgz")
++      set(FCV_PACKAGE_HASH  "062a26639cd2788beee2e0dd8743d680")
+     else()
+       message("FastCV: fastcv lib for 32-bit Linux is not supported for now!")
+     endif()
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch
new file mode 100644
index 0000000000..dd3c9a7a82
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch
@@ -0,0 +1,87 @@
+From e517347450636012e5f7a65a504e4ac9e1224c50 Mon Sep 17 00:00:00 2001
+From: Alexander Smorkalov <alexander.smorkalov@opencv.ai>
+Date: Thu, 13 Feb 2025 09:17:08 +0300
+Subject: [PATCH] FROMLIST: Switch to static instance of FastCV on Linux.
+
+Signed-off-by: Alexander Smorkalov <alexander.smorkalov@opencv.ai>
+Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/26917]
+---
+ 3rdparty/fastcv/fastcv.cmake   |  7 ++++---
+ cmake/OpenCVFindLibsPerf.cmake | 21 +++++++++++++++------
+ 2 files changed, 19 insertions(+), 9 deletions(-)
+
+diff --git a/3rdparty/fastcv/fastcv.cmake b/3rdparty/fastcv/fastcv.cmake
+index b8172705ca..5c81c11300 100644
+--- a/3rdparty/fastcv/fastcv.cmake
++++ b/3rdparty/fastcv/fastcv.cmake
+@@ -1,7 +1,7 @@
+ function(download_fastcv root_dir)
+ 
+   # Commit SHA in the opencv_3rdparty repo
+-  set(FASTCV_COMMIT "dc5d58018f3af915a8d209386d2c58c0501c0f2c")
++  set(FASTCV_COMMIT "f4413cc2ab7233fdfc383a4cded402c072677fb0")
+ 
+   # Define actual FastCV versions
+   if(ANDROID)
+@@ -16,14 +16,15 @@ function(download_fastcv root_dir)
+     endif()
+   elseif(UNIX AND NOT APPLE AND NOT IOS AND NOT XROS)
+     if(AARCH64)
+-      set(FCV_PACKAGE_NAME  "fastcv_linux_aarch64_2024_12_11.tgz")
+-      set(FCV_PACKAGE_HASH  "7b33ad833e6f15ab6d4ec64fa3c17acd")
++      set(FCV_PACKAGE_NAME  "fastcv_linux_aarch64_2025_02_12.tgz")
++      set(FCV_PACKAGE_HASH  "33ac2a59cf3e7d6402eee2e010de1202")
+     else()
+       message("FastCV: fastcv lib for 32-bit Linux is not supported for now!")
+     endif()
+   endif(ANDROID)
+ 
+   # Download Package
++
+   set(OPENCV_FASTCV_URL "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${FASTCV_COMMIT}/fastcv/")
+ 
+   ocv_download( FILENAME        ${FCV_PACKAGE_NAME}
+diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
+index c2380e6ce5..c5fb628c44 100644
+--- a/cmake/OpenCVFindLibsPerf.cmake
++++ b/cmake/OpenCVFindLibsPerf.cmake
+@@ -181,7 +181,14 @@ endif(WITH_KLEIDICV)
+ if(WITH_FASTCV)
+   if((EXISTS ${FastCV_INCLUDE_PATH}) AND (EXISTS ${FastCV_LIB_PATH}))
+     message(STATUS "Use external FastCV ${FastCV_INCLUDE_PATH}, ${FastCV_LIB_PATH}")
+-    set(HAVE_FASTCV TRUE CACHE BOOL "FastCV status")
++    find_library(FASTCV_LIBRARY NAMES "fastcv"
++                 PATHS "${FastCV_LIB_PATH}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    mark_as_advanced(FASTCV_LIBRARY)
++    if (FASTCV_LIBRARY)
++      set(HAVE_FASTCV TRUE CACHE BOOL "FastCV status")
++    else()
++      set(HAVE_FASTCV FALSE CACHE BOOL "FastCV status")
++    endif()
+   else()
+     include("${OpenCV_SOURCE_DIR}/3rdparty/fastcv/fastcv.cmake")
+     set(FCV_ROOT_DIR "${OpenCV_BINARY_DIR}/3rdparty/fastcv")
+@@ -190,13 +197,15 @@ if(WITH_FASTCV)
+       set(FastCV_INCLUDE_PATH "${FCV_ROOT_DIR}/inc" CACHE PATH "FastCV includes directory")
+       set(FastCV_LIB_PATH "${FCV_ROOT_DIR}/libs" CACHE PATH "FastCV library directory")
+       ocv_install_3rdparty_licenses(FastCV "${OpenCV_BINARY_DIR}/3rdparty/fastcv/LICENSE")
+-      install(FILES "${FastCV_LIB_PATH}/libfastcvopt.so"
+-              DESTINATION "${OPENCV_LIB_INSTALL_PATH}" COMPONENT "bin")
++      if(ANDROID)
++        set(FASTCV_LIBRARY "${FastCV_LIB_PATH}/libfastcvopt.so" CACHE PATH "FastCV library")
++        install(FILES "${FASTCV_LIBRARY}" DESTINATION "${OPENCV_LIB_INSTALL_PATH}" COMPONENT "bin")
++      else()
++        set(FASTCV_LIBRARY "${FastCV_LIB_PATH}/libfastcv.a" CACHE PATH "FastCV library")
++        install(FILES "${FASTCV_LIBRARY}" DESTINATION "${OPENCV_LIB_INSTALL_PATH}" COMPONENT "dev")
++      endif()
+     else()
+       set(HAVE_FASTCV FALSE CACHE BOOL "FastCV status")
+     endif()
+   endif()
+-  if(HAVE_FASTCV)
+-    set(FASTCV_LIBRARY "${FastCV_LIB_PATH}/libfastcvopt.so" CACHE PATH "FastCV library")
+-  endif()
+ endif(WITH_FASTCV)
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-core-fixed-VSX-intrinsics-implementation.patch b/meta-oe/recipes-support/opencv/opencv/0001-core-fixed-VSX-intrinsics-implementation.patch
new file mode 100644
index 0000000000..9fc89e4244
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/0001-core-fixed-VSX-intrinsics-implementation.patch
@@ -0,0 +1,61 @@
+From 97f3f390661f2fd1168336820b89eb4383ce8528 Mon Sep 17 00:00:00 2001
+From: Maksim Shabunin <maksim.shabunin@gmail.com>
+Date: Fri, 10 Jan 2025 18:34:11 +0300
+Subject: [PATCH] core: fixed VSX intrinsics implementation
+
+Upstream-Status: Backport
+[https://github.com/opencv/opencv/commit/97f3f390661f2fd1168336820b89eb4383ce8528]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ modules/core/include/opencv2/core/hal/intrin_vsx.hpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/modules/core/include/opencv2/core/hal/intrin_vsx.hpp b/modules/core/include/opencv2/core/hal/intrin_vsx.hpp
+index 2157e1e870..0a0915a22f 100644
+--- a/modules/core/include/opencv2/core/hal/intrin_vsx.hpp
++++ b/modules/core/include/opencv2/core/hal/intrin_vsx.hpp
+@@ -262,7 +262,7 @@ OPENCV_HAL_IMPL_VSX_EXTRACT_N(v_float64x2, double)
+ inline _Tpvec v_setzero_##suffix() { return _Tpvec(vec_splats((_Tp)0)); }             \
+ inline _Tpvec v_setall_##suffix(_Tp v) { return _Tpvec(vec_splats((_Tp)v));}          \
+ template <> inline _Tpvec v_setzero_() { return v_setzero_##suffix(); }               \
+-template <> inline _Tpvec v_setall_(_Tp v) { return v_setall_##suffix(_Tp v); }       \
++template <> inline _Tpvec v_setall_(_Tp v) { return v_setall_##suffix(v); }       \
+ template<typename _Tpvec0> inline _Tpvec v_reinterpret_as_##suffix(const _Tpvec0 &a)  \
+ { return _Tpvec((cast)a.val); }
+ 
+@@ -650,11 +650,11 @@ OPENCV_HAL_IMPL_VSX_SELECT(v_float64x2, vec_bdword2_c)
+ #define OPENCV_HAL_IMPL_VSX_INT_CMP_OP(_Tpvec)                 \
+ inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b)           \
+ { return _Tpvec(vec_cmpeq(a.val, b.val)); }                    \
+-inline _Tpvec V_ne(const _Tpvec& a, const _Tpvec& b)           \
++inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b)           \
+ { return _Tpvec(vec_cmpne(a.val, b.val)); }                    \
+ inline _Tpvec v_lt(const _Tpvec& a, const _Tpvec& b)           \
+ { return _Tpvec(vec_cmplt(a.val, b.val)); }                    \
+-inline _Tpvec V_gt(const _Tpvec& a, const _Tpvec& b)           \
++inline _Tpvec v_gt(const _Tpvec& a, const _Tpvec& b)           \
+ { return _Tpvec(vec_cmpgt(a.val, b.val)); }                    \
+ inline _Tpvec v_le(const _Tpvec& a, const _Tpvec& b)           \
+ { return _Tpvec(vec_cmple(a.val, b.val)); }                    \
+@@ -1507,7 +1507,7 @@ inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b, cons
+ inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b)
+ { return v_dotprod(a, b); }
+ inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
+-{ return v_int32x4(vec_msum(a.val, b.val, vec_int4_z)) + c; }
++{ return v_add(v_int32x4(vec_msum(a.val, b.val, vec_int4_z)), c); }
+ // 32 >> 64
+ inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b)
+ { return v_dotprod(a, b); }
+@@ -1518,7 +1518,7 @@ inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b, const v_
+ inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b)
+ { return v_dotprod_expand(a, b); }
+ inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
+-{ return v_uint32x4(vec_msum(a.val, b.val, vec_uint4_z)) + c; }
++{ return v_add(v_uint32x4(vec_msum(a.val, b.val, vec_uint4_z)), c); }
+ 
+ inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b)
+ {
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/opencv/opencv_4.9.0.bb b/meta-oe/recipes-support/opencv/opencv_4.11.0.bb
index cf836d3ecf..826eff30ca 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.9.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.11.0.bb
@@ -10,31 +10,35 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
 
 DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
 
-SRCREV_opencv = "dad8af6b17f8e60d7b95a1203a1b4d22f56574cf"
-SRCREV_contrib = "c7602a8f74205e44389bd6a4e8d727d32e7e27b4"
+SRCREV_opencv = "31b0eeea0b44b370fd0712312df4214d4ae1b158"
+SRCREV_contrib = "0e5254ebf54d2aed6e7eaf6660bf3b797cf50a02"
 SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
 SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
 SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"
 SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252"
+SRCREV_fastcv = "8d86e68dad8b80b8575a8d3cf401d3ee96c24148"
 
 
-SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg"
+SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg_fastcv"
 SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https \
-           git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=4.x;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \
-           git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \
+           git://github.com/opencv/opencv_contrib.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/contrib;name=contrib;branch=4.x;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/boostdesc;name=boostdesc;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/vgg;name=vgg;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/face;name=face;protocol=https \
+           git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/wechat_qrcode;name=wechat-qrcode;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=fastcv/4.x_20250410;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/fastcv;name=fastcv;protocol=https  \
            file://0003-To-fix-errors-as-following.patch \
            file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
            file://0001-Dont-use-isystem.patch \
            file://download.patch \
            file://0001-Make-ts-module-external.patch \
            file://0008-Do-not-embed-build-directory-in-binaries.patch \
+           file://0001-core-fixed-VSX-intrinsics-implementation.patch \
+           file://0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch \
+           file://0001-FROMLIST-FastCV-latest-libs-hash-update.patch \
            "
 SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"
 
-S = "${WORKDIR}/git"
 
 # OpenCV wants to download more files during configure.  We download these in
 # do_fetch and construct a source cache in the format it expects
@@ -60,6 +64,7 @@ do_unpack_extra() {
     cache data ${S}/face/*.dat
     cache wechat_qrcode ${S}/wechat_qrcode/*.caffemodel
     cache wechat_qrcode ${S}/wechat_qrcode/*.prototxt
+    cache fastcv ${S}/fastcv/fastcv/*.tgz
 }
 addtask unpack_extra after do_unpack before do_patch
 
@@ -86,7 +91,7 @@ EXTRA_OECMAKE:append:x86 = " -DX86=ON"
 EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1"
 
 PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
+    ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \
     ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}"
 
 # TBB does not build for powerpc so disable that package config
@@ -113,20 +118,21 @@ PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtu
 PACKAGECONFIG[openvino] = "-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine"
 PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native,"
 PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
-PACKAGECONFIG[python3] = "-DPYTHON3_INCLUDE_PATH=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} -DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy,"
+PACKAGECONFIG[python3] = "-DPYTHON3_INCLUDE_PATH=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} -DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/_core/include,,python3-numpy,"
 PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,"
 PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,"
 PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,,"
 PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract,"
 PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,"
 PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,"
+PACKAGECONFIG[fastcv] = "-DWITH_FASTCV=ON ,-DWITH_FASTCV=OFF,,"
 
 inherit pkgconfig cmake setuptools3-base python3native
 
-export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}"
-export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java"
-export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native"
-export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/"
+export PYTHON_CSPEC = "-I${STAGING_INCDIR}/${PYTHON_DIR}"
+export ORACLE_JAVA_HOME = "${STAGING_DIR_NATIVE}/usr/bin/java"
+export JAVA_HOME = "${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native"
+export ANT_DIR = "${STAGING_DIR_NATIVE}/usr/share/ant/"
 
 TARGET_CC_ARCH += "-I${S}/include "
 
@@ -207,4 +213,10 @@ do_install:append() {
     if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then
         rm -rf ${D}${bindir}/setup_vars_opencv4.sh
     fi
+
+    for fn in arithm.vsx3.cpp convert.vsx3.cpp; do
+        if [ -f ${B}/modules/core/$fn ]; then
+            sed -i -e 's,${S},/usr/src/debug/${PN}/${PV},g' ${B}/modules/core/$fn
+        fi
+    done
 }
diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb b/meta-oe/recipes-support/openldap/openldap_2.6.10.bb
index c229667d68..9ef4a83584 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.6.10.bb
@@ -4,10 +4,10 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
 # The OpenLDAP Public License - see the HOMEPAGE - defines
 # the license.  www.openldap.org claims this is Open Source
 # (see http://www.openldap.org), the license appears to be
-# basically BSD.  opensource.org does not record this license
-# at present (so it is apparently not OSI certified).
-LICENSE = "OpenLDAP"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \
+# basically BSD.  opensource.org has listed this license
+# since August 2019.
+LICENSE = "OLDAP-2.8"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a41b4ed95ab4a20f366a8d82536afe4 \
                     file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
                     "
 SECTION = "libs"
@@ -21,7 +21,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
     file://0001-build-top.mk-unset-STRIP_OPTS.patch \
 "
 
-SRC_URI[sha256sum] = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930"
+SRC_URI[sha256sum] = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516"
 
 DEPENDS = "util-linux groff-native"
 
diff --git a/meta-oe/recipes-support/opensc/opensc_0.25.1.bb b/meta-oe/recipes-support/opensc/opensc_0.26.1.bb
index 19fb78092e..78258c965a 100644
--- a/meta-oe/recipes-support/opensc/opensc_0.25.1.bb
+++ b/meta-oe/recipes-support/opensc/opensc_0.26.1.bb
@@ -5,24 +5,24 @@ functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO\
 keys on the smart card is possible with PKCS\
 such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\
 eID cards have also been confirmed to work."
-
 HOMEPAGE = "https://github.com/OpenSC/OpenSC/wiki"
 SECTION = "System Environment/Libraries"
-LICENSE = "LGPL-2.0-or-later"
+LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7"
+DEPENDS = "openssl"
+
+SRCREV = "043343d2df7b09d1938bc3dc313d86a96be457cc"
+SRC_URI = "git://github.com/OpenSC/OpenSC;branch=0.26.1;protocol=https"
+
+CVE_STATUS[CVE-2024-8443] = "fixed-version: this is fixed since 0.26.0"
 
-#v0.21.0
-SRCREV = "0a4b772d6fdab9bfaaa3123775a48a7cb6c5e7c6"
-SRC_URI = "git://github.com/OpenSC/OpenSC;branch=stable-0.25;protocol=https"
-DEPENDS = "virtual/libiconv openssl"
 
-S = "${WORKDIR}/git"
 inherit autotools pkgconfig bash-completion
 
 EXTRA_OECONF = " \
-    --disable-static \
     --disable-ctapi \
     --disable-doc \
+    --disable-static \
     --disable-strict \
 "
 EXTRA_OEMAKE = "DESTDIR=${D}"
@@ -31,12 +31,10 @@ PACKAGECONFIG ??= "pcsc"
 
 PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct"
 PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite,pcsc-lite pcsc-lite-lib"
-
-RDEPENDS:${PN} = "readline"
+PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
 
 FILES:${PN} += "\
     ${libdir}/opensc-pkcs11.so \
-    ${libdir}/onepin-opensc-pkcs11.so \
     ${libdir}/pkcs11-spy.so \
 "
 FILES:${PN}-dev += "\
diff --git a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
index 1c5a18e863..02815ec7ba 100644
--- a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
+++ b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
@@ -8,10 +8,9 @@ DEPENDS = "expat"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libwbxml/libwbxml-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "f5031e9f730ffd9dc6a2d1ded585e1d1"
 SRC_URI[sha256sum] = "a057daa098f12838eb4e635bb28413027f1b73819872c3fbf64e3207790a3f7d"
 
-S = "${WORKDIR}/libwbxml-${PV}"
+S = "${UNPACKDIR}/libwbxml-${PV}"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb
deleted file mode 100644
index 88033e58cc..0000000000
--- a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Open Telemetry Library"
-DESCRIPTION = "An Observability framework to create and manage telemetry data \
-such as traces, metrics, and logs."
-HOMEPAGE = "https://github.com/open-telemetry/opentelemetry-cpp"
-SECTION = "libs"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-DEPENDS = "nlohmann-json"
-
-SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;"
-SRCREV = "054b0dc207c1f58e290d78cdaac5f314bc328b31"
-
-S = "${WORKDIR}/git"
-inherit cmake pkgconfig lib_package
-
-PACKAGECONFIG ?= "opentelemety_install otlp_api"
-
-PACKAGECONFIG[opentelemety_install]="-DOPENTELEMETRY_INSTALL=ON,-DOPENTELEMETRY_INSTALL=OFF"
-PACKAGECONFIG[build_package]="-DBUILD_PACKAGE=ON,-DBUILD_PACKAGE=OFF"
-PACKAGECONFIG[otlp_api]="-DWITH_OTLP_API=ON,-DWITH_OTLP_API=OFF"
-PACKAGECONFIG[otlp_grpc]="-DWITH_OTLP_GRPC=ON,-DWITH_OTLP_GRPC=OFF"
-PACKAGECONFIG[otlp_http]="-DWITH_OTLP_HTTP=ON,-DWITH_OTLP_HTTP=OFF"
-PACKAGECONFIG[otlp_prometheus]="-DWITH_PROMETHEUS=ON,-DWITH_PROMETHEUS=OFF"
-PACKAGECONFIG[benchmark]="-DWITH_BENCHMARK=ON,-DWITH_BENCHMARK=OFF"
-PACKAGECONFIG[testing]="-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF"
diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.20.0.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.20.0.bb
new file mode 100644
index 0000000000..eb108c177c
--- /dev/null
+++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.20.0.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Open Telemetry Library"
+DESCRIPTION = "An Observability framework to create and manage telemetry data \
+such as traces, metrics, and logs."
+HOMEPAGE = "https://github.com/open-telemetry/opentelemetry-cpp"
+SECTION = "libs"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+DEPENDS = "nlohmann-json"
+SRC_URI = "gitsm://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "6175aa0b213eea053247e43b4f35b8d201fa356e"
+
+inherit cmake pkgconfig lib_package
+
+LDFLAGS:append:riscv32 = " -latomic"
+
+EXTRA_OECMAKE:append = " -DPROTOBUF_PROTOC_EXECUTABLE=${RECIPE_SYSROOT_NATIVE}${bindir}/protoc \
+                         -DOTELCPP_VERSIONED_LIBS=ON \
+                         -DBUILD_SHARED_LIBS=ON "
+
+PACKAGECONFIG ?= "opentelemetry_install otlp_api"
+
+PACKAGECONFIG[opentelemetry_install] = "-DOPENTELEMETRY_INSTALL=ON, -DOPENTELEMETRY_INSTALL=OFF"
+PACKAGECONFIG[otlp_api] = "-DWITH_OTLP_API=ON, -DWITH_OTLP_API=OFF"
+PACKAGECONFIG[otlp_grpc] = "-DWITH_OTLP_GRPC=ON -DWITH_ABSEIL=ON, -DWITH_OTLP_GRPC=OFF, grpc grpc-native protobuf-native"
+PACKAGECONFIG[otlp_http] = "-DWITH_OTLP_HTTP=ON -DWITH_ABSEIL=ON, -DWITH_OTLP_HTTP=OFF, protobuf protobuf-native curl"
+PACKAGECONFIG[otlp_prometheus] = "-DWITH_PROMETHEUS=ON -DUSE_THIRDPARTY_LIBRARIES=OFF, \
+                                -DWITH_PROMETHEUS=OFF, civetweb curl"
+PACKAGECONFIG[benchmark] = "-DWITH_BENCHMARK=ON, -DWITH_BENCHMARK=OFF"
+PACKAGECONFIG[testing] = "-DBUILD_TESTING=ON, -DBUILD_TESTING=OFF, gtest"
diff --git a/meta-oe/recipes-support/p910nd/p910nd_0.97.bb b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb
index c6a3079ea2..0b5740c161 100644
--- a/meta-oe/recipes-support/p910nd/p910nd_0.97.bb
+++ b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb
@@ -10,7 +10,6 @@ SRCREV = "57ebc07ad8723ea4106090536c58c7f7160743e2"
 SRC_URI = "git://github.com/kenyapcomau/p910nd;protocol=https;branch=master \
            file://fix-var-lock.patch"
 
-S = "${WORKDIR}/git"
 
 inherit update-rc.d
 
diff --git a/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp-native_6.3.7.bb
index 2f37b099b4..806ef668e2 100644
--- a/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb
+++ b/meta-oe/recipes-support/pcp/pcp-native_6.3.7.bb
@@ -44,5 +44,6 @@ do_install () {
     PCP_LIBADM_DIR=${D}/${libdir} \
     PCP_LIB_DIR=${D}/${libdir} \
     PCP_MAN_DIR=${D}/${mandir} \
-    PCP_DOC_DIR=${D}/${docdir} 
+    PCP_DOC_DIR=${D}/${docdir} \
+    PCP_SYSTEMDUNIT_DIR=${D}${systemd_system_unitdir}
 }
diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc
index 4cafa7234b..c54c054cf8 100644
--- a/meta-oe/recipes-support/pcp/pcp.inc
+++ b/meta-oe/recipes-support/pcp/pcp.inc
@@ -7,12 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=37ab75b580d5aad4ada04260efa3702f \
                     "
 COMPATIBLE_HOST:libc-musl = "null"
 
-SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/${BP}.src.tar.gz \
+SRC_URI = "git://github.com/performancecopilot/pcp;branch=stable;protocol=https \
            file://0001-configure-Limit-the-header-search-to-sysroot.patch \
            file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \
            file://config.linux \
            "
-SRC_URI[sha256sum] = "dacf92ba195f1f2ea8f40bf0c455d2cd2456273a1e30dcc3ee5b5bfd099a99ee"
+
+SRCREV = "d8d97b79ee47d9dfb076a3242564ed3cae04eba9"
+
 
 inherit setuptools3-base pkgconfig autotools-brokensep
 
@@ -36,5 +38,3 @@ EXTRA_OECONF:append = "\
 PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d"
 
 PACKAGECONFIG ?= ""
-
-PARALLEL_MAKE = ""
diff --git a/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch b/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch
new file mode 100644
index 0000000000..32b9252542
--- /dev/null
+++ b/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch
@@ -0,0 +1,30 @@
+From 4c79ea13b8456155e1acd6a53a2586b6c2c32e05 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 3 May 2025 14:27:30 -0700
+Subject: [PATCH] bind2: Use pmcpp from native builds
+
+This is needed for cross compiling. Fixes
+| ./mk.rewrite
+| ./mk.rewrite: line 41: ../../pmcpp/pmcpp.static: No such file or directory
+| Error: pmcpp failed
+| make[3]: *** [GNUmakefile:54: rewrite.conf] Error 1
+
+Upstream-Status: Inappropriate [Cross-compiling specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/pmdas/bind2/mk.rewrite | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pmdas/bind2/mk.rewrite b/src/pmdas/bind2/mk.rewrite
+index 36e8dc1e61..142a75a824 100755
+--- a/src/pmdas/bind2/mk.rewrite
++++ b/src/pmdas/bind2/mk.rewrite
+@@ -38,7 +38,7 @@ inlist == 1           { print }' \
+     -e 's/[    ][      ]*\([0-9][0-9]*\)/ { pmid -> BIND2.0.\1 }/' \
+ ) >$tmp.tmp
+ 
+-if PCP_CONF=../../include/pcp.conf ../../pmcpp/pmcpp.static -P <$tmp.tmp >>rewrite.conf
++if PCP_CONF=../../include/pcp.conf pmcpp -P <$tmp.tmp >>rewrite.conf
+ then
+     :
+ else
diff --git a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch
index 009dfe2d04..2915d48f04 100644
--- a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch
+++ b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch
@@ -16,14 +16,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  src/pcp/htop/GNUmakefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile
-index 6b7c0c5..5153c63 100644
 --- a/src/pcp/htop/GNUmakefile
 +++ b/src/pcp/htop/GNUmakefile
-@@ -186,8 +186,8 @@ CFGMETERS = $(patsubst %,pcp/meters/%,$(METERS))
- CFGCOLUMNS = $(patsubst %,pcp/columns/%,$(COLUMNS))
+@@ -210,8 +210,8 @@ CFGCOLUMNS = $(patsubst %,pcp/columns/%,
+ CFGSCREENS = $(patsubst %,pcp/screens/%,$(SCREENS))
  
- CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS)
+ CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) $(CFGSCREENS)
 -TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES)
 -SUBXFILES = $(SUBCFILES) $(SUBHFILES)
 +TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES)
@@ -31,6 +29,3 @@ index 6b7c0c5..5153c63 100644
  CFILES = $(TOPCFILES) $(SUBCFILES)
  HFILES = $(TOPHFILES) $(SUBHFILES)
  LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \
--- 
-2.41.0
-
diff --git a/meta-oe/recipes-support/pcp/pcp/0001-pcp-htop-fix-header-build-race-condition.patch b/meta-oe/recipes-support/pcp/pcp/0001-pcp-htop-fix-header-build-race-condition.patch
new file mode 100644
index 0000000000..2c3cf696ed
--- /dev/null
+++ b/meta-oe/recipes-support/pcp/pcp/0001-pcp-htop-fix-header-build-race-condition.patch
@@ -0,0 +1,33 @@
+From d04ea418c5fcfec2f6fbb2dd9f982ddf12c5be87 Mon Sep 17 00:00:00 2001
+From: Yoann Congal <yoann.congal@smile.fr>
+Date: Tue, 3 Jun 2025 10:02:58 +0200
+Subject: [PATCH] pcp-htop: fix header build race condition
+
+.c and .h files are soft-linked before being compiled. Under heavy load
+or a build with a high CPU count, the compilation can start before
+header files are softlinked, resulting in a build error:
+| pcp-htop.c:13:10: fatal error: CommandLine.h: No such file or directory
+|    13 | #include "CommandLine.h"
+|       |          ^~~~~~~~~~~~~~~
+
+Fix this by adding the make dependency between object files and the
+headers.
+
+Upstream-Status: Backport [https://github.com/performancecopilot/pcp/commit/0ca303467ce382127cd9676e288bf7690a93f084]
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+---
+ src/pcp/htop/GNUmakefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile
+index 3e29638d6..898f0b766 100644
+--- a/src/pcp/htop/GNUmakefile
++++ b/src/pcp/htop/GNUmakefile
+@@ -224,6 +224,7 @@ default:    build-me
+ include $(BUILDRULES)
+ 
+ ifeq "$(HAVE_NCURSESW)" "true"
++$(OBJECTS): $(HFILES)
+ build-me: $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) $(CMDTARGET) $(DISTLINKS) $(MAN_PAGES)
+ 
+ install: default
diff --git a/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch
index 9cb649a594..7bc045949b 100644
--- a/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch
+++ b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch
@@ -1,13 +1,113 @@
-Upstream-Status: Pending
+From 92add24ccfc7e643349a1c091957595ce25a9915 Mon Sep 17 00:00:00 2001
+From: Yoann Congal <yoann.congal@smile.fr>
+Date: Tue, 27 May 2025 08:45:36 +0200
+Subject: [PATCH] QA: cleanup localconfig.h build dependencies
 
+Some QA binaries include localconfig.h but there is no explicit dependencies
+between the binary build and the localconfig.h generation.
+On heavily loaded systems, this can result in the binary being built
+before localconf.h and a compilation error, e.g:
+| username.c:8:10: fatal error: localconfig.h: No such file or directory
+|     8 | #include "localconfig.h"
+|       |          ^~~~~~~~~~~~~~~
+| compilation terminated.
+
+This can be reproduced by adding "sleep 30" at the start of the
+localconfig.h generation rule.
+
+Fix this by adding the missing Makefile rule dependency between the
+binary (or its pre-link .o) and localconfig.h.
+
+Also remove an un-needed scale.o->localconfig.h dependency.
+
+Upstream-Status: Backport [https://github.com/performancecopilot/pcp/commit/8de7bbb06703f224b72fe0994acde3189b742fd2]
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+---
+ qa/src/GNUlocaldefs | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/qa/src/GNUlocaldefs b/qa/src/GNUlocaldefs
+index f83826068..e47fbfd72 100644
 --- a/qa/src/GNUlocaldefs
 +++ b/qa/src/GNUlocaldefs
-@@ -728,7 +728,7 @@ scale.o:    localconfig.h
+@@ -299,7 +299,7 @@ diowr:      diowr.c
+        rm -f $@
+        $(CCF) $(CDEFS) -o $@ diowr.c
+ 
+-endian:        endian.c
++endian:        endian.c localconfig.h
+        rm -f $@
+        $(CCF) $(CDEFS) -o $@ endian.c
+ 
+@@ -331,15 +331,15 @@ exercise: exercise.c
+        rm -f $@
+        $(CCF) $(CDEFS) -o $@ exercise.c $(LDLIBS)
+ 
+-chkacc1:       chkacc1.c
++chkacc1:       chkacc1.c localconfig.h
+        rm -f $@
+        $(CCF) $(CDEFS) -o $@ chkacc1.c $(LDLIBS)
+ 
+-chkacc2:       chkacc2.c
++chkacc2:       chkacc2.c localconfig.h
+        rm -f $@
+        $(CCF) $(CDEFS) -o $@ chkacc2.c $(LDLIBS)
+ 
+-chkacc3:       chkacc3.c
++chkacc3:       chkacc3.c localconfig.h
+        rm -f $@
+        $(CCF) $(CDEFS) -o $@ chkacc3.c $(LDLIBS)
+ 
+@@ -489,7 +489,7 @@ pmdashutdown:       pmdashutdown.c
+        rm -f $@
+        $(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
+ 
+-dumb_pmda: dumb_pmda.c
++dumb_pmda: dumb_pmda.c localconfig.h
+        $(CCF) $(LCDEFS) $(LCOPTS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
+ 
+ pmdacache: pmdacache.c
+@@ -633,7 +633,7 @@ else
+        $(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
+ endif
+ 
+-multithread2:  multithread2.c
++multithread2:  multithread2.c localconfig.h
+        rm -f $@
+        $(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
+ 
+@@ -786,7 +786,6 @@ $(NVIDIAQALIB):     nvidia-ml.o
+ endif
+ 
+ arch_maxfd.o:  localconfig.h
+-scale.o:       localconfig.h
+ 
  779246.o:      libpcp.h
  aggrstore.o:   libpcp.h
- badmmv.o:      libpcp.h
--chkacc1.o:     libpcp.h
-+chkacc1.o:     libpcp.h localconfig.h
- chkacc2.o:     libpcp.h
- chkacc3.o:     libpcp.h
- chkacc4.o:     libpcp.h
+@@ -847,14 +846,14 @@ multithread14.o:  libpcp.h
+ nameall.o:     libpcp.h
+ parsehostattrs.o:      libpcp.h
+ parsehostspec.o:       libpcp.h
+-pdubufbounds.o:        libpcp.h
+-pducheck.o:    libpcp.h
++pdubufbounds.o:        libpcp.h localconfig.h
++pducheck.o:    libpcp.h localconfig.h
+ pducrash.o:    libpcp.h
+-pdu-server.o:  libpcp.h
++pdu-server.o:  libpcp.h localconfig.h
+ pmcdgone.o:    libpcp.h
+ pmlcmacro.o:   libpcp.h
+ pmnsinarchives.o:      libpcp.h
+-pmnsunload.o:  libpcp.h
++pmnsunload.o:  libpcp.h localconfig.h
+ proc_test.o:   libpcp.h
+ qa_libpcp_compat.o:    libpcp.h
+ qa_timezone.o: libpcp.h
+@@ -874,6 +873,7 @@ torture_pmns.o:     libpcp.h
+ tztest.o:      libpcp.h
+ unpack.o:      libpcp.h
+ unpickargs.o:  libpcp.h
++username.o:    localconfig.h
+ xarch.o:       libpcp.h
+ xlog.o:        libpcp.h
+ xmktime.o:     libpcp.h
diff --git a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp_6.3.7.bb
index 10545b65ea..65efac06be 100644
--- a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb
+++ b/meta-oe/recipes-support/pcp/pcp_6.3.7.bb
@@ -13,12 +13,17 @@ DEPENDS += "perl-native bison-native flex-native python3-native python3-setuptoo
 SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \
             file://pass-options-to-AR.patch \
             file://fix_parallel_make.patch \
+                        file://0001-bind2-Use-pmcpp-from-native-builds.patch \
+            file://0001-pcp-htop-fix-header-build-race-condition.patch \
            "
 
-export PCP_DIR="${RECIPE_SYSROOT_NATIVE}"
-#export PCP_RUN_DIR="${RECIPE_SYSROOT_NATIVE}"
-EXTRA_OEMAKE = "CC="${CC}" LD="${LD}""
-inherit useradd systemd features_check python3targetconfig
+export PCP_DIR = "${RECIPE_SYSROOT_NATIVE}"
+#export PCP_RUN_DIR = "${RECIPE_SYSROOT_NATIVE}"
+EXTRA_OEMAKE = '\
+        CC="${CC}" LD="${LD}" CROSS_COMPILING="yes" \
+    PCP_SYSTEMDUNIT_DIR=${systemd_system_unitdir} \
+'
+inherit useradd systemd features_check python3targetconfig gtk-icon-cache
 
 # Needs libx11
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -48,6 +53,7 @@ USERADD_PARAM:${PN}-testsuite = "--system --home ${localstatedir}/lib/pcp/testsu
                        --user-group pcpqa"
 
 RDEPENDS:${PN} += "perl"
+RDEPENDS:${PN}-xsos += "${PN} bash"
 RDEPENDS:${PN}-testsuite += "${PN} bash perl"
 RDEPENDS:python3-${PN} += "${PN} python3"
 
@@ -69,6 +75,7 @@ do_compile:prepend() {
                 ${S}/src/include/builddefs
         sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile
         export PYTHON=python3
+        export PATH=${PATH}:${RECIPE_SYSROOT_NATIVE}${libexecdir}/pcp/bin
         #export PYTHON3=${STAGING_BINDIR_NATIVE}/python3-native/python3
 }
 
@@ -85,17 +92,18 @@ do_install () {
         rm -rf ${D}${localstatedir}/lib/pcp/pmcd
         rm -rf ${D}${localstatedir}/lib/pcp/tmp
         rm -rf ${D}${localstatedir}/run
-        mv ${D}${docdir}/C* ${D}${docdir}/pcp-doc/
-        mv ${D}${docdir}/I* ${D}${docdir}/pcp-doc/
-        mv ${D}${docdir}/R* ${D}${docdir}/pcp-doc/
-        mv ${D}${docdir}/V* ${D}${docdir}/pcp-doc/
         sed -i "s#PCP_AWK_PROG=.*#PCP_AWK_PROG=awk#" ${D}/${sysconfdir}/pcp.conf
         sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf
         sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf
         sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf
+        sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}/${sysconfdir}/pcp.conf
+        sed -i -e 's#${RECIPE_SYSROOT}##g' \
+                -e 's#${RECIPE_SYSROOT_NATIVE}##g' \
+                -e 's#${TMPDIR}##g' ${D}${includedir}/pcp/builddefs
 }
 
-PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \
+PACKAGE_BEFORE_PN = "${PN}-xsos"
+PACKAGES =+ " ${PN}-export-zabbix-agent ${PN}-testsuite \
         libpcp-gui2  libpcp-gui2-dev \
         libpcp-import1 libpcp-archive1 \
         libpcp-mmv1 libpcp-mmv1-dev \
@@ -105,7 +113,7 @@ PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \
         libpcp3 libpcp3-dev python3-${PN}\
 "
 FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \
-"       
+"
 FILES:libpcp-archive1 = "${libdir}/libpcp_archive.so.1 \
 "       
 FILES:libpcp-gui2-dev = " \
@@ -114,6 +122,8 @@ FILES:libpcp-gui2-dev = " \
         ${includedir}/pmafm.h \
         ${includedir}/pmtime.h \
 "
+INSANE_SKIP:libpcp-gui2-dev = "staticdev"
+
 FILES:libpcp-mmv1 = " \
         ${libdir}/libpcp_mmv.so.1 \
 "
@@ -126,6 +136,8 @@ FILES:libpcp-mmv1-dev = " \
         ${datadir}/man/man3/mmv_* \
         ${datadir}/man/man5/mmv.5.gz \
 "
+INSANE_SKIP:libpcp-mmv1-dev = "staticdev"
+
 FILES:libpcp-import1 = " \
         ${libdir}/libpcp_import.so.1 \
 "
@@ -141,6 +153,8 @@ FILES:libpcp-pmda3-dev = " \
         ${datadir}/man/man3/PMDA.3.gz \
         ${datadir}/man/man3/pmda* \
 "
+INSANE_SKIP:libpcp-pmda3-dev = "staticdev"
+
 FILES:libpcp-trace2 = " \
         ${libdir}/libpcp_trace.so.2 \
 "
@@ -151,6 +165,8 @@ FILES:libpcp-trace2-dev = " \
         ${libdir}/libpcp_trace.so \
         ${datadir}/man/man3/pmtrace* \
 "
+INSANE_SKIP:libpcp-trace2-dev = "staticdev"
+
 FILES:libpcp-web1 = " \
         ${libdir}/libpcp_web.so.1 \
 "
@@ -162,10 +178,15 @@ FILES:libpcp-web1-dev = " \
         ${datadir}/man/man3/pmhttp* \
         ${datadir}/man/man3/pmjson* \
 "
+INSANE_SKIP:libpcp-web1-dev = "staticdev"
+
 FILES:libpcp3 = " \
         ${libdir}/libpcp.so.3 \
 "
 
+FILES:${PN}-xsos = " \
+        ${libexecdir}/pcp/bin/pcp-xsos \
+"
 FILES:${PN} = " \
         ${sysconfdir}/pcp \
         ${sysconfdir}/cron.d \
@@ -175,6 +196,7 @@ FILES:${PN} = " \
         ${datadir}/bash-completion \
         ${datadir}/pcp-gui \
         ${datadir}/zsh \
+        ${datadir}/icons \
         ${systemd_system_unitdir}/ \
         ${libdir}/pcp/ \
         ${libdir}/sysusers.d/pcp.conf \
@@ -188,6 +210,7 @@ FILES:${PN} = " \
         ${localstatedir}/lib/pcp/pmdas/ \
         ${localstatedir}/lib/pcp/pmns \
         ${libdir}/libpcp_fault.so.3 \
+        ${nonarch_libdir}/tmpfiles.d/pcp-reboot-init.conf \
 "
 
 FILES:${PN}-export-zabbix-agent += " \
@@ -196,6 +219,8 @@ FILES:${PN}-export-zabbix-agent += " \
         ${mandir}/man3/zbxpcp.3.gz \
         ${libdir}/zabbix \
 "
+INSANE_SKIP:${PN}-export-zabbix-agent = "dev-so"
+
 FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/ ${libdir}/sysusers.d/pcp-testsuite.conf"
 FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}"
 FILES:${PN}-dev += " \
diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb
index d5a560a6a0..169630d319 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb
@@ -21,7 +21,7 @@ EXTRA_OECONF = " \
     --enable-usbdropdir=${libdir}/pcsc/drivers \
 "
 
-S = "${WORKDIR}/pcsc-lite-${PV}"
+S = "${UNPACKDIR}/pcsc-lite-${PV}"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} udev"
 PACKAGECONFIG:class-native ??= ""
diff --git a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb
index 97a94ec973..14ffab6128 100644
--- a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb
+++ b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb
@@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master"
 
-SRCREV = "53834cd33155ae1f0332102b1baca6ce63660fc5"
+SRCREV = "778da3d86a59f5166443118c158e11ba4da9a5f1"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "pcsc-lite autoconf-archive-native"
 
diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_2024.bb
index cc0d88faca..37cf2d0a4c 100644
--- a/meta-oe/recipes-support/picocom/picocom_git.bb
+++ b/meta-oe/recipes-support/picocom/picocom_2024.bb
@@ -4,17 +4,13 @@ LICENSE = "GPL-2.0-or-later"
 HOMEPAGE = "https://gitlab.com/wsakernel/picocom"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a"
 
-BASEPV = "2023-04"
-PV = "${BASEPV}+git"
-
-SRCREV = "12537df0314767d5af35bddddbbca3694e6a0342"
+SRCREV = "7b6acbd421a2d4ca99376b7b427828dc1bcba4d8"
 
 SRC_URI = "git://gitlab.com/wsakernel/picocom;branch=master;protocol=https \
            "
 
-S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \
+EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${PV}' \
                 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "
 
 do_install () {
diff --git a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
index ad6a7501c5..c547b0532e 100644
--- a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
+++ b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
@@ -10,7 +10,9 @@ inherit pkgconfig
 SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https"
 SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 do_compile() {
     oe_runmake CC="${CC}" CXX="${CXX}" EXTRA_INCLUDES="${TARGET_CFLAGS}" AR="${AR}";
diff --git a/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-oe/recipes-support/pidgin/icyque_git.bb
index ed58c4a76f..e8b4a3c2c3 100644
--- a/meta-oe/recipes-support/pidgin/icyque_git.bb
+++ b/meta-oe/recipes-support/pidgin/icyque_git.bb
@@ -12,7 +12,9 @@ inherit pkgconfig
 SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https"
 SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 do_compile() {
     oe_runmake;
diff --git a/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb
index d17a623063..f2fe4a7a93 100644
--- a/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb
+++ b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb
@@ -15,6 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/pidgin/${BPN}/${PV}/${BP}.tar.xz \
 "
 SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/pidgin/files/libgnt/"
+UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)"
+
 EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false"
 
 FILES:${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so"
diff --git a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
index 115a6968eb..b4f462de83 100644
--- a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
+++ b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
@@ -10,7 +10,6 @@ SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \
            file://0001-tests-Include-missing-sys-socket.h-header.patch \
 "
 
-SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81"
 SRC_URI[sha256sum] = "8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb
index 326c5bfc57..f4c9020dea 100644
--- a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb
@@ -7,7 +7,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "https://otr.cypherpunks.ca/${BP}.tar.gz \
 "
-SRC_URI[md5sum] = "7ef14e1334a4bc80e5d530f9a3cfc626"
 SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4"
 
 FILES:${PN} = "${libdir}/pidgin/*"
diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb
index 6ce42ec187..5fd927bc64 100644
--- a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb
@@ -14,7 +14,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \
            file://0001-Migrate-to-use-g_memdup2.patch \
 "
 
-SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314"
 SRC_URI[sha256sum] = "738b121b11f2b3f1744150c00cb381222eb6cf67161a7742797eb4f03e64a2ba"
 
 PACKAGECONFIG ??= "nss krb5"
@@ -37,3 +36,7 @@ FILES:${PN} += " \
     ${datadir}/appdata \
     ${datadir}/metainfo \
 "
+
+# http://errors.yoctoproject.org/Errors/Details/766947/
+# pidgin-sipe-1.25.0/src/core/sipe-xml.c:210:9: error: initialization of 'void (*)(void *, const xmlError *)' {aka 'void (*)(void *, const struct _xmlError *)'} from incompatible pointer type 'void (*)(void *, xmlError *)' {aka 'void (*)(void *, struct _xmlError *)'} [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch
deleted file mode 100644
index 1c4daa9f67..0000000000
--- a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 43e9db656431ffb22b429d5fca4ce3b4af21bc9e Mon Sep 17 00:00:00 2001
-From: Herrie <github.com@herrie.org>
-Date: Mon, 24 Jul 2017 21:30:16 +0200
-
----
-Upstream-Status: Pending
-
- libpurple/protocols/irc/irc.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libpurple/protocols/irc/irc.h b/libpurple/protocols/irc/irc.h
-index 596ddaf..b70f3a9 100644
---- a/libpurple/protocols/irc/irc.h
-+++ b/libpurple/protocols/irc/irc.h
-@@ -40,9 +40,9 @@
- 
- #define IRC_DEFAULT_CHARSET "UTF-8"
- #define IRC_DEFAULT_AUTODETECT FALSE
--#define IRC_DEFAULT_ALIAS "purple"
-+#define IRC_DEFAULT_ALIAS "OE-user"
- 
--#define IRC_DEFAULT_QUIT "Leaving."
-+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
- 
- #define IRC_BUFSIZE_INCREMENT 1024
- #define IRC_MAX_BUFSIZE 16384
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb
index ae251b5a08..13a22f6e59 100644
--- a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb
@@ -10,10 +10,9 @@ inherit autotools gettext pkgconfig gconf perlnative python3native
 SRC_URI = "\
     ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
     file://sanitize-configure.ac.patch \
-    file://purple-OE-branding-25.patch \
 "
 
-SRC_URI[sha256sum] = "19654ad276b149646371fbdac21bc7620742f2975f7399fed0ffc1a18fbaf603"
+SRC_URI[sha256sum] = "0ffc9994def10260f98a55cd132deefa8dc4a9835451cc0e982747bd458e2356"
 
 CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
 CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
@@ -21,7 +20,6 @@ CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't
 PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \
 "
-PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2"
 #  --disable-gstreamer     compile without GStreamer audio support
 #  --disable-gstreamer-video
 #                          compile without GStreamer 1.0 Video Overlay support
@@ -29,8 +27,7 @@ PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2"
 #                          compile without GStreamer 0.10 interface support
 #  --with-gstreamer=<version>
 #                          compile with GStreamer 0.10 or 1.0 interface
-PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer"
-PACKAGECONFIG[vv] = "--enable-vv,--disable-vv,gstreamer"
+PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer1.0"
 PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn"
 PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+"
 PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11"
@@ -51,10 +48,19 @@ EXTRA_OECONF = " \
     --disable-meanwhile \
     --disable-nm \
     --disable-screensaver \
+    --disable-farstream \
+    --disable-vv \
 "
 
-OE_LT_RPATH_ALLOW=":${libdir}/purple-2:"
-OE_LT_RPATH_ALLOW[export]="1"
+# CONFIG_ARGS is used to display build info. Replace full paths by reproducible
+# variables ($S, $WORKDIR)
+do_configure:append() {
+    sed -i -e "/CONFIG_ARGS/s|${S}|\$S|g" ${B}/config.h
+    sed -i -e "/CONFIG_ARGS/s|${WORKDIR}|\$WORKDIR|g" ${B}/config.h
+}
+
+OE_LT_RPATH_ALLOW = ":${libdir}/purple-2:"
+OE_LT_RPATH_ALLOW[export] = "1"
 
 PACKAGES =+ "libpurple-dev libpurple finch finch-dev ${PN}-data"
 
@@ -73,7 +79,7 @@ FILES:finch          = "${bindir}/finch"
 FILES:finch-dev      = "${libdir}/finch/*.la"
 
 FILES:${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \
-           ${datadir}/applications"
+           ${datadir}/applications ${datadir}/metainfo"
 RRECOMMENDS:${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp"
 
 FILES:${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata"
diff --git a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
index 1981f1ee9c..421b1725ba 100644
--- a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
+++ b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
@@ -10,7 +10,6 @@ inherit pkgconfig
 SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https"
 SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6"
 
-S = "${WORKDIR}/git"
 PV = "1.7+git"
 
 do_compile() {
diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.0.bb
index 816ee967c1..a403289cfc 100644
--- a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb
+++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.0.bb
@@ -11,17 +11,18 @@ SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45"
 DEPENDS = "\
-    autoconf-archive \
     openssl \
     p11-kit \
 "
 
-SRCREV = "58040b4e32975cc1d7f39e424ee7b0097cd11311"
+SRCREV = "8f6b94409d4872265076df310492da1e5f6abdf7"
 
 SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https"
 
-S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
+inherit meson pkgconfig
+
+# Overwrite default pkcs11 module path
+#EXTRA_OEMESON += "-Ddefault_pkcs11_module=/path/to/mymodule.so"
 
 FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so"
diff --git a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
index 19da947d04..3bd2f414d7 100644
--- a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
+++ b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
@@ -10,9 +10,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/png-mng/${BPN}/${PV}/${BPN}-${PV}.tar.g
            file://0001-make-Respect-variables-from-environement.patch \
            "
 
-SRC_URI[md5sum] = "980bd6d9a3830fdce746d7fe3c9166ee"
 SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/png-mng/files/pngcheck/"
+UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
+
 CFLAGS += "-DUSE_ZLIB"
 
 EXTRA_OEMAKE = "-f ${S}/Makefile.unx"
diff --git a/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch b/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch
new file mode 100644
index 0000000000..d976a1f83b
--- /dev/null
+++ b/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch
@@ -0,0 +1,59 @@
+From 03c35cff930e421199b586c33a00eb6cc537ba28 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Thu, 19 Sep 2024 09:36:48 +0100
+Subject: [PATCH] SimpleRowFormatter.h: fix the build on `gcc-15` (unsatisfied
+ `noexcept`)
+
+On today's `gcc-15` poco fails to build as:
+
+    In file included from /build/source/Data/include/Poco/Data/Statement.h:27,
+                     from /build/source/Data/include/Poco/Data/Session.h:23,
+                     from /build/source/Data/include/Poco/Data/ArchiveStrategy.h:22,
+                     from /build/source/Data/src/ArchiveStrategy.cpp:15:
+    /build/source/Data/include/Poco/Data/SimpleRowFormatter.h:114:21: error: declaration of 'std::_Require<std::__not_<std::__is_tuple_like<_Tp> >, std::is_move_construc
+    tible<_Tp>, std::is_move_assignable<_Tp> > std::swap(_Tp&, _Tp&) noexcept [with _Tp = Poco::Data::SimpleRowFormatter; _Require<__not_<__is_tuple_like<_Tp> >, is_move_constructible<_Tp>, is_move_assignable<_Tp> > = void]' has a different exception specifier
+      114 |         inline void swap<Poco::Data::SimpleRowFormatter>(Poco::Data::SimpleRowFormatter& s1,
+          |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    In file included from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/new_allocator.h:36,
+                     from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/x86_64-unknown-linux-gnu/bits/c++allocator.h:33,
+                     from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/allocator.h:46,
+                     from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/string:43,
+                     from /build/source/Foundation/include/Poco/Foundation.h:94,
+                     from /build/source/Data/include/Poco/Data/Data.h:23,
+                     from /build/source/Data/include/Poco/Data/ArchiveStrategy.h:21:
+    /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/move.h:214:5: note: from previous declaration 'std::_Require<std::__not_<std::__is_tuple_like<_Tp> >, std::is_move_constructible<_Tp>, std::is_move_assignable<_Tp> > std::swap(_Tp&, _Tp&) noexcept (false) [with _Tp = Poco::Data::SimpleRowFormatter; _Require<__not_<__is_tuple_like<_Tp> >, is_move_constructible<_Tp>, is_move_assignable<_Tp> > = void]'
+      214 |     swap(_Tp& __a, _Tp& __b)
+          |     ^~~~
+
+Possibly because `SimpleRowFormatter` does not have constructors and
+assignment operators that involve rvalue references?
+
+Updated `noexcept` condition. Fixes the build on` gcc-15`. Still
+compiles on `gcc-13`.
+
+Upstream-Status: Backport [03c35cf SimpleRowFormatter.h: fix the build on `gcc-15` (unsatisfied `noexcept`)]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ Data/include/Poco/Data/SimpleRowFormatter.h | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/Data/include/Poco/Data/SimpleRowFormatter.h b/Data/include/Poco/Data/SimpleRowFormatter.h
+index 0dcb43b0b..c8417b3a7 100644
+--- a/Data/include/Poco/Data/SimpleRowFormatter.h
++++ b/Data/include/Poco/Data/SimpleRowFormatter.h
+@@ -109,13 +109,10 @@ inline std::streamsize SimpleRowFormatter::getSpacing() const
+ 
+ namespace std
+ {
+-       // Note: for an unknown reason, clang refuses to compile this function as noexcept
+        template<>
+        inline void swap<Poco::Data::SimpleRowFormatter>(Poco::Data::SimpleRowFormatter& s1,
+                Poco::Data::SimpleRowFormatter& s2)
+-#ifndef POCO_COMPILER_CLANG
+-               noexcept
+-#endif
++               noexcept(std::is_nothrow_swappable_v<Poco::Data::SimpleRowFormatter>)
+                /// Full template specalization of std:::swap for SimpleRowFormatter
+        {
+                s1.swap(s2);
+
diff --git a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch b/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch
deleted file mode 100644
index b06135222a..0000000000
--- a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 4cbb225811205b51b65371d0d8abc2d2af8233b6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 26 Jan 2023 14:56:36 -0800
-Subject: [PATCH] Use std::atomic<int> instead of std::atomic<bool>
-
-GCC on RISCV does not yet support inline subword atomics [1]
-Therefore avoid them until fixed
-
-Upstream-Status: Pending
-
-[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104338
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Foundation/include/Poco/AsyncChannel.h | 2 +-
- Foundation/src/AsyncChannel.cpp        | 5 ++---
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/Foundation/include/Poco/AsyncChannel.h b/Foundation/include/Poco/AsyncChannel.h
-index 190bae7dd..d73ea6c72 100644
---- a/Foundation/include/Poco/AsyncChannel.h
-+++ b/Foundation/include/Poco/AsyncChannel.h
-@@ -111,7 +111,7 @@ private:
-        NotificationQueue _queue;
-        std::size_t _queueSize = 0;
-        std::size_t _dropCount = 0;
--       std::atomic<bool> _closed;
-+       std::atomic<int> _closed;
- };
- 
- 
-diff --git a/Foundation/src/AsyncChannel.cpp b/Foundation/src/AsyncChannel.cpp
-index 37cdec477..e829b180c 100644
---- a/Foundation/src/AsyncChannel.cpp
-+++ b/Foundation/src/AsyncChannel.cpp
-@@ -48,11 +48,10 @@ private:
-        Message _msg;
- };
- 
--
- AsyncChannel::AsyncChannel(Channel::Ptr pChannel, Thread::Priority prio):
-        _pChannel(pChannel),
-        _thread("AsyncChannel"),
--       _closed(false)
-+       _closed(0)
- {
-        _thread.setPriority(prio);
- }
-@@ -95,7 +94,7 @@ void AsyncChannel::open()
- 
- void AsyncChannel::close()
- {
--       if (!_closed.exchange(true))
-+       if (!_closed.exchange(1))
-        {
-                if (_thread.isRunning())
-                {
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch b/meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch
new file mode 100644
index 0000000000..e607063d58
--- /dev/null
+++ b/meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch
@@ -0,0 +1,53 @@
+From 6faf90773a7327e54342a5d3caee151623b5caf0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
+Date: Fri, 27 Sep 2024 08:53:18 +0200
+Subject: [PATCH] =?UTF-8?q?fix(Foundation):=20Build=20error=20with=20GCC-1?=
+ =?UTF-8?q?5=20(class=20Poco::PriorityDelegate<TObj,=20void,=20true>?=
+ =?UTF-8?q?=E2=80=99=20has=20no=20member=20named=20=E2=80=98=5FpTarget?=
+ =?UTF-8?q?=E2=80=99)=20(#4695)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [6faf907 fix(Foundation): Build error with GCC-15 (class Poco::PriorityDelegate<TObj, void, true>’ has no member named ‘_pTarget’) (#4695)]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ Foundation/include/Poco/PriorityDelegate.h | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/Foundation/include/Poco/PriorityDelegate.h b/Foundation/include/Poco/PriorityDelegate.h
+index 4cd664aab..cac9cf25e 100644
+--- a/Foundation/include/Poco/PriorityDelegate.h
++++ b/Foundation/include/Poco/PriorityDelegate.h
+@@ -52,7 +52,6 @@ public:
+        {
+                if (&delegate != this)
+                {
+-                       this->_pTarget        = delegate._pTarget;
+                        this->_receiverObject = delegate._receiverObject;
+                        this->_receiverMethod = delegate._receiverMethod;
+                        this->_priority       = delegate._priority;
+@@ -126,7 +125,6 @@ public:
+        {
+                if (&delegate != this)
+                {
+-                       this->_pTarget        = delegate._pTarget;
+                        this->_receiverObject = delegate._receiverObject;
+                        this->_receiverMethod = delegate._receiverMethod;
+                        this->_priority       = delegate._priority;
+@@ -200,7 +198,6 @@ public:
+        {
+                if (&delegate != this)
+                {
+-                       this->_pTarget        = delegate._pTarget;
+                        this->_receiverObject = delegate._receiverObject;
+                        this->_receiverMethod = delegate._receiverMethod;
+                        this->_priority       = delegate._priority;
+@@ -274,7 +271,6 @@ public:
+        {
+                if (&delegate != this)
+                {
+-                       this->_pTarget        = delegate._pTarget;
+                        this->_receiverObject = delegate._receiverObject;
+                        this->_receiverMethod = delegate._receiverMethod;
+                        this->_priority       = delegate._priority;
diff --git a/meta-oe/recipes-support/poco/poco_1.13.3.bb b/meta-oe/recipes-support/poco/poco_1.13.3.bb
index 6ad577b37b..e0f6c4169e 100644
--- a/meta-oe/recipes-support/poco/poco_1.13.3.bb
+++ b/meta-oe/recipes-support/poco/poco_1.13.3.bb
@@ -8,16 +8,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc"
 # These dependencies are required by Foundation
 DEPENDS = "libpcre2 zlib"
 
-SRC_URI = "git://github.com/pocoproject/poco.git;branch=master-unused;protocol=https \
-           file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \
+SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-1.13.3;protocol=https \
            file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \
            file://run-ptest \
+           file://0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch \
+           file://0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch \
            "
-SRCREV = "d6bd48a94c5f03e3c69cac1b024fdad5120e3a7b"
+SRCREV = "7f848d25aa0461d3beeff1189dc61b48ffe8e2f4"
 
 UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
diff --git a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch
index adbe82263f..ab2fbf7d9b 100644
--- a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch
+++ b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch
@@ -40,11 +40,9 @@ Upstream-Status: Pending
  utils/CMakeLists.txt   | 10 +++++-----
  6 files changed, 16 insertions(+), 16 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c6c757c..5f1c540 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS})
+@@ -628,10 +628,10 @@ add_library(poppler ${poppler_SRCS} ${LI
  if (OpenJPEG_FOUND)
    # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed
    # target openjp2 may lack interface include directories
@@ -56,9 +54,7 @@ index c6c757c..5f1c540 100644
 +  target_include_directories(poppler  PRIVATE ${LCMS2_INCLUDE_DIR})
  endif()
  generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h")
- set_target_properties(poppler PROPERTIES VERSION 127.0.0 SOVERSION 127)
-diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
-index 52e8687..08ab39a 100644
+ set_target_properties(poppler PROPERTIES
 --- a/glib/CMakeLists.txt
 +++ b/glib/CMakeLists.txt
 @@ -4,7 +4,7 @@ include_directories(
@@ -66,7 +62,7 @@ index 52e8687..08ab39a 100644
  
  include_directories(
 -  SYSTEM
-+  
++
    ${GLIB2_INCLUDE_DIRS}
    ${CAIRO_INCLUDE_DIRS}
  )
@@ -78,9 +74,7 @@ index 52e8687..08ab39a 100644
 +target_include_directories(poppler-glib  PRIVATE ${CAIRO_INCLUDE_DIRS})
  install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
  
- install(FILES
-diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
-index 5db3a6c..f242d29 100644
+ if (ENABLE_NSS3)
 --- a/qt5/src/CMakeLists.txt
 +++ b/qt5/src/CMakeLists.txt
 @@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS)
@@ -97,8 +91,6 @@ index 5db3a6c..f242d29 100644
  endif()
  install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
  
-diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt
-index cd91975..6c42e12 100644
 --- a/qt6/src/CMakeLists.txt
 +++ b/qt6/src/CMakeLists.txt
 @@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS)
@@ -115,8 +107,6 @@ index cd91975..6c42e12 100644
  endif()
  install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
  
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index afa1352..9bd3b9a 100644
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
 @@ -23,7 +23,7 @@ if (GTK_FOUND)
@@ -146,11 +136,9 @@ index afa1352..9bd3b9a 100644
    endif ()
  endif ()
  
-diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
-index 1c3ebcb..bc1840a 100644
 --- a/utils/CMakeLists.txt
 +++ b/utils/CMakeLists.txt
-@@ -16,7 +16,7 @@ add_executable(pdftoppm ${pdftoppm_SOURCES})
+@@ -18,7 +18,7 @@ add_executable(pdftoppm ${pdftoppm_SOURC
  target_link_libraries(pdftoppm ${common_libs})
  if(LCMS2_FOUND)
    target_link_libraries(pdftoppm ${LCMS2_LIBRARIES})
@@ -159,7 +147,7 @@ index 1c3ebcb..bc1840a 100644
  endif()
  install(TARGETS pdftoppm DESTINATION bin)
  install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
-@@ -37,10 +37,10 @@ if (HAVE_CAIRO)
+@@ -39,10 +39,10 @@ if (HAVE_CAIRO)
    add_definitions(${CAIRO_CFLAGS})
    add_executable(pdftocairo ${pdftocairo_SOURCES})
    target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs})
@@ -172,16 +160,16 @@ index 1c3ebcb..bc1840a 100644
    endif()
    install(TARGETS pdftocairo DESTINATION bin)
    install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
-@@ -99,7 +99,7 @@ if (ENABLE_NSS3)
-     pdfsig.cc
-   )
+@@ -109,7 +109,7 @@ if (ENABLE_SIGNATURES)
    add_executable(pdfsig ${pdfsig_SOURCES})
--  target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS})
-+  target_include_directories(pdfsig  PRIVATE ${NSS3_INCLUDE_DIRS})
    target_link_libraries(pdfsig ${common_libs})
-   install(TARGETS pdfsig DESTINATION bin)
-   install(FILES pdfsig.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
-@@ -114,7 +114,7 @@ add_executable(pdftops ${pdftops_SOURCES})
+   if (ENABLE_NSS3)
+-    target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS})
++    target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS})
+   endif()
+   if (Intl_FOUND)
+     target_link_libraries(pdfsig Intl::Intl)
+@@ -127,7 +127,7 @@ add_executable(pdftops ${pdftops_SOURCES
  target_link_libraries(pdftops ${common_libs})
  if(LCMS2_FOUND)
    target_link_libraries(pdftops ${LCMS2_LIBRARIES})
diff --git a/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch b/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch
deleted file mode 100644
index cc942fad77..0000000000
--- a/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 591235c8b6c65a2eee88991b9ae73490fd9afdfe Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Fri, 18 Aug 2023 11:36:06 +0000
-Subject: [PATCH] OutlineItem::open: Fix crash on malformed files
-
-Fixes #1399
-
-CVE: CVE-2023-34872
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/poppler/poppler/-/commit/591235c8b6c65a2eee88991b9ae73490fd9afdfe]
-
-Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
----
- poppler/Outline.cc | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/poppler/Outline.cc b/poppler/Outline.cc
-index cbb6cb4..4c68be9 100644
---- a/poppler/Outline.cc
-+++ b/poppler/Outline.cc
-@@ -14,7 +14,7 @@
- // under GPL version 2 or later
- //
- // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
--// Copyright (C) 2008, 2016-2019, 2021 Albert Astals Cid <aacid@kde.org>
-+// Copyright (C) 2008, 2016-2019, 2021, 2023 Albert Astals Cid <aacid@kde.org>
- // Copyright (C) 2009 Nick Jones <nick.jones@network-box.com>
- // Copyright (C) 2016 Jason Crain <jason@aquaticape.us>
- // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
-@@ -483,8 +483,12 @@ void OutlineItem::open()
- {
-     if (!kids) {
-         Object itemDict = xref->fetch(ref);
--        const Object &firstRef = itemDict.dictLookupNF("First");
--        kids = readItemList(this, &firstRef, xref, doc);
-+        if (itemDict.isDict()) {
-+            const Object &firstRef = itemDict.dictLookupNF("First");
-+            kids = readItemList(this, &firstRef, xref, doc);
-+        } else {
-+            kids = new std::vector<OutlineItem *>();
-+        }
-     }
- }
-
---
-2.35.5
diff --git a/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch b/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch
deleted file mode 100644
index 70ba1cf123..0000000000
--- a/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2986f06c7cc9d64a506ebe861b8bf38f73386e86 Mon Sep 17 00:00:00 2001
-From: Jordan Abrahams-Whitehead <ajordanr@google.com>
-Date: Tue, 16 May 2023 18:52:19 +0000
-Subject: [PATCH] Add missing #include <cstdio> prior to jpeglib.h
-
-Fixes #1398
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- goo/JpegWriter.cc              | 2 +-
- poppler/ImageEmbeddingUtils.cc | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc
-index ca69fd055..566ee38f8 100644
---- a/goo/JpegWriter.cc
-+++ b/goo/JpegWriter.cc
-@@ -23,7 +23,7 @@
- #ifdef ENABLE_LIBJPEG
- 
- #    include "poppler/Error.h"
--
-+#    include <cstdio>
- extern "C" {
- #    include <jpeglib.h>
- }
-diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc
-index 0c13fe968..07b9dfb62 100644
---- a/poppler/ImageEmbeddingUtils.cc
-+++ b/poppler/ImageEmbeddingUtils.cc
-@@ -14,6 +14,7 @@
- 
- #include <memory>
- #ifdef ENABLE_LIBJPEG
-+#    include <cstdio>
- extern "C" {
- #    include <jpeglib.h>
- }
--- 
-GitLab
diff --git a/meta-oe/recipes-support/poppler/poppler_23.04.0.bb b/meta-oe/recipes-support/poppler/poppler_25.04.0.bb
index f4411e1163..1cd5f28cd8 100644
--- a/meta-oe/recipes-support/poppler/poppler_23.04.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_25.04.0.bb
@@ -7,24 +7,24 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
            file://0001-Do-not-overwrite-all-our-build-flags.patch \
            file://basename-include.patch \
            file://0001-cmake-Do-not-use-isystem.patch \
-           file://jpeg-stdio.patch \
-           file://CVE-2023-34872.patch \
            "
-SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1"
+SRC_URI[sha256sum] = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d"
 
 DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native"
 
 inherit cmake pkgconfig gobject-introspection
 
-PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash"
+PACKAGECONFIG ??= "boost jpeg nss openjpeg png tiff"
+PACKAGECONFIG[boost] = "-DENABLE_BOOST=ON,-DENABLE_BOOST=OFF,boost"
 PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg"
 PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng"
-PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff"
+PACKAGECONFIG[tiff] = "-DENABLE_LIBTIFF=ON,-DENABLE_LIBTIFF=OFF,tiff"
 PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl"
 PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg"
 PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native"
-PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss"
-PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost"
+PACKAGECONFIG[nss] = "-DENABLE_NSS3=ON,-DENABLE_NSS3=OFF,nss"
+PACKAGECONFIG[gpgme] = "-DENABLE_GPGME=ON,-DENABLE_GPGME=OFF,gpgme"
+PACKAGECONFIG[qt6] = "-DENABLE_QT6=ON,-DENABLE_QT6=OFF,qtbase"
 
 # surprise - did not expect this to work :)
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
@@ -32,10 +32,9 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
 SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
 
 EXTRA_OECMAKE += " \
-    -DENABLE_CMS=lcms2 \
+    -DENABLE_LCMS=ON \
     -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
     -DBUILD_GTK_TESTS=OFF \
-    -DENABLE_ZLIB=ON \
     -DRUN_GPERF_IF_PRESENT=OFF \
     -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \
     ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \
diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb
index 2bf4d0a449..4451e96307 100644
--- a/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb
+++ b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb
@@ -8,7 +8,6 @@ PV .= "+git"
 SRC_URI = "git://github.com/PortAudio/portaudio.git;branch=master;protocol=https"
 SRCREV = "929e2e8f7af281c5eb4fa07758930d542ec43d97"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-support/pps-tools/pps-tools/0001-Use-lld-in-printf-for-64-bit-time_t.patch b/meta-oe/recipes-support/pps-tools/pps-tools/0001-Use-lld-in-printf-for-64-bit-time_t.patch
new file mode 100644
index 0000000000..058217d68d
--- /dev/null
+++ b/meta-oe/recipes-support/pps-tools/pps-tools/0001-Use-lld-in-printf-for-64-bit-time_t.patch
@@ -0,0 +1,59 @@
+From 6faed0a3b41fba4619fe4598a2834dfb4d2be7e4 Mon Sep 17 00:00:00 2001
+From: Matt Merhar <mattmerhar@protonmail.com>
+Date: Fri, 10 Nov 2023 17:21:51 -0500
+Subject: [PATCH] Use %lld in printf for 64-bit time_t
+
+musl 1.2.0 switched to use 64-bit time_t everywhere, including 32-bit
+architectures, causing garbage values to be printed from ppswatch and
+ppstest.
+
+Use the correct format string for the affected printf statements and
+explicitly cast to long long to avoid potential compatibility issues
+with 32-bit glibc.
+
+Upstream-Status: Backport [https://github.com/redlab-i/pps-tools/commit/6faed0a3b41fba4619fe4598a2834dfb4d2be7e4]
+
+Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
+---
+ ppstest.c  | 8 ++++----
+ ppswatch.c | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/ppstest.c b/ppstest.c
+index 0370794..c375a09 100644
+--- a/ppstest.c
++++ b/ppstest.c
+@@ -110,13 +110,13 @@ retry:
+        }
+ 
+        printf("source %d - "
+-              "assert %ld.%09ld, sequence: %ld - "
+-              "clear  %ld.%09ld, sequence: %ld\n",
++              "assert %lld.%09ld, sequence: %ld - "
++              "clear  %lld.%09ld, sequence: %ld\n",
+               i,
+-              infobuf.assert_timestamp.tv_sec,
++              (long long)infobuf.assert_timestamp.tv_sec,
+               infobuf.assert_timestamp.tv_nsec,
+               infobuf.assert_sequence,
+-              infobuf.clear_timestamp.tv_sec,
++              (long long)infobuf.clear_timestamp.tv_sec,
+               infobuf.clear_timestamp.tv_nsec, infobuf.clear_sequence);
+        fflush(stdout);
+ 
+diff --git a/ppswatch.c b/ppswatch.c
+index 5c6202b..15d7a77 100644
+--- a/ppswatch.c
++++ b/ppswatch.c
+@@ -148,7 +148,7 @@ int fetch_source(pps_handle_t handle, int avail_mode)
+        if (max_divergence < div)
+                max_divergence = div;
+        if (div >= margin) {
+-               printf("timestamp: %ld, sequence: %ld, offset: % 6ld\n", ts.tv_sec, seq, ts.tv_nsec);
++               printf("timestamp: %lld, sequence: %ld, offset: % 6ld\n", (long long)ts.tv_sec, seq, ts.tv_nsec);
+                fflush(stdout);
+                overflows++;
+                curr_unsync++;
+-- 
+2.47.1
+
diff --git a/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb
index 65c06c1bd5..65caa05a13 100644
--- a/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb
+++ b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb
@@ -5,9 +5,10 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 SRCREV = "c50cb7183e252b47308fa22f420e0a877277aa29"
-SRC_URI = "git://github.com/ago/pps-tools.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/ago/pps-tools.git;branch=master;protocol=https \
+           file://0001-Use-lld-in-printf-for-64-bit-time_t.patch \
+           "
 
-S = "${WORKDIR}/git"
 
 RDEPENDS:${PN} = "bash"
 
diff --git a/meta-oe/recipes-support/procmail/procmail/0001-fix-too-many-arguments-issue.patch b/meta-oe/recipes-support/procmail/procmail/0001-fix-too-many-arguments-issue.patch
new file mode 100644
index 0000000000..9b98720b2e
--- /dev/null
+++ b/meta-oe/recipes-support/procmail/procmail/0001-fix-too-many-arguments-issue.patch
@@ -0,0 +1,88 @@
+From 6f00795de8623347580c4366cb517a6653f73ca4 Mon Sep 17 00:00:00 2001
+From: Liu Yiding <liuyd.fnst@fujitsu.com>
+Date: Mon, 9 Jun 2025 08:01:39 +0000
+Subject: [PATCH] fix too many arguments issue
+
+fix issue like:
+| procmail.c:76:12: error: too many arguments to function 'auth_finduid'; expected 0, have 2
+|    76 |   if(tpass=auth_finduid(uid,0))                           /* save by copying */
+|       |            ^~~~~~~~~~~~ ~~~
+| In file included from procmail.c:36:
+| authenticate.h:15:3: note: declared here
+|    15 |  *auth_finduid Q((const uid_t uid,const int sock));
+| --
+| procmail.c:212:9: error: too many arguments to function 'checkprivFrom_'; expected 0, have 3
+|   212 |         checkprivFrom_(euid,passinvk?auth_username(passinvk):0,override);
+|       |         ^~~~~~~~~~~~~~ ~~~~
+| In file included from procmail.c:41:
+| from.h:9:2: note: declared here
+|     9 |  checkprivFrom_ Q((uid_t euid,const char*logname,int override));
+| --
+| procmail.c:213:9: error: too many arguments to function 'doumask'; expected 0, have 1
+|   213 |         doumask(INIT_UMASK);               /* allowed to set the From_ line? */
+|       |         ^~~~~~~
+| In file included from procmail.c:23:
+| robust.h:12:2: note: declared here
+|    12 |  doumask Q((const mode_t mask));
+
+Upstream-Status: Submitted [https://github.com/BuGlessRB/procmail/pull/11]
+Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
+---
+ src/authenticate.h | 2 +-
+ src/exopen.c       | 2 +-
+ src/includes.h     | 2 +-
+ src/misc.h         | 1 +
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/authenticate.h b/src/authenticate.h
+index be9d88d..31e665a 100644
+--- a/src/authenticate.h
++++ b/src/authenticate.h
+@@ -7,7 +7,7 @@ typedef struct auth_identity auth_identity;
+ 
+ #ifndef P
+ #define P(x)   x
+-#define Q(x)   ()
++#define Q(x)   x
+ #endif
+ 
+ /*const*/auth_identity
+diff --git a/src/exopen.c b/src/exopen.c
+index c7647e5..46e3467 100644
+--- a/src/exopen.c
++++ b/src/exopen.c
+@@ -51,7 +51,7 @@ static const char*safehost P((void)) /* return a hostname safe for filenames */
+   return sname;
+ }
+ 
+-int unique(full,p,len,mode,verbos,flags)char*const full;char*p;
++int unique(full,p,len,mode,verbos,flags)const char*const full;char*p;
+  const size_t len;const mode_t mode;const int verbos,flags;
+ { static const char s2c[]=".,+%";static int serial=STRLEN(s2c);
+   static time_t t;char*dot,*end,*host;struct stat filebuf;
+diff --git a/src/includes.h b/src/includes.h
+index 7d6b41f..134805b 100644
+--- a/src/includes.h
++++ b/src/includes.h
+@@ -530,7 +530,7 @@ extern void*memmove();
+  * problems caused by one of those types being shorter than int and thereby
+  * being passed differently under ANSI rules.
+  */
+-#define Q(args)                ()
++#define Q(args)                args
+ 
+ #ifdef oBRAIN_DAMAGE
+ #undef oBRAIN_DAMAGE
+diff --git a/src/misc.h b/src/misc.h
+index 4f62ebc..659dfcb 100644
+--- a/src/misc.h
++++ b/src/misc.h
+@@ -1,4 +1,5 @@
+ /*$Id: misc.h,v 1.56 2001/06/30 01:14:19 guenther Exp $*/
++#include "authenticate.h"
+ 
+ struct dyna_array{int filled,tspace;char*vals;};
+ union offori{off_t o;int i;};
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-support/procmail/procmail/0001-fix-uname-declaration.patch b/meta-oe/recipes-support/procmail/procmail/0001-fix-uname-declaration.patch
new file mode 100644
index 0000000000..adbc4f584a
--- /dev/null
+++ b/meta-oe/recipes-support/procmail/procmail/0001-fix-uname-declaration.patch
@@ -0,0 +1,27 @@
+From a9e57d4048c94f6bc2533ccc41e6c35d4416571a Mon Sep 17 00:00:00 2001
+From: Liu Yiding <liuyd.fnst@fujitsu.com>
+Date: Mon, 9 Jun 2025 06:44:06 +0000
+Subject: [PATCH] fix uname declaration
+
+Upstream-Status: Submitted [https://github.com/BuGlessRB/procmail/pull/11]
+Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
+---
+ src/includes.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/includes.h b/src/includes.h
+index 4466907..7d6b41f 100644
+--- a/src/includes.h
++++ b/src/includes.h
+@@ -331,7 +331,7 @@ extern int errno;
+ 
+ #ifndef NOuname
+ #ifndef P                /* SINIX V5.23 has the wrong prototype for uname() */
+-extern int uname();                                     /* so we fix it :-) */
++extern int uname(struct utsname *);
+ #define Uname(name)            ((int(*)(struct utsname*))uname)(name)
+ #else
+ #define Uname(name)            uname(name)                 /* no fix needed */
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-support/procmail/procmail/CVE-2014-3618.patch b/meta-oe/recipes-support/procmail/procmail/CVE-2014-3618.patch
new file mode 100644
index 0000000000..b041924361
--- /dev/null
+++ b/meta-oe/recipes-support/procmail/procmail/CVE-2014-3618.patch
@@ -0,0 +1,29 @@
+Description: Fix heap-overflow in formail
+ CVE-2014-3618: Heap-overflow in formail when processing
+ specially-crafted email headers.
+Origin: http://www.openwall.com/lists/oss-security/2014/09/03/8
+Bug-Debian: https://bugs.debian.org/704675
+Bug-Debian: https://bugs.debian.org/760443
+Forwarded: not-needed
+Last-Update: 2014-09-04
+
+CVE: CVE-2014-3618
+Upstream-Status: Inactive-Upstream [lastrelease: 2001]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+
+--- a/src/formisc.c
++++ b/src/formisc.c
+@@ -84,12 +84,11 @@ normal:        *target++= *start++;
+        case '"':*target++=delim='"';start++;
+       }
+      ;{ int i;
+-       do
++       while(*start)
+           if((i= *target++= *start++)==delim)   /* corresponding delimiter? */
+              break;
+           else if(i=='\\'&&*start)                 /* skip quoted character */
+              *target++= *start++;
+-       while(*start);                                          /* anything? */
+       }
+      hitspc=2;
+    }
diff --git a/meta-oe/recipes-support/procmail/procmail/CVE-2017-16844.patch b/meta-oe/recipes-support/procmail/procmail/CVE-2017-16844.patch
new file mode 100644
index 0000000000..6e04989c33
--- /dev/null
+++ b/meta-oe/recipes-support/procmail/procmail/CVE-2017-16844.patch
@@ -0,0 +1,20 @@
+From: Santiago Vila <sanvila@debian.org>
+Subject: Fix heap-based buffer overflow in loadbuf()
+Bug-Debian: http://bugs.debian.org/876511
+X-Debian-version: 3.22-26
+
+CVE: CVE-2017-16844
+Upstream-Status: Inactive-Upstream [lastrelease: 2001]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+
+--- a/src/formisc.c
++++ b/src/formisc.c
+@@ -103,7 +103,7 @@
+ }
+                                                            /* append to buf */
+ void loadbuf(text,len)const char*const text;const size_t len;
+-{ if(buffilled+len>buflen)                       /* buf can't hold the text */
++{ while(buffilled+len>buflen)                    /* buf can't hold the text */
+      buf=realloc(buf,buflen+=Bsize);
+   tmemmove(buf+buffilled,text,len);buffilled+=len;
+ }
diff --git a/meta-oe/recipes-support/procmail/procmail/gcc14.patch b/meta-oe/recipes-support/procmail/procmail/gcc14.patch
new file mode 100644
index 0000000000..5ca56fa006
--- /dev/null
+++ b/meta-oe/recipes-support/procmail/procmail/gcc14.patch
@@ -0,0 +1,127 @@
+From: Santiago Vila <sanvila@debian.org>
+Subject: Fix build with gcc-14
+Bug-Debian: https://bugs.debian.org/1075398
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/initmake
++++ b/initmake
+@@ -124,7 +124,7 @@ else
+ fi
+ 
+ cat >_autotst.c <<HERE
+-main()
++int main()
+ { return 0;
+ }
+ HERE
+@@ -200,7 +200,7 @@ cat >_autotst.c <<HERE
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <sys/stat.h>
+-main()
++int main()
+ { struct stat buf;return!&buf;
+ }
+ HERE
+--- a/src/autoconf
++++ b/src/autoconf
+@@ -414,6 +414,12 @@ cat >_autotst.c <<HERE
+ int dolock,child[NR_of_forks],timeout,fdcollect;
+ char dirlocktest[]="_locktest";
+ 
++#include <stdlib.h>
++int killchildren();
++int fdlock(int fd);
++int sfdlock(int fd);
++int fdunlock();
++
+ void stimeout()
+ { timeout=1;close(fdcollect);killchildren();
+ }
+@@ -435,7 +441,7 @@ unsigned sfork()
+   return pid;
+ }
+ 
+-int main(argc,argv)char*argv[];
++int main(int argc,char*argv[])
+ { int goodlock,testlock,i,pip[2],pipw[2];time_t otimet;unsigned dtimet;
+   static char filename[]="_locktst.l0";
+   close(0);goodlock=0;testlock=FIRST_lock;signal(SIGPIPE,SIG_DFL);
+@@ -585,13 +591,13 @@ int killchildren()
+   return 0;
+ }
+ 
+-int sfdlock(fd)
++int sfdlock(int fd)
+ { int i;unsigned gobble[GOBBLE>>2];
+   for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0);          /* SunOS crash test */
+   return fdlock(fd);
+ }
+ 
+-static oldfdlock;
++static int oldfdlock;
+ #ifdef F_SETLKW
+ static struct flock flck;              /* why can't it be a local variable? */
+ #endif
+@@ -599,7 +605,7 @@ static struct flock flck;           /* why can't
+ static off_t oldlockoffset;
+ #endif
+ 
+-int fdlock(fd)
++int fdlock(int fd)
+ { int i;unsigned gobble[GOBBLE>>2];
+   for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0);          /* SunOS crash test */
+   oldfdlock=fd;fd=0;
+@@ -993,11 +999,11 @@ int main(){int i;i=1;
+  i+=WIFEXITED(i);
+  i+=WIFSTOPPED(i);
+  i+=WEXITSTATUS(i);
+- i+=WSIGTERM(i);
++ i+=WTERMSIG(i);
+  return i;}
+ HERE
+ 
+-echo 'Testing for WIFEXITED(), WIFSTOPPED(), WEXITSTATUS() & WSIGTERM()'
++echo 'Testing for WIFEXITED(), WIFSTOPPED(), WEXITSTATUS() & WTERMSIG()'
+ if $MAKE _autotst.$O >_autotst.rrr 2>&1
+ then
+    $FGREP -v include/ <_autotst.rrr >_autotst.$O
+@@ -1029,6 +1035,8 @@ cat >_autotst.c <<HERE
+ #ifndef NO_COMSAT
+ #include "network.h"
+ #endif
++int setrgid();
++int setresgid();
+ int main(){char a[2];
+  endpwent();endgrent();memmove(a,"0",1);bcopy("0",a,1);strcspn(a,"0");
+  strtol("0",(char**)0,10);strchr("0",'0');strpbrk(a,"0");rename(a,"0");
+@@ -1059,7 +1067,7 @@ echo 'Testing for memmove, strchr, strpb
+ echo ' rename, setrgid, setegid, pow, opendir, mkdir, waitpid, fsync,'
+ echo ' ftruncate, strtod, strncasecmp, strerror, strlcat,'
+ echo ' memset, bzero, and _exit'
+-if $MAKE _autotst.$O >$DEVNULL 2>&1
++if $MAKE _autotst.$O >_autotst.rrr 2>&1
+ then
+ :
+ else
+@@ -1196,7 +1204,7 @@ unsigned long dobench(strstr,iter,haysta
+   return (unsigned long)clock()-to;
+ }
+ #endif
+-int main(argc,argv)int argc;const char*argv[];
++int main(int argc,const char*argv[])
+ { if(argc==1)
+    { char*haystack;
+ #ifdef BENCHSIZE
+--- a/src/mailfold.c
++++ b/src/mailfold.c
+@@ -378,7 +378,7 @@ void concon(ch)const int ch;   /* flip b
+    }
+ }
+ 
+-void readmail(rhead,tobesent)const long tobesent;
++void readmail(int rhead,const long tobesent)
+ { char*chp,*pastend;static size_t contlengthoffset;
+   ;{ long dfilled;
+      if(rhead==2)                /* already read, just examine what we have */
diff --git a/meta-oe/recipes-support/procmail/procmail_3.22.bb b/meta-oe/recipes-support/procmail/procmail_3.22.bb
index 16917666a4..47c8310eaf 100644
--- a/meta-oe/recipes-support/procmail/procmail_3.22.bb
+++ b/meta-oe/recipes-support/procmail/procmail_3.22.bb
@@ -12,8 +12,13 @@ SRC_URI = "http://www.ring.gr.jp/archives/net/mail/${BPN}/${BP}.tar.gz \
     file://from-debian-to-fix-compile-errors.patch \
     file://from-debian-to-modify-parameters.patch \
     file://from-debian-to-fix-man-file.patch \
-    file://man-file-mailstat.1-from-debian.patch"
-SRC_URI[md5sum] = "1678ea99b973eb77eda4ecf6acae53f1"
+    file://man-file-mailstat.1-from-debian.patch \
+    file://CVE-2014-3618.patch \
+    file://CVE-2017-16844.patch \
+    file://gcc14.patch \
+    file://0001-fix-uname-declaration.patch \
+    file://0001-fix-too-many-arguments-issue.patch \
+"
 SRC_URI[sha256sum] = "087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117"
 
 LICENSE = "GPL-2.0-only & Artistic-1.0"
@@ -22,6 +27,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a71e50e197a992c862379e576e669757 \
 
 DEPENDS = "libnet"
 inherit autotools-brokensep
+
 do_configure() {
     find examples -type f | xargs chmod 644
     export CC="${BUILD_CC}"
@@ -33,7 +39,7 @@ do_configure() {
 }
 
 do_compile() {
-    oe_runmake -i TARGET_CFLAGS="$TARGET_CFLAGS -Wno-comments -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}"
+    oe_runmake -i CFLAGS="$TARGET_CFLAGS -Wno-comments -Wno-implicit-int -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}"
 }
 
 do_install() {
diff --git a/meta-oe/recipes-support/psutils/psutils_2.10.bb b/meta-oe/recipes-support/psutils/psutils_2.10.bb
index 1f1894a5f2..14792acaa5 100644
--- a/meta-oe/recipes-support/psutils/psutils_2.10.bb
+++ b/meta-oe/recipes-support/psutils/psutils_2.10.bb
@@ -6,7 +6,7 @@ SRC_URI[sha256sum] = "6f8339fd5322df5c782bfb355d9f89e513353220fca0700a5a28775404
 
 inherit perlnative autotools
 
-export PERL="/usr/bin/env perl"
+export PERL = "/usr/bin/env perl"
 
 DEPENDS += "libpaper-native"
 
diff --git a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch
deleted file mode 100644
index c51fb1cfdb..0000000000
--- a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c5cd932fb08e7ce90cdbf9ae6c5cc7e65ac0738e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Wei=C3=9F?= <michael.weiss@aisec.fraunhofer.de>
-Date: Tue, 9 May 2023 20:00:26 +0200
-Subject: [PATCH] pv/display: handle error of tcgetpgrp() in pv_in_foreground()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Show pv progress bar even if no terminal is set, e.g., in a busybox
-init script. The description of pv_in_forground() states it will
-return true "if we aren't outputting to a terminal". However, this
-is not the case since tcgetpgrg() will return an error and set ERRNO
-to ENOTTY if the output fd is not an tty. We now handle this error
-correctly and pv_in_foreground() returns also true in that case.
-
-Signed-off-by: Michael Weiß <michael.weiss@aisec.fraunhofer.de>
----
-Upstream-Status: Pending
-
- src/pv/display.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/pv/display.c b/src/pv/display.c
-index aff643b..8d1f4c9 100644
---- a/src/pv/display.c
-+++ b/src/pv/display.c
-@@ -48,6 +48,10 @@ bool pv_in_foreground(void)
- 
-        our_process_group = getpgrp();
-        tty_process_group = tcgetpgrp(STDERR_FILENO);
-+
-+       if (tty_process_group == -1 && errno == ENOTTY)
-+               return true;
-+
-        if (our_process_group == tty_process_group)
-                return true;
- 
--- 
-2.30.2
-
diff --git a/meta-oe/recipes-support/pv/pv/pv-test-system-version.patch b/meta-oe/recipes-support/pv/pv/pv-test-system-version.patch
new file mode 100644
index 0000000000..f5e2b05768
--- /dev/null
+++ b/meta-oe/recipes-support/pv/pv/pv-test-system-version.patch
@@ -0,0 +1,18 @@
+Use the version of pv installed on the system rather than the ./pv from 
+the development tree as is done when running 'make check'.
+
+Upstream-Status: Inappropriate [x-compile specific]
+
+---
+diff -Naur pv-1.9.31.orig/tests/test-env.sh pv-1.9.31/tests/test-env.sh
+--- pv-1.9.31.orig/tests/test-env.sh    2024-12-07 08:59:43.000000000 -0500
++++ pv-1.9.31/tests/test-env.sh 2025-03-26 14:11:30.987123378 -0400
+@@ -9,7 +9,7 @@
+ true "${srcdir:?not set - call this from 'make check'}"
+ 
+ # Parameters.
+-testSubject="./pv"
++testSubject="pv"
+ sourcePath="${srcdir}"
+ 
+ # Set everything to the "C" locale.
diff --git a/meta-oe/recipes-support/pv/pv/run-ptest b/meta-oe/recipes-support/pv/pv/run-ptest
index 3f5956f4c0..b0370e0a99 100644
--- a/meta-oe/recipes-support/pv/pv/run-ptest
+++ b/meta-oe/recipes-support/pv/pv/run-ptest
@@ -1,7 +1,22 @@
 #!/bin/sh
 
-rm -rf tests.log
-sh -e run-test.sh pv . > tests.log 2>&1
-sed -e 's|\(.*\):.*OK|PASS: \1|' \
-    -e 's|\(.*\):.*FAILED|FAIL: \1|' \
-   tests.log
+srcdir=/usr/lib/pv/ptest       
+export srcdir                      
+                        
+source tests/test-env.sh
+               
+num_fail=0
+
+# all pv tests are capitalized
+for test in tests/[A-Z]*
+do
+    ./"$test" \
+         && echo "PASS: $test" \
+         || {
+            echo "FAIL: $test"
+            num_fail=$(( ${num_fail} + 1))
+         }
+
+done
+
+exit $num_fail
diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-oe/recipes-support/pv/pv_1.6.20.bb
deleted file mode 100644
index 6a739af927..0000000000
--- a/meta-oe/recipes-support/pv/pv_1.6.20.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline"
-HOMEPAGE = "http://www.ivarch.com/programs/pv.shtml"
-
-LICENSE = "Artistic-2.0"
-LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
-
-SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \
-           file://0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch \
-           file://run-ptest \
-"
-SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603"
-
-UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml"
-UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar.bz2"
-
-inherit autotools ptest
-
-LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}"
-export LDEMULATION
-
-RDEPENDS:${PN}-ptest += "coreutils ${PN}"
-
-do_install_ptest() {
-    install -d ${D}${PTEST_PATH}/tests
-    cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests
-    cp -r ${S}/autoconf/scripts/run-test.sh  ${D}${PTEST_PATH}
-    # sed -i -e 's@\$SRCDIR/@./@g' ${D}${PTEST_PATH}/run-ptest
-}
diff --git a/meta-oe/recipes-support/pv/pv_1.9.31.bb b/meta-oe/recipes-support/pv/pv_1.9.31.bb
new file mode 100644
index 0000000000..578012fcfd
--- /dev/null
+++ b/meta-oe/recipes-support/pv/pv_1.9.31.bb
@@ -0,0 +1,65 @@
+SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline"
+HOMEPAGE = "http://www.ivarch.com/programs/pv.shtml"
+
+LICENSE = "GPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://docs/COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.gz \
+           file://pv-test-system-version.patch \
+           file://run-ptest \
+"
+SRC_URI[sha256sum] = "a35e92ec4ac0e8f380e8e840088167ae01014bfa008a3a9d6506b848079daedf"
+
+UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml"
+UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar"
+
+inherit autotools gettext ptest
+
+LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}"
+export LDEMULATION
+
+# for ptests
+VALGRIND = "valgrind"
+
+# valgrind supports armv7 and above
+VALGRIND:armv4 = ''
+VALGRIND:armv5 = ''
+VALGRIND:armv6 = ''
+
+# X32 isn't supported by valgrind at this time
+VALGRIND:linux-gnux32 = ''
+VALGRIND:linux-muslx32 = ''
+
+# Disable for some MIPS variants
+VALGRIND:mipsarchr6 = ''
+VALGRIND:linux-gnun32 = ''
+
+# Disable for powerpc64 with musl
+VALGRIND:libc-musl:powerpc64 = ''
+VALGRIND:libc-musl:powerpc64le = ''
+
+# RISC-V support for valgrind is not there yet
+VALGRIND:riscv64 = ""
+VALGRIND:riscv32 = ""
+
+RDEPENDS:${PN}-ptest += "bash coreutils tmux ${VALGRIND}"
+RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales"
+RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-binary-localedata-c"
+
+do_install_ptest() {
+    testsdir=${D}${PTEST_PATH}/tests
+    install -d ${testsdir}
+    cp -r ${S}/tests/* ${testsdir}
+    #
+    # remove self-hosted install test
+    rm -f ${testsdir}/Bug_-_Install_all_files.test
+    # skip the failing valgrind tests for now (March 2025).
+    # See: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15817
+    rm -f ${testsdir}/Memory*
+    # test requires at least 3GB free on /tmp
+    rm -f ${testsdir}/Integrity_-_Large_file_support.test
+    # fails due to our prompt: 
+    rm -f ${testsdir}/Terminal_-_Detect_width.test
+    #
+    # sed -i -e 's@\$SRCDIR/@./@g' ${D}${PTEST_PATH}/run-ptest
+}
diff --git a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
index 09534c44fd..ff4668ecde 100644
--- a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
+++ b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
@@ -9,8 +9,7 @@ SRC_URI = "file://pxaregs.c \
            file://serial.patch \
            file://usb.patch "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_compile() {
     ${CC} pxaregs.c -o pxaregs ${CFLAGS} ${LDFLAGS}
@@ -21,5 +20,4 @@ do_install() {
     install -m 0755 pxaregs ${D}${sbindir}/
 }
 
-SRC_URI[md5sum] = "a43baa88842cd5926dbffb6fb87624f6"
 SRC_URI[sha256sum] = "f339b91cd8ab348052c36b36d20033e4bffc3666bc836ff72d5704f025e1c057"
diff --git a/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch b/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch
new file mode 100644
index 0000000000..b12beff6cb
--- /dev/null
+++ b/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch
@@ -0,0 +1,73 @@
+Do not use curl-config
+
+Sourced from
+https://bugs.gentoo.org/552474
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -596,49 +596,12 @@ else
+   PKG_CHECK_MODULES([XSLT], [libxslt > $libxslt_min_version], [have_libxslt=1], [have_libxslt=0])
+ fi
+ 
+-dnl curl
+-AC_ARG_WITH(curl-config, [  --with-curl-config=PATH   Location of libcurl curl-config []], curl_config="$withval", curl_config="")
+-
+-if test "X$curl_config" != "Xno" ; then
+-  if test "X$curl_config" != "X" ; then
+-    AC_MSG_CHECKING(for $curl_config)
+-
+-    if test -f $curl_config ; then
+-      CURL_CONFIG=$curl_config
+-      AC_MSG_RESULT(yes)
+-    else
+-      AC_MSG_RESULT(no - searching PATH)
+-    fi
+-  fi
+-  if test "X$CURL_CONFIG" = "X" ; then
+-    AC_CHECK_PROGS(CURL_CONFIG, curl-config)
+-  fi
+-fi
+-
+ libcurl_source=no
+-if test "X$CURL_CONFIG" != "X"; then
+-  LIBCURL_CFLAGS=`$CURL_CONFIG --cflags`
+-  LIBCURL_LIBS=`$CURL_CONFIG --libs`
+-
+-  CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS"
+-  LIBS="$LIBS $LIBCURL_LIBS"
+-  AC_CHECK_HEADER(curl/curl.h)
+-  AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no)
+-
+-  AC_MSG_CHECKING(for libcurl via curl-config)
+-  if test $have_curl_easy_init = yes; then
+-    libcurl_source="curl-config"
+-    LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'`
+-  fi
+-  CPPFLAGS="$oCPPFLAGS"
+-  LIBS="$oLIBS"
+-else
+-  PKG_CHECK_MODULES([LIBCURL],[libcurl],[
+-    LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion`
+-    libcurl_source="pkg-config"
+-  ], [:])
+-  AC_MSG_CHECKING(for libcurl via pkg-config)
+-fi
++PKG_CHECK_MODULES([LIBCURL],[libcurl],[
++  LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion`
++  libcurl_source="pkg-config"
++], [:])
++AC_MSG_CHECKING(for libcurl via pkg-config)
+ 
+ if test "$libcurl_source" = "no"; then
+   AC_MSG_RESULT(no - not found)
+@@ -1033,7 +996,7 @@ need_libcurl=0
+ need_libxml_www=0
+ need_libfetch=0
+ 
+-if test "X$CURL_CONFIG" != X; then
++if test "$libcurl_source" != "no"; then
+   CPPFLAGS="$CPPFLAGS $LIBCURL_CFLAGS"
+   LIBS="$LIBS $LIBCURL_LIBS"
+   AC_CHECK_HEADER(curl/curl.h)
diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb
index 85012bcfb3..7014a28c02 100644
--- a/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb
+++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb
@@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
 "
 
-DEPENDS = "libxml2 libxslt curl yajl"
+DEPENDS = "bison-native flex-native libxml2 libxslt curl yajl"
 
 SRC_URI = " \
     http://download.librdf.org/source/${BPN}-${PV}.tar.gz \
     file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \
+    file://raptor-2.0.16-dont_use_curl-config.patch \
 "
 SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680"
 
-inherit autotools pkgconfig gtk-doc
+inherit autotools pkgconfig gtk-doc perlnative
 
 EXTRA_OECONF = " \
     --without-xml2-config \
-    --without-curl-config \
     --without-xslt-config \
 "
diff --git a/meta-oe/recipes-support/re2/re2_2024.03.01.bb b/meta-oe/recipes-support/re2/re2_2024.03.01.bb
index 76d6f0c7a9..55a834fa42 100644
--- a/meta-oe/recipes-support/re2/re2_2024.03.01.bb
+++ b/meta-oe/recipes-support/re2/re2_2024.03.01.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \
            ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \
           "
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "abseil-cpp ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest googlebenchmark', '', d)}"
 
diff --git a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb
index 28da51a21c..5ea0fb852a 100644
--- a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb
+++ b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb
@@ -12,7 +12,6 @@ SRC_URI = "http://polypux.org/projects/read-edid/read-edid-${PV}.tar.gz \
            file://0001-Do-not-install-license-file.patch \
            file://0001-get-edid-define-quiet-once.patch \
            "
-SRC_URI[md5sum] = "016546e438bf6c98739ff74061df9854"
 SRC_URI[sha256sum] = "c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f"
 
 EXTRA_OECMAKE = "-DCLASSICBUILD=OFF"
diff --git a/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb
index c038966ba8..4172de857c 100644
--- a/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb
+++ b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 SRC_URI = "git://gitlab.com/postmarketOS/reboot-mode.git;protocol=http;branch=master"
 SRCREV = "84831b20512abd9033414ca5f5a023f333525335"
 
-S = "${WORKDIR}/git"
+
+# Upstream repo has not made releases/tags after 1.0.0
+UPSTREAM_CHECK_COMMITS = "1"
 
 do_compile() {
     ${CC} ${CFLAGS} ${LDFLAGS} ${S}/reboot-mode.c -o ${B}/reboot-mode
diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.35.bb b/meta-oe/recipes-support/remmina/remmina_1.4.36.bb
index 0cad52df3a..aefd871354 100644
--- a/meta-oe/recipes-support/remmina/remmina_1.4.35.bb
+++ b/meta-oe/recipes-support/remmina/remmina_1.4.36.bb
@@ -25,9 +25,8 @@ DEPENDS = " \
 DEPENDS:append:libc-musl = " libexecinfo"
 LDFLAGS:append:libc-musl = " -lexecinfo"
 
-SRCREV = "2a455eadd6462457d08c2d066c5c245e0dee3bf9"
+SRCREV = "17cf7956b9f925fa788083a2db8d5e669f86bfaf"
 SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master"
-S = "${WORKDIR}/git"
 
 inherit cmake features_check mime mime-xdg gtk-icon-cache pkgconfig
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -44,7 +43,7 @@ do_configure:append() {
 
 RDEPENDS:${PN} = "bash"
 
-FILES:${PN}+= " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/mime \
 "
diff --git a/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb
index 57b31a78d9..5f4ffcd657 100644
--- a/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb
+++ b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a0555028c71837623fa6dfa4cc45c0"
 SRC_URI = "git://github.com/nelhage/reptyr.git;protocol=https;branch=master"
 SRCREV = "1238097fc2cd15db058d2185cc4985daa87bcd41"
 
-S = "${WORKDIR}/git"
 
 inherit bash-completion github-releases manpages pkgconfig
 
@@ -27,3 +26,5 @@ do_compile () {
 do_install () {
         oe_runmake install 'DESTDIR=${D}'
 }
+
+COMPATIBLE_HOST:riscv32 = "null"
diff --git a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
index 3cbd04bd5c..8c4183bae3 100644
--- a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
+++ b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
@@ -29,7 +29,6 @@ SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=https \
            file://configure-fix-cmd_rsync.patch \
           "
 
-S = "${WORKDIR}/git"
 
 inherit autotools perlnative
 
diff --git a/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb
index d65f5da859..711d4696fd 100644
--- a/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb
+++ b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74274e8a218423e49eefdea80bc55038"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/${BPN}.git;protocol=https;branch=master"
 SRCREV = "61839777afedcc7bdb68ea4628c5ce5ca72c2ac8"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "DESTDIR=${D}"
 
diff --git a/meta-oe/recipes-support/rtkit/rtkit_0.13.bb b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb
index 4f06e55e8e..b68820dfd6 100644
--- a/meta-oe/recipes-support/rtkit/rtkit_0.13.bb
+++ b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a8e768468b658b3ed44971b53d4a6716"
 SRC_URI = "git://github.com/heftig/rtkit.git;protocol=https;branch=master"
 
 SRCREV = "b9169402fe5e82d20efb754509eb0b191f214599"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check useradd
 
diff --git a/meta-oe/recipes-support/sass/libsass_git.bb b/meta-oe/recipes-support/sass/libsass_git.bb
deleted file mode 100644
index f0824944b9..0000000000
--- a/meta-oe/recipes-support/sass/libsass_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "C/C++ port of the Sass CSS precompiler"
-HOMEPAGE = "http://sass-lang.com/libsass"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d"
-
-inherit autotools
-
-SRC_URI = "git://github.com/sass/libsass.git;branch=master;protocol=https"
-SRCREV = "7037f03fabeb2b18b5efa84403f5a6d7a990f460"
-PV = "3.6.6"
-
-S = "${WORKDIR}/git"
-
-BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/sass/sassc_git.bb b/meta-oe/recipes-support/sass/sassc_git.bb
deleted file mode 100644
index 9bb8c76e87..0000000000
--- a/meta-oe/recipes-support/sass/sassc_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "libsass command line driver "
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744"
-
-DEPENDS = "libsass"
-
-inherit autotools pkgconfig
-
-SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https"
-SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0"
-S = "${WORKDIR}/git"
-PV = "3.6.2"
-
-BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/satyr/satyr_0.43.bb b/meta-oe/recipes-support/satyr/satyr_0.43.bb
index 9e6d701c7f..1976a929bd 100644
--- a/meta-oe/recipes-support/satyr/satyr_0.43.bb
+++ b/meta-oe/recipes-support/satyr/satyr_0.43.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \
            file://0002-fix-compile-failure-against-musl-C-library.patch \
            "
 SRCREV = "5891618d6a95afc4cde6757374485adf9bf0e9a5"
-S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
diff --git a/meta-oe/recipes-support/sdmon/sdmon_git.bb b/meta-oe/recipes-support/sdmon/sdmon_git.bb
index 81c8033c15..8007ead6c6 100644
--- a/meta-oe/recipes-support/sdmon/sdmon_git.bb
+++ b/meta-oe/recipes-support/sdmon/sdmon_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/Ognian/sdmon;protocol=https;branch=master"
 PV = "0.9.0"
 SRCREV = "4dff9b690e8d4454fada6abfbb6b32fcb794968c"
 
-S = "${WORKDIR}/git"
 
 do_compile() {
         oe_runmake -C ${S}/src CC="${CC}" CFLAGS="${CFLAGS} -D_REENTRANT -DVERSION=\"\\\"${PV}\\\"\"" LDFLAGS="${LDFLAGS}"
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.12.bb b/meta-oe/recipes-support/sdparm/sdparm_1.12.bb
index a5f98e6723..1143d157c9 100644
--- a/meta-oe/recipes-support/sdparm/sdparm_1.12.bb
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.12.bb
@@ -6,7 +6,7 @@ SECTION = "console/utils"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \
                     file://lib/BSD_LICENSE;md5=12cde17a04c30dece2752f36b7192c64"
-DEPENDS="sg3-utils"
+DEPENDS = "sg3-utils"
 SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
            file://make-sysroot-work.patch \
            "
@@ -17,7 +17,6 @@ UPSTREAM_CHECK_REGEX = "sdparm-(?P<pver>\d+(\.\d+)+)\.tgz"
 PACKAGES =+ "${PN}-scripts"
 RDEPENDS:${PN}-scripts += "bash ${PN}"
 
-SRC_URI[md5sum] = "2902fd29e6834fd62c16bb5d1ac53c7e"
 SRC_URI[sha256sum] = "e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124"
 
 inherit autotools
diff --git a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb
index 82994331ee..1d7e29ecc5 100644
--- a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb
+++ b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb
@@ -6,7 +6,7 @@ SRCREV = "00dbec2636ae0385ad028587e20e446272ff97ec"
 PV = "1.1+git"
 
 SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https;branch=master"
-S = "${WORKDIR}/git/tools/serial_forward"
+S = "${UNPACKDIR}/${BP}/tools/serial_forward"
 
 inherit autotools native
 
diff --git a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb
index 541ae84a93..05e965fc63 100644
--- a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb
+++ b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb
@@ -9,6 +9,6 @@ SRC_URI = "git://github.com/freesmartphone/cornucopia.git;branch=master;protocol
            file://0001-serial_forward-Disable-default-static-linking.patch;striplevel=3 \
            file://0001-correct-the-typo-in-include-file-name-string.h.patch;striplevel=3 \
           "
-S = "${WORKDIR}/git/tools/serial_forward"
+S = "${UNPACKDIR}/${BP}/tools/serial_forward"
 
 inherit autotools
diff --git a/meta-oe/recipes-support/serial/serial_1.2.1.bb b/meta-oe/recipes-support/serial/serial_1.2.1.bb
index c3f13d1af5..42151da532 100644
--- a/meta-oe/recipes-support/serial/serial_1.2.1.bb
+++ b/meta-oe/recipes-support/serial/serial_1.2.1.bb
@@ -11,7 +11,6 @@ SRC_URI = " \
 SRCREV = "10ac4e1c25c2cda1dc0a32a8e12b87fd89f3bb4f"
 SRC_URI[sha256sum] = "c8cd235dda2ef7d977ba06dfcb35c35e42f45cfd9149ba3ad257756123d8ff96"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb
index 6c3d813983..4af20fe72a 100644
--- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb
+++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb
@@ -17,6 +17,6 @@ SRC_URI[sha256sum] = "d62b6c3cf20390fa7357044390084166d25f1d932a1135c450b69fe5c2
 
 inherit autotools-brokensep
 
-S = "${WORKDIR}/sg3_utils-${PV}"
+S = "${UNPACKDIR}/sg3_utils-${PV}"
 
 RDEPENDS:${PN} += "bash"
diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-ISO-C23-Backport-stdbool.m4.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-ISO-C23-Backport-stdbool.m4.patch
new file mode 100644
index 0000000000..507c0c99cb
--- /dev/null
+++ b/meta-oe/recipes-support/sharutils/sharutils/0001-ISO-C23-Backport-stdbool.m4.patch
@@ -0,0 +1,213 @@
+From c349e9656440fcde2f71950d466fcddaa9a59f72 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Fri, 4 Apr 2025 14:19:00 +0900
+Subject: [PATCH 1/3] ISO C23: Backport stdbool.m4
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Petr Písař <ppisar@redhat.com>
+
+The bundled gnulib check for stdbool.h did not account for ISO C23
+which provides its own false and true keywords. As a result stdbool.h
+presence was not correctly detected and libopts/compat/compat.h,
+bundled from AutoGen, failed to compile with GCC 15 which defaults to
+ISO C23:
+
+    In file included from autoopts/project.h:30,
+                     from libopts.c:2:
+    ./compat/compat.h:188:19: error: cannot use keyword ‘false’ as enumeration
+constant
+      188 |    typedef enum { false = 0, true = 1 } _Bool;
+          |                   ^~~~~
+    ./compat/compat.h:188:19: note: ‘false’ is a keyword with ‘-std=c23’ onwards
+    ./compat/compat.h:188:41: error: expected ‘;’, identifier or ‘(’ before
+‘_Bool’
+      188 |    typedef enum { false = 0, true = 1 } _Bool;
+          |                                         ^~~~~
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+Upstream-Status: Backport [https://lists.gnu.org/r/bug-gnu-utils/2025-03/msg00002.html]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ m4/stdbool.m4 | 129 +++++++++++++++++++++++++++++---------------------
+ 1 file changed, 74 insertions(+), 55 deletions(-)
+
+diff --git a/m4/stdbool.m4 b/m4/stdbool.m4
+index 7273b82..8e00e4a 100644
+--- a/m4/stdbool.m4
++++ b/m4/stdbool.m4
+@@ -1,27 +1,40 @@
+ # Check for stdbool.h that conforms to C99.
+ 
+-dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
++dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+ 
+-#serial 5
++#serial 10
+ 
+ # Prepare for substituting <stdbool.h> if it is not supported.
+ 
+ AC_DEFUN([AM_STDBOOL_H],
+ [
+   AC_REQUIRE([AC_CHECK_HEADER_STDBOOL])
++  AC_REQUIRE([AC_CANONICAL_HOST])
+ 
+-  # Define two additional variables used in the Makefile substitution.
+-
++  dnl On some platforms, <stdbool.h> does not exist or does not conform to C99.
++  dnl On Solaris 10 with CC=cc CXX=CC, <stdbool.h> exists but is not usable
++  dnl in C++ mode (and no <cstdbool> exists). In this case, we use our
++  dnl replacement, also in C mode (for binary compatibility between C and C++).
+   if test "$ac_cv_header_stdbool_h" = yes; then
+-    STDBOOL_H=''
++    case "$host_os" in
++      solaris*)
++        if test -z "$GCC"; then
++          GL_GENERATE_STDBOOL_H=true
++        else
++          GL_GENERATE_STDBOOL_H=false
++        fi
++        ;;
++      *)
++        GL_GENERATE_STDBOOL_H=false
++        ;;
++    esac
+   else
+-    STDBOOL_H='stdbool.h'
++    GL_GENERATE_STDBOOL_H=true
+   fi
+-  AC_SUBST([STDBOOL_H])
+-  AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"])
++  AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test "$GL_GENERATE_STDBOOL_H" = "true"])
+ 
+   if test "$ac_cv_type__Bool" = yes; then
+     HAVE__BOOL=1
+@@ -31,70 +44,76 @@ AC_DEFUN([AM_STDBOOL_H],
+   AC_SUBST([HAVE__BOOL])
+ ])
+ 
+-# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.
+-AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])
+-
+-# This version of the macro is needed in autoconf <= 2.68.
++m4_version_prereq([2.72], [], [
+ 
+ AC_DEFUN([AC_CHECK_HEADER_STDBOOL],
+-  [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
++  [AC_CHECK_TYPES([_Bool])
++   AC_CACHE_CHECK([for stdbool.h that conforms to C99 or later],
+      [ac_cv_header_stdbool_h],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+-           [[
+-             #include <stdbool.h>
+-             #ifndef bool
+-              "error: bool is not defined"
++           [[#include <stdbool.h>
++
++             /* "true" and "false" should be usable in #if expressions and
++                integer constant expressions, and "bool" should be a valid
++                type name.
++
++                Although C99 requires bool, true, and false to be macros,
++                C23 and C++11 overrule that, so do not test for that.
++                Although C99 requires __bool_true_false_are_defined and
++                _Bool, C23 says they are obsolescent, so do not require
++                them.  */
++
++             #if !true
++               #error "'true' is not true"
+              #endif
+-             #ifndef false
+-              "error: false is not defined"
++             #if true != 1
++               #error "'true' is not equal to 1"
+              #endif
++             char b[true == 1 ? 1 : -1];
++             char c[true];
++
+              #if false
+-              "error: false is not 0"
++               #error "'false' is not false"
+              #endif
+-             #ifndef true
+-              "error: true is not defined"
+-             #endif
+-             #if true != 1
+-              "error: true is not 1"
+-             #endif
+-             #ifndef __bool_true_false_are_defined
+-              "error: __bool_true_false_are_defined is not defined"
++             #if false != 0
++               #error "'false' is not equal to 0"
+              #endif
++             char d[false == 0 ? 1 : -1];
++
++             enum { e = false, f = true, g = false * true, h = true * 256 };
++
++             char i[(bool) 0.5 == true ? 1 : -1];
++             char j[(bool) 0.0 == false ? 1 : -1];
++             char k[sizeof (bool) > 0 ? 1 : -1];
++
++             struct sb { bool s: 1; bool t; } s;
++             char l[sizeof s.t > 0 ? 1 : -1];
+ 
+-             struct s { _Bool s: 1; _Bool t; } s;
+-
+-             char a[true == 1 ? 1 : -1];
+-             char b[false == 0 ? 1 : -1];
+-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+-             char d[(bool) 0.5 == true ? 1 : -1];
+-             /* See body of main program for 'e'.  */
+-             char f[(_Bool) 0.0 == false ? 1 : -1];
+-             char g[true];
+-             char h[sizeof (_Bool)];
+-             char i[sizeof s.t];
+-             enum { j = false, k = true, l = false * true, m = true * 256 };
+              /* The following fails for
+                 HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+-             _Bool n[m];
+-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
++             bool m[h];
++             char n[sizeof m == h * sizeof m[0] ? 1 : -1];
++             char o[-1 - (bool) 0 < 0 ? 1 : -1];
+              /* Catch a bug in an HP-UX C compiler.  See
+-                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+-                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
++                https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
++                https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html
+               */
+-             _Bool q = true;
+-             _Bool *pq = &q;
++             bool p = true;
++             bool *pp = &p;
+            ]],
+            [[
+-             bool e = &s;
+-             *pq |= q;
+-             *pq |= ! q;
+-             /* Refer to every declared value, to avoid compiler optimizations.  */
+-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+-                     + !m + !n + !o + !p + !q + !pq);
++             bool ps = &s;
++             *pp |= p;
++             *pp |= ! p;
++
++             /* Refer to every declared value, so they cannot be
++                discarded as unused.  */
++             return (!b + !c + !d + !e + !f + !g + !h + !i + !j + !k
++                     + !l + !m + !n + !o + !p + !pp + !ps);
+            ]])],
+         [ac_cv_header_stdbool_h=yes],
+         [ac_cv_header_stdbool_h=no])])
+-   AC_CHECK_TYPES([_Bool])
+-])
++])# AC_CHECK_HEADER_STDBOOL
++
++]) # m4_version_prereq 2.72
diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch
new file mode 100644
index 0000000000..6d8a5e2128
--- /dev/null
+++ b/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch
@@ -0,0 +1,47 @@
+From fb8bf1c1b1d0bf8e9bc637c0e67219fab1a9eb03 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 14 Aug 2024 15:24:57 -0700
+Subject: [PATCH] libopts.m4: accept POSIX_SHELL from the environment during
+ the configure step
+
+This lets us set it to the canonical path /bin/bash, even on systems
+where both /bin/bash and /usr/bin/bash are available, and therefore
+which(1) might return /usr/bin/bash (depending on PATH order).
+
+Both copies of libopts.m4 are marked as generated files, but the files
+from which they were generated do not seem to be present in the sharutils
+package. This change is equivalent to part of a 2016 autogen commit
+<https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a>.
+
+Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libopts/m4/libopts.m4 | 1 +
+ m4/libopts.m4         | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4
+index 1a896d9..3b88426 100644
+--- a/libopts/m4/libopts.m4
++++ b/libopts/m4/libopts.m4
+@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
+   AC_PROG_SED
+   [while :
+   do
++      test -x "$POSIX_SHELL" && break
+       POSIX_SHELL=`which bash`
+       test -x "$POSIX_SHELL" && break
+       POSIX_SHELL=`which dash`
+diff --git a/m4/libopts.m4 b/m4/libopts.m4
+index c7ba4f3..a1127e1 100644
+--- a/m4/libopts.m4
++++ b/m4/libopts.m4
+@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
+   AC_PROG_SED
+   [while :
+   do
++      test -x "$POSIX_SHELL" && break
+       POSIX_SHELL=`which bash`
+       test -x "$POSIX_SHELL" && break
+       POSIX_SHELL=`which dash`
diff --git a/meta-oe/recipes-support/sharutils/sharutils/0002-ISO-C23-Port-getcwd.m4-to-ISO-C23.patch b/meta-oe/recipes-support/sharutils/sharutils/0002-ISO-C23-Port-getcwd.m4-to-ISO-C23.patch
new file mode 100644
index 0000000000..44991cad1b
--- /dev/null
+++ b/meta-oe/recipes-support/sharutils/sharutils/0002-ISO-C23-Port-getcwd.m4-to-ISO-C23.patch
@@ -0,0 +1,49 @@
+From 01c13c5b455ec8d51240af20f59324b2ed15a337 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 4 Apr 2025 14:20:05 +0900
+Subject: [PATCH 2/3] ISO C23: Port getcwd.m4 to ISO C23
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Petr Písař <ppisar@redhat.com>
+
+Some confgure tests failed because of function arguments missing from
+the prototypes:
+
+    configure:16105: checking whether getcwd (NULL, 0) allocates memory for
+result
+    configure:16162: gcc -o conftest -g -O2   conftest.c  >&5
+    conftest.c:186:16: error: conflicting types for 'getcwd'; have 'char
+*(void)'
+      186 |          char *getcwd ();
+          |                ^~~~~~
+    In file included from conftest.c:181:
+    /usr/include/unistd.h:531:14: note: previous declaration of 'getcwd' with
+type 'char *(char *, size_t)'
+
+This patch fixes it.
+
+Maintainer is encouraged to rebase the m4 files to the latest gnulib.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+Upstream-Status: Backport [https://lists.gnu.org/r/bug-gnu-utils/2025-03/msg00003.html]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ m4/getcwd.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
+index b9fbcec..6f24b14 100644
+--- a/m4/getcwd.m4
++++ b/m4/getcwd.m4
+@@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
+ #         include <direct.h>
+ #        endif
+ #        ifndef getcwd
+-         char *getcwd ();
++         char *getcwd (char *buf, size_t size);
+ #        endif
+ ]], [[
+ #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
diff --git a/meta-oe/recipes-support/sharutils/sharutils/0003-ISO-C23-Port-the-code-to-ISO-C23.patch b/meta-oe/recipes-support/sharutils/sharutils/0003-ISO-C23-Port-the-code-to-ISO-C23.patch
new file mode 100644
index 0000000000..57e0ac3ed6
--- /dev/null
+++ b/meta-oe/recipes-support/sharutils/sharutils/0003-ISO-C23-Port-the-code-to-ISO-C23.patch
@@ -0,0 +1,143 @@
+From 4e50196673fc14bd6081e8a78cc940199566ba55 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Fri, 4 Apr 2025 14:38:51 +0900
+Subject: [PATCH 3/3] ISO C23: Port the code to ISO C23
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Petr Písař <ppisar@redhat.com>
+
+With GCC 15, which defaults to ISO 23, a build failed, for example like
+this:
+
+    gcc -DLOCALEDIR=\"/usr/local/share/locale\" -DHAVE_CONFIG_H -I. -I..
+-I../libopts -I. -I.. -I../lib -I
+    ../lib -I../intl  -Wno-format-contains-nul -g -O2 -Wno-format-contains-nul
+-c -o shar.o shar.c
+    In file included from local.h:23,
+                     from shar-opts.h:354,
+                     from shar.c:46:
+    ../lib/system.h:78:7: error: conflicting types for ‘fdopen’; have ‘FILE
+*(void)’
+       78 | FILE *fdopen ();
+          |       ^~~~~~
+
+The cause is that ISO C23 changed a meaning of an empty argument list
+from an unspecified list to no arguments.
+
+Also K&R syntax is now deprecated and the compiler warned:
+
+    encode.c: In function ‘write_encoded_bytes’:
+    encode.c:33:1: warning: old-style function definition
+[-Wold-style-definition]
+       33 | write_encoded_bytes (group, file)
+          | ^~~~~~~~~~~~~~~~~~~
+
+This patch fixes both the erros and the warnigs by specifying all the
+arguments in the modern syntax.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+Upstream-Status: Backport [https://lists.gnu.org/r/bug-gnu-utils/2025-03/msg00001.html]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ lib/system.h   |  6 +++---
+ src/encode.c   | 13 +++----------
+ src/shar.c     |  3 +--
+ src/uudecode.c |  2 +-
+ 4 files changed, 8 insertions(+), 16 deletions(-)
+
+diff --git a/lib/system.h b/lib/system.h
+index 2b9846b..811e8cf 100644
+--- a/lib/system.h
++++ b/lib/system.h
+@@ -52,7 +52,7 @@ typedef enum {false = 0, true = 1} bool;
+ #endif
+ 
+ #if !HAVE_DECL_STRTOIMAX && !defined strtoimax
+-intmax_t strtoimax ();
++intmax_t strtoimax (const char *nptr, char **endptr, int base);
+ #endif
+ 
+ #if HAVE_STRING_H
+@@ -75,8 +75,8 @@ intmax_t strtoimax ();
+ # include <unistd.h>
+ #endif
+ 
+-FILE *fdopen ();
+-FILE *popen ();
++FILE *fdopen (int fd, const char *mode);
++FILE *popen (const char *command, const char *type);
+ 
+ /* Global functions of the shar package.  */
+ 
+diff --git a/src/encode.c b/src/encode.c
+index 09e0c69..b1de8bd 100644
+--- a/src/encode.c
++++ b/src/encode.c
+@@ -30,9 +30,7 @@
+ `------------------------------------------*/
+ 
+ static void
+-write_encoded_bytes (group, file)
+-     char *group;
+-     FILE *file;
++write_encoded_bytes (char *group, FILE *file)
+ {
+   int c1, c2, c3, c4;
+ 
+@@ -52,10 +50,7 @@ write_encoded_bytes (group, file)
+ `--------------------------------------------------------------------*/
+ 
+ static int
+-read_raw_bytes (file, buffer, buffer_size)
+-     FILE *file;
+-     char *buffer;
+-     int buffer_size;
++read_raw_bytes (FILE *file, char *buffer, int buffer_size)
+ {
+   int character;
+   int counter;
+@@ -75,9 +70,7 @@ read_raw_bytes (file, buffer, buffer_size)
+ `----------------------------------------------------*/
+ 
+ void
+-copy_file_encoded (input, output)
+-     FILE *input;
+-     FILE *output;
++copy_file_encoded (FILE *input, FILE *output)
+ {
+   char buffer[LINE_BUFFER_SIZE];
+   int counter;
+diff --git a/src/shar.c b/src/shar.c
+index 6d7ed1d..b5e84ff 100644
+--- a/src/shar.c
++++ b/src/shar.c
+@@ -1,4 +1,3 @@
+-
+ static const char cright_years_z[] =
+ 
+ /* Handle so called `shell archives'.
+@@ -109,7 +108,7 @@ static inline unsigned char to_uchar (char ch) { return ch; }
+ #define IS_GRAPH(_c) (isprint (to_uchar (_c)) && !isspace (to_uchar (_c)))
+ #endif
+ 
+-struct tm *localtime ();
++struct tm *localtime (const time_t *timep);
+ 
+ #if MSDOS
+           /* 1 extra for CR.  */
+diff --git a/src/uudecode.c b/src/uudecode.c
+index 0621c99..b8a316e 100644
+--- a/src/uudecode.c
++++ b/src/uudecode.c
+@@ -82,7 +82,7 @@ static char const cright_years_z[] =
+ #define UU_CHMOD(_n, _fd, _m)   chmod ((_n), UU_MODE_BITS(_m))
+ #endif
+ 
+-struct passwd *getpwnam ();
++struct passwd *getpwnam (const char *name);
+ 
+ static uudecode_exit_code_t read_stduu(
+         const char *inname, const char *outname);
diff --git a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb
index 2a16b18288..45bf341063 100644
--- a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb
+++ b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb
@@ -1,7 +1,7 @@
 SUMMARY = "This is the set of GNU shar utilities."
 HOMEPAGE = "http://www.gnu.org/software/sharutils/"
 SECTION = "console/utils"
-LICENSE="GPL-3.0-or-later"
+LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit gettext autotools update-alternatives
@@ -13,10 +13,15 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0001-Fix-building-with-GCC-10.patch \
            file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \
            file://0001-configure.ac-Check-and-define-intmax_t-type.patch \
+           file://0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch \
+           file://0001-ISO-C23-Backport-stdbool.m4.patch \
+           file://0002-ISO-C23-Port-getcwd.m4-to-ISO-C23.patch \
+           file://0003-ISO-C23-Port-the-code-to-ISO-C23.patch \
            "
-SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800"
 SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637"
 
+EXTRA_OECONF = "POSIX_SHELL=${base_bindir}/sh"
+
 do_install:append() {
     if [ -e ${D}${libdir}/charset.alias ]
     then
diff --git a/meta-oe/recipes-support/smarty/smarty_4.4.1.bb b/meta-oe/recipes-support/smarty/smarty_4.4.1.bb
deleted file mode 100644
index e0979bb5aa..0000000000
--- a/meta-oe/recipes-support/smarty/smarty_4.4.1.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "the compiling PHP template engine"
-SECTION = "console/network"
-HOMEPAGE = "https://www.smarty.net/"
-
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3"
-
-DEPENDS += "php"
-
-SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=support/4.3"
-
-SRCREV = "f4152e9b814ae2369b6e4935c05e1e0c3654318d"
-
-S = "${WORKDIR}/git"
-
-do_install() {
-        install -d ${D}${datadir}/php/smarty3/libs/
-        install -m 0644 ${S}/libs/*.php ${D}${datadir}/php/smarty3/libs/
-
-        install -d ${D}${datadir}/php/smarty3/libs/plugins
-        install -m 0644 ${S}/libs/plugins/*.php ${D}${datadir}/php/smarty3/libs/plugins/
-
-        install -d ${D}${datadir}/php/smarty3/libs/sysplugins
-        install -m 0644 ${S}/libs/sysplugins/*.php ${D}${datadir}/php/smarty3/libs/sysplugins/
-}
-FILES:${PN} = "${datadir}/php/smarty3/"
-
-CVE_STATUS[CVE-2020-10375] = "cpe-incorrect: The recipe used in the meta-openembedded is a different smarty package compared to the one which has the CVE issue."
diff --git a/meta-oe/recipes-support/smarty/smarty_5.4.5.bb b/meta-oe/recipes-support/smarty/smarty_5.4.5.bb
new file mode 100644
index 0000000000..047f10589d
--- /dev/null
+++ b/meta-oe/recipes-support/smarty/smarty_5.4.5.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Template engine for PHP"
+DESCRIPTION = "\
+    Smarty facilitates the separation of presentation (HTML/CSS) from \
+    application logic. This implies that PHP code is application logic, and is \
+    separated from the presentation. \
+"
+HOMEPAGE = "https://smarty-php.github.io/smarty/"
+BUGTRACKER = "https://github.com/smarty-php/smarty/issues"
+
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3"
+
+SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=master;tag=v${PV}"
+
+SRCREV = "e26f82d02c4d18fc82094c28fbc65f711e39ed5d"
+
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+# `make clean` removes files, they can't be rebuild with `make all`
+CLEANBROKEN = "1"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+
+do_install() {
+        install -d ${D}${datadir}/php/smarty3/libs/
+        install -m 0644 ${S}/libs/*.php ${D}${datadir}/php/smarty3/libs/
+
+        install -d ${D}${datadir}/php/smarty3/src/
+        cp -rf ${S}/src/* ${D}${datadir}/php/smarty3/src/
+}
+FILES:${PN} += "${datadir}/php/smarty3/"
+
+RDEPENDS:${PN} = "php"
+
+CVE_STATUS[CVE-2020-10375] = "cpe-incorrect: The recipe used in the meta-openembedded is a different smarty package compared to the one which has the CVE issue."
diff --git a/meta-oe/recipes-support/snapper/snapper/0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch b/meta-oe/recipes-support/snapper/snapper/0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch
new file mode 100644
index 0000000000..ec8594629e
--- /dev/null
+++ b/meta-oe/recipes-support/snapper/snapper/0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch
@@ -0,0 +1,30 @@
+From d103eaeae169708ca567f092182a89b79e5ab9db Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 20 Oct 2024 07:52:33 -0700
+Subject: [PATCH 1/2] Include linux/types.h for __u16/__u32/__u64 type
+
+This header is included indirectly with glibc but when using musl
+it ends up with compilation failure
+
+BcachefsUtils.cc:85:20: error: use of undeclared identifier '__u32'
+   85 |             args.dirfd = (__u32) fddst;
+      |                           ^
+
+Upstream-Status: Submitted [https://github.com/openSUSE/snapper/pull/945]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ snapper/BcachefsUtils.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/snapper/BcachefsUtils.cc b/snapper/BcachefsUtils.cc
+index e9163ffb..1d328a78 100644
+--- a/snapper/BcachefsUtils.cc
++++ b/snapper/BcachefsUtils.cc
+@@ -24,6 +24,7 @@
+ 
+ #include <cstring>
+ #include <cerrno>
++#include <linux/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ 
diff --git a/meta-oe/recipes-support/snapper/snapper/0002-Use-statvfs-instead-of-statvfs64.patch b/meta-oe/recipes-support/snapper/snapper/0002-Use-statvfs-instead-of-statvfs64.patch
new file mode 100644
index 0000000000..b915fda257
--- /dev/null
+++ b/meta-oe/recipes-support/snapper/snapper/0002-Use-statvfs-instead-of-statvfs64.patch
@@ -0,0 +1,37 @@
+From 0b39f4484553c796cb300fb4933ea314e91d913b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 20 Oct 2024 07:55:23 -0700
+Subject: [PATCH 2/2] Use statvfs instead of statvfs64
+
+when using LFS64 these functions are same and also
+on 64bit systems they are same. musl is using 64bit off_t
+by default and does not define LFS64 variants of these functions
+and it ends up in build errors
+
+Taken from Alpine Linux: [https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/snapper/statvfs64.patch]
+
+Upstream-Status: Submitted [https://github.com/openSUSE/snapper/pull/945]
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ snapper/FileUtils.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/snapper/FileUtils.cc b/snapper/FileUtils.cc
+index d4034279..4c8578a1 100644
+--- a/snapper/FileUtils.cc
++++ b/snapper/FileUtils.cc
+@@ -387,9 +387,9 @@ namespace snapper
+     std::pair<unsigned long long, unsigned long long>
+     SDir::statvfs() const
+     {
+-       struct statvfs64 fsbuf;
+-       if (fstatvfs64(dirfd, &fsbuf) != 0)
+-           SN_THROW(IOErrorException(sformat("statvfs64 failed path:%s errno:%d (%s)", base_path.c_str(),
++       struct statvfs fsbuf;
++       if (fstatvfs(dirfd, &fsbuf) != 0)
++           SN_THROW(IOErrorException(sformat("statvfs failed path:%s errno:%d (%s)", base_path.c_str(),
+                                              errno, stringerror(errno).c_str())));
+ 
+        // f_bavail is used (not f_bfree) since df seems to do the
diff --git a/meta-oe/recipes-support/snapper/snapper_0.11.2.bb b/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
new file mode 100644
index 0000000000..887615ef45
--- /dev/null
+++ b/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
@@ -0,0 +1,40 @@
+SUMMARY = "Snapper is a tool for Linux file system snapshot management"
+HOMEPAGE = "https://github.com/openSUSE/snapper"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS = "acl boost btrfs-tools dbus e2fsprogs json-c libxml2 lvm2 ncurses zlib"
+
+# Build separation is slightly broken
+inherit autotools-brokensep pkgconfig gettext
+
+SRC_URI = " \
+    git://github.com/openSUSE/snapper.git;protocol=https;branch=master \
+    file://0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch \
+    file://0002-Use-statvfs-instead-of-statvfs64.patch \
+"
+SRCREV = "6c603565f36e9996d85045c8012cd04aba5f3708"
+
+
+EXTRA_OECONF += "--disable-zypp"
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'api-documentation systemd pam', d)}"
+PACKAGECONFIG[pam] = "--enable-pam --with-pam-security=${base_libdir}/security, --disable-pam,libpam"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
+PACKAGECONFIG[api-documentation] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native"
+
+# Avoid HOSTTOOLS path in binaries
+export DIFFBIN = "${bindir}/diff"
+export RMBIN = "${bindir}/rm"
+export TOUCHBIN = "${bindir}/touch"
+export CPBIN = "${bindir}/cp"
+
+do_install:append() {
+        install -d ${D}${sysconfdir}/sysconfig
+        install -m0644 ${S}/data/default-config ${D}${sysconfdir}/sysconfig/snapper
+}
+
+FILES:${PN} += "${base_libdir}/security ${nonarch_libdir} ${systemd_system_unitdir} ${datadir}"
+
+# bash is needed for the testsuite
+RDEPENDS:${PN} = "bash diffutils util-linux util-linux-mount"
diff --git a/meta-oe/recipes-support/source-highlight/source-highlight_git.bb b/meta-oe/recipes-support/source-highlight/source-highlight_git.bb
new file mode 100644
index 0000000000..8b0a38095f
--- /dev/null
+++ b/meta-oe/recipes-support/source-highlight/source-highlight_git.bb
@@ -0,0 +1,35 @@
+SUMMARY = "Syntax highlight utility"
+DESCRIPTION = "Source-highlight converts source code to formatted text with syntax highlighting."
+HOMEPAGE = "https://www.gnu.org/software/src-highlite/"
+LICENSE = "GPL-3.0-only"
+SECTION = "libs"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb"
+
+SRCREV = "894cacd0799ca60afa359a63782729dec76cbb79"
+PV = "3.1.9+git"
+SRC_URI = "git://git.savannah.gnu.org/git/src-highlite.git;protocol=https;branch=master"
+
+inherit autotools pkgconfig
+
+DEPENDS:append = " bison-native boost"
+
+DEPENDS:append:class-target = " ${BPN}-native"
+
+EXTRA_OECONF = "--with-boost-regex=boost_regex"
+
+BBCLASSEXTEND = "native nativesdk"
+
+PACKAGES += "${PN}-tools ${PN}-data"
+
+RDEPENDS:${PN} = "boost-regex ${PN}-data"
+RDEPENDS:${PN}-tools = "${PN} ${PN}-data bash"
+
+FILES:${PN}       = "${libdir}/*${SOLIBS}"
+FILES:${PN}-data  = "${datadir}/source-highlight"
+FILES:${PN}-tools = "${bindir} ${sysconfdir}/bash_completion.d"
+
+# source-highlight is using its own binary from the build tree to make documentation
+# let's substitute the native binary instead
+do_configure:prepend:class-target () {
+     sed -i -e 's,^SRCHILITEEXE = $(top_builddir).*,SRCHILITEEXE = source-highlight,' ${S}/doc/Makefile.am
+}
diff --git a/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb b/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb
index 9dc393fd08..9fef39216f 100644
--- a/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb
+++ b/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb
@@ -6,6 +6,5 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 SRC_URI += "git://github.com/martinmoene/span-lite;branch=master;protocol=https"
 SRCREV = "50f55c59d1b66910837313c40d11328d03447a41"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb b/meta-oe/recipes-support/spdlog/spdlog_1.15.0.bb
index 19bac0be89..25d8249917 100644
--- a/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb
+++ b/meta-oe/recipes-support/spdlog/spdlog_1.15.0.bb
@@ -3,12 +3,12 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9"
 
-SRCREV = "27cb4c76708608465c413f6d0e6b8d99a4d84302"
+PV .= "+git"
+SRCREV = "96a8f6250cbf4e8c76387c614f666710a2fa9bad"
 SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x"
 
-DEPENDS = "fmt"
+DEPENDS += "fmt"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-oe/recipes-support/spitools/spitools_git.bb
index 1e3d6beaf4..e313685d95 100644
--- a/meta-oe/recipes-support/spitools/spitools_git.bb
+++ b/meta-oe/recipes-support/spitools/spitools_git.bb
@@ -1,12 +1,11 @@
 DESCRIPTION = "This package contains some simple command line tools to help using Linux spidev devices"
 HOMEPAGE = "https://github.com/cpb-/spi-tools"
-LICENSE="GPL-2.0-only"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381"
 
 PV = "1.0.2"
 SRCREV = "1748e092425a4a0ff693aa347062a57fc1ffdd00"
 
-S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=https;branch=master"
 
diff --git a/meta-oe/recipes-support/srecord/files/0001-fix-build-failure-with-gcc-15-by-adding-cstdint-head.patch b/meta-oe/recipes-support/srecord/files/0001-fix-build-failure-with-gcc-15-by-adding-cstdint-head.patch
new file mode 100644
index 0000000000..fe55fc5c87
--- /dev/null
+++ b/meta-oe/recipes-support/srecord/files/0001-fix-build-failure-with-gcc-15-by-adding-cstdint-head.patch
@@ -0,0 +1,36 @@
+From 69290e4d727492a63a2a4424368a476b86ef8183 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Mon, 7 Apr 2025 17:18:34 +0900
+Subject: [PATCH] fix build failure with gcc 15 by adding cstdint header
+
+Fixes #79
+
+srecord/input/file/hp64k.h:82:21: error: ‘uint16_t’ has not been declared
+   82 |     bool read_u16be(uint16_t *dest);
+      |                     ^~~~~~~~
+/home/abuild/rpmbuild/BUILD/srecord-1.65.0-build/srecord-1.65.0-Source/./srecord/input/file/hp64k.h:1:1: note: ‘uint16_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
+  +++ |+#include <cstdint>
+    1 | //
+make[2]: *** [srecord/CMakeFiles/lib_srecord.dir/build.make:222: srecord/CMakeFiles/lib_srecord.dir/arglex/tool/input.cc.o] Error 1
+
+    * From gcc 13, cstdint header must be explicitly included for uint_X data types.
+    * See also: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Upstream-Status: Submitted [https://github.com/sierrafoxtrot/srecord/pull/80]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ srecord/input/file/hp64k.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/srecord/input/file/hp64k.h b/srecord/input/file/hp64k.h
+index a3f8a6d..205e1e4 100644
+--- a/srecord/input/file/hp64k.h
++++ b/srecord/input/file/hp64k.h
+@@ -21,6 +21,7 @@
+ #define LIB_INPUT_FILE_HP64K
+ 
+ #include <srecord/input/file.h>
++#include <cstdint>
+ 
+ namespace srecord {
+ 
diff --git a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
index 3e8a87d07f..1797112a90 100644
--- a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
+++ b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
@@ -7,9 +7,11 @@ SRC_URI = " \
     https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}', 2)}/${BP}-Source.tar.gz \
     file://0001-Disable-doxygen.patch \
     file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \
-    file://0001-cmake-respect-explicit-install-prefix.patch"
+    file://0001-cmake-respect-explicit-install-prefix.patch \
+    file://0001-fix-build-failure-with-gcc-15-by-adding-cstdint-head.patch \
+"
 SRC_URI[sha256sum] = "81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644"
-S = "${WORKDIR}/${BP}-Source"
+S = "${UNPACKDIR}/${BP}-Source"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/srecord/files/releases"
 
diff --git a/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb
index bf9de31f84..d634ca1b6e 100644
--- a/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb
+++ b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb
@@ -22,10 +22,9 @@ SRC_URI = "http://sourceforge.net/projects/irstessi/files/${BPN}.${PV}.tgz \
            file://0004-include-limits.h.patch \
            file://0001-Include-libgen.h.patch \
            "
-SRC_URI[md5sum] = "d06c9b426437a7697d77266e9835b520"
 SRC_URI[sha256sum] = "59daab29363d6e9f07c524029c4239653cfbbee6b0e57fd75df62499728dad8a"
 
-S ="${WORKDIR}/${BPN}.${PV}"
+S = "${UNPACKDIR}/${BPN}.${PV}"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb
index 17f54dcf4c..bba2507e14 100644
--- a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb
+++ b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb
@@ -10,7 +10,6 @@ SRCREV = "e7c351c6c722336b3c79b79cd002c7c2986eefb0"
 SRC_URI = "git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master"
 SRC_URI[sha256sum] = "a715e46d8498418dbb8a2519318ba0714ee148151d7e4a7fa5e27770a2f6888f"
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep pkgconfig
 
diff --git a/meta-oe/recipes-support/synergy/synergy/CVE-2020-15117.patch b/meta-oe/recipes-support/synergy/synergy/CVE-2020-15117.patch
new file mode 100644
index 0000000000..4ad2a45275
--- /dev/null
+++ b/meta-oe/recipes-support/synergy/synergy/CVE-2020-15117.patch
@@ -0,0 +1,48 @@
+From 79efdb7c617b809e1a2daf17441d7a30f7046aa5 Mon Sep 17 00:00:00 2001
+From: Jnewbon <48688400+Jnewbon@users.noreply.github.com>
+Date: Tue, 14 Jul 2020 13:14:40 +0100
+Subject: [PATCH] Merge pull request from GHSA-chfm-333q-gfpp
+
+Attempts to fis DoS to servers with less then 4GB memory
+
+CVE: CVE-2020-15117
+Upstream-Status: Backport [https://github.com/deskflow/deskflow/commit/0a97c2be0da2d0df25cb86dfd642429e7a8bea39]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ src/lib/synergy/ProtocolUtil.cpp | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/synergy/ProtocolUtil.cpp b/src/lib/synergy/ProtocolUtil.cpp
+index d9f5dc324..7d2c37ff8 100644
+--- a/src/lib/synergy/ProtocolUtil.cpp
++++ b/src/lib/synergy/ProtocolUtil.cpp
+@@ -61,6 +61,9 @@ ProtocolUtil::readf(synergy::IStream* stream, const char* fmt, ...)
+     catch (XIO&) {
+         result = false;
+     }
++    catch (std::bad_alloc & exception) {
++        result = false;
++    }
+     va_end(args);
+     return result;
+ }
+@@ -216,7 +219,15 @@ ProtocolUtil::vreadf(synergy::IStream* stream, const char* fmt, va_list args)
+                 // allocate a buffer to read the data
+                 UInt8* sBuffer = buffer;
+                 if (!useFixed) {
+-                    sBuffer = new UInt8[len];
++                    try{
++                        sBuffer = new UInt8[len];
++                    }
++                    catch (std::bad_alloc & exception) {
++                        // Added try catch due to GHSA-chfm-333q-gfpp
++                        LOG((CLOG_ERR "ALLOC: Unable to allocate memory %d bytes", len));
++                        LOG((CLOG_DEBUG "bad_alloc detected: Do you have enough free memory?"));
++                        throw exception;
++                    }
+                 }
+ 
+                 // read the data
+-- 
+2.30.2
+
diff --git a/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-oe/recipes-support/synergy/synergy_git.bb
index fb767942fe..e215c62620 100644
--- a/meta-oe/recipes-support/synergy/synergy_git.bb
+++ b/meta-oe/recipes-support/synergy/synergy_git.bb
@@ -10,12 +10,12 @@ DEPENDS = "virtual/libx11 libxtst libxinerama curl openssl"
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "git://github.com/symless/synergy-core;protocol=https;nobranch=1"
+SRC_URI += "file://CVE-2020-15117.patch"
 
 # Version 1.10.1-stable
 SRCREV ?= "1b4c076127687aceac931d269e898beaac1cad9f"
 PV = "1.10.1+git"
 
-S = "${WORKDIR}/git"
 
 inherit cmake features_check
 
diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch
deleted file mode 100644
index f21ad5d70f..0000000000
--- a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 896d77dd949b52d6ea5798e5a038ba97d6b802be Mon Sep 17 00:00:00 2001
-From: Peter Marko <peter.marko@siemens.com>
-Date: Thu, 4 Apr 2024 15:44:18 +0200
-Subject: [PATCH] macros: guard ipv6 code with SYSLOG_NG_ENABLE_IPV6
-
-With ipv6 disabled, there are linking errors currently.
-This fixes it by not using the symbols when IPv6 is disabled.
-
-Solves #4810 with my config options
-https://github.com/openembedded/meta-openembedded/blob/2487e65ee3842b6ae0c7a2628985be6189ed9ebf/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb
-
-Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/4880]
-
-Signed-off-by: Peter Marko <peter.marko@siemens.com>
----
- lib/template/macros.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/template/macros.c b/lib/template/macros.c
-index 54142706c..fcb83637f 100644
---- a/lib/template/macros.c
-+++ b/lib/template/macros.c
-@@ -277,12 +277,14 @@ _get_originating_ip_protocol(const LogMessage *msg)
-     return 0;
-   if (g_sockaddr_inet_check(msg->saddr))
-     return 4;
-+#if SYSLOG_NG_ENABLE_IPV6
-   if (g_sockaddr_inet6_check(msg->saddr))
-     {
-       if (g_sockaddr_inet6_is_v4_mapped(msg->saddr))
-         return 4;
-       return 6;
-     }
-+#endif
-   return 0;
- }
- 
--- 
-2.30.2
-
diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd
index 851bf252b7..d3f3730105 100644
--- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd
+++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd
@@ -1,5 +1,6 @@
-@version: 3.36
-#
+@version: 4.8
+@include "scl.conf"
+
 # Syslog-ng configuration file, compatible with default Debian syslogd
 # installation. Originally written by anonymous (I can't find his name)
 # Revised, and rewrited by me (SZALAY Attila <sasa@debian.org>)
@@ -10,9 +11,9 @@
 #     Joe Slater <joe.slater@windriver.com>
 
 # First, set some global options.
-options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no);
-          owner("root"); group("adm"); perm(0640); stats_freq(0);
-          bad_hostname("^gconfd$");
+options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no);
+          dns_cache(no); owner("root"); group("adm"); perm(0640);
+          stats(freq(0)); bad_hostname("^gconfd$");
 };
 
 ########################
diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit
index 70afd0da84..2b18dce89c 100644
--- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit
+++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit
@@ -1,4 +1,4 @@
-@version: 3.36
+@version: 4.8
 #
 # Syslog-ng configuration file, compatible with default Debian syslogd
 # installation. Originally written by anonymous (I can't find his name)
@@ -10,9 +10,9 @@
 #     Joe Slater <joe.slater@windriver.com>
 
 # First, set some global options.
-options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no);
-          owner("root"); group("adm"); perm(0640); stats_freq(0);
-          bad_hostname("^gconfd$");
+options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no);
+          dns_cache(no); owner("root"); group("adm"); perm(0640);
+          stats(freq(0)); bad_hostname("^gconfd$");
 };
 
 ########################
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.8.2.bb
index ab4a8d1825..1b46d66d6c 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.8.2.bb
@@ -13,7 +13,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=924958cefc9f7de3e0b818832b8a1cec"
 
 # util-linux added to get libuuid
-DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl"
+DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl json-c"
 
 SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \
            file://syslog-ng.conf.systemd \
@@ -23,11 +23,10 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta
            file://syslog-ng-tmp.conf \
            file://syslog-ng.service-the-syslog-ng-service.patch \
            file://0001-Fix-buildpaths-warning.patch \
-           file://0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch \
 "
 SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch"
 
-SRC_URI[sha256sum] = "b69e3360dfb96a754a4e1cbead4daef37128b1152a23572356db4ab64a475d4f"
+SRC_URI[sha256sum] = "7d1ebe70746009dc06bd2fa5c412a1985579a9c887292f766cc775d169d60e68"
 
 UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"
 
@@ -60,19 +59,12 @@ PACKAGECONFIG[dbi] = "--enable-sql,--disable-sql,libdbi,"
 PACKAGECONFIG[spoof-source] = "--enable-spoof-source --with-libnet=${STAGING_BINDIR_CROSS},--disable-spoof-source,libnet,"
 PACKAGECONFIG[http] = "--enable-http,--disable-http,curl,"
 PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp,"
+PACKAGECONFIG[stomp] = "--enable-stomp,--disable-stomp,,"
 PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c,"
 PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers,"
 PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip,"
 PACKAGECONFIG[native] = "--enable-native,--disable-native,,"
-
-do_configure:prepend() {
-        olddir=$(pwd)
-        cd ${AUTOTOOLS_SCRIPT_PATH}
-
-        ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} -I ${S}/m4 ${ACLOCALEXTRAPATH} || die "extra autoreconf execution failed."
-
-        cd $olddir
-}
+PACKAGECONFIG[examples] = "--enable-example-modules,--disable-example-modules,,"
 
 do_install:append() {
     install -d ${D}${sysconfdir}/${BPN}
diff --git a/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb b/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb
deleted file mode 100644
index db4c395c56..0000000000
--- a/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "a graphical user interface that allows the user to \
-change the default keyboard of the system"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "https://fedorahosted.org/releases/s/y/${BPN}/${BP}.tar.bz2"
-SRC_URI[md5sum] = "c267db0ee7a2131ba418399dc17f9e72"
-SRC_URI[sha256sum] = "218c883e4e2bfcc82bfe07e785707b5c2ece28df772f2155fd044b9bb1614284"
-
-inherit python3-dir gettext
-DEPENDS += "intltool-native gettext-native"
-
-EXTRA_OEMAKE = " \
-    PYTHON='${STAGING_BINDIR_NATIVE}'/python-native/python \
-    PYTHON_SITELIB=${PYTHON_SITEPACKAGES_DIR} \
-"
-do_install() {
-    oe_runmake 'DESTDIR=${D}' install
-}
-
-do_install:append:class-native() {
-    rm -rf ${D}/usr
-}
-
-FILES:${PN} += " \
-   ${libdir}/python${PYTHON_BASEVERSION}/* \
-   ${datadir}/* \
-"
-BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb
new file mode 100644
index 0000000000..019098fdf7
--- /dev/null
+++ b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Forwards messages from the journal to other hosts over the network using the Syslog Protocol"
+
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI = "git://github.com/systemd/systemd-netlogd.git;protocol=https;branch=main"
+SRCREV = "b03cc3b1a75048c7cf19467d8918a4b7320767e6"
+
+inherit meson systemd pkgconfig useradd features_check
+
+REQUIRED_DISTRO_FEATURES = "systemd"
+COMPATIBLE_HOST:libc-musl = "null"
+
+
+DEPENDS += "systemd"
+DEPENDS += "openssl"
+DEPENDS += "gperf-native"
+DEPENDS += "python3-sphinx-native"
+
+# systemd-netlogd uses prefix and sysconfdir in a weird way.
+EXTRA_OEMESON += "--prefix ${libdir}/systemd --sysconfdir ${sysconfdir}/systemd"
+
+FILES:${PN} += "${libdir}"
+
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM:${PN} = "-r systemd-journal"
+USERADD_PARAM:${PN} = "--system -d / -M --shell /sbin/nologin -g systemd-journal systemd-journal-netlog"
diff --git a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch b/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch
deleted file mode 100644
index 640b131703..0000000000
--- a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7ffc1eba8596544d6e3af0fd5f4004fff6d56f84 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 29 Nov 2023 15:48:57 +0800
-Subject: [PATCH] hwloc_detection.cmake: remove cross-compiation check
-
-This check is preventing pkgconfig to
-search for hwloc under cross-compilation.
-
-pkgconfig able to find hwloc pkg from sysroot.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- cmake/hwloc_detection.cmake | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/cmake/hwloc_detection.cmake b/cmake/hwloc_detection.cmake
-index 47233b17..5a7e84c3 100644
---- a/cmake/hwloc_detection.cmake
-+++ b/cmake/hwloc_detection.cmake
-@@ -46,8 +46,6 @@ endforeach()
- unset(HWLOC_TARGET_NAME)
- 
- if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED AND
--    # No hwloc auto detection for cross compilation
--    NOT CMAKE_CROSSCOMPILING AND
-     NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH
- )
-     find_package(PkgConfig QUIET)
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb b/meta-oe/recipes-support/tbb/tbb_2022.1.0.bb
index f834726bd6..937cf6a0b9 100644
--- a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb
+++ b/meta-oe/recipes-support/tbb/tbb_2022.1.0.bb
@@ -12,12 +12,11 @@ DEPENDS:append:class-target = " hwloc"
 
 PE = "1"
 
-BRANCH = "onetbb_2021"
-SRCREV = "8b829acc65569019edb896c5150d427f288e8aba"
+BRANCH = "onetbb_2022"
+SRCREV = "45587e94dfb6dfe00220c5f520020a5bc745e92f"
 SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \
-            file://0001-hwloc_detection.cmake-remove-cross-compiation-check.patch \
-"
-S = "${WORKDIR}/git"
+          "
+
 
 inherit cmake pkgconfig
 
@@ -25,6 +24,8 @@ inherit cmake pkgconfig
 EXTRA_OECMAKE += " \
                     -DTBB_TEST=OFF \
                     -DCMAKE_BUILD_TYPE=Release \
+                    -DTBB_STRICT=OFF \
+                    -DTBB_DISABLE_HWLOC_AUTOMATIC_SEARCH=OFF \
                 "
 
 # Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi)
diff --git a/meta-oe/recipes-support/testdisk/testdisk_7.2.bb b/meta-oe/recipes-support/testdisk/testdisk_7.2.bb
new file mode 100644
index 0000000000..66d0cd4d0d
--- /dev/null
+++ b/meta-oe/recipes-support/testdisk/testdisk_7.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "TestDisk is a free data recovery software primarily designed to help recover lost partitions and/or make non-booting disks bootable again when these symptoms are caused by faulty software, certain types of viruses or human error (such as accidentally deleting your Partition Table)."
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS = "jpeg ncurses e2fsprogs"
+
+SRC_URI = "https://www.cgsecurity.org/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "f8343be20cb4001c5d91a2e3bcd918398f00ae6d8310894a5a9f2feb813c283f"
+
+inherit autotools pkgconfig
+COMPATIBLE_HOST:libc-musl = "null"
+
+PACKAGES =+ "${PN}-photorec"
+
+DESCRIPTION:${PN}-photorec = "Photorec is file data recovery software designed to recover lost files including video, documents and archives from Hard Disks and CDRom and lost pictures (Photo Recovery) from digital camera memory."
+FILES:${PN}-photorec = "${sbindir}/photorec"
+
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc
deleted file mode 100644
index d71aa442fa..0000000000
--- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc
+++ /dev/null
@@ -1,214 +0,0 @@
-# Autogenerated with 'bitbake -c update_crates thin-provisioning-tools'
-
-# from Cargo.lock
-SRC_URI += " \
-    crate://crates.io/adler/1.0.2 \
-    crate://crates.io/aho-corasick/1.1.2 \
-    crate://crates.io/anstyle/1.0.6 \
-    crate://crates.io/anyhow/1.0.80 \
-    crate://crates.io/atty/0.2.14 \
-    crate://crates.io/autocfg/1.1.0 \
-    crate://crates.io/base64/0.21.7 \
-    crate://crates.io/bitflags/1.3.2 \
-    crate://crates.io/bitflags/2.4.2 \
-    crate://crates.io/bytemuck/1.14.3 \
-    crate://crates.io/byteorder/1.5.0 \
-    crate://crates.io/cassowary/0.3.0 \
-    crate://crates.io/cfg-if/1.0.0 \
-    crate://crates.io/clap/4.5.1 \
-    crate://crates.io/clap_builder/4.5.1 \
-    crate://crates.io/clap_lex/0.7.0 \
-    crate://crates.io/console/0.15.8 \
-    crate://crates.io/crc32c/0.6.5 \
-    crate://crates.io/crc32fast/1.4.0 \
-    crate://crates.io/data-encoding/2.5.0 \
-    crate://crates.io/downcast/0.11.0 \
-    crate://crates.io/duct/0.13.7 \
-    crate://crates.io/encode_unicode/0.3.6 \
-    crate://crates.io/env_logger/0.8.4 \
-    crate://crates.io/errno/0.3.8 \
-    crate://crates.io/exitcode/1.1.2 \
-    crate://crates.io/fastrand/2.0.1 \
-    crate://crates.io/fixedbitset/0.4.2 \
-    crate://crates.io/flate2/1.0.28 \
-    crate://crates.io/fragile/2.0.0 \
-    crate://crates.io/getrandom/0.2.12 \
-    crate://crates.io/hermit-abi/0.1.19 \
-    crate://crates.io/hermit-abi/0.3.6 \
-    crate://crates.io/indicatif/0.17.8 \
-    crate://crates.io/instant/0.1.12 \
-    crate://crates.io/iovec/0.1.4 \
-    crate://crates.io/lazy_static/1.4.0 \
-    crate://crates.io/libc/0.2.153 \
-    crate://crates.io/linux-raw-sys/0.4.13 \
-    crate://crates.io/log/0.4.20 \
-    crate://crates.io/memchr/2.7.1 \
-    crate://crates.io/minimal-lexical/0.2.1 \
-    crate://crates.io/miniz_oxide/0.7.2 \
-    crate://crates.io/mockall/0.12.1 \
-    crate://crates.io/mockall_derive/0.12.1 \
-    crate://crates.io/nom/7.1.3 \
-    crate://crates.io/num-derive/0.4.2 \
-    crate://crates.io/num-traits/0.2.18 \
-    crate://crates.io/num_cpus/1.16.0 \
-    crate://crates.io/number_prefix/0.4.0 \
-    crate://crates.io/numtoa/0.1.0 \
-    crate://crates.io/once_cell/1.19.0 \
-    crate://crates.io/os_pipe/1.1.5 \
-    crate://crates.io/portable-atomic/1.6.0 \
-    crate://crates.io/ppv-lite86/0.2.17 \
-    crate://crates.io/predicates/3.1.0 \
-    crate://crates.io/predicates-core/1.0.6 \
-    crate://crates.io/predicates-tree/1.0.9 \
-    crate://crates.io/proc-macro2/1.0.78 \
-    crate://crates.io/quick-xml/0.31.0 \
-    crate://crates.io/quickcheck/1.0.3 \
-    crate://crates.io/quickcheck_macros/1.0.0 \
-    crate://crates.io/quote/1.0.35 \
-    crate://crates.io/rand/0.8.5 \
-    crate://crates.io/rand_chacha/0.3.1 \
-    crate://crates.io/rand_core/0.6.4 \
-    crate://crates.io/rangemap/1.5.0 \
-    crate://crates.io/redox_syscall/0.2.16 \
-    crate://crates.io/redox_termios/0.1.3 \
-    crate://crates.io/regex/1.10.3 \
-    crate://crates.io/regex-automata/0.4.5 \
-    crate://crates.io/regex-syntax/0.8.2 \
-    crate://crates.io/roaring/0.10.3 \
-    crate://crates.io/rustc_version/0.4.0 \
-    crate://crates.io/rustix/0.38.31 \
-    crate://crates.io/safemem/0.3.3 \
-    crate://crates.io/semver/1.0.22 \
-    crate://crates.io/shared_child/1.0.0 \
-    crate://crates.io/strsim/0.11.0 \
-    crate://crates.io/syn/1.0.109 \
-    crate://crates.io/syn/2.0.50 \
-    crate://crates.io/tempfile/3.10.0 \
-    crate://crates.io/termion/1.5.6 \
-    crate://crates.io/termtree/0.4.1 \
-    crate://crates.io/thiserror/1.0.57 \
-    crate://crates.io/thiserror-impl/1.0.57 \
-    crate://crates.io/threadpool/1.8.1 \
-    crate://crates.io/tui/0.19.0 \
-    crate://crates.io/unicode-ident/1.0.12 \
-    crate://crates.io/unicode-segmentation/1.11.0 \
-    crate://crates.io/unicode-width/0.1.11 \
-    crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
-    crate://crates.io/winapi/0.3.9 \
-    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
-    crate://crates.io/windows-sys/0.52.0 \
-    crate://crates.io/windows-targets/0.52.3 \
-    crate://crates.io/windows_aarch64_gnullvm/0.52.3 \
-    crate://crates.io/windows_aarch64_msvc/0.52.3 \
-    crate://crates.io/windows_i686_gnu/0.52.3 \
-    crate://crates.io/windows_i686_msvc/0.52.3 \
-    crate://crates.io/windows_x86_64_gnu/0.52.3 \
-    crate://crates.io/windows_x86_64_gnullvm/0.52.3 \
-    crate://crates.io/windows_x86_64_msvc/0.52.3 \
-"
-
-SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-SRC_URI[aho-corasick-1.1.2.sha256sum] = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
-SRC_URI[anstyle-1.0.6.sha256sum] = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
-SRC_URI[anyhow-1.0.80.sha256sum] = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
-SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
-SRC_URI[bytemuck-1.14.3.sha256sum] = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
-SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-SRC_URI[cassowary-0.3.0.sha256sum] = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
-SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-SRC_URI[clap-4.5.1.sha256sum] = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
-SRC_URI[clap_builder-4.5.1.sha256sum] = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
-SRC_URI[clap_lex-0.7.0.sha256sum] = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
-SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-SRC_URI[crc32c-0.6.5.sha256sum] = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2"
-SRC_URI[crc32fast-1.4.0.sha256sum] = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
-SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
-SRC_URI[downcast-0.11.0.sha256sum] = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
-SRC_URI[duct-0.13.7.sha256sum] = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c"
-SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
-SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
-SRC_URI[exitcode-1.1.2.sha256sum] = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193"
-SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
-SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
-SRC_URI[fragile-2.0.0.sha256sum] = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
-SRC_URI[getrandom-0.2.12.sha256sum] = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
-SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-SRC_URI[hermit-abi-0.3.6.sha256sum] = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
-SRC_URI[indicatif-0.17.8.sha256sum] = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
-SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
-SRC_URI[linux-raw-sys-0.4.13.sha256sum] = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
-SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
-SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
-SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
-SRC_URI[mockall-0.12.1.sha256sum] = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48"
-SRC_URI[mockall_derive-0.12.1.sha256sum] = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2"
-SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-SRC_URI[num-derive-0.4.2.sha256sum] = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
-SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
-SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
-SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-SRC_URI[os_pipe-1.1.5.sha256sum] = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9"
-SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
-SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-SRC_URI[predicates-3.1.0.sha256sum] = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
-SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
-SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
-SRC_URI[proc-macro2-1.0.78.sha256sum] = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
-SRC_URI[quick-xml-0.31.0.sha256sum] = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
-SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
-SRC_URI[quickcheck_macros-1.0.0.sha256sum] = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9"
-SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
-SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-SRC_URI[rangemap-1.5.0.sha256sum] = "795915a3930a5d6bafd9053d37602fea3e61be2e5d4d788983a8ba9654c1c6f2"
-SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-SRC_URI[redox_termios-0.1.3.sha256sum] = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb"
-SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
-SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
-SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-SRC_URI[roaring-0.10.3.sha256sum] = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf"
-SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-SRC_URI[rustix-0.38.31.sha256sum] = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
-SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-SRC_URI[semver-1.0.22.sha256sum] = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
-SRC_URI[shared_child-1.0.0.sha256sum] = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef"
-SRC_URI[strsim-0.11.0.sha256sum] = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
-SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-SRC_URI[syn-2.0.50.sha256sum] = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb"
-SRC_URI[tempfile-3.10.0.sha256sum] = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
-SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e"
-SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
-SRC_URI[thiserror-1.0.57.sha256sum] = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
-SRC_URI[thiserror-impl-1.0.57.sha256sum] = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
-SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
-SRC_URI[tui-0.19.0.sha256sum] = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1"
-SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
-SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-SRC_URI[windows-targets-0.52.3.sha256sum] = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f"
-SRC_URI[windows_aarch64_gnullvm-0.52.3.sha256sum] = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6"
-SRC_URI[windows_aarch64_msvc-0.52.3.sha256sum] = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f"
-SRC_URI[windows_i686_gnu-0.52.3.sha256sum] = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb"
-SRC_URI[windows_i686_msvc-0.52.3.sha256sum] = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58"
-SRC_URI[windows_x86_64_gnu-0.52.3.sha256sum] = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614"
-SRC_URI[windows_x86_64_gnullvm-0.52.3.sha256sum] = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c"
-SRC_URI[windows_x86_64_msvc-0.52.3.sha256sum] = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6"
diff --git a/meta-oe/recipes-support/tio/tio_2.7.bb b/meta-oe/recipes-support/tio/tio_3.9.bb
index 59c772b5d0..67107e2924 100644
--- a/meta-oe/recipes-support/tio/tio_2.7.bb
+++ b/meta-oe/recipes-support/tio/tio_3.9.bb
@@ -2,18 +2,16 @@ SUMMARY = "tio - a simple serial device I/O tool"
 DESCRIPTION = "tio is a simple serial device tool which features a \
     straightforward command-line and configuration file interface to easily \
     connect to serial TTY devices for basic I/O operations."
-
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0e1a95b7892d3015ecd6d0016f601f2c"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d25b0ab86d83b943da4d25251a2c21d7"
+DEPENDS += " glib-2.0 lua"
+SRCREV = "bdfe87e1cbf6e3bfd48324a25ea026fcd3cc47e9"
 
-SRC_URI = "git://github.com/tio/tio;protocol=https;branch=master"
-SRCREV = "1c32555c2a4f26b60f94757656825fc6684d6892"
+SRC_URI = "git://github.com/tio/tio;protocol=https;branch=master;tag=v${PV}"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
-DEPENDS += " libinih"
-RDEPENDS:${PN} += " libinih"
+RDEPENDS:${PN} += " lua"
 
-FILES:${PN} += " /usr/share/bash-completion/completions/tio "
+FILES:${PN} += " ${datadir}/bash-completion/completions/tio"
diff --git a/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb b/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb
index ae00ff4e55..75f68ab5f5 100644
--- a/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb
+++ b/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb
@@ -20,7 +20,6 @@ SRC_URI = "http://fallabs.com/tokyocabinet/${BP}.tar.gz \
            file://0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch \
 "
 
-SRC_URI[md5sum] = "fd03df6965f8f56dd5b8518ca43b4f5e"
 SRC_URI[sha256sum] = "a003f47c39a91e22d76bc4fe68b9b3de0f38851b160bbb1ca07a4f6441de1f90"
 
 DEPENDS = "bzip2 zlib"
diff --git a/meta-oe/recipes-support/tree/tree_2.1.1.bb b/meta-oe/recipes-support/tree/tree_2.2.1.bb
index 0b61149609..df52d63fbb 100644
--- a/meta-oe/recipes-support/tree/tree_2.1.1.bb
+++ b/meta-oe/recipes-support/tree/tree_2.2.1.bb
@@ -1,11 +1,11 @@
 SUMMARY = "A recursive directory listing command"
-HOMEPAGE = "http://mama.indstate.edu/users/ice/tree/"
+HOMEPAGE = "https://oldmanprogrammer.net/source.php?dir=projects/tree"
 SECTION = "console/utils"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
 
-SRC_URI = "http://mama.indstate.edu/users/ice/tree/src/${BP}.tgz"
-SRC_URI[sha256sum] = "d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5"
+SRC_URI = "https://oldmanprogrammer.net/tar/tree/${BP}.tgz"
+SRC_URI[sha256sum] = "68ac45dc78c0c311ada06200ffc3c285e74223ba208061f8d15ffac25e44b2ec"
 
 # tree's default CFLAGS for Linux
 CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
diff --git a/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb
index cb1cbe670d..85859cd968 100644
--- a/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb
+++ b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb
@@ -22,7 +22,6 @@ SRC_URI = " \
         file://0001-Makefile.am-Dont-include-buildpath.patch \
 "
 SRCREV = "18c9faf089e306ad6f3f51f5cb887a6b9aa08350"
-S = "${WORKDIR}/git"
 
 CVE_PRODUCT = "udisks"
 
diff --git a/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb b/meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb
index 8b334dbdec..f4c2eaa63f 100644
--- a/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb
+++ b/meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb
@@ -6,9 +6,10 @@ DEPENDS = "libusb1"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCREV = "20276ad5ced147d018e2b3fccedabd94597aa25e"
+SRCREV = "352f5878e999c0a9d5a453b34110479b2056d7e7"
 SRC_URI = "git://github.com/mvp/${BPN};branch=master;protocol=https"
-S = "${WORKDIR}/git"
+
+inherit pkgconfig
 
 # uhubctl gets its program version from "git describe". As we use the source
 # archive do reduce download size replace the call with our hardcoded version.
diff --git a/meta-oe/recipes-support/uim/uim_1.8.9.bb b/meta-oe/recipes-support/uim/uim_1.9.0.bb
index f78c82f18a..cb3aee3f0d 100644
--- a/meta-oe/recipes-support/uim/uim_1.8.9.bb
+++ b/meta-oe/recipes-support/uim/uim_1.9.0.bb
@@ -8,9 +8,10 @@ SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2"
 SRC_URI:append:class-target = "\
     file://uim-module-manager.patch \
 "
-SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4"
+SRC_URI[sha256sum] = "271f0ed5f455e5bffa859f01b2d0f7fb966554ebd4822657afb67a0431dd85a8"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit"
 DEPENDS:append:class-target = " intltool-native gtk+ gtk+3 uim-native"
@@ -30,6 +31,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 GTKIMMODULES_PACKAGES = "uim-gtk2.0 uim-gtk3"
 
+CFLAGS += "-std=gnu17"
+
 EXTRA_OECONF += "--disable-emacs \
     --with-libedit=${STAGING_EXECPREFIXDIR} \
     --without-scim \
diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb
index 026d4ffe02..890568d727 100644
--- a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb
+++ b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb
@@ -1,19 +1,18 @@
 SUMMARY = "Unicode Character Database"
 HOMEPAGE = "https://unicode.org/ucd/"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${UNPACKDIR}/license.txt;md5=4b11b5cbb0a24df9f4e7db63db98f22f"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ucd-license-v3.txt;md5=ea17640caddb659394df50e5db6efd69"
 
 SRC_URI = " \
     https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \
-    https://www.unicode.org/license.txt;name=ucd-license \
+    https://www.unicode.org/license.txt;downloadfilename=ucd-license-v3.txt;name=ucd-license \
 "
 SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600"
-SRC_URI[ucd-license.sha256sum] = "f7830d126f59d83842565d3dddedc79db4ca978ed52aee0ebcc040ea76a85519"
+SRC_URI[ucd-license.sha256sum] = "abf84f74dea2812799e1dbef7f0581adf7db244881e4febb8684f441568da0ad"
 
 inherit allarch
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure[noexec] = "1"
 
diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb
index dfad833e0a..389c3be903 100644
--- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb
+++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb
@@ -15,11 +15,12 @@ SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \
 "
 SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec"
 
+UPSTREAM_CHECK_URI = "https://www.unixodbc.org/download.html"
 UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar"
 
 inherit autotools-brokensep multilib_header qemu
 
-S = "${WORKDIR}/unixODBC-${PV}"
+S = "${UNPACKDIR}/unixODBC-${PV}"
 
 EXTRA_OEMAKE += "LIBS=-lltdl"
 EXTRA_OECONF += "--enable-utf8ini"
diff --git a/meta-oe/recipes-support/upower/power-profiles-daemon_0.30.bb b/meta-oe/recipes-support/upower/power-profiles-daemon_0.30.bb
new file mode 100644
index 0000000000..f9f7e86990
--- /dev/null
+++ b/meta-oe/recipes-support/upower/power-profiles-daemon_0.30.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Makes power profiles handling available over D-Bus"
+HOMEPAGE = "https://gitlab.freedesktop.org/upower/power-profile-daemon"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+DEPENDS = " \
+    glib-2.0 \
+    polkit \
+    upower \
+    libgudev \
+"
+
+inherit meson pkgconfig systemd features_check
+
+REQUIRED_DISTRO_FEATURES = "polkit"
+
+EXTRA_OEMESON = "-Dtests=false"
+
+SRCREV = "5b4994c8a91290481bef87a5bae95391d0ec677f"
+SRC_URI = "git://gitlab.freedesktop.org/upower/power-profiles-daemon;branch=main;protocol=https"
+
+do_install:append() {
+        install -d ${D}${sysconfdir}/tmpfiles.d
+        echo "d ${localstatedir}/lib/power-profiles-daemon 700 root root - -" > ${D}${sysconfdir}/tmpfiles.d/power-profiles-daemon.conf
+        sed -i -e 's|After=multi-user.target |After=|g' ${D}${systemd_system_unitdir}/power-profiles-daemon.service
+}
+
+FILES:${PN} += "${sysconfdir}/tmpfiles.d ${datadir}/dbus-1 ${datadir}/polkit-1 ${systemd_system_unitdir}"
diff --git a/meta-oe/recipes-support/upower/upower_0.99.17.bb b/meta-oe/recipes-support/upower/upower_1.90.6.bb
index 0572cc801b..d2f58d5b22 100644
--- a/meta-oe/recipes-support/upower/upower_0.99.17.bb
+++ b/meta-oe/recipes-support/upower/upower_1.90.6.bb
@@ -11,11 +11,12 @@ DEPENDS = " \
     dbus-glib \
 "
 
-SRC_URI = "git://gitlab.freedesktop.org/upower/upower.git;protocol=https;branch=master"
-SRCREV = "c889154ec8e3e2239db9260d48b2e198d72ba002"
-S = "${WORKDIR}/git"
+SRC_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/archive/v${PV}/${BPN}-v${PV}.tar.bz2"
+SRC_URI[sha256sum] = "aed4e42a21307512ad236ad58d7ee4e0196670c8524a168a0edccdc32964ea0c"
+S = "${UNPACKDIR}/${BPN}-v${PV}"
 
-UPSTREAM_CHECK_GITTAGREGEX = "UPOWER_(?P<pver>\d+(\_\d+)+)"
+UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/tags"
+UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 GIR_MESON_ENABLE_FLAG = "enabled"
 GIR_MESON_DISABLE_FLAG = "disabled"
@@ -23,9 +24,10 @@ GTKDOC_MESON_OPTION = "gtk-doc"
 
 inherit meson pkgconfig gtk-doc gettext gobject-introspection systemd
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)}"
 PACKAGECONFIG[idevice] = "-Didevice=enabled,-Didevice=disabled,libimobiledevice libplist"
 PACKAGECONFIG[systemd] = "-Dsystemdsystemunitdir=${systemd_system_unitdir},-Dsystemdsystemunitdir=no -Dudevrulesdir=${base_libdir}/udev/rules.d,systemd"
+PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit"
 
 EXTRA_OEMESON = " \
     -Dos_backend=linux \
@@ -36,9 +38,16 @@ SYSTEMD_SERVICE:${PN} = "upower.service"
 # don't start on boot by default - dbus does that on demand
 SYSTEMD_AUTO_ENABLE = "disable"
 
-RDEPENDS:${PN} += "dbus"
+RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_dbus}"
 RRECOMMENDS:${PN} += "pm-utils"
 FILES:${PN} += " \
     ${datadir}/dbus-1/ \
+    ${datadir}/polkit-1/ \
     ${base_libdir}/udev/* \
 "
+
+do_install:append() {
+    # remove integration tests scripts
+    rm -rf ${D}${datadir}/installed-tests
+    rm -rf ${D}${libexecdir}/upower
+}
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb
index 351fe44d70..2dfcd886ca 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb
@@ -7,7 +7,6 @@ inherit allarch
 DEPENDS += "tcl-native"
 
 SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2"
-SRC_URI[md5sum] = "e8fce7eb949cbe16c61fb71bade4cc17"
 SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9"
 
 do_install() {
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..eb65beb686
--- /dev/null
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch
@@ -0,0 +1,51 @@
+From f497eef1f38bd79a96a13269f251f1413c54b790 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Tue, 25 Mar 2025 12:36:32 +0100
+Subject: [PATCH] Fix build with gcc-15
+
+* fixes:
+  http://errors.yoctoproject.org/Errors/Details/848747/
+
+usb_modeswitch.c: In function 'main':
+usb_modeswitch.c:573:28: error: too many arguments to function 'get_current_config_value'; expected 0, have 1
+  573 |         currentConfigVal = get_current_config_value(dev);
+      |                            ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~
+In file included from usb_modeswitch.c:59:
+usb_modeswitch.h:55:5: note: declared here
+   55 | int get_current_config_value();
+      |     ^~~~~~~~~~~~~~~~~~~~~~~~
+usb_modeswitch.c:775:52: error: too many arguments to function 'get_current_config_value'; expected 0, have 1
+  775 |                                 currentConfigVal = get_current_config_value(dev);
+      |                                                    ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~
+usb_modeswitch.h:55:5: note: declared here
+   55 | int get_current_config_value();
+      |     ^~~~~~~~~~~~~~~~~~~~~~~~
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+Upstream-Status: Submitted [https://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=3122]
+---
+ usb_modeswitch.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/usb_modeswitch.c b/usb_modeswitch.c
+index 2d4c0aa..bfbcbfb 100644
+--- a/usb_modeswitch.c
++++ b/usb_modeswitch.c
+@@ -570,7 +570,7 @@ int main(int argc, char **argv)
+        /* Get current configuration of default device, note value if Configuration
+         * parameter is set. Also sets active_config
+         */
+-       currentConfigVal = get_current_config_value(dev);
++       currentConfigVal = get_current_config_value();
+        if (Configuration > -1) {
+                SHOW_PROGRESS(output,"Current configuration number is %d\n", currentConfigVal);
+        } else
+@@ -772,7 +772,7 @@ int main(int argc, char **argv)
+        if (Configuration > 0) {
+                if (currentConfigVal != Configuration) {
+                        if (switchConfiguration()) {
+-                               currentConfigVal = get_current_config_value(dev);
++                               currentConfigVal = get_current_config_value();
+                                if (currentConfigVal == Configuration) {
+                                        SHOW_PROGRESS(output,"The configuration was set successfully\n");
+                                } else {
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb
index cd3840feab..b6b720fe1e 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb
@@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=091556bd6d0154cd4c2d17a1bfc7380a"
 
 DEPENDS = "libusb1"
 
-SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2"
+SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2 \
+    file://0001-Fix-build-with-gcc-15.patch \
+"
 SRC_URI[sha256sum] = "5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34"
 
 inherit pkgconfig systemd
diff --git a/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb b/meta-oe/recipes-support/usbids/usbids_2025.04.01.bb
index b0dd72fb25..aa884419f8 100644
--- a/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb
+++ b/meta-oe/recipes-support/usbids/usbids_2025.04.01.bb
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
 SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https"
 
-SRCREV = "7963233faf69eb9c80ffca8dfc1f31940f75999f"
+# April 1, 2025
+SRCREV = "635738b64eb52d376c5d1756c265de67236c8934"
 
-S = "${WORKDIR}/git"
 
 do_install() {
         install -d ${D}${datadir}
diff --git a/meta-oe/recipes-support/uthash/uthash_2.3.0.bb b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb
index ef15613586..357ddfdbca 100644
--- a/meta-oe/recipes-support/uthash/uthash_2.3.0.bb
+++ b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb
@@ -16,7 +16,6 @@ SRC_URI = "\
     file://run-ptest \
 "
 
-S = "${WORKDIR}/git"
 
 inherit ptest
 
diff --git a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
index bd69dbb11c..e42b19a8d0 100644
--- a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
+++ b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
@@ -14,6 +14,5 @@ SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24"
 
 PV = "1.0.6+git"
 
-S = "${WORKDIR}/git"
 
 PARALLEL_MAKE = ""
diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb
index ddd27a7e30..44994cafe0 100644
--- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb
+++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb
@@ -18,4 +18,3 @@ SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc"
 
 PV = "1.1.2+git"
 
-S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb
index d964d7f263..eccaa81d18 100644
--- a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb
+++ b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb
@@ -16,4 +16,3 @@ DEPENDS += "mtdev utouch-frame utouch-evemu libx11"
 
 PV = "1.1.7+git"
 
-S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fix-bool-reserved-word-error-in-gcc-15.patch b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fix-bool-reserved-word-error-in-gcc-15.patch
new file mode 100644
index 0000000000..ec75d5a423
--- /dev/null
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fix-bool-reserved-word-error-in-gcc-15.patch
@@ -0,0 +1,28 @@
+From 76c443dfd209ddbed3ed4102596a568670d4c59f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 1 May 2025 20:16:11 -0700
+Subject: [PATCH] fix bool reserved word error in gcc 15
+
+gcc-15 switched to -std=c23 by default. https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
+
+Upstream-Status: Submitted [https://www.virtualbox.org/pipermail/vbox-dev/2025-May/010316.html]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ vboxsf/include/iprt/types.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/vboxsf/include/iprt/types.h b/vboxsf/include/iprt/types.h
+index 3bcc4146..33b46ef6 100644
+--- a/vboxsf/include/iprt/types.h
++++ b/vboxsf/include/iprt/types.h
+@@ -282,7 +282,9 @@ typedef _Bool bool;
+ #   endif
+ #  else
+ #   undef bool /* see above netbsd explanation */
+-typedef _Bool bool;
++#   if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L
++     typedef _Bool bool;
++#   endif
+ #  endif
+ # else
+ #  if RT_MSC_PREREQ(RT_MSC_VER_VC120)
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.1.8.bb
index 47f616e990..dbfa454f13 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.1.8.bb
@@ -1,34 +1,36 @@
 SUMMARY = "VirtualBox Linux Guest Drivers"
 SECTION = "core"
 LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=217590d3a513571b94632edf5fa1169a"
 
 DEPENDS = "virtual/kernel"
 
 inherit module kernel-module-split
 
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm64)"
 
 VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
+    file://0001-fix-bool-reserved-word-error-in-gcc-15.patch \
 "
 
-SRC_URI[sha256sum] = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"
+SRC_URI[sha256sum] = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d"
 
-S ?= "${WORKDIR}/vbox_module"
-S:task-patch = "${WORKDIR}/${VBOX_NAME}"
+S ?= "${UNPACKDIR}/vbox_module"
+S:task-unpack = "${UNPACKDIR}/${VBOX_NAME}"
+S:task-patch = "${UNPACKDIR}/${BP}"
 
-export VBOX_KBUILD_TARGET_ARCH="${ARCH}"
-export VBOX_KBUILD_TARGET_ARCH:x86-64="amd64"
+export VBOX_KBUILD_TARGET_ARCH = "${ARCH}"
+export VBOX_KBUILD_TARGET_ARCH:x86-64 = "amd64"
 
-EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1 CC='${CC} ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -fdebug-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}'"
+EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1 CC='${CC} ${DEBUG_PREFIX_MAP} -ffile-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -ffile-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}'"
 
 # otherwise 5.2.22 builds just vboxguest
 MAKE_TARGETS = "all"
 
-addtask export_sources after do_patch before do_configure
+addtask export_sources before do_patch after do_unpack
 do_export_sources[depends] += "virtual/kernel:do_shared_workdir"
 
 do_export_sources() {
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch
new file mode 100644
index 0000000000..40a7133052
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch
@@ -0,0 +1,30 @@
+From 984538dcce7b184269efc1e1b0fb78e1cb932b5d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 21 Mar 2025 01:21:22 -0700
+Subject: [PATCH] Fix build errors on RISCV
+ https://bugs.webkit.org/show_bug.cgi?id=290163
+
+Reviewed by NOBODY (OOPS!).
+
+Include c++ header <system_error> for std::error_code.
+
+* Source/WebCore/contentextensions/ContentExtensionActions.h: Include system_error
+
+Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/42802]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Source/WebCore/contentextensions/ContentExtensionActions.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/contentextensions/ContentExtensionActions.h b/Source/WebCore/contentextensions/ContentExtensionActions.h
+index 0b75d2e1df78..61cb33c94ce8 100644
+--- a/Source/WebCore/contentextensions/ContentExtensionActions.h
++++ b/Source/WebCore/contentextensions/ContentExtensionActions.h
+@@ -28,6 +28,7 @@
+ #if ENABLE(CONTENT_EXTENSIONS)
+ 
+ #include "ContentExtensionStringSerialization.h"
++#include <system_error>
+ #include <wtf/JSONValues.h>
+ #include <wtf/Hasher.h>
+ 
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch
deleted file mode 100644
index e6a43c2fff..0000000000
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fb81a5de7798eb7f68e0de1c281671553e1aa19d Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@redhat.com>
-Date: Mon, 5 Feb 2024 11:00:49 -0600
-Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?=
- =?UTF-8?q?=E2=80=98t6=E2=80=99=20was=20not=20declared=20in=20this=20scope?=
- =?UTF-8?q?=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid=3D268739?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Unreviewed build fix. Seems a backport went badly, and we didn't notice
-because the code is architecture-specific.
-
-* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:
-(JSC::CLoop::execute):
-
-Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-index 75cecbbd..b1020ea4 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
-     UNUSED_VARIABLE(t2);
-     UNUSED_VARIABLE(t3);
-     UNUSED_VARIABLE(t5);
--    UNUSED_VARIABLE(t6);
--    UNUSED_VARIABLE(t7);
- 
-     struct StackPointerScope {
-         StackPointerScope(CLoopStack& stack)
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch
deleted file mode 100644
index b2e40a88c8..0000000000
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 1523e00a2a76e285262c8aa3721b5d99f3f2d612 Mon Sep 17 00:00:00 2001
-From: Thomas Devoogdt <thomas.devoogdt@barco.com>
-Date: Mon, 16 Jan 2023 17:03:30 +0100
-Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix
-
- !ENABLE(WEBASSEMBLY_B3JIT)
-
-https://bugs.webkit.org/show_bug.cgi?id=250681
-
-Reviewed by NOBODY (OOPS!).
-
-WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT).
-Also, toB3Type and simdScalarType are not defined if it is included.
-
-Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
-
-Upstream-Status: Inappropriate [https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2008798]
----
- Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp
-index eaaa3749..1d089783 100644
---- a/Source/JavaScriptCore/b3/B3Validate.cpp
-+++ b/Source/JavaScriptCore/b3/B3Validate.cpp
-@@ -47,6 +47,12 @@
- #include <wtf/StringPrintStream.h>
- #include <wtf/text/CString.h>
- 
-+#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT)
-+#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type))
-+#else
-+#define simdScalarTypeToB3Type(type) B3::Type()
-+#endif
-+
- namespace JSC { namespace B3 {
- 
- namespace {
-@@ -454,7 +460,7 @@ public:
-             case VectorExtractLane:
-                 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
-                 VALIDATE(value->numChildren() == 1, ("At ", *value));
--                VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
-+                VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
-                 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
-                 break;
-             case VectorReplaceLane:
-@@ -462,7 +468,7 @@ public:
-                 VALIDATE(value->numChildren() == 2, ("At ", *value));
-                 VALIDATE(value->type() == V128, ("At ", *value));
-                 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
--                VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
-+                VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
-                 break;
-             case VectorDupElement:
-                 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
-@@ -484,7 +490,7 @@ public:
-                 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
-                 VALIDATE(value->numChildren() == 1, ("At ", *value));
-                 VALIDATE(value->type() == V128, ("At ", *value));
--                VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
-+                VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
-                 break;
- 
-             case VectorPopcnt:
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-ftbfs-riscv64.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-ftbfs-riscv64.patch
new file mode 100644
index 0000000000..00347ef3e1
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-ftbfs-riscv64.patch
@@ -0,0 +1,39 @@
+From: Alberto Garcia <berto@igalia.com>
+Description: Use WTF_CPU_UNKNOWN when building for riscv64
+ WebKitGTK doesn't build on riscv64 even with the JIT disabled.
+ Treating the CPU as unknown is perhaps a bit severe, but it allows us
+ to get the build done until someone steps up to maintain this
+ properly.
+Bug: https://bugs.webkit.org/show_bug.cgi?id=271371
+Forwarded: no
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/Source/WTF/wtf/PlatformCPU.h
++++ b/Source/WTF/wtf/PlatformCPU.h
+@@ -286,14 +286,6 @@
+ 
+ #endif /* ARM */
+ 
+-/* CPU(RISCV64) - RISC-V 64-bit */
+-#if    defined(__riscv) \
+-    && defined(__riscv_xlen) \
+-    && (__riscv_xlen == 64)
+-#define WTF_CPU_RISCV64 1
+-#define WTF_CPU_KNOWN 1
+-#endif
+-
+ #if !CPU(KNOWN)
+ #define WTF_CPU_UNKNOWN 1
+ #endif
+--- a/Source/cmake/WebKitCommon.cmake
++++ b/Source/cmake/WebKitCommon.cmake
+@@ -125,8 +125,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+         set(WTF_CPU_PPC64 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
+         set(WTF_CPU_PPC64LE 1)
+-    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64")
+-        set(WTF_CPU_RISCV64 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64")
+         set(WTF_CPU_LOONGARCH64 1)
+     else ()
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-typo-denormaldisabler.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-typo-denormaldisabler.patch
new file mode 100644
index 0000000000..c3383fcd41
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-typo-denormaldisabler.patch
@@ -0,0 +1,18 @@
+From: Alberto Garcia <berto@igalia.com>
+Subject: Fix build failure due to missing semicolon
+
+Source: https://sources.debian.org/data/main/w/webkit2gtk/2.48.1-2/debian/patches/fix-typo-denormaldisabler.patch
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/Source/WebCore/platform/audio/DenormalDisabler.cpp
++++ b/Source/WebCore/platform/audio/DenormalDisabler.cpp
+@@ -91,7 +91,7 @@ DenormalDisabler::~DenormalDisabler()
+     }
+ }
+ #else
+-DenormalDisabler::DenormalDisabler() = default
++DenormalDisabler::DenormalDisabler() = default;
+ DenormalDisabler::~DenormalDisabler() = default;
+ #endif
+ 
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch
index 37bc6538c3..367e6b8342 100644
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch
@@ -1,6 +1,6 @@
-From c50f2277509f2e6f087cda2eaf323eaf569aad8d Mon Sep 17 00:00:00 2001
+From 4602261fa44d6bbb4c3698c79e08a6a40a6edc5a Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 30 Sep 2023 12:42:06 -0700
+Date: Fri, 12 Jan 2024 09:21:39 -0800
 Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL
 
 This causes clang-17 to crash see [1]
@@ -9,22 +9,26 @@ this code is new in webkit 2.42[2] thats why we do not see the crash in older we
 [1] https://github.com/llvm/llvm-project/issues/67767
 [2] https://github.com/WebKit/WebKit/commit/4d816460b765acd8aef90ab474615850b91ecc35
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [work around to avoid clang compiler crash]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Update context for webkitgtk 2.48.0.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
  Source/WTF/wtf/Compiler.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
-index 449ca502..daac29d7 100644
+index 16e416d..68dd9a0 100644
 --- a/Source/WTF/wtf/Compiler.h
 +++ b/Source/WTF/wtf/Compiler.h
-@@ -321,7 +321,7 @@
- /* MUST_TAIL_CALL */
- 
+@@ -293,7 +293,7 @@
+ #if COMPILER(CLANG)
+ #if __SIZEOF_POINTER__ == 8
  #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute)
--#if __has_cpp_attribute(clang::musttail)
-+#if __has_cpp_attribute(clang::musttail) && !defined(__arm__)
+-#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32)
++#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) && !defined(__arm__)
  #define MUST_TAIL_CALL [[clang::musttail]]
- #endif
+ #define HAVE_MUST_TAIL_CALL 1
  #endif
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/sys_futex.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/sys_futex.patch
new file mode 100644
index 0000000000..19d18dea88
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/sys_futex.patch
@@ -0,0 +1,16 @@
+Fix build on newer 32bit architectures with only 64bit time_t
+
+Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/angle/angle/+/6108397]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp
++++ b/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp
+@@ -17,6 +17,9 @@
+ #        include <linux/futex.h>
+ #        include <sys/syscall.h>
+ #        include <unistd.h>
++#        if !defined(SYS_futex) && defined(SYS_futex_time64)
++#           define SYS_futex SYS_futex_time64
++#        endif
+ #    endif  // defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_ANDROID)
+ 
+ #    if defined(ANGLE_PLATFORM_WINDOWS)
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.1.bb
index 31480b8d8e..d11d4808fd 100644
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.1.bb
@@ -1,4 +1,8 @@
 SUMMARY = "WebKit web rendering engine for the GTK+ platform"
+DESCRIPTION = "\
+    This recipe builds with Gtk3 (instead of Gtk4) which results in API version 4.1 \
+    (having javascriptcoregtk-4.1.pc instead of 6.0). \
+"
 HOMEPAGE = "https://www.webkitgtk.org/"
 BUGTRACKER = "https://bugs.webkit.org/"
 
@@ -13,14 +17,16 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
            file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
            file://reproducibility.patch \
            file://no-musttail-arm.patch \
-           file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \
-           file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \
+           file://sys_futex.patch \
+           file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \
+           file://fix-typo-denormaldisabler.patch \
+           file://fix-ftbfs-riscv64.patch \
            "
-SRC_URI[sha256sum] = "523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b"
+SRC_URI[sha256sum] = "98efdf21c4cdca0fe0b73ab5a8cb52093b5aa52d9b1b016a93f71dbfa1eb258f"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
 
-S = "${WORKDIR}/webkitgtk-${PV}"
+S = "${UNPACKDIR}/webkitgtk-${PV}"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}"
@@ -46,6 +52,8 @@ DEPENDS += " \
           gettext-native \
           "
 
+# using soup2 builds (JavaScript) API version 4.0
+# using soup3 builds (JavaScript) API version 4.1
 PACKAGECONFIG_SOUP ?= "soup3"
 PACKAGECONFIG ??= " \
            ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \
@@ -83,6 +91,8 @@ PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette"
 PACKAGECONFIG[webrtc] = "-DENABLE_WEB_RTC=ON,-DENABLE_WEB_RTC=OFF"
 PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON -DBWRAP_EXECUTABLE=${bindir}/bwrap -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,,bubblewrap xdg-dbus-proxy"
 PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace"
+PACKAGECONFIG[sysprof-capture] = "-DUSE_SYSTEM_SYSPROF_CAPTURE=YES,-DUSE_SYSTEM_SYSPROF_CAPTURE=NO,sysprof"
+PACKAGECONFIG[speech] = "-DENABLE_SPEECH_SYNTHESIS=ON,-DENABLE_SPEECH_SYNTHESIS=OFF,flite"
 
 EXTRA_OECMAKE = " \
         -DPORT=GTK \
@@ -92,9 +102,8 @@ EXTRA_OECMAKE = " \
         -DENABLE_MINIBROWSER=ON \
         -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \
                 "
-# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the
-# debug symbols (4.3GB to 700M at time of writing)
-DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}"
+# pass -g1 to massively reduce the size of the debug symbols (4.3GB to 700M at time of writing)
+DEBUG_LEVELFLAG = "-g1"
 
 # Javascript JIT is not supported on ARC
 EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF "
@@ -127,12 +136,8 @@ EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES
 EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}"
 EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}"
 
-EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF "
-EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF "
-
-# JIT and gold linker does not work on RISCV
-EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF"
-EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF"
+# JIT does not work on RISCV
+EXTRA_OECMAKE:append:riscv32 = " -DENABLE_JIT=OFF"
 
 # JIT not supported on MIPS either
 EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON "
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb
index f437accc50..17b71411ca 100644
--- a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb
+++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb
@@ -23,9 +23,8 @@ RDEPENDS:${PN}-dev = ""
 # TOOLCHAIN_TARGET_TASK:append = " websocketpp-dev"
 
 # tag 0.8.2
-SRCREV= "56123c87598f8b1dd471be83ca841ceae07f95ba"
+SRCREV = "56123c87598f8b1dd471be83ca841ceae07f95ba"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
@@ -37,3 +36,5 @@ do_install:append() {
         install -d ${D}${docdir}/${BPN}
         cp -R ${S}/examples ${D}${docdir}/${BPN}
 }
+
+SKIP_RECIPE[websocketpp] ?= "Does not work with boost >= 1.87"
diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb
index 6b35d71a55..93692af682 100644
--- a/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb
+++ b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl;protocol=https"
 SRCREV = "4b4aed71a959fe11852e45242bb6524be85d3709"
-S = "${WORKDIR}/git/xdelta3"
+S = "${UNPACKDIR}/${BP}/xdelta3"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb
index e10ccd04ea..43536f5d7b 100644
--- a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb
+++ b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb
@@ -13,7 +13,6 @@ inherit meson pkgconfig
 
 SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
-SRCREV = "7466c8137fc06f863fde8486521984e43a26cd10"
+SRCREV = "1c1989e56f94b9eb3b7567f8a6e8a0aa16cba496"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.20.0.bb
index 87e8f1f5e9..440d836874 100644
--- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb
+++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.20.0.bb
@@ -27,18 +27,18 @@ RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS} fuse3-utils"
 inherit meson pkgconfig python3native features_check
 
 SRC_URI = " \
-        git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=xdg-desktop-portal-1.18 \
+        git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=main \
         file://0001-meson.build-add-a-hack-for-crosscompile.patch \
 "
 
-S = "${WORKDIR}/git"
-SRCREV = "11c8a96b147aeae70e3f770313f93b367d53fedd"
+SRCREV = "85df26fb1c53334969fea3f15c2a06a14831094b"
 
 FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1"
 
 EXTRA_OEMESON += " \
         --cross-file=${WORKDIR}/meson-${PN}.cross \
         -Ddbus-service-dir=${datadir}/dbus-1/services \
+        -Dtests=disabled \
 "
 
 do_write_config:append() {
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
index f107f42dab..9bb017b63b 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
@@ -1,4 +1,4 @@
-From 4d73b85fb1b794c649359bc8a774b0111d36994a Mon Sep 17 00:00:00 2001
+From 1d7c01467e6f510b5636c73757f302a4bd277a3c Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Tue, 4 Feb 2020 23:39:49 -0800
 Subject: [PATCH] nss/nspr: fix for multilib
@@ -6,16 +6,15 @@ Subject: [PATCH] nss/nspr: fix for multilib
 Upstream-Status: Pending
 
 Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-
 ---
  configure.ac | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 51621d6..3d23683 100644
+index 40e9c0d..8f42d4d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -960,24 +960,24 @@ fi
+@@ -966,24 +966,24 @@ fi
  dnl Priority 1: User specifies the path to installation
  if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then
      AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder)
@@ -28,8 +27,8 @@ index 51621d6..3d23683 100644
          NSPR_FOUND="yes"
          AC_MSG_RESULT([yes])
      else
--        AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?])
-+        AC_MSG_ERROR([not found: "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?])
+-        AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER"])
++        AC_MSG_ERROR([not found: "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER"])
      fi
  fi
  if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then
@@ -43,8 +42,11 @@ index 51621d6..3d23683 100644
          NSS_FOUND="yes"
          AC_MSG_RESULT([yes])
      else
--        AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?])
-+        AC_MSG_ERROR([not found: "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?])
+-        AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER"])
++        AC_MSG_ERROR([not found: "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER"])
      fi
  fi
  
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
index 3a1531deb1..61c56ffc8b 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
@@ -1,4 +1,4 @@
-From 9c861646e034b1c80fafd389279b0a7da90a8ba7 Mon Sep 17 00:00:00 2001
+From b43fa6bf612ee59db57573b39e357b6ca96d48b6 Mon Sep 17 00:00:00 2001
 From: Yulong Pei <Yulong.pei@windriver.com>
 Date: Wed, 21 Jul 2010 22:33:43 +0800
 Subject: [PATCH] change finding path of nss and nspr
@@ -8,16 +8,15 @@ Upstream-Status: Pending
 Signed-off-by: Yulong Pei <Yulong.pei@windriver.com>
 Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index ce8a278..51621d6 100644
+index 8add879..7f137c0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -935,7 +935,7 @@ NSS_PACKAGE=mozilla-nss
+@@ -933,7 +933,7 @@ NSS_PACKAGE=mozilla-nss
  NSPR_INCLUDE_MARKER="nspr/nspr.h"
  NSPR_LIB_MARKER="libnspr4$shrext"
  NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch
index 26ebce343d..55ae9887f2 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch
@@ -14,11 +14,11 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/examples/Makefile b/examples/Makefile
-index 02480c2..cbc2661 100644
+index 0b352bc..de3c217 100644
 --- a/examples/Makefile
 +++ b/examples/Makefile
-@@ -8,9 +8,17 @@ PROGRAMS = \
-        decrypt1 decrypt2 decrypt3 \
+@@ -12,9 +12,17 @@ PROGRAMS = \
+        $(PROGRAMS_DEC) \
         xmldsigverify
  
 +ifndef CC
@@ -38,5 +38,5 @@ index 02480c2..cbc2661 100644
  all: $(PROGRAMS)
  
 -- 
-2.25.1
+2.43.0
 
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch
index 9e6a6a840f..50706793b2 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch
@@ -11,10 +11,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/examples/Makefile b/examples/Makefile
-index cbc2661..e882b61 100644
+index de3c217..2e0ab6e 100644
 --- a/examples/Makefile
 +++ b/examples/Makefile
-@@ -12,8 +12,10 @@ ifndef CC
+@@ -16,8 +16,10 @@ ifndef CC
  CC     = gcc
  endif
  
@@ -28,5 +28,5 @@ index cbc2661..e882b61 100644
  DESTDIR = /usr/share/xmlsec1
  install-ptest:
 -- 
-2.25.1
+2.43.0
 
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb
index 7639209e19..0f4ae205b1 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0"
 
 SECTION = "libs"
 
-SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \
+SRC_URI = "https://github.com/lsh123/xmlsec/releases/download/${PV}/${BP}.tar.gz \
            file://fix-ltmain.sh.patch \
            file://change-finding-path-of-nss.patch \
            file://makefile-ptest.patch \
@@ -22,7 +22,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \
            file://ensure-search-path-non-host.patch \
            "
 
-SRC_URI[sha256sum] = "45ad9078d41ae76844ad2f8651600ffeec0fdd128ead988a8d69e907c57aee75"
+SRC_URI[sha256sum] = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea"
 
 inherit autotools-brokensep ptest pkgconfig
 
@@ -54,8 +54,11 @@ do_compile_ptest () {
 }
 
 do_install:append() {
-    for i in ${bindir}/xmlsec1-config ${libdir}/xmlsec1Conf.sh \
-        ${libdir}/pkgconfig/xmlsec1-openssl.pc; do
+    for i in \
+        ${bindir}/xmlsec1-config \
+        ${libdir}/xmlsec1Conf.sh \
+        ${libdir}/pkgconfig/xmlsec1-openssl.pc \
+        ${libdir}/pkgconfig/xmlsec1-gnutls.pc; do
         sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i
     done
 }
diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Define-ATTRIBUTE_UNUSED-if-its-not-defined.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Define-ATTRIBUTE_UNUSED-if-its-not-defined.patch
new file mode 100644
index 0000000000..1468559e7f
--- /dev/null
+++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Define-ATTRIBUTE_UNUSED-if-its-not-defined.patch
@@ -0,0 +1,37 @@
+From 4e94034e9231f5d8312497b7504f21b7a6062bf4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 27 May 2025 16:12:01 -0700
+Subject: [PATCH] Define ATTRIBUTE_UNUSED if its not defined
+
+ATTRIBUTE_UNUSED is not defined in libxml2 2.14+, so check if the define is
+not there then define it.
+
+Fixes build errors e.g.
+../xmlstarlet-1.6.1/src/xml_pyx.c:203:36: error: expected ')'
+  203 | pyxExternalSubsetHandler(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name,
+      |                                    ^
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/xml_pyx.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/xml_pyx.c b/src/xml_pyx.c
+index ab295f1..f1a1884 100644
+--- a/src/xml_pyx.c
++++ b/src/xml_pyx.c
+@@ -21,6 +21,13 @@
+ 
+ #include "xmlstar.h"
+ 
++/**
++ * Unbreak build with libxml2 2.14
++ */
++#ifndef ATTRIBUTE_UNUSED
++#define ATTRIBUTE_UNUSED __attribute__((unused))
++#endif
++
+ /**
+  *  Output newline and tab characters as escapes
+  *  Required both for attribute values and character data (#PCDATA)
diff --git a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb
index 61eeaaa095..c8cfd884e2 100644
--- a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb
+++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb
@@ -16,13 +16,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \
            file://configure.ac.patch \
            file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \
            file://0001-Make-xmlError-struct-constant.patch \
-           file://0001-Fix-hash_key_put-signature.patch"
+           file://0001-Fix-hash_key_put-signature.patch \
+                   file://0001-Define-ATTRIBUTE_UNUSED-if-its-not-defined.patch"
 SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca"
 
 inherit autotools
 
 # doc build: requires (native) xstlproc, fop, pdf2ps
-EXTRA_OECONF="--disable-build-docs \
+EXTRA_OECONF = "--disable-build-docs \
   --with-libxml-prefix=${STAGING_LIBDIR}/.. \
   --with-libxslt-prefix=${STAGING_LIBDIR}/.."
 
diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb
index 9650d43695..533b0801cb 100644
--- a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb
+++ b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb
@@ -16,8 +16,13 @@ SRCREV = "d463bad9639c910fadc2f30dac473c7688b11cfc"
 
 PV = "0.9.19"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${libdir}/xorg/modules/*"
 
-INSANE_SKIP:${PN} += "xorg-driver-abi"
+require recipes-graphics/xorg-xserver/xserver-abi.inc
+
+python add_xorg_abi_depends() {
+    _add_xorg_abi_depends(d, "xinput")
+    _add_xorg_abi_depends(d, "videodrv")
+}
+PACKAGEFUNCS =+ "add_xorg_abi_depends"
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
index 05803266cb..926ad93bbe 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
@@ -1,7 +1,7 @@
-From d705b1d666cb8713d86ea6fb2fc45c424128285a Mon Sep 17 00:00:00 2001
+From abdfa0fddeceab843ab6eabe31c7763c8719642b Mon Sep 17 00:00:00 2001
 From: Lei Maohui <leimaohui@cn.fujitsu.com>
 Date: Fri, 1 Dec 2017 10:24:50 +0900
-Subject: [PATCH] Added  req_distinguished_name in /etc/xrdp/openssl.conf,
+Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf,
  otherwise, cert.pem can't be created.
 
 Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
@@ -30,6 +30,3 @@ index 09db6c2..f077d72 100644
  
  [v3_ca]
  # Extensions for a typical CA - PKIX recommendation.
--- 
-1.8.4.2
-
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
index e8b4ffa6bf..1bb84001f3 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
@@ -1,3 +1,6 @@
+From 2fa575c3171688ceb0dc867a52628046b3f60d91 Mon Sep 17 00:00:00 2001
+From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
+Date: Tue, 12 Dec 2017 22:36:50 +0800
 Subject: [PATCH] Fix the make error
 
 Fix the compile error:
@@ -11,10 +14,10 @@ Upstream-Status: Pending
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
-index a259ef3..d5505b2 100644
+index 71d0f76..f41751b 100644
 --- a/xrdp/Makefile.am
 +++ b/xrdp/Makefile.am
-@@ -23,7 +23,7 @@ endif
+@@ -21,7 +21,7 @@ XRDP_EXTRA_LIBS =
  if XRDP_RFXCODEC
  AM_CPPFLAGS += -DXRDP_RFXCODEC
  AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include
@@ -23,7 +26,7 @@ index a259ef3..d5505b2 100644
  endif
  
  if XRDP_PIXMAN
-@@ -35,7 +35,7 @@ endif
+@@ -33,7 +33,7 @@ endif
  if XRDP_PAINTER
  AM_CPPFLAGS += -DXRDP_PAINTER
  AM_CPPFLAGS += -I$(top_srcdir)/libpainter/include
@@ -32,6 +35,3 @@ index a259ef3..d5505b2 100644
  endif
  
  sbin_PROGRAMS = \
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch
index ea3eb11f0a..01449e2a5f 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch
@@ -1,4 +1,4 @@
-From 5958db649855bfb2ada7c0ed22a00f839b9a1161 Mon Sep 17 00:00:00 2001
+From 71e8fd272a4609cf3b6a0802cee82e2861a1fa0c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 12 Mar 2021 21:40:35 -0800
 Subject: [PATCH] arch: Define NO_NEED_ALIGN on ppc64
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/common/arch.h b/common/arch.h
-index 617feb5e..6edb39db 100644
+index ec0aa05..f574656 100644
 --- a/common/arch.h
 +++ b/common/arch.h
-@@ -85,7 +85,7 @@ typedef int bool_t;
+@@ -86,7 +86,7 @@ typedef int bool_t;
  #define NEED_ALIGN
  #elif defined(__x86__) || defined(__x86_64__) || \
        defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
@@ -22,6 +22,3 @@ index 617feb5e..6edb39db 100644
        defined(__PPC__) || defined(__LITTLE_ENDIAN__) || \
        defined(__s390__) || defined (__s390x__) || \
        defined(__riscv)
--- 
-2.31.1
-
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch
index 77a394d556..2559ab7b31 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch
@@ -1,4 +1,4 @@
-From 492f74dbea1d9a15fbc3e870e78ab52e7fc5583b Mon Sep 17 00:00:00 2001
+From 23638d0ec23c2658a4e98321c20a4a2ac9294fb2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 31 Aug 2022 20:19:32 -0700
 Subject: [PATCH] mark count with unused attribute
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c
-index 4452d998..b818bff3 100644
+index d66310b..eeb5921 100644
 --- a/sesman/chansrv/chansrv.c
 +++ b/sesman/chansrv/chansrv.c
 @@ -195,7 +195,7 @@ check_timeout(void)
@@ -24,8 +24,5 @@ index 4452d998..b818bff3 100644
 -    int count;
 +    int count __attribute__((unused));
      tui32 now;
- 
+     UNUSED_VAR(count);
      LOG_DEVEL(LOG_LEVEL_DEBUG, "check_timeout:");
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb
index c1b75e6138..a60c125d06 100644
--- a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb
+++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb
@@ -18,7 +18,10 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN
            file://0001-mark-count-with-unused-attribute.patch \
            "
 
-SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0"
+SRC_URI[sha256sum] = "db693401da95b71b4d4e4c99aeb569a546dbdbde343f6d3302b0c47653277abb"
+
+UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases"
+UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
 
 CFLAGS += " -Wno-deprecated-declarations"
 
diff --git a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb b/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb
deleted file mode 100644
index 76aea6f41a..0000000000
--- a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "X.Org X cvt"
-HOMEPAGE = "https://linux.die.net/man/1/cvt"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
-
-DEPENDS += "pixman-native xorgproto-native libxrandr-native"
-
-XORG_PN = "xorg-server"
-
-SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "8cf8bd1f33e3736bc8dd279b20a32399"
-SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99"
-
-S = "${WORKDIR}/${XORG_PN}-${PV}"
-B = "${WORKDIR}/build"
-
-inherit pkgconfig native
-
-do_configure[noexec] = "1"
-
-do_compile() {
-    cd ${S}
-    for header in `find -name '*.h'`; do
-        path=`dirname $header`
-        if ! echo "$incpaths" | grep -q "$path" ; then
-            incpaths="$incpaths -I$path"
-        fi
-    done
-    CFLAGS="${CFLAGS} -DXORG_VERSION_CURRENT=1 $incpaths `pkg-config --cflags pixman-1`"
-    LDFLAGS="${LDFLAGS} -lm `pkg-config --libs pixman-1`"
-    ${CC} $CFLAGS -o ${B}/cvt \
-        ${S}/hw/xfree86/utils/cvt/cvt.c \
-        ${S}/hw/xfree86/modes/xf86cvt.c \
-        ${S}/os/xprintf.c \
-        $LDFLAGS
-}
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 755 ${B}/cvt ${D}${bindir}
-}
diff --git a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb
index 44ac0687a7..09db5519ea 100644
--- a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb
+++ b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c"
 # yaml-cpp releases are stored as archive files in github.
 # download the exact revision of release
 SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https"
-SRCREV = "f7320141120f720aecc4c32be25586e7da9eb978"
+SRCREV = "28f93bdec6387d42332220afa9558060c8016795"
+PV .= "+git"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-support/yyjson/yyjson_0.11.1.bb b/meta-oe/recipes-support/yyjson/yyjson_0.11.1.bb
new file mode 100644
index 0000000000..0655f225b4
--- /dev/null
+++ b/meta-oe/recipes-support/yyjson/yyjson_0.11.1.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "A high performance JSON library written in ANSI C."
+HOMEPAGE = "https://github.com/ibireme/yyjson"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c8ae1b99922935413d4c596f50b59545"
+
+SRC_URI = "git://github.com/ibireme/yyjson.git;protocol=https;branch=master;tag=${PV}"
+SRCREV = "9e24d6bcead647231f81173cc5c6bb6c097c00e4"
+
+
+inherit cmake
+
+PACKAGECONFIG ??= "reader writer utils fast-fp-conv non-standard utf8-validation unaligned-memory-access"
+PACKAGECONFIG[reader] = "-DYYJSON_DISABLE_READER=OFF,-DYYJSON_DISABLE_READER=ON"
+PACKAGECONFIG[writer] = "-DYYJSON_DISABLE_WRITER=OFF,-DYYJSON_DISABLE_WRITER=ON"
+PACKAGECONFIG[utils] = "-DYYJSON_DISABLE_UTILS=OFF,-DYYJSON_DISABLE_UTILS=ON"
+PACKAGECONFIG[fast-fp-conv] = "-DYYJSON_DISABLE_FAST_FP_CONV=OFF,-DYYJSON_DISABLE_FAST_FP_CONV=ON"
+PACKAGECONFIG[non-standard] = "-DYYJSON_DISABLE_NON_STANDARD=OFF,-DYYJSON_DISABLE_NON_STANDARD=ON"
+PACKAGECONFIG[utf8-validation] = "-DYYJSON_DISABLE_UTF8_VALIDATION=OFF,-DYYJSON_DISABLE_UTF8_VALIDATION=ON"
+PACKAGECONFIG[unaligned-memory-access] = "-DYYJSON_DISABLE_UNALIGNED_MEMORY_ACCESS=OFF,-DYYJSON_DISABLE_UNALIGNED_MEMORY_ACCESS=ON"
+
+EXTRA_OECMAKE:append = " \
+-DBUILD_SHARED_LIBS=ON \
+-DYYJSON_BUILD_TESTS=OFF \
+-DYYJSON_BUILD_FUZZER=OFF \
+-DYYJSON_BUILD_MISC=OFF \
+-DYYJSON_BUILD_DOC=OFF \
+-DYYJSON_ENABLE_COVERAGE=OFF \
+-DYYJSON_ENABLE_VALGRIND=OFF \
+-DYYJSON_ENABLE_SANITIZE=OFF \
+-DYYJSON_ENABLE_FASTMATH=OFF \
+-DYYJSON_FORCE_32_BIT=OFF \
+"
diff --git a/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-oe/recipes-support/zbar/zbar_git.bb
index 975779cd18..053e0161d7 100644
--- a/meta-oe/recipes-support/zbar/zbar_git.bb
+++ b/meta-oe/recipes-support/zbar/zbar_git.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/mchehab/zbar.git;branch=master;protocol=https \
 "
 SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37"
 
-S = "${WORKDIR}/git"
 PV = "0.23.1+git"
 
 DEPENDS += "xmlto-native"
diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb b/meta-oe/recipes-support/zchunk/zchunk_1.5.1.bb
index 0c8a9c7a5f..9ef380005c 100644
--- a/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb
+++ b/meta-oe/recipes-support/zchunk/zchunk_1.5.1.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242"
 
 SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main"
 
-SRCREV = "4dd91d31157ede4a1b092721d944ae2fdd161cd9"
-S = "${WORKDIR}/git"
+SRCREV = "69dd7d6764e333413dd12848607d72cab310e406"
 
 DEPENDS = "zstd"
 DEPENDS:append:libc-musl = " argp-standalone"
diff --git a/meta-oe/recipes-support/zile/zile_2.4.15.bb b/meta-oe/recipes-support/zile/zile_2.4.15.bb
index e86b3f82d2..d7973ab861 100644
--- a/meta-oe/recipes-support/zile/zile_2.4.15.bb
+++ b/meta-oe/recipes-support/zile/zile_2.4.15.bb
@@ -9,7 +9,6 @@ SRC_URI = "${GNU_MIRROR}/zile/${BP}.tar.gz \
            file://remove-help2man.patch \
 "
 
-SRC_URI[md5sum] = "05efa90dfee1821ca018b0b2ef8f50a8"
 SRC_URI[sha256sum] = "39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-test/bats/bats_1.11.0.bb b/meta-oe/recipes-test/bats/bats_1.12.0.bb
index f0615f7b79..14a234c866 100644
--- a/meta-oe/recipes-test/bats/bats_1.11.0.bb
+++ b/meta-oe/recipes-test/bats/bats_1.12.0.bb
@@ -9,10 +9,9 @@ SRC_URI = "\
   git://github.com/bats-core/bats-core.git;branch=master;protocol=https \
   "
 
-# v1.10.0
-SRCREV = "7531b575bb81487553553aecb654c41b237ae96c"
+# v1.12.0
+SRCREV = "713504bc0224a19b3d7c7958c18dc07f64f54b44"
 
-S = "${WORKDIR}/git"
 
 # Numerous scripts assume ${baselib} == lib, which is not true.
 #
diff --git a/meta-oe/recipes-test/catch2/catch2_3.6.0.bb b/meta-oe/recipes-test/catch2/catch2_3.8.1.bb
index c4541c4d52..6a7fc5ad47 100644
--- a/meta-oe/recipes-test/catch2/catch2_3.6.0.bb
+++ b/meta-oe/recipes-test/catch2/catch2_3.8.1.bb
@@ -5,9 +5,8 @@ LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
 SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https"
-SRCREV = "4e8d92bf02f7d1c8006a0e7a5ecabd8e62d98502"
+SRCREV = "2b60af89e23d28eefc081bc930831ee9d45ea58b"
 
-S = "${WORKDIR}/git"
 
 inherit cmake python3native
 
@@ -16,6 +15,7 @@ do_install:append() {
     rm ${D}${datadir}/Catch2/gdbinit
     rmdir ${D}${datadir}/Catch2/
 }
+
 # Header-only library
 RDEPENDS:${PN}-dev = ""
 RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
diff --git a/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb b/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb
index 6c94e9e275..09afe36666 100644
--- a/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb
+++ b/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=st
            file://run-ptest \
           "
 
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
diff --git a/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb b/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb
index be81125652..193bfc000a 100644
--- a/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb
+++ b/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb
@@ -8,7 +8,6 @@ SRC_URI = " \
     http://dev-www.libreoffice.org/src/cppunit-${PV}.tar.gz \
     file://0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch \
 "
-SRC_URI[md5sum] = "9dc669e6145cadd9674873e24943e6dd"
 SRC_URI[sha256sum] = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7"
 
 inherit autotools
diff --git a/meta-oe/recipes-test/cpputest/cpputest_4.0.bb b/meta-oe/recipes-test/cpputest/cpputest_4.0.bb
index 5536cf07b6..5710585b6c 100644
--- a/meta-oe/recipes-test/cpputest/cpputest_4.0.bb
+++ b/meta-oe/recipes-test/cpputest/cpputest_4.0.bb
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177"
 SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https;branch=master"
 SRCREV = "67d2dfd41e13f09ff218aa08e2d35f1c32f032a1"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-test/cukinia/cukinia_0.7.0.bb b/meta-oe/recipes-test/cukinia/cukinia_0.7.0.bb
index e3424d019e..ad545e627b 100644
--- a/meta-oe/recipes-test/cukinia/cukinia_0.7.0.bb
+++ b/meta-oe/recipes-test/cukinia/cukinia_0.7.0.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/savoirfairelinux/cukinia.git;protocol=https;branch=m
 
 SRCREV = "be56f653743cc0e68bef81ef35df7c50ff8919c4"
 
-S = "${WORKDIR}/git"
 
 RRECOMMENDS:${PN} = "libgpiod-tools"
 
diff --git a/meta-oe/recipes-test/cunit/cunit_2.1-3.bb b/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
index 252ef60def..9aab617487 100644
--- a/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
+++ b/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
@@ -4,13 +4,12 @@ LICENSE = "LGPL-2.0-only"
 SECTION = "libs"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7734aa853b85d6f935466f081490ddbb"
 
-S = "${WORKDIR}/CUnit-${PV}"
+S = "${UNPACKDIR}/CUnit-${PV}"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/cunit/CUnit/${PV}/CUnit-${PV}.tar.bz2 \
            file://fixup-install-docdir.patch \
            file://run-ptest \
           "
-SRC_URI[md5sum] = "b5f1a9f6093869c070c6e4a9450cc10c"
 SRC_URI[sha256sum] = "f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214"
 
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/cunit/files/releases"
diff --git a/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
index c5dfff2259..4eb4e8ecbf 100644
--- a/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
+++ b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
@@ -5,9 +5,10 @@ LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
 SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/${BP}.tar.gz"
-SRC_URI[md5sum] = "c3cc3355e2ac64e34c215f28e44cfcec"
 SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/p/cxxtest/activity/"
+
 inherit setuptools3
 
 SETUPTOOLS_SETUP_PATH = "${S}/python"
diff --git a/meta-oe/recipes-test/evtest/evtest_1.35.bb b/meta-oe/recipes-test/evtest/evtest_1.35.bb
index 52f684ce5f..9c42efcdab 100644
--- a/meta-oe/recipes-test/evtest/evtest_1.35.bb
+++ b/meta-oe/recipes-test/evtest/evtest_1.35.bb
@@ -11,6 +11,5 @@ SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https;branc
            file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb b/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb
index 6082ea2574..98db76eda1 100644
--- a/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb
+++ b/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 SRCREV = "063ec650960c2d79ac51f5c5f026cb05343a33e2"
 SRC_URI = "git://github.com//ponty/fb-test-app.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 do_install() {
     install -d ${D}${bindir}
diff --git a/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch b/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch
new file mode 100644
index 0000000000..814912650b
--- /dev/null
+++ b/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch
@@ -0,0 +1,26 @@
+https://github.com/google/googletest/issues/4701
+
+taken from fedora:
+https://src.fedoraproject.org/rpms/gtest/c/b3fe6f803a1e554971f70e1c3f55aa5fcb377b1b?branch=rawhide
+
+Upstream-Status: Pending
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+
+--- ./googletest/include/gtest/internal/gtest-port.h.orig       2025-01-27 03:39:18.963893931 +0000
++++ ./googletest/include/gtest/internal/gtest-port.h    2025-01-28 13:57:51.381081952 +0000
+@@ -288,11 +288,11 @@
+ 
+ // Detect C++ feature test macros as gracefully as possible.
+ // MSVC >= 19.15, Clang >= 3.4.1, and GCC >= 4.1.2 support feature test macros.
+-#if GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && \
+-    (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<version>))
++#if GTEST_INTERNAL_HAS_INCLUDE(<version>) || \
++    (GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && !defined(__has_include))
+ #include <version>  // C++20 and later
+-#elif (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<ciso646>))
+-#include <ciso646>  // Pre-C++20
++#else
++#include <cerrno>  // Pre-C++20
+ #endif
+ 
+ #include <ctype.h>   // for isspace, etc
diff --git a/meta-oe/recipes-test/googletest/googletest_1.14.0.bb b/meta-oe/recipes-test/googletest/googletest_1.16.0.bb
index 6546845715..55d670a428 100644
--- a/meta-oe/recipes-test/googletest/googletest_1.14.0.bb
+++ b/meta-oe/recipes-test/googletest/googletest_1.16.0.bb
@@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a"
 
 PROVIDES += "gmock gtest"
 
-S = "${WORKDIR}/git"
-SRCREV = "f8d7d77c06936315286eb55f8de22cd23c188571"
-SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https"
+SRCREV = "6910c9d9165801d8827d628cb72eb7ea9dd538c5"
+SRC_URI = "git://github.com/google/googletest.git;branch=v1.16.x;protocol=https \
+    file://gtest-ciso646.patch \
+"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-test/libfaketime/libfaketime_0.9.10.bb b/meta-oe/recipes-test/libfaketime/libfaketime_0.9.10.bb
index f13925ee18..3588e96847 100644
--- a/meta-oe/recipes-test/libfaketime/libfaketime_0.9.10.bb
+++ b/meta-oe/recipes-test/libfaketime/libfaketime_0.9.10.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/wolfcw/libfaketime.git;branch=master;protocol=https
            file://0001-Makefile-Detect-compiler-in-makefile.patch \
            "
 
-S = "${WORKDIR}/git"
 
 CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE"
 
diff --git a/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb b/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb
index e909676abc..c617cf09a3 100644
--- a/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb
+++ b/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb
@@ -8,6 +8,8 @@ SRC_URI = "git://github.com/cbrake/linux-serial-test.git;protocol=https;branch=m
 PV = "0+git"
 SRCREV = "2ee61484167eab846f7b7c565284d7c350d738d3"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 inherit cmake
diff --git a/meta-oe/recipes-test/pm-qa/pm-qa/0001-fix-build-with-gcc-15-Wincompatible-pointer-types-er.patch b/meta-oe/recipes-test/pm-qa/pm-qa/0001-fix-build-with-gcc-15-Wincompatible-pointer-types-er.patch
new file mode 100644
index 0000000000..7efd8dd71a
--- /dev/null
+++ b/meta-oe/recipes-test/pm-qa/pm-qa/0001-fix-build-with-gcc-15-Wincompatible-pointer-types-er.patch
@@ -0,0 +1,69 @@
+From b6b968d1c8fbba79b33d63874b551225e663435e Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 2 Apr 2025 16:59:00 +0900
+Subject: [PATCH] fix build with gcc-15 -Wincompatible-pointer-types error
+
+See more details: http://errors.yoctoproject.org/Errors/Details/850314
+utils/uevent_reader.c:33:24: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
+   33 |         signal(SIGINT, exit_handler);
+      |                        ^~~~~~~~~~~~
+      |                        |
+      |                        void (*)(void)
+In file included from utils/uevent_reader.c:4:
+TOPDIR/tmp/work/core2-64-oe-linux/pm-qa/0.5.2/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)
+      |                                          ~~~~~~~~~~~~~~~^~~~~~~~~
+utils/uevent_reader.c:15:6: note: 'exit_handler' declared here
+   15 | void exit_handler()
+      |      ^~~~~~~~~~~~
+TOPDIR/tmp/work/core2-64-oe-linux/pm-qa/0.5.2/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
+   72 | typedef void (*__sighandler_t) (int);
+      |                ^~~~~~~~~~~~~~
+
+* Set the parameter of exit_handler() to int.
+  Changed to use exit_handler(0).
+  The parameter is not used inside exit_handler() anyway.
+
+Upstream-Status: Inactive-Upstream [lastrelease: 6 years ago]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ utils/uevent_reader.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/utils/uevent_reader.c b/utils/uevent_reader.c
+index afbb426..75d445c 100644
+--- a/utils/uevent_reader.c
++++ b/utils/uevent_reader.c
+@@ -12,7 +12,7 @@
+ 
+ FILE *fp;
+ 
+-void exit_handler()
++void exit_handler(int sig)
+ {
+        fprintf(stdout, "exiting from uevent reader...\n");
+        fclose(fp);
+@@ -42,20 +42,20 @@ int main(int argc, char *argv[])
+        pfd.fd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
+        if (pfd.fd == -1) {
+                perror("error: socket()");
+-               exit_handler();
++               exit_handler(0);
+        }
+ 
+        if (bind(pfd.fd, (struct sockaddr *) &nls,
+                                sizeof(struct sockaddr_nl))) {
+                perror("error : bind()");
+-               exit_handler();
++               exit_handler(0);
+        }
+ 
+        while (-1 != poll(&pfd, 1, -1)) {
+                int i, len = recv(pfd.fd, buf, sizeof(buf), MSG_DONTWAIT);
+                if (len == -1) {
+                        perror("error : recv()");
+-                       exit_handler();
++                       exit_handler(0);
+                }
+ 
+                i = 0;
diff --git a/meta-oe/recipes-test/pm-qa/pm-qa_git.bb b/meta-oe/recipes-test/pm-qa/pm-qa_git.bb
index fc21e6192e..d7e9618985 100644
--- a/meta-oe/recipes-test/pm-qa/pm-qa_git.bb
+++ b/meta-oe/recipes-test/pm-qa/pm-qa_git.bb
@@ -10,12 +10,16 @@ BRANCH ?= "master"
 
 SRCREV = "05710ec5032be4c8edafb4109d4d908d31243906"
 
-SRC_URI = "git://git.linaro.org/power/pm-qa.git;protocol=git;branch=${BRANCH}"
+SRC_URI = " \
+    git://git.linaro.org/power/pm-qa.git;protocol=git;branch=${BRANCH} \
+    file://0001-fix-build-with-gcc-15-Wincompatible-pointer-types-er.patch \
+"
 
-S = "${WORKDIR}/git"
 
 CFLAGS += "-pthread"
 
+PATCHTOOL = "git"
+
 do_compile () {
     # Find all the .c files in this project and build them.
     for x in `find . -name "*.c"`
@@ -63,7 +67,7 @@ do_install () {
         install -m 0755 $script ${D}${bindir}/${script_basename}
     done
 }
-RDEPENDS:${PN} +="bash"
+RDEPENDS:${PN} += "bash"
 
 # http://errors.yoctoproject.org/Errors/Details/186956/
 COMPATIBLE_HOST:libc-musl = 'null'
diff --git a/meta-oe/recipes-test/shunit2/shunit2_2.1.8.bb b/meta-oe/recipes-test/shunit2/shunit2_2.1.8.bb
index 683600f712..8d298e3c1d 100644
--- a/meta-oe/recipes-test/shunit2/shunit2_2.1.8.bb
+++ b/meta-oe/recipes-test/shunit2/shunit2_2.1.8.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI = " git://github.com/kward/shunit2.git;branch=master;protocol=https"
 SRCREV = "080159b303537888c5d41910b4d47a5002638e30"
 
-S = "${WORKDIR}/git"
 
 do_install() {
     install -D -m 0755 ${S}/shunit2 ${D}${bindir}/shunit2
diff --git a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb
index 639f55de2f..b2b0f7ae9e 100644
--- a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb
+++ b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb
@@ -13,11 +13,10 @@ SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IM
            "
 SRCREV = "25905f5d0a2a7883bd33491997556193582c6059"
 
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 export GOPROXY = "https://proxy.golang.org,direct"
-# Workaround for network access issue during compile step.
-# This needs to be fixed in the recipes buildsystem so that
-# it can be accomplished during do_fetch task.
-do_compile[network] = "1"
 
 COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64).*-linux"
 
@@ -25,8 +24,8 @@ B = "${S}/src/${GO_IMPORT}/bin"
 
 GO_EXTRA_LDFLAGS += ' -X ${GO_IMPORT}/prog.GitRevision=${SRCREV}'
 
-export GOHOSTFLAGS="${GO_LINKSHARED} ${GOBUILDFLAGS}"
-export GOTARGETFLAGS="${GO_LINKSHARED} ${GOBUILDFLAGS}"
+export GOHOSTFLAGS = "${GO_LINKSHARED} ${GOBUILDFLAGS}"
+export GOTARGETFLAGS = "${GO_LINKSHARED} ${GOBUILDFLAGS}"
 export TARGETOS = '${GOOS}'
 export TARGETARCH = '${GOARCH}'
 export TARGETVMARCH = '${GOARCH}'
diff --git a/meta-oe/recipes-test/testfloat/testfloat_3e.bb b/meta-oe/recipes-test/testfloat/testfloat_3e.bb
index 071be2a200..5000c7d106 100644
--- a/meta-oe/recipes-test/testfloat/testfloat_3e.bb
+++ b/meta-oe/recipes-test/testfloat/testfloat_3e.bb
@@ -19,8 +19,9 @@ SRC_URI[TestFloat.sha256sum] = "6d4bdf0096b48a653aa59fc203a9e5fe18b5a58d7a1b7151
 SRC_URI[SoftFloat.md5sum] = "7dac954ea4aed0697cbfee800ba4f492"
 SRC_URI[SoftFloat.sha256sum] = "21130ce885d35c1fe73fc1e1bf2244178167e05c6747cad5f450cc991714c746"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+UPSTREAM_CHECK_URI = "http://www.jhauser.us/arithmetic/TestFloat.html"
+
+S = "${UNPACKDIR}"
 
 do_compile(){
     oe_runmake -C SoftFloat-${PV}/build/Linux-Cross-Compile/
diff --git a/meta-oe/recipes-test/trompeloeil/trompeloeil_v47.bb b/meta-oe/recipes-test/trompeloeil/trompeloeil_v47.bb
index 788a15dba2..3f2f07c28f 100644
--- a/meta-oe/recipes-test/trompeloeil/trompeloeil_v47.bb
+++ b/meta-oe/recipes-test/trompeloeil/trompeloeil_v47.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 SRC_URI = "git://github.com/rollbear/trompeloeil.git;branch=main;protocol=https"
 SRCREV = "ad9bc41b1e01ae92802de59a12d19cf7c8683d6d"
 
-S = "${WORKDIR}/git"
 
 inherit cmake