230 files changed, 2385 insertions, 15180 deletions

diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
index f8d9ee6f9b..4de602ac1c 100644
--- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
+++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
@@ -72,6 +72,7 @@ PTESTS_FAST_META_OE:remove:riscv32 = "botan nodejs oprofile"
 
 PTESTS_SLOW_META_OE = "\
     c-ares \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'freerdp', '', d)} \
     fftw \
     libusb-compat \
     mariadb \
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf
deleted file mode 100644
index ddf155a907..0000000000
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Service]
-ExecStartPre=/usr/bin/android-gadget-setup
-ExecStartPost=/usr/bin/android-gadget-start
-ExecStopPost=/usr/bin/android-gadget-cleanup
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup
deleted file mode 100644
index 517227d4a6..0000000000
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-cleanup
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-[ -d /sys/kernel/config/usb_gadget ] || exit 0
-
-cd /sys/kernel/config/usb_gadget
-
-cd adb
-
-echo "" > UDC || true
-
-killall adbd || true
-
-umount /dev/usb-ffs/adb
-
-rm configs/c.1/ffs.usb0
-
-rmdir configs/c.1/strings/0x409
-rmdir configs/c.1
-
-rmdir functions/ffs.usb0
-rmdir strings/0x409
-
-cd ..
-rmdir adb
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup
deleted file mode 100644
index e44d1bacbe..0000000000
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-setup
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-set -e
-
-manufacturer=RPB
-model="Android device"
-serial=0123456789ABCDEF
-
-if [ -r /etc/android-gadget-setup.machine ] ; then
-        . /etc/android-gadget-setup.machine
-fi
-
-[ -d /sys/kernel/config/usb_gadget ] || modprobe libcomposite
-
-cd /sys/kernel/config/usb_gadget
-
-[ -d adb ] && /usr/bin/android-gadget-cleanup || true
-
-mkdir adb
-cd adb
-
-mkdir configs/c.1
-mkdir functions/ffs.usb0
-mkdir strings/0x409
-mkdir configs/c.1/strings/0x409
-echo 0x18d1 > idVendor
-echo 0xd002 > idProduct
-echo "$serial" > strings/0x409/serialnumber
-echo "$manufacturer" > strings/0x409/manufacturer
-echo "$model" > strings/0x409/product
-echo "Conf 1" > configs/c.1/strings/0x409/configuration
-ln -s functions/ffs.usb0 configs/c.1
-
-mkdir -p /dev/usb-ffs/adb
-mount -t functionfs usb0 /dev/usb-ffs/adb
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start
deleted file mode 100644
index ca6c3df275..0000000000
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs/android-gadget-start
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-sleep 3
-
-ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC
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
deleted file mode 100644
index 4d30327372..0000000000
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "Various utilities from Android - corresponding configuration files for using ConfigFS"
-SECTION = "console/utils"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-S = "${UNPACKDIR}"
-
-SRC_URI = " \
-    file://android-gadget-setup \
-    file://android-gadget-start \
-    file://android-gadget-cleanup \
-    file://10-adbd-configfs.conf \
-"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
-    install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir}
-    install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir}
-
-    if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then
-        install -d ${D}${sysconfdir}
-        install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir}
-    fi
-
-    install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
-    install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
-}
-
-FILES:${PN} += " \
-    ${systemd_unitdir}/system/ \
-"
-
-PROVIDES += "android-tools-conf"
-RPROVIDES:${PN} = "android-tools-conf"
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.39.bb b/meta-oe/recipes-benchmark/fio/fio_3.41.bb
index 2ca52aaecf..494a4eb3d7 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.39.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.41.bb
@@ -22,8 +22,8 @@ PACKAGECONFIG_NUMA:armeb = ""
 PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}"
 PACKAGECONFIG[numa] = ",--disable-numa,numactl"
 
-SRC_URI = "git://git.kernel.dk/fio.git;branch=master"
-SRCREV = "a6e474c9e896e4ba1eb40066a03402afb040710a"
+SRC_URI = "git://git.kernel.dk/fio.git;branch=master;tag=${BP}"
+SRCREV = "ed675d3477a70a42d2e757b713f6c7125a27cdca"
 
 SRC_URI += "file://CVE-2025-10823.patch"
 
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_507.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_508.bb
index 725b0af209..31cc72af53 100644
--- a/meta-oe/recipes-benchmark/iozone3/iozone3_507.bb
+++ b/meta-oe/recipes-benchmark/iozone3/iozone3_508.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \
     file://parallelism.patch \
     file://copyright.txt \
 "
-SRC_URI[sha256sum] = "1e8087ada056f5d8018ee0bc76686d416fc2251ed03038055dbd0af78d1e5ce3"
+SRC_URI[sha256sum] = "ee55af310a65ec97e1db214aebd75ee87f458b529cea3da37081a63974e8ace3"
 
 UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar"
 
diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb
index d31f4ed634..cc7a1561df 100644
--- a/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb
+++ b/meta-oe/recipes-benchmark/iperf2/iperf2_2.2.1.bb
@@ -19,7 +19,7 @@ EXTRA_OECONF = "--exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 
-CVE_PRODUCT = "iperf_project:iperf"
+CVE_PRODUCT:append = " iperf_project:iperf"
 CVE_STATUS[CVE-2025-54349] = "cpe-incorrect: the vulnerability is in iperf3, which is a different project"
 CVE_STATUS[CVE-2025-54350] = "cpe-incorrect: the vulnerability is in iperf3, which is a different project"
 CVE_STATUS[CVE-2025-54351] = "cpe-incorrect: the vulnerability is in iperf3, which is a different project"
diff --git a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/Makefile-Fix-sysinfo-generation-in-parallel-build.patch b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/Makefile-Fix-sysinfo-generation-in-parallel-build.patch
new file mode 100644
index 0000000000..b5f60b1c87
--- /dev/null
+++ b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/Makefile-Fix-sysinfo-generation-in-parallel-build.patch
@@ -0,0 +1,69 @@
+From 26e13ce45ffeb2f233d1dd7e4321cb65ab10b0fb Mon Sep 17 00:00:00 2001
+From: Daniel Klauer <daniel.klauer@gin.de>
+Date: Fri, 6 Feb 2026 17:13:49 +0100
+Subject: [PATCH] Makefile: Fix sysinfo generation in parallel build
+
+sysinfo.sh non-atomically overwrites both sysinfo.c and sysinfoc.c,
+so it should only be invoked once, not twice in parallel.
+
+Requires at least GNU make 4.3, for Grouped Targets support [1].
+
+Should fix random build failures like this one:
+
+| NOTE: make -j 20 -e MAKEFLAGS=
+[...]
+| ./sysinfo.sh x86_64-gin-linux-gcc [...]
+| ./sysinfo.sh x86_64-gin-linux-gcc [...]
+[...]
+| x86_64-gin-linux-gcc [...] \
+|       -c nbench0.c
+| In file included from nbench0.c:219:
+| sysinfo.c: In function 'main':
+| sysinfo.c:11:1: error: 'fer' undeclared (first use in this function)
+|    11 | fer);
+|       | ^~~
+| sysinfo.c:11:1: note: each undeclared identifier is reported only once for each function it appears in
+| sysinfo.c:11:4: error: expected ';' before ')' token
+|    11 | fer);
+|       |    ^
+|       |    ;
+| sysinfo.c:11:4: error: expected statement before ')' token
+| In file included from nbench0.c:317:
+| sysinfoc.c:5:4: error: expected ';' before ')' token
+|     5 | fer);
+|       |    ^
+|       |    ;
+| sysinfoc.c:5:4: error: expected statement before ')' token
+| make: *** [Makefile:115: nbench0.o] Error 1
+| make: *** Waiting for unfinished jobs....
+| ERROR: oe_runmake failed
+| WARNING: exit code 1 from a shell command.
+NOTE: recipe nbench-byte-2.2.3-r0: task do_compile: Failed
+
+[1] https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html
+Upstream-Status: Inactive-Upstream [lastrelease 2003, no vcs]
+Signed-off-by: Daniel Klauer <daniel.klauer@gin.de>
+---
+ Makefile | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index edd9ea2..66b2ddc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -95,10 +95,8 @@ DEFINES= -DLINUX $(NO_UNAME)
+ 
+ ##########################################################################
+ # For LINUX-like systems with gcc
+-sysinfoc.c: Makefile
+-       ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)
+-
+-sysinfo.c: Makefile
++# sysinfo.sh generates both sysinfo.c and sysinfoc.c
++sysinfo.c sysinfoc.c &: Makefile
+        ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)
+ 
+ ##########################################################################
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/sysinfo.sh-Fix-typo-in-rm-command.patch b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/sysinfo.sh-Fix-typo-in-rm-command.patch
new file mode 100644
index 0000000000..c6a37c3e56
--- /dev/null
+++ b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/sysinfo.sh-Fix-typo-in-rm-command.patch
@@ -0,0 +1,27 @@
+From 0019af6eb5188f5111a0f2008c0002b545382b67 Mon Sep 17 00:00:00 2001
+From: Daniel Klauer <daniel.klauer@gin.de>
+Date: Fri, 6 Feb 2026 17:14:53 +0100
+Subject: [PATCH] sysinfo.sh: Fix typo in rm command
+
+Upstream-Status: Inactive-Upstream [lastrelease 2003, no vcs]
+Signed-off-by: Daniel Klauer <daniel.klauer@gin.de>
+---
+ sysinfo.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysinfo.sh b/sysinfo.sh
+index 57754fe..1373699 100755
+--- a/sysinfo.sh
++++ b/sysinfo.sh
+@@ -61,7 +61,7 @@ if ($* hello.c -o hello) >/dev/null 2>&1; then
+   fi
+ fi
+ 
+-rm -f sysinfo.crm sysinfoc.c hello
++rm -f sysinfo.c sysinfoc.c hello
+ 
+ # this bombs out on Ultrix which expect "cut -d"
+ 
+-- 
+2.43.0
+
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 da03ebb291..538ff24c0a 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
@@ -10,7 +10,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://0001-Fix-build-error-with-gcc-15.patch"
+           file://0001-Fix-build-error-with-gcc-15.patch \
+           file://Makefile-Fix-sysinfo-generation-in-parallel-build.patch \
+           file://sysinfo.sh-Fix-typo-in-rm-command.patch"
 
 SRC_URI[sha256sum] = "723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac"
 
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
deleted file mode 100644
index fbc0f5a18e..0000000000
--- a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 0fc8ac5bd2..0000000000
--- a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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.21.bb
index e0041b58e6..9f00d00ec3 100644
--- a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb
+++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.21.bb
@@ -5,18 +5,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb"
 
 DEPENDS = "libusb"
 
-SRCREV = "e691f2d432144e3dbc82e9e0eea1ebaed4f3becf"
+SRCREV = "42edbcc60217f3fb39d5c6e5a68bedaa32844482"
 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 \
+    git://github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master;tag=V${PV},x \
     "
 
 EXTRA_OEMAKE = "NOSTRIP=1 DESTDIR=${D} PREFIX=${prefix}"
 
-PV = "1.0+${SRCPV}"
-
-
 do_install() {
     oe_runmake install
 }
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 0d8f3c8a6b..9ea4d719e3 100644
--- a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb
+++ b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = " sysfsutils"
 
-SRCREV = "1c57818ecee186aa47af0342149577df5302c022"
+SRCREV = "8fdc1d40e30f65737fef6c3ddcd1d2cd769f6277"
 PV = "0.18+git"
 
 
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_2.0.16.bb b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.19.bb
index 31b17486cb..586f7ad1f9 100644
--- a/meta-oe/recipes-bsp/fwupd/fwupd_2.0.16.bb
+++ b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.19.bb
@@ -19,7 +19,7 @@ SRC_URI = "\
     https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
     file://run-ptest \
 "
-SRC_URI[sha256sum] = "79cce6b61d9ea531de0ef3b13e7f2682c699901b11f410b2ed91192618e1620e"
+SRC_URI[sha256sum] = "3bb7a4a1e2d00f0ab513e4c667d7bf5a3ff34a9802757849d3fedf07dd40ddbb"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.16.bb
index eae49b04ea..3fbe52020e 100644
--- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb
+++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.16.bb
@@ -6,9 +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 = "71fa5d9310d6b41a69e844593423ac91b1453472"
+SRCREV = "faf7326a2997dea91687fd3daa17fc405910a4c1"
 
-SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https;tag=v${PV}"
 
 inherit bash-completion meson pkgconfig systemd
 
diff --git a/meta-oe/recipes-bsp/thermald/thermald_2.5.10.bb b/meta-oe/recipes-bsp/thermald/thermald_2.5.10.bb
new file mode 100644
index 0000000000..98310b4c5c
--- /dev/null
+++ b/meta-oe/recipes-bsp/thermald/thermald_2.5.10.bb
@@ -0,0 +1,44 @@
+SUMMARY = "Linux thermal daemon"
+
+DESCRIPTION = "Thermal Daemon is a Linux daemon used to prevent the \
+overheating of platforms. This daemon monitors temperature and applies \
+compensation using available cooling methods."
+
+HOMEPAGE = "https://github.com/intel/thermal_daemon"
+
+DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native upower libevdev"
+DEPENDS += "autoconf-archive-native"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848"
+
+SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \
+           "
+
+SRCREV = "88369b42ec523787081b9bf8811b364e2a3d5f2d"
+
+inherit pkgconfig autotools systemd gtk-doc
+
+# gtkdocsize runs before autotools do_configure and it copies gtk-doc.m4 and fails
+# to copy becuase there is no m4 dir yet.
+do_configure:prepend () {
+        mkdir -p ${S}/m4
+}
+
+EXTRA_OECONF = " \
+                 --with-systemdsystemunitdir=${systemd_system_unitdir} \
+                 "
+
+FILES:${PN} += "${datadir}/dbus-1"
+
+SYSTEMD_SERVICE:${PN} = "thermald.service"
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+CONFFILES:${PN} = " \
+                   ${sysconfdir}/thermald/thermal-conf.xml \
+                   ${sysconfdir}/thermald/thermal-cpu-cdev-order.xml \
+                  "
+
+UPSTREAM_CHECK_URI = "https://github.com/intel/thermal_daemon/releases/"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(?!2\.15\.10$)\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.2.6.bb b/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.3.0.bb
index 47de7a7344..0e1e155356 100644
--- a/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.2.6.bb
+++ b/meta-oe/recipes-connectivity/asyncmqtt/asyncmqtt_10.3.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c"
 CVE_PRODUCT = "async_mqtt"
 
 SRC_URI = "git://github.com/redboltz/async_mqtt;protocol=http;branch=main;protocol=https;tag=${PV}"
-SRCREV = "cb3d37dc3432b9c03fe631eeba2d548de7457bf9"
+SRCREV = "7129d72c1b9adf159bc506206df3fb422bb9fb84"
 
 DEPENDS = "openssl boost"
 
diff --git a/meta-oe/recipes-connectivity/gensio/gensio_3.0.1.bb b/meta-oe/recipes-connectivity/gensio/gensio_3.0.2.bb
index 3427ef3a30..da6b1961d3 100644
--- a/meta-oe/recipes-connectivity/gensio/gensio_3.0.1.bb
+++ b/meta-oe/recipes-connectivity/gensio/gensio_3.0.2.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
                     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     "
 
-SRCREV = "f15f54da21697c3656a6fb3ad65a8bec1687c772"
+SRCREV = "57320144c7f3a3ba3d00435a966aa811e219e374"
 
-SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=ipv6-fix;tag=v${PV}"
+SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master;tag=v${PV}"
 
 
 inherit autotools
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_3.10.bb b/meta-oe/recipes-connectivity/iwd/iwd_3.11.bb
index f52472adf8..c4956fb22c 100644
--- a/meta-oe/recipes-connectivity/iwd/iwd_3.10.bb
+++ b/meta-oe/recipes-connectivity/iwd/iwd_3.11.bb
@@ -9,7 +9,7 @@ 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] = "640bff22540e1714f71772a83123aff6f810b7eb9d7d6df1e10fb2695beb5115"
+SRC_URI[sha256sum] = "85730e79de05978e26e44b958fd11e2ebb45424ca181f8db7a8daf25fc2226ea"
 
 inherit autotools manpages pkgconfig python3native systemd update-rc.d
 
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
deleted file mode 100644
index 3f90ccc56f..0000000000
--- a/meta-oe/recipes-connectivity/krb5/krb5/0001-Eliminate-old-style-function-declarations.patch
+++ /dev/null
@@ -1,10803 +0,0 @@
-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
deleted file mode 100644
index d4267b3bf7..0000000000
--- a/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-more-non-prototype-functions.patch
+++ /dev/null
@@ -1,862 +0,0 @@
-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
deleted file mode 100644
index 63072c790c..0000000000
--- a/meta-oe/recipes-connectivity/krb5/krb5/0002-Avoid-strict-prototype-compiler-errors.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-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
deleted file mode 100644
index 46eb6aa96c..0000000000
--- a/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-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
deleted file mode 100644
index ac6039edf1..0000000000
--- a/meta-oe/recipes-connectivity/krb5/krb5/CVE-2025-24528.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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.3.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb
index c042dba5a7..507a1b2381 100644
--- a/meta-oe/recipes-connectivity/krb5/krb5_1.21.3.bb
+++ b/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb
@@ -14,16 +14,13 @@ 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=71c06694263581762668e88b7b77a1a5"
+LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=c1deab93872560046ba4411e77050d24"
 
 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 \
@@ -31,11 +28,9 @@ 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] = "b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35"
+SRC_URI[sha256sum] = "3243ffbc8ea4d4ac22ddc7dd2a1dc54c57874c40648b60ff97009763554eaf13"
 
 CVE_PRODUCT = "kerberos"
 CVE_VERSION = "5-${PV}"
@@ -156,7 +151,7 @@ FILES:${PN}-kdc = "${libdir}/krb5/plugins/kdb/db2.so \
                    ${sysconfdir}/tmpfiles.d/krb5.conf \
                    ${systemd_system_unitdir}/krb5-kdc.service"
 
-FILES:${PN}-kdc-ldap = "${libdir}/krb5/libkdb_ldap${SOLIBS} \
+FILES:${PN}-kdc-ldap = "${libdir}/libkdb_ldap${SOLIBS} \
                         ${libdir}/krb5/plugins/kdb/kldap.so \
                         ${sbindir}/kdb5_ldap_util"
 
diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice/0001-include-unistd.h-for-usleep.patch b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice/0001-include-unistd.h-for-usleep.patch
deleted file mode 100644
index 424a203e56..0000000000
--- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice/0001-include-unistd.h-for-usleep.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6cb8069cfe08114f1dc7b50a7fcd4dc040cd1bbb Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 May 2023 20:19:23 -0700
-Subject: [PATCH] include unistd.h for usleep()
-
-clang16 flags the missing header
-
-Fixes
-../../git/tools/idevicedevmodectl.c:363:2: error: call to undeclared function 'usleep'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-
-Upstream-Status: Submitted [https://github.com/libimobiledevice/libimobiledevice/pull/1444]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tools/idevicedevmodectl.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/idevicedevmodectl.c b/tools/idevicedevmodectl.c
-index 739bc13..9fe8d6a 100644
---- a/tools/idevicedevmodectl.c
-+++ b/tools/idevicedevmodectl.c
-@@ -34,6 +34,7 @@
- #ifndef WIN32
- #include <signal.h>
- #endif
-+#include <unistd.h>
- 
- #ifdef WIN32
- #include <windows.h>
--- 
-2.40.1
-
diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.4.0.bb
index 3c93c9a37b..eeae93e261 100644
--- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb
+++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.4.0.bb
@@ -6,13 +6,10 @@ LIC_FILES_CHKSUM = "\
 "
 HOMEPAGE = "http://www.libimobiledevice.org/"
 
-DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt libimobiledevice-glue openssl"
+DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt libimobiledevice-glue openssl libtatsu"
 
-PV = "1.3.0+git"
-
-SRCREV = "860ffb707af3af94467d2ece4ad258dda957c6cd"
-SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https;branch=master \
-           file://0001-include-unistd.h-for-usleep.patch"
+SRCREV = "149f7623c672c1fa73122c7119a12bfc0012f2ac"
+SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https;branch=master;tag=${PV}"
 
 inherit autotools pkgconfig
 
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.11.bb
index 6bfcbec25f..ca3fe2c8ee 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.11.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8b6cb42d66e6b3c47a909c3ce678a7b"
 
 DEPENDS = "boost openssl"
 
-SRC_URI = "git://github.com/arvidn/libtorrent.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/arvidn/libtorrent.git;branch=master;protocol=https;tag=v${PV} \
         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 = "9d7443f467147d1784fb7516d2a882db1abb5a8b"
 SRCREV_try_signal = "105cce59972f925a33aa6b1c3109e4cd3caf583d"
 SRCREV_FORMAT .= "_try_signal"
 
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
deleted file mode 100644
index 4215f698c7..0000000000
--- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c/0001-Fix-build-error-due-to-bool-keyword-with-gcc-15.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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.14.bb b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.15.bb
index ad6637ed88..64b9de3848 100644
--- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.14.bb
+++ b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.15.bb
@@ -11,11 +11,10 @@ LIC_FILES_CHKSUM = " \
 "
 
 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 \
+    git://github.com/eclipse/paho.mqtt.c;protocol=https;branch=master;tag=v${PV} \
 "
 
-SRCREV = "2150ba29d9df24ad1733c460eb099f292af84ee5"
+SRCREV = "62782406bcf511ee8e22bc34e826f8c6b8254c7c"
 
 DEPENDS = "openssl"
 
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch b/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch
deleted file mode 100644
index a08366a36d..0000000000
--- a/meta-oe/recipes-connectivity/transmission/files/0001-build-bump-CMake-version-to-3.10-4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a18ae078a32e08a7193d0bae20190060bd1e8b85 Mon Sep 17 00:00:00 2001
-From: Yat Ho <lagoho7@gmail.com>
-Date: Thu, 1 May 2025 09:14:19 +0800
-Subject: [PATCH] build: bump CMake version to 3.10 (#4)
-
-CMake < 3.5 compatibility has been removed from CMake 4.0 and CMake < 3.10 compatibility has been deprecated in CMake 3.31.
-
-https://cmake.org/cmake/help/latest/release/4.0.html
-https://cmake.org/cmake/help/latest/release/3.31.html
-
-Upstream-Status: Backport [https://github.com/transmission/dht/commit/38c9f261d9b58b76b9eaf85f84ec1b35151a1eac]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6d4aa99..596dbfb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.10)
- project(dht C)
- 
- add_library(${PROJECT_NAME} STATIC
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch b/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch
deleted file mode 100644
index 887bc21114..0000000000
--- a/meta-oe/recipes-connectivity/transmission/files/0001-build-set-minimum-required-CMake-to-3.5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9c5ed3204bdb722b5624f6b9dbfba240a50b336c Mon Sep 17 00:00:00 2001
-From: fanquake <fanquake@gmail.com>
-Date: Fri, 12 Jan 2024 10:25:27 +0000
-Subject: [PATCH] build: set minimum required CMake to 3.5
-
-Avoids:
-```bash
-CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
-  Compatibility with CMake < 3.5 will be removed from a future version of
-  CMake.
-
-  Update the VERSION argument <min> value or use a ...<max> suffix to tell
-  CMake that the project does not need compatibility with older versions.
-```
-
-Upstream-Status: Backport [https://github.com/miniupnp/libnatpmp/pull/43]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3034df8..e7cffe5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.5)
- project(natpmp C)
- 
- add_definitions(-DNATPMP_STATICLIB -DENABLE_STRNATPMPERR)
diff --git a/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch b/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch
deleted file mode 100644
index 1714ad1b99..0000000000
--- a/meta-oe/recipes-connectivity/transmission/files/0001-miniupnpc-bump-CMake-version-to-3.14.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From aa19cb131c953e4520be5284d86964f371ee059f Mon Sep 17 00:00:00 2001
-From: Yat Ho <lagoho7@gmail.com>
-Date: Mon, 13 May 2024 16:21:28 +0800
-Subject: [PATCH] miniupnpc: bump CMake version to 3.14
-
-Upstream-Status: Backport [https://github.com/transmission/miniupnpc/commit/e7b0fa83c313c50a66da76ad6fb446e5bfdb482f]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0a53e27..2c713b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required (VERSION 2.6)
-+cmake_minimum_required (VERSION 3.14)
- 
- project (miniupnpc C)
- set (MINIUPNPC_VERSION 2.0)
diff --git a/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb b/meta-oe/recipes-connectivity/transmission/transmission_4.1.0.bb
index 518f8653ca..aed1e2e32a 100644
--- a/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb
+++ b/meta-oe/recipes-connectivity/transmission/transmission_4.1.0.bb
@@ -2,23 +2,20 @@ DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client"
 SECTION = "network"
 HOMEPAGE = "https://transmissionbt.com/"
 LICENSE = "MIT & GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ba8199e739948e198310093de27175fa"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d54f298b276b8cc5f20168e43a0e8103"
 
 DEPENDS = "curl libevent libpsl gnutls openssl libtool intltool-native glib-2.0-native"
 RDEPENDS:${PN}-web = "${PN}"
 
 SRC_URI = " \
-        gitsm://github.com/transmission/transmission;branch=4.0.x;protocol=https \
-        file://0001-build-bump-CMake-version-to-3.10-4.patch;patchdir=third-party/dht \
+        gitsm://github.com/transmission/transmission;branch=4.1.x;protocol=https;tag=${PV} \
         file://0001-bump-cmake-to-3.10.patch;patchdir=third-party/libb64 \
         file://0001-Increase-minimum-CMake-version-to-3.10.patch;patchdir=third-party/libdeflate \
-        file://0001-miniupnpc-bump-CMake-version-to-3.14.patch;patchdir=third-party/miniupnpc \
-        file://0001-build-set-minimum-required-CMake-to-3.5.patch;patchdir=third-party/libnatpmp \
         file://transmission-daemon \
 "
 
-# Transmission release 4.0.6
-SRCREV = "38c164933e9f77c110b48fe745861c3b98e3d83e"
+# Transmission release 4.1.0
+SRCREV = "272401184f0736e6063f9da90be7d037e907508a"
 
 
 inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg
@@ -45,9 +42,9 @@ do_install:append() {
         fi
 
         if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-                sed -i '/User=/c\User=${TRANSMISSION_USER}' ${S}/daemon/transmission-daemon.service
+                sed -i '/User=/c\User=${TRANSMISSION_USER}' ${B}/daemon/transmission-daemon.service
                 install -d ${D}${systemd_unitdir}/system
-                install -m 0644 ${S}/daemon/transmission-daemon.service ${D}${systemd_unitdir}/system
+                install -m 0644 ${B}/daemon/transmission-daemon.service ${D}${systemd_unitdir}/system
         fi
 }
 
diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.6.0.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.6.1.bb
index cfa476cd1c..bedd379e89 100644
--- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.6.0.bb
+++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.6.1.bb
@@ -6,7 +6,7 @@ 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;tag=${PV}"
-SRCREV = "b705ad73bef724de0ed33f60462c70b380b6b300"
+SRCREV = "521a3d88bb731b94cc9998a0f711a5ca9e831e04"
 
 DEPENDS = "libsigc++-3"
 
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
deleted file mode 100644
index c471b098d4..0000000000
--- a/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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_4.0.8.bb b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb
index cf98c0cf2e..2e7f438821 100644
--- a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb
+++ b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb
@@ -7,11 +7,10 @@ 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"
+SRCREV = "f3ed731e27a97e30dffe076ed5e0537daae5c1bd"
 
 
 RCONFLICTS:${PN} += "minizip"
diff --git a/meta-oe/recipes-core/minizip/minizip_1.3.1.bb b/meta-oe/recipes-core/minizip/minizip_1.3.2.bb
index 51a74d039b..49e4a4b561 100644
--- a/meta-oe/recipes-core/minizip/minizip_1.3.1.bb
+++ b/meta-oe/recipes-core/minizip/minizip_1.3.2.bb
@@ -4,7 +4,7 @@ library which is used by many different programs."
 HOMEPAGE = "http://www.winimage.com/zLibDll/minizip.html"
 SECTION = "libs"
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=8eaa8535a3a1a2296b303f40f75385e7"
+LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=b7d2930a7332b2bc68fc1a7fdc5ba775"
 
 GITHUB_BASE_URI ?= "https://github.com/madler/zlib/releases/"
 
@@ -12,7 +12,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/zlib-${PV}.tar.xz"
 
 S = "${UNPACKDIR}/zlib-${PV}/contrib/minizip"
 
-SRC_URI[sha256sum] = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32"
+SRC_URI[sha256sum] = "d7a0654783a4da529d1bb793b7ad9c3318020af77667bcae35f95d0e42a792f3"
 
 PACKAGECONFIG ??= "demos"
 PACKAGECONFIG[demos] = "--enable-demos=yes,,,"
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 9b92e7e3d5..87f8a1eed5 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -821,8 +821,8 @@ RDEPENDS:packagegroup-meta-oe-support = "\
     lvm2 \
     mailcap \
     mbuffer \
+    media-types \
     mg \
-    mime-support \
     minini \
     monit \
     mscgen \
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 aec2e0a47d..465f2262b6 100644
--- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc
+++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc
@@ -3,108 +3,109 @@
 # from Cargo.lock
 SRC_URI += " \
     crate://crates.io/adler2/2.0.1 \
-    crate://crates.io/aho-corasick/1.1.3 \
+    crate://crates.io/aho-corasick/1.1.4 \
     crate://crates.io/allocator-api2/0.2.21 \
     crate://crates.io/android_system_properties/0.1.5 \
     crate://crates.io/ansi-width/0.1.0 \
-    crate://crates.io/anstream/0.6.19 \
-    crate://crates.io/anstyle/1.0.11 \
+    crate://crates.io/anstream/0.6.21 \
+    crate://crates.io/anstyle/1.0.13 \
     crate://crates.io/anstyle-parse/0.2.7 \
-    crate://crates.io/anstyle-query/1.1.3 \
-    crate://crates.io/anstyle-wincon/3.0.9 \
+    crate://crates.io/anstyle-query/1.1.5 \
+    crate://crates.io/anstyle-wincon/3.0.11 \
     crate://crates.io/anyhow/1.0.100 \
     crate://crates.io/approx/0.5.1 \
-    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/autocfg/1.5.0 \
     crate://crates.io/base64-simd/0.8.0 \
-    crate://crates.io/bigdecimal/0.4.9 \
+    crate://crates.io/bigdecimal/0.4.10 \
     crate://crates.io/binary-heap-plus/0.5.0 \
-    crate://crates.io/bincode/2.0.1 \
-    crate://crates.io/bincode_derive/2.0.1 \
     crate://crates.io/bindgen/0.72.1 \
     crate://crates.io/bitflags/1.3.2 \
-    crate://crates.io/bitflags/2.9.1 \
+    crate://crates.io/bitflags/2.10.0 \
     crate://crates.io/bitvec/1.0.1 \
-    crate://crates.io/blake2b_simd/1.0.3 \
-    crate://crates.io/blake3/1.8.2 \
+    crate://crates.io/blake2b_simd/1.0.4 \
+    crate://crates.io/blake3/1.8.3 \
     crate://crates.io/block-buffer/0.10.4 \
+    crate://crates.io/block2/0.6.2 \
     crate://crates.io/bstr/1.12.1 \
-    crate://crates.io/bumpalo/3.18.1 \
+    crate://crates.io/bumpalo/3.19.1 \
     crate://crates.io/bytecount/0.6.9 \
     crate://crates.io/byteorder/1.5.0 \
-    crate://crates.io/cc/1.2.27 \
+    crate://crates.io/calendrical_calculations/0.2.3 \
+    crate://crates.io/cc/1.2.52 \
     crate://crates.io/cexpr/0.6.0 \
-    crate://crates.io/cfg-if/1.0.1 \
+    crate://crates.io/cfg-if/1.0.4 \
     crate://crates.io/cfg_aliases/0.2.1 \
-    crate://crates.io/chrono/0.4.42 \
+    crate://crates.io/chrono/0.4.43 \
     crate://crates.io/clang-sys/1.8.1 \
-    crate://crates.io/clap/4.5.53 \
-    crate://crates.io/clap_builder/4.5.53 \
-    crate://crates.io/clap_complete/4.5.61 \
-    crate://crates.io/clap_lex/0.7.5 \
+    crate://crates.io/clap/4.5.56 \
+    crate://crates.io/clap_builder/4.5.56 \
+    crate://crates.io/clap_complete/4.5.65 \
+    crate://crates.io/clap_lex/0.7.7 \
     crate://crates.io/clap_mangen/0.2.31 \
-    crate://crates.io/codspeed/4.1.0 \
-    crate://crates.io/codspeed-divan-compat/4.1.0 \
-    crate://crates.io/codspeed-divan-compat-macros/4.1.0 \
-    crate://crates.io/codspeed-divan-compat-walltime/4.1.0 \
+    crate://crates.io/codspeed/4.3.0 \
+    crate://crates.io/codspeed-divan-compat/4.3.0 \
+    crate://crates.io/codspeed-divan-compat-macros/4.3.0 \
+    crate://crates.io/codspeed-divan-compat-walltime/4.3.0 \
     crate://crates.io/colorchoice/1.0.4 \
     crate://crates.io/colored/2.2.0 \
     crate://crates.io/compare/0.1.0 \
     crate://crates.io/condtype/1.3.0 \
-    crate://crates.io/console/0.16.0 \
+    crate://crates.io/console/0.16.2 \
     crate://crates.io/const-random/0.1.18 \
     crate://crates.io/const-random-macro/0.1.16 \
-    crate://crates.io/constant_time_eq/0.3.1 \
-    crate://crates.io/convert_case/0.7.1 \
+    crate://crates.io/constant_time_eq/0.4.2 \
     crate://crates.io/core-foundation-sys/0.8.7 \
+    crate://crates.io/core_maths/0.1.1 \
     crate://crates.io/cpufeatures/0.2.17 \
     crate://crates.io/crc/3.3.0 \
     crate://crates.io/crc-catalog/2.4.0 \
-    crate://crates.io/crc-fast/1.8.1 \
+    crate://crates.io/crc-fast/1.9.0 \
     crate://crates.io/crc32fast/1.5.0 \
     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.3 \
-    crate://crates.io/crypto-common/0.1.6 \
+    crate://crates.io/crunchy/0.2.4 \
+    crate://crates.io/crypto-common/0.1.7 \
     crate://crates.io/ctor/0.6.3 \
     crate://crates.io/ctor-proc-macro/0.0.7 \
-    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.5.2 \
-    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/ctrlc/3.5.1 \
+    crate://crates.io/darling/0.21.3 \
+    crate://crates.io/darling_core/0.21.3 \
+    crate://crates.io/darling_macro/0.21.3 \
+    crate://crates.io/data-encoding/2.10.0 \
+    crate://crates.io/data-encoding-macro/0.1.19 \
+    crate://crates.io/data-encoding-macro-internal/0.1.17 \
+    crate://crates.io/deranged/0.5.5 \
     crate://crates.io/diff/0.1.13 \
     crate://crates.io/digest/0.10.7 \
+    crate://crates.io/dispatch2/0.3.0 \
     crate://crates.io/displaydoc/0.2.5 \
     crate://crates.io/divan-macros/0.1.17 \
     crate://crates.io/dlv-list/0.5.2 \
     crate://crates.io/dns-lookup/3.0.1 \
-    crate://crates.io/document-features/0.2.11 \
-    crate://crates.io/dtor/0.1.0 \
+    crate://crates.io/document-features/0.2.12 \
+    crate://crates.io/dtor/0.1.1 \
     crate://crates.io/dtor-proc-macro/0.0.6 \
     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.12 \
+    crate://crates.io/errno/0.3.14 \
     crate://crates.io/exacl/0.12.0 \
     crate://crates.io/fastrand/2.3.0 \
     crate://crates.io/file_diff/1.0.0 \
     crate://crates.io/filedescriptor/0.8.3 \
-    crate://crates.io/filetime/0.2.26 \
-    crate://crates.io/fixed_decimal/0.7.0 \
-    crate://crates.io/flate2/1.1.2 \
+    crate://crates.io/filetime/0.2.27 \
+    crate://crates.io/find-msvc-tools/0.1.7 \
+    crate://crates.io/fixed_decimal/0.7.1 \
+    crate://crates.io/flate2/1.1.8 \
     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-langneg/0.13.1 \
     crate://crates.io/fluent-syntax/0.12.0 \
     crate://crates.io/fnv/1.0.7 \
     crate://crates.io/foldhash/0.1.5 \
@@ -119,60 +120,71 @@ SRC_URI += " \
     crate://crates.io/futures-util/0.3.31 \
     crate://crates.io/gcd/2.3.0 \
     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/getrandom/0.2.17 \
+    crate://crates.io/getrandom/0.3.4 \
     crate://crates.io/glob/0.3.3 \
     crate://crates.io/half/2.7.1 \
     crate://crates.io/hashbrown/0.14.5 \
-    crate://crates.io/hashbrown/0.15.4 \
+    crate://crates.io/hashbrown/0.15.5 \
+    crate://crates.io/hashbrown/0.16.1 \
     crate://crates.io/hex/0.4.3 \
     crate://crates.io/hex-literal/1.1.0 \
     crate://crates.io/hostname/0.4.2 \
     crate://crates.io/iana-time-zone/0.1.64 \
     crate://crates.io/iana-time-zone-haiku/0.1.2 \
+    crate://crates.io/icu_calendar/2.1.1 \
+    crate://crates.io/icu_calendar_data/2.1.1 \
     crate://crates.io/icu_collator/2.1.1 \
     crate://crates.io/icu_collator_data/2.1.1 \
     crate://crates.io/icu_collections/2.1.1 \
+    crate://crates.io/icu_datetime/2.1.1 \
+    crate://crates.io/icu_datetime_data/2.1.2 \
     crate://crates.io/icu_decimal/2.1.1 \
     crate://crates.io/icu_decimal_data/2.1.1 \
     crate://crates.io/icu_locale/2.1.1 \
     crate://crates.io/icu_locale_core/2.1.1 \
-    crate://crates.io/icu_locale_data/2.1.1 \
+    crate://crates.io/icu_locale_data/2.1.2 \
     crate://crates.io/icu_normalizer/2.1.1 \
     crate://crates.io/icu_normalizer_data/2.1.1 \
-    crate://crates.io/icu_properties/2.1.1 \
-    crate://crates.io/icu_properties_data/2.1.1 \
+    crate://crates.io/icu_pattern/0.4.1 \
+    crate://crates.io/icu_plurals/2.1.1 \
+    crate://crates.io/icu_plurals_data/2.1.1 \
+    crate://crates.io/icu_properties/2.1.2 \
+    crate://crates.io/icu_properties_data/2.1.2 \
     crate://crates.io/icu_provider/2.1.1 \
-    crate://crates.io/indexmap/2.9.0 \
+    crate://crates.io/icu_time/2.1.1 \
+    crate://crates.io/icu_time_data/2.1.1 \
+    crate://crates.io/ident_case/1.0.1 \
+    crate://crates.io/indexmap/2.13.0 \
     crate://crates.io/indicatif/0.18.3 \
     crate://crates.io/inotify/0.11.0 \
     crate://crates.io/inotify-sys/0.1.5 \
     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/is_terminal_polyfill/1.70.2 \
     crate://crates.io/itertools/0.13.0 \
     crate://crates.io/itertools/0.14.0 \
-    crate://crates.io/itoa/1.0.15 \
-    crate://crates.io/jiff/0.2.16 \
-    crate://crates.io/jiff-static/0.2.16 \
-    crate://crates.io/jiff-tzdb/0.1.4 \
+    crate://crates.io/itoa/1.0.17 \
+    crate://crates.io/ixdtf/0.6.4 \
+    crate://crates.io/jiff/0.2.18 \
+    crate://crates.io/jiff-icu/0.2.2 \
+    crate://crates.io/jiff-static/0.2.18 \
+    crate://crates.io/jiff-tzdb/0.1.5 \
     crate://crates.io/jiff-tzdb-platform/0.1.3 \
-    crate://crates.io/js-sys/0.3.77 \
+    crate://crates.io/js-sys/0.3.85 \
     crate://crates.io/keccak/0.1.5 \
     crate://crates.io/kqueue/1.1.1 \
     crate://crates.io/kqueue-sys/1.0.4 \
     crate://crates.io/lazy_static/1.5.0 \
-    crate://crates.io/libc/0.2.175 \
-    crate://crates.io/libloading/0.8.8 \
+    crate://crates.io/libc/0.2.180 \
+    crate://crates.io/libloading/0.8.9 \
     crate://crates.io/libm/0.2.15 \
-    crate://crates.io/libredox/0.1.3 \
-    crate://crates.io/libz-rs-sys/0.5.1 \
+    crate://crates.io/libredox/0.1.12 \
     crate://crates.io/linux-raw-sys/0.11.0 \
-    crate://crates.io/linux-raw-sys/0.12.0 \
-    crate://crates.io/litemap/0.8.0 \
-    crate://crates.io/litrs/0.4.1 \
-    crate://crates.io/lock_api/0.4.13 \
-    crate://crates.io/log/0.4.27 \
+    crate://crates.io/litemap/0.8.1 \
+    crate://crates.io/litrs/1.0.0 \
+    crate://crates.io/lock_api/0.4.14 \
+    crate://crates.io/log/0.4.29 \
     crate://crates.io/lru/0.12.5 \
     crate://crates.io/lscolors/0.21.0 \
     crate://crates.io/md-5/0.10.6 \
@@ -181,7 +193,7 @@ SRC_URI += " \
     crate://crates.io/memoffset/0.9.1 \
     crate://crates.io/minimal-lexical/0.2.1 \
     crate://crates.io/miniz_oxide/0.8.9 \
-    crate://crates.io/mio/1.0.4 \
+    crate://crates.io/mio/1.1.1 \
     crate://crates.io/nix/0.30.1 \
     crate://crates.io/nom/7.1.3 \
     crate://crates.io/nom/8.0.0 \
@@ -195,15 +207,17 @@ SRC_URI += " \
     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/objc2/0.6.3 \
+    crate://crates.io/objc2-encode/4.1.0 \
     crate://crates.io/once_cell/1.21.3 \
-    crate://crates.io/once_cell_polyfill/1.70.1 \
+    crate://crates.io/once_cell_polyfill/1.70.2 \
     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/outref/0.5.2 \
-    crate://crates.io/parking_lot/0.12.4 \
-    crate://crates.io/parking_lot_core/0.9.11 \
+    crate://crates.io/parking_lot/0.12.5 \
+    crate://crates.io/parking_lot_core/0.9.12 \
     crate://crates.io/parse_datetime/0.13.3 \
     crate://crates.io/phf/0.13.1 \
     crate://crates.io/phf_codegen/0.13.1 \
@@ -213,126 +227,127 @@ SRC_URI += " \
     crate://crates.io/pin-utils/0.1.0 \
     crate://crates.io/pkg-config/0.3.32 \
     crate://crates.io/platform-info/2.0.5 \
-    crate://crates.io/portable-atomic/1.11.1 \
+    crate://crates.io/portable-atomic/1.13.0 \
     crate://crates.io/portable-atomic-util/0.2.4 \
     crate://crates.io/potential_utf/0.1.4 \
     crate://crates.io/powerfmt/0.2.0 \
     crate://crates.io/ppv-lite86/0.2.21 \
     crate://crates.io/pretty_assertions/1.4.1 \
-    crate://crates.io/prettyplease/0.2.34 \
-    crate://crates.io/proc-macro-crate/3.3.0 \
-    crate://crates.io/proc-macro2/1.0.103 \
+    crate://crates.io/prettyplease/0.2.37 \
+    crate://crates.io/proc-macro-crate/3.4.0 \
+    crate://crates.io/proc-macro2/1.0.106 \
     crate://crates.io/procfs/0.18.0 \
     crate://crates.io/procfs-core/0.18.0 \
-    crate://crates.io/quote/1.0.42 \
-    crate://crates.io/r-efi/5.2.0 \
+    crate://crates.io/quote/1.0.44 \
+    crate://crates.io/r-efi/5.3.0 \
     crate://crates.io/radium/0.7.0 \
     crate://crates.io/rand/0.8.5 \
     crate://crates.io/rand/0.9.2 \
     crate://crates.io/rand_chacha/0.3.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/rand_core/0.9.5 \
     crate://crates.io/rayon/1.11.0 \
     crate://crates.io/rayon-core/1.13.0 \
-    crate://crates.io/redox_syscall/0.5.13 \
+    crate://crates.io/redox_syscall/0.5.18 \
+    crate://crates.io/redox_syscall/0.7.0 \
     crate://crates.io/regex/1.12.2 \
-    crate://crates.io/regex-automata/0.4.12 \
-    crate://crates.io/regex-lite/0.1.7 \
-    crate://crates.io/regex-syntax/0.8.5 \
+    crate://crates.io/regex-automata/0.4.13 \
+    crate://crates.io/regex-lite/0.1.8 \
+    crate://crates.io/regex-syntax/0.8.8 \
     crate://crates.io/relative-path/1.9.3 \
-    crate://crates.io/rlimit/0.10.2 \
+    crate://crates.io/rlimit/0.11.0 \
     crate://crates.io/roff/0.2.2 \
     crate://crates.io/rstest/0.26.1 \
     crate://crates.io/rstest_macros/0.26.1 \
     crate://crates.io/rust-ini/0.21.3 \
     crate://crates.io/rustc-hash/2.1.1 \
     crate://crates.io/rustc_version/0.4.1 \
-    crate://crates.io/rustix/1.1.2 \
-    crate://crates.io/rustversion/1.0.21 \
-    crate://crates.io/ryu/1.0.20 \
+    crate://crates.io/rustix/1.1.3 \
+    crate://crates.io/rustversion/1.0.22 \
     crate://crates.io/same-file/1.0.6 \
     crate://crates.io/scopeguard/1.2.0 \
-    crate://crates.io/self_cell/1.2.1 \
+    crate://crates.io/self_cell/1.2.2 \
     crate://crates.io/selinux/0.5.2 \
     crate://crates.io/selinux-sys/0.6.15 \
-    crate://crates.io/semver/1.0.26 \
+    crate://crates.io/semver/1.0.27 \
     crate://crates.io/serde/1.0.228 \
-    crate://crates.io/serde-big-array/0.5.1 \
     crate://crates.io/serde_core/1.0.228 \
     crate://crates.io/serde_derive/1.0.228 \
-    crate://crates.io/serde_json/1.0.140 \
+    crate://crates.io/serde_json/1.0.149 \
     crate://crates.io/sha1/0.10.6 \
     crate://crates.io/sha2/0.10.9 \
     crate://crates.io/sha3/0.10.8 \
     crate://crates.io/shlex/1.3.0 \
     crate://crates.io/signal-hook/0.3.18 \
-    crate://crates.io/signal-hook-mio/0.2.4 \
-    crate://crates.io/signal-hook-registry/1.4.5 \
-    crate://crates.io/simd-adler32/0.3.7 \
+    crate://crates.io/signal-hook/0.4.3 \
+    crate://crates.io/signal-hook-mio/0.2.5 \
+    crate://crates.io/signal-hook-registry/1.4.8 \
+    crate://crates.io/simd-adler32/0.3.8 \
     crate://crates.io/siphasher/1.0.1 \
-    crate://crates.io/slab/0.4.9 \
+    crate://crates.io/slab/0.4.11 \
     crate://crates.io/sm3/0.4.2 \
     crate://crates.io/smallvec/1.15.1 \
     crate://crates.io/smawk/0.3.2 \
-    crate://crates.io/socket2/0.6.0 \
+    crate://crates.io/socket2/0.6.1 \
     crate://crates.io/spin/0.10.0 \
-    crate://crates.io/stable_deref_trait/1.2.0 \
+    crate://crates.io/stable_deref_trait/1.2.1 \
     crate://crates.io/statrs/0.18.0 \
+    crate://crates.io/string-interner/0.19.0 \
     crate://crates.io/strsim/0.11.1 \
-    crate://crates.io/syn/2.0.103 \
+    crate://crates.io/syn/2.0.114 \
     crate://crates.io/synstructure/0.13.2 \
     crate://crates.io/tap/1.0.1 \
-    crate://crates.io/tempfile/3.23.0 \
+    crate://crates.io/tempfile/3.24.0 \
     crate://crates.io/terminal_size/0.4.3 \
     crate://crates.io/textwrap/0.16.2 \
     crate://crates.io/thiserror/1.0.69 \
-    crate://crates.io/thiserror/2.0.17 \
+    crate://crates.io/thiserror/2.0.18 \
     crate://crates.io/thiserror-impl/1.0.69 \
-    crate://crates.io/thiserror-impl/2.0.17 \
-    crate://crates.io/time/0.3.44 \
-    crate://crates.io/time-core/0.1.6 \
-    crate://crates.io/time-macros/0.2.24 \
+    crate://crates.io/thiserror-impl/2.0.18 \
+    crate://crates.io/time/0.3.45 \
+    crate://crates.io/time-core/0.1.7 \
+    crate://crates.io/time-macros/0.2.25 \
     crate://crates.io/tiny-keccak/2.0.2 \
-    crate://crates.io/tinystr/0.8.1 \
-    crate://crates.io/toml_datetime/0.6.11 \
-    crate://crates.io/toml_edit/0.22.27 \
+    crate://crates.io/tinystr/0.8.2 \
+    crate://crates.io/toml_datetime/0.7.5+spec-1.1.0 \
+    crate://crates.io/toml_edit/0.23.10+spec-1.0.0 \
+    crate://crates.io/toml_parser/1.0.6+spec-1.1.0 \
     crate://crates.io/type-map/0.5.1 \
-    crate://crates.io/typenum/1.18.0 \
+    crate://crates.io/typed-path/0.12.0 \
+    crate://crates.io/typenum/1.19.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-ident/1.0.22 \
     crate://crates.io/unicode-linebreak/0.1.5 \
-    crate://crates.io/unicode-segmentation/1.12.0 \
     crate://crates.io/unicode-width/0.1.14 \
     crate://crates.io/unicode-width/0.2.2 \
     crate://crates.io/unindent/0.2.4 \
     crate://crates.io/unit-prefix/0.5.2 \
-    crate://crates.io/unty/0.0.4 \
     crate://crates.io/utf16_iter/1.0.5 \
     crate://crates.io/utf8_iter/1.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.17.0 \
+    crate://crates.io/uuid/1.19.0 \
     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/vsimd/0.8.0 \
     crate://crates.io/walkdir/2.5.0 \
     crate://crates.io/wasi/0.11.1+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/wasip2/1.0.1+wasi-0.2.4 \
+    crate://crates.io/wasm-bindgen/0.2.108 \
+    crate://crates.io/wasm-bindgen-macro/0.2.108 \
+    crate://crates.io/wasm-bindgen-macro-support/0.2.108 \
+    crate://crates.io/wasm-bindgen-shared/0.2.108 \
     crate://crates.io/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.11 \
     crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/wincode/0.2.5 \
+    crate://crates.io/wincode-derive/0.2.3 \
     crate://crates.io/windows-core/0.62.2 \
     crate://crates.io/windows-implement/0.60.2 \
     crate://crates.io/windows-interface/0.59.3 \
@@ -343,150 +358,152 @@ SRC_URI += " \
     crate://crates.io/windows-sys/0.60.2 \
     crate://crates.io/windows-sys/0.61.2 \
     crate://crates.io/windows-targets/0.52.6 \
-    crate://crates.io/windows-targets/0.53.2 \
+    crate://crates.io/windows-targets/0.53.5 \
     crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
-    crate://crates.io/windows_aarch64_gnullvm/0.53.0 \
+    crate://crates.io/windows_aarch64_gnullvm/0.53.1 \
     crate://crates.io/windows_aarch64_msvc/0.52.6 \
-    crate://crates.io/windows_aarch64_msvc/0.53.0 \
+    crate://crates.io/windows_aarch64_msvc/0.53.1 \
     crate://crates.io/windows_i686_gnu/0.52.6 \
-    crate://crates.io/windows_i686_gnu/0.53.0 \
+    crate://crates.io/windows_i686_gnu/0.53.1 \
     crate://crates.io/windows_i686_gnullvm/0.52.6 \
-    crate://crates.io/windows_i686_gnullvm/0.53.0 \
+    crate://crates.io/windows_i686_gnullvm/0.53.1 \
     crate://crates.io/windows_i686_msvc/0.52.6 \
-    crate://crates.io/windows_i686_msvc/0.53.0 \
+    crate://crates.io/windows_i686_msvc/0.53.1 \
     crate://crates.io/windows_x86_64_gnu/0.52.6 \
-    crate://crates.io/windows_x86_64_gnu/0.53.0 \
+    crate://crates.io/windows_x86_64_gnu/0.53.1 \
     crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
-    crate://crates.io/windows_x86_64_gnullvm/0.53.0 \
+    crate://crates.io/windows_x86_64_gnullvm/0.53.1 \
     crate://crates.io/windows_x86_64_msvc/0.52.6 \
-    crate://crates.io/windows_x86_64_msvc/0.53.0 \
-    crate://crates.io/winnow/0.7.11 \
-    crate://crates.io/wit-bindgen-rt/0.39.0 \
+    crate://crates.io/windows_x86_64_msvc/0.53.1 \
+    crate://crates.io/winnow/0.7.14 \
+    crate://crates.io/wit-bindgen/0.46.0 \
     crate://crates.io/write16/1.0.0 \
     crate://crates.io/writeable/0.6.2 \
     crate://crates.io/wyz/0.5.1 \
     crate://crates.io/xattr/1.6.1 \
     crate://crates.io/yansi/1.0.1 \
-    crate://crates.io/yoke/0.8.0 \
-    crate://crates.io/yoke-derive/0.8.0 \
+    crate://crates.io/yoke/0.8.1 \
+    crate://crates.io/yoke-derive/0.8.1 \
     crate://crates.io/z85/3.0.6 \
     crate://crates.io/zerocopy/0.7.35 \
-    crate://crates.io/zerocopy/0.8.27 \
+    crate://crates.io/zerocopy/0.8.33 \
     crate://crates.io/zerocopy-derive/0.7.35 \
-    crate://crates.io/zerocopy-derive/0.8.27 \
+    crate://crates.io/zerocopy-derive/0.8.33 \
     crate://crates.io/zerofrom/0.1.6 \
     crate://crates.io/zerofrom-derive/0.1.6 \
-    crate://crates.io/zerotrie/0.2.2 \
+    crate://crates.io/zerotrie/0.2.3 \
     crate://crates.io/zerovec/0.11.5 \
-    crate://crates.io/zerovec-derive/0.11.1 \
-    crate://crates.io/zip/6.0.0 \
-    crate://crates.io/zlib-rs/0.5.1 \
-    crate://crates.io/zopfli/0.8.2 \
+    crate://crates.io/zerovec-derive/0.11.2 \
+    crate://crates.io/zip/7.2.0 \
+    crate://crates.io/zlib-rs/0.5.5 \
+    crate://crates.io/zmij/1.0.14 \
+    crate://crates.io/zopfli/0.8.3 \
 "
 
 SRC_URI[adler2-2.0.1.sha256sum] = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+SRC_URI[aho-corasick-1.1.4.sha256sum] = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 SRC_URI[allocator-api2-0.2.21.sha256sum] = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
 SRC_URI[ansi-width-0.1.0.sha256sum] = "219e3ce6f2611d83b51ec2098a12702112c29e57203a6b0a0929b2cddb486608"
-SRC_URI[anstream-0.6.19.sha256sum] = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
-SRC_URI[anstyle-1.0.11.sha256sum] = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+SRC_URI[anstream-0.6.21.sha256sum] = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+SRC_URI[anstyle-1.0.13.sha256sum] = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 SRC_URI[anstyle-parse-0.2.7.sha256sum] = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
-SRC_URI[anstyle-query-1.1.3.sha256sum] = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
-SRC_URI[anstyle-wincon-3.0.9.sha256sum] = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
+SRC_URI[anstyle-query-1.1.5.sha256sum] = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+SRC_URI[anstyle-wincon-3.0.11.sha256sum] = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 SRC_URI[anyhow-1.0.100.sha256sum] = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 SRC_URI[approx-0.5.1.sha256sum] = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-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[autocfg-1.5.0.sha256sum] = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 SRC_URI[base64-simd-0.8.0.sha256sum] = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
-SRC_URI[bigdecimal-0.4.9.sha256sum] = "560f42649de9fa436b73517378a147ec21f6c997a546581df4b4b31677828934"
+SRC_URI[bigdecimal-0.4.10.sha256sum] = "4d6867f1565b3aad85681f1015055b087fcfd840d6aeee6eee7f2da317603695"
 SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296"
-SRC_URI[bincode-2.0.1.sha256sum] = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740"
-SRC_URI[bincode_derive-2.0.1.sha256sum] = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09"
 SRC_URI[bindgen-0.72.1.sha256sum] = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-SRC_URI[bitflags-2.9.1.sha256sum] = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+SRC_URI[bitflags-2.10.0.sha256sum] = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 SRC_URI[bitvec-1.0.1.sha256sum] = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-SRC_URI[blake2b_simd-1.0.3.sha256sum] = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99"
-SRC_URI[blake3-1.8.2.sha256sum] = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
+SRC_URI[blake2b_simd-1.0.4.sha256sum] = "b79834656f71332577234b50bfc009996f7449e0c056884e6a02492ded0ca2f3"
+SRC_URI[blake3-1.8.3.sha256sum] = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d"
 SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+SRC_URI[block2-0.6.2.sha256sum] = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 SRC_URI[bstr-1.12.1.sha256sum] = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
-SRC_URI[bumpalo-3.18.1.sha256sum] = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
+SRC_URI[bumpalo-3.19.1.sha256sum] = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
 SRC_URI[bytecount-0.6.9.sha256sum] = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"
 SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-SRC_URI[cc-1.2.27.sha256sum] = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
+SRC_URI[calendrical_calculations-0.2.3.sha256sum] = "3a0b39595c6ee54a8d0900204ba4c401d0ab4eb45adaf07178e8d017541529e7"
+SRC_URI[cc-1.2.52.sha256sum] = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
 SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-SRC_URI[cfg-if-1.0.1.sha256sum] = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-SRC_URI[chrono-0.4.42.sha256sum] = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+SRC_URI[chrono-0.4.43.sha256sum] = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
 SRC_URI[clang-sys-1.8.1.sha256sum] = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-SRC_URI[clap-4.5.53.sha256sum] = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
-SRC_URI[clap_builder-4.5.53.sha256sum] = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
-SRC_URI[clap_complete-4.5.61.sha256sum] = "39615915e2ece2550c0149addac32fb5bd312c657f43845bb9088cb9c8a7c992"
-SRC_URI[clap_lex-0.7.5.sha256sum] = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+SRC_URI[clap-4.5.56.sha256sum] = "a75ca66430e33a14957acc24c5077b503e7d374151b2b4b3a10c83b4ceb4be0e"
+SRC_URI[clap_builder-4.5.56.sha256sum] = "793207c7fa6300a0608d1080b858e5fdbe713cdc1c8db9fb17777d8a13e63df0"
+SRC_URI[clap_complete-4.5.65.sha256sum] = "430b4dc2b5e3861848de79627b2bedc9f3342c7da5173a14eaa5d0f8dc18ae5d"
+SRC_URI[clap_lex-0.7.7.sha256sum] = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
 SRC_URI[clap_mangen-0.2.31.sha256sum] = "439ea63a92086df93893164221ad4f24142086d535b3a0957b9b9bea2dc86301"
-SRC_URI[codspeed-4.1.0.sha256sum] = "c3b847e05a34be5c38f3f2a5052178a3bd32e6b5702f3ea775efde95c483a539"
-SRC_URI[codspeed-divan-compat-4.1.0.sha256sum] = "f0f0e9fe5eaa39995ec35e46407f7154346cc25bd1300c64c21636f3d00cb2cc"
-SRC_URI[codspeed-divan-compat-macros-4.1.0.sha256sum] = "88c8babf2a40fd2206a2e030cf020d0d58144cd56e1dc408bfba02cdefb08b4f"
-SRC_URI[codspeed-divan-compat-walltime-4.1.0.sha256sum] = "7f26092328e12a36704ffc552f379c6405dd94d3149970b79b22d371717c2aae"
+SRC_URI[codspeed-4.3.0.sha256sum] = "38c2eb3388ebe26b5a0ab6bf4969d9c4840143d7f6df07caa3cc851b0606cef6"
+SRC_URI[codspeed-divan-compat-4.3.0.sha256sum] = "b2de65b7489a59709724d489070c6d05b7744039e4bf751d0a2006b90bb5593d"
+SRC_URI[codspeed-divan-compat-macros-4.3.0.sha256sum] = "56ca01ce4fd22b8dcc6c770dcd6b74343642e842482b94e8920d14e10c57638d"
+SRC_URI[codspeed-divan-compat-walltime-4.3.0.sha256sum] = "720ab9d0714718afe5f5832be6e5f5eb5ce97836e24ca7bf7042eea4308b9fb8"
 SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 SRC_URI[colored-2.2.0.sha256sum] = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3"
 SRC_URI[condtype-1.3.0.sha256sum] = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af"
-SRC_URI[console-0.16.0.sha256sum] = "2e09ced7ebbccb63b4c65413d821f2e00ce54c5ca4514ddc6b3c892fdbcbc69d"
+SRC_URI[console-0.16.2.sha256sum] = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4"
 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[convert_case-0.7.1.sha256sum] = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
+SRC_URI[constant_time_eq-0.4.2.sha256sum] = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
 SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+SRC_URI[core_maths-0.1.1.sha256sum] = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30"
 SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 SRC_URI[crc-3.3.0.sha256sum] = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
 SRC_URI[crc-catalog-2.4.0.sha256sum] = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
-SRC_URI[crc-fast-1.8.1.sha256sum] = "2c15e7f62c7d6e256e6d0fc3fc1ef395348e4bc395dcf14d6990da0e5aa6e8b0"
+SRC_URI[crc-fast-1.9.0.sha256sum] = "2fd92aca2c6001b1bf5ba0ff84ee74ec8501b52bbef0cac80bf25a6c1d87a83d"
 SRC_URI[crc32fast-1.5.0.sha256sum] = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 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.3.sha256sum] = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
-SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+SRC_URI[crunchy-0.2.4.sha256sum] = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+SRC_URI[crypto-common-0.1.7.sha256sum] = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 SRC_URI[ctor-0.6.3.sha256sum] = "424e0138278faeb2b401f174ad17e715c829512d74f3d1e81eb43365c2e0590e"
 SRC_URI[ctor-proc-macro-0.0.7.sha256sum] = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1"
-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.5.2.sha256sum] = "75d7cc94194b4dd0fa12845ef8c911101b7f37633cda14997a6e82099aa0b693"
-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[ctrlc-3.5.1.sha256sum] = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790"
+SRC_URI[darling-0.21.3.sha256sum] = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+SRC_URI[darling_core-0.21.3.sha256sum] = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+SRC_URI[darling_macro-0.21.3.sha256sum] = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+SRC_URI[data-encoding-2.10.0.sha256sum] = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
+SRC_URI[data-encoding-macro-0.1.19.sha256sum] = "8142a83c17aa9461d637e649271eae18bf2edd00e91f2e105df36c3c16355bdb"
+SRC_URI[data-encoding-macro-internal-0.1.17.sha256sum] = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de"
+SRC_URI[deranged-0.5.5.sha256sum] = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+SRC_URI[dispatch2-0.3.0.sha256sum] = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
 SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 SRC_URI[divan-macros-0.1.17.sha256sum] = "8dc51d98e636f5e3b0759a39257458b22619cac7e96d932da6eeb052891bb67c"
 SRC_URI[dlv-list-0.5.2.sha256sum] = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
 SRC_URI[dns-lookup-3.0.1.sha256sum] = "6e39034cee21a2f5bbb66ba0e3689819c4bb5d00382a282006e802a7ffa6c41d"
-SRC_URI[document-features-0.2.11.sha256sum] = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
-SRC_URI[dtor-0.1.0.sha256sum] = "e58a0764cddb55ab28955347b45be00ade43d4d6f3ba4bf3dc354e4ec9432934"
+SRC_URI[document-features-0.2.12.sha256sum] = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
+SRC_URI[dtor-0.1.1.sha256sum] = "404d02eeb088a82cfd873006cb713fe411306c7d182c344905e101fb1167d301"
 SRC_URI[dtor-proc-macro-0.0.6.sha256sum] = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5"
 SRC_URI[dunce-1.0.5.sha256sum] = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 SRC_URI[encode_unicode-1.0.0.sha256sum] = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 SRC_URI[equivalent-1.0.2.sha256sum] = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-SRC_URI[errno-0.3.12.sha256sum] = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
+SRC_URI[errno-0.3.14.sha256sum] = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 SRC_URI[exacl-0.12.0.sha256sum] = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8"
 SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 SRC_URI[file_diff-1.0.0.sha256sum] = "31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5"
 SRC_URI[filedescriptor-0.8.3.sha256sum] = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d"
-SRC_URI[filetime-0.2.26.sha256sum] = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
-SRC_URI[fixed_decimal-0.7.0.sha256sum] = "35943d22b2f19c0cb198ecf915910a8158e94541c89dcc63300d7799d46c2c5e"
-SRC_URI[flate2-1.1.2.sha256sum] = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+SRC_URI[filetime-0.2.27.sha256sum] = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db"
+SRC_URI[find-msvc-tools-0.1.7.sha256sum] = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
+SRC_URI[fixed_decimal-0.7.1.sha256sum] = "35eabf480f94d69182677e37571d3be065822acfafd12f2f085db44fbbcc8e57"
+SRC_URI[flate2-1.1.8.sha256sum] = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369"
 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-langneg-0.13.1.sha256sum] = "7eebbe59450baee8282d71676f3bfed5689aeab00b27545e83e5f14b1195e8b0"
 SRC_URI[fluent-syntax-0.12.0.sha256sum] = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198"
 SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 SRC_URI[foldhash-0.1.5.sha256sum] = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
@@ -501,60 +518,71 @@ SRC_URI[futures-timer-3.0.3.sha256sum] = "f288b0a4f20f9a56b5d1da57e2227c661b7b16
 SRC_URI[futures-util-0.3.31.sha256sum] = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 SRC_URI[gcd-2.3.0.sha256sum] = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a"
 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[getrandom-0.2.17.sha256sum] = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+SRC_URI[getrandom-0.3.4.sha256sum] = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 SRC_URI[glob-0.3.3.sha256sum] = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 SRC_URI[half-2.7.1.sha256sum] = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-SRC_URI[hashbrown-0.15.4.sha256sum] = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+SRC_URI[hashbrown-0.15.5.sha256sum] = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+SRC_URI[hashbrown-0.16.1.sha256sum] = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 SRC_URI[hex-literal-1.1.0.sha256sum] = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1"
 SRC_URI[hostname-0.4.2.sha256sum] = "617aaa3557aef3810a6369d0a99fac8a080891b68bd9f9812a1eeda0c0730cbd"
 SRC_URI[iana-time-zone-0.1.64.sha256sum] = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
 SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+SRC_URI[icu_calendar-2.1.1.sha256sum] = "d6f0e52e009b6b16ba9c0693578796f2dd4aaa59a7f8f920423706714a89ac4e"
+SRC_URI[icu_calendar_data-2.1.1.sha256sum] = "527f04223b17edfe0bd43baf14a0cb1b017830db65f3950dc00224860a9a446d"
 SRC_URI[icu_collator-2.1.1.sha256sum] = "32eed11a5572f1088b63fa21dc2e70d4a865e5739fc2d10abc05be93bae97019"
 SRC_URI[icu_collator_data-2.1.1.sha256sum] = "5ab06f0e83a613efddba3e4913e00e43ed4001fae651cb7d40fc7e66b83b6fb9"
 SRC_URI[icu_collections-2.1.1.sha256sum] = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+SRC_URI[icu_datetime-2.1.1.sha256sum] = "1b9d49f41ded8e63761b6b4c3120dfdc289415a1ed10107db6198eb311057ca5"
+SRC_URI[icu_datetime_data-2.1.2.sha256sum] = "46597233625417b7c8052a63d916e4fdc73df21614ac0b679492a5d6e3b01aeb"
 SRC_URI[icu_decimal-2.1.1.sha256sum] = "a38c52231bc348f9b982c1868a2af3195199623007ba2c7650f432038f5b3e8e"
 SRC_URI[icu_decimal_data-2.1.1.sha256sum] = "2905b4044eab2dd848fe84199f9195567b63ab3a93094711501363f63546fef7"
 SRC_URI[icu_locale-2.1.1.sha256sum] = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60"
 SRC_URI[icu_locale_core-2.1.1.sha256sum] = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
-SRC_URI[icu_locale_data-2.1.1.sha256sum] = "f03e2fcaefecdf05619f3d6f91740e79ab969b4dd54f77cbf546b1d0d28e3147"
+SRC_URI[icu_locale_data-2.1.2.sha256sum] = "1c5f1d16b4c3a2642d3a719f18f6b06070ab0aef246a6418130c955ae08aa831"
 SRC_URI[icu_normalizer-2.1.1.sha256sum] = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 SRC_URI[icu_normalizer_data-2.1.1.sha256sum] = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
-SRC_URI[icu_properties-2.1.1.sha256sum] = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
-SRC_URI[icu_properties_data-2.1.1.sha256sum] = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
+SRC_URI[icu_pattern-0.4.1.sha256sum] = "7a7ff8c0ff6f61cdce299dcb54f557b0a251adbc78f6f0c35a21332c452b4a1b"
+SRC_URI[icu_plurals-2.1.1.sha256sum] = "4f9cfe49f5b1d1163cc58db451562339916a9ca5cbcaae83924d41a0bf839474"
+SRC_URI[icu_plurals_data-2.1.1.sha256sum] = "f018a98dccf7f0eb02ba06ac0ff67d102d8ded80734724305e924de304e12ff0"
+SRC_URI[icu_properties-2.1.2.sha256sum] = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
+SRC_URI[icu_properties_data-2.1.2.sha256sum] = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
 SRC_URI[icu_provider-2.1.1.sha256sum] = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
-SRC_URI[indexmap-2.9.0.sha256sum] = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+SRC_URI[icu_time-2.1.1.sha256sum] = "8242b00da3b3b6678f731437a11c8833a43c821ae081eca60ba1b7579d45b6d8"
+SRC_URI[icu_time_data-2.1.1.sha256sum] = "3e10b0e5e87a2c84bd5fa407705732052edebe69291d347d0c3033785470edbf"
+SRC_URI[ident_case-1.0.1.sha256sum] = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+SRC_URI[indexmap-2.13.0.sha256sum] = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 SRC_URI[indicatif-0.18.3.sha256sum] = "9375e112e4b463ec1b1c6c011953545c65a30164fbab5b581df32b3abf0dcb88"
 SRC_URI[inotify-0.11.0.sha256sum] = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 SRC_URI[inotify-sys-0.1.5.sha256sum] = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
 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[is_terminal_polyfill-1.70.2.sha256sum] = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 SRC_URI[itertools-0.14.0.sha256sum] = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
-SRC_URI[itoa-1.0.15.sha256sum] = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
-SRC_URI[jiff-0.2.16.sha256sum] = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35"
-SRC_URI[jiff-static-0.2.16.sha256sum] = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69"
-SRC_URI[jiff-tzdb-0.1.4.sha256sum] = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524"
+SRC_URI[itoa-1.0.17.sha256sum] = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+SRC_URI[ixdtf-0.6.4.sha256sum] = "84de9d95a6d2547d9b77ee3f25fa0ee32e3c3a6484d47a55adebc0439c077992"
+SRC_URI[jiff-0.2.18.sha256sum] = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50"
+SRC_URI[jiff-icu-0.2.2.sha256sum] = "0e67c2beaae8b10a82d849b9aabb698a43a682f32b17bcdc035d5ecadb44d646"
+SRC_URI[jiff-static-0.2.18.sha256sum] = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78"
+SRC_URI[jiff-tzdb-0.1.5.sha256sum] = "68971ebff725b9e2ca27a601c5eb38a4c5d64422c4cbab0c535f248087eda5c2"
 SRC_URI[jiff-tzdb-platform-0.1.3.sha256sum] = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8"
-SRC_URI[js-sys-0.3.77.sha256sum] = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+SRC_URI[js-sys-0.3.85.sha256sum] = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
 SRC_URI[keccak-0.1.5.sha256sum] = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 SRC_URI[kqueue-1.1.1.sha256sum] = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
 SRC_URI[kqueue-sys-1.0.4.sha256sum] = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
 SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-SRC_URI[libc-0.2.175.sha256sum] = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
-SRC_URI[libloading-0.8.8.sha256sum] = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
+SRC_URI[libc-0.2.180.sha256sum] = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
+SRC_URI[libloading-0.8.9.sha256sum] = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 SRC_URI[libm-0.2.15.sha256sum] = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
-SRC_URI[libredox-0.1.3.sha256sum] = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-SRC_URI[libz-rs-sys-0.5.1.sha256sum] = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
+SRC_URI[libredox-0.1.12.sha256sum] = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
 SRC_URI[linux-raw-sys-0.11.0.sha256sum] = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
-SRC_URI[linux-raw-sys-0.12.0.sha256sum] = "b83b49c75b50cb715b09d337b045481493a8ada2bb3e872f2bae71db45b27696"
-SRC_URI[litemap-0.8.0.sha256sum] = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
-SRC_URI[litrs-0.4.1.sha256sum] = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
-SRC_URI[lock_api-0.4.13.sha256sum] = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
-SRC_URI[log-0.4.27.sha256sum] = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+SRC_URI[litemap-0.8.1.sha256sum] = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+SRC_URI[litrs-1.0.0.sha256sum] = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
+SRC_URI[lock_api-0.4.14.sha256sum] = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+SRC_URI[log-0.4.29.sha256sum] = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 SRC_URI[lru-0.12.5.sha256sum] = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 SRC_URI[lscolors-0.21.0.sha256sum] = "d60e266dfb1426eb2d24792602e041131fdc0236bb7007abc0e589acafd60929"
 SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
@@ -563,7 +591,7 @@ SRC_URI[memmap2-0.9.9.sha256sum] = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111a
 SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
 SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 SRC_URI[miniz_oxide-0.8.9.sha256sum] = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-SRC_URI[mio-1.0.4.sha256sum] = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+SRC_URI[mio-1.1.1.sha256sum] = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
 SRC_URI[nix-0.30.1.sha256sum] = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 SRC_URI[nom-8.0.0.sha256sum] = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
@@ -577,15 +605,17 @@ SRC_URI[num-modular-0.5.1.sha256sum] = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f
 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[objc2-0.6.3.sha256sum] = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05"
+SRC_URI[objc2-encode-4.1.0.sha256sum] = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
 SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
-SRC_URI[once_cell_polyfill-1.70.1.sha256sum] = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+SRC_URI[once_cell_polyfill-1.70.2.sha256sum] = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 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[outref-0.5.2.sha256sum] = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
-SRC_URI[parking_lot-0.12.4.sha256sum] = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
-SRC_URI[parking_lot_core-0.9.11.sha256sum] = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+SRC_URI[parking_lot-0.12.5.sha256sum] = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+SRC_URI[parking_lot_core-0.9.12.sha256sum] = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 SRC_URI[parse_datetime-0.13.3.sha256sum] = "acea383beda9652270f3c9678d83aa58cbfc16880343cae0c0c8c7d6c0974132"
 SRC_URI[phf-0.13.1.sha256sum] = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 SRC_URI[phf_codegen-0.13.1.sha256sum] = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
@@ -595,126 +625,127 @@ SRC_URI[pin-project-lite-0.2.16.sha256sum] = "3b3cff922bd51709b605d9ead9aa71031d
 SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 SRC_URI[pkg-config-0.3.32.sha256sum] = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 SRC_URI[platform-info-2.0.5.sha256sum] = "7539aeb3fdd8cb4f6a331307cf71a1039cee75e94e8a71725b9484f4a0d9451a"
-SRC_URI[portable-atomic-1.11.1.sha256sum] = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+SRC_URI[portable-atomic-1.13.0.sha256sum] = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
 SRC_URI[portable-atomic-util-0.2.4.sha256sum] = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
 SRC_URI[potential_utf-0.1.4.sha256sum] = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
 SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 SRC_URI[ppv-lite86-0.2.21.sha256sum] = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 SRC_URI[pretty_assertions-1.4.1.sha256sum] = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
-SRC_URI[prettyplease-0.2.34.sha256sum] = "6837b9e10d61f45f987d50808f83d1ee3d206c66acf650c3e4ae2e1f6ddedf55"
-SRC_URI[proc-macro-crate-3.3.0.sha256sum] = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
-SRC_URI[proc-macro2-1.0.103.sha256sum] = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+SRC_URI[prettyplease-0.2.37.sha256sum] = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+SRC_URI[proc-macro-crate-3.4.0.sha256sum] = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 SRC_URI[procfs-0.18.0.sha256sum] = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7"
 SRC_URI[procfs-core-0.18.0.sha256sum] = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405"
-SRC_URI[quote-1.0.42.sha256sum] = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
-SRC_URI[r-efi-5.2.0.sha256sum] = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+SRC_URI[quote-1.0.44.sha256sum] = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
+SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 SRC_URI[rand-0.9.2.sha256sum] = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 SRC_URI[rand_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_core-0.9.3.sha256sum] = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+SRC_URI[rand_core-0.9.5.sha256sum] = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 SRC_URI[rayon-1.11.0.sha256sum] = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 SRC_URI[rayon-core-1.13.0.sha256sum] = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
-SRC_URI[redox_syscall-0.5.13.sha256sum] = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
+SRC_URI[redox_syscall-0.5.18.sha256sum] = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+SRC_URI[redox_syscall-0.7.0.sha256sum] = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
 SRC_URI[regex-1.12.2.sha256sum] = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
-SRC_URI[regex-automata-0.4.12.sha256sum] = "722166aa0d7438abbaa4d5cc2c649dac844e8c56d82fb3d33e9c34b5cd268fc6"
-SRC_URI[regex-lite-0.1.7.sha256sum] = "943f41321c63ef1c92fd763bfe054d2668f7f225a5c29f0105903dc2fc04ba30"
-SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+SRC_URI[regex-automata-0.4.13.sha256sum] = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+SRC_URI[regex-lite-0.1.8.sha256sum] = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da"
+SRC_URI[regex-syntax-0.8.8.sha256sum] = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 SRC_URI[relative-path-1.9.3.sha256sum] = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
-SRC_URI[rlimit-0.10.2.sha256sum] = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a"
+SRC_URI[rlimit-0.11.0.sha256sum] = "f35ee2729c56bb610f6dba436bf78135f728b7373bdffae2ec815b2d3eb98cc3"
 SRC_URI[roff-0.2.2.sha256sum] = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3"
 SRC_URI[rstest-0.26.1.sha256sum] = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49"
 SRC_URI[rstest_macros-0.26.1.sha256sum] = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0"
 SRC_URI[rust-ini-0.21.3.sha256sum] = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7"
 SRC_URI[rustc-hash-2.1.1.sha256sum] = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 SRC_URI[rustc_version-0.4.1.sha256sum] = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-SRC_URI[rustix-1.1.2.sha256sum] = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
-SRC_URI[rustversion-1.0.21.sha256sum] = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
-SRC_URI[ryu-1.0.20.sha256sum] = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+SRC_URI[rustix-1.1.3.sha256sum] = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+SRC_URI[rustversion-1.0.22.sha256sum] = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-SRC_URI[self_cell-1.2.1.sha256sum] = "16c2f82143577edb4921b71ede051dac62ca3c16084e918bf7b40c96ae10eb33"
+SRC_URI[self_cell-1.2.2.sha256sum] = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89"
 SRC_URI[selinux-0.5.2.sha256sum] = "2ef2ca58174235414aee5465f5d8ef9f5833023b31484eb52ca505f306f4573c"
 SRC_URI[selinux-sys-0.6.15.sha256sum] = "debaba5832b4831ffe0ba9118b526c752c960f41c46c4ef197d9a15f5179d6fd"
-SRC_URI[semver-1.0.26.sha256sum] = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+SRC_URI[semver-1.0.27.sha256sum] = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
-SRC_URI[serde-big-array-0.5.1.sha256sum] = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f"
 SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
-SRC_URI[serde_json-1.0.140.sha256sum] = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+SRC_URI[serde_json-1.0.149.sha256sum] = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 SRC_URI[signal-hook-0.3.18.sha256sum] = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
-SRC_URI[signal-hook-mio-0.2.4.sha256sum] = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
-SRC_URI[signal-hook-registry-1.4.5.sha256sum] = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
-SRC_URI[simd-adler32-0.3.7.sha256sum] = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+SRC_URI[signal-hook-0.4.3.sha256sum] = "3b57709da74f9ff9f4a27dce9526eec25ca8407c45a7887243b031a58935fb8e"
+SRC_URI[signal-hook-mio-0.2.5.sha256sum] = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
+SRC_URI[signal-hook-registry-1.4.8.sha256sum] = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
+SRC_URI[simd-adler32-0.3.8.sha256sum] = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 SRC_URI[siphasher-1.0.1.sha256sum] = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-SRC_URI[slab-0.4.9.sha256sum] = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+SRC_URI[slab-0.4.11.sha256sum] = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860"
 SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 SRC_URI[smawk-0.3.2.sha256sum] = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
-SRC_URI[socket2-0.6.0.sha256sum] = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+SRC_URI[socket2-0.6.1.sha256sum] = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
 SRC_URI[spin-0.10.0.sha256sum] = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
-SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+SRC_URI[stable_deref_trait-1.2.1.sha256sum] = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 SRC_URI[statrs-0.18.0.sha256sum] = "2a3fe7c28c6512e766b0874335db33c94ad7b8f9054228ae1c2abd47ce7d335e"
+SRC_URI[string-interner-0.19.0.sha256sum] = "23de088478b31c349c9ba67816fa55d9355232d63c3afea8bf513e31f0f1d2c0"
 SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-SRC_URI[syn-2.0.103.sha256sum] = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8"
+SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 SRC_URI[synstructure-0.13.2.sha256sum] = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-SRC_URI[tempfile-3.23.0.sha256sum] = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+SRC_URI[tempfile-3.24.0.sha256sum] = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
 SRC_URI[terminal_size-0.4.3.sha256sum] = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
 SRC_URI[textwrap-0.16.2.sha256sum] = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
 SRC_URI[thiserror-1.0.69.sha256sum] = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
-SRC_URI[thiserror-2.0.17.sha256sum] = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+SRC_URI[thiserror-2.0.18.sha256sum] = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 SRC_URI[thiserror-impl-1.0.69.sha256sum] = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-SRC_URI[thiserror-impl-2.0.17.sha256sum] = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
-SRC_URI[time-0.3.44.sha256sum] = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
-SRC_URI[time-core-0.1.6.sha256sum] = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
-SRC_URI[time-macros-0.2.24.sha256sum] = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+SRC_URI[thiserror-impl-2.0.18.sha256sum] = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+SRC_URI[time-0.3.45.sha256sum] = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd"
+SRC_URI[time-core-0.1.7.sha256sum] = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca"
+SRC_URI[time-macros-0.2.25.sha256sum] = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd"
 SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-SRC_URI[tinystr-0.8.1.sha256sum] = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
-SRC_URI[toml_datetime-0.6.11.sha256sum] = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-SRC_URI[toml_edit-0.22.27.sha256sum] = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+SRC_URI[tinystr-0.8.2.sha256sum] = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+SRC_URI[toml_datetime-0.7.5+spec-1.1.0.sha256sum] = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+SRC_URI[toml_edit-0.23.10+spec-1.0.0.sha256sum] = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
+SRC_URI[toml_parser-1.0.6+spec-1.1.0.sha256sum] = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
 SRC_URI[type-map-0.5.1.sha256sum] = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90"
-SRC_URI[typenum-1.18.0.sha256sum] = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+SRC_URI[typed-path-0.12.0.sha256sum] = "7922f2cdc51280d47b491af9eafc41eb0cdab85eabcb390c854412fcbf26dbe8"
+SRC_URI[typenum-1.19.0.sha256sum] = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 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-ident-1.0.22.sha256sum] = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-SRC_URI[unicode-segmentation-1.12.0.sha256sum] = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 SRC_URI[unicode-width-0.1.14.sha256sum] = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 SRC_URI[unicode-width-0.2.2.sha256sum] = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 SRC_URI[unindent-0.2.4.sha256sum] = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
 SRC_URI[unit-prefix-0.5.2.sha256sum] = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3"
-SRC_URI[unty-0.0.4.sha256sum] = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
 SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
 SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 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.17.0.sha256sum] = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
+SRC_URI[uuid-1.19.0.sha256sum] = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
 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[vsimd-0.8.0.sha256sum] = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
 SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 SRC_URI[wasi-0.11.1+wasi-snapshot-preview1.sha256sum] = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
-SRC_URI[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[wasip2-1.0.1+wasi-0.2.4.sha256sum] = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+SRC_URI[wasm-bindgen-0.2.108.sha256sum] = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
+SRC_URI[wasm-bindgen-macro-0.2.108.sha256sum] = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
+SRC_URI[wasm-bindgen-macro-support-0.2.108.sha256sum] = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
+SRC_URI[wasm-bindgen-shared-0.2.108.sha256sum] = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
 SRC_URI[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.11.sha256sum] = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+SRC_URI[wincode-0.2.5.sha256sum] = "d5cec722a3274e47d1524cbe2cea762f2c19d615bd9d73ada21db9066349d57e"
+SRC_URI[wincode-derive-0.2.3.sha256sum] = "8961eb04054a1b2e026b5628e24da7e001350249a787e1a85aa961f33dc5f286"
 SRC_URI[windows-core-0.62.2.sha256sum] = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 SRC_URI[windows-implement-0.60.2.sha256sum] = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 SRC_URI[windows-interface-0.59.3.sha256sum] = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
@@ -725,45 +756,46 @@ SRC_URI[windows-sys-0.59.0.sha256sum] = "1e38bc4d79ed67fd075bcc251a1c39b32a1776b
 SRC_URI[windows-sys-0.60.2.sha256sum] = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 SRC_URI[windows-sys-0.61.2.sha256sum] = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-SRC_URI[windows-targets-0.53.2.sha256sum] = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+SRC_URI[windows-targets-0.53.5.sha256sum] = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-SRC_URI[windows_aarch64_gnullvm-0.53.0.sha256sum] = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+SRC_URI[windows_aarch64_gnullvm-0.53.1.sha256sum] = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-SRC_URI[windows_aarch64_msvc-0.53.0.sha256sum] = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+SRC_URI[windows_aarch64_msvc-0.53.1.sha256sum] = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-SRC_URI[windows_i686_gnu-0.53.0.sha256sum] = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+SRC_URI[windows_i686_gnu-0.53.1.sha256sum] = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-SRC_URI[windows_i686_gnullvm-0.53.0.sha256sum] = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+SRC_URI[windows_i686_gnullvm-0.53.1.sha256sum] = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-SRC_URI[windows_i686_msvc-0.53.0.sha256sum] = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+SRC_URI[windows_i686_msvc-0.53.1.sha256sum] = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-SRC_URI[windows_x86_64_gnu-0.53.0.sha256sum] = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+SRC_URI[windows_x86_64_gnu-0.53.1.sha256sum] = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-SRC_URI[windows_x86_64_gnullvm-0.53.0.sha256sum] = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+SRC_URI[windows_x86_64_gnullvm-0.53.1.sha256sum] = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-SRC_URI[windows_x86_64_msvc-0.53.0.sha256sum] = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-SRC_URI[winnow-0.7.11.sha256sum] = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
-SRC_URI[wit-bindgen-rt-0.39.0.sha256sum] = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+SRC_URI[windows_x86_64_msvc-0.53.1.sha256sum] = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+SRC_URI[winnow-0.7.14.sha256sum] = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+SRC_URI[wit-bindgen-0.46.0.sha256sum] = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
 SRC_URI[writeable-0.6.2.sha256sum] = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
 SRC_URI[xattr-1.6.1.sha256sum] = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
 SRC_URI[yansi-1.0.1.sha256sum] = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-SRC_URI[yoke-0.8.0.sha256sum] = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
-SRC_URI[yoke-derive-0.8.0.sha256sum] = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+SRC_URI[yoke-0.8.1.sha256sum] = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+SRC_URI[yoke-derive-0.8.1.sha256sum] = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 SRC_URI[z85-3.0.6.sha256sum] = "9b3a41ce106832b4da1c065baa4c31cf640cf965fa1483816402b7f6b96f0a64"
 SRC_URI[zerocopy-0.7.35.sha256sum] = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-SRC_URI[zerocopy-0.8.27.sha256sum] = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+SRC_URI[zerocopy-0.8.33.sha256sum] = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd"
 SRC_URI[zerocopy-derive-0.7.35.sha256sum] = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-SRC_URI[zerocopy-derive-0.8.27.sha256sum] = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+SRC_URI[zerocopy-derive-0.8.33.sha256sum] = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1"
 SRC_URI[zerofrom-0.1.6.sha256sum] = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 SRC_URI[zerofrom-derive-0.1.6.sha256sum] = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
-SRC_URI[zerotrie-0.2.2.sha256sum] = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+SRC_URI[zerotrie-0.2.3.sha256sum] = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
 SRC_URI[zerovec-0.11.5.sha256sum] = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
-SRC_URI[zerovec-derive-0.11.1.sha256sum] = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
-SRC_URI[zip-6.0.0.sha256sum] = "eb2a05c7c36fde6c09b08576c9f7fb4cda705990f73b58fe011abf7dfb24168b"
-SRC_URI[zlib-rs-0.5.1.sha256sum] = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
-SRC_URI[zopfli-0.8.2.sha256sum] = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7"
+SRC_URI[zerovec-derive-0.11.2.sha256sum] = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+SRC_URI[zip-7.2.0.sha256sum] = "c42e33efc22a0650c311c2ef19115ce232583abbe80850bc8b66509ebef02de0"
+SRC_URI[zlib-rs-0.5.5.sha256sum] = "40990edd51aae2c2b6907af74ffb635029d5788228222c4bb811e9351c0caad3"
+SRC_URI[zmij-1.0.14.sha256sum] = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea"
+SRC_URI[zopfli-0.8.3.sha256sum] = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
 # from fuzz/Cargo.lock
 SRC_URI += " \
     crate://crates.io/adler2/2.0.1 \
@@ -778,34 +810,34 @@ SRC_URI += " \
     crate://crates.io/arrayvec/0.7.6 \
     crate://crates.io/autocfg/1.5.0 \
     crate://crates.io/base64-simd/0.8.0 \
-    crate://crates.io/bigdecimal/0.4.9 \
+    crate://crates.io/bigdecimal/0.4.10 \
     crate://crates.io/binary-heap-plus/0.5.0 \
     crate://crates.io/bitflags/2.10.0 \
-    crate://crates.io/blake2b_simd/1.0.3 \
-    crate://crates.io/blake3/1.8.2 \
+    crate://crates.io/blake2b_simd/1.0.4 \
+    crate://crates.io/blake3/1.8.3 \
     crate://crates.io/block-buffer/0.10.4 \
     crate://crates.io/block2/0.6.2 \
     crate://crates.io/bstr/1.12.1 \
-    crate://crates.io/bumpalo/3.19.0 \
+    crate://crates.io/bumpalo/3.19.1 \
     crate://crates.io/bytecount/0.6.9 \
-    crate://crates.io/cc/1.2.48 \
+    crate://crates.io/calendrical_calculations/0.2.3 \
+    crate://crates.io/cc/1.2.54 \
     crate://crates.io/cfg-if/1.0.4 \
     crate://crates.io/cfg_aliases/0.2.1 \
-    crate://crates.io/chrono/0.4.42 \
-    crate://crates.io/clap/4.5.53 \
-    crate://crates.io/clap_builder/4.5.53 \
-    crate://crates.io/clap_lex/0.7.6 \
+    crate://crates.io/chrono/0.4.43 \
+    crate://crates.io/clap/4.5.54 \
+    crate://crates.io/clap_builder/4.5.54 \
+    crate://crates.io/clap_lex/0.7.7 \
     crate://crates.io/colorchoice/1.0.4 \
     crate://crates.io/compare/0.1.0 \
-    crate://crates.io/console/0.16.1 \
+    crate://crates.io/console/0.16.2 \
     crate://crates.io/const-random/0.1.18 \
     crate://crates.io/const-random-macro/0.1.16 \
-    crate://crates.io/constant_time_eq/0.3.1 \
+    crate://crates.io/constant_time_eq/0.4.2 \
     crate://crates.io/core-foundation-sys/0.8.7 \
+    crate://crates.io/core_maths/0.1.1 \
     crate://crates.io/cpufeatures/0.2.17 \
-    crate://crates.io/crc/3.4.0 \
-    crate://crates.io/crc-catalog/2.4.0 \
-    crate://crates.io/crc-fast/1.8.0 \
+    crate://crates.io/crc-fast/1.10.0 \
     crate://crates.io/crc32fast/1.5.0 \
     crate://crates.io/crossbeam-deque/0.8.6 \
     crate://crates.io/crossbeam-epoch/0.9.18 \
@@ -813,9 +845,9 @@ SRC_URI += " \
     crate://crates.io/crunchy/0.2.4 \
     crate://crates.io/crypto-common/0.1.7 \
     crate://crates.io/ctrlc/3.5.1 \
-    crate://crates.io/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/data-encoding/2.10.0 \
+    crate://crates.io/data-encoding-macro/0.1.19 \
+    crate://crates.io/data-encoding-macro-internal/0.1.17 \
     crate://crates.io/digest/0.10.7 \
     crate://crates.io/dispatch2/0.3.0 \
     crate://crates.io/displaydoc/0.2.5 \
@@ -825,46 +857,60 @@ SRC_URI += " \
     crate://crates.io/encode_unicode/1.0.0 \
     crate://crates.io/errno/0.3.14 \
     crate://crates.io/fastrand/2.3.0 \
-    crate://crates.io/find-msvc-tools/0.1.5 \
-    crate://crates.io/flate2/1.1.5 \
+    crate://crates.io/find-msvc-tools/0.1.8 \
+    crate://crates.io/fixed_decimal/0.7.1 \
+    crate://crates.io/flate2/1.1.8 \
     crate://crates.io/fluent/0.17.0 \
     crate://crates.io/fluent-bundle/0.16.0 \
     crate://crates.io/fluent-langneg/0.13.1 \
     crate://crates.io/fluent-syntax/0.12.0 \
     crate://crates.io/fnv/1.0.7 \
     crate://crates.io/generic-array/0.14.7 \
-    crate://crates.io/getrandom/0.2.16 \
+    crate://crates.io/getrandom/0.2.17 \
     crate://crates.io/getrandom/0.3.4 \
     crate://crates.io/glob/0.3.3 \
     crate://crates.io/hashbrown/0.14.5 \
     crate://crates.io/hex/0.4.3 \
     crate://crates.io/iana-time-zone/0.1.64 \
     crate://crates.io/iana-time-zone-haiku/0.1.2 \
+    crate://crates.io/icu_calendar/2.1.1 \
+    crate://crates.io/icu_calendar_data/2.1.1 \
     crate://crates.io/icu_collator/2.1.1 \
     crate://crates.io/icu_collator_data/2.1.1 \
     crate://crates.io/icu_collections/2.1.1 \
+    crate://crates.io/icu_datetime/2.1.1 \
+    crate://crates.io/icu_datetime_data/2.1.2 \
+    crate://crates.io/icu_decimal/2.1.1 \
+    crate://crates.io/icu_decimal_data/2.1.1 \
     crate://crates.io/icu_locale/2.1.1 \
     crate://crates.io/icu_locale_core/2.1.1 \
-    crate://crates.io/icu_locale_data/2.1.1 \
+    crate://crates.io/icu_locale_data/2.1.2 \
     crate://crates.io/icu_normalizer/2.1.1 \
     crate://crates.io/icu_normalizer_data/2.1.1 \
-    crate://crates.io/icu_properties/2.1.1 \
-    crate://crates.io/icu_properties_data/2.1.1 \
+    crate://crates.io/icu_pattern/0.4.1 \
+    crate://crates.io/icu_plurals/2.1.1 \
+    crate://crates.io/icu_plurals_data/2.1.1 \
+    crate://crates.io/icu_properties/2.1.2 \
+    crate://crates.io/icu_properties_data/2.1.2 \
     crate://crates.io/icu_provider/2.1.1 \
+    crate://crates.io/icu_time/2.1.1 \
+    crate://crates.io/icu_time_data/2.1.1 \
     crate://crates.io/intl-memoizer/0.5.3 \
     crate://crates.io/intl_pluralrules/7.0.2 \
     crate://crates.io/is_terminal_polyfill/1.70.2 \
     crate://crates.io/itertools/0.14.0 \
-    crate://crates.io/jiff/0.2.16 \
-    crate://crates.io/jiff-static/0.2.16 \
-    crate://crates.io/jiff-tzdb/0.1.4 \
+    crate://crates.io/ixdtf/0.6.4 \
+    crate://crates.io/jiff/0.2.18 \
+    crate://crates.io/jiff-icu/0.2.2 \
+    crate://crates.io/jiff-static/0.2.18 \
+    crate://crates.io/jiff-tzdb/0.1.5 \
     crate://crates.io/jiff-tzdb-platform/0.1.3 \
     crate://crates.io/jobserver/0.1.34 \
-    crate://crates.io/js-sys/0.3.83 \
+    crate://crates.io/js-sys/0.3.85 \
     crate://crates.io/keccak/0.1.5 \
-    crate://crates.io/libc/0.2.178 \
+    crate://crates.io/libc/0.2.180 \
     crate://crates.io/libfuzzer-sys/0.4.10 \
-    crate://crates.io/libm/0.2.15 \
+    crate://crates.io/libm/0.2.16 \
     crate://crates.io/linux-raw-sys/0.11.0 \
     crate://crates.io/litemap/0.8.1 \
     crate://crates.io/log/0.4.29 \
@@ -886,29 +932,27 @@ SRC_URI += " \
     crate://crates.io/os_display/0.1.4 \
     crate://crates.io/outref/0.5.2 \
     crate://crates.io/parse_datetime/0.13.3 \
-    crate://crates.io/phf/0.13.1 \
-    crate://crates.io/phf_shared/0.13.1 \
     crate://crates.io/pkg-config/0.3.32 \
-    crate://crates.io/portable-atomic/1.11.1 \
+    crate://crates.io/portable-atomic/1.13.0 \
     crate://crates.io/portable-atomic-util/0.2.4 \
     crate://crates.io/potential_utf/0.1.4 \
     crate://crates.io/ppv-lite86/0.2.21 \
-    crate://crates.io/proc-macro2/1.0.103 \
+    crate://crates.io/proc-macro2/1.0.106 \
     crate://crates.io/procfs/0.18.0 \
     crate://crates.io/procfs-core/0.18.0 \
-    crate://crates.io/quote/1.0.42 \
+    crate://crates.io/quote/1.0.44 \
     crate://crates.io/r-efi/5.3.0 \
     crate://crates.io/rand/0.9.2 \
     crate://crates.io/rand_chacha/0.9.0 \
-    crate://crates.io/rand_core/0.9.3 \
+    crate://crates.io/rand_core/0.9.5 \
     crate://crates.io/rayon/1.11.0 \
     crate://crates.io/rayon-core/1.13.0 \
     crate://crates.io/regex-automata/0.4.13 \
     crate://crates.io/rust-ini/0.21.3 \
     crate://crates.io/rustc-hash/2.1.1 \
-    crate://crates.io/rustix/1.1.2 \
+    crate://crates.io/rustix/1.1.3 \
     crate://crates.io/rustversion/1.0.22 \
-    crate://crates.io/self_cell/1.2.1 \
+    crate://crates.io/self_cell/1.2.2 \
     crate://crates.io/serde/1.0.228 \
     crate://crates.io/serde_core/1.0.228 \
     crate://crates.io/serde_derive/1.0.228 \
@@ -916,20 +960,19 @@ SRC_URI += " \
     crate://crates.io/sha2/0.10.9 \
     crate://crates.io/sha3/0.10.8 \
     crate://crates.io/shlex/1.3.0 \
-    crate://crates.io/simd-adler32/0.3.7 \
+    crate://crates.io/simd-adler32/0.3.8 \
     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.1 \
     crate://crates.io/spin/0.10.0 \
     crate://crates.io/stable_deref_trait/1.2.1 \
     crate://crates.io/strsim/0.11.1 \
-    crate://crates.io/syn/2.0.111 \
+    crate://crates.io/syn/2.0.114 \
     crate://crates.io/synstructure/0.13.2 \
-    crate://crates.io/tempfile/3.23.0 \
+    crate://crates.io/tempfile/3.24.0 \
     crate://crates.io/terminal_size/0.4.3 \
-    crate://crates.io/thiserror/2.0.17 \
-    crate://crates.io/thiserror-impl/2.0.17 \
+    crate://crates.io/thiserror/2.0.18 \
+    crate://crates.io/thiserror-impl/2.0.18 \
     crate://crates.io/tiny-keccak/2.0.2 \
     crate://crates.io/tinystr/0.8.2 \
     crate://crates.io/type-map/0.5.1 \
@@ -945,11 +988,11 @@ SRC_URI += " \
     crate://crates.io/version_check/0.9.5 \
     crate://crates.io/vsimd/0.8.0 \
     crate://crates.io/wasi/0.11.1+wasi-snapshot-preview1 \
-    crate://crates.io/wasip2/1.0.1+wasi-0.2.4 \
-    crate://crates.io/wasm-bindgen/0.2.106 \
-    crate://crates.io/wasm-bindgen-macro/0.2.106 \
-    crate://crates.io/wasm-bindgen-macro-support/0.2.106 \
-    crate://crates.io/wasm-bindgen-shared/0.2.106 \
+    crate://crates.io/wasip2/1.0.2+wasi-0.2.9 \
+    crate://crates.io/wasm-bindgen/0.2.108 \
+    crate://crates.io/wasm-bindgen-macro/0.2.108 \
+    crate://crates.io/wasm-bindgen-macro-support/0.2.108 \
+    crate://crates.io/wasm-bindgen-shared/0.2.108 \
     crate://crates.io/wild/2.2.1 \
     crate://crates.io/winapi-util/0.1.11 \
     crate://crates.io/windows-core/0.62.2 \
@@ -970,14 +1013,14 @@ SRC_URI += " \
     crate://crates.io/windows_x86_64_gnullvm/0.53.1 \
     crate://crates.io/windows_x86_64_msvc/0.53.1 \
     crate://crates.io/winnow/0.7.14 \
-    crate://crates.io/wit-bindgen/0.46.0 \
+    crate://crates.io/wit-bindgen/0.51.0 \
     crate://crates.io/write16/1.0.0 \
     crate://crates.io/writeable/0.6.2 \
     crate://crates.io/yoke/0.8.1 \
     crate://crates.io/yoke-derive/0.8.1 \
     crate://crates.io/z85/3.0.6 \
-    crate://crates.io/zerocopy/0.8.31 \
-    crate://crates.io/zerocopy-derive/0.8.31 \
+    crate://crates.io/zerocopy/0.8.34 \
+    crate://crates.io/zerocopy-derive/0.8.34 \
     crate://crates.io/zerofrom/0.1.6 \
     crate://crates.io/zerofrom-derive/0.1.6 \
     crate://crates.io/zerotrie/0.2.3 \
@@ -997,34 +1040,34 @@ SRC_URI[arrayref-0.3.9.sha256sum] = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd422
 SRC_URI[arrayvec-0.7.6.sha256sum] = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 SRC_URI[autocfg-1.5.0.sha256sum] = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 SRC_URI[base64-simd-0.8.0.sha256sum] = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
-SRC_URI[bigdecimal-0.4.9.sha256sum] = "560f42649de9fa436b73517378a147ec21f6c997a546581df4b4b31677828934"
+SRC_URI[bigdecimal-0.4.10.sha256sum] = "4d6867f1565b3aad85681f1015055b087fcfd840d6aeee6eee7f2da317603695"
 SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296"
 SRC_URI[bitflags-2.10.0.sha256sum] = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
-SRC_URI[blake2b_simd-1.0.3.sha256sum] = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99"
-SRC_URI[blake3-1.8.2.sha256sum] = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
+SRC_URI[blake2b_simd-1.0.4.sha256sum] = "b79834656f71332577234b50bfc009996f7449e0c056884e6a02492ded0ca2f3"
+SRC_URI[blake3-1.8.3.sha256sum] = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d"
 SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 SRC_URI[block2-0.6.2.sha256sum] = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 SRC_URI[bstr-1.12.1.sha256sum] = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
-SRC_URI[bumpalo-3.19.0.sha256sum] = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+SRC_URI[bumpalo-3.19.1.sha256sum] = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
 SRC_URI[bytecount-0.6.9.sha256sum] = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"
-SRC_URI[cc-1.2.48.sha256sum] = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a"
+SRC_URI[calendrical_calculations-0.2.3.sha256sum] = "3a0b39595c6ee54a8d0900204ba4c401d0ab4eb45adaf07178e8d017541529e7"
+SRC_URI[cc-1.2.54.sha256sum] = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583"
 SRC_URI[cfg-if-1.0.4.sha256sum] = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 SRC_URI[cfg_aliases-0.2.1.sha256sum] = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-SRC_URI[chrono-0.4.42.sha256sum] = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
-SRC_URI[clap-4.5.53.sha256sum] = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
-SRC_URI[clap_builder-4.5.53.sha256sum] = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
-SRC_URI[clap_lex-0.7.6.sha256sum] = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+SRC_URI[chrono-0.4.43.sha256sum] = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
+SRC_URI[clap-4.5.54.sha256sum] = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394"
+SRC_URI[clap_builder-4.5.54.sha256sum] = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00"
+SRC_URI[clap_lex-0.7.7.sha256sum] = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
 SRC_URI[colorchoice-1.0.4.sha256sum] = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3"
-SRC_URI[console-0.16.1.sha256sum] = "b430743a6eb14e9764d4260d4c0d8123087d504eeb9c48f2b2a5e810dd369df4"
+SRC_URI[console-0.16.2.sha256sum] = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4"
 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[constant_time_eq-0.4.2.sha256sum] = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
 SRC_URI[core-foundation-sys-0.8.7.sha256sum] = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+SRC_URI[core_maths-0.1.1.sha256sum] = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30"
 SRC_URI[cpufeatures-0.2.17.sha256sum] = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
-SRC_URI[crc-3.4.0.sha256sum] = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
-SRC_URI[crc-catalog-2.4.0.sha256sum] = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
-SRC_URI[crc-fast-1.8.0.sha256sum] = "a2f7c8d397a6353ef0c1d6217ab91b3ddb5431daf57fd013f506b967dcf44458"
+SRC_URI[crc-fast-1.10.0.sha256sum] = "e75b2483e97a5a7da73ac68a05b629f9c53cff58d8ed1c77866079e18b00dba5"
 SRC_URI[crc32fast-1.5.0.sha256sum] = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 SRC_URI[crossbeam-deque-0.8.6.sha256sum] = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
@@ -1032,9 +1075,9 @@ SRC_URI[crossbeam-utils-0.8.21.sha256sum] = "d0a5c400df2834b80a4c3327b3aad3a4c4c
 SRC_URI[crunchy-0.2.4.sha256sum] = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 SRC_URI[crypto-common-0.1.7.sha256sum] = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 SRC_URI[ctrlc-3.5.1.sha256sum] = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790"
-SRC_URI[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[data-encoding-2.10.0.sha256sum] = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
+SRC_URI[data-encoding-macro-0.1.19.sha256sum] = "8142a83c17aa9461d637e649271eae18bf2edd00e91f2e105df36c3c16355bdb"
+SRC_URI[data-encoding-macro-internal-0.1.17.sha256sum] = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de"
 SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 SRC_URI[dispatch2-0.3.0.sha256sum] = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
 SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
@@ -1044,46 +1087,60 @@ SRC_URI[either-1.15.0.sha256sum] = "48c757948c5ede0e46177b7add2e67155f70e33c07fe
 SRC_URI[encode_unicode-1.0.0.sha256sum] = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 SRC_URI[errno-0.3.14.sha256sum] = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 SRC_URI[fastrand-2.3.0.sha256sum] = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-SRC_URI[find-msvc-tools-0.1.5.sha256sum] = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
-SRC_URI[flate2-1.1.5.sha256sum] = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
+SRC_URI[find-msvc-tools-0.1.8.sha256sum] = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
+SRC_URI[fixed_decimal-0.7.1.sha256sum] = "35eabf480f94d69182677e37571d3be065822acfafd12f2f085db44fbbcc8e57"
+SRC_URI[flate2-1.1.8.sha256sum] = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369"
 SRC_URI[fluent-0.17.0.sha256sum] = "8137a6d5a2c50d6b0ebfcb9aaa91a28154e0a70605f112d30cb0cd4a78670477"
 SRC_URI[fluent-bundle-0.16.0.sha256sum] = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4"
 SRC_URI[fluent-langneg-0.13.1.sha256sum] = "7eebbe59450baee8282d71676f3bfed5689aeab00b27545e83e5f14b1195e8b0"
 SRC_URI[fluent-syntax-0.12.0.sha256sum] = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198"
 SRC_URI[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.2.17.sha256sum] = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 SRC_URI[getrandom-0.3.4.sha256sum] = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 SRC_URI[glob-0.3.3.sha256sum] = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 SRC_URI[iana-time-zone-0.1.64.sha256sum] = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
 SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+SRC_URI[icu_calendar-2.1.1.sha256sum] = "d6f0e52e009b6b16ba9c0693578796f2dd4aaa59a7f8f920423706714a89ac4e"
+SRC_URI[icu_calendar_data-2.1.1.sha256sum] = "527f04223b17edfe0bd43baf14a0cb1b017830db65f3950dc00224860a9a446d"
 SRC_URI[icu_collator-2.1.1.sha256sum] = "32eed11a5572f1088b63fa21dc2e70d4a865e5739fc2d10abc05be93bae97019"
 SRC_URI[icu_collator_data-2.1.1.sha256sum] = "5ab06f0e83a613efddba3e4913e00e43ed4001fae651cb7d40fc7e66b83b6fb9"
 SRC_URI[icu_collections-2.1.1.sha256sum] = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+SRC_URI[icu_datetime-2.1.1.sha256sum] = "1b9d49f41ded8e63761b6b4c3120dfdc289415a1ed10107db6198eb311057ca5"
+SRC_URI[icu_datetime_data-2.1.2.sha256sum] = "46597233625417b7c8052a63d916e4fdc73df21614ac0b679492a5d6e3b01aeb"
+SRC_URI[icu_decimal-2.1.1.sha256sum] = "a38c52231bc348f9b982c1868a2af3195199623007ba2c7650f432038f5b3e8e"
+SRC_URI[icu_decimal_data-2.1.1.sha256sum] = "2905b4044eab2dd848fe84199f9195567b63ab3a93094711501363f63546fef7"
 SRC_URI[icu_locale-2.1.1.sha256sum] = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60"
 SRC_URI[icu_locale_core-2.1.1.sha256sum] = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
-SRC_URI[icu_locale_data-2.1.1.sha256sum] = "f03e2fcaefecdf05619f3d6f91740e79ab969b4dd54f77cbf546b1d0d28e3147"
+SRC_URI[icu_locale_data-2.1.2.sha256sum] = "1c5f1d16b4c3a2642d3a719f18f6b06070ab0aef246a6418130c955ae08aa831"
 SRC_URI[icu_normalizer-2.1.1.sha256sum] = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 SRC_URI[icu_normalizer_data-2.1.1.sha256sum] = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
-SRC_URI[icu_properties-2.1.1.sha256sum] = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
-SRC_URI[icu_properties_data-2.1.1.sha256sum] = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
+SRC_URI[icu_pattern-0.4.1.sha256sum] = "7a7ff8c0ff6f61cdce299dcb54f557b0a251adbc78f6f0c35a21332c452b4a1b"
+SRC_URI[icu_plurals-2.1.1.sha256sum] = "4f9cfe49f5b1d1163cc58db451562339916a9ca5cbcaae83924d41a0bf839474"
+SRC_URI[icu_plurals_data-2.1.1.sha256sum] = "f018a98dccf7f0eb02ba06ac0ff67d102d8ded80734724305e924de304e12ff0"
+SRC_URI[icu_properties-2.1.2.sha256sum] = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
+SRC_URI[icu_properties_data-2.1.2.sha256sum] = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
 SRC_URI[icu_provider-2.1.1.sha256sum] = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+SRC_URI[icu_time-2.1.1.sha256sum] = "8242b00da3b3b6678f731437a11c8833a43c821ae081eca60ba1b7579d45b6d8"
+SRC_URI[icu_time_data-2.1.1.sha256sum] = "3e10b0e5e87a2c84bd5fa407705732052edebe69291d347d0c3033785470edbf"
 SRC_URI[intl-memoizer-0.5.3.sha256sum] = "310da2e345f5eb861e7a07ee182262e94975051db9e4223e909ba90f392f163f"
 SRC_URI[intl_pluralrules-7.0.2.sha256sum] = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972"
 SRC_URI[is_terminal_polyfill-1.70.2.sha256sum] = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 SRC_URI[itertools-0.14.0.sha256sum] = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
-SRC_URI[jiff-0.2.16.sha256sum] = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35"
-SRC_URI[jiff-static-0.2.16.sha256sum] = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69"
-SRC_URI[jiff-tzdb-0.1.4.sha256sum] = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524"
+SRC_URI[ixdtf-0.6.4.sha256sum] = "84de9d95a6d2547d9b77ee3f25fa0ee32e3c3a6484d47a55adebc0439c077992"
+SRC_URI[jiff-0.2.18.sha256sum] = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50"
+SRC_URI[jiff-icu-0.2.2.sha256sum] = "0e67c2beaae8b10a82d849b9aabb698a43a682f32b17bcdc035d5ecadb44d646"
+SRC_URI[jiff-static-0.2.18.sha256sum] = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78"
+SRC_URI[jiff-tzdb-0.1.5.sha256sum] = "68971ebff725b9e2ca27a601c5eb38a4c5d64422c4cbab0c535f248087eda5c2"
 SRC_URI[jiff-tzdb-platform-0.1.3.sha256sum] = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8"
 SRC_URI[jobserver-0.1.34.sha256sum] = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
-SRC_URI[js-sys-0.3.83.sha256sum] = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
+SRC_URI[js-sys-0.3.85.sha256sum] = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
 SRC_URI[keccak-0.1.5.sha256sum] = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
-SRC_URI[libc-0.2.178.sha256sum] = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
+SRC_URI[libc-0.2.180.sha256sum] = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
 SRC_URI[libfuzzer-sys-0.4.10.sha256sum] = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
-SRC_URI[libm-0.2.15.sha256sum] = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+SRC_URI[libm-0.2.16.sha256sum] = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 SRC_URI[linux-raw-sys-0.11.0.sha256sum] = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 SRC_URI[litemap-0.8.1.sha256sum] = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 SRC_URI[log-0.4.29.sha256sum] = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
@@ -1105,29 +1162,27 @@ SRC_URI[ordered-multimap-0.7.3.sha256sum] = "49203cdcae0030493bad186b28da2fa2564
 SRC_URI[os_display-0.1.4.sha256sum] = "ad5fd71b79026fb918650dde6d125000a233764f1c2f1659a1c71118e33ea08f"
 SRC_URI[outref-0.5.2.sha256sum] = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 SRC_URI[parse_datetime-0.13.3.sha256sum] = "acea383beda9652270f3c9678d83aa58cbfc16880343cae0c0c8c7d6c0974132"
-SRC_URI[phf-0.13.1.sha256sum] = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
-SRC_URI[phf_shared-0.13.1.sha256sum] = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
 SRC_URI[pkg-config-0.3.32.sha256sum] = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
-SRC_URI[portable-atomic-1.11.1.sha256sum] = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+SRC_URI[portable-atomic-1.13.0.sha256sum] = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
 SRC_URI[portable-atomic-util-0.2.4.sha256sum] = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
 SRC_URI[potential_utf-0.1.4.sha256sum] = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
 SRC_URI[ppv-lite86-0.2.21.sha256sum] = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-SRC_URI[proc-macro2-1.0.103.sha256sum] = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+SRC_URI[proc-macro2-1.0.106.sha256sum] = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 SRC_URI[procfs-0.18.0.sha256sum] = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7"
 SRC_URI[procfs-core-0.18.0.sha256sum] = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405"
-SRC_URI[quote-1.0.42.sha256sum] = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
+SRC_URI[quote-1.0.44.sha256sum] = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
 SRC_URI[r-efi-5.3.0.sha256sum] = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 SRC_URI[rand-0.9.2.sha256sum] = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 SRC_URI[rand_chacha-0.9.0.sha256sum] = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
-SRC_URI[rand_core-0.9.3.sha256sum] = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+SRC_URI[rand_core-0.9.5.sha256sum] = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 SRC_URI[rayon-1.11.0.sha256sum] = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 SRC_URI[rayon-core-1.13.0.sha256sum] = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 SRC_URI[regex-automata-0.4.13.sha256sum] = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 SRC_URI[rust-ini-0.21.3.sha256sum] = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7"
 SRC_URI[rustc-hash-2.1.1.sha256sum] = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
-SRC_URI[rustix-1.1.2.sha256sum] = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+SRC_URI[rustix-1.1.3.sha256sum] = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
 SRC_URI[rustversion-1.0.22.sha256sum] = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
-SRC_URI[self_cell-1.2.1.sha256sum] = "16c2f82143577edb4921b71ede051dac62ca3c16084e918bf7b40c96ae10eb33"
+SRC_URI[self_cell-1.2.2.sha256sum] = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89"
 SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
@@ -1135,20 +1190,19 @@ SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1
 SRC_URI[sha2-0.10.9.sha256sum] = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-SRC_URI[simd-adler32-0.3.7.sha256sum] = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+SRC_URI[simd-adler32-0.3.8.sha256sum] = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 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.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 SRC_URI[spin-0.10.0.sha256sum] = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
 SRC_URI[stable_deref_trait-1.2.1.sha256sum] = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-SRC_URI[syn-2.0.111.sha256sum] = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+SRC_URI[syn-2.0.114.sha256sum] = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 SRC_URI[synstructure-0.13.2.sha256sum] = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
-SRC_URI[tempfile-3.23.0.sha256sum] = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+SRC_URI[tempfile-3.24.0.sha256sum] = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
 SRC_URI[terminal_size-0.4.3.sha256sum] = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
-SRC_URI[thiserror-2.0.17.sha256sum] = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
-SRC_URI[thiserror-impl-2.0.17.sha256sum] = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+SRC_URI[thiserror-2.0.18.sha256sum] = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+SRC_URI[thiserror-impl-2.0.18.sha256sum] = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
 SRC_URI[tinystr-0.8.2.sha256sum] = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 SRC_URI[type-map-0.5.1.sha256sum] = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90"
@@ -1164,11 +1218,11 @@ SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa570
 SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 SRC_URI[vsimd-0.8.0.sha256sum] = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
 SRC_URI[wasi-0.11.1+wasi-snapshot-preview1.sha256sum] = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
-SRC_URI[wasip2-1.0.1+wasi-0.2.4.sha256sum] = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
-SRC_URI[wasm-bindgen-0.2.106.sha256sum] = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
-SRC_URI[wasm-bindgen-macro-0.2.106.sha256sum] = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
-SRC_URI[wasm-bindgen-macro-support-0.2.106.sha256sum] = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
-SRC_URI[wasm-bindgen-shared-0.2.106.sha256sum] = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
+SRC_URI[wasip2-1.0.2+wasi-0.2.9.sha256sum] = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+SRC_URI[wasm-bindgen-0.2.108.sha256sum] = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
+SRC_URI[wasm-bindgen-macro-0.2.108.sha256sum] = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
+SRC_URI[wasm-bindgen-macro-support-0.2.108.sha256sum] = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
+SRC_URI[wasm-bindgen-shared-0.2.108.sha256sum] = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
 SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1"
 SRC_URI[winapi-util-0.1.11.sha256sum] = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 SRC_URI[windows-core-0.62.2.sha256sum] = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
@@ -1189,14 +1243,14 @@ SRC_URI[windows_x86_64_gnu-0.53.1.sha256sum] = "9c3842cdd74a865a8066ab39c8a7a473
 SRC_URI[windows_x86_64_gnullvm-0.53.1.sha256sum] = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 SRC_URI[windows_x86_64_msvc-0.53.1.sha256sum] = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 SRC_URI[winnow-0.7.14.sha256sum] = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
-SRC_URI[wit-bindgen-0.46.0.sha256sum] = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+SRC_URI[wit-bindgen-0.51.0.sha256sum] = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
 SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
 SRC_URI[writeable-0.6.2.sha256sum] = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 SRC_URI[yoke-0.8.1.sha256sum] = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 SRC_URI[yoke-derive-0.8.1.sha256sum] = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 SRC_URI[z85-3.0.6.sha256sum] = "9b3a41ce106832b4da1c065baa4c31cf640cf965fa1483816402b7f6b96f0a64"
-SRC_URI[zerocopy-0.8.31.sha256sum] = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
-SRC_URI[zerocopy-derive-0.8.31.sha256sum] = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
+SRC_URI[zerocopy-0.8.34.sha256sum] = "71ddd76bcebeed25db614f82bf31a9f4222d3fbba300e6fb6c00afa26cbd4d9d"
+SRC_URI[zerocopy-derive-0.8.34.sha256sum] = "d8187381b52e32220d50b255276aa16a084ec0a9017a0ca2152a1f55c539758d"
 SRC_URI[zerofrom-0.1.6.sha256sum] = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 SRC_URI[zerofrom-derive-0.1.6.sha256sum] = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 SRC_URI[zerotrie-0.2.3.sha256sum] = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.5.0.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.6.0.bb
index ab3e0eb6ff..2d0963c4b5 100644
--- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.5.0.bb
+++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.6.0.bb
@@ -11,7 +11,7 @@ SRC_URI = " \
     git://github.com/uutils/coreutils.git;protocol=https;branch=main;tag=${PV} \
 "
 
-SRCREV = "64203e309810d7e01eaf9c6cc7c21df22a8a896d"
+SRCREV = "2319a99057d11b0c9744c885df84806eea019166"
 
 require ${BPN}-crates.inc
 
diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.3.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.4.bb
index 44bf66c1ed..34755fc3ad 100644
--- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.3.bb
+++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.4.bb
@@ -24,7 +24,7 @@ DEPENDS:append:libc-musl = " argp-standalone"
 LDFLAGS:append:libc-musl = " -largp"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "4a8a23b8b9d1a3250452e40acead4421a03e45a38954ad0595634f4266aa800f"
+SRC_URI[sha256sum] = "443e46f8964c9acc780f455afbb8e23aa0e8ed7ec504cfc59e04f406fa1e8a83"
 
 inherit autotools gettext pkgconfig
 
diff --git a/meta-oe/recipes-dbs/lmdb/files/CVE-2026-22185.patch b/meta-oe/recipes-dbs/lmdb/files/CVE-2026-22185.patch
deleted file mode 100644
index 6c85b2b8ed..0000000000
--- a/meta-oe/recipes-dbs/lmdb/files/CVE-2026-22185.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 94ca20e5aed5d8730e045bb945fa3485b28a7981 Mon Sep 17 00:00:00 2001
-From: Gyorgy Sarvari <skandigraun@gmail.com>
-Date: Tue, 6 Jan 2026 20:52:25 +0000
-Subject: [PATCH] ITS#10421 mdb_load: check for malicious input
-
-From: Howard Chu <hyc@openldap.org>
-
-CVE: CVE-2026-22185
-Upstream-Status: Backport [https://github.com/LMDB/lmdb/commit/8e1fda85532a3c74276df38a42d234dcdfa1e40d]
-Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
----
- libraries/liblmdb/mdb_load.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c
-index d2a3cec..7eccf40 100644
---- a/libraries/liblmdb/mdb_load.c
-+++ b/libraries/liblmdb/mdb_load.c
-@@ -208,6 +208,12 @@ badend:
- 
-        c1 = buf->mv_data;
-        len = strlen((char *)c1);
-+       if (!len) {
-+               /* This can only happen with an intentionally invalid input
-+                * with a NUL byte after the leading SPACE
-+                */
-+               goto badend;
-+       }
-        l2 = len;
- 
-        /* Is buffer too short? */
diff --git a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.35.bb
index 29bfbb81fa..36f2056914 100644
--- a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.31.bb
+++ b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.35.bb
@@ -8,14 +8,13 @@ HOMEPAGE = "https://symas.com/lightning-memory-mapped-database/"
 LICENSE = "OLDAP-2.8"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972"
 
-SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1;protocol=https \
+SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1;protocol=https;tag=LMDB_${PV} \
            file://run-ptest \
            file://0001-Makefile-use-libprefix-instead-of-libdir.patch \
            file://0001-make-set-soname-on-liblmdb.patch;patchdir=../.. \
-           file://CVE-2026-22185.patch;striplevel=3 \
            "
 
-SRCREV = "ce201088de95d26fc0da36ba805bf2ddc2ba74ff"
+SRCREV = "69087ced3cb6082f7dcfb4fc2dcaa3b68a7e2e8c"
 
 inherit ptest
 
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
index 89a509087f..445a6d4910 100644
--- 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
@@ -1,4 +1,4 @@
-From f0d8240dbf594e6dfab31fd7d70ce340ac365a65 Mon Sep 17 00:00:00 2001
+From ab23817b4f4a02de21f63800adc30d6236c15c8b 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
diff --git a/meta-oe/recipes-dbs/postgresql/files/0002-Improve-reproducibility.patch b/meta-oe/recipes-dbs/postgresql/files/0002-Improve-reproducibility.patch
index b3e87cbc46..e0605347e3 100644
--- a/meta-oe/recipes-dbs/postgresql/files/0002-Improve-reproducibility.patch
+++ b/meta-oe/recipes-dbs/postgresql/files/0002-Improve-reproducibility.patch
@@ -1,7 +1,7 @@
-From 084cc44215c1d5e6d33bc3d2e1d24da4fc98bdcd Mon Sep 17 00:00:00 2001
+From 736c190e0c8a1c5ce3dc84292d066292e969d81e Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 28 Dec 2020 16:38:21 +0800
-Subject: [PATCH 2/5] Improve reproducibility,
+Subject: [PATCH] Improve reproducibility,
 
 Remove build patch from binaries which pg_config do
 not record var-CC, var-CFLAGS, and configure
@@ -23,7 +23,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 3 deletions(-)
 
 diff --git a/src/common/Makefile b/src/common/Makefile
-index 113029b..58842a6 100644
+index 3d83299..e14cda6 100644
 --- a/src/common/Makefile
 +++ b/src/common/Makefile
 @@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.global
@@ -36,6 +36,3 @@ index 113029b..58842a6 100644
  override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
  override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
  override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
--- 
-2.25.1
-
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 ce19bacc47..b91228aedd 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,4 +1,4 @@
-From 30b1b37d309f67ba6d58f2197bd917107bc7d56c Mon Sep 17 00:00:00 2001
+From 29289c6f5b665ed9943bb7701a542fcdf64c4a22 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] configure.ac: bypass autoconf 2.69 version check
@@ -13,12 +13,12 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
  1 file changed, 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 642dbde..af37179 100644
+index 856b091..646394c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
  
- AC_INIT([PostgreSQL], [17.7], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/])
+ AC_INIT([PostgreSQL], [17.8], [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
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 d94f028036..1514c223c1 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,4 +1,4 @@
-From 62733bdc9346651637d9e5ac7cbf8d7311ef5d97 Mon Sep 17 00:00:00 2001
+From e4b32033827ed73c95e6e6aa26dd45e828ffc18b 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] config_info.c: not expose build info
@@ -14,7 +14,7 @@ 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 f0fa973..8ccd8bc 100644
+index 646394c..f5a5590 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2024, PostgreSQL Global Development Group])
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 8219fc80e9..753cd1bb97 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,4 +1,4 @@
-From d1fb37569b5a8c21968f69164e8bc6e4bb0185eb Mon Sep 17 00:00:00 2001
+From 220b65291734b81a3c232877cf5fced20fe773e3 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] postgresql: fix ptest failure of sysviews
@@ -44,6 +44,3 @@ index b047fb5..d1e3999 100644
  
  -- We expect no cursors in this test; see also portals.sql
  select count(*) = 0 as ok from pg_cursors;
--- 
-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 a2f0500a8c..1142ff4878 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 1a9416bae71aa935797add3fa11407732ad010c0 Mon Sep 17 00:00:00 2001
+From 29e76cad362c7154920aa49aa0137e1773c4d3ec 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 f398184..493d5cd 100644
+index ce0966f..856b091 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2336,7 +2336,7 @@ Use --without-tcl to disable building PL/Tcl.])
+@@ -2340,7 +2340,7 @@ Use --without-tcl to disable building PL/Tcl.])
  fi
  
  # check for <perl.h>
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_17.7.bb b/meta-oe/recipes-dbs/postgresql/postgresql_17.8.bb
index 81b096194c..ad1e9704cc 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql_17.7.bb
+++ b/meta-oe/recipes-dbs/postgresql/postgresql_17.8.bb
@@ -1,6 +1,6 @@
 require postgresql.inc
 
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=08b6032a749e67f6e3de84ea8e466933"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=55760ee57ce4e51e4b57f0801ff032dd"
 
 SRC_URI += "\
    file://not-check-libperl.patch \
@@ -12,6 +12,6 @@ SRC_URI += "\
    file://0001-tcl.m4-Recognize-tclsh9.patch \
 "
 
-SRC_URI[sha256sum] = "ef9e343302eccd33112f1b2f0247be493cb5768313adeb558b02de8797a2e9b5"
+SRC_URI[sha256sum] = "a88d195dd93730452d0cfa1a11896720d6d1ba084bc2be7d7fc557fa4e4158a0"
 
 CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Doesn't apply to our configuration of postgresql so we can safely ignore it."
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch
new file mode 100644
index 0000000000..dac61773e5
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch
@@ -0,0 +1,43 @@
+From 7509f5d4bfcd8ba8bc0ad8c2054b2b336d8c0c9f Mon Sep 17 00:00:00 2001
+From: Minjae Kim <mj.kim@mercedes-benz.com>
+Date: Mon, 9 Feb 2026 20:34:53 +0000
+Subject: [PATCH] Findzstd.cmake: support pkg-config based zstd detection
+
+In Yocto builds, zstd is built via Makefile and does not install
+CMake package configuration files. As a result, Findzstd.cmake
+fails to detect ZSTD_INCLUDE_DIRS.
+
+Add pkg-config based detection as a fallback to properly locate
+zstd headers and libraries.
+
+fix error:
+|   Could NOT find zstd (missing: ZSTD_INCLUDE_DIRS)
+| Call Stack (most recent call first):
+
+
+Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/14308]
+
+Signed-off-by: Minjae Kim <flowergom@gmail.com>
+
+---
+ cmake/modules/Findzstd.cmake | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cmake/modules/Findzstd.cmake b/cmake/modules/Findzstd.cmake
+index e82fa148c8..f160be9ae0 100644
+--- a/cmake/modules/Findzstd.cmake
++++ b/cmake/modules/Findzstd.cmake
+@@ -14,6 +14,10 @@ find_library(ZSTD_LIBRARIES
+   HINTS ${zstd_ROOT_DIR}/lib)
+ 
+ include(FindPackageHandleStandardArgs)
++find_package(PkgConfig QUIET)
++if(PKG_CONFIG_FOUND)
++  pkg_check_modules(ZSTD QUIET libzstd)
++endif()
+ find_package_handle_standard_args(zstd DEFAULT_MSG ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS)
+ 
+ mark_as_advanced(
+-- 
+2.43.0
+
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb
index c6d5a0ec7f..d8ba31e8ca 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb
@@ -22,6 +22,7 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt
            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 \
+           file://0001-Findzstd.cmake-support-pkg-config-based-zstd-detecti.patch \
           "
 
 SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch"
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250814.1.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20260107.1.bb
index 0394f36cdb..4f75ed605c 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250814.1.bb
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20260107.1.bb
@@ -11,7 +11,7 @@ SRC_URI = "https://github.com/abseil/${BPN}/releases/download/${PV}/${BP}.tar.gz
            file://0001-absl-always-use-asm-sgidefs.h.patch \
            file://0002-abseil-ppc-fixes.patch \
            "
-SRC_URI[sha256sum] = "1692f77d1739bacf3f94337188b78583cf09bab7e420d2dc6c5605a4f86785a1"
+SRC_URI[sha256sum] = "4314e2a7cbac89cac25a2f2322870f343d81579756ceff7f431803c2c9090195"
 
 UPSTREAM_CHECK_URI = "https://github.com/abseil/abseil-cpp/releases"
 UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)"
@@ -21,6 +21,7 @@ inherit cmake
 EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \
                  -DBUILD_TESTING=OFF    \
                  -DABSL_ENABLE_INSTALL=ON \
+                 -DCMAKE_CXX_STANDARD=17 \
                 "
 #  riscv32-yoe-linux-ld.lld: error: undefined reference: __atomic_store_8
 #  >>> referenced by <recipe-sysroot>/usr/lib/libabsl_flags_internal.so.2505.0.0 (disallowed by --no-allow-shlib-undefined)
diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.2.20260104.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.2.20260222.0.bb
index 71ba0eda74..5dafe54062 100644
--- a/meta-oe/recipes-devtools/ctags/ctags_6.2.20260104.0.bb
+++ b/meta-oe/recipes-devtools/ctags/ctags_6.2.20260222.0.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 inherit autotools-brokensep pkgconfig manpages
 
-SRCREV = "743e71b21f504fcea2f9c19b814b3d8b36cb8c81"
+SRCREV = "b4fdb901fc4930eebcf06ef72bfd67cec606eb4c"
 SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https;tag=p${PV}"
 
 
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.15.0.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.16.1.bb
index 494e92f768..3d0cfaed80 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen_1.15.0.bb
+++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.16.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "\
     git://github.com/doxygen/doxygen.git;branch=master;protocol=https \
 "
 
-SRCREV = "7cca38ba5185457e6d9495bf963d4cdeacebc25a"
+SRCREV = "669aeeefca743c148e2d935b3d3c69535c7491e6"
 
 
 UPSTREAM_CHECK_GITTAGREGEX = "Release_(?P<pver>\d+(\_\d+)+)"
diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-build-add-missing-includes-41351.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-build-add-missing-includes-41351.patch
new file mode 100644
index 0000000000..bf1f22b906
--- /dev/null
+++ b/meta-oe/recipes-devtools/grpc/grpc/0001-build-add-missing-includes-41351.patch
@@ -0,0 +1,58 @@
+From a976f66ac7d1b9f43a3071e22b5014fcfeab04b3 Mon Sep 17 00:00:00 2001
+From: "Mark D. Roth" <roth@google.com>
+Date: Tue, 6 Jan 2026 10:09:45 -0800
+Subject: [PATCH] [build] add missing includes (#41351)
+
+Fixes #41305.
+
+Closes #41351
+
+COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/41351 from markdroth:add_missing_includes 223be6932adb00d085149c53167c1b0318745f6c
+PiperOrigin-RevId: 852829597
+
+Upstream-Status: Backport [https://github.com/grpc/grpc/commit/d54219b508423f0a2ff6a0b98c16fb6dafd44b84]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/grpc/event_engine/memory_request.h | 2 ++
+ src/core/channelz/v2tov1/property_list.cc  | 1 +
+ src/core/util/glob.cc                      | 2 ++
+ 3 files changed, 5 insertions(+)
+
+diff --git a/include/grpc/event_engine/memory_request.h b/include/grpc/event_engine/memory_request.h
+index 76bcbb2036..ad8cab842e 100644
+--- a/include/grpc/event_engine/memory_request.h
++++ b/include/grpc/event_engine/memory_request.h
+@@ -17,6 +17,8 @@
+ #include <grpc/support/port_platform.h>
+ #include <stddef.h>
+ 
++#include <string>
++
+ #include "absl/strings/string_view.h"
+ 
+ namespace grpc_event_engine {
+diff --git a/src/core/channelz/v2tov1/property_list.cc b/src/core/channelz/v2tov1/property_list.cc
+index 64bbb6307c..03367cce7c 100644
+--- a/src/core/channelz/v2tov1/property_list.cc
++++ b/src/core/channelz/v2tov1/property_list.cc
+@@ -15,6 +15,7 @@
+ #include "src/core/channelz/v2tov1/property_list.h"
+ 
+ #include <cstdint>
++#include <limits>
+ #include <optional>
+ #include <string>
+ 
+diff --git a/src/core/util/glob.cc b/src/core/util/glob.cc
+index 1b1c16e23d..22e54259f0 100644
+--- a/src/core/util/glob.cc
++++ b/src/core/util/glob.cc
+@@ -12,6 +12,8 @@
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+ 
++#include <algorithm>
++
+ #include "absl/strings/string_view.h"
+ 
+ namespace grpc_core {
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb b/meta-oe/recipes-devtools/grpc/grpc_1.76.0.bb
index 53867b8fe6..39c9fb98de 100644
--- a/meta-oe/recipes-devtools/grpc/grpc_1.71.0.bb
+++ b/meta-oe/recipes-devtools/grpc/grpc_1.76.0.bb
@@ -23,10 +23,11 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler"
 # Both dependencies are mutually exclusive
 # RDEPENDS:${PN}-dev += "${PN}-compiler"
 
-SRCREV_grpc = "4e9357bca1408596663a218c0c608a4c0560a867"
-BRANCH = "v1.71.x"
-SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \
+SRCREV = "f5ffb68d8a2fd603dff16287e90a4ac571e1fec6"
+BRANCH = "v1.76.x"
+SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH};tag=v${PV} \
            file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \
+           file://0001-build-add-missing-includes-41351.patch \
            "
 
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.2.bb
index 5ad953d260..eb8bc59322 100644
--- a/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.1.bb
+++ b/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.2.bb
@@ -4,10 +4,10 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8325a5ce4414c65ffdda392e0d96a9ff"
 
-SRC_URI = "git://github.com/Thalhammer/jwt-cpp.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/Thalhammer/jwt-cpp.git;branch=master;protocol=https;tag=v${PV} \
             "
 
-SRCREV = "e71e0c2d584baff06925bbb3aad683f677e4d498"
+SRCREV = "b0ea29a58fc852a67d4e896d266880c2c63b0c4c"
 
 
 DEPENDS = "openssl"
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
index c8c9922d55..9516ee5cb1 100644
--- 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
@@ -11,7 +11,7 @@ include/toml11/impl/../fwd/literal_fwd.hpp:22:26: error: identifier '_toml' prec
 |       |               ~~~~~~~~~~~^~~~~
 |       |               operator""_toml
 
-Upstream-Status: Submitted [https://github.com/ToruNiina/toml11/pull/285]
+Upstream-Status: Backport [https://github.com/ToruNiina/toml11/commit/dee78f822d8a5b985e565e5c1ef42a59557aa8fc]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  include/toml11/fwd/literal_fwd.hpp   | 2 +-
diff --git a/meta-oe/recipes-devtools/libtoml11/files/run-ptest b/meta-oe/recipes-devtools/libtoml11/files/run-ptest
index 9bc480aa7f..4da9e68cc5 100755
--- a/meta-oe/recipes-devtools/libtoml11/files/run-ptest
+++ b/meta-oe/recipes-devtools/libtoml11/files/run-ptest
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+cd tests || exit 1
+
+rm -rf tests.log
 
-cd tests
 for atest in test_* ; do
-    rm -rf tests.log
-    ./${atest} > tests.log 2>&1
-    if [ $? = 0 ] ; then
+    if ./"${atest}" >> tests.log 2>&1; then
         echo "PASS: ${atest}"
     else
         echo "FAIL: ${atest}"
diff --git a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
index 38786b79ed..7e097e4612 100644
--- a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
+++ b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb
@@ -3,6 +3,8 @@ DESCRIPTION = "toml11 is a feature-rich TOML language library for \
                C++11/14/17/20."
 
 HOMEPAGE = "https://github.com/ToruNiina/toml11"
+BUGTRACKER = "https://github.com/ToruNiina/toml11/issues"
+CVE_PRODUCT = "libtoml11"
 
 SECTION = "libs"
 
@@ -11,23 +13,17 @@ 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 \
+SRC_URI = "\
+    gitsm://github.com/ToruNiina/toml11.git;protocol=https;branch=main;tag=v${PV} \
+    file://0001-Remove-whitespace-in-operator.patch \
+    file://run-ptest \
 "
-SRCREV_FORMAT = "json_doctest"
-
+SRCREV = "be08ba2be2a964edcdb3d3e3ea8d100abc26f286"
 
 inherit cmake ptest
 
 EXTRA_OECMAKE += "-DTOML11_PRECOMPILE=ON \
-                  -DTOML11_BUILD_TESTS=${@bb.utils.contains("DISTRO_FEATURES", "ptest", "ON", "OFF", d)} \
+                  -DTOML11_BUILD_TESTS=${@bb.utils.contains("PTEST_ENABLED", "1", "ON", "OFF", d)} \
 "
 
 ALLOW_EMPTY:${PN} = "1"
@@ -36,3 +32,5 @@ do_install_ptest () {
     install -d ${D}${PTEST_PATH}/tests
     cp -r ${B}/tests/test_* ${D}${PTEST_PATH}/tests
 }
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/memstat/memstat/0001-makefile-Do-not-override-cflags.patch b/meta-oe/recipes-devtools/memstat/memstat/0001-makefile-Do-not-override-cflags.patch
new file mode 100644
index 0000000000..8ac7a8ff54
--- /dev/null
+++ b/meta-oe/recipes-devtools/memstat/memstat/0001-makefile-Do-not-override-cflags.patch
@@ -0,0 +1,30 @@
+From a0806283da1b82b511aa879fa2f71deb01f849bd Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 26 Jan 2026 22:22:54 -0800
+Subject: [PATCH] makefile: Do not override cflags
+
+bitbake environment passes correct clfags for OE env
+overriding it means some important flags for cross-compiling
+go missing and causes
+
+memstat-1.0-r0 do_package_qa: QA Issue: File /usr/bin/.debug/memstat in package memstat-dbg contains reference to TMPDIR [buildpaths]
+
+Upstream-Status: Inappropriate [OE-specific]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 29f8129..5426bf4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,6 @@
+ # Copyright 1998, by Bernd Eckenfels <ecki@debian.org>
+ # This file is under the GPL.
+ #
+-CFLAGS = -g -Wall -O2
+ prefix = $(DESTDIR)/
+ exec_prefix = $(prefix)/usr
+ 
diff --git a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
index a65782d017..a0b4d0b9cc 100644
--- a/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
+++ b/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
@@ -14,10 +14,13 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=87be186443b1ac2cfa466f475e1ee0cb
 
 SRC_URI = "http://sourceforge.net/projects/memstattool/files/memstat_${PV}.tar.gz \
            file://0001-Include-limits.h-for-PATH_MAX-definition.patch \
+           file://0001-makefile-Do-not-override-cflags.patch \
            "
 
 SRC_URI[sha256sum] = "245d5fc7fb87bcfd14486cd34917cae2856e799559ac568434af12c4852bce94"
 
+TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}"
+
 do_install:append(){
     install -d ${D}${bindir}
     install -m 0755 memstat ${D}${bindir}
diff --git a/meta-oe/recipes-devtools/mpich/mpich_4.3.2.bb b/meta-oe/recipes-devtools/mpich/mpich_5.0.0.bb
index f1ac212023..505fc6f92b 100644
--- a/meta-oe/recipes-devtools/mpich/mpich_4.3.2.bb
+++ b/meta-oe/recipes-devtools/mpich/mpich_5.0.0.bb
@@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a296dfb961b957b0e8adf67d8478d3d"
 
 SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz"
-SRC_URI[sha256sum] = "47d774587a7156a53752218c811c852e70ac44db9c502dc3f399b4cb817e3818"
+SRC_URI[sha256sum] = "e9350e32224283e95311f22134f36c98e3cd1c665d17fae20a6cc92ed3cffe11"
 
 RDEPENDS:${PN} += "bash perl libxml2"
 
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.21/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.22/oe-npm-cache
index eb0f143eae..eb0f143eae 100755
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.21/oe-npm-cache
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-22.22/oe-npm-cache
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.21.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.22.bb
index 1dcd1f7926..1dcd1f7926 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.21.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_22.22.bb
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-detect-aarch64-Neon-correctly.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-detect-aarch64-Neon-correctly.patch
new file mode 100644
index 0000000000..15de2c1119
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-detect-aarch64-Neon-correctly.patch
@@ -0,0 +1,51 @@
+From 41ec2d5302b77be27ca972102c29ce12471ed4b0 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Thu, 12 Feb 2026 11:09:44 +0100
+Subject: [PATCH 2/2] detect aarch64 Neon correctly
+
+The llhttp vendored dependency of nodejs takes advantage of Arm NEON
+instructions when they are available, however they are detected by
+checking for an outdated CPU feature macro: it checks for __ARM_NEON__,
+however it is not defined by new compilers for aarch64, rather they
+set __ARM_NEON. The Arm C extension guide[1] refers to __ARM_NEON macro
+aswell.
+
+This patch changes the detection to check for both macros when detecting
+the availability of NEON instructions.
+
+The code this patch modifies is generated, so the patch itself isn't
+suitable for upstream submission, as the root cause of the error is
+in the generator itself. A PR has been submitted[2] to the generator
+project to rectify this issue.
+
+[1]: https://developer.arm.com/documentation/ihi0053/d/ - pdf, section 6.9
+[2]: https://github.com/nodejs/llparse/pull/84
+
+Upstream-Status: Inappropriate [see above]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ deps/llhttp/src/llhttp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/deps/llhttp/src/llhttp.c b/deps/llhttp/src/llhttp.c
+index a0e59e50..b069bbbb 100644
+--- a/deps/llhttp/src/llhttp.c
++++ b/deps/llhttp/src/llhttp.c
+@@ -10,7 +10,7 @@
+  #endif  /* _MSC_VER */
+ #endif  /* __SSE4_2__ */
+ 
+-#ifdef __ARM_NEON__
++#if defined(__ARM_NEON__) || defined(__ARM_NEON)
+  #include <arm_neon.h>
+ #endif  /* __ARM_NEON__ */
+ 
+@@ -2625,7 +2625,7 @@ static llparse_state_t llhttp__internal__run(
+         goto s_n_llhttp__internal__n_header_value_otherwise;
+       }
+       #endif  /* __SSE4_2__ */
+-      #ifdef __ARM_NEON__
++      #if defined(__ARM_NEON__) || defined(__ARM_NEON)
+       while (endp - p >= 16) {
+         uint8x16_t input;
+         uint8x16_t single;
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-fix-arm-Neon-intrinsics-types.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-fix-arm-Neon-intrinsics-types.patch
new file mode 100644
index 0000000000..ddbad575f0
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-fix-arm-Neon-intrinsics-types.patch
@@ -0,0 +1,59 @@
+From 3f4283dac7d88a89b42f1f2966a862cee5afe486 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Thu, 12 Feb 2026 11:03:53 +0100
+Subject: [PATCH 1/2] fix arm Neon intrinsics types
+
+The current code calls these intrinsics with incorrect datatypes
+(it uses a vector of uint16 instead of uint8), causing compilation
+to fail with the following error:
+
+| ../deps/llhttp/src/llhttp.c: In function 'llhttp__internal__run':
+| ../deps/llhttp/src/llhttp.c:2645:9: note: use '-flax-vector-conversions' to permit conversions between vectors with differing element types or numbers of subparts
+|  2645 |         );
+|       |         ^
+| ../deps/llhttp/src/llhttp.c:2643:11: error: incompatible type for argument 1 of 'vandq_u16'
+|  2643 |           vcgeq_u8(input, vdupq_n_u8(' ')),
+
+To avoid this, set the correct intrinsics call that matches the
+actual arguments.
+
+The code that this patch modifies is generated code, so in itself
+this change isn't appropriate for upstream. The actual problem
+is in the code generator itself, for which a PR is already pending
+for merging[1]. This patch is a port of that PR.
+
+[1]: https://github.com/nodejs/llparse/pull/79
+
+Upstream-Status: Inappropriate [see above]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ deps/llhttp/src/llhttp.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deps/llhttp/src/llhttp.c b/deps/llhttp/src/llhttp.c
+index aa4c4682..887603fd 100644
+--- a/deps/llhttp/src/llhttp.c
++++ b/deps/llhttp/src/llhttp.c
+@@ -2639,17 +2639,17 @@ static llparse_state_t llhttp__internal__run(
+         /* Find first character that does not match `ranges` */
+         single = vceqq_u8(input, vdupq_n_u8(0x9));
+         mask = single;
+-        single = vandq_u16(
++        single = vandq_u8(
+           vcgeq_u8(input, vdupq_n_u8(' ')),
+           vcleq_u8(input, vdupq_n_u8('~'))
+         );
+-        mask = vorrq_u16(mask, single);
+-        single = vandq_u16(
++        mask = vorrq_u8(mask, single);
++        single = vandq_u8(
+           vcgeq_u8(input, vdupq_n_u8(0x80)),
+           vcleq_u8(input, vdupq_n_u8(0xff))
+         );
+-        mask = vorrq_u16(mask, single);
+-        narrow = vshrn_n_u16(mask, 4);
++        mask = vorrq_u8(mask, single);
++        narrow = vshrn_n_u16(vreinterpretq_u16_u8(mask), 4);
+         match_mask = ~vget_lane_u64(vreinterpret_u64_u8(narrow), 0);
+         match_len = __builtin_ctzll(match_mask) >> 2;
+         if (match_len != 16) {
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
index d987ac50be..835c7018de 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch
@@ -17,6 +17,10 @@ Fix:
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+Added libatomic library explicitly to x86 targets.
+
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
 ---
  node.gyp                 | 13 ++++++++++++-
  tools/v8_gypfiles/v8.gyp | 15 ++++++++++++---
@@ -26,7 +30,7 @@ diff --git a/node.gyp b/node.gyp
 index b425f443..f296f35c 100644
 --- a/node.gyp
 +++ b/node.gyp
-@@ -487,7 +487,18 @@
+@@ -503,7 +503,18 @@
          ],
        }],
        ['OS=="linux" and clang==1', {
@@ -50,7 +54,7 @@ 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
-@@ -1100,9 +1100,18 @@
+@@ -1348,9 +1348,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"]', {
@@ -72,6 +76,21 @@ index b23263cf..dcabf4ca 100644
          }],
        ],
      },  # v8_base_without_compiler
--- 
-2.35.5
-
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index cb82d4f15bc..65cb123b7bf 100644
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -1820,6 +1820,13 @@
+         ['enable_lto=="true"', {
+           'ldflags': [ '-fno-lto' ],
+         }],
++        # For future patch-rebases: this hunk is in mksnapshot target.
++        # ia32 includes x86 also
++        ['v8_target_arch=="ia32"', {
++          'link_settings': {
++            'libraries': ['-latomic']
++          }
++        }],
+       ],
+     },  # mksnapshot
+     {
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.22.0.bb
index ccaf9f7bb2..05fa608047 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_22.21.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.22.0.bb
@@ -31,6 +31,8 @@ SRC_URI = "https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
            file://0001-positional-args.patch \
            file://0001-custom-env.patch \
            file://0001-build-remove-redundant-mXX-flags-for-V8.patch \
+           file://0001-fix-arm-Neon-intrinsics-types.patch \
+           file://0001-detect-aarch64-Neon-correctly.patch \
            file://run-ptest \
            "
 SRC_URI:append:class-target = " \
@@ -39,17 +41,13 @@ SRC_URI:append:class-target = " \
 SRC_URI:append:toolchain-clang:powerpc64le = " \
            file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
            "
-SRC_URI[sha256sum] = "487d73fd4db00dc2420d659a8221b181a7937fbc5bc73f31c30b1680ad6ded6a"
+SRC_URI[sha256sum] = "4c138012bb5352f49822a8f3e6d1db71e00639d0c36d5b6756f91e4c6f30b683"
 
 S = "${UNPACKDIR}/node-v${PV}"
 
 # v8 errors out if you have set CCACHE
 CCACHE = ""
 
-# Use '-flax-vector-conversions' to permit conversions between vectors
-# with differing element types or numbers of subparts
-CFLAGS:append:toolchain-gcc:arm = " -flax-vector-conversions"
-
 def map_nodejs_arch(a, d):
     import re
 
@@ -74,8 +72,8 @@ PACKAGECONFIG ??= "ares brotli icu zlib"
 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[libuv] = "--shared-libuv,,libuv libuv-native"
+PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2 nghttp2-native"
 PACKAGECONFIG[shared] = "--shared"
 PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
 
@@ -96,7 +94,7 @@ python prune_sources() {
     if 'zlib' in d.getVar('PACKAGECONFIG'):
         shutil.rmtree(d.getVar('S') + '/deps/zlib')
 }
-do_unpack[postfuncs] += "prune_sources"
+do_patch[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
@@ -133,8 +131,6 @@ python do_create_v8_qemu_wrapper () {
 do_create_v8_qemu_wrapper[dirs] = "${B}"
 addtask create_v8_qemu_wrapper after do_configure before do_compile
 
-LDFLAGS:append:x86 = " -latomic"
-
 export CC_host
 export CFLAGS_host
 export CXX_host
diff --git a/meta-oe/recipes-devtools/pahole/files/0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch b/meta-oe/recipes-devtools/pahole/files/0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch
deleted file mode 100644
index dad5a9646a..0000000000
--- a/meta-oe/recipes-devtools/pahole/files/0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6fa2b7de3e647e64c5d693aea7f3bacbfa964f53 Mon Sep 17 00:00:00 2001
-From: Ihor Solodari <ihor.solodrai@linux.dev>
-Date: Wed, 20 Aug 2025 09:00:03 +0100
-Subject: [PATCH] btf_encoder: Fix elf_functions cleanup on error
-
-When elf_functions__new() errors out and jumps to
-elf_functions__delete(), pahole segfaults on attempt to list_del() the
-elf_functions instance from a list, to which it was never added.
-
-Fix this by moving list_del() call out of elf_functions__delete().
-Remove from the list only on normal cleanup in
-elf_functions_list__clear().
-
-v1:
-https://lore.kernel.org/dwarves/979a1ac4-21d3-4384-8ce4-d10f41887088@linux.dev/
-
-Closes:
-https://lore.kernel.org/dwarves/24bcc853-533c-42ab-bc37-0c13e0baa217@windriver.com/
-Reported-by: Changqing Li <changqing.li@windriver.com>
-Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
-Reviewed-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Link: https://lore.kernel.org/dwarves/acef4a0e-7d3b-4e05-b3ca-1007580f2754@linux.dev/
-Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
-
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?h=next&id=fe6738f4b46b63dcdc5b15b252a014b3eaba16a4]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- btf_encoder.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/btf_encoder.c b/btf_encoder.c
-index 511c1ea..2f8c6bb 100644
---- a/btf_encoder.c
-+++ b/btf_encoder.c
-@@ -162,7 +162,6 @@ static inline void elf_functions__delete(struct elf_functions *funcs)
-                free(funcs->entries[i].alias);
-        free(funcs->entries);
-        elf_symtab__delete(funcs->symtab);
--       list_del(&funcs->node);
-        free(funcs);
- }
- 
-@@ -204,6 +203,7 @@ static inline void elf_functions_list__clear(struct list_head *elf_functions_lis
- 
-        list_for_each_safe(pos, tmp, elf_functions_list) {
-                funcs = list_entry(pos, struct elf_functions, node);
-+               list_del(&funcs->node);
-                elf_functions__delete(funcs);
-        }
- }
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-devtools/pahole/pahole_1.29.bb b/meta-oe/recipes-devtools/pahole/pahole_1.31.bb
index 4f2737767b..62f053b6aa 100644
--- a/meta-oe/recipes-devtools/pahole/pahole_1.29.bb
+++ b/meta-oe/recipes-devtools/pahole/pahole_1.31.bb
@@ -9,10 +9,10 @@ DEPENDS = "elfutils zlib libbpf"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"
 
-SRCREV = "b9cc7963051b2099795129450f9b70c81950d02f"
-SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master \
+SRCREV = "1f2805b6eef104df3125143c949b391f6122e5b9"
+SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master;tag=v${PV} \
            file://0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch \
-           file://0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch"
+           "
 
 
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.10.bb b/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.10.bb
new file mode 100644
index 0000000000..08dfcb7545
--- /dev/null
+++ b/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.10.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Security-focused ELF files checking tool"
+DESCRIPTION = "This is a small set of various PaX aware and related \
+utilities for ELF binaries. It can check ELF binary files and running \
+processes for issues that might be relevant when using ELF binaries \
+along with PaX, such as non-PIC code or executable stack and heap."
+HOMEPAGE = "https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
+
+SRC_URI = "git://github.com/gentoo/pax-utils;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "d279ca563775105859f1f8c8467b8244d758cc62"
+
+RDEPENDS:${PN} += "bash"
+
+BBCLASSEXTEND = "native"
+
+inherit meson pkgconfig
+
+PACKAGECONFIG ??= ""
+
+PACKAGECONFIG[libcap] = "-Duse_libcap=enabled, -Duse_libcap=disabled, libcap"
+PACKAGECONFIG[libseccomp] = "-Duse_seccomp=true, -Duse_seccomp=false, libseccomp"
+PACKAGECONFIG[pyelftools] = "-Dlddtree_implementation=python, -Dlddtree_implementation=sh,, python3-pyelftools"
+
+do_install:append(){
+    if ${@bb.utils.contains('PACKAGECONFIG', 'pyelftools', 'true', 'false', d)}; then
+        sed -i 's,#!/usr/bin/env python,#!/usr/bin/env python3,' ${D}${bindir}/lddtree
+    fi
+}
+
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
deleted file mode 100644
index 4e80ca87ee..0000000000
--- a/meta-oe/recipes-devtools/pax-utils/pax-utils_1.3.3.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "Security-focused ELF files checking tool"
-DESCRIPTION = "This is a small set of various PaX aware and related \
-utilities for ELF binaries. It can check ELF binary files and running \
-processes for issues that might be relevant when using ELF binaries \
-along with PaX, such as non-PIC code or executable stack and heap."
-HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
-
-SRC_URI = "https://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz"
-SRC_URI[sha256sum] = "eeca7fbd98bc66bead4a77000c2025d9f17ea8201b84245882406ce00b9b6b14"
-
-RDEPENDS:${PN} += "bash"
-
-export GNULIB_OVERRIDES_WINT_T = "0"
-
-do_configure:prepend() {
-    touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog ${S}/README
-}
-
-do_install() {
-    oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install
-}
-
-BBCLASSEXTEND = "native"
-
-inherit autotools pkgconfig
-
-PACKAGECONFIG ??= ""
-
-PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap"
-PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp"
-PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, python3-pyelftools"
-
-EXTRA_OECONF += "--enable-largefile"
diff --git a/meta-oe/recipes-devtools/perl/exiftool_13.45.bb b/meta-oe/recipes-devtools/perl/exiftool_13.48.bb
index 9feaeb10b1..0ace1e10eb 100644
--- a/meta-oe/recipes-devtools/perl/exiftool_13.45.bb
+++ b/meta-oe/recipes-devtools/perl/exiftool_13.48.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff
 
 inherit cpan
 
-SRCREV = "6219b531484ad790d7fcfa5732d5a9f42ff9e5b7"
+SRCREV = "5a760372fadf23effe370ab5e9ca8e2df9448411"
 SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master;tag=${PV}"
 
 RDEPENDS:${PN} = " \
diff --git a/meta-oe/recipes-devtools/php/php_8.5.1.bb b/meta-oe/recipes-devtools/php/php_8.5.3.bb
index c3abf58ad5..f4d02dbf22 100644
--- a/meta-oe/recipes-devtools/php/php_8.5.1.bb
+++ b/meta-oe/recipes-devtools/php/php_8.5.3.bb
@@ -12,7 +12,7 @@ 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 \
+SRC_URI = "https://php.net/distributions/php-${PV}.tar.bz2 \
            file://0001-configure.ac-don-t-include-build-libtool.m4.patch \
            file://0002-ext-phar-Makefile.frag-Fix-phar-packaging.patch \
           "
@@ -32,7 +32,7 @@ UPSTREAM_CHECK_REGEX = "releases/tag/php-(?P<pver>\d+(\.\d+)+)"
 
 S = "${UNPACKDIR}/php-${PV}"
 
-SRC_URI[sha256sum] = "55f428c426e7241752ea9afff160bb64c32a9321cbd6d17d1c145b8df8823737"
+SRC_URI[sha256sum] = "fc5ecabc183ceb64d9fca3dcd387bd29b2b67448326af998fde003124916823b"
 
 CVE_STATUS_GROUPS += "CVE_STATUS_PHP"
 CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored."
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch b/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
deleted file mode 100644
index 1f5c9127de..0000000000
--- a/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-build-on-mips-clang.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From cd6c5f36c0dc38e4734b74b03923489b7bfb9aba Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 10 Mar 2025 19:59:19 -0700
-Subject: [PATCH] Fix build on mips/clang
-
-clang20 crashes on mips, until its fixed upstream disable tailcall on
-mips
-
-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 | 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
-@@ -227,6 +227,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
- #error PROTOBUF_TAILCALL was previously defined
- #endif
- #if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) &&  \
-+    !defined(__mips__) && \
-     !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-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
index 2edba6b7eb..788db3e406 100644
--- 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
@@ -30,9 +30,9 @@ 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)
+@@ -18,6 +18,10 @@ if(CMAKE_CXX_STANDARD AND CMAKE_CXX_STANDARD LESS 17)
+   message(FATAL_ERROR "The minimum supported C++ standard is C++ 17")
+ endif()
  
 +set(CMAKE_CXX_STANDARD 17)
 +set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_6.31.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf_6.33.5.bb
index 37b26b610d..66c9c24473 100644
--- a/meta-oe/recipes-devtools/protobuf/protobuf_6.31.1.bb
+++ b/meta-oe/recipes-devtools/protobuf/protobuf_6.33.5.bb
@@ -10,22 +10,26 @@ LIC_FILES_CHKSUM = " \
     file://third_party/utf8_range/LICENSE;md5=d4974d297231477b2ff507c35d61c13c \
 "
 
+PROTOC_VERSION = "v${@d.getVar('PV').split('.', 1)[1]}"
+PROTOC_BRANCH = "${@d.getVar('PV').split('.', 2)[1]}.x"
+
 DEPENDS = "zlib abseil-cpp jsoncpp"
 DEPENDS:append:class-target = " protobuf-native"
 
-SRCREV = "74211c0dfc2777318ab53c2cd2c317a2ef9012de"
+SRCREV = "b6f9284da830b69be787732ffdaa35049d20a088"
 
-SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=31.x;protocol=https \
+SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=${PROTOC_BRANCH};protocol=https;tag=${PROTOC_VERSION} \
            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:mipsarcho32:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch "
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d\.\d+\.\d+)"
 
 CVE_PRODUCT = "google:protobuf protobuf:protobuf google-protobuf protobuf-cpp"
 
+CVE_STATUS[CVE-2026-0994] = "cpe-incorrect: the vulnerability affects only python3-protobuf recipe"
+
 inherit cmake pkgconfig ptest
 
 PACKAGECONFIG ??= ""
@@ -70,6 +74,7 @@ do_compile_ptest() {
         # Adapt uf8_range.pc
         cp "${B}/third_party/utf8_range/utf8_range.pc" "${B}/${TEST_SRC_DIR}/utf8_range.pc"
         sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc"
+        sed -e 's|includedir=.*|includedir=${S}/third_party/utf8_range|' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc"
         sed -e 's|Libs:|Libs= -L${B}/third_party/utf8_range |' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc"
         # Until out-of-tree build of examples is supported, we have to use this approach
         sed -e 's|../src/google/protobuf/.libs/timestamp.pb.o|${B}/CMakeFiles/libprotobuf.dir/src/google/protobuf/timestamp.pb.cc.o|' -i "${B}/${TEST_SRC_DIR}/Makefile"
diff --git a/meta-oe/recipes-extended/byacc/byacc_20241231.bb b/meta-oe/recipes-extended/byacc/byacc_20260126.bb
index 8d74dbb83e..cf58f4025c 100644
--- a/meta-oe/recipes-extended/byacc/byacc_20241231.bb
+++ b/meta-oe/recipes-extended/byacc/byacc_20260126.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=6a728308869d7a7901618a5bcb970f7e"
+LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=0eedc51db8ab59ff33e74b4e8138035c"
 require byacc.inc
 
-SRC_URI[sha256sum] = "192c2fae048d4e7f514ba451627f9c4e612765099f819c19191f9fde3e609673"
+SRC_URI[sha256sum] = "b618c5fb44c2f5f048843db90f7d1b24f78f47b07913c8c7ba8c942d3eb24b00"
diff --git a/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch b/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch
deleted file mode 100644
index 78f36bde45..0000000000
--- a/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From a08acdfadb5eba2a3201209c6da3ad6f2ca4ae79 Mon Sep 17 00:00:00 2001
-From: Craig Comstock <craig.comstock@northern.tech>
-Date: Fri, 27 Jan 2023 15:19:48 -0600
-Subject: [PATCH] Fixed --with-libxml2=no case in configure.ac
-
-The CF3_WITH_LIBRARY and AC_CHECK_HEADERS were moved to outside of the check for with-libxml2=no
-
-Ticket: CFE-4023
-Changelog: title
----
-Upstream-Status: Pending
-
- configure.ac          | 21 +++++++++++----------
- libntech/configure.ac | 21 +++++++++++----------
- 2 files changed, 22 insertions(+), 20 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e189b10..f6b8226 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -659,19 +659,20 @@ if test "x$with_libxml2" != "xno"; then
-             LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2
-         fi
-     fi
--fi
- 
--CF3_WITH_LIBRARY(libxml2,
--    [AC_CHECK_LIB(xml2, xmlFirstElementChild,
--    [],
--    [if test "x$with_libxml2" != xcheck; then
--        AC_MSG_ERROR(Cannot find libxml2); fi]
--    )
--    AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
-+    CF3_WITH_LIBRARY(libxml2,
-+        [AC_CHECK_LIB(xml2, xmlFirstElementChild,
-+        [],
-         [if test "x$with_libxml2" != xcheck; then
-             AC_MSG_ERROR(Cannot find libxml2); fi]
--    )]
--)
-+        )
-+        AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
-+            [if test "x$with_libxml2" != xcheck; then
-+                AC_MSG_ERROR(Cannot find libxml2); fi]
-+        )]
-+    )
-+    
-+fi
- 
- AM_CONDITIONAL([HAVE_LIBXML2],
-     [test "x$with_libxml2" != xno &&
-diff --git a/libntech/configure.ac b/libntech/configure.ac
-index 7bb8787..28b3683 100644
---- a/libntech/configure.ac
-+++ b/libntech/configure.ac
-@@ -571,19 +571,20 @@ if test "x$with_libxml2" != "xno"; then
-             LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2
-         fi
-     fi
--fi
- 
--CF3_WITH_LIBRARY(libxml2,
--    [AC_CHECK_LIB(xml2, xmlFirstElementChild,
--    [],
--    [if test "x$with_libxml2" != xcheck; then
--        AC_MSG_ERROR(Cannot find libxml2); fi]
--    )
--    AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
-+    CF3_WITH_LIBRARY(libxml2,
-+        [AC_CHECK_LIB(xml2, xmlFirstElementChild,
-+        [],
-         [if test "x$with_libxml2" != xcheck; then
-             AC_MSG_ERROR(Cannot find libxml2); fi]
--    )]
--)
-+        )
-+        AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
-+            [if test "x$with_libxml2" != xcheck; then
-+                AC_MSG_ERROR(Cannot find libxml2); fi]
-+        )]
-+    )
-+
-+fi
- 
- AM_CONDITIONAL([HAVE_LIBXML2],
-     [test "x$with_libxml2" != xno &&
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.26.0.bb
index de20f585b0..28ea16ea6f 100644
--- a/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb
+++ b/meta-oe/recipes-extended/cfengine/cfengine_3.26.0.bb
@@ -10,51 +10,47 @@ its lifecycle. CFEngine takes systems from Build to Deploy, Manage and Audit."
 
 HOMEPAGE = "http://cfengine.com"
 
-SKIP_RECIPE[cfengine] ?= "Needs porting to openssl 3.x"
-
 LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=233aa25e53983237cf0bd4c238af255f"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=eef43e6a0b5a8f46ef7f11e1e4b32a6c"
 
-DEPENDS += "attr tokyocabinet bison-native libxml2"
-#RDEPENDS:cfengine += "attr tokyocabinet bison-native libxml2"
+DEPENDS += "attr tokyocabinet bison-native openssl libpcre2 librsync"
 
 SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BPN}-community-${PV}.tar.gz \
-           file://0001-Fixed-with-libxml2-no-case-in-configure.ac.patch \
            file://set-path-of-default-config-file.patch \
            "
-SRC_URI[sha256sum] = "911778ddb0a4e03a3ddfc8fc0f033136e1551849ea2dcbdb3f0f14359dfe3126"
+SRC_URI[sha256sum] = "d3c3884b314dae48a6884e919d0a12acac5aea95d970544e4632a1773857d19b"
 
 inherit autotools-brokensep systemd
 
 export EXPLICIT_VERSION = "${PV}"
 
 SYSTEMD_SERVICE:${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \
-                         cf-runalerts.service cf-execd.service \
+                         cf-execd.service cf-php-fpm.service \
                          cf-monitord.service  cf-serverd.service \
+                         cf-reactor.service \
 "
 SYSTEMD_AUTO_ENABLE:${PN} = "disable"
 
-PACKAGECONFIG ??= "libpcre openssl \
-                   ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \
-"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}"
+
 PACKAGECONFIG[libxml2] = "--with-libxml2=yes,--with-libxml2=no,libxml2,"
-PACKAGECONFIG[mysql] = "--with-mysql=yes,--with-mysql=no,mysql,"
+PACKAGECONFIG[mysql] = "--with-mysql=yes,--with-mysql=no,mariadb,"
 PACKAGECONFIG[postgresql] = "--with-postgresql=yes,--with-postgresql=no,postgresql,"
 PACKAGECONFIG[acl] = "--with-libacl=yes,--with-libacl=no,acl,"
 PACKAGECONFIG[libvirt] = "--with-libvirt=yes,--with-libvirt=no,libvirt,"
-PACKAGECONFIG[libpcre] = "--with-pcre=yes,--with-pcre=no,libpcre,"
-PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl,"
 PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam,"
 PACKAGECONFIG[libyaml] = "--with-libyaml,--without-libyaml,libyaml,"
 PACKAGECONFIG[systemd] = "--with-systemd-service=${systemd_system_unitdir},--without-systemd-service"
 PACKAGECONFIG[libcurl] = "--with-libcurl,--without-libcurl,curl,"
 
 EXTRA_OECONF = "hw_cv_func_va_copy=yes --with-init-script=${sysconfdir}/init.d --with-tokyocabinet"
+CFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'mysql', '-I${STAGING_INCDIR}/mysql', '', d)}"
+CFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'libxml2', '-I${STAGING_INCDIR}/libxml2', '', d)}"
 
 do_install:append() {
     install -d ${D}${localstatedir}/${BPN}/bin
-    for f in `ls ${D}${bindir}`; do
-        ln -s ${bindir}/`basename $f` ${D}${localstatedir}/${BPN}/bin/
+    for f in $(find ${D}${bindir} -type f); do
+         ln -sr $f ${D}${localstatedir}/${BPN}/bin/
     done
 
     install -d ${D}${sysconfdir}/default
@@ -73,3 +69,5 @@ EOF
 }
 
 RDEPENDS:${PN} += "${BPN}-masterfiles"
+
+FILES:${PN} += "${libdir}/python"
diff --git a/meta-oe/recipes-extended/highway/highway_1.3.0.bb b/meta-oe/recipes-extended/highway/highway_1.3.0.bb
index 81b71b1f21..d279994301 100644
--- a/meta-oe/recipes-extended/highway/highway_1.3.0.bb
+++ b/meta-oe/recipes-extended/highway/highway_1.3.0.bb
@@ -16,3 +16,5 @@ 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"
+
+BBCLASSEXTEND = "native"
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 ffc18d90c6..2b53d19f9f 100644
--- a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
+++ b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
@@ -20,6 +20,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0001-Fix-upstream-CFLAGS-override.patch"
 SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624"
 
+CVE_PRODUCT = "hplip linux_imaging_and_printing"
+
 UPSTREAM_CHECK_URI = "https://sourceforge.net/p/hplip/activity"
 
 DEPENDS += "cups python3 libusb1 python3-setuptools-native"
diff --git a/meta-oe/recipes-extended/iotop/iotop_1.30.bb b/meta-oe/recipes-extended/iotop/iotop_1.31.bb
index 9fe774f9f2..f37b5a5dd3 100644
--- a/meta-oe/recipes-extended/iotop/iotop_1.30.bb
+++ b/meta-oe/recipes-extended/iotop/iotop_1.31.bb
@@ -1,11 +1,11 @@
 SUMMARY = "A top utility for I/O"
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3154adaa1a9ca0d8dcc1944518ece1b9"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=26b36b714daebf72b11715ba73efbad4"
 
 DEPENDS = "ncurses"
 
 SRC_URI = "git://github.com/Tomas-M/iotop.git;branch=master;protocol=https;tag=v${PV}"
-SRCREV = "c3366a8a235f9c8ddc4797625f22cfdf12ba2c36"
+SRCREV = "57890d671ba69ebc4a619a1cfe7d76cdd3d836a8"
 
 
 inherit pkgconfig
diff --git a/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.8.bb b/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.9.bb
index 6c68b515e9..188f7d6011 100644
--- a/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.8.bb
+++ b/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.9.bb
@@ -11,7 +11,7 @@ DEPENDS = "libfastjson libestr"
 SRC_URI = "git://github.com/rsyslog/liblognorm;branch=stable;protocol=https;tag=v${PV} \
            file://0001-Add-asprintf-to-autoconf-function-check-macro.patch \
            "
-SRCREV = "33ec4b061ad0a6e5508e679e150ce6422ef6be30"
+SRCREV = "3804548e3541747bde3e82a78d2c2dcd865296dd"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch
index aef521bc5d..aef521bc5d 100644
--- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch
+++ b/meta-oe/recipes-extended/libx86-1/libx86-1.1.1/0001-Define-CARD32-as-uint-as-it-is-32-bit.patch
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1.1/0001-assume-zero-is-valid-address.patch
index 7a46301deb..7a46301deb 100644
--- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch
+++ b/meta-oe/recipes-extended/libx86-1/libx86-1.1.1/0001-assume-zero-is-valid-address.patch
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Fix-type-of-the-void-pointer-assignment.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Fix-type-of-the-void-pointer-assignment.patch
deleted file mode 100644
index ea3c306fd7..0000000000
--- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-Fix-type-of-the-void-pointer-assignment.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c782e208021409e9b78acb2200abd4319072e78a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 2 Sep 2022 00:28:05 -0700
-Subject: [PATCH] Fix type of the void pointer assignment
-
-Fixes build with clang
-
-x86-common.c:216:9: error: incompatible integer to pointer conversion assigning to 'void *' from 'long' [-Wint-conversion]
-        offset = mem_info.offset - REAL_MEM_BASE;
-               ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- x86-common.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/x86-common.c b/x86-common.c
-index 137bc3c..6f737ed 100644
---- a/x86-common.c
-+++ b/x86-common.c
-@@ -213,7 +213,7 @@ void *LRMI_common_init(int high_page)
-        if (!real_mem_init(high_page))
-                return NULL;
- 
--       offset = mem_info.offset - REAL_MEM_BASE;
-+       offset = (void*)(mem_info.offset - REAL_MEM_BASE);
- 
-        /*
-         Map the Interrupt Vectors (0x0 - 0x400) + BIOS data (0x400 - 0x502)
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch
deleted file mode 100644
index 1c120c04b9..0000000000
--- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Upstream-Status: Pending
-
-Upstream-Statue: Pending 
-[from ftp://195.220.108.108/linux/fedora/linux/development/rawhide/source/SRPMS/l/libx86-1.1-21.fc23.src.rpm]
-
-diff -ur libx86-1.1/lrmi.c libx86-1.1.hack/lrmi.c
---- libx86-1.1/lrmi.c   2006-10-30 15:10:16.000000000 -0500
-+++ libx86-1.1.hack/lrmi.c      2009-10-26 15:55:42.000000000 -0400
-@@ -136,7 +136,7 @@
-        if (context.ready)
-                return 1;
- 
--       if (!LRMI_common_init())
-+       if (!LRMI_common_init(0))
-                return 0;
- 
-        /*
-diff -ur libx86-1.1/thunk.c libx86-1.1.hack/thunk.c
---- libx86-1.1/thunk.c  2008-04-02 20:48:00.000000000 -0400
-+++ libx86-1.1.hack/thunk.c     2009-10-26 16:05:39.000000000 -0400
-@@ -139,11 +139,11 @@
-        int i;
-        X86EMU_intrFuncs intFuncs[256];
- 
--       if (!LRMI_common_init())
-+       mmap_addr = LRMI_common_init(1);
-+
-+       if (!mmap_addr)
-                return 0;
- 
--       mmap_addr = 0;
--       
-        X86EMU_pioFuncs pioFuncs = {
-                (&x_inb),
-                (&x_inw),
-@@ -169,10 +169,10 @@
-        X86_ESP = 0xFFF9;
-        memset (stack, 0, 64*1024);
- 
--       *((char *)0) = 0x4f; /* Make sure that we end up jumping back to a
--                               halt instruction */
-+       *mmap_addr = 0x4f; /* Make sure that we end up jumping back to a
-+                             halt instruction */
- 
--       M.mem_base = 0;
-+       M.mem_base = (unsigned long)mmap_addr;
-        M.mem_size = 1024*1024;
- 
-        return 1;
-diff -ur libx86-1.1/x86-common.c libx86-1.1.hack/x86-common.c
---- libx86-1.1/x86-common.c     2008-05-16 12:56:23.000000000 -0400
-+++ libx86-1.1.hack/x86-common.c        2009-10-26 16:03:21.000000000 -0400
-@@ -45,14 +45,15 @@
- static struct {
-        int ready;
-        int count;
-+       void *offset;
-        struct mem_block blocks[REAL_MEM_BLOCKS];
- } mem_info = { 0 };
- 
- static int
--real_mem_init(void)
-+real_mem_init(int high_page)
- {
-        void *m;
--       int fd_zero;
-+       int fd_zero, flags = MAP_SHARED;
- 
-        if (mem_info.ready)
-                return 1;
-@@ -63,9 +64,12 @@
-                return 0;
-        }
- 
-+       if (!high_page)
-+               flags |= MAP_FIXED;
-+
-        m = mmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE,
--        PROT_READ | PROT_WRITE | PROT_EXEC,
--        MAP_FIXED | MAP_SHARED, fd_zero, 0);
-+                PROT_READ | PROT_WRITE | PROT_EXEC,
-+                flags, fd_zero, 0);
- 
-        if (m == (void *)-1) {
-                perror("mmap /dev/zero");
-@@ -76,6 +80,7 @@
-        close(fd_zero);
- 
-        mem_info.ready = 1;
-+       mem_info.offset = m;
-        mem_info.count = 1;
-        mem_info.blocks[0].size = REAL_MEM_SIZE;
-        mem_info.blocks[0].free = 1;
-@@ -87,7 +92,7 @@
- real_mem_deinit(void)
- {
-        if (mem_info.ready) {
--               munmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE);
-+               munmap(mem_info.offset, REAL_MEM_SIZE);
-                mem_info.ready = 0;
-        }
- }
-@@ -119,7 +124,7 @@
- LRMI_alloc_real(int size)
- {
-        int i;
--       char *r = (char *)REAL_MEM_BASE;
-+       char *r = (char *)mem_info.offset;
- 
-        if (!mem_info.ready)
-                return NULL;
-@@ -151,7 +156,7 @@
- LRMI_free_real(void *m)
- {
-        int i;
--       char *r = (char *)REAL_MEM_BASE;
-+       char *r = (char *)mem_info.offset;
- 
-        if (!mem_info.ready)
-                return;
-@@ -200,13 +205,15 @@
-        return *(unsigned short *)(i * 4);
- }
- 
--int LRMI_common_init(void)
-+void *LRMI_common_init(int high_page)
- {
--       void *m;
-+       void *m, *offset;
-        int fd_mem;
- 
--       if (!real_mem_init())
--               return 0;
-+       if (!real_mem_init(high_page))
-+               return NULL;
-+
-+       offset = mem_info.offset - REAL_MEM_BASE;
- 
-        /*
-         Map the Interrupt Vectors (0x0 - 0x400) + BIOS data (0x400 - 0x502)
-@@ -217,33 +224,33 @@
-        if (fd_mem == -1) {
-                real_mem_deinit();
-                perror("open /dev/mem");
--               return 0;
-+               return NULL;
-        }
- 
--       m = mmap((void *)0, 0x502,
--        PROT_READ | PROT_WRITE | PROT_EXEC,
--        MAP_FIXED | MAP_SHARED, fd_mem, 0);
-+       m = mmap(offset, 0x502,
-+                PROT_READ | PROT_WRITE | PROT_EXEC,
-+                MAP_FIXED | MAP_SHARED, fd_mem, 0);
- 
-        if (m == (void *)-1) {
-                close(fd_mem);
-                real_mem_deinit();
-                perror("mmap /dev/mem");
--               return 0;
-+               return NULL;
-        }
- 
--       m = mmap((void *)0xa0000, 0x100000 - 0xa0000,
-+       m = mmap(offset+0xa0000, 0x100000 - 0xa0000,
-         PROT_READ | PROT_WRITE | PROT_EXEC,
-         MAP_FIXED | MAP_SHARED, fd_mem, 0xa0000);
- 
-        if (m == (void *)-1) {
--               munmap((void *)0, 0x502);
-+               munmap(offset, 0x502);
-                close(fd_mem);
-                real_mem_deinit();
-                perror("mmap /dev/mem");
--               return 0;
-+               return NULL;
-        }
- 
-        close(fd_mem);
- 
--       return 1;
-+       return offset;
- }
-diff -ur libx86-1.1/x86-common.h libx86-1.1.hack/x86-common.h
---- libx86-1.1/x86-common.h     2006-09-07 18:44:27.000000000 -0400
-+++ libx86-1.1.hack/x86-common.h        2009-10-26 16:01:19.000000000 -0400
-@@ -40,4 +40,4 @@
- 
- void *LRMI_alloc_real(int size);
- void LRMI_free_real(void *m);
--int LRMI_common_init(void);
-+void *LRMI_common_init(int high_page);
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch b/meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch
deleted file mode 100644
index 821ab379d5..0000000000
--- a/meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-
-diff --git a/Makefile b/Makefile
-index 951b617..6d9b73d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -22,7 +22,7 @@ static: $(OBJECTS)
-        $(AR) cru libx86.a $(OBJECTS)
- 
- shared: $(OBJECTS)
--       $(CC) $(CFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS)
-+       $(CC) $(CFLAGS) $(LDFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS)
- 
- objclean:
-        $(MAKE) -C x86emu clean
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.1.bb
index 817322a484..5ef7707a86 100644
--- a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
+++ b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.1.bb
@@ -7,17 +7,16 @@ LICENSE = "MIT & BSD-3-Clause"
 SECTION = "libs"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=633af6c02e6f624d4c472d970a2aca53"
 
-SRC_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/libx86-${PV}.tar.gz \
-           file://libx86-mmap-offset.patch \
+SRC_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/libx86-v${PV}.tar.lz \
            file://0001-assume-zero-is-valid-address.patch \
-           file://makefile-add-ldflags.patch \
-           file://0001-Fix-type-of-the-void-pointer-assignment.patch \
            file://0001-Define-CARD32-as-uint-as-it-is-32-bit.patch \
 "
-SRC_URI[sha256sum] = "5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048"
+SRC_URI[sha256sum] = "0de221c8e2fcc84078155c1a82f86dcd71c2706033eb410d2090d86c99f51141"
 
 UPSTREAM_CHECK_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/"
 
+S = "${UNPACKDIR}/${BPN}-v${PV}"
+
 BPN = "libx86"
 COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
 
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/D261512.1755672843.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/D261512.1755672843.patch
new file mode 100644
index 0000000000..1b35d2c094
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/D261512.1755672843.patch
@@ -0,0 +1,68 @@
+This patch fixes configure with python 3.14
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+
+Upstream-Status: Backport [https://github.com/mozilla-firefox/firefox/commit/d497aa4f770ca02f6083e93b94996a8fe32c2ff4]
+
+diff --git a/python/mozbuild/mozbuild/frontend/reader.py b/python/mozbuild/mozbuild/frontend/reader.py
+index 5cb627b..c2dcafe 100644
+--- a/python/mozbuild/mozbuild/frontend/reader.py
++++ b/python/mozbuild/mozbuild/frontend/reader.py
+@@ -470,7 +470,7 @@ class TemplateFunction(object):
+             return c(
+                 ast.Subscript(
+                     value=c(ast.Name(id=self._global_name, ctx=ast.Load())),
+-                    slice=c(ast.Index(value=c(ast.Str(s=node.id)))),
++                    slice=c(ast.Index(value=c(ast.Constant(value=node.id)))),
+                     ctx=node.ctx,
+                 )
+             )
+@@ -1035,8 +1035,8 @@ class BuildReader(object):
+                 else:
+                     # Others
+                     assert isinstance(target.slice, ast.Index)
+-                    assert isinstance(target.slice.value, ast.Str)
+-                    key = target.slice.value.s
++                    assert isinstance(target.slice.value, ast.Constant)
++                    key = target.slice.value.value
+ 
+             return name, key
+ 
+@@ -1044,11 +1044,11 @@ class BuildReader(object):
+             value = node.value
+             if isinstance(value, ast.List):
+                 for v in value.elts:
+-                    assert isinstance(v, ast.Str)
+-                    yield v.s
++                    assert isinstance(v, ast.Constant)
++                    yield v.value
+             else:
+-                assert isinstance(value, ast.Str)
+-                yield value.s
++                assert isinstance(value, ast.Constant)
++                yield value.value
+ 
+         assignments = []
+ 
+diff --git a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
+index 1590267..151d27c 100644
+--- a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
++++ b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
+@@ -327,15 +327,13 @@ def assignment_node_to_source_filename_list(code, node):
+     """
+     if isinstance(node.value, ast.List) and "elts" in node.value._fields:
+         for f in node.value.elts:
+-            if not isinstance(f, ast.Constant) and not isinstance(f, ast.Str):
++            if not isinstance(f, ast.Constant):
+                 log(
+                     "Found non-constant source file name in list: ",
+                     ast_get_source_segment(code, f),
+                 )
+                 return []
+-        return [
+-            f.value if isinstance(f, ast.Constant) else f.s for f in node.value.elts
+-        ]
++        return [f.value for f in node.value.elts]
+     elif isinstance(node.value, ast.ListComp):
+         # SOURCES += [f for f in foo if blah]
+         log("Could not find the files for " + ast_get_source_segment(code, node.value))
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb b/meta-oe/recipes-extended/mozjs/mozjs-128_128.14.0.bb
index fbbe3749ba..635cad96cf 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128_128.14.0.bb
@@ -3,22 +3,24 @@ HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonk
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf"
 
-SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \
-           file://0001-Cargo.toml-do-not-abort-on-panic.patch \
-           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://0005-Add-RISCV32-support.patch \
-           file://0006-util.configure-fix-one-occasionally-reproduced-confi.patch \
-           file://0007-Rewrite-cargo-host-linker-in-python3.patch  \
-           file://0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch \
-           file://0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch \
-           file://0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch \
-           file://0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \
-           file://0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \
-           file://0013-Fix-build-error-with-musl.patch \
-           "
-SRC_URI[sha256sum] = "25d633eb81499cbda44b8c64fa1c1a5879d55024b864ef495d4997154d68358f"
+SRC_URI = " \
+    https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \
+    file://0001-Cargo.toml-do-not-abort-on-panic.patch \
+    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://0005-Add-RISCV32-support.patch \
+    file://0006-util.configure-fix-one-occasionally-reproduced-confi.patch \
+    file://0007-Rewrite-cargo-host-linker-in-python3.patch  \
+    file://0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch \
+    file://0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch \
+    file://0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch \
+    file://0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \
+    file://0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \
+    file://0013-Fix-build-error-with-musl.patch \
+    file://D261512.1755672843.patch \
+"
+SRC_URI[sha256sum] = "93b9ef6229f41cb22ff109b95bbf61a78395a0fe4b870192eeca22947cb09a53"
 
 UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs128"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-extended/networking/mstpd_git.bb b/meta-oe/recipes-extended/networking/mstpd_0.1.1.bb
index b003b52d25..3ac4d5b1fe 100644
--- a/meta-oe/recipes-extended/networking/mstpd_git.bb
+++ b/meta-oe/recipes-extended/networking/mstpd_0.1.1.bb
@@ -1,14 +1,12 @@
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4325afd396febcb659c36b49533135d4"
 
-PV = "0.1.0+git"
-
 SRC_URI = " \
-    git://github.com/mstpd/mstpd;branch=master;protocol=https \
+    git://github.com/mstpd/mstpd;branch=master;protocol=https;tag=${PV} \
     file://bridge-stp \
     file://mstpd.service \
 "
-SRCREV = "181c453fc1a00573e19f14960dcc54ad84beea7c"
+SRCREV = "d7dd987b101f277bfef8ac71de7c1d962a424e8e"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+){2,})"
 
diff --git a/meta-oe/recipes-extended/parallel/parallel_20251122.bb b/meta-oe/recipes-extended/parallel/parallel_20260222.bb
index c2775472d7..cf01b783bb 100644
--- a/meta-oe/recipes-extended/parallel/parallel_20251122.bb
+++ b/meta-oe/recipes-extended/parallel/parallel_20260222.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \
 "
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "368d1982cfd9dbebb8cd0e444de6199559df94ac2dd1edf95f74350f0af1e84d"
+SRC_URI[sha256sum] = "c6272a48972a0f2fdd3f39560d698f3c5abd3d8a4de40d52f9772f3a03ae1f48"
 
 inherit autotools bash-completion
 
diff --git a/meta-oe/recipes-extended/plocate/plocate_1.1.23.bb b/meta-oe/recipes-extended/plocate/plocate_1.1.24.bb
index c9502db16a..b33c339d14 100644
--- a/meta-oe/recipes-extended/plocate/plocate_1.1.23.bb
+++ b/meta-oe/recipes-extended/plocate/plocate_1.1.24.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] = "06bd3b284d5d077b441bef74edb0cc6f8e3f0a6f58b4c15ef865d3c460733783"
+SRC_URI[sha256sum] = "e55a757af1d7efb15ea674993224da4f0258479f8f720bd3dae0925d27dc04a2"
diff --git a/meta-oe/recipes-extended/polkit/polkit_127.bb b/meta-oe/recipes-extended/polkit/polkit_127.bb
index 40eca9f9ee..f97c6efbf7 100644
--- a/meta-oe/recipes-extended/polkit/polkit_127.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_127.bb
@@ -65,3 +65,5 @@ FILES:${PN} += " \
         ${systemd_unitdir}/system/polkit-agent-helper.socket \
         ${systemd_unitdir}/system/polkit-agent-helper@.service \
 "
+
+CVE_STATUS[CVE-2016-2568] = "unpatched: the fix is a kernel compiled without CONFIG_LEGACY_TIOCSTI"
diff --git a/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-8.0.0/0001-hiredis-use-default-CC-if-it-is-set.patch
index 51a6e9c957..a176f7c14e 100644
--- a/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis-8.0.0/0001-hiredis-use-default-CC-if-it-is-set.patch
@@ -1,4 +1,4 @@
-From 67990f216f2fbbc8a6699c700dfc089aa617905f Mon Sep 17 00:00:00 2001
+From 43601f60f268ddbc2e03f7a33ae4a1ad109f092c 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
@@ -6,6 +6,10 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+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.
 
@@ -18,20 +22,24 @@ 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: Eric Meyers <eric.meyers@arthrex.com>
+
 ---
  deps/hiredis/Makefile | 2 --
  1 file changed, 2 deletions(-)
 
 diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
-index 7e41c97..54717e3 100644
+index bd2106b..9ce768d 100644
 --- a/deps/hiredis/Makefile
 +++ b/deps/hiredis/Makefile
-@@ -42,8 +42,6 @@ endef
+@@ -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 -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+ WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
  DEBUG_FLAGS?= -g -ggdb
diff --git a/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-8.0.0/0002-lua-update-Makefile-to-use-environment-build-setting.patch
index 17b533669b..f1b59ad0a1 100644
--- a/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
+++ b/meta-oe/recipes-extended/redis/redis-8.0.0/0002-lua-update-Makefile-to-use-environment-build-setting.patch
@@ -1,4 +1,4 @@
-From ef989aab052510bfda32b2b325a5f80b76c42677 Mon Sep 17 00:00:00 2001
+From d50d4cb30bfb533185711116822a50d83e5a92e8 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
@@ -16,6 +16,10 @@ 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>
+
+Reworked for 8.0.0
+Signed-off-by: Eric Meyers <eric.meyers@arthrex.com>
+
 ---
  deps/Makefile         |  1 -
  deps/lua/Makefile     |  1 -
@@ -23,10 +27,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
  3 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/deps/Makefile b/deps/Makefile
-index cbe3aef..76bc222 100644
+index 5593e0c..d71265a 100644
 --- a/deps/Makefile
 +++ b/deps/Makefile
-@@ -81,7 +81,6 @@ endif
+@@ -101,7 +101,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/0003-hack-to-force-use-of-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-8.0.0/0003-hack-to-force-use-of-libc-malloc.patch
index f1021eef6c..2b0db43f7e 100644
--- a/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
+++ b/meta-oe/recipes-extended/redis/redis-8.0.0/0003-hack-to-force-use-of-libc-malloc.patch
@@ -1,4 +1,4 @@
-From b9586abcb803747301f6cc4ff93c7642bef693ea Mon Sep 17 00:00:00 2001
+From 55e09d562a1b8ca6a7d3ef2349c58f466bc44d2b 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
@@ -15,15 +15,19 @@ 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 8.0.0
+Signed-off-by: Eric Meyers <eric.meyers@arthrex.com>
+
 ---
  src/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 7d75c83..35dd314 100644
+index 948ef83..5dbbefc 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -13,7 +13,8 @@
+@@ -17,7 +17,8 @@
  # Just use 'make dep', but this is only needed by developers.
  
  release_hdr := $(shell sh -c './mkreleasehdr.sh')
@@ -31,5 +35,5 @@ index 7d75c83..35dd314 100644
 +# 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')
- OPTIMIZATION?=-O2
- DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
+ CLANG := $(findstring clang,$(shell sh -c '$(CC) --version | head -1'))
+ 
diff --git a/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-8.0.0/0004-src-Do-not-reset-FINAL_LIBS.patch
index 958106e261..5b8616c652 100644
--- a/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis-8.0.0/0004-src-Do-not-reset-FINAL_LIBS.patch
@@ -1,4 +1,4 @@
-From a4d87aca1c00c53b386ee7490223971e00873add Mon Sep 17 00:00:00 2001
+From 8f7a23705433e3f8850736a3348ecabbf7949e01 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
@@ -11,20 +11,24 @@ 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>
+
+Reworked for 8.0.0
+Signed-off-by: Eric Meyers <eric.meyers@arthrex.com>
+
 ---
  src/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 35dd314..3770f96 100644
+index 5dbbefc..15fbe09 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -93,7 +93,7 @@ endif
+@@ -131,7 +131,7 @@ endif
  
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
- FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
--FINAL_LIBS=-lm
-+FINAL_LIBS+=-lm
+ FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG)
+-FINAL_LIBS=-lm -lstdc++
++FINAL_LIBS+=-lm -lstdc++
  DEBUG=-g -ggdb
  
  # Linux ARM32 needs -latomic at linking time
diff --git a/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch b/meta-oe/recipes-extended/redis/redis-8.0.0/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
index d73c66c9d0..a94f2ad565 100644
--- a/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
+++ b/meta-oe/recipes-extended/redis/redis-8.0.0/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
@@ -1,4 +1,4 @@
-From 2e6311c9c7cd85bf63eab8fe92c08ec1ec01b6fc Mon Sep 17 00:00:00 2001
+From 3e5b6732b936883d895638a3098a29dd254a7be4 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
@@ -11,17 +11,21 @@ Fixes
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Reworked for 8.0.0
+Signed-off-by: Eric Meyers <eric.meyers@arthrex.com>
+
 ---
  src/zmalloc.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/src/zmalloc.c b/src/zmalloc.c
-index 1f33d09..5e182d1 100644
+index b2f5718..913be90 100644
 --- a/src/zmalloc.c
 +++ b/src/zmalloc.c
-@@ -28,6 +28,7 @@
-  * POSSIBILITY OF SUCH DAMAGE.
-  */
+@@ -12,6 +12,7 @@
+ #include "config.h"
+ #include "solarisfixes.h"
  
 +#define _GNU_SOURCE
  #include <stdio.h>
diff --git a/meta-oe/recipes-extended/redis/redis/init-redis-server b/meta-oe/recipes-extended/redis/redis-8.0.0/init-redis-server
index c5f335f57d..c5f335f57d 100644
--- a/meta-oe/recipes-extended/redis/redis/init-redis-server
+++ b/meta-oe/recipes-extended/redis/redis-8.0.0/init-redis-server
diff --git a/meta-oe/recipes-extended/redis/redis/redis.conf b/meta-oe/recipes-extended/redis/redis-8.0.0/redis.conf
index 75037d6dc8..75037d6dc8 100644
--- a/meta-oe/recipes-extended/redis/redis/redis.conf
+++ b/meta-oe/recipes-extended/redis/redis-8.0.0/redis.conf
diff --git a/meta-oe/recipes-extended/redis/redis/redis.service b/meta-oe/recipes-extended/redis/redis-8.0.0/redis.service
index f98f2d19e8..b7791d0df4 100644
--- a/meta-oe/recipes-extended/redis/redis/redis.service
+++ b/meta-oe/recipes-extended/redis/redis-8.0.0/redis.service
@@ -9,6 +9,7 @@ ExecStart=/usr/bin/redis-server /etc/redis/redis.conf
 ExecStop=/usr/bin/redis-cli shutdown
 Restart=always
 LimitNOFILE=10032
+Type=notify
 StateDirectory=redis
 
 [Install]
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
deleted file mode 100644
index bb3f5c607e..0000000000
--- a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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
-Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
----
- src/debug.c | 26 ++++++++++++++++++++++++--
- 1 file changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/src/debug.c b/src/debug.c
-index bb76c5d..55a0696 100644
---- a/src/debug.c
-+++ b/src/debug.c
-@@ -1067,7 +1067,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
-     #endif
- #elif defined(__linux__)
-     /* Linux */
--    #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__))
-+    #if defined(__riscv) && __riscv_xlen == 32
-+    return (void*) uc->uc_mcontext.__gregs[REG_PC];
-+    #elif defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__))
-     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);
-@@ -1234,8 +1236,28 @@ void logRegisters(ucontext_t *uc) {
-     #endif
- /* Linux */
- #elif defined(__linux__)
-+    /* Linux RISCV32 */
-+    #if defined(__riscv) && __riscv_xlen == 32
-+    serverLog(LL_WARNING,
-+    "\n"
-+    "RA:%08lx S0:%08lx S1:%08lx S2:%08lx\n"
-+    "SP:%08lx PC:%08lx A0:%08lx A1:%08lx\n"
-+    "A2 :%08lx A3:%08lx A4:%08lx",
-+        (unsigned long) uc->uc_mcontext.__gregs[REG_RA],
-+        (unsigned long) uc->uc_mcontext.__gregs[REG_S0],
-+        (unsigned long) uc->uc_mcontext.__gregs[REG_S1],
-+        (unsigned long) uc->uc_mcontext.__gregs[REG_S2],
-+        (unsigned long) uc->uc_mcontext.__gregs[REG_SP],
-+        (unsigned long) uc->uc_mcontext.__gregs[REG_PC],
-+        (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 0],
-+        (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 1],
-+        (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 2],
-+        (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 3],
-+        (unsigned long) uc->uc_mcontext.__gregs[REG_A0 + 4]
-+    );
-+    logStackContent((void**)uc->uc_mcontext.__gregs[REG_SP]);
-     /* Linux x86 */
--    #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__))
-+    #elif defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__))
-     serverLog(LL_WARNING,
-     "\n"
-     "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n"
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.12.bb b/meta-oe/recipes-extended/redis/redis_7.2.12.bb
index 8abf758930..63a801dd57 100644
--- a/meta-oe/recipes-extended/redis/redis_7.2.12.bb
+++ b/meta-oe/recipes-extended/redis/redis_7.2.12.bb
@@ -47,6 +47,8 @@ PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
 
 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
 
+TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}"
+
 do_compile:prepend() {
     oe_runmake -C deps hdr_histogram fpconv hiredis lua linenoise
 }
diff --git a/meta-oe/recipes-extended/redis/redis_6.2.21.bb b/meta-oe/recipes-extended/redis/redis_8.0.0.bb
index 474aea7dc3..afad578dba 100644
--- a/meta-oe/recipes-extended/redis/redis_6.2.21.bb
+++ b/meta-oe/recipes-extended/redis/redis_8.0.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Redis is an open source, advanced key-value store."
 HOMEPAGE = "http://redis.io"
 SECTION = "libs"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4feb9943a139a170b9d6ed6ec3342d0c"
 DEPENDS = "readline lua ncurses"
 
 SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
@@ -15,22 +15,19 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            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] = "cf395665ba5fcecc4ef7aed1d8ab19c268619d98595827565c82344160171262"
 
-SRC_URI[sha256sum] = "6383b32ba8d246f41bbbb83663381f5a5f4c4713235433cec22fc4a47e9b6d5f"
+RPROVIDES:${PN} = "virtual-redis"
 
 CVE_STATUS[CVE-2025-21605] = "cpe-incorrect: the used version already contains the fix"
-# The vulnerability originates from Debian's packaging methodology,
-# which loads system-wide Lua libraries (lua-cjson, lua-cmsgpack),
-# enabling Lua sandbox escape. Upstream Redis builds, including
-# those built by Yocto/OpenEmbedded, utilize embedded Lua from the
-# deps/ directory and are therefore not affected by this issue.
-CVE_STATUS[CVE-2022-0543] = "not-applicable-config: Debian-specific packaging issue caused by loading system-wide Lua libraries; upstream builds use embedded Lua and are not affected"
-CVE_STATUS[CVE-2022-3734] = "not-applicable-config: only affects Windows"
+CVE_STATUS[CVE-2025-27151] = "cpe-incorrect: the used version already contains the fix"
 CVE_STATUS[CVE-2025-46686] = "disputed: upstream rejected because mitigating it would affect other functionality"
+CVE_STATUS[CVE-2025-46817] = "cpe-incorrect: the used version already contains the fix"
+CVE_STATUS[CVE-2025-46818] = "cpe-incorrect: the used version already contains the fix"
+CVE_STATUS[CVE-2025-46819] = "cpe-incorrect: the used version already contains the fix"
 
-inherit update-rc.d systemd useradd
+inherit pkgconfig update-rc.d systemd useradd
 
 FINAL_LIBS:x86:toolchain-clang = "-latomic"
 FINAL_LIBS:riscv32 = "-latomic"
@@ -44,10 +41,15 @@ USERADD_PACKAGES = "${PN}"
 USERADD_PARAM:${PN}  = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis"
 GROUPADD_PARAM:${PN} = "--system redis"
 
-REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
+PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
+
+EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
+
+TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}"
 
 do_compile:prepend() {
-    oe_runmake -C deps hiredis lua linenoise
+    oe_runmake -C deps hdr_histogram fpconv hiredis lua linenoise
 }
 
 do_install() {
@@ -64,8 +66,9 @@ do_install() {
     install -m 0644 ${UNPACKDIR}/redis.service ${D}${systemd_system_unitdir}
     sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service
 
-    if [ "${REDIS_ON_SYSTEMD}" = true ]; then
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf
+        sed -i 's!supervised no!supervised systemd!' ${D}/${sysconfdir}/redis/redis.conf
     fi
 }
 
@@ -75,3 +78,11 @@ 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."
+# The vulnerability originates from Debian's packaging methodology,
+# which loads system-wide Lua libraries (lua-cjson, lua-cmsgpack),
+# enabling Lua sandbox escape. Upstream Redis builds, including
+# those built by Yocto/OpenEmbedded, utilize embedded Lua from the
+# deps/ directory and are therefore not affected by this issue.
+CVE_STATUS[CVE-2022-0543] = "not-applicable-config: Debian-specific packaging issue caused by loading system-wide Lua libraries; upstream builds use embedded Lua and are not affected"
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb
index 63233fd278..c50a7a3f7a 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb
@@ -149,11 +149,11 @@ do_install:append() {
     sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
 
     if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then
-        install -d 0755 ${D}${sysconfdir}/rsyslog.d
+        install -d -m 0755 ${D}${sysconfdir}/rsyslog.d
         echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf
     fi
     if ${@bb.utils.contains('PACKAGECONFIG', 'mmjsonparse', 'true', 'false', d)}; then
-        install -d 0755 ${D}${sysconfdir}/rsyslog.d
+        install -d -m 0755 ${D}${sysconfdir}/rsyslog.d
         echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf
     fi
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
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 733cddc88b..dc6e12fd80 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
@@ -2,7 +2,7 @@ SUMMARY = "Small Footprint CIM Client Library"
 DESCRIPTION = "Small Footprint CIM Client Library Runtime Libraries"
 HOMEPAGE = "http://www.sblim.org"
 
-SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/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 \
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 a051f90c43..2961d23bd9 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
@@ -1,16 +1,20 @@
-From a5835dfe126bfe6ed0b8197c6578960835bf1fe8 Mon Sep 17 00:00:00 2001
+From 01f08e93a4b5b94d271f5a57baed6473e0511c2c Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Sun, 3 Oct 2021 22:08:50 +0200
 Subject: [PATCH] configure.ac: add py 3.10/11 support
 
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
+Update to include Python 3.14 support.
+
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 4802f35..e0e468f 100644
+index 4802f35..2eb47a6 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -93,7 +93,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary])
@@ -18,7 +22,10 @@ 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.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])
++       [python-3.14-embed], [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.])])
  
+-- 
+2.52.0
+
diff --git a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
deleted file mode 100644
index 530e38ce21..0000000000
--- a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931"
-SRCREV = "7626d0a0707391970080d493ce69638719938da7"
-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"
-
-
-inherit module
-
-EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}"
-
-do_install:append() {
-    install -Dm 644 ${S}/include/uapi/linux/can/isotp.h ${D}${includedir}/linux/can/isotp.h
-}
-
-SKIP_RECIPE[can-isotp] ?= "Not needed with kernel 5.10+"
diff --git a/meta-oe/recipes-extended/valkey/valkey_9.0.1.bb b/meta-oe/recipes-extended/valkey/valkey_9.0.2.bb
index 1f27224772..419efab17c 100644
--- a/meta-oe/recipes-extended/valkey/valkey_9.0.1.bb
+++ b/meta-oe/recipes-extended/valkey/valkey_9.0.2.bb
@@ -15,12 +15,14 @@ SRC_URI = "git://github.com/valkey-io/valkey.git;branch=9.0;protocol=https;tag=$
            file://0001-src-Do-not-reset-FINAL_LIBS.patch \
            file://GNU_SOURCE-7.patch \
            "
-SRCREV = "ab3c953b80289d88991095f53c1235fc2f8b44d6"
+SRCREV = "1ac4cfe4c877a6cb8cb2e28fa7094055ac06f64b"
 
 RPROVIDES:${PN} = "virtual-redis"
 
 inherit pkgconfig update-rc.d systemd useradd
 
+TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}"
+
 FINAL_LIBS:x86:toolchain-clang = "-latomic"
 FINAL_LIBS:riscv32 = "-latomic"
 FINAL_LIBS:mips = "-latomic"
@@ -63,6 +65,7 @@ do_install() {
     fi
 }
 
+
 CONFFILES:${PN} = "${sysconfdir}/valkey/valkey.conf"
 
 INITSCRIPT_NAME = "valkey-server"
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb
index 815a0b2d0a..a149134f5a 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.1.bb
@@ -50,7 +50,13 @@ EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"'
 PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
 "
-PACKAGECONFIG:append:class-target = " mediactrl ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'webkit', '', d)}"
+PACKAGECONFIG:append:class-target = " mediactrl"
+
+# (x11 OR wayland) AND opengl -> webkit
+PACKAGECONFIG:append:class-target = "\
+    ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', \
+    bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webkit', '', d),\
+   '', d)}"
 
 PACKAGECONFIG:class-native ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)}"
 
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb
index cac6474e73..b09d1150bb 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.7.bb
@@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
 
 DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm gdk-pixbuf-native"
 
-BPN = "gtkmm"
-
+GNOMEBN = "gtkmm"
 
 inherit gnomebase features_check
 
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
index 439ab800f8..0e08bed8a1 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native"
 
-BPN = "gtkmm"
+GNOMEBN = "gtkmm"
 
 inherit gnomebase features_check
 
diff --git a/meta-oe/recipes-graphics/drm-framebuffer/drm-framebuffer_git.bb b/meta-oe/recipes-graphics/drm-framebuffer/drm-framebuffer_git.bb
new file mode 100644
index 0000000000..faffca2059
--- /dev/null
+++ b/meta-oe/recipes-graphics/drm-framebuffer/drm-framebuffer_git.bb
@@ -0,0 +1,16 @@
+HOMEPAGE = "https://github.com/embear-engineering/drm-framebuffer"
+SUMMARY = "A simple application which can be used to test a Linux DRM device"
+SECTION = "graphics"
+
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c"
+
+SRC_URI = "git://github.com/embear-engineering/drm-framebuffer;protocol=https;branch=main"
+
+PV = "0.1+git"
+SRCREV = "a560c2b810c8f677aaaaa9e9e8b1d13854718aba"
+
+inherit cmake pkgconfig 
+
+DEPENDS = "libdrm"
+
diff --git a/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-oe/recipes-graphics/fbida/fbida_2.15.bb
index 2736f61004..99beccb274 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_git.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_2.15.bb
@@ -7,20 +7,14 @@ SECTION = "utils"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39"
 
-DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman udev libinput cairo"
+DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman udev libinput cairo libxkbcommon"
 
-PV = "2.14+git"
-SRC_URI = "git://github.com/kraxel/fbida;protocol=https;branch=master \
+GITTAG = "${PN}-${PV}-1"
+SRC_URI = "git://github.com/kraxel/fbida;protocol=https;branch=master;tag=${GITTAG} \
            file://fix-preprocessor.patch \
            file://support-jpeg-turbo.patch \
-           file://fbida-gcc10.patch \
-           file://0001-meson.build-install-fbgs-shell-script.patch \
-           file://0002-meson.build-add-features-options-for-png-gif-tiff-we.patch \
-           file://0003-meson.build-do-not-require-xkbcommon.patch \
-           file://0001-meson.build-make-fbpdf-build-optional.patch \
-           file://0001-fbida-Include-missing-sys-types.h.patch \
 "
-SRCREV = "eb769e3d7f4a073d4c37ed524ebd5017c6a578f5"
+SRCREV = "a0d75fbab3ea01bf5b36f813f0ec0d1bfa2db745"
 
 inherit meson pkgconfig features_check
 
diff --git a/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch b/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch
deleted file mode 100644
index 0fb58f80e1..0000000000
--- a/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 17490e264e627ead81bf5840c8797de968485943 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 3 Jul 2023 11:25:26 -0700
-Subject: [PATCH] fbida: Include missing <sys/types.h>
-
-Fixes build on musl
-../git/gfx.h:43:5: error: unknown type name 'dev_t'; did you mean 'div_t'?
-    dev_t devnum;
-    ^~~~~
-    div_t
-TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/fbida/2.14+gitAUTOINC+eb769e3d7f-r0/recipe-sysroot/usr/include/stdlib.h:64:35: note: 'div_t' declared here
-typedef struct { int quot, rem; } div_t;
-                                  ^
-1 error generated
-
-Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/3]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- gfx.h | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/gfx.h
-+++ b/gfx.h
-@@ -1,5 +1,6 @@
- #include <stdbool.h>
- #include <inttypes.h>
-+#include <sys/types.h>
- 
- #include <pixman.h>
- #include <cairo.h>
diff --git a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch
deleted file mode 100644
index 4d081258be..0000000000
--- a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f9c455e81ad4d870c8ae20b9af8598139231ad26 Mon Sep 17 00:00:00 2001
-From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
-Date: Fri, 9 Sep 2022 09:32:22 +0200
-Subject: [PATCH] meson.build: install fbgs shell script
-
-Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4]
-Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
----
- meson.build | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index cbed982..2129896 100644
---- a/meson.build
-+++ b/meson.build
-@@ -126,6 +126,9 @@ executable('fbpdf',
-            sources             : fbpdf_srcs,
-            dependencies        : fbpdf_deps,
-            install             : true)
-+install_data('fbgs',
-+             install_dir        : get_option('bindir'),
-+             install_mode       : 'rwxr--r--')
- 
- # build fbcon
- fbcon_srcs   = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ]
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch
deleted file mode 100644
index b872e213aa..0000000000
--- a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From c00a155e90a9b22bd6ab5fa5407bb9923ee16ca0 Mon Sep 17 00:00:00 2001
-From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
-Date: Fri, 16 Sep 2022 18:45:58 +0200
-Subject: [PATCH] meson.build: make fbpdf build optional
-
-Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4]
-Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
----
- meson.build       | 22 ++++++++++++----------
- meson_options.txt |  1 +
- 2 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 6b3daf3..289d1ec 100644
---- a/meson.build
-+++ b/meson.build
-@@ -15,11 +15,11 @@ x11resdir    = x11resrun.stdout().strip()
- 
- # pkg-config deps
- pixman_dep   = dependency('pixman-1')
--poppler_dep  = dependency('poppler-glib')
-+poppler_dep  = dependency('poppler-glib', required: get_option('pdf'))
- cairo_dep    = dependency('cairo')
- drm_dep      = dependency('libdrm')
--gbm_dep      = dependency('gbm')
--epoxy_dep    = dependency('epoxy')
-+gbm_dep      = dependency('gbm', required: get_option('pdf'))
-+epoxy_dep    = dependency('epoxy', required: get_option('pdf'))
- exif_dep     = dependency('libexif')
- png_dep      = dependency('libpng', required: get_option('png'))
- tiff_dep     = dependency('libtiff-4', required: get_option('tiff'))
-@@ -132,13 +132,15 @@ fbpdf_deps   = [ drm_dep, gbm_dep, epoxy_dep,
-                  pixman_dep, poppler_dep, cairo_dep,
-                  udev_dep, input_dep ]
- 
--executable('fbpdf',
--           sources             : fbpdf_srcs,
--           dependencies        : fbpdf_deps,
--           install             : true)
--install_data('fbgs',
--             install_dir        : get_option('bindir'),
--             install_mode       : 'rwxr--r--')
-+if get_option('pdf').enabled()
-+    executable('fbpdf',
-+               sources             : fbpdf_srcs,
-+               dependencies        : fbpdf_deps,
-+               install             : true)
-+    install_data('fbgs',
-+                 install_dir        : get_option('bindir'),
-+                 install_mode       : 'rwxr--r--')
-+endif
- 
- # build fbcon
- fbcon_srcs   = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ]
-diff --git a/meson_options.txt b/meson_options.txt
-index ce37188..74699ab 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -3,3 +3,4 @@ option('png', type: 'feature', value : 'enabled')
- option('tiff', type: 'feature', value : 'enabled')
- option('webp', type: 'feature', value : 'disabled')
- option('motif', type: 'feature', value : 'disabled')
-+option('pdf', type: 'feature', value : 'enabled')
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch b/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch
deleted file mode 100644
index 4f54fbfba7..0000000000
--- a/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From cdcde5c1fd106a69118dff98118600911392762f Mon Sep 17 00:00:00 2001
-From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
-Date: Fri, 16 Sep 2022 16:25:38 +0200
-Subject: [PATCH] meson.build: add features options for png, gif, tiff, webp, and motif
-
-Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4]
-Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
----
- meson.build       | 41 +++++++++++++++++++++++++++--------------
- meson_options.txt |  5 +++++
- selections.c      |  4 ++++
- 3 files changed, 36 insertions(+), 14 deletions(-)
- create mode 100644 meson_options.txt
-
-diff --git a/meson.build b/meson.build
-index cd9cc49..b5e3ffc 100644
---- a/meson.build
-+++ b/meson.build
-@@ -23,9 +23,9 @@ drm_dep      = dependency('libdrm')
- gbm_dep      = dependency('gbm')
- epoxy_dep    = dependency('epoxy')
- exif_dep     = dependency('libexif')
--png_dep      = dependency('libpng')
--tiff_dep     = dependency('libtiff-4')
--webp_dep     = dependency('libwebp', required : false)
-+png_dep      = dependency('libpng', required: get_option('png'))
-+tiff_dep     = dependency('libtiff-4', required: get_option('tiff'))
-+webp_dep     = dependency('libwebp', required : get_option('webp'))
- udev_dep     = dependency('libudev')
- input_dep    = dependency('libinput')
- xkb_dep      = dependency('xkbcommon')
-@@ -36,20 +36,20 @@ jpeg_dep     = cc.find_library('jpeg')
- util_dep     = cc.find_library('util')
- math_dep     = cc.find_library('m', required : false)
- pcd_dep      = cc.find_library('pcd', required : false)
--gif_dep      = cc.find_library('gif', required : false)
-+gif_dep      = cc.find_library('gif', required: get_option('gif'))
- 
- # motif + x11 libs
--motif_dep    = cc.find_library('Xm', required : false)
--xpm_dep      = cc.find_library('Xpm', required : false)
--xt_dep       = cc.find_library('Xt', required : false)
--xext_dep     = cc.find_library('Xext', required : false)
--x11_dep      = cc.find_library('X11', required : false)
-+motif_dep    = cc.find_library('Xm', required : get_option('motif'))
-+xpm_dep      = cc.find_library('Xpm', required : get_option('motif'))
-+xt_dep       = cc.find_library('Xt', required : get_option('motif'))
-+xext_dep     = cc.find_library('Xext', required : get_option('motif'))
-+x11_dep      = cc.find_library('X11', required : get_option('motif'))
- 
- # image formats
- read_srcs    = [ 'readers.c', 'rd/read-ppm.c', 'rd/read-bmp.c',
--                 'rd/read-jpeg.c', 'rd/read-png.c', 'rd/read-tiff.c' ]
-+                 'rd/read-jpeg.c' ]
- write_srcs   = [ 'writers.c', 'wr/write-ppm.c', 'wr/write-ps.c',
--                 'wr/write-jpeg.c', 'wr/write-png.c', 'wr/write-tiff.c' ]
-+                 'wr/write-jpeg.c' ]
- image_deps   = [ jpeg_dep, png_dep, tiff_dep,
-                  pcd_dep, gif_dep, webp_dep ]
- 
-@@ -57,11 +57,21 @@ if pcd_dep.found()
-     read_srcs += 'rd/read-pcd.c'
-     config.set('HAVE_LIBPCD', true)
- endif
--if gif_dep.found()
-+if get_option('png').enabled()
-+    read_srcs += 'rd/read-png.c'
-+    write_srcs += 'wr/write-png.c'
-+    config.set('HAVE_LIBPNG', true)
-+endif
-+if get_option('tiff').enabled()
-+    read_srcs += 'rd/read-tiff.c'
-+    write_srcs += 'wr/write-tiff.c'
-+    config.set('HAVE_LIBTIFF', true)
-+endif
-+if get_option('gif').enabled()
-     read_srcs += 'rd/read-gif.c'
-     config.set('HAVE_LIBGIF', true)
- endif
--if webp_dep.found()
-+if get_option('webp').enabled()
-     read_srcs += 'rd/read-webp.c'
-     config.set('HAVE_LIBWEBP', true)
- endif
-@@ -168,7 +181,7 @@ ida_srcs     = [ 'ida.c', 'man.c', 'hex.c', 'x11.c', 'viewer.c',
- ida_deps     = [ pixman_dep, exif_dep, image_deps, math_dep,
-                  motif_dep, xpm_dep, xt_dep, xext_dep, x11_dep ]
- 
--if motif_dep.found()
-+if get_option('motif').enabled()
-     executable('ida',
-                sources             : ida_srcs,
-                dependencies        : ida_deps,
-diff --git a/meson_options.txt b/meson_options.txt
-new file mode 100644
-index 0000000..ce37188
---- /dev/null
-+++ b/meson_options.txt
-@@ -0,0 +1,5 @@
-+option('gif', type: 'feature', value : 'enabled')
-+option('png', type: 'feature', value : 'enabled')
-+option('tiff', type: 'feature', value : 'enabled')
-+option('webp', type: 'feature', value : 'disabled')
-+option('motif', type: 'feature', value : 'disabled')
-diff --git a/selections.c b/selections.c
-index 7b16264..ccdc686 100644
---- a/selections.c
-+++ b/selections.c
-@@ -609,8 +609,12 @@ void ipc_init()
- #ifdef HAVE_LIBGIF
-     targets[ntargets++] = MIME_IMAGE_GIF;
- #endif
-+#ifdef HAVE_LIBPNG
-     targets[ntargets++] = MIME_IMAGE_PNG;
-+#endif
-+#ifdef HAVE_LIBTIFF
-     targets[ntargets++] = MIME_IMAGE_TIFF;
-+#endif
-     targets[ntargets++] = XA_PIXMAP;
-     targets[ntargets++] = XA_STRING;
- 
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch b/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch
deleted file mode 100644
index e769014131..0000000000
--- a/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ec82a194f3454ac203a134c9a99bac6d63095d25 Mon Sep 17 00:00:00 2001
-From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
-Date: Fri, 16 Sep 2022 18:29:03 +0200
-Subject: [PATCH] meson.build: do not require xkbcommon
-
-Upstream-Status: Pending
-Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 341939c..b5dab14 100644
---- a/meson.build
-+++ b/meson.build
-@@ -26,7 +26,7 @@ tiff_dep     = dependency('libtiff-4', required: get_option('tiff'))
- webp_dep     = dependency('libwebp', required : get_option('webp'))
- udev_dep     = dependency('libudev')
- input_dep    = dependency('libinput')
--xkb_dep      = dependency('xkbcommon')
-+xkb_dep      = dependency('xkbcommon', required : false)
- tsm_dep      = dependency('libtsm', required : false)
- 
- # other library deps
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch b/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch
deleted file mode 100644
index 1104289f3c..0000000000
--- a/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Fix build with gcc10
-
-Patch from https://src.fedoraproject.org/rpms/fbida/raw/master/f/fbida.gcc10.patch
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---- fbida-2.14/fbi.c.org        2020-03-15 17:02:17.944189632 +0100
-+++ fbida-2.14/fbi.c    2020-03-15 17:02:21.880223224 +0100
-@@ -100,7 +100,6 @@
- 
- /* graphics interface */
- gfxstate                   *gfx;
--int                        debug;
- 
- /* framebuffer */
- char                       *fbdev = NULL;
---- fbida-2.14/filter.c 2020-03-15 16:44:17.159855150 +0100
-+++ fbida-2.14/filter.c 2020-03-15 16:44:27.017941447 +0100
-@@ -6,8 +6,6 @@
- #include "readers.h"
- #include "filter.h"
- 
--int debug = 0;
--
- /* ----------------------------------------------------------------------- */
- 
- static void
---- fbida-2.14/readers.c.org    2020-03-15 17:01:18.692683597 +0100
-+++ fbida-2.14/readers.c        2020-03-15 16:57:19.141632384 +0100
-@@ -6,6 +6,8 @@
- 
- #include "readers.h"
- 
-+int debug=0;
-+
- /* ----------------------------------------------------------------------- */
- 
- void load_bits_lsb(unsigned char *dst, unsigned char *src, int width,
-
---- fbida-2.14/viewer.c.org     2020-03-15 17:05:02.991595832 +0100
-+++ fbida-2.14/viewer.c 2020-03-15 17:04:55.424531467 +0100
-@@ -40,7 +40,6 @@
- #define PROCESS_LINES    16
- 
--int debug;
- Cursor ptrs[POINTER_COUNT];
- 
- /* ----------------------------------------------------------------------- */
- 
---- fbida-2.14/idaconfig.h.org  2020-03-15 17:07:09.239668196 +0100
-+++ fbida-2.14/idaconfig.h      2020-03-15 17:07:21.248770061 +0100
-@@ -17,7 +17,7 @@
- 
- /* -------------------------------------------------------------------------- */
- 
--char *ida_lists;
-+extern char *ida_lists;
- 
- void ida_init_config(void);
- void ida_read_config(void);
diff --git a/meta-oe/recipes-graphics/feh/feh_3.11.2.bb b/meta-oe/recipes-graphics/feh/feh_3.11.3.bb
index 57c30c3475..c79ad488ba 100644
--- a/meta-oe/recipes-graphics/feh/feh_3.11.2.bb
+++ b/meta-oe/recipes-graphics/feh/feh_3.11.3.bb
@@ -9,7 +9,7 @@ DEPENDS = "\
 "
 
 SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "020f8bce84c709333dcc6ec5fff36313782e0b50662754947c6585d922a7a7b2"
+SRC_URI[sha256sum] = "f2cca3592a433922c0db7a9365fd63e5402c121d932a9327e279c71be6501063"
 
 inherit mime-xdg features_check
 # depends on virtual/libx11
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch b/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch
deleted file mode 100644
index 6d133254ed..0000000000
--- a/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch
+++ /dev/null
@@ -1,385 +0,0 @@
-From e6ccc8a8cf1391010a8220836a732da9fab19c69 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Sep 2023 12:35:12 -0700
-Subject: [PATCH] Fix Translations containing invalid directives %hs
-
-Found with gettext 0.22
-Older versions of msgfmt were more sloppy, thus allowing such mistakes to cause bugs at runtime.
-
-https://bugs.gentoo.org/908868
-https://savannah.gnu.org/bugs/index.php?64333
-https://github.com/fontforge/fontforge/issues/5251
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- fontforgeexe/searchview.c |  2 +-
- po/ca.po                  |  4 ++--
- po/de.po                  |  4 ++--
- po/en_GB.po               |  4 ++--
- po/fr.po                  | 40 +++++++++++++++++++--------------------
- po/hr.po                  |  4 ++--
- po/it.po                  |  8 ++++----
- po/ja.po                  |  4 ++--
- po/ko.po                  |  4 ++--
- po/pl.po                  |  4 ++--
- po/uk.po                  |  4 ++--
- po/vi.po                  |  4 ++--
- 12 files changed, 43 insertions(+), 43 deletions(-)
-
-diff --git a/fontforgeexe/searchview.c b/fontforgeexe/searchview.c
-index 1cb39a221..7e1c109cb 100644
---- a/fontforgeexe/searchview.c
-+++ b/fontforgeexe/searchview.c
-@@ -516,7 +516,7 @@ return( true );
-                    if ( ask_if_difficult==2 && !searcher->isvisible )
- return( false );
-                    if ( gwwv_ask(_("Bad Reference"),(const char **) buttons,1,1,
--                           _("The %1$s in the search dialog contains a reference to %2$.20hs which does not exist in the new font.\nShould I remove the reference?"),
-+                           _("The %1$s in the search dialog contains a reference to %2$.20s which does not exist in the new font.\nShould I remove the reference?"),
-                                i==0?_("Search Pattern"):_("Replace Pattern"),
-                                r->sc->name)==1 )
- return( false );
-diff --git a/po/ca.po b/po/ca.po
-index e2349b6ef..6c920b7c0 100644
---- a/po/ca.po
-+++ b/po/ca.po
-@@ -12347,11 +12347,11 @@ msgstr "Tai"
- 
- #, c-format
- msgid ""
--"The %1$s in the search dialog contains a reference to %2$.20hs which does "
-+"The %1$s in the search dialog contains a reference to %2$.20s which does "
- "not exist in the new font.\n"
- "Should I remove the reference?"
- msgstr ""
--"Al diàleg de cerca, %1$s conté una referència a %2$.20hs\n"
-+"Al diàleg de cerca, %1$s conté una referència a %2$.20s\n"
- "que no existeix en el nou tipus.\n"
- "Voleu eliminar la referència?"
- 
-diff --git a/po/de.po b/po/de.po
-index 41430ffae..8a31aeaa2 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -15765,11 +15765,11 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"The %1$s in the search dialog contains a reference to %2$.20hs which does "
-+"The %1$s in the search dialog contains a reference to %2$.20s which does "
- "not exist in the new font.\n"
- "Should I remove the reference?"
- msgstr ""
--"%1$s im Suchdialog enthält eine Referenz auf %2$.20hs, die in der neuen "
-+"%1$s im Suchdialog enthält eine Referenz auf %2$.20s, die in der neuen "
- "Schrift nicht existiert.\n"
- "Soll der Referenz entfernt werden?"
- 
-diff --git a/po/en_GB.po b/po/en_GB.po
-index 9bd2d62bb..fce64c97d 100644
---- a/po/en_GB.po
-+++ b/po/en_GB.po
-@@ -728,11 +728,11 @@ msgstr "Template Colour"
- 
- #, c-format
- msgid ""
--"The %1$s in the search dialog contains a reference to %2$.20hs which does "
-+"The %1$s in the search dialog contains a reference to %2$.20s which does "
- "not exist in the new font.\n"
- "Should I remove the reference?"
- msgstr ""
--"The %1$s in the search dialogue contains a reference to %2$.20hs which does "
-+"The %1$s in the search dialogue contains a reference to %2$.20s which does "
- "not exist in the new font.\n"
- "Should I remove the reference?"
- 
-diff --git a/po/fr.po b/po/fr.po
-index 26e446b38..d130f89bc 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -291,7 +291,7 @@ msgstr "chaîne %1$.30s pour %2$.30s"
- #. GT: $4 is the changed flag ('*' for the changed items)
- #, c-format
- msgid "%1$.80s at %2$d from %3$.90s%4$s"
--msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
-+msgstr "%1$.80s à %2$d de %3$.90s%4$s"
- 
- #. GT: This is the title for a window showing a bitmap character
- #. GT: It will look something like:
-@@ -302,7 +302,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
- #. GT: $4 is the font name
- #, c-format
- msgid "%1$.80s at %2$d size %3$d from %4$.80s"
--msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs"
-+msgstr "%1$.80s (%2$d) taille %3$d de %4$.80s"
- 
- #, c-format
- msgid "%1$s from lookup subtable %2$.50s"
-@@ -7433,7 +7433,7 @@ msgid ""
- "Reverting the file will lose those changes.\n"
- "Is that what you want?"
- msgstr ""
--"La fonte %1$.40s dans le fichier %2$.40hs a été modifiée.\n"
-+"La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n"
- "Revenir vous fera perdre toutes les modifications.\n"
- "Voulez vous vraiment revenir ?"
- 
-@@ -19077,11 +19077,11 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"The %1$s in the search dialog contains a reference to %2$.20hs which does "
-+"The %1$s in the search dialog contains a reference to %2$.20s which does "
- "not exist in the new font.\n"
- "Should I remove the reference?"
- msgstr ""
--"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20hs qui "
-+"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20s qui "
- "n'existe pas dans la nouvelle fonte.\n"
- "Faut-il supprimer la référence ?"
- 
-@@ -19925,7 +19925,7 @@ msgid ""
- "The fonts %1$.30s and %2$.30s have a different number of glyphs or different "
- "encodings"
- msgstr ""
--"Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des "
-+"Les fontes %1$.30s et %2$.30s n'ont pas le même nombre de glyphes ou des "
- "codages différents"
- 
- #, c-format
-@@ -19933,7 +19933,7 @@ msgid ""
- "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, "
- "one cubic)"
- msgstr ""
--"Les fontes %1$.30s et %2$.30hs utilisent des courbes de Bézier d'ordres "
-+"Les fontes %1$.30s et %2$.30s utilisent des courbes de Bézier d'ordres "
- "différents (quadratique et cubique)"
- 
- msgid "The generated font won't work with ATM"
-@@ -19968,8 +19968,8 @@ msgid ""
- "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours "
- "than in %3$.30s"
- msgstr ""
--"Le glyphe %1$.30s dans la police %2$.30hs a un masque de hints différent que "
--"dans %3$.30hs"
-+"Le glyphe %1$.30s dans la police %2$.30s a un masque de hints différent que "
-+"dans %3$.30s"
- 
- #, c-format
- msgid ""
-@@ -19984,8 +19984,8 @@ msgid ""
- "The glyph %1$.30s in font %2$.30s has a different number of references than "
- "in %3$.30s"
- msgstr ""
--"Le glyphe %1$.30s de la fonte %2$.30hs a un nombre de références différent "
--"dans %3$.30hs"
-+"Le glyphe %1$.30s de la fonte %2$.30s a un nombre de références différent "
-+"dans %3$.30s"
- 
- #, c-format
- msgid ""
-@@ -20457,7 +20457,7 @@ msgstr ""
- #, c-format
- msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s"
- msgstr ""
--"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs"
-+"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60s"
- 
- msgid "The paths that make up this glyph intersect one another"
- msgstr "Les chemins qui composent ce glyphe se coupent les uns les autres"
-@@ -21042,7 +21042,7 @@ msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP"
- 
- #, c-format
- msgid "There is already an anchor point named %1$.40s in %2$.40s."
--msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs."
-+msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40s."
- 
- msgid "There is another glyph in the font with this name"
- msgstr "Il y a un autre glyphe dans la fonte avec ce nom"
-@@ -21441,8 +21441,8 @@ msgid ""
- "been able to find is %1$.20s-%2$.20s-%4$d.\n"
- "Shall I use that or let you search?"
- msgstr ""
--"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20hs-%3$d, mais "
--"ce que j'ai trouvé de mieux c'est %1$.20hs-%2$.20hs-%4$d.\n"
-+"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20s-%3$d, mais "
-+"ce que j'ai trouvé de mieux c'est %1$.20s-%2$.20s-%4$d.\n"
- "Devrais-je utiliser cette valeur ou préférez vous chercher ?"
- 
- msgid ""
-@@ -21770,7 +21770,7 @@ msgid ""
- "with a 0 offset for this combination. Would you like to alter this kerning "
- "class entry (or create a kerning pair for just these two glyphs)?"
- msgstr ""
--"Cette paire de crénage (%.20s et %.20hs) est dans une classe de crénage\n"
-+"Cette paire de crénage (%.20s et %.20s) est dans une classe de crénage\n"
- "avec un déplacement de 0 pour cette combinaison. Voulez-vous modifier cette "
- "partie\n"
- "de la classe de crénage (ou créer une nouvelle paire rien que pour ces 2 "
-@@ -24551,8 +24551,8 @@ msgid ""
- "referred to.\n"
- "It will not be copied."
- msgstr ""
--"Vous essayer de coller une référence vers %1$s dans %2$hs.\n"
--"Mais %1$hs n'existe pas dans cette fonte, et FontForge ne trouve pas le "
-+"Vous essayer de coller une référence vers %1$s dans %2$s.\n"
-+"Mais %1$s n'existe pas dans cette fonte, et FontForge ne trouve pas le "
- "glyphe auquel il se référait.\n"
- "Le glyphe ne sera pas copié."
- 
-@@ -24562,8 +24562,8 @@ msgid ""
- "But %1$s does not exist in this font.\n"
- "Would you like to copy the original splines (or delete the reference)?"
- msgstr ""
--"Vous essayer de coller une référence vers %1$s dans %2$hs.\n"
--"Mais %1$hs n'existe pas dans cette fonte.\n"
-+"Vous essayer de coller une référence vers %1$s dans %2$s.\n"
-+"Mais %1$s n'existe pas dans cette fonte.\n"
- "Voulez vous copier le contour d'origine (ou supprimer la référence)?"
- 
- msgid ""
-diff --git a/po/hr.po b/po/hr.po
-index d261d4ca7..ac41b9250 100644
---- a/po/hr.po
-+++ b/po/hr.po
-@@ -20156,11 +20156,11 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"The %1$s in the search dialog contains a reference to %2$.20hs which does "
-+"The %1$s in the search dialog contains a reference to %2$.20s which does "
- "not exist in the new font.\n"
- "Should I remove the reference?"
- msgstr ""
--"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20hs koja ne "
-+"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20s koja ne "
- "postoji u fontu.\n"
- "Želiš li dozvoliti uklanjanje reference?"
- 
-diff --git a/po/it.po b/po/it.po
-index e13711485..d0c3ea987 100644
---- a/po/it.po
-+++ b/po/it.po
-@@ -2303,7 +2303,7 @@ msgid ""
- "Reverting the file will lose those changes.\n"
- "Is that what you want?"
- msgstr ""
--"Il font %1$.40s nel file %2$.40hs è stato modificato.\n"
-+"Il font %1$.40s nel file %2$.40s è stato modificato.\n"
- "Ripristinando il file perderai tutte le modifiche.\n"
- "È quello che vuoi fare?"
- 
-@@ -5835,7 +5835,7 @@ msgid ""
- "The glyph %1$.30s has a different number of contours in font %2$.30s than in "
- "%3$.30s"
- msgstr ""
--"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30hs rispetto "
-+"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30s rispetto "
- "a %3$.30s"
- 
- #, c-format
-@@ -6235,8 +6235,8 @@ msgid ""
- "been able to find is %1$.20s-%2$.20s-%4$d.\n"
- "Shall I use that or let you search?"
- msgstr ""
--"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20hs-%3$d, ma "
--"il migliore che io abbia trovato è %1$.20hs-%2$.20hs-%4$d.\n"
-+"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20s-%3$d, ma "
-+"il migliore che io abbia trovato è %1$.20s-%2$.20s-%4$d.\n"
- "Devo usare questo valore o preferisci cercare tu stesso?"
- 
- msgid ""
-diff --git a/po/ja.po b/po/ja.po
-index ed9f5a645..206ae82d1 100644
---- a/po/ja.po
-+++ b/po/ja.po
-@@ -11458,11 +11458,11 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"The %1$s in the search dialog contains a reference to %2$.20hs which does "
-+"The %1$s in the search dialog contains a reference to %2$.20s which does "
- "not exist in the new font.\n"
- "Should I remove the reference?"
- msgstr ""
--"%1$s には, 新しいフォントには含まれないグリフ %2$.20hs への参照が含まれていま"
-+"%1$s には, 新しいフォントには含まれないグリフ %2$.20s への参照が含まれていま"
- "す.\n"
- "参照を削除しますか?"
- 
-diff --git a/po/ko.po b/po/ko.po
-index 971b4db03..4d5c8d40d 100644
---- a/po/ko.po
-+++ b/po/ko.po
-@@ -20920,11 +20920,11 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"The %1$s in the search dialog contains a reference to %2$.20hs which does "
-+"The %1$s in the search dialog contains a reference to %2$.20s which does "
- "not exist in the new font.\n"
- "Should I remove the reference?"
- msgstr ""
--"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20hs에 대한 참조가 포함되어 있"
-+"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20s에 대한 참조가 포함되어 있"
- "다.\n"
- "참조를 제거해야 하는가?"
- 
-diff --git a/po/pl.po b/po/pl.po
-index 2bbbf00be..c1fd5a454 100644
---- a/po/pl.po
-+++ b/po/pl.po
-@@ -19552,11 +19552,11 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"The %1$s in the search dialog contains a reference to %2$.20hs which does "
-+"The %1$s in the search dialog contains a reference to %2$.20s which does "
- "not exist in the new font.\n"
- "Should I remove the reference?"
- msgstr ""
--"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20hs, który nie "
-+"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20s, który nie "
- "istnieje w nowym foncie.\n"
- "Czy usunąć to odwołanie?"
- 
-diff --git a/po/uk.po b/po/uk.po
-index e3768acc3..3302a1005 100644
---- a/po/uk.po
-+++ b/po/uk.po
-@@ -19860,11 +19860,11 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"The %1$s in the search dialog contains a reference to %2$.20hs which does "
-+"The %1$s in the search dialog contains a reference to %2$.20s which does "
- "not exist in the new font.\n"
- "Should I remove the reference?"
- msgstr ""
--"%1$s у діалоговому вікні пошуку містить посилання на %2$.20hs, якого не "
-+"%1$s у діалоговому вікні пошуку містить посилання на %2$.20s, якого не "
- "існує у новому шрифті.\n"
- "Вилучити це посилання?"
- 
-diff --git a/po/vi.po b/po/vi.po
-index 6aee8bb3f..f5eb739e6 100644
---- a/po/vi.po
-+++ b/po/vi.po
-@@ -17109,11 +17109,11 @@ msgstr ""
- 
- #, c-format
- msgid ""
--"The %1$s in the search dialog contains a reference to %2$.20hs which does "
-+"The %1$s in the search dialog contains a reference to %2$.20s which does "
- "not exist in the new font.\n"
- "Should I remove the reference?"
- msgstr ""
--"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20hs mà không tồn "
-+"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20s mà không tồn "
- "tại trong phông mới.\n"
- "Bạn có muốn gỡ bỏ tham chiếu này không?"
- 
--- 
-2.42.0
-
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
deleted file mode 100644
index 40f85e9f33..0000000000
--- a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2024-25081_CVE-2024-25082.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-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/CVE-2025-15269.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15269.patch
new file mode 100644
index 0000000000..a3e26d407a
--- /dev/null
+++ b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15269.patch
@@ -0,0 +1,36 @@
+From 6a23476bc5eea880f3f24496710a6133c92a198b Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Sat, 10 Jan 2026 20:06:53 +0100
+Subject: [PATCH] Fix CVE-2025-15269: Use-after-free in SFD ligature parsing
+ (#5722)
+
+From: Ahmet Furkan Kavraz <55850855+ahmetfurkankavraz@users.noreply.github.com>
+
+Prevent circular linked list in LigaCreateFromOldStyleMultiple by clearing
+the next pointer after shallow copy. The shallow copy propagates liga's
+modified next pointer from previous iterations, creating a cycle that
+causes double-free when the list is traversed and freed.
+
+Fixes: CVE-2025-15269 | ZDI-25-1195 | ZDI-CAN-28564
+
+Co-authored-by: Ahmet Furkan Kavraz <kavraz@amazon.com>
+
+CVE: CVE-2025-15269
+Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/6aea6db5da332d8ac94e3501bb83c1b21f52074d]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ fontforge/sfd.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/fontforge/sfd.c b/fontforge/sfd.c
+index e19d3a30f..be4220515 100644
+--- a/fontforge/sfd.c
++++ b/fontforge/sfd.c
+@@ -4647,6 +4647,7 @@ static PST1 *LigaCreateFromOldStyleMultiple(PST1 *liga) {
+     while ( (pt = strrchr(liga->pst.u.lig.components,';'))!=NULL ) {
+        new = chunkalloc(sizeof( PST1 ));
+        *new = *liga;
++       new->pst.next = NULL;
+        new->pst.u.lig.components = copy(pt+1);
+        last->pst.next = (PST *) new;
+        last = new;
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15270.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15270.patch
new file mode 100644
index 0000000000..2ff0fd0b08
--- /dev/null
+++ b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15270.patch
@@ -0,0 +1,45 @@
+From 99067ccd695619686646905e637993f0654abb41 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Sat, 31 Jan 2026 21:23:41 +0100
+Subject: [PATCH] Fix CVE-2025-15270: Heap buffer overflow in SFD kern class
+ parsing (#5743)
+
+From: Ahmet Furkan Kavraz <55850855+ahmetfurkankavraz@users.noreply.github.com>
+
+Fixes: CVE-2025-15270 | ZDI-25-1194 | ZDI-CAN-28563
+
+Co-authored-by: Ahmet Furkan Kavraz <kavraz@amazon.com>
+
+CVE: CVE-2025-15270
+Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/d01333a5bfa2ac4ed698c24b323d02107deacad7]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ fontforge/sfd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/fontforge/sfd.c b/fontforge/sfd.c
+index be4220515..d550f02fb 100644
+--- a/fontforge/sfd.c
++++ b/fontforge/sfd.c
+@@ -8147,6 +8147,10 @@ bool SFD_GetFontMetaData( FILE *sfd,
+        for ( i=classstart; i<kc->first_cnt; ++i ) {
+          if (kernclassversion < 3) {
+            getint(sfd,&temp);
++           if (temp < 0) {
++             LogError(_("Corrupted SFD file: Invalid kern class name length %d. Aborting load."), temp);
++             return false;
++           }
+            kc->firsts[i] = malloc(temp+1); kc->firsts[i][temp] = '\0';
+            nlgetc(sfd);        /* skip space */
+            fread(kc->firsts[i],1,temp,sfd);
+@@ -8164,6 +8168,10 @@ bool SFD_GetFontMetaData( FILE *sfd,
+        for ( i=1; i<kc->second_cnt; ++i ) {
+          if (kernclassversion < 3) {
+            getint(sfd,&temp);
++           if (temp < 0) {
++             LogError(_("Corrupted SFD file: Invalid kern class name length %d. Aborting load."), temp);
++             return false;
++           }
+            kc->seconds[i] = malloc(temp+1); kc->seconds[i][temp] = '\0';
+            nlgetc(sfd);        /* skip space */
+            fread(kc->seconds[i],1,temp,sfd);
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15275.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15275.patch
new file mode 100644
index 0000000000..d3d00fd9ac
--- /dev/null
+++ b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15275.patch
@@ -0,0 +1,34 @@
+From 8aed4d992db246a537d07862f31dd04698c3f7e2 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Fri, 9 Jan 2026 16:58:23 +0100
+Subject: [PATCH] Fix CVE-2025-15275: Heap buffer overflow in SFD image parsing
+ (#5721)
+
+From: Ahmet Furkan Kavraz <55850855+ahmetfurkankavraz@users.noreply.github.com>
+
+Fixes: CVE-2025-15275 | ZDI-25-1189 | ZDI-CAN-28543
+
+Co-authored-by: Ahmet Furkan Kavraz <kavraz@amazon.com>
+
+CVE: CVE-2025-15275
+Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/7195402701ace7783753ef9424153eff48c9af44]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ fontforge/sfd.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/fontforge/sfd.c b/fontforge/sfd.c
+index 149941148..e19d3a30f 100644
+--- a/fontforge/sfd.c
++++ b/fontforge/sfd.c
+@@ -3585,6 +3585,10 @@ static ImageList *SFDGetImage(FILE *sfd) {
+     getint(sfd,&image_type);
+     getint(sfd,&bpl);
+     getint(sfd,&clutlen);
++    if ( clutlen < 0 || clutlen > 256 ) {
++        LogError(_("Invalid clut length %d in sfd file, must be between 0 and 256"), clutlen);
++        return NULL;
++    }
+     gethex(sfd,&trans);
+     image = GImageCreate(image_type,width,height);
+     base = image->list_len==0?image->u.image:image->u.images[0];
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-1.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-1.patch
new file mode 100644
index 0000000000..17f33f41ff
--- /dev/null
+++ b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-1.patch
@@ -0,0 +1,42 @@
+From ce71f0cdce556f56c5207a33a1be3830a73cc04f Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Thu, 8 Jan 2026 15:47:43 +0100
+Subject: [PATCH] Fix CVE-2025-15279: Heap buffer overflow in BMP RLE
+ decompression (#5720)
+
+From: Ahmet Furkan Kavraz <55850855+ahmetfurkankavraz@users.noreply.github.com>
+
+CVSS: 7.8 (High)
+ZDI-CAN-27517
+Co-authored-by: Ahmet Furkan Kavraz <kavraz@amazon.com>
+
+CVE: CVE-2025-15279
+Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/7d67700cf8888e0bb37b453ad54ed932c8587073]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ gutils/gimagereadbmp.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/gutils/gimagereadbmp.c b/gutils/gimagereadbmp.c
+index 5a137e28a..133336787 100644
+--- a/gutils/gimagereadbmp.c
++++ b/gutils/gimagereadbmp.c
+@@ -181,12 +181,18 @@ static int readpixels(FILE *file,struct bmpheader *head) {
+        int ii = 0;
+        while ( ii<head->height*head->width ) {
+            int cnt = getc(file);
++           if (cnt < 0 || ii + cnt > head->height * head->width) {
++               return 0;
++           }
+            if ( cnt!=0 ) {
+                int ch = getc(file);
+                while ( --cnt>=0 )
+                    head->byte_pixels[ii++] = ch;
+            } else {
+                cnt = getc(file);
++               if (cnt < 0 || ii + cnt > head->height * head->width) {
++                   return 0;
++               }
+                if ( cnt>= 3 ) {
+                    int odd = cnt&1;
+                    while ( --cnt>=0 )
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-2.patch b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-2.patch
new file mode 100644
index 0000000000..840a37a8a9
--- /dev/null
+++ b/meta-oe/recipes-graphics/fontforge/fontforge/CVE-2025-15279-2.patch
@@ -0,0 +1,35 @@
+From 4cd078071e2487f052ec997ee13bb910d796587b Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Mon, 12 Jan 2026 22:45:16 +0100
+Subject: [PATCH] Fix CVE-2025-15279: Move bounds check inside cnt >= 3 block
+ (#5723)
+
+From: Ahmet Furkan Kavraz <55850855+ahmetfurkankavraz@users.noreply.github.com>
+
+Co-authored-by: Ahmet Furkan Kavraz <kavraz@amazon.com>
+
+CVE: CVE-2025-15279
+Upstream-Status: Backport [https://github.com/fontforge/fontforge/commit/720ea95020c964202928afd2e93b0f5fac11027e]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ gutils/gimagereadbmp.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gutils/gimagereadbmp.c b/gutils/gimagereadbmp.c
+index 133336787..ad365158c 100644
+--- a/gutils/gimagereadbmp.c
++++ b/gutils/gimagereadbmp.c
+@@ -190,10 +190,10 @@ static int readpixels(FILE *file,struct bmpheader *head) {
+                    head->byte_pixels[ii++] = ch;
+            } else {
+                cnt = getc(file);
+-               if (cnt < 0 || ii + cnt > head->height * head->width) {
+-                   return 0;
+-               }
+                if ( cnt>= 3 ) {
++                   if (ii + cnt > head->height * head->width) {
++                       return 0;
++                   }
+                    int odd = cnt&1;
+                    while ( --cnt>=0 )
+                        head->byte_pixels[ii++] = getc(file);
diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20251009.bb
index af77ec913e..8d65f69354 100644
--- a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb
+++ b/meta-oe/recipes-graphics/fontforge/fontforge_20251009.bb
@@ -7,23 +7,29 @@ LIC_FILES_CHKSUM = " \
 "
 
 DEPENDS = "python3 glib-2.0 pango giflib tiff libxml2 jpeg libtool uthash gettext-native libspiro"
-DEPENDS:append:class-target = " libxi"
+DEPENDS:append:class-target = " gtkmm3"
 
 inherit cmake pkgconfig python3native python3targetconfig features_check gettext gtk-icon-cache mime mime-xdg
 
-REQUIRED_DISTRO_FEATURES:append:class-target = " x11"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-# tag 20220308
-SRCREV = "a1dad3e81da03d5d5f3c4c1c1b9b5ca5ebcfcecf"
-SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
+SRCREV = "c41bdb922285f35defd1e1385adfd13bde1ab32a"
+SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https;tag=${PV} \
            file://0001-include-sys-select-on-non-glibc-platforms.patch \
            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 \
-"
+           file://CVE-2025-15279-1.patch \
+           file://CVE-2025-15279-2.patch \
+           file://CVE-2025-15275.patch \
+           file://CVE-2025-15269.patch \
+           file://CVE-2025-15270.patch \
+           "
 
 EXTRA_OECMAKE = "-DENABLE_DOCS=OFF"
+
+# gui requires gtkmm3, which has no native version at the time of writing this comment
+EXTRA_OECMAKE:append:class-native = " -DENABLE_GUI=OFF"
+
 PACKAGECONFIG = "readline"
 PACKAGECONFIG[readline] = "-DENABLE_READLINE=ON,-DENABLE_READLINE=OFF,readline"
 
@@ -31,12 +37,6 @@ CFLAGS += "-fno-strict-aliasing"
 LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
 BUILD_LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
 
-#do_configure:prepend() {
-# uthash sources are expected in uthash/src
-#    mkdir -p ${S}/uthash/src
-#    cp ${STAGING_INCDIR}/ut*.h ${S}/uthash/src
-#}
-
 PACKAGES =+ "${PN}-python"
 
 FILES:${PN} += " \
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 959463e962..e8ad2aad0f 100644
--- a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb
+++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb
@@ -119,9 +119,6 @@ FILES:${PN}-doc = " \
     ${mandir} \
     ${datadir}/fvwm \
 "
-RDEPENDS:${PN} = " \
-    xuser-account \
-"
 RDEPENDS:${PN}-extra += "\
     perl \
     python3-core \
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_14.0.4.bb b/meta-oe/recipes-graphics/graphviz/graphviz_14.1.2.bb
index 3188c8afd5..9a1d9927ce 100644
--- a/meta-oe/recipes-graphics/graphviz/graphviz_14.0.4.bb
+++ b/meta-oe/recipes-graphics/graphviz/graphviz_14.1.2.bb
@@ -23,7 +23,7 @@ SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-re
 SRC_URI:append:class-nativesdk = "\
            file://graphviz-setup.sh \
 "
-SRC_URI[sha256sum] = "a005977de2fec13753f5bde767cf97fdc28ac54bfd6a2737c563748bc4f32317"
+SRC_URI[sha256sum] = "65572cd29317cfb96eac8434fac1d8861c905e9b761bd0442beb2cfcc0211354"
 
 UPSTREAM_CHECK_URI = "https://graphviz.org/download/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-graphics/kmscon/kmscon_9.3.2.bb b/meta-oe/recipes-graphics/kmscon/kmscon_9.3.2.bb
new file mode 100644
index 0000000000..2db5162857
--- /dev/null
+++ b/meta-oe/recipes-graphics/kmscon/kmscon_9.3.2.bb
@@ -0,0 +1,67 @@
+SUMMARY = "Simple terminal emulator based on linux kernel mode setting (KMS)."
+DESCRIPTION = "\
+    Kmscon is a simple terminal emulator based on linux kernel mode setting \
+    (KMS). It is an attempt to replace the in-kernel VT implementation with \
+    a userspace console. \
+"
+HOMEPAGE = "https://github.com/kmscon/kmscon"
+BUGTRACKER = "https://github.com/kmscon/kmscon/issues"
+CVE_PRODUCT = "kmscon"
+
+SECTION = "graphics"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6d4602d249f8a3401040238e98367d9e"
+
+DEPENDS = "\
+    libtsm \
+    libxkbcommon \
+    udev \
+"
+
+SRC_URI = "git://github.com/kmscon/kmscon;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "9ce1dc0dc639e54e243a21d93e13f502a746f0a8"
+
+inherit meson pkgconfig systemd
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
+
+PACKAGECONFIG[font_pango] = "-Dfont_pango=enabled, -Dfont_pango=disabled, pango"
+PACKAGECONFIG[multi_seat] = "-Dmulti_seat=enabled, -Dmulti_seat=disabled, systemd"
+PACKAGECONFIG[opengl] = "-Drenderer_gltex=enabled -Dvideo_drm3d=enabled, -Drenderer_gltex=disabled -Dvideo_drm3d=disabled, libdrm virtual/egl virtual/libgles2 virtual/libgbm"
+PACKAGECONFIG[video_drm2d] = "-Dvideo_drm2d=enabled, -Dvideo_drm2d=disabled, libdrm"
+
+EXTRA_OEMESON = "\
+    -Delogind=disabled \
+    -Dextra_debug=false \
+    -Dfont_unifont=enabled \
+    -Dsession_dummy=enabled \
+    -Dsession_terminal=enabled \
+    -Dtests=false \
+    -Dvideo_fbdev=enabled \
+"
+
+SYSTEMD_SERVICE:${PN} = "kmscon.service"
+FILES:${PN} += "${systemd_system_unitdir}/kmsconvt@.service"
+
+do_install:append() {
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/systemd/system
+        ln -sf ${systemd_system_unitdir}/kmsconvt@.service \
+            ${D}${sysconfdir}/systemd/system/autovt@.service
+    else
+        # kmscon always installs service files.
+        # If systemd and usrmerge are not in DISTRO_FEATURES, packaging errors
+        # occur because service files are installed to /usr/lib/systemd/system/kmscon.service.
+        rm -rf ${D}${libdir}/systemd
+    fi
+
+    if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'true', 'false', d)}; then
+        mv ${D}${sysconfdir}/kmscon/kmscon.conf.example ${D}${sysconfdir}/kmscon/kmscon.conf
+        sed -e "s@#drm@drm@g" \
+            -e "s@#hwaccel@hwaccel@g" \
+            -i ${D}${sysconfdir}/kmscon/kmscon.conf
+    fi
+}
+
+RDEPENDS:${PN} = "xkeyboard-config"
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.58.bb b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.64.bb
index 8bbc23fde4..c83b90f77b 100644
--- a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.58.bb
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.64.bb
@@ -8,10 +8,10 @@ BUGTRACKER = "http://bugzilla.libsdl.org/"
 SECTION = "libs"
 
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=98241180d857fe975e4b60d44d6c01a5"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca6eaff208365238403badb97aa6b3d2"
 
 SRC_URI = "http://www.libsdl.org/release/sdl2-compat-${PV}.tar.gz"
-SRC_URI[sha256sum] = "ae85222c007f7e2acb927c7a47c12726f56478c6f3f35ee0da1ac929f8beb53e"
+SRC_URI[sha256sum] = "b2fa522e7bb08113534904b3dc2d2f7ff7b0c259224d86c12374d5b4a4027930"
 S = "${UNPACKDIR}/sdl2-compat-${PV}"
 
 DEPENDS += "libsdl3"
@@ -20,7 +20,10 @@ PROVIDES = "virtual/libsdl2"
 
 inherit cmake pkgconfig upstream-version-is-even features_check
 
-REQUIRED_DISTRO_FEATURES = "opengl x11"
+REQUIRED_DISTRO_FEATURES = "opengl"
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG[x11] = "-DSDL2COMPAT_X11=ON,-DSDL2COMPAT_X11=OFF,virtual/libx11"
 
 do_install:append() {
         mv ${D}${libdir}/pkgconfig/sdl2-compat.pc ${D}${libdir}/pkgconfig/sdl2.pc
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.6.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.6.bb
deleted file mode 100644
index 7c2f4026f2..0000000000
--- a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.6.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-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 = "d78dd65454f442bfdbc373201165f1ef579484ab"
-
-
-inherit cmake pkgconfig
-
-FILES:${PN} += "${datadir}/licenses"
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.0.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.0.bb
new file mode 100644
index 0000000000..324332eb84
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.0.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Simple DirectMedia Layer image library v2"
+SECTION = "libs"
+
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=df8f4d887d3997f6e9cf81bb7f43dbf7"
+
+DEPENDS = "tiff zlib libpng jpeg libsdl3 libwebp libjxl"
+
+SRC_URI = "git://github.com/libsdl-org/SDL_image.git;protocol=https;branch=release-3.4.x"
+SRCREV = "ad58ecfc27a1bd09e510ceff8bbbdb1094806476"
+
+EXTRA_OECMAKE += "-DSDLIMAGE_JXL=ON"
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[av1] = "-DSDLIMAGE_AVIF=ON,-DSDLIMAGE_AVIF=OFF,libavif"
+
+inherit cmake pkgconfig
+
+FILES:${PN} += "${datadir}/licenses"
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.30.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.0.bb
index bb111050e1..5eb21c5cc7 100644
--- a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.30.bb
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.0.bb
@@ -19,7 +19,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL3-${PV}.tar.gz"
 
 S = "${UNPACKDIR}/SDL3-${PV}"
 
-SRC_URI[sha256sum] = "4c3b09330d866dc52eb65b66259a6684ad387252ca8c57901b3a2b534eb42e3d"
+SRC_URI[sha256sum] = "082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8"
 
 inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even
 
@@ -33,10 +33,8 @@ EXTRA_OECMAKE = " \
         -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 \
 "
@@ -69,7 +67,7 @@ PACKAGECONFIG[pipewire] = "-DSDL_PIPEWIRE_SHARED=ON,-DSDL_PIPEWIRE_SHARED=OFF,pi
 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"
+PACKAGECONFIG[x11]        = "-DSDL_X11=ON,-DSDL_X11=OFF,virtual/libx11 libxext libxrandr libxrender libxcursor xinput libxtst"
 
 CFLAGS:append:class-native = " -DNO_SHARED_MEMORY"
 
diff --git a/meta-oe/recipes-graphics/libtsm/libtsm_4.4.2.bb b/meta-oe/recipes-graphics/libtsm/libtsm_4.4.2.bb
new file mode 100644
index 0000000000..6f060cd0f5
--- /dev/null
+++ b/meta-oe/recipes-graphics/libtsm/libtsm_4.4.2.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Terminal Emulator State Machine"
+DESCRIPTION = "\
+    TSM is a state machine for DEC VT100-VT520 compatible terminal emulators. \
+    It tries to support all common standards while keeping compatibility to \
+    existing emulators like xterm, gnome-terminal, konsole, etc. \
+    TSM itself does not provide any rendering nor window management. It is a \
+    simple plain state machine without any external dependencies. It can be \
+    used to implement terminal emulators, but also to implement other \
+    applications that need to interpret terminal escape sequences. \
+"
+HOMEPAGE = "https://github.com/kmscon/libtsm"
+BUGTRACKER = "https://github.com/kmscon/libtsm/issues"
+CVE_PRODUCT = "libtsm"
+SECTION = "libs"
+
+LICENSE = "MIT & LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "\
+    file://COPYING;md5=69e8256cdc4e949f86fedf94b1b320b4 \
+    file://LICENSE_htable;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+"
+
+DEPENDS = "xkeyboard-config"
+
+SRC_URI = "git://github.com/kmscon/libtsm;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "b052e48cc776be1cdb940be2dcc1603457c01c96"
+
+inherit meson pkgconfig
+
+EXTRA_OEMESON:append = " \
+    -Dextra_debug=false \
+    -Dtests=false \
+    -Dgtktsm=false \
+"
diff --git a/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-oe/recipes-graphics/openbox/obconf_git.bb
index 917492c982..04f10f138b 100644
--- a/meta-oe/recipes-graphics/openbox/obconf_git.bb
+++ b/meta-oe/recipes-graphics/openbox/obconf_git.bb
@@ -10,12 +10,11 @@ DEPENDS = " \
 "
 PV = "2.0.4+git"
 
-SRCREV = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39"
-SRC_URI = " \
-    git://git.openbox.org/dana/obconf;branch=master \
-    file://0001-Fix-function-protype-visibility.patch \
-"
+SRC_URI = "http://deb.debian.org/debian/pool/main/o/obconf/obconf_2.0.4+git20150213.orig.tar.xz \
+           file://0001-Fix-function-protype-visibility.patch"
+SRC_URI[sha256sum] = "2c8837de833a4f2859ddf06e512d7d96d9a7623f90f95d1137779c69e9209feb"
 
+S = "${UNPACKDIR}/${BPN}"
 
 inherit autotools gettext pkgconfig mime mime-xdg features_check
 # depends on openbox, which is X11-only
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2023-39327.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2023-39327.patch
new file mode 100644
index 0000000000..05e504a18e
--- /dev/null
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2023-39327.patch
@@ -0,0 +1,50 @@
+From a3504b2484cf7443c547037511c40f59aff8ae5a Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Mon, 23 Feb 2026 17:22:18 +0100
+Subject: [PATCH] CVE-2023-39327
+
+This patch fixes CVE-2023-39327.
+
+This patch comes from OpenSuse:
+https://build.opensuse.org/projects/openSUSE:Factory/packages/openjpeg2/files/openjpeg2-cve-2023-39327-limit-iterations.patch
+
+Upstream seems to unresponsive to this vulnerability.
+
+Upstream-Status: Inactive-Upstream [inactive, when it comes to CVEs]
+
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/lib/openjp2/t2.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c
+index 4e8cf601..ad39cd74 100644
+--- a/src/lib/openjp2/t2.c
++++ b/src/lib/openjp2/t2.c
+@@ -441,6 +441,8 @@ OPJ_BOOL opj_t2_decode_packets(opj_tcd_t* tcd,
+          * and no l_img_comp->resno_decoded are computed
+          */
+         OPJ_BOOL* first_pass_failed = NULL;
++        OPJ_UINT32 l_packet_count = 0;
++        OPJ_UINT32 l_max_packets = 100000;
+ 
+         if (l_current_pi->poc.prg == OPJ_PROG_UNKNOWN) {
+             /* TODO ADE : add an error */
+@@ -457,6 +459,17 @@ OPJ_BOOL opj_t2_decode_packets(opj_tcd_t* tcd,
+ 
+         while (opj_pi_next(l_current_pi)) {
+             OPJ_BOOL skip_packet = OPJ_FALSE;
++            
++            /* CVE-2023-39327: Check for excessive packet iterations */
++            if (++l_packet_count > l_max_packets) {
++                opj_event_msg(p_manager, EVT_ERROR,
++                              "Excessive packet iterations detected (>%u). Possible malformed stream.\n",
++                              l_max_packets);
++                opj_pi_destroy(l_pi, l_nb_pocs);
++                opj_free(first_pass_failed);
++                return OPJ_FALSE;
++            }
++            
+             JAS_FPRINTF(stderr,
+                         "packet offset=00000166 prg=%d cmptno=%02d rlvlno=%02d prcno=%03d lyrno=%02d\n\n",
+                         l_current_pi->poc.prg1, l_current_pi->compno, l_current_pi->resno,
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb
index 6d7d87f5f1..33dc48b2ea 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb
@@ -7,6 +7,7 @@ DEPENDS = "libpng tiff lcms zlib"
 
 SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \
            file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
+           file://CVE-2023-39327.patch \
            "
 SRCREV = "6c4a29b00211eb0430fa0e5e890f1ce5c80f409f"
 
diff --git a/meta-oe/recipes-graphics/tigervnc/files/0002-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 101adaa82f..924b950c59 100644
--- a/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
+++ b/meta-oe/recipes-graphics/tigervnc/files/0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
@@ -6,16 +6,19 @@ Subject: [PATCH] add missing dynamic library to FLTK_LIBRARIES
 Upstream-Status: Pending
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+Update for 1.16.0
+Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
 ---
  CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80c2762c..eb581600 100644
+index a5981938..dd13d0df 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -315,6 +315,8 @@ if(BUILD_VIEWER)
-   set(CMAKE_REQUIRED_LIBRARIES)
+   endif()
  endif()
  
 +set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lm -ldl -lpng -ljpeg)
@@ -24,5 +27,5 @@ index 80c2762c..eb581600 100644
  trioption(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication")
  if(ENABLE_GNUTLS)
 -- 
-2.25.1
+2.43.0
 
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.16.0.bb
index efc166dfa6..6e8e80f283 100644
--- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb
+++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.16.0.bb
@@ -16,9 +16,9 @@ REQUIRED_DISTRO_FEATURES = "x11 pam"
 # out-of-tree builds.
 B = "${S}"
 
-SRCREV = "8bdf8734ce12c8ed3c232496fc8a4ccdb04636b8"
+SRCREV = "dc50022844dfad0a0e195d54b8499fcf242fff0c"
 
-SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.15-branch;protocol=https \
+SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.16-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 \
@@ -26,10 +26,10 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.15-branch;protocol=ht
 
 # Keep sync with xorg-server in oe-core
 XORG_PN ?= "xorg-server"
-XORG_PV ?= "21.1.18"
+XORG_PV ?= "21.1.21"
 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] = "c878d1930d87725d4a5bf498c24f4be8130d5b2646a9fd0f2994deff90116352"
+SRC_URI[xorg.sha256sum] = "c0cbe5545b3f645bae6024b830d1d1154a956350683a4e52b2fff5b0fa1ab519"
 
 # It is the directory containing the Xorg source for the
 # machine on which you are building TigerVNC.
@@ -85,7 +85,7 @@ do_compile:append () {
 }
 
 do_install:append() {
-    oe_runmake -C ${B}/hw/vnc 'DESTDIR=${D}' install
+    oe_runmake 'TIGERVNC_BUILDDIR=${B}' -C ${B}/hw/vnc 'DESTDIR=${D}' install
 }
 
 FILES:${PN} += " \
@@ -94,7 +94,9 @@ FILES:${PN} += " \
     ${datadir}/metainfo \
 "
 
-SYSTEMD_SERVICE:${PN} = "vncserver@.service"
+#If user want to enable service of vncserver, vncserver@:<display>.service is needed and further steps are listed in unit file itself.
+SYSTEMD_SERVICE:${PN} ?= "vncserver@.service"
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
 
 CVE_STATUS[CVE-2014-8241] = "fixed-version: The vulnerable code is not present in the used version (1.15.0)"
 CVE_STATUS[CVE-2023-6377] = "fixed-version: The vulnerable code is not present in the used xserver version (21.1.18)"
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 b72307519c..e14a85b92c 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
@@ -9,7 +9,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"
+SRC_URI = "https://src.fedoraproject.org/repo/pkgs/sazanami-fonts/sazanami-20040629.tar.bz2/ceef10579a75c92483171f3bd7f77df2/sazanami-20040629.tar.bz2"
 S = "${UNPACKDIR}/sazanami-20040629"
 
 PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho"
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 c7be162b1b..e34770d520 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.en;md5=cc06b20e7a20bdf6c989624405378303 \
                     file://LICENSE_E.mplus;md5=1c4767416f20215f1e61b970f2117db9 \
 "
 
-SRC_URI = "https://osdn.jp/dl/vlgothic/VLGothic-${PV}.tar.xz"
+SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/fonts-vlgothic/${PV}-1ubuntu1/fonts-vlgothic_${PV}.orig.tar.xz"
 
 SRC_URI[sha256sum] = "297a3813675fbea12c5813b55a78091c9a5946515ecbf9fde8b8102e01c579f4"
 
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 67a0dc564c..02f777926e 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
+++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
@@ -1,7 +1,7 @@
 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 \
+SRC_URI = "git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1;tag=${BP} \
            file://0001-use-library-sonames-for-linking.patch \
            file://generate-srcuri.py \
            "
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
index cf1d24f637..52116c8ed7 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc
+++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc
@@ -6,7 +6,7 @@
 RECIPE_UPGRADE_EXTRA_TASKS += "do_refresh_srcuri"
 
 python __anonymous() {
-    if d.getVar("PV") != "1.4.5.0":
+    if d.getVar("PV") != "1.4.5.1":
         bb.warn("-sources.inc out of date, run refresh_srcuri task")
 }
 
@@ -19,6 +19,6 @@ SRC_URI += " \
     git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-validationlayers/src;rev=0a11cf1257471c22b9e7d620ab48057fb2f53cf9 \
     git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/amber/src;rev=9482448393f3f1f75067cc6ba8ad77fda48691c6 \
     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/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-video-samples/src;rev=823364b0c7abdc4f4e39418d3dd9dc11623ef146 \
+    git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-video-samples/src;rev=aaf915a0e08d679d1e8b835c30e6a346ab0c7ad2 \
     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/vulkan-cts_1.4.5.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.5.1.bb
index 34dc10e44d..cd5a66fd9f 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.5.0.bb
+++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.5.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Vulkan CTS"
 
 require khronos-cts.inc
 
-SRCREV_vk-gl-cts = "db74f486c9d0594bc997f8f79521b424708ba8da"
+SRCREV_vk-gl-cts = "7b7c6cda940bec82d1c5a8c39048728d9bd32f39"
 
 require vulkan-cts-sources.inc
 
diff --git a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb
index 485915db35..93c00bda03 100644
--- a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb
+++ b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb
@@ -37,6 +37,8 @@ EXTRA_OECMAKE:class-target = " \
         -DCMAKE_EXE_LINKER_FLAGS="-Wl,--enable-new-dtags" \
 "
 
+FILES:${PN}-dev += "${bindir}/wayland-scanner++"
+
 do_install:append:class-target() {
     sed -i -e 's|${S}||g' ${D}${libdir}/cmake/waylandpp/waylandpp-targets.cmake
     sed -i -e 's|${STAGING_DIR_HOST}||g' ${D}${libdir}/cmake/waylandpp/waylandpp-targets.cmake
diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch b/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch
deleted file mode 100644
index bfda2dfe71..0000000000
--- a/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 088bb4cef2c93bef312b076a8c7a3c798cbf2f19 Mon Sep 17 00:00:00 2001
-From: daicy <daicy@cn.fujitsu.com>
-Date: Tue, 8 Dec 2015 11:45:01 +0900
-Subject: [PATCH] Makefile.am: Error Fix
-
-Do not compile man dir since error always occur.
- | sed: file filenames.sed line 3: unterminated `s' command
- | make[2]: *** [sessreg.1] Error 1
-It is not a good way.But can remove it from SKIP_RECIPE.
-
-Upstream-Status: Pending
-
-Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index cddffd0..94f7048 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,7 +18,7 @@
- #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- #  PERFORMANCE OF THIS SOFTWARE.
- 
--SUBDIRS = man
-+#SUBDIRS = man
- bin_PROGRAMS = sessreg
- 
- AM_CFLAGS = $(CWARNFLAGS) $(SESSREG_CFLAGS)
--- 
-1.8.4.2
-
diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.3.bb b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.4.bb
index 33ab22cde4..4c71130759 100644
--- a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.3.bb
+++ b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.4.bb
@@ -2,10 +2,10 @@ require recipes-graphics/xorg-app/xorg-app-common.inc
 
 SUMMARY = "a simple program for managing utmp/wtmp entries"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185"
-SRC_URI += "file://0001-Makefile.am-Error-Fix.patch"
+LIC_FILES_CHKSUM = "file://COPYING;md5=82cc7e3245e8b11a5259108ba5b7e3dc"
+
 SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "022acd5de8077dddc4f919961f79e102ecd5f3228a333681af5cd0e7344facc2"
+SRC_URI[sha256sum] = "4e85b52f4f65a93449753bfb00ceb5d77f3317e24d07dc23147f2f116c785350"
 
 CFLAGS:append:libc-musl = " -D_WTMPX_FILE=WTMP_FILE -D_PATH_WTMPX=_PATH_WTMP -D_UTMPX_FILE=UTMP_FILE -D_PATH_UTMPX=_PATH_UTMP "
 
diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb
index 073b3f0912..8710ec80dc 100644
--- a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb
+++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb
@@ -19,7 +19,6 @@ DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-
 # These are only needed as part of the stopgap screensaver implementation:
 RDEPENDS:${PN} = " \
     liberation-fonts \
-    xuser-account \
 "
 
 inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check
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 3bbfe4cf9f..2ad41da957 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
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 
 SECTION = "devel"
 
-EXTRA_OEMAKE = "'CC=${CC}'"
+EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS}'"
 
 SRCREV = "468fe4c31e6c62c9bbb328b06ba71eaf7be0b76a"
 
@@ -14,6 +14,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git;protoc
            file://0001-Makefile-Add-LDFLAGS-variable.patch \
 "
 
+TARGET_LDFLAGS:append = " ${DEBUG_PREFIX_MAP}"
+
 BBCLASSEXTEND = "native nativesdk"
 
 
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 f68984b072..44d85550ee 100644
--- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb
+++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb
@@ -1,5 +1,6 @@
 SUMMARY = "minicoredumper provides an alternate core dump facility for Linux \
 to allow minimal and customized crash dumps"
+HOMEPAGE = "https://www.linutronix.de/minicoredumper/"
 LICENSE = " LGPL-2.1-only & BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=71827c617ec7b45a0dd23658347cc1e9 \
                     file://COPYING.BSD;md5=b915ac80d5236d6aa659cb986daf00e5 \
diff --git a/meta-oe/recipes-kernel/tmon/tmon.bb b/meta-oe/recipes-kernel/tmon/tmon.bb
new file mode 100644
index 0000000000..4911f445c5
--- /dev/null
+++ b/meta-oe/recipes-kernel/tmon/tmon.bb
@@ -0,0 +1,40 @@
+SUMMARY = "A Monitoring and Testing Tool for Linux kernel thermal subsystem"
+DESCRIPTION = "TMON is conceived as a tool to help visualize, tune, and \
+test the complex thermal subsystem"
+
+LICENSE = "GPL-2.0-only"
+
+DEPENDS = "virtual/kernel ncurses"
+
+do_configure[depends] += "virtual/kernel:do_shared_workdir"
+
+# This looks in S, so we better make sure there's
+# something in the directory.
+#
+do_populate_lic[depends] += "${PN}:do_configure"
+
+
+EXTRA_OEMAKE = '\
+                CC="${CC}" \
+                -I${STAGING_KERNEL_DIR}/tools/thermal/tmon \
+'
+
+# If we build under STAGING_KERNEL_DIR, source will not be put
+# into the dbg rpm.  STAGING_KERNEL_DIR will exist by the time
+# do_configure() is invoked so we can safely copy from it.
+#
+do_configure:prepend() {
+        mkdir -p ${S}
+        cp -r ${STAGING_KERNEL_DIR}/tools/thermal/tmon/* ${S}
+        # Fix compile error when pkg-config is on the dependency chain:
+        # tmon.h:42:17: error: field 'tv' has incomplete type
+        sed -i '/PKG_CONFIG.*--cflags.*ncurses/d' ${S}/Makefile
+}
+
+do_compile() {
+        oe_runmake STAGING_KERNEL_DIR=${STAGING_KERNEL_DIR}
+}
+
+do_install() {
+        oe_runmake INSTALL_ROOT="${D}" install
+}
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_2.2.0.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.3.0.bb
index c443d9b891..20ffbffd98 100644
--- a/meta-oe/recipes-multimedia/libcdio/libcdio_2.2.0.bb
+++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.3.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.bz2"
 
-SRC_URI[sha256sum] = "6f8fbdf4d189cf63f2a7a1549c516cd720c7b222c7aaadbc924a26e745a48539"
+SRC_URI[sha256sum] = "53e83d284667535a767fd2d31edad1a6701591960459df373a10f1f21e80a7ed"
 
 inherit autotools pkgconfig github-releases
 
@@ -29,3 +29,5 @@ python libcdio_split_packages() {
 }
 
 PACKAGESPLITFUNCS =+ "libcdio_split_packages"
+
+CVE_STATUS[CVE-2024-36600] = "fixed-version: fixed in v2.3.0"
diff --git a/meta-oe/recipes-multimedia/libjxl/libjxl_0.11.1.bb b/meta-oe/recipes-multimedia/libjxl/libjxl_0.11.2.bb
index ad5b5d169b..617d3bc502 100644
--- a/meta-oe/recipes-multimedia/libjxl/libjxl_0.11.1.bb
+++ b/meta-oe/recipes-multimedia/libjxl/libjxl_0.11.2.bb
@@ -8,11 +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;tag=v${PV} \
            file://0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch \
            "
 
-SRCREV = "794a5dcf0d54f9f0b20d288a12e87afb91d20dfc"
+SRCREV = "332feb17d17311c748445f7ee75c4fb55cc38530"
 
 EXTRA_OECMAKE = " \
         -DCMAKE_BUILD_TYPE=Release \
@@ -51,3 +51,5 @@ CFLAGS:append:toolchain-clang:arm = " -fno-integrated-as"
 CXXFLAGS:append:toolchain-clang:arm = " -fno-integrated-as"
 
 FILES:${PN} += "${libdir}/gdk-pixbuf-2.0 ${datadir}"
+
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-multimedia/live555/live555/config.linux-cross b/meta-oe/recipes-multimedia/live555/live555/config.linux-cross
index fe6a28604b..19881e4a46 100644
--- a/meta-oe/recipes-multimedia/live555/live555/config.linux-cross
+++ b/meta-oe/recipes-multimedia/live555/live555/config.linux-cross
@@ -4,7 +4,7 @@ C_COMPILER =		$(CC)
 C_FLAGS =               $(COMPILE_OPTS)
 CPP =                   cpp
 CPLUSPLUS_COMPILER =    $(CXX)
-CPLUSPLUS_FLAGS =       $(COMPILE_OPTS) -Wall -DBSD=1
+CPLUSPLUS_FLAGS =       $(COMPILE_OPTS) -Wall -DBSD=1 -std=c++20
 OBJ =                   o
 LINK =                  $(CXX) -o
 LINK_OPTS =             -L.
diff --git a/meta-oe/recipes-multimedia/live555/live555_20210824.bb b/meta-oe/recipes-multimedia/live555/live555_20260112.bb
index 1622a97fe1..8729d9ca0b 100644
--- a/meta-oe/recipes-multimedia/live555/live555_20210824.bb
+++ b/meta-oe/recipes-multimedia/live555/live555_20260112.bb
@@ -16,7 +16,7 @@ SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz
 # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older
 MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n"
 
-SRC_URI[sha256sum] = "ce95a1c79f6d18e959f9dc129b8529b711c60e76754acc285e60946303b923ec"
+SRC_URI[sha256sum] = "2c54c2e090065849d0ab8cc7b06942f4e66dde17f2a0c80ae20b907d562c937e"
 
 S = "${UNPACKDIR}/live"
 
diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_5.8.1.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_5.9.0.bb
index 63d0db1b67..7e2b0e3d39 100644
--- a/meta-oe/recipes-multimedia/wavpack/wavpack_5.8.1.bb
+++ b/meta-oe/recipes-multimedia/wavpack/wavpack_5.9.0.bb
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=3a6eec695493cff01ff6f7b7888c5631"
 
 DEPENDS = "openssl"
 
-SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https"
-SRCREV = "4827b9889665b937b6ed71b9c6c0123152cd7a02"
+SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https;tag=${PV}"
+SRCREV = "5803634a030e2a11dba602ba057b89cc34486c67"
 
 inherit cmake pkgconfig lib_package
 
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.15.2.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.16.0.bb
index a7cd76e0c7..c81dde000c 100644
--- a/meta-oe/recipes-multimedia/webm/libvpx_1.15.2.bb
+++ b/meta-oe/recipes-multimedia/webm/libvpx_1.16.0.bb
@@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4"
 
-SRCREV = "d168454ecd099805c675d4a98c66f4891373302a"
+SRCREV = "1024874c5919305883187e2953de8fcb4c3d7fa6"
 SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main;tag=v${PV} \
            file://libvpx-configure-support-blank-prefix.patch \
            "
diff --git a/meta-oe/recipes-navigation/geos/geos_3.13.1.bb b/meta-oe/recipes-navigation/geos/geos_3.14.1.bb
index ba01968052..28a620c5bf 100644
--- a/meta-oe/recipes-navigation/geos/geos_3.13.1.bb
+++ b/meta-oe/recipes-navigation/geos/geos_3.14.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] = "df2c50503295f325e7c8d7b783aca8ba4773919cde984193850cf9e361dfd28c"
+SRC_URI[sha256sum] = "3c20919cda9a505db07b5216baa980bacdaa0702da715b43f176fb07eff7e716"
 
 inherit cmake pkgconfig binconfig
 
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.27.3.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.27.5.bb
index 5b2d6d97d2..f7ca367fa4 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.27.3.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.27.5.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "https://gpsd.io/"
 SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
            file://gpsd.init \
            "
-SRC_URI[sha256sum] = "a4d85b67797522ae8611958b5fda0bb67e4921afe26bd53e1d2ff0a4158daccb"
+SRC_URI[sha256sum] = "409873f5048462ef1ac413a51ab35caa8b50b31be62b3347bee1cc2994e7c649"
 
 inherit scons update-rc.d python3-dir python3native systemd update-alternatives pkgconfig
 
diff --git a/meta-oe/recipes-printing/cups/cups-filters_2.0.1.bb b/meta-oe/recipes-printing/cups/cups-filters_2.0.1.bb
index a6eedda5d7..24b916a921 100644
--- a/meta-oe/recipes-printing/cups/cups-filters_2.0.1.bb
+++ b/meta-oe/recipes-printing/cups/cups-filters_2.0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "CUPS backends, filters, and other software"
-HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"
+HOMEPAGE = "https://wiki.linuxfoundation.org/openprinting/cups-filters"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6d5b952b53dbe7752199903d082e5f07"
 
diff --git a/meta-oe/recipes-printing/cups/libcupsfilters/CVE-2025-64503.patch b/meta-oe/recipes-printing/cups/libcupsfilters/CVE-2025-64503.patch
new file mode 100644
index 0000000000..b70586296e
--- /dev/null
+++ b/meta-oe/recipes-printing/cups/libcupsfilters/CVE-2025-64503.patch
@@ -0,0 +1,47 @@
+From da9a7db3b9125c87b11c43b05354ca2eb21ed684 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Mon, 10 Nov 2025 21:10:56 +0100
+Subject: [PATCH] Fix out-of-bounds write in cfFilterPDFToRaster()
+
+From: Till Kamppeter <till.kamppeter@gmail.com>
+
+PDFs with too large page dimensions could cause an integer overflow and then a too small buffer for the pixel line to be allocated.
+
+Fixed this by cropping the page size to the maximum allowed by the standard, 14400x14400pt, 200x200in, 5x5m
+
+https://community.adobe.com/t5/indesign-discussions/maximum-width-of-a-pdf/td-p/9217372
+
+Fixes CVE-2025-64503
+
+CVE: CVE-2025-64503
+Upstream-Status: Backport [https://github.com/OpenPrinting/libcupsfilters/commit/fd01543f372ca3ba1f1c27bd3427110fa0094e3f]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ cupsfilters/pdftoraster.cxx | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/cupsfilters/pdftoraster.cxx b/cupsfilters/pdftoraster.cxx
+index 0235b54..09583df 100644
+--- a/cupsfilters/pdftoraster.cxx
++++ b/cupsfilters/pdftoraster.cxx
+@@ -1606,6 +1606,20 @@ out_page(pdftoraster_doc_t *doc,
+   l = inputPageBox.height();
+   if (l < 0)
+     l = -l;
++
++  //
++  // Maximum allowed page size for PDF is 200x200 inches (~ 5x5 m), or 14400x14400 pt
++  // https://community.adobe.com/t5/indesign-discussions/maximum-width-of-a-pdf/td-p/9217372
++  //
++  if (doc->header.cupsPageSize[0] > 14400) {
++    fprintf(stderr, "ERROR: Page width is %.2fpt, too large, cropping to 14400pt\n", doc->header.cupsPageSize[0]);
++    doc->header.cupsPageSize[0] = 14400;
++  }
++  if (doc->header.cupsPageSize[1] > 14400) {
++    fprintf(stderr, "ERROR: Page height is %.2fpt, too large, cropping to 14400pt\n", doc->header.cupsPageSize[1]);
++    doc->header.cupsPageSize[1] = 14400;
++  }
++
+   if (rotate == 90 || rotate == 270)
+     doc->header.cupsPageSize[0] = l;
+   else
diff --git a/meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb b/meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb
index 51d8c4f18b..311f33e134 100644
--- a/meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb
+++ b/meta-oe/recipes-printing/cups/libcupsfilters_2.1.1.bb
@@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aab2024bd2a475438a154cd1640c9684"
 
 DEPENDS = "cups fontconfig libexif dbus lcms qpdf poppler libpng jpeg tiff"
 
-SRC_URI = " \
-        https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \
-        file://0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch \
-"
+SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \
+           file://0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch \
+           file://CVE-2025-64503.patch \
+           "
 SRC_URI[sha256sum] = "6c303e36cfde05a6c88fb940c62b6a18e7cdbfb91f077733ebc98f104925ce36"
 
 inherit autotools gettext pkgconfig github-releases
diff --git a/meta-oe/recipes-printing/qpdf/qpdf_12.2.0.bb b/meta-oe/recipes-printing/qpdf/qpdf_12.3.2.bb
index 663c60affe..68fb0d4f6b 100644
--- a/meta-oe/recipes-printing/qpdf/qpdf_12.2.0.bb
+++ b/meta-oe/recipes-printing/qpdf/qpdf_12.3.2.bb
@@ -6,7 +6,7 @@ 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;tag=v${PV}"
-SRCREV = "856d32c610334855d30e96d25eb5f9636fb62f08"
+SRCREV = "a898bb3a7289d1d05789d6d3f0d5dd534943a8da"
 
 inherit cmake pkgconfig gettext
 
diff --git a/meta-oe/recipes-security/softhsm/files/0001-avoid-unnecessary-check-for-sqlite3-binary.patch b/meta-oe/recipes-security/softhsm/files/0001-avoid-unnecessary-check-for-sqlite3-binary.patch
deleted file mode 100644
index 7dddcdb78b..0000000000
--- a/meta-oe/recipes-security/softhsm/files/0001-avoid-unnecessary-check-for-sqlite3-binary.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 88d968346184058df18dc69171dcd4fd612c2341 Mon Sep 17 00:00:00 2001
-From: Jan Luebbe <sho@stratum0.net>
-Date: Mon, 30 Jan 2023 12:48:23 +0100
-Subject: [PATCH] avoid unnecessary check for sqlite3 binary
-
-Only the library is used, not the sqlite3 binary. Drop this check to simplify
-cross-compilation (as no native sqlite3 binary is needed).
-
-Upstream-Status: Submitted [https://github.com/opendnssec/SoftHSMv2/pull/694]
----
- m4/acx_sqlite3.m4 | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/m4/acx_sqlite3.m4 b/m4/acx_sqlite3.m4
-index fd942a75e1a6..17c126d161f5 100644
---- a/m4/acx_sqlite3.m4
-+++ b/m4/acx_sqlite3.m4
-@@ -4,19 +4,13 @@ AC_DEFUN([ACX_SQLITE3],[
-                [
-                        SQLITE3_INCLUDES="-I$withval/include"
-                        SQLITE3_LIBDIRS="-L$withval/lib"
--                       AC_PATH_PROGS(SQLITE3, sqlite3, sqlite3, $withval/bin)
-                        
-                ],[
-                        SQLITE3_INCLUDES=""
-                        SQLITE3_LIBDIRS=""
--                       AC_PATH_PROGS(SQLITE3, sqlite3, sqlite3, $PATH)
-                ])
- 
-        
--       if ! test -x "$SQLITE3"; then
--               AC_MSG_ERROR([sqlite3 command not found])
--       fi
--       
-        AC_MSG_CHECKING(what are the SQLite3 includes)
-        AC_MSG_RESULT($SQLITE3_INCLUDES)
- 
--- 
-2.30.2
-
diff --git a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb b/meta-oe/recipes-security/softhsm/softhsm_2.7.0.bb
index 30b4fc71d8..5d75cf0fb4 100644
--- a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb
+++ b/meta-oe/recipes-security/softhsm/softhsm_2.7.0.bb
@@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210"
 DEPENDS = "sqlite3"
 
 SRC_URI = "git://github.com/softhsm/SoftHSMv2.git;protocol=https;branch=main;tag=${PV} \
-           file://0001-avoid-unnecessary-check-for-sqlite3-binary.patch \
            file://0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch \
 "
-SRCREV = "7f99bedae002f0dd04ceeb8d86d59fc4a68a69a0"
+SRCREV = "13e6e86b83748fef74046dbf0c91f664b7acc1c3"
 
 inherit autotools pkgconfig siteinfo
 
diff --git a/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-oe/recipes-support/anthy/anthy_9100h.bb
index 1826e91697..532829a53a 100644
--- a/meta-oe/recipes-support/anthy/anthy_9100h.bb
+++ b/meta-oe/recipes-support/anthy/anthy_9100h.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a \
     file://alt-cannadic/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \
 "
 
-SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \
+SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/anthy/9100h-23ubuntu2/anthy_9100h.orig.tar.gz \
     file://not_build_elc.patch \
     file://2ch_t.patch \
 "
diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.10.bb b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.12.bb
index e611ffb006..2175c8c56d 100644
--- a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.10.bb
+++ b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.12.bb
@@ -19,11 +19,11 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\
 HOMEPAGE = "https://www.hboehm.info/gc/"
 SECTION = "devel"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075"
+LIC_FILES_CHKSUM = "file://README.QUICK;md5=6cff3e88a9b200e8fc98595dc7419dcf"
 
 DEPENDS = "libatomic-ops"
 
-SRCREV = "2955e33aba7467d4777aa985637620f909cc2a14"
+SRCREV = "4fab5386df64466b2b61fc7209bef033cad1e6cc"
 SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https;tag=v${PV}"
 
 
diff --git a/meta-oe/recipes-support/cjose/cjose_0.6.2.4.bb b/meta-oe/recipes-support/cjose/cjose_0.6.2.4.bb
new file mode 100644
index 0000000000..f6a5d15a9b
--- /dev/null
+++ b/meta-oe/recipes-support/cjose/cjose_0.6.2.4.bb
@@ -0,0 +1,14 @@
+SUMMARY = "C library implementing the Javascript Object Signing and Encryption (JOSE)"
+HOMEPAGE = "https://github.com/OpenIDC/cjose"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7249e2f9437adfb8c88d870438042f0e"
+
+SRC_URI = "git://github.com/OpenIDC/cjose;protocol=https;branch=version-0.6.2.x;tag=v${PV}"
+
+PV = "0.6.2.4"
+SRCREV = "8d94c3ad3237ab6a83d2e92fa541542b1b92c023"
+
+DEPENDS = "openssl libcheck jansson"
+
+inherit pkgconfig autotools
+
diff --git a/meta-oe/recipes-support/cmark/cmark_0.31.1.bb b/meta-oe/recipes-support/cmark/cmark_0.31.2.bb
index bbbb36dace..b820d9fd65 100644
--- a/meta-oe/recipes-support/cmark/cmark_0.31.1.bb
+++ b/meta-oe/recipes-support/cmark/cmark_0.31.2.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/commonmark/cmark"
 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 = "bb3678d7a73cb02d35c8876ecd097072636200a8"
+SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https;tag=${PV}"
+SRCREV = "eec0eeba6d31189fd828314576494566d539b1e3"
 
 inherit cmake lib_package
 
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22852.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22852.patch
new file mode 100644
index 0000000000..aa6952fb7d
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22852.patch
@@ -0,0 +1,27 @@
+From e3391e8d160f4b1b43d53b4a7d462a3601c45408 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Sat, 10 Jan 2026 08:36:38 +0100
+Subject: [PATCH] free up old audio formats
+
+CVE: CVE-2026-22852
+Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/cd1ffa112cfbe1b40a9fd57e299a8ea12e23df0d]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ channels/audin/client/audin_main.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c
+index 23561b153..5ffe09127 100644
+--- a/channels/audin/client/audin_main.c
++++ b/channels/audin/client/audin_main.c
+@@ -219,6 +219,10 @@ static UINT audin_process_formats(AUDIN_PLUGIN* audin, AUDIN_CHANNEL_CALLBACK* c
+        }
+ 
+        Stream_Seek_UINT32(s); /* cbSizeFormatsPacket */
++
++       audio_formats_free(callback->formats, callback->formats_count);
++       callback->formats_count = 0;
++
+        callback->formats = audio_formats_new(NumFormats);
+ 
+        if (!callback->formats)
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22854.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22854.patch
new file mode 100644
index 0000000000..791e10ab25
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22854.patch
@@ -0,0 +1,29 @@
+From 94d3791abcdbc1e72827921906d5f9c14a2b0a78 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Mon, 12 Jan 2026 03:44:06 +0100
+Subject: [PATCH] fix constant type
+
+From: akallabeth <akallabeth@posteo.net>
+
+ensure constant is of 64bit integer type
+
+CVE: CVE-2026-22854
+Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/3da319570c8a6be0a79b3306f1ed354c4a943259]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ channels/drive/client/drive_main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c
+index b6cf2ad32..5df7fbe97 100644
+--- a/channels/drive/client/drive_main.c
++++ b/channels/drive/client/drive_main.c
+@@ -295,7 +295,7 @@ static UINT drive_process_irp_read(DRIVE_DEVICE* drive, IRP* irp)
+                Length = 0;
+        }
+ 
+-       if (!Stream_EnsureRemainingCapacity(irp->output, Length + 4))
++       if (!Stream_EnsureRemainingCapacity(irp->output, 4ull + Length))
+        {
+                WLog_ERR(TAG, "Stream_EnsureRemainingCapacity failed!");
+                return ERROR_INTERNAL_ERROR;
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22855.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22855.patch
new file mode 100644
index 0000000000..ec0c3a75ec
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-22855.patch
@@ -0,0 +1,83 @@
+From df1132783e49ebeaa30206a67b70c7a37f3c5650 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Sun, 11 Jan 2026 09:03:57 +0100
+Subject: [PATCH] add length validity checks
+
+From: akallabeth <akallabeth@posteo.net>
+
+in smartcard_unpack_set_attrib_call input length validity checks were
+missing.
+
+CVE: CVE-2026-22855
+Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/57c5647d98c2a026de8b681159cb188ca0439ef8]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ channels/smartcard/client/smartcard_pack.c | 27 +++++++++++++++++-----
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/channels/smartcard/client/smartcard_pack.c b/channels/smartcard/client/smartcard_pack.c
+index f70eb4e5d..c0673e066 100644
+--- a/channels/smartcard/client/smartcard_pack.c
++++ b/channels/smartcard/client/smartcard_pack.c
+@@ -98,8 +98,8 @@ static BOOL smartcard_ndr_pointer_read_(wStream* s, UINT32* index, UINT32* ptr,
+        return TRUE;
+ }
+ 
+-static LONG smartcard_ndr_read(wStream* s, BYTE** data, size_t min, size_t elementSize,
+-                               ndr_ptr_t type)
++static LONG smartcard_ndr_read_ex(wStream* s, BYTE** data, size_t min, size_t elementSize,
++                               ndr_ptr_t type, size_t* plen)
+ {
+        size_t len, offset, len2;
+        void* r;
+@@ -125,6 +125,9 @@ static LONG smartcard_ndr_read(wStream* s, BYTE** data, size_t min, size_t eleme
+                return STATUS_BUFFER_TOO_SMALL;
+        }
+ 
++       if (plen)
++               *plen = 0;
++
+        switch (type)
+        {
+                case NDR_PTR_FULL:
+@@ -181,11 +184,20 @@ static LONG smartcard_ndr_read(wStream* s, BYTE** data, size_t min, size_t eleme
+        if (!r)
+                return SCARD_E_NO_MEMORY;
+        Stream_Read(s, r, len);
+-       smartcard_unpack_read_size_align(NULL, s, len, 4);
++       const LONG pad = smartcard_unpack_read_size_align(NULL, s, len, 4);
++       len += (size_t)pad;
+        *data = r;
++       if (plen)
++               *plen = len;
+        return STATUS_SUCCESS;
+ }
+ 
++static LONG smartcard_ndr_read(wStream* s, BYTE** data, size_t min, size_t elementSize,
++                               ndr_ptr_t type)
++{
++       return smartcard_ndr_read_ex(s, data, min, elementSize, type, NULL);
++}
++
+ static BOOL smartcard_ndr_pointer_write(wStream* s, UINT32* index, DWORD length)
+ {
+        const UINT32 ndrPtr = 0x20000 + (*index) * 4;
+@@ -3427,12 +3439,15 @@ LONG smartcard_unpack_set_attrib_call(SMARTCARD_DEVICE* smartcard, wStream* s, S
+ 
+        if (ndrPtr)
+        {
+-               // TODO: call->cbAttrLen was larger than the pointer value.
+-               // TODO: Maybe need to refine the checks?
+-               status = smartcard_ndr_read(s, &call->pbAttr, 0, 1, NDR_PTR_SIMPLE);
++               size_t len = 0;
++               status = smartcard_ndr_read_ex(s, &call->pbAttr, 0, 1, NDR_PTR_SIMPLE, &len);
+                if (status != SCARD_S_SUCCESS)
+                        return status;
++               if (call->cbAttrLen > len)
++                       call->cbAttrLen = (DWORD)(len);
+        }
++       else
++               call->cbAttrLen = 0;
+        smartcard_trace_set_attrib_call(smartcard, call);
+        return SCARD_S_SUCCESS;
+ }
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23530.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23530.patch
new file mode 100644
index 0000000000..4aac13de93
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23530.patch
@@ -0,0 +1,28 @@
+From 6f61d18e9707cebe9d7d64346c66da780c7094c4 Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Thu, 15 Jan 2026 12:02:02 +0100
+Subject: [PATCH] fix decoder length checks
+
+CVE: CVE-2026-23530
+Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/1bab198a2edd0d0e6e1627d21a433151ea190500]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ libfreerdp/codec/planar.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libfreerdp/codec/planar.c b/libfreerdp/codec/planar.c
+index fe27011e1..1cb2e22bc 100644
+--- a/libfreerdp/codec/planar.c
++++ b/libfreerdp/codec/planar.c
+@@ -616,6 +616,11 @@ BOOL planar_decompress(BITMAP_PLANAR_CONTEXT* planar, const BYTE* pSrcData, UINT
+        WINPR_ASSERT(planar);
+        WINPR_ASSERT(prims);
+ 
++       if (planar->maxWidth < nSrcWidth)
++               return FALSE;
++       if (planar->maxHeight < nSrcHeight)
++               return FALSE;
++
+        if (nDstStep <= 0)
+                nDstStep = nDstWidth * GetBytesPerPixel(DstFormat);
+ 
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23532.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23532.patch
new file mode 100644
index 0000000000..80d4af30b9
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2026-23532.patch
@@ -0,0 +1,49 @@
+From 51929613e6897489736a35eaaf14a3accf143963 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Thu, 15 Jan 2026 12:04:36 +0100
+Subject: [PATCH] properly clamp SurfaceToSurface
+
+From: akallabeth <akallabeth@posteo.net>
+
+CVE: CVE-2026-23532
+Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/c4a7c371342edf0d307cea728f56d3302f0ab38c]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ libfreerdp/gdi/gfx.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/libfreerdp/gdi/gfx.c b/libfreerdp/gdi/gfx.c
+index 3970715e0..812568bbb 100644
+--- a/libfreerdp/gdi/gfx.c
++++ b/libfreerdp/gdi/gfx.c
+@@ -1175,7 +1175,6 @@ static UINT gdi_SurfaceToSurface(RdpgfxClientContext* context,
+        UINT status = ERROR_INTERNAL_ERROR;
+        UINT16 index;
+        BOOL sameSurface;
+-       UINT32 nWidth, nHeight;
+        const RECTANGLE_16* rectSrc;
+        RECTANGLE_16 invalidRect;
+        gdiGfxSurface* surfaceSrc;
+@@ -1199,8 +1198,8 @@ static UINT gdi_SurfaceToSurface(RdpgfxClientContext* context,
+        if (!is_rect_valid(rectSrc, surfaceSrc->width, surfaceSrc->height))
+                goto fail;
+ 
+-       nWidth = rectSrc->right - rectSrc->left;
+-       nHeight = rectSrc->bottom - rectSrc->top;
++       const UINT32 nWidth = rectSrc->right - rectSrc->left;
++       const UINT32 nHeight = rectSrc->bottom - rectSrc->top;
+ 
+        for (index = 0; index < surfaceToSurface->destPtsCount; index++)
+        {
+@@ -1209,8 +1208,10 @@ static UINT gdi_SurfaceToSurface(RdpgfxClientContext* context,
+                if (!is_rect_valid(&rect, surfaceDst->width, surfaceDst->height))
+                        goto fail;
+ 
++               const UINT32 rwidth = rect.right - rect.left;
++               const UINT32 rheight = rect.bottom - rect.top;
+                if (!freerdp_image_copy(surfaceDst->data, surfaceDst->format, surfaceDst->scanline,
+-                                       destPt->x, destPt->y, nWidth, nHeight, surfaceSrc->data,
++                                       destPt->x, destPt->y, rwidth, rheight, surfaceSrc->data,
+                                        surfaceSrc->format, surfaceSrc->scanline, rectSrc->left,
+                                        rectSrc->top, NULL, FREERDP_FLIP_NONE))
+                        goto fail;
diff --git a/meta-oe/recipes-support/freerdp/freerdp/run-ptest b/meta-oe/recipes-support/freerdp/freerdp/run-ptest
new file mode 100644
index 0000000000..423a780eb1
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/run-ptest
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+#The key is the test binary name, and the value is the list of arguments to
+#use with the given binary. Each argument is a testcase to execute.
+
+#These test cases were determined by running the actual test binary
+#which lists all available test cases. Couldn't find a way to just simply
+#run all. Also, BusyBox seems to have no associative array support, so
+#plain variables are used with eval.
+
+TestAsn="TestAsn1Module TestAsn1Encoder TestAsn1Decoder TestAsn1Encode TestAsn1Decode TestAsn1String \
+    TestAsn1Integer TestAsn1Compare TestAsn1BerEnc TestAsn1BerDec TestAsn1DerEnc TestAsn1DerDec"
+TestClient="TestClientRdpFile TestClientChannels TestClientCmdLine"
+TestClipboard="TestClipboardFormats"
+TestCommon="TestCommonAssistance"
+TestCore="TestVersion TestSettings"
+TestCredUI="TestCredUIParseUserName TestCredUIConfirmCredentials TestCredUIPromptForCredentials TestCredUICmdLinePromptForCredentials"
+TestCrt="TestTypes TestFormatSpecifiers TestAlignment TestString TestUnicodeConversion"
+TestCrypto="TestCryptoHash TestCryptoRand TestCryptoCipher TestCryptoProtectData TestCryptoProtectMemory TestCryptoCertEnumCertificatesInStore"
+TestDsParse="TestDsMakeSpn TestDsCrackNames"
+TestEnvironment="TestEnvironmentGetEnvironmentStrings TestEnvironmentSetEnvironmentVariable TestEnvironmentMergeEnvironmentStrings TestEnvironmentGetSetEB"
+TestError="TestErrorSetLastError"
+TestFile="TestFileCreateFile TestFileDeleteFile TestFileReadFile TestSetFileAttributes TestFileWriteFile \
+    TestFilePatternMatch TestFileFindFirstFile TestFileFindFirstFileEx TestFileFindNextFile TestFileGetStdHandle"
+TestFreeRDPCodec="TestFreeRDPRegion TestFreeRDPCodecMppc TestFreeRDPCodecNCrush TestFreeRDPCodecXCrush \
+    TestFreeRDPCodecZGfx TestFreeRDPCodecPlanar TestFreeRDPCodecClear TestFreeRDPCodecInterleaved \
+    TestFreeRDPCodecProgressive TestFreeRDPCodecRemoteFX"
+TestFreeRDPCrypto="TestKnownHosts TestBase64 Test_x509_cert_info"
+TestFreeRDPUtils="TestRingBuffer"
+TestGdi="TestGdiRop3 TestGdiLine TestGdiRegion TestGdiRect TestGdiBitBlt TestGdiCreate TestGdiEllipse TestGdiClip"
+TestInterlocked="TestInterlockedAccess TestInterlockedSList TestInterlockedDList"
+TestIo="TestIoDevice TestIoGetOverlappedResult"
+TestLibrary="TestLibraryLoadLibrary TestLibraryGetProcAddress TestLibraryGetModuleFileName"
+TestLocale="TestLocaleFormatMessage"
+TestMemory="TestMemoryCreateFileMapping"
+TestNt="TestNtCreateFile TestNtCurrentTeb"
+TestPath="TestPathCchAddBackslash TestPathCchRemoveBackslash TestPathCchAddBackslashEx TestPathCchRemoveBackslashEx \
+    TestPathCchAddExtension TestPathCchAppend TestPathCchAppendEx TestPathCchCanonicalize TestPathCchCanonicalizeEx \
+    TestPathAllocCanonicalize TestPathCchCombine TestPathCchCombineEx TestPathAllocCombine TestPathCchFindExtension \
+    TestPathCchRenameExtension TestPathCchRemoveExtension TestPathCchIsRoot TestPathIsUNCEx TestPathCchSkipRoot \
+    TestPathCchStripToRoot TestPathCchStripPrefix TestPathCchRemoveFileSpec TestPathShell TestPathMakePath"
+TestPipe="TestPipeCreatePipe TestPipeCreateNamedPipe TestPipeCreateNamedPipeOverlapped"
+TestPool="TestPoolIO TestPoolSynch TestPoolThread TestPoolTimer TestPoolWork"
+TestPrimitives="TestPrimitivesAdd TestPrimitivesAlphaComp TestPrimitivesAndOr TestPrimitivesColors TestPrimitivesCopy \
+    TestPrimitivesSet TestPrimitivesShift TestPrimitivesSign TestPrimitivesYUV TestPrimitivesYCbCr TestPrimitivesYCoCg"
+TestRdTk="TestRdTkNinePatch"
+TestSecurity="TestSecurityToken"
+TestSmartCard="TestSmartCardListReaders"
+TestSspi="TestQuerySecurityPackageInfo TestEnumerateSecurityPackages TestInitializeSecurityContext TestAcquireCredentialsHandle TestCredSSP TestNTLM"
+TestSynch="TestSynchInit TestSynchEvent TestSynchMutex TestSynchBarrier TestSynchCritical TestSynchSemaphore \
+    TestSynchThread TestSynchMultipleThreads TestSynchTimerQueue TestSynchWaitableTimer TestSynchWaitableTimerAPC TestSynchAPC"
+TestSysInfo="TestGetNativeSystemInfo TestCPUFeatures TestGetComputerName TestSystemTime TestLocalTime"
+TestThread="TestThreadCommandLineToArgv TestThreadCreateProcess TestThreadExitThread"
+TestWinPR="TestIntrinsics TestTypes"
+TestWinPRUtils="TestIni TestVersion TestImage TestBipBuffer TestBacktrace TestQueue TestPrint TestPubSub TestStream \
+    TestBitStream TestArrayList TestLinkedList TestListDictionary TestCmdLine TestWLog TestWLogCallback TestHashTable \
+    TestBufferPool TestStreamPool TestMessageQueue TestMessagePipe"
+TestWnd="TestWndCreateWindowEx TestWndWmCopyData"
+TestWtsApi="TestWtsApiEnumerateProcesses TestWtsApiEnumerateSessions TestWtsApiQuerySessionInformation \
+    TestWtsApiSessionNotification TestWtsApiShutdownSystem TestWtsApiWaitSystemEvent"
+
+run_test(){
+  binary=$1
+  tcs=$(eval "echo \$${binary}")
+  if [ -z "$tcs" -o "$tcs" = ".so" ]; then
+     return
+  fi
+  
+  EXTRA_ARG=""
+  if [ "$binary" = "TestFile" ]; then
+    # This testcase needs an extra argument. TestFileArea is a folder
+    # where some test files are used by this test.
+    EXTRA_ARG="TestFileArea"
+  fi
+  
+  for tc in $tcs; do
+    ./$binary $tc $EXTRA_ARG > ../${binary}_${tc}.out 2>&1 && echo PASS: $binary $tc || echo FAIL: $binary $tc
+  done
+}
+
+cd Testing
+
+for testbin in *; do
+  run_test $testbin
+done
diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.20.0.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.22.0.bb
index ee3fd8d843..c182ee1339 100644
--- a/meta-oe/recipes-support/freerdp/freerdp3_3.20.0.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp3_3.22.0.bb
@@ -8,7 +8,7 @@ RDEPENDS:${PN}-ptest += "cmake coreutils"
 
 inherit pkgconfig cmake ptest
 
-SRCREV = "b8e790a02ede8dd64ff7177fb9027d1844e66bb6"
+SRCREV = "e3ef4c71138f76516299cb3637d2d0c59b2a3737"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https;tag=${PV} \
            file://run-ptest"
 
@@ -38,6 +38,7 @@ EXTRA_OECMAKE = " \
     -DWITH_CLIENT_SDL=OFF \
     -DWITH_SAMPLE=OFF \
     -DWITH_CAIRO=ON \
+    -DWITH_MANPAGES=OFF \
  "
 
 X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile"
@@ -49,7 +50,6 @@ PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gst
 PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups"
 PACKAGECONFIG[fuse] = "-DWITH_FUSE=ON,-DWITH_FUSE=OFF,fuse3,fuse3"
 PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite"
-PACKAGECONFIG[manpages] = "-DWITH_MANPAGES=ON,-DWITH_MANPAGES=OFF, libxslt-native docbook-xsl-stylesheets-native"
 PACKAGECONFIG[ffmpeg] = "-DWITH_DSP_FFMPEG=ON -DWITH_FFMPEG=ON -DWITH_SWSCALE=ON, -DWITH_DSP_FFMPEG=OFF -DWITH_FFMPEG=OFF -DWITH_SWSCALE=OFF,ffmpeg"
 PACKAGECONFIG[krb5] = "-DWITH_KRB5=ON -DWITH_KRB5_NO_NTLM_FALLBACK=OFF,-DWITH_KRB5=OFF,krb5"
 PACKAGECONFIG[openh264] = "-DWITH_OPENH264=ON,-DWITH_OPENH264=OFF,openh264"
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 a78724b925..dff3f6dafe 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
@@ -8,19 +8,27 @@ SECTION = "net"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-inherit pkgconfig cmake gitpkgv
+inherit pkgconfig cmake gitpkgv ptest
+
+RDEPENDS:${PN}-ptest += "coreutils pcsc-lite-lib"
 
 PE = "1"
 PKGV = "${GITPKGVTAG}"
 
 SRCREV = "efa899d3deb8595a29fabb2a2251722f9d7e0d7f"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \
+           file://run-ptest \
            file://winpr-makecert-Build-with-install-RPATH.patch \
            file://0001-Fixed-compilation-warnings.patch \
            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 \
+           file://CVE-2026-22854.patch \
+           file://CVE-2026-22855.patch \
+           file://CVE-2026-22852.patch \
+           file://CVE-2026-23530.patch \
+           file://CVE-2026-23532.patch \
            "
 
 
@@ -37,6 +45,7 @@ EXTRA_OECMAKE += " \
 
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\
+    ${@bb.utils.contains('PTEST_ENABLED', '1', 'test', '', d)} \
     alsa gstreamer cups pcsc server \
 "
 
@@ -51,6 +60,7 @@ PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gst
 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"
+PACKAGECONFIG[test] = "-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF"
 
 PACKAGES =+ "libfreerdp"
 
@@ -59,6 +69,12 @@ FILES:libfreerdp = "${libdir}/lib*${SOLIBS}"
 
 PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*"
 
+do_configure:prepend() {
+    sed -i 's,CMAKE_CURRENT_SOURCE_DIR,"${PTEST_PATH}/test_data",' ${S}/libfreerdp/codec/test/TestFreeRDPCodecProgressive.c
+    sed -i 's,\${CMAKE_CURRENT_SOURCE_DIR},"${PTEST_PATH}/test_data",' ${S}/libfreerdp/crypto/test/CMakeLists.txt
+    sed -i 's,\${CMAKE_CURRENT_SOURCE_DIR},${PTEST_PATH}/test_data,' ${S}/winpr/libwinpr/utils/test/CMakeLists.txt
+}
+
 do_configure:append() {
     sed -i -e 's|${WORKDIR}||g' ${B}/buildflags.h
 }
@@ -70,6 +86,15 @@ do_install:append () {
     rm -rf ${D}${libdir}/freerdp
 }
 
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/test_data
+    cp -r ${B}/Testing ${D}${PTEST_PATH}
+    install -m 0644 ${S}/libfreerdp/codec/test/progressive.bmp ${D}${PTEST_PATH}/test_data/
+    install -m 0644 ${S}/libfreerdp/crypto/test/Test_x509_cert_info.pem ${D}${PTEST_PATH}/test_data/
+    install -m 0644 ${S}/winpr/libwinpr/utils/test/lodepng_32bit.png ${D}${PTEST_PATH}/test_data/
+    install -m 0644 ${S}/winpr/libwinpr/utils/test/lodepng_32bit.bmp ${D}${PTEST_PATH}/test_data/
+}
+
 python populate_packages:prepend () {
     freerdp_root = d.expand('${libdir}/freerdp')
 
@@ -95,6 +120,8 @@ python populate_packages:prepend () {
 }
 
 CVE_STATUS[CVE-2024-32662] = "fixed-version: 2.x is not affected, bug was introduced in 3.0.0"
+CVE_STATUS[CVE-2025-68118] = "not-applicable-platform: Windows-only vulnerability"
+CVE_STATUS[CVE-2026-22853] = "cpe-incorrect: the vulnerability was introduced in 3.9.0"
 
 # avoid http://errors.yoctoproject.org/Errors/Details/852862/
 # fixed in freerdp3 with https://github.com/FreeRDP/FreeRDP/pull/10553
diff --git a/meta-oe/recipes-support/glaze/glaze_7.0.2.bb b/meta-oe/recipes-support/glaze/glaze_7.0.2.bb
new file mode 100644
index 0000000000..9a8fc34a9c
--- /dev/null
+++ b/meta-oe/recipes-support/glaze/glaze_7.0.2.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Extremely fast, in memory, JSON and reflection library for modern C++. BEVE, CBOR, CSV, MessagePack, TOML, EETF "
+HOMEPAGE = "https://stephenberry.github.io/glaze/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4d29875d83fbbf50485c846dbbbed8"
+
+SRC_URI = "git://github.com/stephenberry/glaze;protocol=https;branch=main;tag=v${PV}"
+
+SRCREV = "459946d325c497c274fa59d666bd7cb6e2dd7ad0"
+
+inherit cmake
+
+EXTRA_OECMAKE = "-Dglaze_BUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -Dglaze_ENABLE_FUZZING=OFF -Dglaze_DEVELOPER_MODE=OFF"
+
+FILES:${PN}-dev += "${datadir}/${BPN}/*.cmake"
+
+# Glaze is a header-only C++ library, so the main package will be empty.
+ALLOW_EMPTY:${PN} = "1"
+
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.4.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.5.bb
index 7f6755d51e..b72b57f4df 100644
--- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.4.bb
+++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.5.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main;tag=v${PV}"
-SRCREV = "eddb0241389718a23a42db6af5f0164b6e0139af"
+SRCREV = "192ef10025eb2c4cdd392bc502f0c852196baa48"
 
 EXTRA_OECMAKE = " \
     -DBUILD_SHARED_LIBS=yes \
diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.16.bb b/meta-oe/recipes-support/gperftools/gperftools_2.18.bb
index c0fe586f6d..bc84ba54c6 100644
--- a/meta-oe/recipes-support/gperftools/gperftools_2.16.bb
+++ b/meta-oe/recipes-support/gperftools/gperftools_2.18.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"
 
 DEPENDS:append:libc-musl = " libucontext"
 
-SRCREV = "e1014dead2029b341d06027b4f2b5562d799d5b1"
-SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https"
+SRCREV = "6ed73507dd3970a123e267a50b3ee73392e3b053"
+SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https;tag=gperftools-${PV}"
 
 SRC_URI:append:libc-musl = " \
         file://ppc-musl.patch \
diff --git a/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb b/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb
index 93fe352b99..350be8dc0e 100644
--- a/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb
+++ b/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb
@@ -11,11 +11,13 @@ inherit cmake pkgconfig siteinfo qemu multilib_header multilib_script
 
 DEPENDS += "qemu-native zlib"
 
-SRC_URI = "https://support.hdfgroup.org/releases/hdf5/v2_0/v2_0_0/downloads/${BPN}-${PV}.tar.gz \
+# set downloadfilename to workaround mirroring test issues. When hdf5 is
+# upgraded beyond 2.0.0 this can likely be removed
+SRC_URI = "https://support.hdfgroup.org/releases/hdf5/v2_0/v2_0_0/downloads/${BPN}-${PV}.tar.gz;downloadfilename=${BPN}-${PV}-1.tar.gz \
            file://0002-Remove-suffix-shared-from-shared-library-name.patch \
            file://0001-cmake-remove-build-flags.patch \
            "
-SRC_URI[sha256sum] = "6e45a4213cb11bb5860e1b0a7645688ab55562cc2d55c6ff9bcb0984ed12b22b"
+SRC_URI[sha256sum] = "f4c2edc5668fb846627182708dbe1e16c60c467e63177a75b0b9f12c19d7efed"
 
 FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*"
 
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-12.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-15.bb
index 26c19bf986..952f8c4028 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-12.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-15.bb
@@ -4,8 +4,8 @@ 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"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1f56ade64cf079aff7232f7dbeaea992 \
+                    file://NOTICE;md5=3974428a57d34b981abb7acc416dde8f"
 # 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"
 
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt
            file://imagemagick-ptest.sh \
 "
 
-SRCREV = "bdd4fa561d7bf4c6afd40ee9c89e9f9e82b6e88b"
+SRCREV = "b5fdb90dac0e6d0bf1bbd95704bbd60216a5bc23"
 
 inherit autotools pkgconfig update-alternatives ptest
 export ac_cv_sys_file_offset_bits = "64"
@@ -27,9 +27,12 @@ EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --enable-
 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[heic] = "--with-heic,--without-heic,libheif"
+PACKAGECONFIG[jxl] = "--with-jxl,--without-jxl,libjxl"
 PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
 PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg"
 PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
+PACKAGECONFIG[raw] = "--with-raw,--without-raw,libraw"
 PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg"
 PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools"
 PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
diff --git a/meta-oe/recipes-support/lcms/lcms_2.17.bb b/meta-oe/recipes-support/lcms/lcms_2.18.bb
index 616bb323c0..79e4a6f694 100644
--- a/meta-oe/recipes-support/lcms/lcms_2.17.bb
+++ b/meta-oe/recipes-support/lcms/lcms_2.18.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e9ce323c4b71c943a785db90142b228a"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz"
-SRC_URI[sha256sum] = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074"
+SRC_URI[sha256sum] = "ee67be3566f459362c1ee094fde2c159d33fa0390aa4ed5f5af676f9e5004347"
 
 DEPENDS = "tiff"
 
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30-19.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30-19.bb
index 19900d6cbe..2c063fd995 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30-19.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30-19.bb
@@ -23,7 +23,8 @@ EXTRA_OECONF = "\
 
 PACKAGECONFIG ??= " \
         ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \
-        ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk3 gstreamer', '', d)} \
+        ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gstreamer', '', d)} \
+        ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk3', '', d)} \
 "
 PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib"
 PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio"
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.2.2.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.3.bb
index 09b0928dfa..a23d65bcaa 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod_2.2.2.bb
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.3.bb
@@ -13,7 +13,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-2.x:"
 
 SRC_URI += "file://gpio-manager.init"
 
-SRC_URI[sha256sum] = "7e3bff0209d75fbca2e9fcff1fd5f07cc58b543e129e08b6d4bb1e4a56cfec0d"
+SRC_URI[sha256sum] = "70012b0262e4b90f140431efa841ca89643b02ea6c09f507e23cec664a51b71a"
 
 # Enable all project features for ptest
 PACKAGECONFIG[tests] = " \
diff --git a/meta-oe/recipes-support/liboauth2/liboauth2/0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch b/meta-oe/recipes-support/liboauth2/liboauth2/0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch
new file mode 100644
index 0000000000..75da04a3a0
--- /dev/null
+++ b/meta-oe/recipes-support/liboauth2/liboauth2/0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch
@@ -0,0 +1,33 @@
+From a9f28a44b9b387ef28904e24ca05d28562fdcc45 Mon Sep 17 00:00:00 2001
+From: Frede Hoey Braendstrup <frede@vokalo.io>
+Date: Mon, 26 Jan 2026 11:07:24 +0100
+Subject: [PATCH] fix(clang): curl_easy_setopt takes a long not an int
+
+Signed-off-by: Frede Hoey Braendstrup <frede@vokalo.io>
+Upstream-Status: Backport [https://github.com/OpenIDC/liboauth2/pull/69]
+---
+ src/http.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/http.c b/src/http.c
+index ab7a25a..bc242ed 100644
+--- a/src/http.c
++++ b/src/http.c
+@@ -1024,7 +1024,7 @@ bool oauth2_http_call(oauth2_log_t *log, const char *url, const char *data,
+        curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 5L);
+ 
+        if (ctx)
+-               curl_easy_setopt(curl, CURLOPT_TIMEOUT, ctx->timeout);
++               curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)ctx->timeout);
+ 
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
+                         oauth2_http_curl_buf_write);
+@@ -1092,7 +1092,7 @@ bool oauth2_http_call(oauth2_log_t *log, const char *url, const char *data,
+ 
+        if (data != NULL) {
+                curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data);
+-               curl_easy_setopt(curl, CURLOPT_POST, 1);
++               curl_easy_setopt(curl, CURLOPT_POST, 1L);
+        }
+ 
+        if (ctx)
diff --git a/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb b/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb
new file mode 100644
index 0000000000..31d7aec69d
--- /dev/null
+++ b/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb
@@ -0,0 +1,23 @@
+SUMMARY = "OAuth 2.x and OpenID Connect C library"
+HOMEPAGE = "https://github.com/OpenIDC/liboauth2"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
+
+SRC_URI = " \
+    git://github.com/OpenIDC/liboauth2;protocol=https;branch=master;tag=v${PV} \
+    file://0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch \
+    "
+
+PV = "2.2.0"
+SRCREV = "12571b6d6568c2db7d5f080f60ecb55795c0db19"
+
+DEPENDS = "libpcre2 jansson curl openssl cjose"
+
+inherit pkgconfig autotools-brokensep
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[memcache] = "--with-memcache,--without-memcache,libmemcached"
+PACKAGECONFIG[redis] = "--with-redis,--without-redis,hiredis"
+PACKAGECONFIG[jq] = "--with-jq,--without-jq,jq"
+PACKAGECONFIG[apache] = "--with-apache,--without-apache,apache2"
+
diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.16.bb b/meta-oe/recipes-support/libp11/libp11_0.4.17.bb
index 2bd589be8a..9bd44a2d23 100644
--- a/meta-oe/recipes-support/libp11/libp11_0.4.16.bb
+++ b/meta-oe/recipes-support/libp11/libp11_0.4.17.bb
@@ -9,9 +9,9 @@ LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
 DEPENDS = "libtool openssl"
 
-SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https;tag=${BPN}-${PV}"
 
-SRCREV = "b9c2de288833e38a391ee3cb106f965a40153629"
+SRCREV = "1ad1efdffc90df5dcd69822f3f593898acc1aa78"
 
 UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)"
 
diff --git a/meta-oe/recipes-support/libspdm/libspdm_3.8.1.bb b/meta-oe/recipes-support/libspdm/libspdm_3.8.2.bb
index 431eb8fd40..75c51b92d9 100644
--- a/meta-oe/recipes-support/libspdm/libspdm_3.8.1.bb
+++ b/meta-oe/recipes-support/libspdm/libspdm_3.8.2.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8f9b59a81a88da8e812af43728b72dd7"
 
 DEPENDS = "openssl"
 
-SRC_URI = "git://github.com/DMTF/libspdm.git;branch=release-3.8;protocol=https"
-SRCREV = "d7c8c8247b4d0bd8ed75d9f35a558a4df173a4c7"
+SRC_URI = "git://github.com/DMTF/libspdm.git;branch=release-3.8;protocol=https;tag=${PV}"
+SRCREV = "5cf0acb87b2f36f8d70a89e5da8476d85db59f46"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-support/mcelog/mcelog_208.bb b/meta-oe/recipes-support/mcelog/mcelog_210.bb
index 4a72cd4d66..f009ba98ad 100644
--- a/meta-oe/recipes-support/mcelog/mcelog_208.bb
+++ b/meta-oe/recipes-support/mcelog/mcelog_210.bb
@@ -5,12 +5,12 @@ and should run on all Linux systems that need error handling."
 HOMEPAGE = "https://mcelog.org/"
 SECTION = "System Environment/Base"
 
-SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \
+SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master;tag=v${PV} \
            file://0001-client-Include-string.h-form-mem-function-prototypes.patch \
            file://run-ptest \
            "
 
-SRCREV = "2965a540ac2fbf1e0a992afd17c01747d6fd66aa"
+SRCREV = "357b136f95be23be1dda2c5e220e0430e9b20765"
 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
diff --git a/meta-oe/recipes-support/media-types/media-types_14.0.0.bb b/meta-oe/recipes-support/media-types/media-types_14.0.0.bb
new file mode 100644
index 0000000000..af91a584bd
--- /dev/null
+++ b/meta-oe/recipes-support/media-types/media-types_14.0.0.bb
@@ -0,0 +1,41 @@
+SECTION = "base"
+SUMMARY = "MIME files 'mime.types'"
+LICENSE = "PD"
+LIC_FILES_CHKSUM = "file://debian/copyright;md5=f3ace4a4ff8aa9e374be6080e41a822e"
+DEPENDS = "file"
+RDEPENDS:${PN} = "perl"
+RRECOMMENDS:${PN} = "file"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.tar.xz"
+SRC_URI[sha256sum] = "d5877ac8c1fa3661b3c9ace293ae154c844fad686786f085e954c014f7e73f4d"
+S = "${UNPACKDIR}/work"
+
+inherit update-alternatives
+
+FILES:${PN} += " ${datadir}/bug/media-types"
+
+docdir:append = "/${BPN}"
+
+do_install () {
+    install -d ${D}${sysconfdir}
+    install -d ${D}${datadir}/bug/media-types
+    install -d ${D}${docdir}
+    install -m 644 mime.types         ${D}${sysconfdir}/
+    install -m 644 debian/bug-presubj ${D}${datadir}/bug/media-types/presubj
+    install -m 644 debian/changelog   ${D}${docdir}/changelog
+    install -m 644 debian/copyright   ${D}${docdir}/copyright
+    cd ${D}${docdir}; gzip -9v changelog
+}
+
+ALTERNATIVE_PRIORITY = "90"
+ALTERNATIVE:${PN} = "mime.types"
+ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types"
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+# Debian used to have mime-support package which was media-types and
+# mailcap recipes in one.
+PACKAGES += "mime-support"
+RPROVIDES:${PN} += "mime-support"
+RDEPENDS:mime-support += "${PN} mailcap"
+ALLOW_EMPTY:mime-support = "1"
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
deleted file mode 100644
index 1c0aec13e3..0000000000
--- a/meta-oe/recipes-support/mime-support/mime-support_3.62.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-SECTION = "base"
-SUMMARY = "MIME files 'mime.types' & 'mailcap', and support programs"
-LICENSE = "PD & Bellcore"
-LICENSE:${PN} = "PD"
-# mailcap.man's license is Bellcore
-LICENSE:${PN}-doc = "PD & Bellcore"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=53c851e31d27c3ea8a6217073a5ff01c"
-
-DEPENDS = "file"
-RDEPENDS:${PN} = "perl"
-RRECOMMENDS:${PN} = "file"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}.tar.gz"
-SRC_URI[sha256sum] = "54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a"
-S = "${UNPACKDIR}/${BPN}"
-
-inherit update-alternatives
-
-FILES:${PN} += " ${libdir}/mime"
-
-docdir:append = "/${BPN}"
-
-do_install () {
-    install -d ${D}${sysconfdir}
-    install -d ${D}${libdir}/mime/packages
-    install -d ${D}${docdir}
-    install -d ${D}${sbindir}
-    install -d ${D}${bindir}
-    install -d ${D}${mandir}/man1
-    install -d ${D}${mandir}/man5
-    install -d ${D}${mandir}/man8
-    install -m 644 mime.types         ${D}${sysconfdir}/
-    install -m 644 mailcap            ${D}${libdir}/mime/
-    install -m 644 mailcap.order      ${D}${sysconfdir}/
-    install -m 644 mailcap.man        ${D}${mandir}/man5/mailcap.5
-    install -m 644 mailcap.order.man  ${D}${mandir}/man5/mailcap.order.5
-#    install -m 755 install-mime       ${D}${sbindir}/
-#    install -m 644 install-mime.man   ${D}${mandir}/man8/install-mime.8
-    install -m 755 update-mime        ${D}${sbindir}/
-    install -m 644 update-mime.man    ${D}${mandir}/man8/update-mime.8
-    install -m 755 run-mailcap        ${D}${bindir}/
-    install -m 644 run-mailcap.man    ${D}${mandir}/man1/run-mailcap.1
-#    install -m 644 rfcs/*             ${D}${docdir}/
-    install -m 644 debian/changelog   ${D}${docdir}/changelog.Debian
-    install -m 644 debian/copyright   ${D}${docdir}/copyright
-    install -m 755 debian-view        ${D}${libdir}/mime/
-    install -m 755 playaudio          ${D}${libdir}/mime/
-    install -m 755 playdsp            ${D}${libdir}/mime/
-    install -m 644 mailcap.entries    ${D}${libdir}/mime/packages/mime-support
-    cd ${D}${mandir}; gzip -9fv */*
-    cd ${D}${docdir}; gzip -9v *
-    cd ${D}${docdir}; gunzip copyright.gz
-    cd ${D}${bindir}; ln -s run-mailcap see
-    cd ${D}${bindir}; ln -s run-mailcap edit
-    cd ${D}${bindir}; ln -s run-mailcap compose
-    cd ${D}${bindir}; ln -s run-mailcap print
-    cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz see.1.gz
-    cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz edit.1.gz
-    cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz compose.1.gz
-    cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz
-}
-
-ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE:${PN} = "mime.types"
-ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types"
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 8fad8d5645..1e8b69abf7 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,6 +1,6 @@
-From c34eca043178e60ff04dc88953a71b36ce9dc1b0 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Mon, 26 Nov 2018 09:19:17 +0800
+From 5544371deb70e091e86d07f2755396b8a49729d7 Mon Sep 17 00:00:00 2001
+From: Liu Yiding <liuyd.fnst@fujitsu.com>
+Date: Wed, 28 Jan 2026 09:56:19 +0000
 Subject: [PATCH] RH: use rpm optflags if present
 
 Use the passed in optflags when compiling as an RPM, and keep the
@@ -22,19 +22,22 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 
 Rebase to 0.12.1
 Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
+
+Rebase to 0.12.2
+Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
 ---
  Makefile.inc | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.inc b/Makefile.inc
-index d04a3175..eb339251 100644
+index 7ca96e58..8e168dc8 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -102,7 +102,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
+@@ -108,7 +108,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")
  
--OPTFLAGS       := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
+-OPTFLAGS       := $(OPT) -g $(STACKPROT) --param=ssp-buffer-size=4
 +ifndef RPM_OPT_FLAGS
 +       OPTFLAGS        := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
 +else
@@ -47,13 +50,13 @@ index d04a3175..eb339251 100644
  
  # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development.
  WARN_ONLY       :=
-@@ -121,7 +129,7 @@ CPPFLAGS    := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
+@@ -127,7 +135,7 @@ CPPFLAGS    := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) $(D_CMOCKA_VERSION) \
                    -DABSTRACT_SOCKET=\"$(abstract_socket)\" -DPATHNAME_SOCKET=\"$(pathname_socket)\" \
                    -DWSTRINGOP_TRUNCATION=$(if $(WSTRINGOP_TRUNCATION),1,0) \
                    -MMD -MP
 -CFLAGS         := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
-+CFLAGS          := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) -pipe \
-                   -fexceptions
++CFLAGS         := -std=$(C_STD) $(CFLAGS) $(OPTFLAGS) -pipe \
+                   -fexceptions -fno-strict-aliasing $(if $(ASAN),-fsanitize=address)
  BIN_CFLAGS     := -fPIE -DPIE
  LIB_CFLAGS     := -fPIC
 -- 
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.1.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb
index 20d9b6a1b5..bfb75718f2 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.1.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.12.2.bb
@@ -49,7 +49,7 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=st
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f"
 
-SRCREV = "a1f7f3d5b4972c39e8950c722a04c21a9e030a31"
+SRCREV = "5bd1163d187520b958d78b85c7b239561dc86192"
 
 
 inherit systemd pkgconfig
diff --git a/meta-oe/recipes-support/nano/nano_8.7.bb b/meta-oe/recipes-support/nano/nano_8.7.1.bb
index b6c65a6f31..e62529ff9b 100644
--- a/meta-oe/recipes-support/nano/nano_8.7.bb
+++ b/meta-oe/recipes-support/nano/nano_8.7.1.bb
@@ -13,7 +13,7 @@ RDEPENDS:${PN} = "ncurses-terminfo-base"
 PV_MAJOR = "${@d.getVar('PV').split('.')[0]}"
 
 SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz"
-SRC_URI[sha256sum] = "afd287aa672c48b8e1a93fdb6c6588453d527510d966822b687f2835f0d986e9"
+SRC_URI[sha256sum] = "76f0dcb248f2e2f1251d4ecd20fd30fb400a360a3a37c6c340e0a52c2d1cdedf"
 
 UPSTREAM_CHECK_URI = "${GNU_MIRROR}/nano"
 
diff --git a/meta-oe/recipes-support/opencv/opencv_4.13.0.bb b/meta-oe/recipes-support/opencv/opencv_4.13.0.bb
index 3f4dc23da2..981b06e33b 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.13.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.13.0.bb
@@ -124,7 +124,7 @@ PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON -DINSTALL_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,qcom-fastcv-binaries,"
+PACKAGECONFIG[fastcv] = "-DWITH_FASTCV=ON ,-DWITH_FASTCV=OFF,"
 
 inherit pkgconfig cmake setuptools3-base python3native
 
@@ -171,7 +171,7 @@ python populate_packages:prepend () {
     fastcv_pkgs = ["libopencv-core", "libopencv-fastcv", "libopencv-imgproc"]
     if bb.utils.contains('PACKAGECONFIG', 'fastcv', True, False, d):
         for pkg in fastcv_pkgs:
-            d.appendVar('RDEPENDS:' + pkg, " qcom-fastcv-binaries")
+            d.appendVar('RRECOMMENDS:' + pkg, " qcom-fastcv-binaries")
 }
 
 PACKAGES_DYNAMIC += "^libopencv-.*"
diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.10.bb b/meta-oe/recipes-support/openldap/openldap_2.6.12.bb
index 9ef4a83584..beee1b2738 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.6.10.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.6.12.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
 # basically BSD.  opensource.org has listed this license
 # since August 2019.
 LICENSE = "OLDAP-2.8"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a41b4ed95ab4a20f366a8d82536afe4 \
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=e71f8d80fdc11f3cea5dee6ad13679ce \
                     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] = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516"
+SRC_URI[sha256sum] = "1716ad779e85d743694c3e3b05277fb71b6a5eadca43c7a958aa62683b22208e"
 
 DEPENDS = "util-linux groff-native"
 
diff --git a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.3.bb b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.4.bb
index 5aecc2df89..2a003cbb46 100644
--- a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.3.bb
+++ b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.4.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master;tag=${PV}"
 
-SRCREV = "12f62c67650e1bfb491c18242a75fa61993c4cb8"
+SRCREV = "52c6a3fda367d2badf618a2e0b8f9e59a02f16ff"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-support/raptor2/raptor2/CVE-2024-57822.patch b/meta-oe/recipes-support/raptor2/raptor2/CVE-2024-57822.patch
new file mode 100644
index 0000000000..cb98f4250c
--- /dev/null
+++ b/meta-oe/recipes-support/raptor2/raptor2/CVE-2024-57822.patch
@@ -0,0 +1,44 @@
+From 3b0ded4ae8110b6291d030af927ecd08197e668f Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Thu, 6 Feb 2025 21:12:37 -0800
+Subject: [PATCH] Fix Github issue 70 A) Integer Underflow in
+ raptor_uri_normalize_path()
+
+From: Dave Beckett <dave@dajobe.org>
+
+(raptor_uri_normalize_path): Return empty buffer if path gets to 0
+length
+
+CVE: CVE-2024-57822
+Upstream-Status: Backport [github.com/dajobe/raptor/commit/da7a79976bd0314c23cce55d22495e7d29301c44]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/raptor_rfc2396.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/raptor_rfc2396.c b/src/raptor_rfc2396.c
+index 89183d9..2f0195f 100644
+--- a/src/raptor_rfc2396.c
++++ b/src/raptor_rfc2396.c
+@@ -351,6 +351,10 @@ raptor_uri_normalize_path(unsigned char* path_buffer, size_t path_len)
+           *dest++ = *s++;
+         *dest = '\0';
+         path_len -= len;
++        if(path_len <= 0) {
++          *path_buffer = '\0';
++          return 0;
++        }
+ 
+         if(p && p < prev) {
+           /* We know the previous prev path component and we didn't do
+@@ -390,6 +394,10 @@ raptor_uri_normalize_path(unsigned char* path_buffer, size_t path_len)
+     /* Remove <component>/.. at the end of the path */
+     *prev = '\0';
+     path_len -= (s-prev);
++    if(path_len <= 0) {
++      *path_buffer = '\0';
++      return 0;
++    }
+   }
+ 
+ 
diff --git a/meta-oe/recipes-support/raptor2/raptor2/CVE-2024-57823.patch b/meta-oe/recipes-support/raptor2/raptor2/CVE-2024-57823.patch
new file mode 100644
index 0000000000..79833a55cb
--- /dev/null
+++ b/meta-oe/recipes-support/raptor2/raptor2/CVE-2024-57823.patch
@@ -0,0 +1,31 @@
+From 0b028dd16eb504d3d4dcfa9c72ceb29a9e1f3915 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Fri, 7 Feb 2025 11:38:34 -0800
+Subject: [PATCH] Fix Github issue 70 B) Heap read buffer overflow in ntriples
+ bnode
+
+From: Dave Beckett <dave@dajobe.org>
+
+(raptor_ntriples_parse_term_internal): Only allow looking at the last
+character of a bnode ID only if bnode length >0
+
+CVE: CVE-2024-57823
+Upstream-Status: Backport [https://github.com/dajobe/raptor/commit/ece2c79df43091686a538b8231cf387d84bfa60e]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ src/raptor_ntriples.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/raptor_ntriples.c b/src/raptor_ntriples.c
+index 3276e79..ecc4247 100644
+--- a/src/raptor_ntriples.c
++++ b/src/raptor_ntriples.c
+@@ -212,7 +212,7 @@ raptor_ntriples_parse_term_internal(raptor_world* world,
+             locator->column--;
+             locator->byte--;
+           }
+-          if(term_class == RAPTOR_TERM_CLASS_BNODEID && dest[-1] == '.') {
++          if(term_class == RAPTOR_TERM_CLASS_BNODEID && position > 0 && dest[-1] == '.') {
+             /* If bnode id ended on '.' move back one */
+             dest--;
+ 
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 03e57ce86f..1b77103a8d 100644
--- a/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb
+++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb
@@ -13,6 +13,8 @@ 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 \
+    file://CVE-2024-57822.patch \
+    file://CVE-2024-57823.patch \
 "
 SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680"
 
diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb b/meta-oe/recipes-support/rdfind/rdfind_1.7.0.bb
index 3a15fe6c9a..1472ca94ea 100644
--- a/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb
+++ b/meta-oe/recipes-support/rdfind/rdfind_1.7.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fa22e16ebbe6638b2bd253338fbded9f"
 DEPENDS = "nettle autoconf-archive"
 
 SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz"
-SRC_URI[sha256sum] = "7a406e8ef1886a5869655604618dd98f672f12c6a6be4926d053be65070f3279"
+SRC_URI[sha256sum] = "78c463152e1d9e4fd1bfeb83b9c92df5e7fc4c5f93c7d426fb1f7efa2be4df29"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-support/re2/re2_2024.03.01.bb b/meta-oe/recipes-support/re2/re2_2025.11.05.bb
index a510545bab..91306b3621 100644
--- a/meta-oe/recipes-support/re2/re2_2024.03.01.bb
+++ b/meta-oe/recipes-support/re2/re2_2025.11.05.bb
@@ -3,10 +3,10 @@ HOMEPAGE = "https://github.com/google/re2/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760"
 
-# tag 2024-03-01
-SRCREV = "2d866a3d0753f4f4fce93cccc6c59c4b052d7db4"
+# tag 2025-11-05
+SRCREV = "927f5d53caf8111721e734cf24724686bb745f55"
 
-SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \
+SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https;tag=2025-11-05 \
            ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \
           "
 
diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.36.bb b/meta-oe/recipes-support/remmina/remmina_1.4.43.bb
index b8a31fc012..518c75a1a8 100644
--- a/meta-oe/recipes-support/remmina/remmina_1.4.36.bb
+++ b/meta-oe/recipes-support/remmina/remmina_1.4.43.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://L
 DEPENDS = " \
     glib-2.0-native \
     openssl \
-    freerdp \
+    freerdp3 \
     gtk+3 \
     gdk-pixbuf \
     atk \
@@ -26,13 +26,19 @@ DEPENDS = " \
 DEPENDS:append:libc-musl = " libexecinfo"
 LDFLAGS:append:libc-musl = " -lexecinfo"
 
-SRCREV = "17cf7956b9f925fa788083a2db8d5e669f86bfaf"
-SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master"
+SRCREV = "7be0cf2348d149c6bf5bd882fe91d3bec7d6aebb"
+SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master;tag=v${PV}"
 
 inherit cmake features_check mime mime-xdg gtk-icon-cache pkgconfig
 REQUIRED_DISTRO_FEATURES = "x11"
 
-EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DHAVE_LIBAPPINDICATOR=OFF -DWITH_WEBKIT2GTK=OFF"
+EXTRA_OECMAKE += "\
+    -DWITH_APPINDICATOR=OFF \
+    -DWITH_GETTEXT=OFF \
+    -DWITH_TRANSLATIONS=OFF \
+    -DHAVE_LIBAPPINDICATOR=OFF \
+    -DWITH_WEBKIT2GTK=OFF \
+    -DWITH_FREERDP3=ON"
 
 PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol"
 # Switch on gtk support in avahi recipe if you want to enable avahi support
diff --git a/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch b/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch
deleted file mode 100644
index a6598b5635..0000000000
--- a/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From c33e7707da86a23c4ad7e2451ddb04df419d6412 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 31 Aug 2025 00:13:07 -0700
-Subject: [PATCH] Fix build with boost 1.89
-
-boost 1.89+ does not have boost system lib anymore all needed functions
-are now in header
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- dbus/Makefile.am             | 2 +-
- examples/c++-lib/Makefile.am | 1 -
- server/Makefile.am           | 2 +-
- snapper/Makefile.am          | 2 +-
- testsuite-cmp/Makefile.am    | 1 -
- zypp-plugin/Makefile.am      | 1 -
- 6 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/dbus/Makefile.am b/dbus/Makefile.am
-index 9c0456a..2078d7d 100644
---- a/dbus/Makefile.am
-+++ b/dbus/Makefile.am
-@@ -15,4 +15,4 @@ libdbus_la_SOURCES =                                  \
-        DBusMainLoop.cc         DBusMainLoop.h
- 
- libdbus_la_LIBADD = $(DBUS_LIBS)
--libdbus_la_LDFLAGS = -lboost_system -lboost_thread
-+libdbus_la_LDFLAGS = -lboost_thread
-diff --git a/examples/c++-lib/Makefile.am b/examples/c++-lib/Makefile.am
-index 52c81e5..f55da6f 100644
---- a/examples/c++-lib/Makefile.am
-+++ b/examples/c++-lib/Makefile.am
-@@ -5,7 +5,6 @@
- AM_CPPFLAGS = -I$(top_srcdir)
- 
- LDADD = ../../snapper/libsnapper.la
--AM_LDFLAGS = -lboost_system
- 
- noinst_PROGRAMS = List ListAll Create CmpDirs CreateNumber CreateTimeline
- 
-diff --git a/server/Makefile.am b/server/Makefile.am
-index c03f373..1aef916 100644
---- a/server/Makefile.am
-+++ b/server/Makefile.am
-@@ -16,4 +16,4 @@ snapperd_SOURCES =                                    \
-        FilesTransferTask.cc    FilesTransferTask.h
- 
- snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt
--snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread
-+snapperd_LDFLAGS = -lboost_thread -lpthread
-diff --git a/snapper/Makefile.am b/snapper/Makefile.am
-index b0fe55c..d75599f 100644
---- a/snapper/Makefile.am
-+++ b/snapper/Makefile.am
-@@ -71,7 +71,7 @@ endif
- 
- libsnapper_la_CPPFLAGS = $(XML2_CFLAGS) $(ZLIB_CFLAGS)
- libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@
--libsnapper_la_LIBADD = -lboost_thread -lboost_system $(XML2_LIBS) -lacl $(ZLIB_LIBS)
-+libsnapper_la_LIBADD = -lboost_thread $(XML2_LIBS) -lacl $(ZLIB_LIBS)
- if ENABLE_ROLLBACK
- libsnapper_la_LIBADD += -lmount
- endif
-diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
-index 81104bf..555bc3b 100644
---- a/testsuite-cmp/Makefile.am
-+++ b/testsuite-cmp/Makefile.am
-@@ -3,7 +3,6 @@
- #
- 
- AM_CPPFLAGS = -I$(top_srcdir)
--AM_LDFLAGS = -lboost_system
- 
- LDADD = ../snapper/libsnapper.la
- 
-diff --git a/zypp-plugin/Makefile.am b/zypp-plugin/Makefile.am
-index 9d102e0..e395f59 100644
---- a/zypp-plugin/Makefile.am
-+++ b/zypp-plugin/Makefile.am
-@@ -33,7 +33,6 @@ forwarding_zypp_plugin_SOURCES = \
- forwarding_zypp_plugin_LDADD = \
-        ../snapper/libsnapper.la \
-        ../stomp/libstomp.la \
--       -lboost_system \
-        -lpthread
- 
- TESTS = solvable-matcher.test
diff --git a/meta-oe/recipes-support/snapper/snapper_0.12.2.bb b/meta-oe/recipes-support/snapper/snapper_0.13.0.bb
index 981ca84c13..56d4c89d0f 100644
--- a/meta-oe/recipes-support/snapper/snapper_0.12.2.bb
+++ b/meta-oe/recipes-support/snapper/snapper_0.13.0.bb
@@ -6,19 +6,17 @@ 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
+inherit autotools-brokensep pkgconfig gettext manpages
 
-SRC_URI = "git://github.com/openSUSE/snapper.git;protocol=https;branch=master \
-           file://0001-Fix-build-with-boost-1.89.patch \
-          "
-SRCREV = "4f3d2b2fc58aefa976668cd25b8eac02ba0f85e7"
+SRC_URI = "git://github.com/openSUSE/snapper.git;protocol=https;branch=master"
+SRCREV = "3a3bd97083976d28538d402284ff947b4aab5b8f"
 
 EXTRA_OECONF += "--disable-zypp"
 
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'api-documentation systemd pam', d)}"
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', '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"
+PACKAGECONFIG[manpages] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native"
 
 # Avoid HOSTTOOLS path in binaries
 export DIFF_BIN = "${bindir}/diff"
diff --git a/meta-oe/recipes-support/tree/tree_2.2.1.bb b/meta-oe/recipes-support/tree/tree_2.3.1.bb
index df52d63fbb..b4fa0659b9 100644
--- a/meta-oe/recipes-support/tree/tree_2.2.1.bb
+++ b/meta-oe/recipes-support/tree/tree_2.3.1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
 
 SRC_URI = "https://oldmanprogrammer.net/tar/tree/${BP}.tgz"
-SRC_URI[sha256sum] = "68ac45dc78c0c311ada06200ffc3c285e74223ba208061f8d15ffac25e44b2ec"
+SRC_URI[sha256sum] = "47ca786ed4ea4aa277cabd42b1a54635aca41b29e425e9229bd1317831f25665"
 
 # tree's default CFLAGS for Linux
 CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
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 890568d727..02908b905a 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,14 +1,14 @@
 SUMMARY = "Unicode Character Database"
 HOMEPAGE = "https://unicode.org/ucd/"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ucd-license-v3.txt;md5=ea17640caddb659394df50e5db6efd69"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ucd-license-v4.txt;md5=3049f4ad14be1ebf8c80a93d9d32b2d6"
 
 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;downloadfilename=ucd-license-v3.txt;name=ucd-license \
+    https://www.unicode.org/license.txt;downloadfilename=ucd-license-v4.txt;name=ucd-license \
 "
 SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600"
-SRC_URI[ucd-license.sha256sum] = "abf84f74dea2812799e1dbef7f0581adf7db244881e4febb8684f441568da0ad"
+SRC_URI[ucd-license.sha256sum] = "e7a93b009565cfce55919a381437ac4db883e9da2126fa28b91d12732bc53d96"
 
 inherit allarch
 
diff --git a/meta-oe/recipes-support/usbids/usbids_2025.09.15.bb b/meta-oe/recipes-support/usbids/usbids_2025.12.13.bb
index 925a8ddda9..ebaa1d1f99 100644
--- a/meta-oe/recipes-support/usbids/usbids_2025.09.15.bb
+++ b/meta-oe/recipes-support/usbids/usbids_2025.12.13.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
 SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https"
 
-# September 15, 2025
-SRCREV = "18b3055a9819a341ac2ff957f0b92f564d0d5d6e"
+# December 13, 2025
+SRCREV = "5de1427442504bc8e28d35cca5397d64ea177456"
 
 
 do_install() {
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.4.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.6.bb
index eb9b81f154..ac941de811 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.4.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.2.6.bb
@@ -15,7 +15,7 @@ VBOX_NAME = "VirtualBox-${PV}"
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
     file://Makefile.utils \
 "
-SRC_URI[sha256sum] = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd"
+SRC_URI[sha256sum] = "c58443a0e6fcc7fc7e84c1011a10823b3540c6a2b8f2e27c4d8971272baf09f7"
 
 S ?= "${UNPACKDIR}/vbox_module"
 S:task-unpack = "${UNPACKDIR}/${VBOX_NAME}"
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 367e6b8342..411164433a 100644
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch
@@ -23,12 +23,12 @@ diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
 index 16e416d..68dd9a0 100644
 --- a/Source/WTF/wtf/Compiler.h
 +++ b/Source/WTF/wtf/Compiler.h
-@@ -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) && !defined(__powerpc__) && !defined(_WIN32)
-+#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) && !defined(__arm__)
+@@ -290,7 +290,7 @@
+ // written for 64-bit may fail to tail call on 32-bit.
+ // It also doesn't work on ppc64le: https://github.com/llvm/llvm-project/issues/98859
+ // and on Windows: https://github.com/llvm/llvm-project/issues/116568
+-#if !defined(MUST_TAIL_CALL) && COMPILER(CLANG) && __SIZEOF_POINTER__ == 8 && defined(__cplusplus) && COMPILER_HAS_CPP_ATTRIBUTE(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32)
++#if !defined(MUST_TAIL_CALL) && COMPILER(CLANG) && __SIZEOF_POINTER__ == 8 && defined(__cplusplus) && COMPILER_HAS_CPP_ATTRIBUTE(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) && !defined(__arm__)
  #define MUST_TAIL_CALL [[clang::musttail]]
  #define HAVE_MUST_TAIL_CALL 1
  #endif
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.7.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.50.5.bb
index 118592d42b..9be30506d6 100644
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.7.bb
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.50.5.bb
@@ -23,14 +23,14 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
            file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \
            file://0001-Fix-32bit-arm.patch \
            "
-SRC_URI[sha256sum] = "2c62aebb608e09f930a539f3623a5cc8023b5068029f42a208f45f9124da6e30"
+SRC_URI[sha256sum] = "8737631bac3e9c7ad3e5208f9370e076c09d9c45b39980021ce54edadcc6f94f"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
 
 S = "${UNPACKDIR}/webkitgtk-${PV}"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}"
+REQUIRED_DISTRO_FEATURES = "opengl"
 
 CVE_PRODUCT = "webkitgtk webkitgtk\+"
 
@@ -51,11 +51,10 @@ DEPENDS += " \
           gstreamer1.0-plugins-base \
           glib-2.0-native \
           gettext-native \
+          libsoup \
+          libepoxy \
           "
 
-# 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)} \
            ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \
@@ -63,7 +62,6 @@ PACKAGECONFIG ??= " \
            ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \
            enchant \
            libsecret \
-           ${PACKAGECONFIG_SOUP} \
            "
 
 PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
@@ -83,8 +81,6 @@ PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg"
 PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd"
 PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,,"
 PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms"
-PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3"
-PACKAGECONFIG[soup3] = ",,libsoup,,,soup2"
 PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd"
 PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif"
 PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad"
@@ -103,6 +99,7 @@ EXTRA_OECMAKE = " \
         ${@oe.utils.vartrue('DEBUG_BUILD', '-DWEBKIT_NO_INLINE_HINTS=ON', '-DWEBKIT_NO_INLINE_HINTS=OFF', d)} \
         -DENABLE_MINIBROWSER=ON \
         -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \
+        -DUSE_SOUP2=OFF \
                 "
 # pass -g1 to massively reduce the size of the debug symbols (4.3GB to 700M at time of writing)
 DEBUG_LEVELFLAG = "-g1"
@@ -181,3 +178,7 @@ src_package_preprocess () {
             ${B}/WebKitGTK/DerivedSources/webkit/*.cpp
 }
 
+
+# complation fails with Clang-21 issue - https://github.com/llvm/llvm-project/issues/132322
+# Can be removed when clang is updated to v22
+TOOLCHAIN:arm = "gcc"
diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.18.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.19.bb
index 84fc9e2f18..2550d4cd59 100644
--- a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.18.bb
+++ b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.19.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-SRC_URI = "http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz"
-SRC_URI[sha256sum] = "ec6f06d7495cdba37a732039f9b5e1578bcb296576fde0da40edb2f52220df3c"
+SRC_URI = "http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[sha256sum] = "e92deb929c10d4b29329397af8a2585101247f7e6177ac6f1d28e82130ed8c19"
 
-inherit autotools gettext
+inherit autotools gettext pkgconfig
 
 EXTRA_OECONF = "--disable-documentation"
 
@@ -13,3 +13,5 @@ CONFFILES:${PN} += " \
     ${sysconfdir}/xdg/user-dirs.conf \
     ${sysconfdir}/xdg/user-dirs.defaults \
 "
+
+FILES:${PN} += "${systemd_user_unitdir}/xdg-user-dirs.service"
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.9.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.9.bb
index ca6ebba59c..e0888f1ff4 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.9.bb
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.9.bb
@@ -33,7 +33,7 @@ inherit autotools-brokensep ptest pkgconfig
 #CFLAGS += "-I${STAGING_INCDIR}/nss3"
 #CPPFLAGS += "-I${STAGING_INCDIR}/nss3"
 
-PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des"
+PACKAGECONFIG ??= "gnutls libgcrypt nss openssl"
 PACKAGECONFIG[gnutls] = ",,gnutls"
 PACKAGECONFIG[libgcrypt] = ",,libgcrypt"
 PACKAGECONFIG[nss] = "--with-nss=${STAGING_DIR_HOST} --with-nspr=${STAGING_DIR_HOST},--with-nss=no --with-nspr=no,nss nspr"
diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.10.4.bb b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.10.5.bb
index f111c4eed9..225de422e6 100644
--- a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.10.4.bb
+++ b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.10.5.bb
@@ -12,7 +12,7 @@ REQUIRED_DISTRO_FEATURES = "x11 pam"
 
 SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git;branch=v0.10;protocol=https;tag=v${PV}"
 
-SRCREV = "2b1f913f4aa6b88d63d9ce9302c61cb0e39483f6"
+SRCREV = "c2d3cbafebe00be3221f985c06ef6b97f1c63790"
 
 FILES:${PN} += "${libdir}/xorg/modules/*"
 FILES:${PN}-staticdev += " \
diff --git a/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch b/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch
deleted file mode 100644
index c716229ab6..0000000000
--- a/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-
-sys/signal.h does almost the same in both glibc and musl: it includes "signal.h"
-
-However with musl there is also a warning macro about this, which is interpreted as
-an error during building.
-
-Fixes error:
-
-| In file included from ../../sources/xrdp-0.10.4.1/waitforx/waitforx.c:5:
-| <...>/usr/include/sys/signal.h:1:2: error: #warning redirecting incorrect #include <sys/signal.h> to <signal.h> [-Werror=cpp]
-|     1 | #warning redirecting incorrect #include <sys/signal.h> to <signal.h>
-|       |  ^~~~~~~
-| cc1: all warnings being treated as errors
-
-Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/3678]
-Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
-
---- ./waitforx/waitforx.c.orig  2025-11-25 14:38:46.464337398 +0100
-+++ ./waitforx/waitforx.c       2025-11-25 14:38:52.007441093 +0100
-@@ -2,7 +2,6 @@
- #include <signal.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <sys/signal.h>
- #include <unistd.h>
- 
- #include "config_ac.h"
diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.10.5.bb
index 8203ada8e5..8d7c5807f2 100644
--- a/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb
+++ b/meta-oe/recipes-support/xrdp/xrdp_0.10.5.bb
@@ -17,9 +17,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN
            file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \
            file://0001-mark-count-with-unused-attribute.patch \
            "
-SRC_URI:append:libc-musl = " file://fix-compiling-with-musl.patch"
-
-SRC_URI[sha256sum] = "52eadf3e86c57be0de0b9d5c184b52a7946a070746d3eb04b5089dd6d42f8f5f"
+SRC_URI[sha256sum] = "9abc96d164de4b1c40e2f3f537d0593d052a640cf3388978c133715ea69fb123"
 
 UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases"
 UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-oe/recipes-test/catch2/catch2_3.8.1.bb b/meta-oe/recipes-test/catch2/catch2_3.13.0.bb
index 48ed26708c..c5d85ba302 100644
--- a/meta-oe/recipes-test/catch2/catch2_3.8.1.bb
+++ b/meta-oe/recipes-test/catch2/catch2_3.13.0.bb
@@ -4,8 +4,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2"
 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 = "2b60af89e23d28eefc081bc930831ee9d45ea58b"
+SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https;tag=v${PV}"
+SRCREV = "29c9844f688acb27c87338c39cd186ebfe41aa19"
 
 
 inherit cmake python3native