Update for 2025.11-rc2

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/18xx-ti-utils: switch to git repo
2025-11-30 20:19:47 +01:00 · 2025-11-30 19:55:16 +01:00 · 2025-11-30 18:07:46 +01:00 · 2025-11-30 18:05:33 +01:00 · 2025-11-30 17:29:13 +01:00 · 2025-11-30 17:26:27 +01:00
92 changed files with 1286 additions and 1318 deletions
@@ -149,7 +149,6 @@ configs/orangepi_pc2_defconfig lib_defconfig.ForceCheckHash
 configs/orangepi_zero_plus_defconfig lib_defconfig.ForceCheckHash
 configs/pine64_defconfig lib_defconfig.ForceCheckHash
 configs/pine64_pinecube_defconfig lib_defconfig.ForceCheckHash
-configs/pine64_star64_defconfig lib_defconfig.ForceCheckHash
 configs/s6lx9_microboard_defconfig lib_defconfig.ForceCheckHash
 configs/sipeed_lichee_rv_defconfig lib_defconfig.ForceCheckHash
 configs/sipeed_lichee_rv_dock_defconfig lib_defconfig.ForceCheckHash
@@ -1,3 +1,24 @@
+2025.11-rc2, released November 30th, 2025
+
+	Fixes all over the tree.
+
+	Infrastructure: support/scripts/check-merged (introduced in
+	2025.11-rc1) no longer relies on getopt from util-linux
+
+	Defconfigs: pine64 star: Update U-Boot and Linux kernel to fix
+	builds with GCC 14.x
+
+	Updated/fixed packages: 18xx-ti-utils, depot-tools, e2fsprogs,
+	enscript, fio, gnutls, intel-mediadriver, intel-vpl-gpu-rt,
+	ledmon, libpng, libteam, lmbench, mongoose, netsnmp,
+	nss-pam-ldapd, open-plc-utils, oprofile, pdmenu, php-apcu,
+	php-pecl-dbus, php-xdebug, php-yaml, python-flask-restx,
+	python-pysocks, python-starlette, sane-backends, sbc, sdl,
+	stress-ng, swipl, syslinux, time, tmux, tor, uboot-tools,
+	woff2, xfsprogs, yaml-cpp
+
+	Removed packages: libargtable2, starfive-spltool
+
 2025.11-rc1, released November 20th, 2025

 	Fixes all over the tree and new features.
@@ -32,6 +53,72 @@
 	linphone, logsurfer, mediastreamer, metacity, mongrel2, ola,
 	ortp, procrank_linux, ramspeed, sylpheed

+2025.08.2, released November 20, 2025
+
+    Important / security related fixes:
+
+	- bind: CVE-2025-8677, CVE-2025-40778, CVE-2025-40780
+	- dante: CVE-2024-54662
+	- erlang: CVE-2024-53846, CVE-2025-4748, CVE-2025-26618, CVE-2025-30211,
+	          CVE-2025-32433, CVE-2025-46712, CVE-2025-48038,
+	          CVE-2025-48039, CVE-2025-48040, CVE-2025-48041
+	- hostapd: CVE-2025-24912
+	- imagemagick: CVE-2025-62171
+	- iptraf-ng: CVE-2024-52949
+	- libarchive: CVE-2025-25724
+	- libglib2: CVE-2024-54662
+	- libvips: CVE-2025-29769, CVE-2025-59933
+	- libvpx: CVE-2025-5283
+	- libxslt: CVE-2025-24855, CVE-2024-55549
+	- mbedtls: CVE-2025-54764, CVE-2025-59438
+	- modsecurity2: CVE-2025-52891, CVE-2025-54571
+	- netdata: CVE-2023-22496, CVE-2023-22497
+	- podman: CVE-2025-9566
+	- poppler: CVE-2024-6239, CVE-2024-56378, CVE-2025-32364,
+	           CVE-2025-32365, CVE-2025-43903, CVE-2025-50420,
+	           CVE-2025-52886
+	- python3: gh-139312, gh-139700, gh-139400, gh-135661, gh-135661,
+	           gh-102555, gh-135462, gh-118350, gh-86155
+	- python-webpy: CVE-2025-3818
+	- redis: CVE-2025-46817, CVE-2025-46818, CVE-2025-46819, CVE-2025-49844
+	- samba: CVE-2025-3818, CVE-2025-10230
+	- shairport-sync: Upstream security fixes without CVE
+	- squid: CVE-2025-59362
+	- suricata: CVE-2024-37151, CVE-2024-38535
+	- tpm2-tss: CVE-2024-29040
+	- xerces: CVE-2024-23807
+	- zabbix: CVE-2025-27231, CVE-2025-27236, CVE-2025-27238, CVE-2025-49641
+	- zip: CVE-2018-13410
+
+	Infrastructure updates/fixes:
+
+	- Improved matching of CPE ID with NVD database, resulting in more accurate
+	  identification of CVEs.
+	- brmake: avoid garbled output with top-level parallel build
+
+	Updated / fixed packages: 4th, audit, bind, cmake, crun, dante,
+	ebtables, erlang, freeradius-server, freerdp, gpsd, gstd, hostapd,
+	imagemagick, iptraf-ng, ledmon, libarchive, libcurl, libdbi-drivers,
+	libdisplay-info, libglib2, libgphoto2, libgtk3, libheif, libiconv,
+	libsemanage, libshout, libsolv, libtpms, libvips, libvpx, libwpe,
+	libxslt, linux, linux-headers, live555, mbedtls, micropython,
+	mjpg-streamer, modsecurity2, netdata, podman, poppler, python3,
+	python-flask-cors, python-webpy, quota, qt6multimedia, redis, refpolicy,
+	samba4, shairport-sync, selinux-python, sexpect, siproxd, sqlite, squid,
+	suricata, tor, tpm2-tss, waffle, webkitgtk, wireless-regdb, wpewebkit,
+	xerces, zabbix, zip
+
+	Removed package: ramspeed
+
+	Boards updated / fixed: andes_ae350_45, beaglebone, beagleboneai,
+	cubieboard1, cubieboard2, imx6ulz_bsh_smm_m2, imx8mn_bsh_smm_s2,
+	imx8mn_bsh_smm_s2_pro, olimex_a20_olinuxino_lime*, stm32f429_disco_xip,
+	stm32f746_disco_sd, stm32f769_disco_sd, stm32mp1*_dk*, ti_am62x_sk
+
+	Test Improvements:
+
+	- Capture output of failing commands on host.
+
 2025.08.1, released October 11, 2025

    Important / security related fixes:
@@ -546,6 +633,69 @@
 	- netsnmp: unexpected header length in /proc/net/snmp...
 	  https://gitlab.com/buildroot.org/buildroot/-/issues/110

+2025.02.8, released November 20, 2025
+
+    Important / security related fixes:
+
+	- bind: CVE-2025-8677, CVE-2025-40778, CVE-2025-40780
+	- dante: CVE-2024-54662
+	- erlang: CVE-2024-53846, CVE-2025-4748, CVE-2025-26618, CVE-2025-30211,
+	          CVE-2025-32433, CVE-2025-46712, CVE-2025-48038,
+	          CVE-2025-48039, CVE-2025-48040, CVE-2025-48041
+	- hostapd: CVE-2025-24912
+	- imagemagick: CVE-2025-62171
+	- iptraf-ng: CVE-2024-52949
+	- libarchive: CVE-2025-25724
+	- libglib2: CVE-2024-54662
+	- libvips: CVE-2025-29769, CVE-2025-59933
+	- libvpx: CVE-2025-5283
+	- libxslt: CVE-2025-24855, CVE-2024-55549
+	- mbedtls: CVE-2025-54764, CVE-2025-59438
+	- modsecurity2: CVE-2025-52891, CVE-2025-54571
+	- netdata: CVE-2023-22496, CVE-2023-22497
+	- poppler: CVE-2024-6239, CVE-2024-56378, CVE-2025-32364,
+	           CVE-2025-32365, CVE-2025-43903, CVE-2025-50420,
+	           CVE-2025-52886
+	- python3: gh-139312, gh-139700, gh-139400, gh-135661, gh-135661,
+	           gh-102555, gh-135462, gh-118350, gh-86155
+	- python-webpy: CVE-2025-3818
+	- redis: CVE-2025-46817, CVE-2025-46818, CVE-2025-46819, CVE-2025-49844
+	- samba: CVE-2025-3818, CVE-2025-10230
+	- shairport-sync: Upstream security fixes without CVE
+	- squid: CVE-2025-59362
+	- suricata: CVE-2024-37151, CVE-2024-38535
+	- tpm2-tss: CVE-2024-29040
+	- xerces: CVE-2024-23807
+	- zabbix: CVE-2025-27231, CVE-2025-27236, CVE-2025-27238, CVE-2025-49641
+	- zip: CVE-2018-13410
+
+	Infrastructure updates/fixes:
+
+	- Improved matching of CPE ID with NVD database, resulting in more
+	  accurate identification of CVEs.
+	- brmake: avoid garbled output with top-level parallel build
+
+	Updated / fixed packages: 4th, audit, bind, cmake, crun, dante,
+	ebtables, erlang, freeradius-server, gpsd, gstd, hostapd, imagemagick,
+	iptraf-ng, iozone, ledmon, libarchive, libcurl, libdbi-drivers,
+	libdisplay-info, libglib2, libgphoto2, libgtk3, libheif, libsemanage,
+	libshout, libsolv, libtpms, libvips, libvpx, libwpe, libxslt, linux,
+	linux-headers, live555, mbedtls, micropython, mjpg-streamer,
+	modsecurity2, netdata, netsnmp, poppler, python3, python-flask-cors,
+	python-webpy, quota, qt6multimedia, redis, refpolicy, samba4,
+	selinux-python, sexpect, shairport-sync, siproxd, sqlite, squid,
+	suricata, tor, tpm2-tss, waffle, webkitgtk, wireless-regdb, wpewebkit,
+	xerces, zabbix, zip
+
+	Removed package: ramspeed
+
+	Boards updated / fixed: beagleboneai, cubieboard1, cubieboard2,
+	stm32f429_disco_xip, stm32f746_disco_sd, stm32f769_disco_sd,
+
+	Test Improvements:
+
+	- Capture output of failing commands on host.
+
 2025.02.7, released October 11, 2025

    Important / security related fixes:
@@ -146,6 +146,12 @@ endif

 comment "Legacy options removed in 2025.11"

+config BR2_PACKAGE_LIBARGTABLE2
+	bool "libargtable2 has been removed"
+	select BR2_LEGACY
+	help
+	  libargtable2 is unmaintained and has been removed
+
 config BR2_PACKAGE_OLA
 	bool "ola has been removed"
 	select BR2_LEGACY
@@ -3172,7 +3172,6 @@ F:	package/x265/
 N:	Thomas Bonnefille <thomas.bonnefille@bootlin.com>
 F:	board/pine64/star64
 F:	configs/pine64_star64_defconfig
-F:	package/starfive-spltool/

 N:	Thomas Claveirole <thomas.claveirole@green-communications.fr>
 F:	package/fcgiwrap/
@@ -92,9 +92,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2025.11-rc1
+export BR2_VERSION := 2025.11-rc2
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1763670000
+BR2_VERSION_EPOCH = 1764530000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -783,9 +783,9 @@ endif
 # counterparts are appropriately setup as symlinks ones to the others.
 	@$(call MESSAGE,"Sanity check in overlays $(call qstrip,$(BR2_ROOTFS_OVERLAY))")
 	support/scripts/check-merged \
-		--type overlay \
-		$(if $(BR2_ROOTFS_MERGED_USR),--merged-usr) \
-		$(if $(BR2_ROOTFS_MERGED_BIN),--merged-bin) \
+		-t overlay \
+		$(if $(BR2_ROOTFS_MERGED_USR),-u) \
+		$(if $(BR2_ROOTFS_MERGED_BIN),-b) \
 		$(call qstrip,$(BR2_ROOTFS_OVERLAY))

 	$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
@@ -12,8 +12,8 @@ image sdcard.img {
        }

        partition uboot {
-                image = "opensbi_uboot_payload.img"
-                partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47
+                image = "u-boot.itb"
+                partition-type-uuid = xbootldr
                offset = 4M
        }

@@ -1,4 +1,4 @@
 label star64
  kernel /boot/Image
  devicetree /boot/jh7110-pine64-star64.dtb
-  append root=/dev/mmcblk1p3 earlycon=sbi
+  append root=/dev/mmcblk1p3 rootwait earlycon=sbi
@@ -0,0 +1,2 @@
+# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
+sha256  165ca1c37c4607b90e731996b7c1e3311285167d13deeedf08f3f1f0b9d2541a  linux-6.12.57.tar.xz
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a  u-boot-2025.10.tar.bz2
@@ -1,9 +0,0 @@
-#!/bin/bash
-BOARD_DIR="$CONFIG_DIR"/board/pine64/star64
-
-# Add header to the SPL
-"$HOST_DIR"/bin/spl_tool -c -f "$BINARIES_DIR"/u-boot-spl.bin
-
-# Create the u-boot FIT image
-cp "$BOARD_DIR"/star64-uboot-fit-image.its "$BINARIES_DIR"
-mkimage -f "$BINARIES_DIR"/star64-uboot-fit-image.its -A riscv -O u-boot -T firmware "$BINARIES_DIR"/opensbi_uboot_payload.img
@@ -1,29 +0,0 @@
-/dts-v1/;
-
-/ {
-	description = "U-boot-spl FIT image for JH7110 Pine64 Star64";
-	#address-cells = <2>;
-
-	images {
-		firmware {
-			description = "u-boot";
-			data = /incbin/("fw_payload.bin");
-			type = "firmware";
-			arch = "riscv";
-			os = "u-boot";
-			load = <0x0 0x40000000>;
-			entry = <0x0 0x40000000>;
-			compression = "none";
-		};
-	};
-
-	configurations {
-		default = "config-1";
-
-		config-1 {
-			description = "U-boot-spl FIT config for JH7110 Pine64 Star64";
-			firmware = "firmware";
-		};
-	};
-};
-
@@ -56,6 +56,9 @@ SYSLINUX_POST_PATCH_HOOKS += SYSLINUX_CLEANUP
 # syslinux build system has no convenient way to pass CFLAGS,
 # and the internal zlib should take precedence so -I shouldn't
 # be used.
+# gcc-15 defaults to -std=gnu23 which introduces build failures.
+# We force "-std=gnu17" for gcc version supporting it. Earlier gcc
+# versions will work, since they are using the older standard.
 # Install in a temporary location that eases final install into
 # images/ (see corresponding command, below).
 # Repeat the target, otherwise syslinux will try to build everything
@@ -65,7 +68,7 @@ define SYSLINUX_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE1) \
 		ASCIIDOC_OK=-1 \
 		A2X_XML_OK=-1 \
-		CC="$(TARGET_CC) -std=gnu17" \
+		CC="$(TARGET_CC) $(if $(BR2_TOOLCHAIN_GCC_AT_LEAST_8),-std=gnu17)" \
 		LD="$(TARGET_LD)" \
 		OBJCOPY="$(TARGET_OBJCOPY)" \
 		AS="$(TARGET_AS)" \
@@ -1,13 +1,14 @@
 BR2_riscv=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_GLOBAL_PATCH_DIR="board/pine64/star64/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_ROOTFS_OVERLAY="board/pine64/star64/overlay/"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/star64/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/star64/genimage.cfg"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,Star64_linux,1456c984f15e21e28fb8a9ce96d0ca10e61a71c4)/linux-1456c984f15e21e28fb8a9ce96d0ca10e61a71c4.tar.gz"
-BR2_LINUX_KERNEL_DEFCONFIG="pine64_star64"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.57"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-pine64-star64"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -17,15 +18,18 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="100M"
 BR2_TARGET_OPENSBI=y
 BR2_TARGET_OPENSBI_PLAT="generic"
-BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y
+# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,u-boot,172b47f62039605d6806fa96bd403c21cda28996)/u-boot-172b47f62039605d6806fa96bd403c21cda28996.tar.gz"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_star64"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2"
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
+BR2_TARGET_UBOOT_NEEDS_OPENSBI=y
+BR2_TARGET_UBOOT_USE_BINMAN=y
+# BR2_TARGET_UBOOT_FORMAT_BIN is not set
+BR2_TARGET_UBOOT_FORMAT_ITB=y
 BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin.normal.out"
 BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_STARFIVE_SPLTOOL=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
@@ -21,25 +21,25 @@
          <th>2025.11.x</th>
          <td>March 2026</td>
          <td>
-            2025.11-rc1<br/>
-            <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.11-rc1/CHANGES">
+            2025.11-rc2<br/>
+            <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.11-rc2/CHANGES">
              Changelog
            </a>
          </td>
          <td>2025-11-20</td>
          <td>
-            <a href="/downloads/buildroot-2025.11-rc1.tar.gz">
+            <a href="/downloads/buildroot-2025.11-rc2.tar.gz">
              <img src="images/zip.png" width="24" alt="">
              .tar.gz
            </a><br/>
-            <a href="/downloads/buildroot-2025.11-rc1.tar.gz.sign">[PGP sig]</a>
+            <a href="/downloads/buildroot-2025.11-rc2.tar.gz.sign">[PGP sig]</a>
          </td>
          <td>
-            <a href="/downloads/buildroot-2025.11-rc1.tar.xz">
+            <a href="/downloads/buildroot-2025.11-rc2.tar.xz">
              <img src="images/package.png" width="24" alt="">
              .tar.xz
            </a><br/>
-            <a href="/downloads/buildroot-2025.11-rc1.tar.xz.sign">[PGP sig]</a>
+            <a href="/downloads/buildroot-2025.11-rc2.tar.xz.sign">[PGP sig]</a>
          </td>
        </tr>
        <tr>
@@ -47,76 +47,50 @@
          <th>2025.08.x</th>
          <td>December 2025</td>
          <td>
-            2025.08.1<br/>
-            <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.08.1/CHANGES">
+            2025.08.2<br/>
+            <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.08.2/CHANGES">
              Changelog
            </a>
          </td>
-          <td>2025-10-11</td>
+          <td>2025-11-20</td>
          <td>
-            <a href="/downloads/buildroot-2025.08.1.tar.gz">
+            <a href="/downloads/buildroot-2025.08.2.tar.gz">
              <img src="images/zip.png" width="24" alt="">
              .tar.gz
            </a><br/>
-            <a href="/downloads/buildroot-2025.08.1.tar.gz.sign">[PGP sig]</a>
+            <a href="/downloads/buildroot-2025.08.2.tar.gz.sign">[PGP sig]</a>
          </td>
          <td>
-            <a href="/downloads/buildroot-2025.08.1.tar.xz">
+            <a href="/downloads/buildroot-2025.08.2.tar.xz">
              <img src="images/package.png" width="24" alt="">
              .tar.xz
            </a><br/>
-            <a href="/downloads/buildroot-2025.08.1.tar.xz.sign">[PGP sig]</a>
+            <a href="/downloads/buildroot-2025.08.2.tar.xz.sign">[PGP sig]</a>
          </td>
-        </tr>
-          <th>Stable (EOL)</th>
-          <th>2025.05.x</th>
-          <td>September 2025</td>
-          <td>
-            2025.05.3<br/>
-            <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.05.3/CHANGES">
-              Changelog
-            </a>
-          </td>
-          <td>2025-10-11</td>
-          <td>
-            <a href="/downloads/buildroot-2025.05.3.tar.gz">
-              <img src="images/zip.png" width="24" alt="">
-              .tar.gz
-            </a><br/>
-            <a href="/downloads/buildroot-2025.05.3.tar.gz.sign">[PGP sig]</a>
-          </td>
-          <td>
-            <a href="/downloads/buildroot-2025.05.3.tar.xz">
-              <img src="images/package.png" width="24" alt="">
-              .tar.xz
-            </a><br/>
-            <a href="/downloads/buildroot-2025.05.3.tar.xz.sign">[PGP sig]</a>
-          </td>
-        </tr>
        <tr>
          <th>Long-term support</th>
          <th>2025.02.x</th>
          <td>March 2028</td>
          <td>
-            2025.02.7<br/>
-            <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.02.7/CHANGES">
+            2025.02.8<br/>
+            <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.02.8/CHANGES">
              Changelog
            </a>
          </td>
-          <td>2025-10-11</td>
+          <td>2025-11-20</td>
          <td>
-            <a href="/downloads/buildroot-2025.02.7.tar.gz">
+            <a href="/downloads/buildroot-2025.02.8.tar.gz">
              <img src="images/zip.png" width="24" alt="">
              .tar.gz
            </a><br/>
-            <a href="/downloads/buildroot-2025.02.7.tar.gz.sign">[PGP sig]</a>
+            <a href="/downloads/buildroot-2025.02.8.tar.gz.sign">[PGP sig]</a>
          </td>
          <td>
-            <a href="/downloads/buildroot-2025.02.7.tar.xz">
+            <a href="/downloads/buildroot-2025.02.8.tar.xz">
              <img src="images/package.png" width="24" alt="">
              .tar.xz
            </a><br/>
-            <a href="/downloads/buildroot-2025.02.7.tar.xz.sign">[PGP sig]</a>
+            <a href="/downloads/buildroot-2025.02.8.tar.xz.sign">[PGP sig]</a>
          </td>
        </tr>
      </table>
@@ -9,6 +9,65 @@
 <h2>News</h2>
 <ul class="timeline">

+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2025.11-rc2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>30 November 2025</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>Another week, another release candidate with more cleanups and build fixes. See the
+	  <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.11-rc2/CHANGES">CHANGES</a>
+	  file for more details.</p>
+
+	<p>Go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2025.11-rc2.tar.xz">2025.11-rc2
+	  release</a>, and report any problems found to the
+         <a href="support.html">mailing list</a> or
+         <a href="https://gitlab.com/buildroot.org/buildroot/-/issues">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2025.08.2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>20 November 2025</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2025.08.2 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2025.08.1 release. See the
+	  <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.08.2/CHANGES">CHANGES</a>
+	  file for more details, read the
+	  <a href="https://lore.kernel.org/buildroot/4ec5e145-5c9e-4934-9074-32ddcfa8fbbc@rnout.be/T/#u">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2025.08.2.tar.xz">2025.08.2 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2025.02.8 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>20 November 2025</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2025.02.8 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2025.02.7 release. See the
+	  <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.02.8/CHANGES">CHANGES</a>
+	  file for more details, read the
+	  <a href="https://lore.kernel.org/buildroot/f35f9987-0ba1-4a4c-904e-85f8552f00a3@rnout.be/T/#u">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2025.02.8.tar.xz">2025.02.8 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
  <li class="timeline-inverted">
    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
    <div class="timeline-panel">
@@ -141,7 +141,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES

 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "6.17.8" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "6.17.9" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
@@ -1,7 +1,7 @@
 # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  5a8de64a75fca706c01c6c0a77cf75a74618439db195e25f1f0268af6b2fb1da  linux-6.17.8.tar.xz
-sha256  5f1c4c546660a6a81046fdfa6195306bad2c8d17c0d69876dc100a85ad4613ac  linux-6.12.58.tar.xz
-sha256  a9a59742c29be284c205dc87cbe9b065f9688488132c8f5a6057a5539230a51d  linux-6.6.116.tar.xz
+sha256  6d08803b953c509df48d44d3281ed392524321d8bb353eb21c0555790c8f8e06  linux-6.17.9.tar.xz
+sha256  a1d2cd7327f10eec022615c1bb12c06439bd110d2020164be97f698f43ca58be  linux-6.12.59.tar.xz
+sha256  643b31079222fdbda70cfdd0b68c514f05a3926104be4762a4685f62818b43d1  linux-6.6.117.tar.xz
 sha256  ad068bfdb604ec0f4f7de385c8e7ab944008aa78a4aeeca94f53206e6726bfda  linux-6.1.158.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
 sha256  83157953598b026fb721c906c60dfdfd8e986f25ecb9910f3504f690e2770e05  linux-5.15.196.tar.xz
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  ce0185ba8a9bf456cc94a798bf66903775065e337e53ff812f18a6d88f5bac13  18xx-ti-utils-R8.8.tar.xz
+sha256  33be3c90719bf36d5da76c6faaefb07bf3697635f81b86e28b92307d7825483e  18xx-ti-utils-R8.8-git4.tar.gz
 sha256  363cef40b276a7a91ebcff3f78626d9cfe5e5a51927c725236007259403d5fc4  COPYING
@@ -4,9 +4,9 @@
 #
 ################################################################################

-18XX_TI_UTILS_VERSION = 8.8
-18XX_TI_UTILS_SITE = https://git.ti.com/cgit/wilink8-wlan/18xx-ti-utils/snapshot
-18XX_TI_UTILS_SOURCE = 18xx-ti-utils-R$(18XX_TI_UTILS_VERSION).tar.xz
+18XX_TI_UTILS_VERSION = R8.8
+18XX_TI_UTILS_SITE = https://git.ti.com/cgit/wilink8-wlan/18xx-ti-utils
+18XX_TI_UTILS_SITE_METHOD = git
 18XX_TI_UTILS_DEPENDENCIES = libnl
 18XX_TI_UTILS_LICENSE = BSD-3-Clause
 18XX_TI_UTILS_LICENSE_FILES = COPYING
@@ -2205,7 +2205,6 @@ menu "Other"
 	source "package/jemalloc/Config.in"
 	source "package/lapack/Config.in"
 	source "package/libabseil-cpp/Config.in"
-	source "package/libargtable2/Config.in"
 	source "package/libatomic_ops/Config.in"
 	source "package/libavl/Config.in"
 	source "package/libb64/Config.in"
@@ -114,7 +114,6 @@ menu "Host utilities"
 	source "package/sloci-image/Config.in.host"
 	source "package/snagboot/Config.in.host"
 	source "package/squashfs/Config.in.host"
-	source "package/starfive-spltool/Config.in.host"
 	source "package/sunxi-tools/Config.in.host"
 	source "package/swig/Config.in.host"
 	source "package/swtpm/Config.in.host"
@@ -0,0 +1,32 @@
+From e52f67026d7ce5b30887e1cfe486ed994169119d Mon Sep 17 00:00:00 2001
+From: Adam Duskett <adam.duskett@amarulasolutions.com>
+Date: Tue, 4 Nov 2025 11:58:37 +0100
+Subject: [PATCH] gerrit_util.py: fix importing socks
+
+As of commit 1a6ff781792099e9e14d7beb610bd99112b17b07,
+httplib2 removed the internal copy of socksipy module.
+
+The commit message specifically states to install pysocks.
+
+Upstream: unsubmitted
+Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
+---
+ gerrit_util.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gerrit_util.py b/gerrit_util.py
+index eef2f5749..d866bc47a 100644
+--- a/gerrit_util.py
+++ b/gerrit_util.py
+@@ -35,7 +35,7 @@ from typing import NamedTuple, List, Optional
+ from typing import Tuple, TypedDict, cast
+ 
+ import httplib2
+-import httplib2.socks
+import socks
+ 
+ import auth
+ import gclient_utils
+-- 
+2.51.1
+
@@ -14,6 +14,7 @@ HOST_DEPOT_TOOLS_DEPENDENCIES = \
 	host-python3 \
 	host-python-httplib2 \
 	host-python-pyparsing \
+	host-python-pysocks \
 	host-python-six

 define HOST_DEPOT_TOOLS_INSTALL_CMDS
@@ -0,0 +1,103 @@
+From 1a2ce8cd956065106ae27a36a5000f00ebc4591f Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Sat, 22 Nov 2025 21:12:23 +0100
+Subject: [PATCH] configure.ac: check for FS_IOC_READ_VERITY_METADATA
+ availability
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 6bfa843b4435334ac073e42950b48d8bacb54977 ("mke2fs: enable
+copying of fs-verity metadata") introduced support for reading
+fs-verity metadata, which requires using the
+FS_IOC_READ_VERITY_METADATA.
+
+The code is conditionally compiled when the kernel headers have
+<linux/fsverity.h> available. Unfortunately, this check is not
+sufficient: <linux/fsverity.h> was introduced in Linux 5.10, but the
+FS_IOC_READ_VERITY_METADATA was not introduced before 5.12, so if one
+is using 5.10 or 5.11 kernel headers, the build fails with:
+
+./../misc/create_inode.c: In function ‘copy_fs_verity_data’:
+./../misc/create_inode.c:589:10: error: variable ‘arg’ has initializer but incomplete type
+  589 |   struct fsverity_read_metadata_arg arg = {
+      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~
+[...]
+./../misc/create_inode.c:600:20: error: ‘FS_IOC_READ_VERITY_METADATA’ undeclared (first use in this function)
+  600 |   size = ioctl(fd, FS_IOC_READ_VERITY_METADATA, &arg);
+      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This commit therefore extends the configure.ac check to ensure that
+not only <linux/fsverity.h> exists but also that it defines the
+FS_IOC_READ_VERITY_METADATA ioctl.
+
+Upstream: https://github.com/tytso/e2fsprogs/pull/256
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ configure.ac        | 18 ++++++++++++++++++
+ misc/create_inode.c |  6 +++---
+ 2 files changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a0171163..3e5586a3 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1997,6 +1997,24 @@ OS_IO_FILE=""
+ esac]
+ AC_SUBST(OS_IO_FILE)
+ 
+dnl Check for fsverity ioctl
+if test "${ac_cv_header_linux_fsverity_h}" = "yes"; then
+   AC_MSG_CHECKING([for FS_IOC_READ_VERITY_METADATA ioctl])
+   AC_PREPROC_IFELSE(
+   [AC_LANG_PROGRAM([[
+#include <linux/fsverity.h>
+#ifndef FS_IOC_READ_VERITY_METADATA
+# error "FS_IOC_READ_VERITY_METADATA not available"
+#endif
+]], [])], [
+   AC_DEFINE([HAVE_FS_IOC_READ_VERITY_METADATA], [1], [Define to 1 if FS_IOC_READ_VERITY_METADATA ioctl is available])
+   AC_MSG_RESULT([yes])
+   ],
+   [
+   AC_MSG_RESULT([no])
+   ])
+fi
+
+ dnl
+ dnl Make our output files, being sure that we create the some miscellaneous 
+ dnl directories
+diff --git a/misc/create_inode.c b/misc/create_inode.c
+index 624efc03..a7918873 100644
+--- a/misc/create_inode.c
+++ b/misc/create_inode.c
+@@ -30,7 +30,7 @@
+ #ifdef HAVE_SYS_SYSMACROS_H
+ #include <sys/sysmacros.h>
+ #endif
+-#ifdef HAVE_LINUX_FSVERITY_H
+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA)
+ #include <linux/fsverity.h>
+ #include <linux/fs.h>
+ #endif
+@@ -569,7 +569,7 @@ out:
+ }
+ #endif /* FS_IOC_FIEMAP */
+ 
+-#ifdef HAVE_LINUX_FSVERITY_H
+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA)
+ static inline off_t round_up(off_t n, off_t blksz, off_t bias)
+ {
+   return ((n - bias + (blksz - 1)) & ~(blksz - 1)) + bias;
+@@ -738,7 +738,7 @@ static errcode_t copy_file(ext2_filsys fs, int fd, struct stat *statbuf,
+ 		err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf,
+ 				      zerobuf);
+ 
+-#ifdef HAVE_LINUX_FSVERITY_H
+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA)
+ 	if (!err && (flags & EXT4_VERITY_FL))
+ 		err = copy_fs_verity(fs, fd, e2_file, statbuf->st_size);
+ #endif
+-- 
+2.51.1
+
@@ -18,6 +18,13 @@ E2FSPROGS_INSTALL_STAGING = YES
 E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
 HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux

+# 0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch
+# the additional dependencies are only needed for autoreconf
+E2FSPROGS_AUTORECONF = YES
+E2FSPROGS_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive
+E2FSPROGS_DEPENDENCIES += host-gettext host-autoconf-archive
+HOST_E2FSPROGS_DEPENDENCIES += host-gettext host-autoconf-archive
+
 E2FSPROGS_SELINUX_MODULES = fstools

 # e4defrag doesn't build on older systems like RHEL5.x, and we don't
@@ -0,0 +1,19 @@
+Fix build with gcc 15.x
+
+Upstream: https://savannah.gnu.org/bugs/?66845
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+
+diff --git a/compat/regex.c b/compat/regex.c
+index c6907f3..87f2840 100644
+--- a/compat/regex.c
+++ b/compat/regex.c
+@@ -336,7 +336,7 @@ typedef char boolean;
+ #define false 0
+ #define true 1
+ 
+-static int re_match_2_internal ();
+static int re_match_2_internal (struct re_pattern_buffer*, const char*, int, const char*, int, int, struct re_registers*, int);
+ 
+ /* These are the command codes that appear in compiled regular
+    expressions.  Some opcodes are followed by argument bytes.  A
@@ -11,6 +11,11 @@ FIO_LICENSE_FILES = COPYING MORAL-LICENSE

 FIO_OPTS = --disable-native --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)"

+# Uses __atomic_load_8
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+FIO_CONF_ENV += LIBS=-latomic
+endif
+
 ifeq ($(BR2_PACKAGE_LIBAIO),y)
 FIO_DEPENDENCIES += libaio
 endif
@@ -36,7 +41,7 @@ FIO_DEPENDENCIES += zlib
 endif

 define FIO_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) ./configure $(FIO_OPTS))
+	(cd $(@D); $(TARGET_MAKE_ENV) $(FIO_CONF_ENV) ./configure $(FIO_OPTS))
 endef

 define FIO_BUILD_CMDS
@@ -0,0 +1,67 @@
+From 2bbae7644a2292410b53f98fd0035c40bf8750a5 Mon Sep 17 00:00:00 2001
+From: Julien Olivain <ju.o@free.fr>
+Date: Sun, 23 Nov 2025 18:17:19 +0100
+Subject: [PATCH] audit: crau: fix compilation with gcc < 11
+
+If the CRAU_MAYBE_UNUSED macro is unset, the crau.h file tries to
+automatically detect an appropriate value for it.
+
+This autodetection is using the cpp special operator
+`__has_c_attribute` [1], introduced in gcc 11 [2].
+
+When compiling with a gcc older than version 11, the compilation fails
+with the error:
+
+    In file included from audit.h:22,
+                     from audit.c:26:
+    crau/crau.h:255:23: error: missing binary operator before token "("
+         __has_c_attribute (__maybe_unused__)
+                           ^
+
+This has been observed, for example, in Rocky Linux 8.10, which
+contains a gcc v8.5.0.
+
+The issue happens because the test for the `__has_c_attribute`
+availability and the test for the `__maybe_unused__` attribute
+are in the same directive. Those tests should be separated in
+two different directives, following the same logic described in
+the `__has_builtin` documentation [3].
+
+This issue was found in Buildroot, after updating gnutls to
+version 3.8.11 in [4].
+
+This commit fixes the issue by splitting the test in two.
+
+[1] https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fc_005fattribute.html
+[2] https://gcc.gnu.org/gcc-11/changes.html#c
+[3] https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fbuiltin.html
+[4] https://gitlab.com/buildroot.org/buildroot/-/commit/81dbfe1c2ae848b4eb1f896198d13455df50e548
+
+Upstream: https://gitlab.com/gnutls/gnutls/-/merge_requests/2045
+Reported-by: Neal Frager <neal.frager@amd.com>
+Signed-off-by: Julien Olivain <ju.o@free.fr>
+---
+ lib/crau/crau.h | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lib/crau/crau.h b/lib/crau/crau.h
+index 0d4f9f13e..53d33555b 100644
+--- a/lib/crau/crau.h
+++ b/lib/crau/crau.h
+@@ -251,9 +251,10 @@ void crau_data(struct crau_context_stack_st *stack, ...)
+ # else
+ 
+ #  ifndef CRAU_MAYBE_UNUSED
+-#   if defined(__has_c_attribute) && \
+-    __has_c_attribute (__maybe_unused__)
+-#    define CRAU_MAYBE_UNUSED [[__maybe_unused__]]
+#   if defined(__has_c_attribute)
+#    if __has_c_attribute (__maybe_unused__)
+#     define CRAU_MAYBE_UNUSED [[__maybe_unused__]]
+#    endif
+ #   elif defined(__GNUC__)
+ #    define CRAU_MAYBE_UNUSED __attribute__((__unused__))
+ #   endif
+-- 
+2.51.1
+
@@ -1,6 +1,6 @@
 # Locally calculated after checking pgp signature
-# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.10.tar.xz.sig
-sha256  db7fab7cce791e7727ebbef2334301c821d79a550ec55c9ef096b610b03eb6b7  gnutls-3.8.10.tar.xz
+# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.11.tar.xz.sig
+sha256  91bd23c4a86ebc6152e81303d20cf6ceaeb97bc8f84266d0faec6e29f17baa20  gnutls-3.8.11.tar.xz
 # Locally calculated
 sha256  3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  COPYING
 sha256  20e50fe7aae3e56378ebf0417d9de904f55a0e61e4df315333e632a4d3555d95  COPYING.LESSERv2
@@ -6,7 +6,7 @@

 # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS
 GNUTLS_VERSION_MAJOR = 3.8
-GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).10
+GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).11
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
 GNUTLS_LICENSE = LGPL-2.1+ (core library)
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  796a44747f75cd957960fc27070c351ed9a3fc585feb699fd7906f3d7d0e4268  intel-media-25.4.3.tar.gz
+sha256  2e034525b508aa85914736ef9b9c59b6ab51ae9008c9c815e3ee354a5ada76b4  intel-media-25.4.4.tar.gz
 sha256  74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3  LICENSE.md
@@ -6,7 +6,7 @@

 # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack

-INTEL_MEDIADRIVER_VERSION = 25.4.3
+INTEL_MEDIADRIVER_VERSION = 25.4.4
 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive
 INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz
 INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  b7b4cfb2a63f6f43db6d9538d5768d692b91f069e1d9aeb876f8e230f5a04de6  intel-vpl-gpu-rt-25.4.3.tar.gz
+sha256  028837bf8d756d5e74dbca4218b4ef5b853b923b6d2361ecc02270fbc63c15e8  intel-vpl-gpu-rt-25.4.4.tar.gz
 sha256  c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-INTEL_VPL_GPU_RT_VERSION = 25.4.3
+INTEL_VPL_GPU_RT_VERSION = 25.4.4
 INTEL_VPL_GPU_RT_SITE = $(call github,intel,vpl-gpu-rt,intel-onevpl-$(INTEL_VPL_GPU_RT_VERSION))
 INTEL_VPL_GPU_RT_LICENSE = MIT
 INTEL_VPL_GPU_RT_LICENSE_FILES = LICENSE
@@ -0,0 +1,100 @@
+From 95adecd3cc8e94f9964c34fdf0354c209acce166 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Thu, 27 Nov 2025 21:17:22 +0100
+Subject: [PATCH] Include libgen.h to fix musl builds
+
+Fixes various build errors like
+
+block.c: In function 'block_set_devnode':
+block.c:226:22: error: implicit declaration of function 'basename'
+ [-Wimplicit-function-declaration]
+  226 |         char *name = basename(device->sysfs_path);
+
+Upstream: https://github.com/md-raid-utilities/ledmon/pull/272
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+[Bernd: backported upstream PR to v1.1.0]
+---
+ src/ledctl/ledctl.c | 1 +
+ src/ledmon/ledmon.c | 1 +
+ src/lib/block.c     | 1 +
+ src/lib/npem.c      | 1 +
+ src/lib/slot.c      | 1 +
+ src/lib/vmdssd.c    | 1 +
+ 6 files changed, 6 insertions(+)
+
+diff --git a/src/ledctl/ledctl.c b/src/ledctl/ledctl.c
+index 30adc74..af2ea1b 100644
+--- a/src/ledctl/ledctl.c
+++ b/src/ledctl/ledctl.c
+@@ -5,6 +5,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <getopt.h>
+#include <libgen.h>
+ #include <linux/limits.h>
+ #include <inttypes.h>
+ #include <limits.h>
+diff --git a/src/ledmon/ledmon.c b/src/ledmon/ledmon.c
+index 37ef69a..4644492 100644
+--- a/src/ledmon/ledmon.c
+++ b/src/ledmon/ledmon.c
+@@ -5,6 +5,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <getopt.h>
+#include <libgen.h>
+ #include <limits.h>
+ #include <signal.h>
+ #include <stdint.h>
+diff --git a/src/lib/block.c b/src/lib/block.c
+index 23dc34f..afa7d57 100644
+--- a/src/lib/block.c
+++ b/src/lib/block.c
+@@ -3,6 +3,7 @@
+ 
+ #include <dirent.h>
+ #include <fcntl.h>
+#include <libgen.h>
+ #include <limits.h>
+ #include <stdint.h>
+ #include <stdio.h>
+diff --git a/src/lib/npem.c b/src/lib/npem.c
+index bdceee3..f980ba8 100644
+--- a/src/lib/npem.c
+++ b/src/lib/npem.c
+@@ -2,6 +2,7 @@
+ // Copyright (C) 2022 Intel Corporation.
+ 
+ #include <errno.h>
+#include <libgen.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <pci/pci.h>
+diff --git a/src/lib/slot.c b/src/lib/slot.c
+index 1044ddf..68e3009 100644
+--- a/src/lib/slot.c
+++ b/src/lib/slot.c
+@@ -1,6 +1,7 @@
+ // SPDX-License-Identifier: LGPL-2.1-or-later
+ // Copyright (C) 2023 Intel Corporation.
+ 
+#include <libgen.h>
+ #include <stdio.h>
+ #include <string.h>
+ 
+diff --git a/src/lib/vmdssd.c b/src/lib/vmdssd.c
+index 8a6e846..0270a7d 100644
+--- a/src/lib/vmdssd.c
+++ b/src/lib/vmdssd.c
+@@ -2,6 +2,7 @@
+ // Copyright (C) 2022 Intel Corporation.
+ 
+ #include <errno.h>
+#include <libgen.h>
+ #include <limits.h>
+ #include <stdlib.h>
+ #include <stdint.h>
+-- 
+2.47.3
+
@@ -1,25 +0,0 @@
-From 3fe1ce4d7aa7c4fc16471a9ab023ecf6628c2f11 Mon Sep 17 00:00:00 2001
-From: Chris McClelland <prophet3636@gmail.com>
-Date: Thu, 12 Nov 2020 14:18:27 +0000
-Subject: [PATCH] Apply uint patch
-
-Upstream: https://github.com/makestuff/libargtable2/commit/3fe1ce4d7aa7c4fc16471a9ab023ecf6628c2f11
-[thomas: strip to only have the include]
-Signed-off-by: Thomas Perale <thomas.perale@mind.be>
---
- src/arg_int.c     |  2 ++
- 1 files changed, 2 insertions(+)
-
-diff --git a/src/arg_int.c b/src/arg_int.c
-index 29c20e5..c51706a 100644
--- a/src/arg_int.c
-+++ b/src/arg_int.c
-@@ -24,6 +24,8 @@ USA.
- #include "config.h"
- #endif
- 
-+#include <ctype.h>
-+
- /* #ifdef HAVE_STDLIB_H */
- #include <stdlib.h>
- /* #endif */
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_LIBARGTABLE2
-	bool "libargtable2"
-	help
-	  A greatly simplified and yet quite robust argument parsing
-	  set of library calls.
-
-	  http://argtable.sourceforge.net/
@@ -1,3 +0,0 @@
-# Locally computed:
-sha256  8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf  argtable2-13.tar.gz
-sha256  d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f  COPYING
@@ -1,21 +0,0 @@
-################################################################################
-#
-# libargtable2
-#
-################################################################################
-
-LIBARGTABLE2_MAJOR_VERSION = 2
-LIBARGTABLE2_MINOR_VERSION = 13
-LIBARGTABLE2_VERSION = $(LIBARGTABLE2_MAJOR_VERSION).$(LIBARGTABLE2_MINOR_VERSION)
-LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_MINOR_VERSION).tar.gz
-LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-$(LIBARGTABLE2_VERSION)
-LIBARGTABLE2_INSTALL_STAGING = YES
-LIBARGTABLE2_CONF_OPTS = \
-	--disable-example \
-	--disable-kernel-module \
-	--enable-lib \
-	--enable-util
-LIBARGTABLE2_LICENSE = LGPL-2.0+
-LIBARGTABLE2_LICENSE_FILES = COPYING
-
-$(eval $(autotools-package))
@@ -1,246 +0,0 @@
-From 7916eb7ba08e97ac97c71784e15f78e3ffcd838c Mon Sep 17 00:00:00 2001
-From: Filip Wasil <f.wasil@samsung.com>
-Date: Mon, 7 Jul 2025 11:08:35 +0200
-Subject: [PATCH] riscv: Support only RVV 1.0
-
-Reviewed-by: John Bowler <jbowler@acm.org>
-Signed-off-by: Cosmin Truta <ctruta@gmail.com>
-
-Upstream: https://github.com/pnggroup/libpng/commit/7916eb7ba08e97ac97c71784e15f78e3ffcd838c
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
- CMakeLists.txt            |  4 --
- configure.ac              |  4 --
- contrib/riscv-rvv/README  | 85 ---------------------------------------
- contrib/riscv-rvv/linux.c | 36 -----------------
- riscv/riscv_init.c        | 32 ++++-----------
- 5 files changed, 7 insertions(+), 154 deletions(-)
- delete mode 100644 contrib/riscv-rvv/README
- delete mode 100644 contrib/riscv-rvv/linux.c
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f0f3a88846..22b929ba97 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -331,10 +331,6 @@ if(PNG_HARDWARE_OPTIMIZATIONS)
- 
-       check_c_source_compiles("
-         #include <riscv_vector.h>
-        #include <asm/hwcap.h>
-        #ifndef COMPAT_HWCAP_ISA_V /* added in linux-6.5 */
-        #error \"COMPAT_HWCAP_ISA_V is not available\"
-        #endif
-         int main() {
-           const float src[] = { 0.0f, 0.0f, 0.0f, 0.0f };
-           uint64_t ptr[2] = {0x0908060504020100, 0xFFFFFFFF0E0D0C0A};
-diff --git a/configure.ac b/configure.ac
-index 5b5d242c5d..bb40f6d994 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -707,10 +707,6 @@ then
- 
-    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #include <riscv_vector.h>
-#include <asm/hwcap.h>
-#ifndef COMPAT_HWCAP_ISA_V /* added in linux-6.5 */
-#error "COMPAT_HWCAP_ISA_V is not available"
-#endif
- int main() {
-    const float src[] = { 0.0f, 0.0f, 0.0f, 0.0f };
-    uint64_t ptr[2] = {0x0908060504020100, 0xFFFFFFFF0E0D0C0A};
-diff --git a/contrib/riscv-rvv/README b/contrib/riscv-rvv/README
-deleted file mode 100644
-index 56b7cd284b..0000000000
--- a/contrib/riscv-rvv/README
-+++ /dev/null
-@@ -1,85 +0,0 @@
-OPERATING SYSTEM SPECIFIC RISC-V RVV DETECTION
-----------------------------------------------
-
-Detection of the ability to execute RISC-V Vector on a RISC-V processor
-requires operating system support.  (The information is not available in user
-mode.)
-
-HOW TO USE THIS
----------------
-
-This directory contains C code fragments that can be included in
-riscv/riscv_init.c by setting the macro PNG_RISCV_RVV_FILE to the file name
-in "" or <> at build time.  This setting is not recorded in pnglibconf.h and
-can be changed simply by rebuilding riscv/riscv_init.o with the required macro
-definition.
-
-For any of this code to be used the RISC-V Vector code must be enabled and run
-time checks must be supported.  I.e.:
-
-#if PNG_RISCV_RVV_OPT > 0
-#ifdef PNG_RISCV_RVV_CHECK_SUPPORTED
-
-This is done in a 'configure' build by passing configure the argument:
-
-   --enable-riscv-rvv=check
-
-Apart from the basic Linux implementation in contrib/riscv-rvv/linux.c this
-code is unsupported.  That means that it is not even compiled on a regular
-basis and may be broken in any given minor release.
-
-FILE FORMAT
------------
-
-Each file documents its testing status as of the last time it was tested (which
-may have been a long time ago):
-
-STATUS: one of:
-   SUPPORTED: This indicates that the file is included in the regularly
-         performed test builds and bugs are fixed when discovered.
-   COMPILED: This indicates that the code did compile at least once.  See the
-         more detailed description for the extent to which the result was
-         successful.
-   TESTED: This means the code was fully compiled into the libpng test programs
-         and these were run at least once.
-
-BUG REPORTS: an email address to which to send reports of problems
-
-The file is a fragment of C code. It should not define any 'extern' symbols;
-everything should be static.  It must define the function:
-
-static int png_have_rvv(png_structp png_ptr);
-
-That function must return 1 if RISC-V Vector instructions are supported, 0 if
-not.  It must not execute png_error unless it detects a bug.  A png_error will
-prevent the reading of the PNG and in the future, writing too.
-
-BUG REPORTS
------------
-
-If you mail a bug report for any file that is not SUPPORTED there may only be
-limited response.  Consider fixing it and sending a patch to fix the problem -
-this is more likely to result in action.
-
-CONTRIBUTIONS
--------------
-
-You may send contributions of new implementations to
-png-mng-implement@sourceforge.net.  Please write code in strict C90 C where
-possible.  Obviously OS dependencies are to be expected.  If you submit code you
-must have the authors permission and it must have a license that is acceptable
-to the current maintainer; in particular that license must permit modification
-and redistribution.
-
-Please try to make the contribution a single file and give the file a clear and
-unambiguous name that identifies the target OS.  If multiple files really are
-required put them all in a sub-directory.
-
-You must also be prepared to handle bug reports from users of the code, either
-by joining the png-mng-implement mailing list or by providing an email for the
-"BUG REPORTS" entry or both.  Please make sure that the header of the file
-contains the STATUS and BUG REPORTS fields as above.
-
-Please list the OS requirements as precisely as possible.  Ideally you should
-also list the environment in which the code has been tested and certainly list
-any environments where you suspect it might not work.
-diff --git a/contrib/riscv-rvv/linux.c b/contrib/riscv-rvv/linux.c
-deleted file mode 100644
-index c3a0ff808a..0000000000
--- a/contrib/riscv-rvv/linux.c
-+++ /dev/null
-@@ -1,36 +0,0 @@
-/* contrib/riscv-rvv/linux.c
- *
- * Copyright (c) 2023 Google LLC
- * Written by Dragoș Tiselice <dtiselice@google.com>, May 2023.
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * SEE contrib/riscv-rvv/README before reporting bugs
- *
- * STATUS: SUPPORTED
- * BUG REPORTS: png-mng-implement@sourceforge.net
- *
- * png_have_rvv implemented for Linux by looking for COMPAT_HWCAP_ISA_V
- * via hardware capabilites API.
- *
- * This code is strict ANSI-C and is probably moderately portable; it does
- * however use <stdio.h> and it assumes that /proc/cpuinfo is never localized.
- */
-
-#if defined(__linux__)
-#include <asm/hwcap.h>
-#include <sys/auxv.h>
-#endif
-
-static int
-png_have_rvv() {
-#if defined(__linux__)
-   return getauxval (AT_HWCAP) & COMPAT_HWCAP_ISA_V ? 1 : 0;
-#else
-#pragma message(                                                               \
-   "warning: RISC-V Vector not supported for this platform")
-   return 0;
-#endif
-}
-diff --git a/riscv/riscv_init.c b/riscv/riscv_init.c
-index 1d9982436a..11b1cb4fd6 100644
--- a/riscv/riscv_init.c
-+++ b/riscv/riscv_init.c
-@@ -12,25 +12,10 @@
- 
- #ifdef PNG_READ_SUPPORTED
- 
-#if PNG_RISCV_RVV_OPT > 0
-+#if PNG_RISCV_RVV_IMPLEMENTATION > 0
- 
- #include <riscv_vector.h>
- 
-#include <signal.h>
-
-#ifndef PNG_RISCV_RVV_FILE
-#  if defined(__linux__)
-#    define PNG_RISCV_RVV_FILE "contrib/riscv-rvv/linux.c"
-#  else
-#    error "No support for run-time RISC-V Vector checking; use compile-time options"
-#  endif
-#endif
-
-static int png_have_rvv();
-#ifdef PNG_RISCV_RVV_FILE
-#  include PNG_RISCV_RVV_FILE
-#endif
-
- #ifndef PNG_ALIGNED_MEMORY_SUPPORTED
- #  error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED"
- #endif
-@@ -38,16 +23,9 @@ static int png_have_rvv();
- void
- png_init_filter_functions_rvv(png_structp pp, unsigned int bpp)
- {
-+#if __riscv_v == 1000000
-    png_debug(1, "in png_init_filter_functions_rvv");
- 
-   static volatile sig_atomic_t no_rvv = -1; /* not checked */
-
-   if (no_rvv < 0)
-      no_rvv = !png_have_rvv();
-
-   if (no_rvv)
-      return;
-
-    pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_rvv;
- 
-    if (bpp == 3)
-@@ -62,7 +40,11 @@ png_init_filter_functions_rvv(png_structp pp, unsigned int bpp)
-       pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = png_read_filter_row_paeth4_rvv;
-       pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_rvv;
-    }
-+#else
-+   PNG_UNUSED(pp);
-+   PNG_UNUSED(bpp);
-+#endif /* __riscv_v == 1000000 */
- }
- 
-#endif /* PNG_RISCV_RVV_OPT > 0 */
-+#endif /* PNG_RISCV_RVV_IMPLEMENTATION > 0 */
- #endif /* PNG_READ_SUPPORTED */
@@ -1,5 +1,5 @@
-# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.50/
-sha1  ecd92ba84628a8ace430706c85fd2fb26ba0882c  libpng-1.6.50.tar.xz
+# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.51/
+sha1  8fd6ff93769fac269ab9197c106d4e0808521b04  libpng-1.6.51.tar.xz
 # Locally computed:
-sha256  4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-1.6.50.tar.xz
+sha256  a050a892d3b4a7bb010c3a95c7301e49656d72a64f1fc709a90b8aded192bed2  libpng-1.6.51.tar.xz
 sha256  16d9daaafbf63a31a5bdc91d4600972548fef5aaa1244202393288dbd079c49a  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-LIBPNG_VERSION = 1.6.50
+LIBPNG_VERSION = 1.6.51
 LIBPNG_SERIES = 16
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz
 LIBPNG_SITE = https://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION)
@@ -0,0 +1,40 @@
+From 4eb54a811bef43da2be9cc84009567e5d6ca9741 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 May 2024 23:15:59 -0700
+Subject: [PATCH] teamd: Pass correct parameter type to accept API
+
+accept() expects sockaddr as second parameter
+
+int accept (int, struct sockaddr *__restrict, socklen_t *__restrict);
+
+Fixes build with gcc-16 on musl systems
+| ../../git/teamd/teamd_usock.c: In function 'callback_usock':
+| ../../git/teamd/teamd_usock.c:280:40: error: passing argument 2 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types]
+|   280 |         sock = accept(ctx->usock.sock, &addr, &alen);
+|       |                                        ^~~~~
+|       |                                        |
+|       |                                        struct sockaddr_un *
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Jiri Pirko <jiri@nvidia.com>
+
+Upstream: https://github.com/jpirko/libteam/commit/4eb54a811bef43da2be9cc84009567e5d6ca9741
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ teamd/teamd_usock.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/teamd/teamd_usock.c b/teamd/teamd_usock.c
+index 1adfdf8..5895124 100644
+--- a/teamd/teamd_usock.c
+++ b/teamd/teamd_usock.c
+@@ -277,7 +277,7 @@ static int callback_usock(struct teamd_context *ctx, int events, void *priv)
+ 	int err;
+ 
+ 	alen = sizeof(addr);
+-	sock = accept(ctx->usock.sock, &addr, &alen);
+	sock = accept(ctx->usock.sock, (struct sockaddr *)&addr, &alen);
+ 	if (sock == -1) {
+ 		teamd_log_err("usock: Failed to accept connection.");
+ 		return -errno;
@@ -462,9 +462,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "5.10.246"	if BR2_KERNEL_HEADERS_5_10
 	default "5.15.196"	if BR2_KERNEL_HEADERS_5_15
 	default "6.1.158"	if BR2_KERNEL_HEADERS_6_1
-	default "6.6.116"	if BR2_KERNEL_HEADERS_6_6
-	default "6.12.58"	if BR2_KERNEL_HEADERS_6_12
-	default "6.17.8"	if BR2_KERNEL_HEADERS_6_17
+	default "6.6.117"	if BR2_KERNEL_HEADERS_6_6
+	default "6.12.59"	if BR2_KERNEL_HEADERS_6_12
+	default "6.17.9"	if BR2_KERNEL_HEADERS_6_17
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
 	default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
@@ -0,0 +1,36 @@
+From 30a95099f4711d7c5a59526a84e2c73701af3c3c Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Tue, 25 Nov 2025 22:57:21 +0100
+Subject: [PATCH] src/bench.h: include string.h
+
+Fixes build error with newer gcc, detected by buildroot autobuilders:
+https://autobuild.buildroot.net/results/189/189219853fbe1b7daf0aaad29279858c6e60507b//build-end.log
+
+lib_unix.c: In function 'unix_server':
+lib_unix.c:29:9: error: implicit declaration of function 'strcpy' [-Wimplicit-function-declaration]
+   29 |         strcpy(s.sun_path, path);
+      |         ^~~~~~
+lib_unix.c:10:1: note: include '<string.h>' or provide a declaration of 'strcpy'
+
+Upstream: https://github.com/intel/lmbench/pull/41
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ src/bench.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/bench.h b/src/bench.h
+index 3b25a47..f0fd6b7 100644
+--- a/src/bench.h
+++ b/src/bench.h
+@@ -27,6 +27,7 @@ typedef unsigned char bool_t;
+ #ifndef WIN32
+ #include        <strings.h>
+ #endif
+#include        <string.h>
+ #include        <sys/types.h>
+ #ifndef WIN32
+ #include        <sys/mman.h>
+-- 
+2.47.3
+
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  7ae38c9d673559d1d9c1bd72c0bdd4a98a2cae995e87cae98b4604d5951762b8  mongoose-7.19.tar.gz
+sha256  ede2371ff4e41e95fd7b2de83a7df727388307a64d3706046ead320defe35e7e  mongoose-7.20.tar.gz
 sha256  9abc2509d90c01ff2a0c91abf73582cdbcf1d2dbcc0b7973097eced43cf4cdd4  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-MONGOOSE_VERSION = 7.19
+MONGOOSE_VERSION = 7.20
 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION))
 MONGOOSE_LICENSE = GPL-2.0
 MONGOOSE_LICENSE_FILES = LICENSE
@@ -16,7 +16,7 @@ NEARD_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive
 NEARD_CONF_OPTS = --disable-traces

 # Autoreconf is missing the m4/ directory, which might actually be missing
-# iff it was the first argument, but unfortunately we are overriding the
+# if it was the first argument, but unfortunately we are overriding the
 # first include directory above. Thus we need that hook here.
 define NEARD_CREATE_M4
 	mkdir -p $(@D)/m4
@@ -0,0 +1,39 @@
+From af1b7f77975bbb2fcbdb3f005f8cb010d1d33cd3 Mon Sep 17 00:00:00 2001
+From: Adam Gajda <adgajda@users.noreply.github.com>
+Date: Mon, 2 Oct 2023 16:40:31 +0200
+Subject: [PATCH] Fix configuration of NETSNMP_FD_MASK_TYPE
+
+Upstream: https://github.com/net-snmp/net-snmp/commit/af1b7f77975bbb2fcbdb3f005f8cb010d1d33cd3
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ configure                        | 2 +-
+ configure.d/config_project_types | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 50522690f5..5512349926 100755
+--- a/configure
+++ b/configure
+@@ -31577,7 +31577,7 @@ CFLAGS="$CFLAGS -Werror"
+ 
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the type of fd_set::fds_bits" >&5
+ printf %s "checking for the type of fd_set::fds_bits... " >&6; }
+-for type in __fd_mask __int32_t unknown; do
+for type in __fd_mask __int32_t long\ int unknown; do
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+diff --git a/configure.d/config_project_types b/configure.d/config_project_types
+index 1b4c66b95e..a78e8ebb06 100644
+--- a/configure.d/config_project_types
+++ b/configure.d/config_project_types
+@@ -66,7 +66,7 @@ netsnmp_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -Werror"
+ 
+ AC_MSG_CHECKING([for the type of fd_set::fds_bits])
+-for type in __fd_mask __int32_t unknown; do
+for type in __fd_mask __int32_t long\ int unknown; do
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ #include <sys/select.h>
+ #include <stddef.h>
@@ -0,0 +1,81 @@
+From b4598662a39ff6974119c900ea56a4d020eac366 Mon Sep 17 00:00:00 2001
+From: Bart Van Assche <bvanassche@acm.org>
+Date: Wed, 20 Dec 2023 13:08:06 -0800
+Subject: [PATCH] Android: Fix the build
+
+Include <sys/select.h> for the fd_set type. In the configure script,
+check whether 'unsigned long' is the underlying type of fd_set. Use
+u_long instead of ulong.
+
+Upstream: https://github.com/net-snmp/net-snmp/commit/b4598662a39ff6974119c900ea56a4d020eac366
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ agent/mibgroup/ip-mib/data_access/ipaddress_linux.c | 4 ++--
+ configure                                           | 2 +-
+ configure.d/config_project_types                    | 2 +-
+ include/net-snmp/types.h                            | 3 +++
+ 4 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
+index b38beb57dd..232202d0f9 100644
+--- a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
+++ b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
+@@ -50,7 +50,7 @@ int _load_v6(netsnmp_container *container, int idx_offset);
+ int
+ netsnmp_access_ipaddress_extra_prefix_info(int index,
+                                            u_long *preferedlt,
+-                                           ulong *validlt,
+                                           u_long *validlt,
+                                            char *addr);
+ #endif
+ 
+@@ -523,7 +523,7 @@ netsnmp_access_other_info_get(int index, int family)
+ 
+ int
+ netsnmp_access_ipaddress_extra_prefix_info(int index, u_long *preferedlt,
+-                                           ulong *validlt, char *addr)
+                                           u_long *validlt, char *addr)
+ {
+ 
+     struct {
+diff --git a/configure b/configure
+index e7bf859bba..48abcbab11 100755
+--- a/configure
+++ b/configure
+@@ -31577,7 +31577,7 @@ CFLAGS="$CFLAGS -Werror"
+ 
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the type of fd_set::fds_bits" >&5
+ printf %s "checking for the type of fd_set::fds_bits... " >&6; }
+-for type in __fd_mask __int32_t long\ int unknown; do
+for type in __fd_mask __int32_t long 'unsigned long' unknown; do
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+diff --git a/configure.d/config_project_types b/configure.d/config_project_types
+index a78e8ebb06..ac958d6712 100644
+--- a/configure.d/config_project_types
+++ b/configure.d/config_project_types
+@@ -66,7 +66,7 @@ netsnmp_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -Werror"
+ 
+ AC_MSG_CHECKING([for the type of fd_set::fds_bits])
+-for type in __fd_mask __int32_t long\ int unknown; do
+for type in __fd_mask __int32_t long 'unsigned long' unknown; do
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ #include <sys/select.h>
+ #include <stddef.h>
+diff --git a/include/net-snmp/types.h b/include/net-snmp/types.h
+index b78f53ffd7..6228170e5f 100644
+--- a/include/net-snmp/types.h
+++ b/include/net-snmp/types.h
+@@ -23,6 +23,9 @@
+ #endif
+ 
+ #include <sys/types.h>
+#ifdef __ANDROID__
+#include <sys/select.h>
+#endif
+ 
+ #if defined(WIN32) && !defined(cygwin)
+ typedef HANDLE netsnmp_pid_t;
@@ -0,0 +1,35 @@
+From 8ddb983a546f632986a84a784c4625110f7782a2 Mon Sep 17 00:00:00 2001
+From: Arthur de Jong <arthur@arthurdejong.org>
+Date: Sun, 23 Feb 2025 15:22:38 +0100
+Subject: Fix variable name (bool) which is a keyword in C23
+
+Closes https://bugs.debian.org/1097481
+
+Upstream: https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=8ddb983a546f632986a84a784c4625110f7782a2
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ nslcd/cfg.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/nslcd/cfg.c b/nslcd/cfg.c
+index ded797a..b984b0e 100644
+--- a/nslcd/cfg.c
+++ b/nslcd/cfg.c
+@@ -207,10 +207,10 @@ static int get_boolean(const char *filename, int lnr,
+   return parse_boolean(filename, lnr, token);
+ }
+ 
+-static const char *print_boolean(int bool)
+static const char *print_boolean(int value)
+ {
+-  if (bool) return "yes";
+-  else      return "no";
+  if (value) return "yes";
+  else       return "no";
+ }
+ 
+ #define TIME_MINUTES 60
+-- 
+cgit v1.2.3
+
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  4b1b55896939f178321ffe1ec2dc6937ea688d577b3671a5f0edb5c3326dfa3d  open-plc-utils-1ba7d5a042e4e8ff6858b08e113eec5dc4e89cf2.tar.gz
+sha256  e02ffc2d2abde6f31c183b0717742c243b5746d0dbe9ffaa38f6154f14a1bd4d  open-plc-utils-46c3506453c15b873fd6ed3e76c9872cea5e143a.tar.gz
 sha256  3137c632bbcec5e88b72dc13f4fe06ee184eea364fec8f7494bdfa57672ef921  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-OPEN_PLC_UTILS_VERSION = 1ba7d5a042e4e8ff6858b08e113eec5dc4e89cf2
+OPEN_PLC_UTILS_VERSION = 46c3506453c15b873fd6ed3e76c9872cea5e143a
 OPEN_PLC_UTILS_SITE = $(call github,qca,open-plc-utils,$(OPEN_PLC_UTILS_VERSION))
 OPEN_PLC_UTILS_LICENSE = BSD-3-Clause
 OPEN_PLC_UTILS_LICENSE_FILES = LICENSE
@@ -0,0 +1,40 @@
+From b0acf9f0c0aac93bf6f3e196d7a52c9632ff4475 Mon Sep 17 00:00:00 2001
+From: Tony Jones <tonyj@suse.de>
+Date: Fri, 8 Nov 2024 13:13:30 -0800
+Subject: [PATCH] Fix autoconf detection of perf_events
+
+The autoconf check for the presence of perf_events api began failing
+on recent openSUSE builds.
+
+checking kernel supports perf_events... conftest.c: In function 'main':
+conftest.c:37:39: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]
+   37 |                                 pid = getpid();
+      |                                       ^~~~~~
+conftest.c:38:33: error: implicit declaration of function 'syscall' [-Wimplicit-function-declaration]
+   38 |                                 syscall(__NR_perf_event_open, &attr, pid, 0, -1, 0);
+      |                                 ^~~~~~~
+no
+Error: Your kernel does not appear to have the necessary support to run oprofile.
+
+Upstream: https://sourceforge.net/p/oprofile/oprofile/ci/b0acf9f0c0aac93bf6f3e196d7a52c9632ff4475/
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index dc447f89..363bd440 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -116,6 +116,7 @@ if test "$kernel_may_have_perf_events_support" = "yes"; then
+ 		rm -f test-for-PERF_EVENT_OPEN
+ 		AC_LANG_CONFTEST(
+ 			[AC_LANG_PROGRAM([[#include <linux/perf_event.h>
+				#include <unistd.h>
+ 				#include <asm/unistd.h>
+ 				#include <sys/types.h>
+ 				#include <string.h>
+-- 
+2.47.3
+
@@ -13,6 +13,7 @@ OPROFILE_CONF_OPTS = \
 	--disable-account-check \
 	--with-kernel=$(STAGING_DIR)/usr
 # 0002-fix-static-build-with-binutils-2.40.patch
+# 0003-Fix-autoconf-detection-of-perf_events.patch
 OPROFILE_AUTORECONF = YES

 define OPROFILE_CREATE_MISSING_FILES
@@ -11,4 +11,11 @@ PDMENU_LICENSE_FILES = doc/COPYING
 PDMENU_DEPENDENCIES = slang $(TARGET_NLS_DEPENDENCIES)
 PDMENU_INSTALL_TARGET_OPTS = INSTALL_PREFIX=$(TARGET_DIR) install

+# gcc-15 defaults to -std=gnu23 which introduces build failures.
+# We force "-std=gnu17" for gcc version supporting it. Earlier gcc
+# versions will work, since they are using the older standard.
+ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y)
+PDMENU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu17"
+endif
+
 $(eval $(autotools-package))
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e  apcu-5.1.22.tgz
+sha256  1a2c37fcad2ae2a1aea779cd6ca9353d8b38d4e27dde2327c52ff3892dfadb3f  apcu-5.1.27.tgz
 sha256  ecc8b74820c32fb82ddee80446205408585d75d1632ac959fb3cdf8eaf3877b5  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-PHP_APCU_VERSION = 5.1.22
+PHP_APCU_VERSION = 5.1.27
 PHP_APCU_SITE = http://pecl.php.net/get
 PHP_APCU_SOURCE = apcu-$(PHP_APCU_VERSION).tgz
 PHP_APCU_LICENSE = PHP-3.01
@@ -1,751 +0,0 @@
-From c3ecd25a755461009de64b9a3b74b4bad8442938 Mon Sep 17 00:00:00 2001
-From: Matt Saladna <msaladna@apisnetworks.com>
-Date: Sun, 5 Mar 2023 12:37:26 -0500
-Subject: [PATCH] PHP 8 update, use zend_objects or zval depending upon version
- Refrain duplicating objects on __get()
-
-Upstream: https://github.com/derickr/pecl-dbus/pull/13
-Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
---
- dbus.c     | 223 +++++++++++++++++++++++++----------------------------
- php_dbus.h |  22 ++++--
- 2 files changed, 118 insertions(+), 127 deletions(-)
-
-diff --git a/dbus.c b/dbus.c
-index 57672cc10f56..c198a6c5c71a 100644
--- a/dbus.c
-+++ b/dbus.c
-@@ -267,22 +267,22 @@ static zend_object* dbus_object_new_dbus_set(zend_class_entry *class_type TSRMLS
- static zend_object* dbus_object_new_dbus_struct(zend_class_entry *class_type TSRMLS_DC);
- static zend_object* dbus_object_new_dbus_object_path(zend_class_entry *class_type TSRMLS_DC);
- 
-static HashTable *dbus_byte_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_bool_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_int16_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_uint16_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_int32_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_uint32_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_int64_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_uint64_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_double_get_properties(zval *object TSRMLS_DC);
-
-static HashTable *dbus_array_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_dict_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_variant_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_set_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_struct_get_properties(zval *object TSRMLS_DC);
-static HashTable *dbus_object_path_get_properties(zval *object TSRMLS_DC);
-+static HashTable *dbus_byte_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_bool_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_int16_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_uint16_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_int32_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_uint32_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_int64_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_uint64_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_double_get_properties(dbus_object_type *object TSRMLS_DC);
-+
-+static HashTable *dbus_array_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_dict_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_variant_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_set_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_struct_get_properties(dbus_object_type *object TSRMLS_DC);
-+static HashTable *dbus_object_path_get_properties(dbus_object_type *object TSRMLS_DC);
- 
- static int dbus_variant_initialize(php_dbus_variant_obj *dbusobj, zval *data, char *signature TSRMLS_DC);
- 
-@@ -548,7 +548,7 @@ static int dbus_object_compare_dbus(zval *d1, zval *d2 TSRMLS_DC)
- 
- static void dbus_object_free_storage_dbus(void *object TSRMLS_DC)
- {
-	php_dbus_obj *intern = DBUS_ZEND_ZOBJ_TO_OBJ(object, php_dbus_obj);
-+	php_dbus_obj *intern = DBUS_GET_OBJECT(php_dbus_obj, object);
- 
- 	if (intern->con) {
- 		dbus_connection_unref(intern->con);
-@@ -572,9 +572,10 @@ static zend_object* dbus_object_new_dbus_object(zend_class_entry *class_type TSR
- 
- static void dbus_object_free_storage_dbus_object(void *object TSRMLS_DC)
- {
-	php_dbus_object_obj *intern = DBUS_ZEND_ZOBJ_TO_OBJ(object, php_dbus_object_obj);
-+	php_dbus_object_obj *intern = DBUS_GET_OBJECT(php_dbus_object_obj, object);
- 
- 	xmlFreeDoc(intern->introspect_xml_doc);
-+
- 	if (intern->destination) {
- 		efree(intern->destination);
- 	}
-@@ -584,6 +585,7 @@ static void dbus_object_free_storage_dbus_object(void *object TSRMLS_DC)
- 	if (intern->interface) {
- 		efree(intern->interface);
- 	}
-+
- 	zend_object_std_dtor(&intern->std);
- }
- 
-@@ -601,7 +603,7 @@ static zend_object* dbus_object_new_dbus_signal(zend_class_entry *class_type TSR
- 
- static void dbus_object_free_storage_dbus_signal(void *object TSRMLS_DC)
- {
-	php_dbus_signal_obj *intern = DBUS_ZEND_ZOBJ_TO_OBJ(object, php_dbus_signal_obj);
-+	php_dbus_signal_obj *intern = DBUS_GET_OBJECT(php_dbus_signal_obj, object);
- 
- 	dbus_message_unref(intern->msg);
- 
-@@ -631,7 +633,7 @@ static zend_object* dbus_object_new_dbus_array(zend_class_entry *class_type TSRM
- 
- static void dbus_object_free_storage_dbus_array(void *object TSRMLS_DC)
- {
-	php_dbus_array_obj *intern = DBUS_ZEND_ZOBJ_TO_OBJ(object, php_dbus_array_obj);
-+	php_dbus_array_obj *intern = DBUS_GET_OBJECT(php_dbus_array_obj, object);
- 
- 	if (intern->signature) {
- 		efree(intern->signature);
-@@ -654,7 +656,7 @@ static zend_object* dbus_object_new_dbus_dict(zend_class_entry *class_type TSRML
- 
- static void dbus_object_free_storage_dbus_dict(void *object TSRMLS_DC)
- {
-	php_dbus_dict_obj *intern = DBUS_ZEND_ZOBJ_TO_OBJ(object, php_dbus_dict_obj);
-+	php_dbus_dict_obj *intern = DBUS_GET_OBJECT(php_dbus_dict_obj, object);
- 
- 	if (intern->signature) {
- 		efree(intern->signature);
-@@ -677,11 +679,14 @@ static zend_object* dbus_object_new_dbus_variant(zend_class_entry *class_type TS
- 
- static void dbus_object_free_storage_dbus_variant(void *object TSRMLS_DC)
- {
-	php_dbus_variant_obj *intern = DBUS_ZEND_ZOBJ_TO_OBJ(object, php_dbus_variant_obj);
-+	php_dbus_variant_obj *intern = DBUS_GET_OBJECT(php_dbus_variant_obj, object);
- 
- 	if (intern->signature) {
- 		efree(intern->signature);
- 	}
-+	if (intern->data) {
-+		efree(intern->data);
-+	}
- 
- 	zend_object_std_dtor(&intern->std);
- }
-@@ -700,7 +705,7 @@ static zend_object* dbus_object_new_dbus_set(zend_class_entry *class_type TSRMLS
- 
- static void dbus_object_free_storage_dbus_set(void *object TSRMLS_DC)
- {
-	php_dbus_set_obj *intern = DBUS_ZEND_ZOBJ_TO_OBJ(object, php_dbus_set_obj);
-+	php_dbus_set_obj *intern = DBUS_GET_OBJECT(php_dbus_set_obj, object);
- 
- 	if (intern->elements) {
- 		int i;
-@@ -720,6 +725,7 @@ static void dbus_object_free_storage_dbus_set(void *object TSRMLS_DC)
- static inline zend_object* dbus_object_new_dbus_struct_ex(zend_class_entry *class_type, php_dbus_struct_obj **ptr TSRMLS_DC)
- {
- 	php_dbus_struct_obj *intern;
-+
- 	DBUS_ZEND_OBJECT_INIT_RETURN(intern, class_type, dbus_struct);
- }
- 
-@@ -730,7 +736,7 @@ static zend_object* dbus_object_new_dbus_struct(zend_class_entry *class_type TSR
- 
- static void dbus_object_free_storage_dbus_struct(void *object TSRMLS_DC)
- {
-	php_dbus_struct_obj *intern = DBUS_ZEND_ZOBJ_TO_OBJ(object, php_dbus_struct_obj);
-+	php_dbus_struct_obj *intern = DBUS_GET_OBJECT(php_dbus_struct_obj, object);
- 
- 	zend_object_std_dtor(&intern->std);
- }
-@@ -749,7 +755,7 @@ static zend_object* dbus_object_new_dbus_object_path(zend_class_entry *class_typ
- 
- static void dbus_object_free_storage_dbus_object_path(void *object TSRMLS_DC)
- {
-	php_dbus_object_path_obj *intern = DBUS_ZEND_ZOBJ_TO_OBJ(object, php_dbus_object_path_obj);
-+	php_dbus_object_path_obj *intern = DBUS_GET_OBJECT(php_dbus_object_path_obj, object);
- 
- 	zend_object_std_dtor(&intern->std);
- }
-@@ -768,27 +774,19 @@ static void dbus_object_free_storage_dbus_object_path(void *object TSRMLS_DC)
-  \
- 	static void dbus_object_free_storage_dbus_##t(void *object TSRMLS_DC) \
- 	{ \
-		php_dbus_##t##_obj *intern = DBUS_ZEND_ZOBJ_TO_OBJ(object, php_dbus_##t##_obj); \
-+		php_dbus_##t##_obj *intern = DBUS_GET_OBJECT(php_dbus_##t##_obj, object); \
-  \
- 		zend_object_std_dtor(&intern->std); \
- 	} \
-  \
-	static HashTable *dbus_##t##_get_properties(zval *object TSRMLS_DC) \
-+	static HashTable *dbus_##t##_get_properties(dbus_object_type *object TSRMLS_DC) \
- 	{ \
- 		HashTable *props; \
- 		zval *zv; \
- 		php_dbus_##t##_obj *intern; \
- \
-		DBUS_ZEND_GET_ZVAL_OBJECT(object, intern, php_dbus_##t##_obj); \
-		DBUS_ZEND_MAKE_STD_ZVAL(zv); \
-		DBUS_ZEND_ZVAL_TYPE_P(zv) = pt; \
-		(*zv).value.pf = intern->data; \
- \
-		props = intern->std.properties; \
- \
-		DBUS_ZEND_HASH_UPDATE(props, "value", &zv); \
- \
-		return props; \
-+                                                \
-+        props = zend_std_get_properties(object);\
-+		return props;                                 \
- 	}
- 
- 
-@@ -810,10 +808,6 @@ static zval * dbus_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC)
- 	}
- 
- 	object_init_ex(object, pce);
-	Z_TYPE_INFO_P(object) = IS_OBJECT_EX;
-	Z_SET_REFCOUNT_P(object, 1);
-	if (Z_ISREF_P(object))
-		ZVAL_UNREF(object);
- 
- 	return object;
- }
-@@ -848,7 +842,7 @@ PHP_METHOD(Dbus, __construct)
- 
- 	dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC);
- 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ll", &type, &introspect)) {
-		DBUS_ZEND_GET_ZVAL_OBJECT(getThis(), dbus, php_dbus_obj);
-+		dbus = DBUS_ZVAL_GET_OBJECT(php_dbus_obj, getThis());
- 		dbus_initialize(dbus, type, introspect TSRMLS_CC);
- 	}
- 	dbus_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
-@@ -930,13 +924,13 @@ PHP_METHOD(DbusObject, __construct)
- 
- 	dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC);
- 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Osss!",
-		&object, dbus_ce_dbus,
-		&destination, &destination_len, &path, &path_len,
-		&interface, &interface_len))
-+										 &object, dbus_ce_dbus,
-+										 &destination, &destination_len, &path, &path_len,
-+										 &interface, &interface_len))
- 	{
- 		DBUS_ZEND_ADDREF_P(object);
-		DBUS_ZEND_GET_ZVAL_OBJECT(object, dbus, php_dbus_obj);
-		DBUS_ZEND_GET_ZVAL_OBJECT(getThis(), dbus_object, php_dbus_object_obj);
-+		dbus = DBUS_ZVAL_GET_OBJECT(php_dbus_obj, object);
-+		dbus_object = DBUS_ZVAL_GET_OBJECT(php_dbus_object_obj, getThis());
- 		dbus_object_initialize(dbus_object, dbus, destination, path, interface TSRMLS_CC);
- 		if (dbus->useIntrospection) {
- 			php_dbus_introspect(dbus_object, dbus, destination, path, interface TSRMLS_CC);
-@@ -959,13 +953,13 @@ PHP_METHOD(Dbus, createProxy)
- 
- 	dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC);
- 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss!",
-		&destination, &destination_len, &path, &path_len,
-		&interface, &interface_len))
-+										 &destination, &destination_len, &path, &path_len,
-+										 &interface, &interface_len))
- 	{
-		DBUS_ZEND_GET_ZVAL_OBJECT(object, dbus, php_dbus_obj);
-+		dbus = DBUS_ZVAL_GET_OBJECT(php_dbus_obj, object);
- 		DBUS_ZEND_ADDREF_P(object);
- 		dbus_instantiate(dbus_ce_dbus_object, return_value TSRMLS_CC);
-		DBUS_ZEND_GET_ZVAL_OBJECT(return_value, dbus_object, php_dbus_object_obj);
-+		dbus_object = DBUS_ZVAL_GET_OBJECT(php_dbus_object_obj, return_value);
- 		dbus_object_initialize(dbus_object, dbus, destination, path, interface TSRMLS_CC);
- 		if (dbus->useIntrospection) {
- 			php_dbus_introspect(dbus_object, dbus, destination, path, interface TSRMLS_CC);
-@@ -979,7 +973,7 @@ static void php_dbus_accept_incoming_signal(DBusMessage *msg, zval **return_valu
- {
- 	php_dbus_signal_obj *signalobj;
- 	dbus_instantiate(dbus_ce_dbus_signal, *return_value TSRMLS_CC);
-	DBUS_ZEND_GET_ZVAL_OBJECT(*return_value, signalobj, php_dbus_signal_obj);
-+	signalobj = DBUS_ZVAL_GET_OBJECT(php_dbus_signal_obj, *return_value);
- 	signalobj->msg = msg;
- 	signalobj->direction = PHP_DBUS_SIGNAL_IN;
- }
-@@ -1114,7 +1108,7 @@ PHP_METHOD(Dbus, waitLoop)
- 		RETURN_FALSE;
- 	}
- 
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, dbus, php_dbus_obj);
-+	dbus = DBUS_ZVAL_GET_OBJECT(php_dbus_obj, object);
- 
- 	dbus_connection_read_write(dbus->con, timeout);
- 	msg = dbus_connection_pop_message(dbus->con);
-@@ -1151,7 +1145,7 @@ PHP_METHOD(Dbus, requestName)
- 		RETURN_FALSE;
- 	}
- 
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, dbus, php_dbus_obj);
-+	dbus = DBUS_ZVAL_GET_OBJECT(php_dbus_obj, object);
- 	dbus_error_init(&err);
- 
- 	/* request our name on the bus and check for errors */
-@@ -1180,7 +1174,7 @@ PHP_METHOD(Dbus, registerObject)
- 		&class, &class_len)) {
- 		RETURN_FALSE;
- 	}
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, dbus, php_dbus_obj);
-+	dbus = DBUS_ZVAL_GET_OBJECT(php_dbus_obj, object);
- 
- 	/* Create the key out of the path and interface */
- 	spprintf(&key, 0, "%s:%s", path, interface ? interface : "(null)");
-@@ -1459,7 +1453,7 @@ PHP_DBUS_APPEND_TYPE_FUNC(uint64, UINT64);
- #define PHP_DBUS_MARSHAL_TO_DBUS_CASE(t) \
- 	if (obj->ce == dbus_ce_dbus_##t) { \
- 		php_dbus_##t##_obj *_val = \
-			DBUS_ZEND_ZOBJ_TO_OBJ(obj, php_dbus_##t##_obj); \
-+			DBUS_GET_OBJECT(php_dbus_##t##_obj, obj); \
- 		dbus_append_var_##t(iter, _val->data); \
- 	}
- 
-@@ -1506,27 +1500,27 @@ static int dbus_append_var(zval **val, DBusMessageIter *iter, char *type_hint TS
- 			obj = Z_OBJ_P(*val);
- 			if (obj->ce == dbus_ce_dbus_array) {
- 				dbus_append_var_array(iter,
-					DBUS_ZEND_ZOBJ_TO_OBJ(obj, php_dbus_array_obj) TSRMLS_CC);
-+					DBUS_GET_OBJECT(php_dbus_array_obj, obj) TSRMLS_CC);
- 			}
- 			if (obj->ce == dbus_ce_dbus_dict) {
- 				dbus_append_var_dict(iter,
-					DBUS_ZEND_ZOBJ_TO_OBJ(obj, php_dbus_dict_obj) TSRMLS_CC);
-+					DBUS_GET_OBJECT(php_dbus_dict_obj, obj) TSRMLS_CC);
- 			}
- 			if (obj->ce == dbus_ce_dbus_variant) {
- 				dbus_append_var_variant(iter,
-					DBUS_ZEND_ZOBJ_TO_OBJ(obj, php_dbus_variant_obj) TSRMLS_CC);
-+					DBUS_GET_OBJECT(php_dbus_variant_obj, obj) TSRMLS_CC);
- 			}
- 			if (obj->ce == dbus_ce_dbus_set) {
- 				dbus_append_var_set(iter,
-					DBUS_ZEND_ZOBJ_TO_OBJ(obj, php_dbus_set_obj) TSRMLS_CC);
-+					DBUS_GET_OBJECT(php_dbus_set_obj, obj) TSRMLS_CC);
- 			}
- 			if (obj->ce == dbus_ce_dbus_struct) {
- 				dbus_append_var_struct(iter,
-					DBUS_ZEND_ZOBJ_TO_OBJ(obj, php_dbus_struct_obj) TSRMLS_CC);
-+					DBUS_GET_OBJECT(php_dbus_struct_obj, obj) TSRMLS_CC);
- 			}
- 			if (obj->ce == dbus_ce_dbus_object_path) {
- 				dbus_append_var_object_path(iter,
-					DBUS_ZEND_ZOBJ_TO_OBJ(obj, php_dbus_object_path_obj) TSRMLS_CC);
-+					DBUS_GET_OBJECT(php_dbus_object_path_obj, obj) TSRMLS_CC);
- 			}
- 			PHP_DBUS_MARSHAL_TO_DBUS_CASE(byte);
- 			PHP_DBUS_MARSHAL_TO_DBUS_CASE(bool);
-@@ -1599,7 +1593,7 @@ static zval *php_dbus_to_zval(DBusMessageIter *args, zval **key TSRMLS_DC)
- 					if (new_key) {
- 						if (!init) {
- 							dbus_instantiate(dbus_ce_dbus_dict, return_value TSRMLS_CC);
-							DBUS_ZEND_GET_ZVAL_OBJECT(return_value, dictobj, php_dbus_dict_obj);
-+							dictobj = DBUS_ZVAL_GET_OBJECT(php_dbus_dict_obj, return_value);
- 							dictobj->type = php_dbus_fetch_child_type(val TSRMLS_CC);
- 							DBUS_ZEND_ALLOC_ZVAL(dictobj->elements);
- 							array_init(dictobj->elements);
-@@ -1611,7 +1605,7 @@ static zval *php_dbus_to_zval(DBusMessageIter *args, zval **key TSRMLS_DC)
- 						} else if (val && Z_TYPE_P(new_key) == IS_OBJECT) {
- 							zend_object *obj = Z_OBJ_P(new_key);
- 							if (obj->ce == dbus_ce_dbus_object_path) {
-								php_dbus_object_path_obj *intern = DBUS_ZEND_ZOBJ_TO_OBJ(obj, php_dbus_object_path_obj);
-+								php_dbus_object_path_obj *intern = DBUS_GET_OBJECT(php_dbus_object_path_obj, obj);
- 								add_assoc_zval_ex(dictobj->elements, intern->path, strlen(intern->path), val);
- 							}
- 						} else if (val && Z_TYPE_P(new_key) == IS_LONG) {
-@@ -1620,7 +1614,7 @@ static zval *php_dbus_to_zval(DBusMessageIter *args, zval **key TSRMLS_DC)
- 					} else {
- 						if (!init) {
- 							dbus_instantiate(dbus_ce_dbus_array, return_value TSRMLS_CC);
-							DBUS_ZEND_GET_ZVAL_OBJECT(return_value, arrayobj, php_dbus_array_obj);
-+							arrayobj = DBUS_ZVAL_GET_OBJECT(php_dbus_array_obj, return_value);
- 							arrayobj->type = val ? php_dbus_fetch_child_type(val TSRMLS_CC) : DBUS_TYPE_INVALID;
- 							DBUS_ZEND_ALLOC_ZVAL(arrayobj->elements);
- 							array_init(arrayobj->elements);
-@@ -1655,7 +1649,7 @@ static zval *php_dbus_to_zval(DBusMessageIter *args, zval **key TSRMLS_DC)
- 				val = php_dbus_to_zval(&subiter, &new_key TSRMLS_CC);
- 
- 				dbus_instantiate(dbus_ce_dbus_variant, return_value TSRMLS_CC);
-				DBUS_ZEND_GET_ZVAL_OBJECT(return_value, variantobj, php_dbus_variant_obj);
-+				variantobj = DBUS_ZVAL_GET_OBJECT(php_dbus_variant_obj, return_value);
- 				variantobj->data = val;
- 			}
- 			break;
-@@ -1664,7 +1658,7 @@ static zval *php_dbus_to_zval(DBusMessageIter *args, zval **key TSRMLS_DC)
- 				php_dbus_struct_obj *structobj;
- 
- 				dbus_instantiate(dbus_ce_dbus_struct, return_value TSRMLS_CC);
-				DBUS_ZEND_GET_ZVAL_OBJECT(return_value, structobj, php_dbus_struct_obj);
-+				structobj = DBUS_ZVAL_GET_OBJECT(php_dbus_struct_obj, return_value);
- 				DBUS_ZEND_ALLOC_ZVAL(structobj->elements);
- 				array_init(structobj->elements);
- 
-@@ -1682,7 +1676,7 @@ static zval *php_dbus_to_zval(DBusMessageIter *args, zval **key TSRMLS_DC)
- 				dbus_int64_t stat;
- 
- 				dbus_instantiate(dbus_ce_dbus_object_path, return_value TSRMLS_CC);
-				DBUS_ZEND_GET_ZVAL_OBJECT(return_value, object_pathobj, php_dbus_object_path_obj);
-+				object_pathobj = DBUS_ZVAL_GET_OBJECT(php_dbus_object_path_obj, return_value);
- 				dbus_message_iter_get_basic(args, &stat);
- 				object_pathobj->path = estrdup((char*) stat);
- 			}
-@@ -1766,7 +1760,7 @@ static int php_dbus_handle_reply(zval *return_value, DBusMessage *msg, int alway
- 			size_t i = 0;
- 
- 			dbus_instantiate(dbus_ce_dbus_set, return_value TSRMLS_CC);
-			DBUS_ZEND_GET_ZVAL_OBJECT(return_value, set, php_dbus_set_obj);
-+			set = DBUS_ZVAL_GET_OBJECT(php_dbus_set_obj, return_value);
- 			set->elements = (zval **) safe_emalloc(sizeof(zval*), 64, 0);
- 
- 			do {
-@@ -1806,7 +1800,8 @@ PHP_METHOD(DbusObject, __call)
- 		"Osz", &object, dbus_ce_dbus_object, &name, &name_len, &data)) {
- 		RETURN_FALSE;
- 	}
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, dbus_object, php_dbus_object_obj);
-+
-+	dbus_object = DBUS_ZVAL_GET_OBJECT(php_dbus_object_obj, object);
- 
- 	dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC);
- 
-@@ -1859,7 +1854,7 @@ PHP_METHOD(Dbus, addWatch)
- 		"O|ss", &object, dbus_ce_dbus, &interface, &interface_len, &member, &member_len)) {
- 		RETURN_FALSE;
- 	}
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, dbus, php_dbus_obj);
-+	dbus = DBUS_ZVAL_GET_OBJECT(php_dbus_obj, object);
- 
- 	dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC);
- 
-@@ -1912,8 +1907,8 @@ PHP_METHOD(DbusSignal, __construct)
- 		&signal, &signal_len))
- 	{
- 		DBUS_ZEND_ADDREF_P(object);
-		DBUS_ZEND_GET_ZVAL_OBJECT(object, dbus, php_dbus_obj);
-		DBUS_ZEND_GET_ZVAL_OBJECT(getThis(), signal_object, php_dbus_signal_obj);
-+		dbus = DBUS_ZVAL_GET_OBJECT(php_dbus_obj, object);
-+		signal_object = DBUS_ZVAL_GET_OBJECT(php_dbus_signal_obj, getThis());
- 		dbus_signal_initialize(signal_object, dbus, object_name, interface, signal TSRMLS_CC);
- 	}
- 	dbus_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
-@@ -1933,7 +1928,7 @@ PHP_METHOD(DbusSignal, matches)
- 		"Oss", &object, dbus_ce_dbus_signal, &interface, &interface_len, &method, &method_len)) {
- 		RETURN_FALSE;
- 	}
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, signal_obj, php_dbus_signal_obj);
-+	signal_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_signal_obj, object);
- 
- 	if (dbus_message_is_signal(signal_obj->msg, interface, method)) {
- 		RETURN_TRUE;
-@@ -1950,7 +1945,7 @@ PHP_METHOD(DbusSignal, getData)
- 		"O", &object, dbus_ce_dbus_signal)) {
- 		RETURN_FALSE;
- 	}
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, signal_obj, php_dbus_signal_obj);
-+	signal_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_signal_obj, object);
- 
- 	if (signal_obj->direction == PHP_DBUS_SIGNAL_OUT) {
- 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "This signal is outgoing, and therefore does not have data.");
-@@ -1969,7 +1964,7 @@ PHP_METHOD(DbusSignal, send)
- 	dbus_uint32_t serial = 0;
- 
- 	dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC);
-	DBUS_ZEND_GET_ZVAL_OBJECT(getThis(), signal_obj, php_dbus_signal_obj);
-+	signal_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_signal_obj, getThis());
- 
- 	if (signal_obj->direction == PHP_DBUS_SIGNAL_IN) {
- 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "This signal is incoming, and therefore can not be send.");
-@@ -2015,15 +2010,15 @@ static int dbus_array_initialize(php_dbus_array_obj *dbusobj, long type, zval *e
- 	return 1;
- }
- 
-static HashTable *dbus_array_get_properties(zval *object TSRMLS_DC)
-+static HashTable *dbus_array_get_properties(dbus_object_type *object TSRMLS_DC)
- {
- 	HashTable *props;
- 	php_dbus_array_obj *array_obj;
- 	zval *sig;
- 
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, array_obj, php_dbus_array_obj);
-+	array_obj = DBUS_OBJ_WRAPPER(php_dbus_array_obj, object);
- 
-	props = array_obj->std.properties;
-+	props = zend_std_get_properties(object);
- 	if (array_obj->signature) {
- 		DBUS_ZEND_MAKE_STD_ZVAL(sig);
- 		DBUS_ZVAL_STRING(sig, array_obj->signature, 1);
-@@ -2051,7 +2046,7 @@ PHP_METHOD(DbusArray, __construct)
- 
- 	dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC);
- 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "la|s", &type, &array, &signature, &signature_len)) {
-		DBUS_ZEND_GET_ZVAL_OBJECT(getThis(), array_obj, php_dbus_array_obj);
-+		array_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_array_obj, getThis());
- 		dbus_array_initialize(array_obj, type, array, signature TSRMLS_CC);
- 	}
- 	dbus_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
-@@ -2067,7 +2062,7 @@ PHP_METHOD(DbusArray, getData)
- 		"O", &object, dbus_ce_dbus_array)) {
- 		RETURN_FALSE;
- 	}
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, array_obj, php_dbus_array_obj);
-+	array_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_array_obj, object);
- 	*return_value = *array_obj->elements;
- 	zval_copy_ctor(return_value);
- }
-@@ -2085,15 +2080,15 @@ static int dbus_dict_initialize(php_dbus_dict_obj *dbusobj, long type, zval *ele
- 	return 1;
- }
- 
-static HashTable *dbus_dict_get_properties(zval *object TSRMLS_DC)
-+static HashTable *dbus_dict_get_properties(dbus_object_type *object TSRMLS_DC)
- {
- 	HashTable *props;
- 	php_dbus_dict_obj *dict_obj;
- 	zval *sig;
- 
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, dict_obj, php_dbus_dict_obj);
-+	dict_obj = DBUS_OBJ_WRAPPER(php_dbus_dict_obj, object);
- 
-	props = dict_obj->std.properties;
-+	props = zend_std_get_properties(object);
- 
- 	if (dict_obj->signature) {
- 		DBUS_ZEND_MAKE_STD_ZVAL(sig);
-@@ -2120,7 +2115,7 @@ PHP_METHOD(DbusDict, __construct)
- 
- 	dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC);
- 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "la|s", &type, &dict, &signature, &signature_len)) {
-		DBUS_ZEND_GET_ZVAL_OBJECT(getThis(), dict_obj, php_dbus_dict_obj);
-+		dict_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_dict_obj, getThis());
- 		dbus_dict_initialize(dict_obj, type, dict, signature TSRMLS_CC);
- 	}
- 	dbus_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
-@@ -2136,7 +2131,7 @@ PHP_METHOD(DbusDict, getData)
- 		"O", &object, dbus_ce_dbus_dict)) {
- 		RETURN_FALSE;
- 	}
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, dict_obj, php_dbus_dict_obj);
-+	dict_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_dict_obj, object);
- 	*return_value = *dict_obj->elements;
- 	zval_copy_ctor(return_value);
- }
-@@ -2152,17 +2147,12 @@ static int dbus_variant_initialize(php_dbus_variant_obj *dbusobj, zval *data, ch
- 	return 1;
- }
- 
-static HashTable *dbus_variant_get_properties(zval *object TSRMLS_DC)
-+static HashTable *dbus_variant_get_properties(dbus_object_type *object TSRMLS_DC)
- {
- 	HashTable *props;
- 	php_dbus_variant_obj *variant_obj;
- 
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, variant_obj, php_dbus_variant_obj);
-
-	props = variant_obj->std.properties;
-
-	DBUS_ZEND_ADDREF_P(variant_obj->data);
-	DBUS_ZEND_HASH_UPDATE(props, "variant", &variant_obj->data);
-+	props = zend_std_get_properties(object);
- 
- 	return props;
- }
-@@ -2179,9 +2169,10 @@ PHP_METHOD(DbusVariant, __construct)
- 
- 	dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC);
- 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &data, &signature, &signature_len)) {
-		DBUS_ZEND_GET_ZVAL_OBJECT(getThis(), variant_obj, php_dbus_variant_obj);
-+		variant_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_variant_obj, getThis());
- 		dbus_variant_initialize(variant_obj, data, signature TSRMLS_CC);
- 	}
-+
- 	dbus_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
- }
- /* }}} */
-@@ -2196,8 +2187,9 @@ PHP_METHOD(DbusVariant, getData)
- 		RETURN_FALSE;
- 	}
- 
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, variant_obj, php_dbus_variant_obj);
-+	variant_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_variant_obj, object);
- 	*return_value = *variant_obj->data;
-+
- 	zval_copy_ctor(return_value);
- }
- 
-@@ -2219,14 +2211,14 @@ static int dbus_set_initialize(php_dbus_set_obj *dbusobj, zval **data, int eleme
- 	return 1;
- }
- 
-static HashTable *dbus_set_get_properties(zval *object TSRMLS_DC)
-+static HashTable *dbus_set_get_properties(dbus_object_type *object TSRMLS_DC)
- {
- 	int i;
- 	HashTable *props;
- 	php_dbus_set_obj *set_obj;
- 	zval *set_contents;
- 
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, set_obj, php_dbus_set_obj);
-+	set_obj = DBUS_OBJ_WRAPPER(php_dbus_set_obj, object);
- 
- 	props = set_obj->std.properties;
- 
-@@ -2255,7 +2247,7 @@ PHP_METHOD(DbusSet, __construct)
- 	zval *data = NULL;
- 	data = (zval *) safe_emalloc(elements, sizeof(zval), 1);
- 	if (SUCCESS == zend_get_parameters_array_ex(elements, data)) {
-		DBUS_ZEND_GET_ZVAL_OBJECT(getThis(), set_obj, php_dbus_set_obj);
-+		set_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_set_obj, getThis());
- 		dbus_set_initialize(set_obj, &data, elements TSRMLS_CC);
- 	}
- 	efree(data);
-@@ -2273,7 +2265,7 @@ PHP_METHOD(DbusSet, getData)
- 		"O", &object, dbus_ce_dbus_set)) {
- 		RETURN_FALSE;
- 	}
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, set_obj, php_dbus_set_obj);
-+	set_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_set_obj, object);
- 	array_init(return_value);
- 	for (i = 0; i < set_obj->element_count; i++) {
- 		DBUS_ZEND_ADDREF_P(set_obj->elements[i]);
-@@ -2290,18 +2282,14 @@ static int dbus_struct_initialize(php_dbus_struct_obj *dbusobj, char *signature,
- 	return 1;
- }
- 
-static HashTable *dbus_struct_get_properties(zval *object TSRMLS_DC)
-+static HashTable *dbus_struct_get_properties(dbus_object_type *object TSRMLS_DC)
- {
- 	HashTable *props;
- 	php_dbus_struct_obj *struct_obj;
- 
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, struct_obj, php_dbus_struct_obj);
-
-	props = struct_obj->std.properties;
-
-	DBUS_ZEND_ADDREF_P(struct_obj->elements);
-	DBUS_ZEND_HASH_UPDATE(props, "struct", &struct_obj->elements);
-+	struct_obj = DBUS_OBJ_WRAPPER(php_dbus_struct_obj, object);
- 
-+	props = zend_std_get_properties(object);
- 	return props;
- }
- 
-@@ -2317,7 +2305,7 @@ PHP_METHOD(DbusStruct, __construct)
- 
- 	dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC);
- 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa", &signature, &signature_len, &array)) {
-		DBUS_ZEND_GET_ZVAL_OBJECT(getThis(), struct_obj, php_dbus_struct_obj);
-+		struct_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_struct_obj, getThis());
- 		dbus_struct_initialize(struct_obj, signature, array TSRMLS_CC);
- 	}
- 	dbus_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
-@@ -2333,7 +2321,7 @@ PHP_METHOD(DbusStruct, getData)
- 		"O", &object, dbus_ce_dbus_struct)) {
- 		RETURN_FALSE;
- 	}
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, struct_obj, php_dbus_struct_obj);
-+	struct_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_struct_obj, object);
- 	*return_value = *struct_obj->elements;
- 	zval_copy_ctor(return_value);
- }
-@@ -2345,20 +2333,15 @@ static int dbus_object_path_initialize(php_dbus_object_path_obj *dbusobj, char *
- 	return 1;
- }
- 
-static HashTable *dbus_object_path_get_properties(zval *object TSRMLS_DC)
-+static HashTable *dbus_object_path_get_properties(dbus_object_type *object TSRMLS_DC)
- {
- 	HashTable *props;
- 	php_dbus_object_path_obj *object_path_obj;
- 	zval *path;
- 
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, object_path_obj, php_dbus_object_path_obj);
-
-	props = object_path_obj->std.properties;
-
-	DBUS_ZEND_MAKE_STD_ZVAL(path);
-	DBUS_ZVAL_STRING(path, object_path_obj->path, 1);
-	DBUS_ZEND_HASH_UPDATE(props, "path", &path);
-+	object_path_obj = DBUS_OBJ_WRAPPER(php_dbus_object_path_obj, object);
- 
-+	props = zend_std_get_properties(object);
- 	return props;
- }
- 
-@@ -2373,7 +2356,7 @@ PHP_METHOD(DbusObjectPath, __construct)
- 
- 	dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC);
- 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &path, &path_len)) {
-		DBUS_ZEND_GET_ZVAL_OBJECT(getThis(), object_path_obj, php_dbus_object_path_obj);
-+		object_path_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_object_path_obj, getThis());
- 		dbus_object_path_initialize(object_path_obj, path TSRMLS_CC);
- 	}
- 	dbus_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
-@@ -2389,7 +2372,7 @@ PHP_METHOD(DbusObjectPath, getData)
- 		"O", &object, dbus_ce_dbus_object_path)) {
- 		RETURN_FALSE;
- 	}
-	DBUS_ZEND_GET_ZVAL_OBJECT(object, object_path_obj, php_dbus_object_path_obj);
-+	object_path_obj = DBUS_ZVAL_GET_OBJECT(php_dbus_object_path_obj, object);
- 
- 	RETURN_STRING(object_path_obj->path);
- }
-@@ -2407,7 +2390,7 @@ PHP_METHOD(DbusObjectPath, getData)
- 		dbus_set_error_handling(EH_THROW, NULL TSRMLS_CC); \
- 		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &data)) { \
- 			php_dbus_##s##_obj *dbusobj = NULL; \
-			DBUS_ZEND_GET_ZVAL_OBJECT(getThis(), dbusobj, php_dbus_##s##_obj); \
-+			dbusobj = DBUS_ZVAL_GET_OBJECT(php_dbus_##s##_obj, getThis()); \
- 			dbus_##s##_initialize(dbusobj, (t)data TSRMLS_CC); \
- 		} \
- 		dbus_set_error_handling(EH_NORMAL, NULL TSRMLS_CC); \
-diff --git a/php_dbus.h b/php_dbus.h
-index a080159c407d..fe93dd3a6a1f 100644
--- a/php_dbus.h
-+++ b/php_dbus.h
-@@ -27,13 +27,23 @@
- 
- #include "Zend/zend_hash.h"
- 
-#define PHP_DBUS_VERSION "0.2.0"
-+#define PHP_DBUS_VERSION "0.3.x-dev"
- 
- #if PHP_VERSION_ID >= 80000
- # define TSRMLS_DC
- # define TSRMLS_CC
- # define TSRMLS_D void
- # define TSRMLS_C
-+# define dbus_object_type zend_object
-+# define dbus_object_handlers_dbus_object dbus_object_handlers_zend_object
-+#define DBUS_OBJ_WRAPPER DBUS_GET_OBJECT
-+
-+# define dbus_strip_obj
-+#else
-+# define dbus_object_type zval
-+# define dbus_object_handlers_dbus_object dbus_object_handlers_zval
-+# define dbus_strip_obj(o) Z_OBJ_P(o)
-+#define DBUS_OBJ_WRAPPER DBUS_ZVAL_GET_OBJECT
- #endif
- 
- # define DBUS_ZEND_OBJECT_PROPERTIES_INIT(_objPtr, _ce) \
-@@ -75,6 +85,10 @@
-         } \
-     } while(0)
- 
-+#define DBUS_GET_OBJECT(class_entry, o) (class_entry *)((char *)o - XtOffsetOf(class_entry, std))
-+#define DBUS_ZVAL_GET_OBJECT(class_entry, z) DBUS_GET_OBJECT(class_entry, Z_OBJ_P(z))
-+
-+
- # define DBUS_ZEND_HASH_ADD_PTR(_ht, _key, _ptr, _ptrSz) \
-     zend_hash_str_add_ptr(_ht, _key, strlen(_key), _ptr)
- 
-@@ -120,12 +134,6 @@
-         } \
-     } while (0)
- 
-# define DBUS_ZEND_ZOBJ_TO_OBJ(_zObj, _objType) \
-    (_objType *) ((char *) _zObj - XtOffsetOf(_objType, std))
-
-# define DBUS_ZEND_GET_ZVAL_OBJECT(_zval, _objPtr, _objType) \
-    _objPtr = DBUS_ZEND_ZOBJ_TO_OBJ(Z_OBJ_P(_zval), _objType)
-
- # define DBUS_ZEND_MAKE_STD_ZVAL(_zval) \
-     { \
-         zval tmp; \
-- 
-2.50.0
-
@@ -1,51 +0,0 @@
-From 46a6aa1308b32549625fd7bc265ad011091b3992 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= <alexis.lothore@bootlin.com>
-Date: Tue, 1 Jul 2025 17:12:32 +0200
-Subject: [PATCH] Fix PHP8 compatibility for
- DBUS_ZEND_HASH_GET_CURRENT_KEY_INFO
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-php-pecl-dbus currently does not build with PHP8 because of the
-following error:
-
-  In file included from dbus.c:27:
-  dbus.c: In function 'dbus_append_var_dict':
-  php_dbus.h:108:64: error: passing argument 3 of 'zend_hash_get_current_key' from incompatible pointer type [-Wincompatible-pointer-types]
-    108 |         _info.type = zend_hash_get_current_key(_ht, &tmp_info, &_idx); \
-  dbus.c:1295:17: note: in expansion of macro 'DBUS_ZEND_HASH_GET_CURRENT_KEY_INFO'
-   1295 | DBUS_ZEND_HASH_GET_CURRENT_KEY_INFO(Z_ARRVAL_P(obj->elements), num_index, key);
-        |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  In file included from ../../host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/php/Zend/zend.h:33,
-                   from ../../host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/php/main/php.h:31,
-                   from dbus.c:21:
-  ../../host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/php/Zend/zend_hash.h:269:115: note: expected 'zend_ulong *' {aka 'unsigned int *'} but argument is of type 'ulong *' {aka 'long unsigned int *'}
-    269 | static zend_always_inline int zend_hash_get_current_key(const HashTable *ht, zend_string **str_index, zend_ulong *num_index) {
-        |                                                                                                       ~~~~~~~~~~~~^~~~~~~~~
-
-Fix the build error by explicitely casting the passed index pointer to
-(zend_ulong *)
-
-Upstream: https://github.com/derickr/pecl-dbus/pull/15
-Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
---
- php_dbus.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/php_dbus.h b/php_dbus.h
-index a080159c407d..68aec7bc3c42 100644
--- a/php_dbus.h
-+++ b/php_dbus.h
-@@ -105,7 +105,7 @@
- # define DBUS_ZEND_HASH_GET_CURRENT_KEY_INFO(_ht, _idx, _info) \
-     do { \
-         zend_string *tmp_info = NULL; \
-        _info.type = zend_hash_get_current_key(_ht, &tmp_info, &_idx); \
-+        _info.type = zend_hash_get_current_key(_ht, &tmp_info, (zend_ulong *)&_idx); \
-         if (tmp_info) { \
-             _info.name = ZSTR_VAL(tmp_info); \
-             _info.length = ZSTR_LEN(tmp_info); \
-- 
-2.50.0
-
@@ -1,3 +1,3 @@
 # Locally calculated:
-sha256  652db988457479682ef1bbe00952d746b54150e77f06a4d75ffa3a696f5321ba  php-pecl-dbus-b147624d480c3353e6c700e9a2d0c6f14d853941.tar.gz
+sha256  d35dfe7c2be5602146803b374b295f24ae9aac5aa0efa5fa80021aa8da2d30df  php-pecl-dbus-0.4.1.tar.gz
 sha256  ecc8b74820c32fb82ddee80446205408585d75d1632ac959fb3cdf8eaf3877b5  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-PHP_PECL_DBUS_VERSION = b147624d480c3353e6c700e9a2d0c6f14d853941
+PHP_PECL_DBUS_VERSION = 0.4.1
 PHP_PECL_DBUS_SITE = $(call github,derickr,pecl-dbus,$(PHP_PECL_DBUS_VERSION))
 PHP_PECL_DBUS_LICENSE = PHP-3.01
 PHP_PECL_DBUS_LICENSE_FILES = LICENSE
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  4eb4ee270bbcc5f14195c38f6ee58580e007cf4886ce32e11430318ab5bc2315  xdebug-3.3.1.tgz
+sha256  7592923501e3fdb9741ad35b90e08fc6b3c5dd31eadc4c83b7b3c9dda0627b24  xdebug-3.4.7.tgz
 sha256  bc2aee27f3f0806be39e329d284ddbbfb14602a49af261df305dd6122d988eb0  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-PHP_XDEBUG_VERSION = 3.3.1
+PHP_XDEBUG_VERSION = 3.4.7
 PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz
 PHP_XDEBUG_SITE = https://xdebug.org/files
 PHP_XDEBUG_INSTALL_STAGING = YES
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  5937eb9722ddf6d64626799cfa024598ff2452ea157992e4e67331a253f90236  yaml-2.2.3.tgz
+sha256  bc8404807a3a4dc896b310af21a7f8063aa238424ff77f27eb6ffa88b5874b8a  yaml-2.3.0.tgz
 sha256  68d9700294396c72089bfc7bf38a5b3654a53ae415f3bd37768848c14e86f338  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-PHP_YAML_VERSION = 2.2.3
+PHP_YAML_VERSION = 2.3.0
 PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz
 PHP_YAML_SITE = https://pecl.php.net/get
 PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_FLASK_RESTX
 	bool "python-flask-restx"
+	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-jsonschema, python-referencing -> python-rpds-py
 	select BR2_PACKAGE_PYTHON_ANISO8601 # runtime
 	select BR2_PACKAGE_PYTHON_FLASK # runtime
 	select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime
@@ -12,3 +12,4 @@ PYTHON_PYSOCKS_LICENSE_FILES = LICENSE
 PYTHON_PYSOCKS_SETUP_TYPE = setuptools

 $(eval $(python-package))
+$(eval $(host-python-package))
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/starlette/json
-md5  9e56e4be3ee2a746ee6375fd9e81f61c  starlette-0.48.0.tar.gz
-sha256  7e8cee469a8ab2352911528110ce9088fdc6a37d9876926e73da7ce4aa4c7a46  starlette-0.48.0.tar.gz
+md5  f3479ed026aeaffb43af371d3b7db527  starlette-0.50.0.tar.gz
+sha256  a2a17b22203254bcbc2e1f926d2d55f3f9497f769416b3190768befe598fa3ca  starlette-0.50.0.tar.gz
 # Locally computed sha256 checksums
 sha256  dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf  LICENSE.md
@@ -4,9 +4,9 @@
 #
 ################################################################################

-PYTHON_STARLETTE_VERSION = 0.48.0
+PYTHON_STARLETTE_VERSION = 0.50.0
 PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz
-PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/a7/a5/d6f429d43394057b67a6b5bbe6eae2f77a6bf7459d961fdb224bf206eee6
+PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/ba/b8/73a0e6a6e079a9d9cfa64113d771e421640b6f679a52eeb9b32f72d871a1
 PYTHON_STARLETTE_SETUP_TYPE = hatch
 PYTHON_STARLETTE_LICENSE = BSD-3-Clause
 PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md
@@ -0,0 +1,38 @@
+From 90815a9f2576c2428287a500cab6caeddb80f9a8 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Wed, 5 Feb 2025 13:19:11 +0100
+Subject: [PATCH] sm3600.h: Fix build with standard C23
+
+bool, true and false are keywords in the standard C23 - the sm3600
+backend defines them on its own, which is forbidden with the new
+standard.
+
+The patch adds ifdef guards for the affected typedef - the old code
+will be used for older standards, C23 will define TBool as bool.
+
+Upstream: https://gitlab.com/sane-project/backends/-/commit/90815a9f2576c2428287a500cab6caeddb80f9a8
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ backend/sm3600.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/backend/sm3600.h b/backend/sm3600.h
+index 2ecbeb236..5d8a8d809 100644
+--- a/backend/sm3600.h
+++ b/backend/sm3600.h
+@@ -77,7 +77,11 @@ Start: 2.4.2001
+ 
+ /* ====================================================================== */
+ 
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 202311L
+ typedef enum { false, true } TBool;
+#else
+typedef bool TBool;
+#endif /* GCC < 15 */
+ 
+ typedef SANE_Status TState;
+ 
+-- 
+GitLab
+
@@ -12,6 +12,13 @@ SBC_DEPENDENCIES = host-pkgconf
 SBC_LICENSE := LGPL-2.1+ (library)
 SBC_LICENSE_FILES = COPYING COPYING.LIB

+# gcc-15 defaults to -std=gnu23 which introduces build failures.
+# We force "-std=gnu17" for gcc version supporting it. Earlier gcc
+# versions will work, since they are using the older standard.
+ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y)
+SBC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=gnu17"
+endif
+
 ifeq ($(BR2_PACKAGE_SBC_TOOLS),y)
 SBC_DEPENDENCIES += libsndfile
 SBC_CONF_OPTS += --enable-tools --enable-tester
@@ -23,7 +23,7 @@ SDBUSPLUS_LICENSE = Apache-2.0
 SDBUSPLUS_LICENSE_FILES = LICENSE

 # Autoreconf is missing the m4/ directory, which might actually be missing
-# iff it was the first argument, but unfortunately we are overriding the
+# if it was the first argument, but unfortunately we are overriding the
 # first include directory above. Thus we need that hook here.
 define SDBUSPLUS_CREATE_M4
 	mkdir -p $(@D)/m4
@@ -0,0 +1,50 @@
+From 390974b8a9d5e513d48d794818dbe180e0f80b16 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti@benettiengineering.com>
+Date: Fri, 28 Nov 2025 10:57:41 +0100
+Subject: [PATCH] src/stdlib/SDL_iconv.c: fix types mismatch
+
+When building sdl this error shows up:
+./src/stdlib/SDL_iconv.c: In function 'SDL_iconv':
+./src/stdlib/SDL_iconv.c:50:29: error: passing argument 2 of 'iconv' from incompatible pointer type [-Wincompatible-pointer-types]
+   50 |         retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft);
+      |                             ^~~~~
+      |                             |
+      |                             const char **
+
+Let's pick only this code from upstream commit[1] and left the rest
+untouched.
+
+Upstream: [1]
+
+[1]:
+https://github.com/libsdl-org/SDL-1.2/commit/8a8135d91f9361448521765c9da00401fab866a1
+
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+---
+ src/stdlib/SDL_iconv.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c
+index fa56a99e..369f6881 100644
+--- a/src/stdlib/SDL_iconv.c
+++ b/src/stdlib/SDL_iconv.c
+@@ -43,12 +43,10 @@ size_t SDL_iconv(SDL_iconv_t cd,
+                  const char **inbuf, size_t *inbytesleft,
+                  char **outbuf, size_t *outbytesleft)
+ {
+-	size_t retCode;
+-#ifdef ICONV_INBUF_NONCONST
+-	retCode = iconv(cd, (char **)inbuf, inbytesleft, outbuf, outbytesleft);
+-#else
+-	retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft);
+-#endif
+	/* iconv's second parameter may or may not be `const char const *` depending on the
+	   C runtime's whims. Casting to void * seems to make everyone happy, though. */
+	const size_t retCode = iconv((iconv_t) ((uintptr_t) cd), (void *)inbuf, inbytesleft, outbuf, outbytesleft);
+
+ 	if ( retCode == (size_t)-1 ) {
+ 		switch(errno) {
+ 		    case E2BIG:
+-- 
+2.47.3
+
@@ -25,9 +25,9 @@ endif

 define SKELETON_CUSTOM_CONFIGURE_CMDS
 	support/scripts/check-merged \
-		--type skeleton \
-		$(if $(BR2_ROOTFS_MERGED_USR),--merged-usr) \
-		$(if $(BR2_ROOTFS_MERGED_BIN),--merged-bin) \
+		-t skeleton \
+		$(if $(BR2_ROOTFS_MERGED_USR),-u) \
+		$(if $(BR2_ROOTFS_MERGED_BIN),-b) \
 		$(SKELETON_CUSTOM_PATH)
 endef

@@ -1,8 +0,0 @@
-config BR2_PACKAGE_HOST_STARFIVE_SPLTOOL
-	bool "host starfive-spltool"
-	depends on BR2_riscv
-	help
-	  Add header to the Secondary Program Loader with the 3rd party
-	  software given by Starfive-Tech for their SoCs.
-
-	  https://github.com/starfive-tech/soft_3rdpart/tree/JH7110_VisionFive2_devel/spl_tool
@@ -1,2 +0,0 @@
-# Locally computed
-sha256  f5466225021fbe4e983cc85f32ce11d92ad30689b18e0d1390d16f6bfab74477  starfive-spltool-JH7110_VF2_515_v5.11.3.tar.gz
@@ -1,20 +0,0 @@
-################################################################################
-#
-# starfive-spltool
-#
-################################################################################
-
-STARFIVE_SPLTOOL_VERSION = JH7110_VF2_515_v5.11.3
-STARFIVE_SPLTOOL_SITE = $(call github,starfive-tech,soft_3rdpart,$(STARFIVE_SPLTOOL_VERSION))
-STARFIVE_SPLTOOL_LICENSE = GPL-2.0+
-STARFIVE_SPLTOOL_FILES = spl_tool/LICENSE
-
-define HOST_STARFIVE_SPLTOOL_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/spl_tool
-endef
-
-define HOST_STARFIVE_SPLTOOL_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/spl_tool/spl_tool $(HOST_DIR)/bin/spl_tool
-endef
-
-$(eval $(host-generic-package))
@@ -0,0 +1,42 @@
+From 73d1f5ed2167fca8a1cbfb85f4da123f00e524a1 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Sun, 30 Nov 2025 11:36:10 +0100
+Subject: [PATCH] stress-pthread: fix non-NPTL build
+
+https://github.com/ColinIanKing/stress-ng/commit/15b26e33daaf36acd5eeceaaf6fc954f46792a8b
+added the usage of attr without using HAVE_PTHREAD_ATTR_SETSTACK for
+toolchains without NPTL support.
+
+This patch fixes build errors detected by buildroot autobuilders:
+https://autobuild.buildroot.net/results/d4f/d4fadef213455b1776d93e30e51ffe09fb1879c5/build-end.log
+
+stress-pthread.c: In function 'stress_pthread':
+stress-pthread.c:567:81: error: 'attr' undeclared (first use in this function)
+  567 |                         pthreads[i].ret = pthread_create(&pthreads[i].pthread, &attr,
+
+Upstream: https://github.com/ColinIanKing/stress-ng/pull/593
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ stress-pthread.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/stress-pthread.c b/stress-pthread.c
+index aafcf0f0a..8605b7a1d 100644
+--- a/stress-pthread.c
+++ b/stress-pthread.c
+@@ -564,7 +564,11 @@ static int stress_pthread(stress_args_t *args)
+ 
+ 			pthreads[i].t_create = stress_time_now();
+ 			pthreads[i].t_run = pthreads[i].t_create;
+#if defined(HAVE_PTHREAD_ATTR_SETSTACK)
+ 			pthreads[i].ret = pthread_create(&pthreads[i].pthread, &attr,
+#else
+			pthreads[i].ret = pthread_create(&pthreads[i].pthread, NULL,
+#endif
+ 				stress_pthread_func, (void *)&pargs);
+ 			if (UNLIKELY(pthreads[i].ret)) {
+ 				/* Out of resources, don't try any more */
+-- 
+2.47.3
+
@@ -1,4 +1,4 @@
 # From https://www.swi-prolog.org/download/stable
-sha256  b331637a57c913c49edcfcb10ddcf6c031278ce93d2411d54542778531abb5c7  swipl-9.2.8.tar.gz
+sha256  53f428e2d9bbdf30e53b06c9c42def9a13ff82fc36a111d410fc8b0bc889ee2d  swipl-9.2.9.tar.gz
 # Locally calculated
 sha256  770594d0f4463b71f1485f00e4bc5cf4b6f667d62ef6bc9bde2fee236541992a  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-SWIPL_VERSION = 9.2.8
+SWIPL_VERSION = 9.2.9
 SWIPL_SITE = https://www.swi-prolog.org/download/stable/src
 SWIPL_LICENSE = BSD-2-Clause
 SWIPL_LICENSE_FILES = LICENSE
@@ -32,7 +32,7 @@ endef
 THERMALD_PRE_CONFIGURE_HOOKS += THERMALD_GTK_DOC_HOOK

 # Autoreconf is missing the m4/ directory, which might actually be missing
-# iff it was the first argument, but unfortunately we are overriding the
+# if it was the first argument, but unfortunately we are overriding the
 # first include directory above. Thus we need that hook here.
 define THERMALD_CREATE_M4
 	mkdir -p $(@D)/m4
@@ -0,0 +1,35 @@
+From 218cd7ce34b6dbc86c80f1c781639ea7661d1252 Mon Sep 17 00:00:00 2001
+From: Marcin Serwin <marcin@serwin.dev>
+Date: Thu, 2 Oct 2025 19:30:12 +0200
+Subject: [PATCH] time: fix sighandler prototype for C23
+
+In C23 functions with empty argument list in the prototype are treated
+as taking no arguments. This means that the `int` argument of the
+sighandler must be specified explicitly or the code will fail to
+compile due to mismatched function type.
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+
+Upstream: https://lists.gnu.org/archive/html/bug-time/2025-10/msg00000.html
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ src/time.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/time.c b/src/time.c
+index 7b401bc..88287dd 100644
+--- a/src/time.c
+++ b/src/time.c
+@@ -77,7 +77,7 @@ enum
+ 
+ 
+ /* A Pointer to a signal handler.  */
+-typedef RETSIGTYPE (*sighandler) ();
+typedef RETSIGTYPE (*sighandler) (int);
+ 
+ /* msec = milliseconds = 1/1,000 (1*10e-3) second.
+    usec = microseconds = 1/1,000,000 (1*10e-6) second.  */
+-- 
+2.47.3
+
@@ -0,0 +1,28 @@
+From f812b8d30456c071ee23e9a02d6ce16036fd3f68 Mon Sep 17 00:00:00 2001
+From: Nicholas Marriott <nicholas.marriott@gmail.com>
+Date: Wed, 29 Oct 2025 08:47:45 +0000
+Subject: [PATCH] Cast to avoid warnings on 32-bit architectures. GitHub issue
+ 4597.
+
+Upstream: https://github.com/tmux/tmux/commit/f812b8d30456c071ee23e9a02d6ce16036fd3f68
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+---
+ compat/utf8proc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compat/utf8proc.c b/compat/utf8proc.c
+index dd4ab27f..147da696 100644
+--- a/compat/utf8proc.c
+++ b/compat/utf8proc.c
+@@ -48,7 +48,7 @@ utf8proc_mbtowc(wchar_t *pwc, const char *s, size_t n)
+ 	 * *pwc == -1 indicates invalid codepoint
+ 	 * slen < 0 indicates an error
+ 	 */
+-	slen = utf8proc_iterate(s, n, pwc);
+	slen = utf8proc_iterate(s, n, (utf8proc_int32_t*)pwc);
+ 	if (*pwc == (wchar_t)-1 || slen < 0)
+ 		return (-1);
+ 	return (slen);
+-- 
+2.47.3
+
@@ -1,4 +1,4 @@
-# From https://dist.torproject.org/tor-0.4.8.20.tar.gz.sha256sum
-sha256  1bb22328cdd1ee948647bfced571efa78c12fc5064187b41d5254085b5282fa7  tor-0.4.8.20.tar.gz
+# From https://dist.torproject.org/tor-0.4.8.21.tar.gz.sha256sum
+sha256  eaf6f5b73091b95576945eade98816ddff7cd005befe4d94718a6f766b840903  tor-0.4.8.21.tar.gz
 # Locally computed
 sha256  47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-TOR_VERSION = 0.4.8.20
+TOR_VERSION = 0.4.8.21
 TOR_SITE = https://dist.torproject.org
 TOR_LICENSE = BSD-3-Clause
 TOR_LICENSE_FILES = LICENSE
@@ -70,6 +70,7 @@ config BR2_PACKAGE_UBOOT_TOOLS_MKEFICAPSULE
 	bool "mkeficapsule"
 	depends on !BR2_STATIC_LIBS # gnutls
 	depends on BR2_USE_WCHAR # gnutls
+	select BR2_PACKAGE_GNUTLS
 	help
 	  Install the mkeficapsule tool on the target system

@@ -0,0 +1,41 @@
+From 08ece7871775c0d7bf4fdff64b961cdc256adf6c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Fri, 2 Aug 2024 22:12:03 +0100
+Subject: [PATCH] include/woff2/output.h: add missing <stdint.h> include
+
+Without the change `woff2` build fails on upcoming `gcc-15` as:
+
+    In file included from src/woff2_out.cc:9:
+    include/woff2/output.h:73:25: error: expected ')' before '*' token
+       73 |   WOFF2MemoryOut(uint8_t* buf, size_t buf_size);
+          |                 ~       ^
+          |                         )
+    include/woff2/output.h:79:3: error: 'uint8_t' does not name a type
+       79 |   uint8_t* buf_;
+          |   ^~~~~~~
+    include/woff2/output.h:16:1: note: 'uint8_t' is defined in header '<cstdint>';
+      this is probably fixable by adding '#include <cstdint>'
+       15 | #include <string>
+      +++ |+#include <cstdint>
+       16 |
+
+Upstream: https://github.com/google/woff2/pull/176
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ include/woff2/output.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/woff2/output.h b/include/woff2/output.h
+index dc78ccf..b12d538 100644
+--- a/include/woff2/output.h
+++ b/include/woff2/output.h
+@@ -9,6 +9,8 @@
+ #ifndef WOFF2_WOFF2_OUT_H_
+ #define WOFF2_WOFF2_OUT_H_
+ 
+#include <stdint.h>
+
+ #include <algorithm>
+ #include <cstring>
+ #include <memory>
@@ -0,0 +1,47 @@
+From 0b3e7284c7fa20dd27f8a584f8db417d1d6fa27b Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Fri, 14 Feb 2025 09:45:10 +0100
+Subject: configure: additionally get icu-uc from pkg-config
+
+Upstream libicu changed its pkgconfig files[0] in version 76 to require
+callers to call out to each .pc file they need for the libraries they
+want to link against.  This apparently reduces overlinking, at a cost of
+needing the world to fix themselves up.
+
+This patch fixes the following build error with icu 76, also seen by
+Fedora[1]:
+
+	    /bin/ld: unicrash.o: undefined reference to symbol 'uiter_setString_76'
+	    /bin/ld: /lib/libicuuc.so.76: error adding symbols: DSO missing from command line
+	    collect2: error: ld returned 1 exit status
+	    make[2]: *** [../include/buildrules:65: xfs_scrub] Error 1
+	    make[1]: *** [include/buildrules:35: scrub] Error 2
+
+Link: https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56 [0]
+Link: https://src.fedoraproject.org/rpms/xfsprogs/c/624b0fdf7b2a31c1a34787b04e791eee47c97340 [1]
+Signed-off-by: Alyssa Ross <hi@alyssa.is>
+Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
+
+Upstream: https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=0b3e7284c7fa20dd27f8a584f8db417d1d6fa27b
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ m4/package_icu.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'm4/package_icu.m4')
+
+diff --git a/m4/package_icu.m4 b/m4/package_icu.m4
+index 3ccbe0cc98..6b89c874f1 100644
+--- a/m4/package_icu.m4
+++ b/m4/package_icu.m4
+@@ -1,5 +1,5 @@
+ AC_DEFUN([AC_HAVE_LIBICU],
+-  [ PKG_CHECK_MODULES([libicu], [icu-i18n], [have_libicu=yes], [have_libicu=no])
+  [ PKG_CHECK_MODULES([libicu], [icu-i18n icu-uc], [have_libicu=yes], [have_libicu=no])
+     AC_SUBST(have_libicu)
+     AC_SUBST(libicu_CFLAGS)
+     AC_SUBST(libicu_LIBS)
+-- 
+cgit 1.2.3-korg
+
@@ -10,6 +10,15 @@ XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz
 XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers)
 XFSPROGS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1

+# 0002-configure-additionally-get-icu-uc-from-pkg-config.patch
+XFSPROGS_AUTORECONF = YES
+
+# restore upstream install-sh script overwritten by autoreconf
+define XFSPROGS_FIX_INSTALL_SH
+	mv $(@D)/install-sh~ $(@D)/install-sh
+endef
+XFSPROGS_POST_CONFIGURE_HOOKS = XFSPROGS_FIX_INSTALL_SH
+
 XFSPROGS_DEPENDENCIES = inih liburcu util-linux

 XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes PLATFORM="linux"
@@ -0,0 +1,42 @@
+From 7b469b4220f96fb3d036cf68cd7bd30bd39e61d2 Mon Sep 17 00:00:00 2001
+From: Christopher Fore <csfore@posteo.net>
+Date: Wed, 14 Aug 2024 21:02:32 -0400
+Subject: [PATCH] emitterutils: Explicitly include <cstdint>
+
+GCC 15 will no longer include it by default, resulting in build
+failures in projects that do not explicitly include it.
+
+Error:
+src/emitterutils.cpp:221:11: error: 'uint16_t' was not declared in this scope
+  221 | std::pair<uint16_t, uint16_t> EncodeUTF16SurrogatePair(int codePoint) {
+      |           ^~~~~~~~
+src/emitterutils.cpp:13:1: note: 'uint16_t' is defined in header '<cstdint>';
+this is probably fixable by adding '#include <cstdint>'
+   12 | #include "yaml-cpp/null.h"
+  +++ |+#include <cstdint>
+   13 | #include "yaml-cpp/ostream_wrapper.h"
+
+Tests pass.
+
+Closes: #1307
+See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
+See-also: https://bugs.gentoo.org/937412
+Signed-off-by: Christopher Fore <csfore@posteo.net>
+
+Upstream: https://github.com/jbeder/yaml-cpp/commit/7b469b4220f96fb3d036cf68cd7bd30bd39e61d2
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ src/emitterutils.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/emitterutils.cpp b/src/emitterutils.cpp
+index fc41011a5..f801b1d0c 100644
+--- a/src/emitterutils.cpp
+++ b/src/emitterutils.cpp
+@@ -1,4 +1,5 @@
+ #include <algorithm>
+#include <cstdint>
+ #include <iomanip>
+ #include <sstream>
+ 
@@ -23,9 +23,9 @@
 #                   to /usr/bin)
 #
 # Input:
-#   --type TYPE     the type of root to check: 'skeleton' or 'overlay'
-#   --merged-usr    check for merged /usr
-#   --merged-bin    check for merged /usr/bin
+#   -t TYPE         the type of root to check: 'skeleton' or 'overlay'
+#   -u              check for merged /usr
+#   -b              check for merged /usr/bin
 #   $*:             the root directories (skeleton, overlays) to check
 # Output:
 #   stdout:         the list of non-compliant paths (empty if compliant).
@@ -34,34 +34,23 @@
 #   !0:             if any directory to check is improperly merged
 #

-opts="type:,merged-usr,merged-bin"
-ARGS="$(getopt -n check-merged -o "" -l "${opts}" -- "${@}")" || exit 1
-eval set -- "${ARGS}"
-
 type=
 merged_usr=false
 merged_bin=false
-while :; do
-	case "${1}" in
-	(--type)
-		type="${2}"
-		shift 2
-		;;
-	(--merged-usr)
-		merged_usr=true
-		shift
-		;;
-	(--merged-bin)
-		merged_bin=true
-		shift
-		;;
-	(--)
-		shift
-		break
-		;;
+while getopts "t:ub" OPT; do
+	case "${OPT}" in
+	(t)	type="${OPTARG}";;
+	(u)	merged_usr=true;;
+	(b)	merged_bin=true;;
+	(:)	printf "option %s expects a mandatory argument\n" "${OPTARG}"; exit 1;;
+	(\?)	printf "unknown option %s\n" "${OPTARG}"; exit 1;;
 	esac
 done

+# Remove the options processed by getopts from $@,
+# so that $@ now contains only the root directories to check.
+shift $((OPTIND -1))
+
 if [ "${type}" = "skeleton" ]; then
 	strict=true
 else