diff --git a/.checkpackageignore b/.checkpackageignore index 695e0d50c6..23d622a810 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -103,7 +103,6 @@ configs/imx6-sabresd_qt5_defconfig lib_defconfig.ForceCheckHash configs/imx6slevk_defconfig lib_defconfig.ForceCheckHash configs/imx6sx-sdb_defconfig lib_defconfig.ForceCheckHash configs/imx6ulevk_defconfig lib_defconfig.ForceCheckHash -configs/imx6ullevk_defconfig lib_defconfig.ForceCheckHash configs/imx6ulpico_defconfig lib_defconfig.ForceCheckHash configs/imx7dpico_defconfig lib_defconfig.ForceCheckHash configs/imx8mqevk_defconfig lib_defconfig.ForceCheckHash @@ -651,7 +650,6 @@ package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch lib_patch package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch lib_patch.Upstream package/mrouted/S41mrouted NotExecutable package/mrp/S65mrp lib_sysv.Indent lib_sysv.Variables -package/mstpd/0001-bridge-stp.in-support-different-versions-of-pidof-13.patch lib_patch.Upstream package/multipath-tools/S60multipathd Shellcheck package/musl/0001-avoid-kernel-if_ether.h.patch lib_patch.Upstream package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index a612203f74..494b153e4e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -153,6 +153,13 @@ config BR2_TARGET_EDK2_PLATFORM_OVMF_I386 EDK2 OVMF IA32 support was removed in upstream version 202511, so it has been dropped. +config BR2_BINUTILS_VERSION_2_43_X + bool "binutils 2.43 has been removed" + select BR2_LEGACY + help + binutils 2.43 has been removed, select a newer version + instead. + comment "Legacy options removed in 2026.02" config BR2_PACKAGE_QEMU_TARGET_CRIS diff --git a/DEVELOPERS b/DEVELOPERS index 9e983ae113..2673a59824 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -611,6 +611,9 @@ F: package/alsa-plugins/ N: Changming Huang F: package/qoriq-cadence-dp-firmware/ +N: Chen Pei +F: package/iniparser/ + N: Chris Packham F: package/coremark/ F: package/coremark-pro/ @@ -2510,6 +2513,7 @@ F: boot/xilinx-embeddedsw/ F: boot/xilinx-prebuilt/ F: configs/versal_vck190_defconfig F: configs/versal_vek280_defconfig +F: configs/versal_vpk120_defconfig F: configs/versal_vpk180_defconfig F: configs/versal2_vek385_defconfig F: configs/zynq_zc702_defconfig diff --git a/board/freescale/imx6ull-evk/linux_sdma.fragment b/board/freescale/imx6ull-evk/linux_sdma.fragment new file mode 100644 index 0000000000..6f1c8b4313 --- /dev/null +++ b/board/freescale/imx6ull-evk/linux_sdma.fragment @@ -0,0 +1 @@ +CONFIG_IMX_SDMA=m diff --git a/board/freescale/imx6ull-evk/patches/linux-headers/linux-headers.hash b/board/freescale/imx6ull-evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx6ull-evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx6ull-evk/patches/linux/linux.hash b/board/freescale/imx6ull-evk/patches/linux/linux.hash new file mode 100644 index 0000000000..b1a0042a91 --- /dev/null +++ b/board/freescale/imx6ull-evk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0c5d5c242c1d604e87d48f08795e861a5a85f725b4ca11d0a538f12ff8cff linux-6.18.8.tar.xz diff --git a/board/freescale/imx6ull-evk/patches/uboot/uboot.hash b/board/freescale/imx6ull-evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..b6a925ea4e --- /dev/null +++ b/board/freescale/imx6ull-evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54 u-boot-2026.01.tar.bz2 diff --git a/board/freescale/imx6ull-evk/readme.txt b/board/freescale/imx6ull-evk/readme.txt new file mode 100644 index 0000000000..8203a12026 --- /dev/null +++ b/board/freescale/imx6ull-evk/readme.txt @@ -0,0 +1,64 @@ +**************************** +Freescale i.MX6ULL EVK board +**************************** + +This file documents the Buildroot support for the Freescale i.MX6ULL EVK board +using Upstream U-Boot and Linux. + +Build +===== + +First, configure Buildroot for your i.MX6ULL EVK board: + +In order to do so issue: + + make imx6ullevk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - boot.vfat + - imx6ull-14x14-evk.dtb + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot.bin + - u-boot-dtb.imx + - zImage + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=./output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template. + +Boot the i.MX6ULL EVK board +=========================== + +To boot your newly created system (refer to the i.MX 6ULL EVK Quick Start Guide [1] for guidance): +- insert the SD card in the micro SD slot of the board; +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! + +References +========== +[1] https://www.nxp.com/webapp/Download?colCode=IMX6ULLQSG diff --git a/board/freescale/imx6ullevk/readme.txt b/board/freescale/imx6ullevk/readme.txt index dc7c5f3678..80db3a46ca 100644 --- a/board/freescale/imx6ullevk/readme.txt +++ b/board/freescale/imx6ullevk/readme.txt @@ -2,25 +2,18 @@ Freescale i.MX6ULL EVK board **************************** -This file documents the Buildroot support for the Freescale i.MX6ULL EVK board. +This file documents the Buildroot support for the Freescale i.MX6ULL EVK board +using Vendor U-Boot and Linux. Build ===== First, configure Buildroot for your i.MX6ULL EVK board: -In order to do so there are two supported options: +In order to do so issue: make freescale_imx6ullevk_defconfig -if you plan to use NXP provided U-Boot and kernel. - -or - - make imx6ullevk_defconfig - -if you plan to use mainline U-Boot and mainline kernel. - Build all components: make diff --git a/board/versal/readme.txt b/board/versal/readme.txt index 3bcaccbb0e..80ab068495 100644 --- a/board/versal/readme.txt +++ b/board/versal/readme.txt @@ -5,6 +5,7 @@ Xilinx Versal boards: Supported Versal Boards: Xilinx VCK190 board Xilinx VEK280 board +Xilinx VPK120 board Xilinx VPK180 board ****************************************** @@ -16,6 +17,9 @@ https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/vck190 VEK280: https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/vek280.html +VPK120: +https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/vpk120.html + VPK180: https://www.amd.com/en/products/adaptive-socs-and-fpgas/evaluation-boards/vpk180.html diff --git a/boot/shim/0001-Fix-build-with-binutils-2.46.patch b/boot/shim/0001-Fix-build-with-binutils-2.46.patch new file mode 100644 index 0000000000..05ab7b2c83 --- /dev/null +++ b/boot/shim/0001-Fix-build-with-binutils-2.46.patch @@ -0,0 +1,51 @@ +From c4665d282072df2ed8ab6ae1d5fa0de41e5db02f Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Tue, 6 Jan 2026 11:48:13 +0100 +Subject: [PATCH] Fix build with binutils 2.46 + +With the new binutils which is in development and in Fedora Rawhide: + +objcopy -D -j .text -j .sdata -j .data -j .data.ident \ + -j .dynamic -j .rodata -j .rel* \ + -j .rela* -j .dyn -j .reloc -j .eh_frame \ + -j .vendor_cert -j .sbat -j .sbatlevel \ + --file-alignment 0x1000 \ + --target efi-app-x86_64 fbx64.so fbx64.efi +objcopy: fbx64.so: file format not recognized + +It seems it was an intentional compat break, according to the upstream +commit: + +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5e83077d552ed6f81dbc092eb3ccf827a43de42c + +* Internal changes to plugin support, and stricter target checking may result + in some errors being exposed in user options passed to the various binutils. + For example objcopy --target=TARGET now will only work if the input file is + for TARGET whereas prior versions of objcopy accepted other target input + files and produced a TARGET output. If you do in fact want the old + behaviour the correct usage is objcopy --output-target=TARGET. + +Switch from --taget to --output-target as suggested. + +Signed-off-by: Luca Boccassi + +Upstream: https://github.com/rhboot/shim/commit/c4665d282072df2ed8ab6ae1d5fa0de41e5db02f + +Signed-off-by: Bernd Kuhls +--- + Make.defaults | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Make.defaults b/Make.defaults +index c5fa32bec..9b40b7f4a 100644 +--- a/Make.defaults ++++ b/Make.defaults +@@ -155,7 +155,7 @@ endif + + LIB_GCC = $(shell $(CC) $(ARCH_CFLAGS) -print-libgcc-file-name) + EFI_LIBS = -lefi -lgnuefi --start-group Cryptlib/libcryptlib.a Cryptlib/OpenSSL/libopenssl.a --end-group $(LIB_GCC) +-FORMAT ?= --target efi-app-$(ARCH) ++FORMAT ?= --output-target efi-app-$(ARCH) + LOCAL_EFI_PATH = gnu-efi/$(ARCH_GNUEFI)/gnuefi + LIBDIR = gnu-efi/$(ARCH_GNUEFI)/lib + diff --git a/configs/imx6ullevk_defconfig b/configs/imx6ullevk_defconfig index 38ea8f6940..5d802e6614 100644 --- a/configs/imx6ullevk_defconfig +++ b/configs/imx6ullevk_defconfig @@ -1,13 +1,15 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_18=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx6ull-evk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.8" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ull-14x14-evk" @@ -20,9 +22,10 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2026.01" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/versal_vpk120_defconfig b/configs/versal_vpk120_defconfig new file mode 100644 index 0000000000..1c9ef448e3 --- /dev/null +++ b/configs/versal_vpk120_defconfig @@ -0,0 +1,50 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.12_LTS_merge_6.12.60)/xlnx_rebase_v6.12_LTS_merge_6.12.60.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk120-revB" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_XILINX_FPGAUTIL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.12_2025.2)/xlnx_rebase_v2.12_2025.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y +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,Xilinx,u-boot-xlnx,xlnx_rebase_v2025.01_2025.2)/xlnx_rebase_v2025.01_2025.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vpk120-revB" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM=y +BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_BOARD="vpk120" +BR2_PACKAGE_HOST_BOOTGEN=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/package/Config.in b/package/Config.in index 371a1c33e1..5c7ab57101 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2305,6 +2305,7 @@ menu "Text and terminal handling" source "package/fstrcmp/Config.in" source "package/icu/Config.in" source "package/inih/Config.in" + source "package/iniparser/Config.in" source "package/libcli/Config.in" source "package/libecoli/Config.in" source "package/libedit/Config.in" diff --git a/package/bdwgc/bdwgc.hash b/package/bdwgc/bdwgc.hash index d38b2bb1b5..dca7e61771 100644 --- a/package/bdwgc/bdwgc.hash +++ b/package/bdwgc/bdwgc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 832cf4f7cf676b59582ed3b1bbd90a8d0e0ddbc3b11cb3b2096c5177ce39cc47 gc-8.2.10.tar.gz -sha256 a9b077aeb4e9e1aaf9742119d8023ef26f52f445cdc3f60d390bf59e1647f54a README.QUICK +sha256 42e5194ad06ab6ffb806c83eb99c03462b495d979cda782f3c72c08af833cd4e gc-8.2.12.tar.gz +sha256 46cf78d79f08ec7295e1c767213582c60eccba2c5bcb07b1b29fd7ddb138fbdc README.QUICK diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk index 0700ee7bf5..e81ad3b288 100644 --- a/package/bdwgc/bdwgc.mk +++ b/package/bdwgc/bdwgc.mk @@ -4,9 +4,9 @@ # ################################################################################ -BDWGC_VERSION = 8.2.10 +BDWGC_VERSION = 8.2.12 BDWGC_SOURCE = gc-$(BDWGC_VERSION).tar.gz -BDWGC_SITE = https://github.com/ivmai/bdwgc/releases/download/v$(BDWGC_VERSION) +BDWGC_SITE = https://github.com/bdwgc/bdwgc/releases/download/v$(BDWGC_VERSION) BDWGC_INSTALL_STAGING = YES BDWGC_LICENSE = bdwgc license BDWGC_LICENSE_FILES = README.QUICK diff --git a/package/binutils/2.43.1/0003-objdump-memleak.patch b/package/binutils/2.43.1/0003-objdump-memleak.patch deleted file mode 100644 index 1b1632093d..0000000000 --- a/package/binutils/2.43.1/0003-objdump-memleak.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ba6ad3a18cb26b79e0e3b84c39f707535bbc344d Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 19 Feb 2025 07:58:54 +1030 -Subject: [PATCH] PR32716, objdump -i memory leak - -PR binutils/32716 -* bucomm.c (display_info): Free arg.info. - -Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ba6ad3a18cb26b79e0e3b84c39f707535bbc344d - -CVE: CVE-2025-3198 -Signed-off-by: Titouan Christophe ---- - binutils/bucomm.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/binutils/bucomm.c b/binutils/bucomm.c -index ccf54099154..d4554737db1 100644 ---- a/binutils/bucomm.c -+++ b/binutils/bucomm.c -@@ -435,6 +435,7 @@ display_info (void) - if (!arg.error) - display_target_tables (&arg); - -+ free (arg.info); - return arg.error; - } - --- -2.43.5 - diff --git a/package/binutils/2.43.1/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch b/package/binutils/2.43.1/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch deleted file mode 100644 index f9b870afa2..0000000000 --- a/package/binutils/2.43.1/0004-opcodes-fix-std-gnu23-compatibility-wrt-static_asser.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 16 Nov 2024 05:03:52 +0000 -Subject: [PATCH] opcodes: fix -std=gnu23 compatibility wrt static_assert - -static_assert is declared in C23 so we can't reuse that identifier: -* Define our own static_assert conditionally; - -* Rename "static assert" hacks to _N as we do already in some places - to avoid a conflict. - -ChangeLog: - PR ld/32372 - - * i386-gen.c (static_assert): Define conditionally. - * mips-formats.h (MAPPED_INT): Rename identifier. - (MAPPED_REG): Rename identifier. - (OPTIONAL_MAPPED_REG): Rename identifier. - * s390-opc.c (static_assert): Define conditionally. - -Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=8ebe62f3f0d27806b1bf69f301f5e188b4acd2b4 -Signed-off-by: Raphaël Mélotte ---- - opcodes/i386-gen.c | 2 ++ - opcodes/mips-formats.h | 6 +++--- - opcodes/s390-opc.c | 2 ++ - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c -index 053b66675c5..7ee8a30310c 100644 ---- a/opcodes/i386-gen.c -+++ b/opcodes/i386-gen.c -@@ -30,7 +30,9 @@ - - /* Build-time checks are preferrable over runtime ones. Use this construct - in preference where possible. */ -+#ifndef static_assert - #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); })) -+#endif - - static const char *program_name = NULL; - static int debug = 0; -diff --git a/opcodes/mips-formats.h b/opcodes/mips-formats.h -index 90df7100803..c4dec6352bf 100644 ---- a/opcodes/mips-formats.h -+++ b/opcodes/mips-formats.h -@@ -49,7 +49,7 @@ - #define MAPPED_INT(SIZE, LSB, MAP, PRINT_HEX) \ - { \ - typedef char ATTRIBUTE_UNUSED \ -- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ -+ static_assert_3[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ - static const struct mips_mapped_int_operand op = { \ - { OP_MAPPED_INT, SIZE, LSB }, MAP, PRINT_HEX \ - }; \ -@@ -83,7 +83,7 @@ - #define MAPPED_REG(SIZE, LSB, BANK, MAP) \ - { \ - typedef char ATTRIBUTE_UNUSED \ -- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ -+ static_assert_4[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ - static const struct mips_reg_operand op = { \ - { OP_REG, SIZE, LSB }, OP_REG_##BANK, MAP \ - }; \ -@@ -93,7 +93,7 @@ - #define OPTIONAL_MAPPED_REG(SIZE, LSB, BANK, MAP) \ - { \ - typedef char ATTRIBUTE_UNUSED \ -- static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ -+ static_assert_5[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \ - static const struct mips_reg_operand op = { \ - { OP_OPTIONAL_REG, SIZE, LSB }, OP_REG_##BANK, MAP \ - }; \ -diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c -index 9d9f0973e55..49efd714157 100644 ---- a/opcodes/s390-opc.c -+++ b/opcodes/s390-opc.c -@@ -36,7 +36,9 @@ - - /* Build-time checks are preferrable over runtime ones. Use this construct - in preference where possible. */ -+#ifndef static_assert - #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); })) -+#endif - - #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) - --- -2.34.1 - diff --git a/package/binutils/2.43.1/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch b/package/binutils/2.43.1/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch deleted file mode 100644 index 1f28137190..0000000000 --- a/package/binutils/2.43.1/0005-Fix-32097-Warnings-when-building-gprofng-with-Clang.patch +++ /dev/null @@ -1,801 +0,0 @@ -From 3e8c6e03675963d65a2f98eb006336c5cd375ec3 Mon Sep 17 00:00:00 2001 -From: Vladimir Mezentsev -Date: Tue, 3 Sep 2024 21:30:31 -0700 -Subject: [PATCH] Fix 32097 Warnings when building gprofng with Clang - -gprofng/ChangeLog -2024-09-03 Vladimir Mezentsev . - - PR gprofng/32097 - * common/hwcdrv.c: Fix -Wempty-body warnings. - * common/hwcentry.h: Fix -Wdeprecated-non-prototype warnings. - * common/hwctable.c: Fix -Wdeprecated-non-prototype warnings. - * libcollector/collector.c: Likewise. - * libcollector/collector.h: Likewise. - * libcollector/collectorAPI.c: Likewise. - * libcollector/dispatcher.c: Likewise. - * libcollector/iotrace.c: Likewise. - * libcollector/libcol_util.c: Fix -Wunused-but-set-variable warnings. - * libcollector/libcol_util.h: Remove unused declarations. - * libcollector/linetrace.c: Fix -Wdeprecated-non-prototype warnings. - * src/BaseMetricTreeNode.h: Fix -Wunused-private-field warnings. - * src/Dbe.cc: Fix -Wself-assign warnings. - * src/DbeSession.cc: Fix -Wunused-but-set-variable warnings. - * src/Disasm.cc: Fix -Wunused-const-variable warnings. - * src/Experiment.cc: Fix -Wunused-private-field warnings. - * src/HashMap.h: Fix -Wself-assign warnings. - * src/IOActivity.h: Fix -Wunused-private-field warnings. - * src/collctrl.cc: Fix -Wself-assign, -Wparentheses-equality warnings. - * src/collctrl.h: Fix -Wunused-private-field warnings. - * src/collector_module.h: Fix -Wdeprecated-non-prototype warnings. - * src/gp-display-src.cc: Fix -Wunused-private-field warnings. - * src/gp-print.h: Fix -Wheader-guard warnings. - * src/hwc_intel_icelake.h: Fix -Winitializer-overrides warnings. - * src/util.cc: Fix -Wunused-but-set-variable warnings. - -Upstream: b79c457ca01df82dbe1facb708e45def4584c903 -Signed-off-by: Thomas Petazzoni ---- - gprofng/common/hwcdrv.c | 3 ++- - gprofng/common/hwcentry.h | 7 +---- - gprofng/common/hwctable.c | 13 +--------- - gprofng/libcollector/collector.c | 15 ++++------- - gprofng/libcollector/collector.h | 2 +- - gprofng/libcollector/collectorAPI.c | 15 ++++++----- - gprofng/libcollector/dispatcher.c | 19 ++++++++------ - gprofng/libcollector/iotrace.c | 12 ++++----- - gprofng/libcollector/libcol_util.c | 2 -- - gprofng/libcollector/libcol_util.h | 6 ----- - gprofng/libcollector/linetrace.c | 40 +++++++++++++++++------------ - gprofng/src/BaseMetricTreeNode.h | 1 - - gprofng/src/Dbe.cc | 12 ++++----- - gprofng/src/DbeSession.cc | 3 --- - gprofng/src/Disasm.cc | 1 - - gprofng/src/Experiment.cc | 2 -- - gprofng/src/HashMap.h | 3 +-- - gprofng/src/IOActivity.h | 1 - - gprofng/src/collctrl.cc | 14 +++++----- - gprofng/src/collctrl.h | 1 - - gprofng/src/collector_module.h | 20 +++++++-------- - gprofng/src/gp-display-src.cc | 8 ------ - gprofng/src/gp-print.h | 2 +- - gprofng/src/hwc_intel_icelake.h | 6 +++-- - gprofng/src/util.cc | 10 +++----- - 25 files changed, 88 insertions(+), 130 deletions(-) - -diff --git a/gprofng/common/hwcdrv.c b/gprofng/common/hwcdrv.c -index aaf3acdf9cd..51492a8d35c 100644 ---- a/gprofng/common/hwcdrv.c -+++ b/gprofng/common/hwcdrv.c -@@ -574,6 +574,7 @@ read_sample (counter_state_t *ctr_state, int msgsz, uint64_t *rvalue, - static void - dump_perf_event_attr (struct perf_event_attr *at) - { -+#if defined(DEBUG) - TprintfT (DBG_LT2, "dump_perf_event_attr: size=%d type=%d sample_period=%lld\n" - " config=0x%llx config1=0x%llx config2=0x%llx wakeup_events=%lld __reserved_1=%lld\n", - (int) at->size, (int) at->type, (unsigned long long) at->sample_period, -@@ -589,13 +590,13 @@ dump_perf_event_attr (struct perf_event_attr *at) - DUMP_F (exclude_kernel); - DUMP_F (exclude_hv); - DUMP_F (exclude_idle); -- // DUMP_F(xmmap); - DUMP_F (comm); - DUMP_F (freq); - DUMP_F (inherit_stat); - DUMP_F (enable_on_exec); - DUMP_F (task); - DUMP_F (watermark); -+#endif - } - - static void -diff --git a/gprofng/common/hwcentry.h b/gprofng/common/hwcentry.h -index b2ab8b9b22c..0b923fc3576 100644 ---- a/gprofng/common/hwcentry.h -+++ b/gprofng/common/hwcentry.h -@@ -200,17 +200,12 @@ extern "C" - extern char *hwc_get_docref (char *buf, size_t buflen); - /* Return a CPU HWC document reference, or NULL. */ - -- // TBR -- extern char *hwc_get_default_cntrs (); -- /* Return a default HW counter string; may be NULL, or zero-length */ -- /* NULL means none is defined in the table; or zero-length means string defined could not be loaded */ -- - extern char *hwc_get_default_cntrs2 (int forKernel, int style); - /* like hwc_get_default_cntrs() for style==1 */ - /* but allows other styles of formatting as well */ - /* deprecate and eventually remove hwc_get_default_cntrs() */ - -- extern char *hwc_get_orig_default_cntrs (); -+ extern char *hwc_get_orig_default_cntrs (int forKernel); - /* Get the default HW counter string as set in the table */ - /* NULL means none is defined in the table */ - -diff --git a/gprofng/common/hwctable.c b/gprofng/common/hwctable.c -index 0baf63b1805..338a1ea86f4 100644 ---- a/gprofng/common/hwctable.c -+++ b/gprofng/common/hwctable.c -@@ -1783,7 +1783,7 @@ check_tables () - } - #endif - --static int try_a_counter (); -+static int try_a_counter (int forKernel); - static void hwc_process_raw_ctrs (int forKernel, Hwcentry ***pstd_out, - Hwcentry ***praw_out, Hwcentry ***phidden_out, - Hwcentry**static_tables, -@@ -2824,17 +2824,6 @@ hwc_get_docref (char *buf, size_t buflen) - return buf; - } - --//TBR: -- --extern char* --hwc_get_default_cntrs () --{ -- setup_cpcx (); -- if (cpcx_default_hwcs[0] != NULL) -- return strdup (cpcx_default_hwcs[0]); // TBR deprecate this -- return NULL; --} -- - extern char* - hwc_get_default_cntrs2 (int forKernel, int style) - { -diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c -index 3a8f27a719d..2ff95e58fde 100644 ---- a/gprofng/libcollector/collector.c -+++ b/gprofng/libcollector/collector.c -@@ -210,15 +210,10 @@ get_collector_interface () - static void - collector_module_init (CollectorInterface *col_intf) - { -- int nmodules = 0; -- - ModuleInitFunc next_init = (ModuleInitFunc) dlsym (RTLD_DEFAULT, "__collector_module_init"); - if (next_init != NULL) -- { -- nmodules++; -- next_init (col_intf); -- } -- TprintfT (DBG_LT1, "collector_module_init: %d modules\n", nmodules); -+ next_init (col_intf); -+ TprintfT (DBG_LT1, "collector_module_init: %d modules\n", next_init ? 1 : 0); - } - - /* Routines concerned with general experiment start and stop */ -@@ -1783,7 +1778,7 @@ __collector_pause () - } - - void --__collector_pause_m (char *reason) -+__collector_pause_m (const char *reason) - { - hrtime_t now; - char xreason[MAXPATHLEN]; -@@ -2449,8 +2444,8 @@ __collector_dlog (int tflag, int level, char *format, ...) - - static void (*__real__exit) (int status) = NULL; /* libc only: _exit */ - static void (*__real__Exit) (int status) = NULL; /* libc only: _Exit */ --void _exit () __attribute__ ((weak, alias ("__collector_exit"))); --void _Exit () __attribute__ ((weak, alias ("__collector_Exit"))); -+void _exit (int status) __attribute__ ((weak, alias ("__collector_exit"))); -+void _Exit (int status) __attribute__ ((weak, alias ("__collector_Exit"))); - - void - __collector_exit (int status) -diff --git a/gprofng/libcollector/collector.h b/gprofng/libcollector/collector.h -index 07a03bdd17a..eda68a0e4f5 100644 ---- a/gprofng/libcollector/collector.h -+++ b/gprofng/libcollector/collector.h -@@ -123,7 +123,7 @@ extern void __collector_terminate_expt (); - extern void __collector_terminate_hook (); - extern void __collector_sample (char *name); - extern void __collector_pause (); --extern void __collector_pause_m (); -+extern void __collector_pause_m (const char *reason); - extern void __collector_resume (); - extern int collector_sigemt_sigaction (const struct sigaction*, - struct sigaction*); -diff --git a/gprofng/libcollector/collectorAPI.c b/gprofng/libcollector/collectorAPI.c -index 5fa6403ad49..449bbbaab65 100644 ---- a/gprofng/libcollector/collectorAPI.c -+++ b/gprofng/libcollector/collectorAPI.c -@@ -26,16 +26,17 @@ - #include "collectorAPI.h" - #include "gp-experiment.h" - --static void *__real_collector_sample = NULL; --static void *__real_collector_pause = NULL; --static void *__real_collector_resume = NULL; --static void *__real_collector_terminate_expt = NULL; --static void *__real_collector_func_load = NULL; --static void *__real_collector_func_unload = NULL; -+static void (*__real_collector_sample)(const char *) = NULL; -+static void (*__real_collector_pause)() = NULL; -+static void (*__real_collector_resume)() = NULL; -+static void (*__real_collector_terminate_expt)() = NULL; -+static void (*__real_collector_func_load)(const char *, const char *, -+ const char *, void *, int, int, Lineno *) = NULL; -+static void (*__real_collector_func_unload)(void *) = NULL; - - #define INIT_API if (init_API == 0) collectorAPI_initAPI() - #define NULL_PTR(x) (__real_##x == NULL) --#define CALL_REAL(x) (*(void(*)())__real_##x) -+#define CALL_REAL(x) (__real_##x) - #define CALL_IF_REAL(x) INIT_API; if (!NULL_PTR(x)) CALL_REAL(x) - - static int init_API = 0; -diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c -index 8b8ad77b5ee..f7cd46e7e6b 100644 ---- a/gprofng/libcollector/dispatcher.c -+++ b/gprofng/libcollector/dispatcher.c -@@ -908,8 +908,9 @@ sigset (int sig, sighandler_t handler) - - // map interposed symbol versions - static int --gprofng_timer_create (int (real_func) (), clockid_t clockid, -- struct sigevent *sevp, timer_t *timerid) -+gprofng_timer_create (int (real_func) (clockid_t, struct sigevent *, timer_t *), -+ clockid_t clockid, -+ struct sigevent *sevp, timer_t *timerid) - { - // collector reserves SIGPROF - if (sevp == NULL || sevp->sigev_notify != SIGEV_SIGNAL || -@@ -1044,7 +1045,7 @@ __collector_thr_sigsetmask (int how, const sigset_t* iset, sigset_t* oset) - // map interposed symbol versions - - static int --gprofng_pthread_sigmask (int (real_func) (), -+gprofng_pthread_sigmask (int (real_func) (int, const sigset_t *, sigset_t*), - int how, const sigset_t *iset, sigset_t* oset) - { - sigset_t lsigset; -@@ -1139,9 +1140,10 @@ collector_root (void *cargs) - // map interposed symbol versions - - static int --gprofng_pthread_create (int (real_func) (), pthread_t *thread, -- const pthread_attr_t *attr, -- void *(*func)(void*), void *arg) -+gprofng_pthread_create (int (real_func) (pthread_t *, const pthread_attr_t *, -+ void *(*)(void *), void *), -+ pthread_t *thread, const pthread_attr_t *attr, -+ void *(*func)(void*), void *arg) - { - TprintfT (DBG_LTT, "gprofng_pthread_create @%p\n", real_func); - if (dispatch_mode != DISPATCH_ON) -@@ -1276,6 +1278,7 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, - } - - // weak symbols: --int sigprocmask () __attribute__ ((weak, alias ("__collector_sigprocmask"))); --int thr_sigsetmask () __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); -+int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); -+int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); - int setitimer () __attribute__ ((weak, alias ("_setitimer"))); -+ -diff --git a/gprofng/libcollector/iotrace.c b/gprofng/libcollector/iotrace.c -index 18060864796..3deb441d9c7 100644 ---- a/gprofng/libcollector/iotrace.c -+++ b/gprofng/libcollector/iotrace.c -@@ -1350,7 +1350,7 @@ mkstemp (char *template) - unsigned pktSize; - if (NULL_PTR (mkstemp)) - init_io_intf (); -- if (CHCK_REENTRANCE (guard) || template == NULL) -+ if (CHCK_REENTRANCE (guard)) - return CALL_REAL (mkstemp)(template); - PUSH_REENTRANCE (guard); - hrtime_t reqt = gethrtime (); -@@ -1405,7 +1405,7 @@ mkstemps (char *template, int slen) - unsigned pktSize; - if (NULL_PTR (mkstemps)) - init_io_intf (); -- if (CHCK_REENTRANCE (guard) || template == NULL) -+ if (CHCK_REENTRANCE (guard)) - return CALL_REAL (mkstemps)(template, slen); - PUSH_REENTRANCE (guard); - hrtime_t reqt = gethrtime (); -@@ -1485,7 +1485,7 @@ close (int fildes) - - /*------------------------------------------------------------- fopen */ - static FILE* --gprofng_fopen (FILE*(real_fopen) (), const char *filename, const char *mode) -+gprofng_fopen (FILE*(real_fopen) (const char *, const char *), const char *filename, const char *mode) - { - int *guard; - FILE *fp = NULL; -@@ -1559,7 +1559,7 @@ DCL_FOPEN (fopen) - - /*------------------------------------------------------------- fclose */ - static int --gprofng_fclose (int(real_fclose) (), FILE *stream) -+gprofng_fclose (int(real_fclose) (FILE *), FILE *stream) - { - int *guard; - int stat; -@@ -1645,7 +1645,7 @@ fflush (FILE *stream) - - /*------------------------------------------------------------- fdopen */ - static FILE* --gprofng_fdopen (FILE*(real_fdopen) (), int fildes, const char *mode) -+gprofng_fdopen (FILE*(real_fdopen) (int, const char *), int fildes, const char *mode) - { - int *guard; - FILE *fp = NULL; -@@ -2957,7 +2957,7 @@ DCL_FGETPOS (fgetpos) - - /*------------------------------------------------------------- fgetpos64 */ - static int --gprofng_fgetpos64 (int(real_fgetpos64) (), FILE *stream, fpos64_t *pos) -+gprofng_fgetpos64 (int(real_fgetpos64) (FILE *, fpos64_t *), FILE *stream, fpos64_t *pos) - { - int *guard; - int ret; -diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c -index 1e58cf491a1..baac15db5c4 100644 ---- a/gprofng/libcollector/libcol_util.c -+++ b/gprofng/libcollector/libcol_util.c -@@ -1013,7 +1013,6 @@ __collector_open (const char *path, int oflag, ...) - mode_t mode = 0; - - hrtime_t t_timeout = __collector_gethrtime () + 5 * ((hrtime_t) NANOSEC); -- int nretries = 0; - long long delay = 100; /* start at some small, arbitrary value */ - - /* get optional mode argument if it's expected/required */ -@@ -1058,7 +1057,6 @@ __collector_open (const char *path, int oflag, ...) - delay *= 2; - if (delay > 100000000) - delay = 100000000; /* cap at some large, arbitrary value */ -- nretries++; - } - return fd; - } -diff --git a/gprofng/libcollector/libcol_util.h b/gprofng/libcollector/libcol_util.h -index c8ec83ff0d9..aa30db72bcc 100644 ---- a/gprofng/libcollector/libcol_util.h -+++ b/gprofng/libcollector/libcol_util.h -@@ -81,12 +81,6 @@ extern int __collector_mutex_trylock (collector_mutex_t *mp); - #define __collector_mutex_init(xx) \ - do { collector_mutex_t tmp=COLLECTOR_MUTEX_INITIALIZER; *(xx)=tmp; } while(0) - --void __collector_sample (char *name); --void __collector_terminate_expt (); --void __collector_pause (); --void __collector_pause_m (); --void __collector_resume (); -- - struct DT_lineno; - - typedef enum -diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c -index 67b2d7e9030..66844bc1337 100644 ---- a/gprofng/libcollector/linetrace.c -+++ b/gprofng/libcollector/linetrace.c -@@ -1207,7 +1207,7 @@ __collector_vfork (void) - } - - /*------------------------------------------------------------- execve */ --int execve () __attribute__ ((weak, alias ("__collector_execve"))); -+int execve (const char *, char *const [], char *const []) __attribute__ ((weak, alias ("__collector_execve"))); - - int - __collector_execve (const char* path, char *const argv[], char *const envp[]) -@@ -1237,7 +1237,7 @@ __collector_execve (const char* path, char *const argv[], char *const envp[]) - return ret; - } - --int execvp () __attribute__ ((weak, alias ("__collector_execvp"))); -+int execvp (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execvp"))); - - int - __collector_execvp (const char* file, char *const argv[]) -@@ -1269,7 +1269,7 @@ __collector_execvp (const char* file, char *const argv[]) - return ret; - } - --int execv () __attribute__ ((weak, alias ("__collector_execv"))); -+int execv (const char *, char *const []) __attribute__ ((weak, alias ("__collector_execv"))); - - int - __collector_execv (const char* path, char *const argv[]) -@@ -1408,7 +1408,10 @@ __collector_execl (const char* path, const char *arg0, ...) - /*-------------------------------------------------------- posix_spawn */ - // map interposed symbol versions - static int --gprofng_posix_spawn (int(real_posix_spawn) (), -+gprofng_posix_spawn (int(real_posix_spawn) (pid_t *, const char *, -+ const posix_spawn_file_actions_t *, -+ const posix_spawnattr_t *, -+ char *const [], char *const []), - pid_t *pidp, const char *path, - const posix_spawn_file_actions_t *file_actions, - const posix_spawnattr_t *attrp, -@@ -1466,7 +1469,10 @@ DCL_POSIX_SPAWN (posix_spawn) - - /*-------------------------------------------------------- posix_spawnp */ - static int --gprofng_posix_spawnp (int (real_posix_spawnp) (), -+gprofng_posix_spawnp (int (real_posix_spawnp) (pid_t *, const char *, -+ const posix_spawn_file_actions_t *, -+ const posix_spawnattr_t *, -+ char *const [], char *const []), - pid_t *pidp, const char *path, - const posix_spawn_file_actions_t *file_actions, - const posix_spawnattr_t *attrp, -@@ -1754,8 +1760,8 @@ __collector_clone (int (*fn)(void *), void *child_stack, int flags, void *arg, - } - - /*-------------------------------------------------------------------- setuid */ --int setuid () __attribute__ ((weak, alias ("__collector_setuid"))); --int _setuid () __attribute__ ((weak, alias ("__collector_setuid"))); -+int setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid"))); -+int _setuid (uid_t) __attribute__ ((weak, alias ("__collector_setuid"))); - - int - __collector_setuid (uid_t ruid) -@@ -1770,8 +1776,8 @@ __collector_setuid (uid_t ruid) - } - - /*------------------------------------------------------------------- seteuid */ --int seteuid () __attribute__ ((weak, alias ("__collector_seteuid"))); --int _seteuid () __attribute__ ((weak, alias ("__collector_seteuid"))); -+int seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid"))); -+int _seteuid (uid_t) __attribute__ ((weak, alias ("__collector_seteuid"))); - - int - __collector_seteuid (uid_t euid) -@@ -1786,8 +1792,8 @@ __collector_seteuid (uid_t euid) - } - - /*------------------------------------------------------------------ setreuid */ --int setreuid () __attribute__ ((weak, alias ("__collector_setreuid"))); --int _setreuid () __attribute__ ((weak, alias ("__collector_setreuid"))); -+int setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid"))); -+int _setreuid (uid_t, uid_t) __attribute__ ((weak, alias ("__collector_setreuid"))); - - int - __collector_setreuid (uid_t ruid, uid_t euid) -@@ -1802,8 +1808,8 @@ __collector_setreuid (uid_t ruid, uid_t euid) - } - - /*-------------------------------------------------------------------- setgid */ --int setgid () __attribute__ ((weak, alias ("__collector_setgid"))); --int _setgid () __attribute__ ((weak, alias ("__collector_setgid"))); -+int setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid"))); -+int _setgid (gid_t) __attribute__ ((weak, alias ("__collector_setgid"))); - - int - __collector_setgid (gid_t rgid) -@@ -1818,8 +1824,8 @@ __collector_setgid (gid_t rgid) - } - - /*------------------------------------------------------------------- setegid */ --int setegid () __attribute__ ((weak, alias ("__collector_setegid"))); --int _setegid () __attribute__ ((weak, alias ("__collector_setegid"))); -+int setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid"))); -+int _setegid (gid_t) __attribute__ ((weak, alias ("__collector_setegid"))); - - int - __collector_setegid (gid_t egid) -@@ -1834,8 +1840,8 @@ __collector_setegid (gid_t egid) - } - - /*------------------------------------------------------------------ setregid */ --int setregid () __attribute__ ((weak, alias ("__collector_setregid"))); --int _setregid () __attribute__ ((weak, alias ("__collector_setregid"))); -+int setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid"))); -+int _setregid (gid_t, gid_t) __attribute__ ((weak, alias ("__collector_setregid"))); - - int - __collector_setregid (gid_t rgid, gid_t egid) -diff --git a/gprofng/src/BaseMetricTreeNode.h b/gprofng/src/BaseMetricTreeNode.h -index d73d244e27e..7698f9c6eaf 100644 ---- a/gprofng/src/BaseMetricTreeNode.h -+++ b/gprofng/src/BaseMetricTreeNode.h -@@ -85,7 +85,6 @@ private: - - BaseMetricTreeNode *root; // root of tree - BaseMetricTreeNode *parent; // my parent -- bool aggregation; // value is based on children's values - char *name; // bm->get_cmd() for metrics, unique string otherwise - char *uname; // user-visible text - char *unit; // see UNIT_* defines -diff --git a/gprofng/src/Dbe.cc b/gprofng/src/Dbe.cc -index 95daa727186..09b7f94eaa8 100644 ---- a/gprofng/src/Dbe.cc -+++ b/gprofng/src/Dbe.cc -@@ -9591,14 +9591,12 @@ dbeGetTLDataRepVals (VMode view_mode, hrtime_t start_ts, hrtime_t delta, - } - if (sampleVals != NULL) - { -- Sample* sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx); -- if (!sample || !sample->get_usage ()) -- sample = sample; -- else -+ Sample *sample = (Sample*) packets->getObjValue (PROP_SMPLOBJ, packetIdx); -+ if (sample != NULL) - { -- PrUsage* prusage = sample->get_usage (); -- Vector *mstateVals = prusage->getMstateValues (); -- sampleVals->store (eventIdx, mstateVals); -+ PrUsage *prusage = sample->get_usage (); -+ if (prusage != NULL) -+ sampleVals->store (eventIdx, prusage->getMstateValues ()); - } - } - } -diff --git a/gprofng/src/DbeSession.cc b/gprofng/src/DbeSession.cc -index a6808d8d8f6..3649357bc79 100644 ---- a/gprofng/src/DbeSession.cc -+++ b/gprofng/src/DbeSession.cc -@@ -1164,8 +1164,6 @@ DbeSession::open_experiment (Experiment *exp, char *path) - closedir (exp_dir); - exp_names->sort (dir_name_cmp); - Experiment **t_exp_list = new Experiment *[exp_names->size ()]; -- int nsubexps = 0; -- - for (int j = 0, jsz = exp_names->size (); j < jsz; j++) - { - t_exp_list[j] = NULL; -@@ -1222,7 +1220,6 @@ DbeSession::open_experiment (Experiment *exp, char *path) - dexp->open (dpath); - append (dexp); - t_exp_list[j] = dexp; -- nsubexps++; - dexp->set_clock (exp->clock); - - // DbeView add_experiment() is split into two parts -diff --git a/gprofng/src/Disasm.cc b/gprofng/src/Disasm.cc -index e41bf679292..19f2174d536 100644 ---- a/gprofng/src/Disasm.cc -+++ b/gprofng/src/Disasm.cc -@@ -49,7 +49,6 @@ struct DisContext - }; - - static const int MAX_DISASM_STR = 2048; --static const int MAX_INSTR_SIZE = 8; - - Disasm::Disasm (char *fname) - { -diff --git a/gprofng/src/Experiment.cc b/gprofng/src/Experiment.cc -index a1f78fc0cde..627a755c88c 100644 ---- a/gprofng/src/Experiment.cc -+++ b/gprofng/src/Experiment.cc -@@ -1937,8 +1937,6 @@ private: - } - - Experiment *exp; -- char *hostname; -- hrtime_t time, tstamp; - }; - - void -diff --git a/gprofng/src/HashMap.h b/gprofng/src/HashMap.h -index 918c0dc95f9..c5fdd345ba8 100644 ---- a/gprofng/src/HashMap.h -+++ b/gprofng/src/HashMap.h -@@ -78,9 +78,8 @@ copy_key (uint64_t a) - } - - template<> inline void --delete_key (uint64_t a) -+delete_key (uint64_t) - { -- a = a; - } - - template<> inline int -diff --git a/gprofng/src/IOActivity.h b/gprofng/src/IOActivity.h -index cf462cf8d55..f3a22ada6b1 100644 ---- a/gprofng/src/IOActivity.h -+++ b/gprofng/src/IOActivity.h -@@ -78,7 +78,6 @@ private: - Hist_data *hist_data_file_all; - Hist_data *hist_data_vfd_all; - Hist_data *hist_data_callstack_all; -- Hist_data *hist_data_callstack; - - DbeView *dbev; - }; -diff --git a/gprofng/src/collctrl.cc b/gprofng/src/collctrl.cc -index 029c0387f19..c0234130f00 100644 ---- a/gprofng/src/collctrl.cc -+++ b/gprofng/src/collctrl.cc -@@ -880,9 +880,7 @@ Coll_Ctrl::set_clkprof (const char *string, char** warn) - double dval = strtod (string, &endchar); - if (*endchar == 'm' || *endchar == 0) /* user specified milliseconds */ - dval = dval * 1000.; -- else if (*endchar == 'u') /* user specified microseconds */ -- dval = dval; -- else -+ else if (*endchar != 'u') - return dbe_sprintf (GTXT ("Unrecognized clock-profiling interval `%s'\n"), string); - nclkprof_timer = (int) (dval + 0.5); - } -@@ -2791,7 +2789,7 @@ Coll_Ctrl::get (char * control) - } - if (!strncmp (control, ipc_str_javaprof, len)) - { -- if ((java_mode == 0)) -+ if (java_mode == 0) - return strdup (ipc_str_off); - return strdup (ipc_str_on); - } -@@ -2807,7 +2805,7 @@ Coll_Ctrl::get (char * control) - } - if (!strncmp (control, ipc_str_sample_sig, len)) - { -- if ((sample_sig == 0)) -+ if (sample_sig == 0) - return strdup (ipc_str_off); - char *str_signal = find_signal_name (sample_sig); - if (str_signal != NULL) -@@ -2841,15 +2839,15 @@ Coll_Ctrl::get (char * control) - } - if (!strncmp (control, ipc_str_iotrace, len)) - { -- if ((iotrace_enabled == 0)) -+ if (iotrace_enabled == 0) - return strdup (ipc_str_off); - return strdup (ipc_str_on); - } - if (!strncmp (control, ipc_str_count, len)) - { -- if ((count_enabled == 0)) -+ if (count_enabled == 0) - return strdup (ipc_str_off); -- if ((count_enabled < 0)) -+ if (count_enabled < 0) - return strdup ("on\nstatic"); - return strdup (ipc_str_on); - } -diff --git a/gprofng/src/collctrl.h b/gprofng/src/collctrl.h -index a41647440ac..e2a8e450890 100644 ---- a/gprofng/src/collctrl.h -+++ b/gprofng/src/collctrl.h -@@ -272,7 +272,6 @@ private: - char *node_name; /* name of machine on which experiment is run */ - long ncpus; /* number of online CPUs */ - int cpu_clk_freq; /* chip clock (MHz.), as reported from processor_info */ -- int cpc_cpuver; /* chip version, as reported from libcpc */ - long sys_resolution; /* system clock resolution */ - int sample_period; /* period for sampling, seconds */ - int sample_default; /* if period for sampling set by default */ -diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h -index bb48eadb9f8..ebcdbca561f 100644 ---- a/gprofng/src/collector_module.h -+++ b/gprofng/src/collector_module.h -@@ -40,12 +40,12 @@ struct tm; - * If you add any, please put it in the right place */ - typedef struct CollectorUtilFuncs - { -- int (*access)(); -+ int (*access)(const char *, int); - int (*atoi)(const char *nptr); - void *(*calloc)(size_t nelem, size_t elsize); - int (*clearenv)(void); - int (*close)(int); -- int (*closedir)(); -+ int (*closedir)(DIR *); - int (*execv)(const char *path, char *const argv[]); - void (*exit)(int status); - int (*fclose)(FILE *stream); -@@ -66,20 +66,20 @@ typedef struct CollectorUtilFuncs - off_t (*lseek)(int fd, off_t offset, int whence); - void *(*malloc)(size_t size); - void *(*memset)(void *s1, int c, size_t n); -- int (*mkdir)(); -+ int (*mkdir)(const char *, mode_t); - time_t (*mktime)(struct tm *timeptr); - void *(*mmap)(void *, size_t, int, int, int, off_t); -- void *(*mmap64_)(); -- int (*munmap)(); -+ void *(*mmap64_)(void *, size_t, int, int, int, off_t); -+ int (*munmap)(void *, size_t); - int (*open)(const char *, int, ...); - int (*open_bare)(const char *, int, ...); -- DIR *(*opendir)(); -+ DIR *(*opendir)(const char *); - int (*pclose)(FILE *stream); - FILE *(*popen)(const char *command, const char *mode); - int (*putenv)(char *string); -- ssize_t (*pwrite)(); -- ssize_t (*pwrite64_)(); -- ssize_t (*read)(); -+ ssize_t (*pwrite)(int, const void *, size_t, off_t); -+ ssize_t (*pwrite64_)(int, const void *, size_t, off_t); -+ ssize_t (*read)(int, void *, size_t); - int (*setenv)(const char *name, const char *value, int overwrite); - int (*sigfillset)(sigset_t *set); - int (*sigprocmask)(int how, const sigset_t *set, sigset_t *oldset); -@@ -112,7 +112,7 @@ typedef struct CollectorUtilFuncs - int (*unsetenv)(const char *name); - int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap); - pid_t (*waitpid)(pid_t pid, int *stat_loc, int options); -- ssize_t (*write)(); -+ ssize_t (*write)(int, void *, size_t); - double (*atof)(); - void *n_a; - } CollectorUtilFuncs; -diff --git a/gprofng/src/gp-display-src.cc b/gprofng/src/gp-display-src.cc -index 200e6080d2e..24af375edf1 100644 ---- a/gprofng/src/gp-display-src.cc -+++ b/gprofng/src/gp-display-src.cc -@@ -75,14 +75,6 @@ private: - bool v_opt; - int multiple; - char *str_compcom; -- bool hex_visible; -- int src_visible; -- int vis_src; -- int vis_dis; -- int threshold_src; -- int threshold_dis; -- int threshold; -- int vis_bits; - }; - - static int -diff --git a/gprofng/src/gp-print.h b/gprofng/src/gp-print.h -index 1b748ea60a3..1a8ad3b6c13 100644 ---- a/gprofng/src/gp-print.h -+++ b/gprofng/src/gp-print.h -@@ -19,7 +19,7 @@ - MA 02110-1301, USA. */ - - #ifndef _GP_PRINT_H --#define _ER_PRINT_H -+#define _GP_PRINT_H - - #include "Command.h" - #include "DbeApplication.h" -diff --git a/gprofng/src/hwc_intel_icelake.h b/gprofng/src/hwc_intel_icelake.h -index 46f4ac5005f..4fe2e26f63b 100644 ---- a/gprofng/src/hwc_intel_icelake.h -+++ b/gprofng/src/hwc_intel_icelake.h -@@ -24,8 +24,10 @@ - #define SH(val, n) (((unsigned long long) (val)) << n) - #define I(nm, event, umask, edge, cmask, inv, \ - offcore_rsp, ldlat, frontend, period, mtr) \ -- INIT_HWC(nm, mtr, SH(event, 0) | SH(umask, 8) | SH(edge, 18) \ -- | SH(cmask, 24) | SH(inv, 23), PERF_TYPE_RAW), \ -+ .use_perf_event_type = 1, .type = PERF_TYPE_RAW, \ -+ .name = (nm), .metric = (mtr), .reg_num = REGNO_ANY, \ -+ .config = SH(event, 0) | SH(umask, 8) | SH(edge, 18) | SH(cmask, 24) \ -+ | SH(inv, 23), \ - .config1 = SH(offcore_rsp, 0) | SH(ldlat, 0) | SH(frontend, 0), \ - .val = period - -diff --git a/gprofng/src/util.cc b/gprofng/src/util.cc -index 201f7088b66..228140b61ae 100644 ---- a/gprofng/src/util.cc -+++ b/gprofng/src/util.cc -@@ -741,17 +741,13 @@ get_relative_link (const char *path_from, const char *path_to) - s2 = canonical_path (s2); - long l = dbe_sstrlen (s1); - // try to find common directories -- int common_slashes = 0; - int last_common_slash = -1; - for (int i = 0; i < l; i++) - { -- if (s1[i] != s2[i]) break; -- if (s1[i] == 0) break; -+ if (s1[i] != s2[i] || s1[i] == 0) -+ break; - if (s1[i] == '/') -- { -- common_slashes++; -- last_common_slash = i; -- } -+ last_common_slash = i; - } - // find slashes in remaining path_to - int slashes = 0; --- -2.50.1 - diff --git a/package/binutils/2.43.1/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch b/package/binutils/2.43.1/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch deleted file mode 100644 index 7c6ed290f9..0000000000 --- a/package/binutils/2.43.1/0006-gprofng-fix-std-gnu23-compatibility-wrt-unprototyped.patch +++ /dev/null @@ -1,619 +0,0 @@ -From a5be89126b9bee78224be842e3086ce99dc045e6 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 16 Nov 2024 05:13:48 +0000 -Subject: [PATCH] gprofng: fix -std=gnu23 compatibility wrt unprototyped - functions - -C23 removes support for unprototyped functions. Fix function pointer types -accordingly. - -This does not fix all instances, there's a few left as I commented on in -PR32374 (e.g. setitimer which I have a local workaround for but it involves -a glibc implementation detail; the Linaro precommit CI tester pointed that -out too, so dropped that). - -ChangeLog: - PR gprofng/32374 - - * libcollector/collector.c (collector_sample): Fix prototype. - * libcollector/envmgmt.c (putenv): Ditto. - (_putenv): Ditto. - (__collector_putenv): Ditto. - (setenv): Ditto. - (_setenv): Ditto. - (__collector_setenv): Ditto. - (unsetenv): Ditto. - (_unsetenv): Ditto. - (__collector_unsetenv): Ditto. - * libcollector/jprofile.c (open_experiment): Ditto. - (__collector_jprofile_enable_synctrace): Ditto. - (jprof_find_asyncgetcalltrace): Ditto. - * libcollector/libcol_util.c (__collector_util_init): Ditto. - (ARCH): Ditto. - * libcollector/mmaptrace.c (collector_func_load): Ditto. - (collector_func_unload): Ditto. - * libcollector/unwind.c (__collector_ext_unwind_init): Ditto. - * src/collector_module.h: Ditto. - -Upstream: a2f774427e078f3da2c06bdea25f77a61979a695 -Signed-off-by: Thomas Petazzoni ---- - gprofng/libcollector/collector.c | 2 +- - gprofng/libcollector/dispatcher.c | 1 - - gprofng/libcollector/envmgmt.c | 24 ++++----- - gprofng/libcollector/jprofile.c | 10 ++-- - gprofng/libcollector/libcol_util.c | 84 +++++++++++++++--------------- - gprofng/libcollector/mmaptrace.c | 4 +- - gprofng/libcollector/unwind.c | 2 +- - gprofng/src/collector_module.h | 2 +- - 8 files changed, 64 insertions(+), 65 deletions(-) - -diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c -index 2ff95e58fde..3cab346e7dc 100644 ---- a/gprofng/libcollector/collector.c -+++ b/gprofng/libcollector/collector.c -@@ -1578,7 +1578,7 @@ __collector_resume_experiment () - } - - /* Code to support Samples and Pause/Resume */ --void collector_sample () __attribute__ ((weak, alias ("__collector_sample"))); -+void collector_sample (char *name) __attribute__ ((weak, alias ("__collector_sample"))); - void - __collector_sample (char *name) - { -diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c -index f7cd46e7e6b..4eda18ec324 100644 ---- a/gprofng/libcollector/dispatcher.c -+++ b/gprofng/libcollector/dispatcher.c -@@ -1281,4 +1281,3 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, - int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); - int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); - int setitimer () __attribute__ ((weak, alias ("_setitimer"))); -- -diff --git a/gprofng/libcollector/envmgmt.c b/gprofng/libcollector/envmgmt.c -index a399c0d0cb4..f2bf2c41bfb 100644 ---- a/gprofng/libcollector/envmgmt.c -+++ b/gprofng/libcollector/envmgmt.c -@@ -685,8 +685,8 @@ __collector_env_update (char *envp[]) - - - /*------------------------------------------------------------- putenv */ --int putenv () __attribute__ ((weak, alias ("__collector_putenv"))); --int _putenv () __attribute__ ((weak, alias ("__collector_putenv"))); -+int putenv (char*) __attribute__ ((weak, alias ("__collector_putenv"))); -+int _putenv (char*) __attribute__ ((weak, alias ("__collector_putenv"))); - - int - __collector_putenv (char * string) -@@ -694,9 +694,9 @@ __collector_putenv (char * string) - if (CALL_UTIL (putenv) == __collector_putenv || - CALL_UTIL (putenv) == NULL) - { // __collector_libc_funcs_init failed -- CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_NEXT, "putenv"); -+ CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_NEXT, "putenv"); - if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv) -- CALL_UTIL (putenv) = (int(*)())dlsym (RTLD_DEFAULT, "putenv"); -+ CALL_UTIL (putenv) = (int(*)(char*))dlsym (RTLD_DEFAULT, "putenv"); - if (CALL_UTIL (putenv) == NULL || CALL_UTIL (putenv) == __collector_putenv) - { - TprintfT (DBG_LT2, "__collector_putenv(): ERROR: no pointer found.\n"); -@@ -712,8 +712,8 @@ __collector_putenv (char * string) - } - - /*------------------------------------------------------------- setenv */ --int setenv () __attribute__ ((weak, alias ("__collector_setenv"))); --int _setenv () __attribute__ ((weak, alias ("__collector_setenv"))); -+int setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv"))); -+int _setenv (const char*, const char*, int) __attribute__ ((weak, alias ("__collector_setenv"))); - - int - __collector_setenv (const char *name, const char *value, int overwrite) -@@ -721,9 +721,9 @@ __collector_setenv (const char *name, const char *value, int overwrite) - if (CALL_UTIL (setenv) == __collector_setenv || - CALL_UTIL (setenv) == NULL) - { // __collector_libc_funcs_init failed -- CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_NEXT, "setenv"); -+ CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_NEXT, "setenv"); - if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv) -- CALL_UTIL (setenv) = (int(*)())dlsym (RTLD_DEFAULT, "setenv"); -+ CALL_UTIL (setenv) = (int(*)(const char*, const char*, int))dlsym (RTLD_DEFAULT, "setenv"); - if (CALL_UTIL (setenv) == NULL || CALL_UTIL (setenv) == __collector_setenv) - { - TprintfT (DBG_LT2, "__collector_setenv(): ERROR: no pointer found.\n"); -@@ -758,8 +758,8 @@ __collector_setenv (const char *name, const char *value, int overwrite) - } - - /*------------------------------------------------------------- unsetenv */ --int unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv"))); --int _unsetenv () __attribute__ ((weak, alias ("__collector_unsetenv"))); -+int unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv"))); -+int _unsetenv (const char*) __attribute__ ((weak, alias ("__collector_unsetenv"))); - - int - __collector_unsetenv (const char *name) -@@ -767,9 +767,9 @@ __collector_unsetenv (const char *name) - if (CALL_UTIL (unsetenv) == __collector_unsetenv || - CALL_UTIL (unsetenv) == NULL) - { // __collector_libc_funcs_init failed -- CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_NEXT, "unsetenv"); -+ CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_NEXT, "unsetenv"); - if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv) -- CALL_UTIL (unsetenv) = (int(*)())dlsym (RTLD_DEFAULT, "unsetenv"); -+ CALL_UTIL (unsetenv) = (int(*)(const char*))dlsym (RTLD_DEFAULT, "unsetenv"); - if (CALL_UTIL (unsetenv) == NULL || CALL_UTIL (unsetenv) == __collector_unsetenv) - { - TprintfT (DBG_LT2, "__collector_unsetenv(): ERROR: no pointer found.\n"); -diff --git a/gprofng/libcollector/jprofile.c b/gprofng/libcollector/jprofile.c -index cd498bed0a3..d8f2d049a84 100644 ---- a/gprofng/libcollector/jprofile.c -+++ b/gprofng/libcollector/jprofile.c -@@ -99,8 +99,8 @@ static void rwrite (int fd, const void *buf, size_t nbyte); - static void addToDynamicArchive (const char* name, const unsigned char* class_data, int class_data_len); - static void (*AsyncGetCallTrace)(JVMPI_CallTrace*, jint, ucontext_t*) = NULL; - static void (*collector_heap_record)(int, int, void*) = NULL; --static void (*collector_jsync_begin)() = NULL; --static void (*collector_jsync_end)(hrtime_t, void *) = NULL; -+static void (*collector_jsync_begin)(void) = NULL; -+static void (*collector_jsync_end)(hrtime_t, void*) = NULL; - - #define gethrtime collector_interface->getHiResTime - -@@ -224,7 +224,7 @@ open_experiment (const char *exp) - else if (__collector_strStartWith (args, "s:") == 0) - { - java_sync_mode = 1; -- collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); -+ collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); - collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end"); - } - #endif -@@ -249,7 +249,7 @@ __collector_jprofile_enable_synctrace () - return; - } - java_sync_mode = 1; -- collector_jsync_begin = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); -+ collector_jsync_begin = (void(*)(void))dlsym (RTLD_DEFAULT, "__collector_jsync_begin"); - collector_jsync_end = (void(*)(hrtime_t, void *))dlsym (RTLD_DEFAULT, "__collector_jsync_end"); - TprintfT (DBG_LT1, "jprofile: turning on Java synctrace, and requesting events\n"); - } -@@ -1123,7 +1123,7 @@ jprof_find_asyncgetcalltrace () - { - void *jvmhandle; - if (__collector_VM_ReadByteInstruction == NULL) -- __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); -+ __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); - - /* look for stack unwind function using default path */ - AsyncGetCallTrace = (void (*)(JVMPI_CallTrace*, jint, ucontext_t*)) -diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c -index baac15db5c4..a73488e3f60 100644 ---- a/gprofng/libcollector/libcol_util.c -+++ b/gprofng/libcollector/libcol_util.c -@@ -1114,7 +1114,7 @@ __collector_util_init () - - ptr = dlsym (libc, "munmap"); - if (ptr) -- __collector_util_funcs.munmap = (int(*)())ptr; -+ __collector_util_funcs.munmap = (int(*)(void *, size_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT munmap: %s\n", dlerror ()); -@@ -1123,7 +1123,7 @@ __collector_util_init () - - ptr = dlsym (libc, "close"); - if (ptr) -- __collector_util_funcs.close = (int(*)())ptr; -+ __collector_util_funcs.close = (int(*)(int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ()); -@@ -1158,7 +1158,7 @@ __collector_util_init () - - ptr = dlsym (libc, "close"); - if (ptr) -- __collector_util_funcs.close = (int(*)())ptr; -+ __collector_util_funcs.close = (int(*)(int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT close: %s\n", dlerror ()); -@@ -1167,7 +1167,7 @@ __collector_util_init () - - ptr = dlsym (libc, "read"); - if (ptr) -- __collector_util_funcs.read = (ssize_t (*)())ptr; -+ __collector_util_funcs.read = (ssize_t (*)(int, void*, size_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT read: %s\n", dlerror ()); -@@ -1176,7 +1176,7 @@ __collector_util_init () - - ptr = dlsym (libc, "write"); - if (ptr) -- __collector_util_funcs.write = (ssize_t (*)())ptr; -+ __collector_util_funcs.write = (ssize_t (*)(int, void*, size_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT write: %s\n", dlerror ()); -@@ -1186,14 +1186,14 @@ __collector_util_init () - #if ARCH(Intel) && WSIZE(32) - ptr = dlvsym (libc, "pwrite", "GLIBC_2.2"); // it is in /lib/libpthread.so.0 - if (ptr) -- __collector_util_funcs.pwrite = (ssize_t (*)())ptr; -+ __collector_util_funcs.pwrite = (ssize_t (*)(int, void*, size_t, off_t))ptr; - else - { - Tprintf (DBG_LT0, "libcol_util: WARNING: dlvsym for %s@%s failed. Using dlsym() instead.", "pwrite", "GLIBC_2.2"); - #endif /* ARCH(Intel) && WSIZE(32) */ - ptr = dlsym (libc, "pwrite"); - if (ptr) -- __collector_util_funcs.pwrite = (ssize_t (*)())ptr; -+ __collector_util_funcs.pwrite = (ssize_t (*)(int, const void*, size_t, off_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pwrite: %s\n", dlerror ()); -@@ -1213,7 +1213,7 @@ __collector_util_init () - #endif /* ARCH(Intel) && WSIZE(32) */ - ptr = dlsym (libc, "pwrite64"); - if (ptr) -- __collector_util_funcs.pwrite64_ = (ssize_t (*)())ptr; -+ __collector_util_funcs.pwrite64_ = (ssize_t (*)(int, const void*, size_t, off_t))ptr; - else - __collector_util_funcs.pwrite64_ = __collector_util_funcs.pwrite; - #if ARCH(Intel) && WSIZE(32) -@@ -1222,7 +1222,7 @@ __collector_util_init () - - ptr = dlsym (libc, "lseek"); - if (ptr) -- __collector_util_funcs.lseek = (off_t (*)())ptr; -+ __collector_util_funcs.lseek = (off_t (*)(int, off_t, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT lseek: %s\n", dlerror ()); -@@ -1231,7 +1231,7 @@ __collector_util_init () - - ptr = dlsym (libc, "access"); - if (ptr) -- __collector_util_funcs.access = (int(*)())ptr; -+ __collector_util_funcs.access = (int(*)(const char*, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT access: %s\n", dlerror ()); -@@ -1240,7 +1240,7 @@ __collector_util_init () - - ptr = dlsym (libc, "mkdir"); - if (ptr) -- __collector_util_funcs.mkdir = (int(*)())ptr; -+ __collector_util_funcs.mkdir = (int(*)(const char*, mode_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mkdir: %s\n", dlerror ()); -@@ -1249,7 +1249,7 @@ __collector_util_init () - - ptr = dlsym (libc, "opendir"); - if (ptr) -- __collector_util_funcs.opendir = (DIR * (*)())ptr; -+ __collector_util_funcs.opendir = (DIR * (*)(const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT opendir: %s\n", dlerror ()); -@@ -1258,7 +1258,7 @@ __collector_util_init () - - ptr = dlsym (libc, "closedir"); - if (ptr) -- __collector_util_funcs.closedir = (int(*)())ptr; -+ __collector_util_funcs.closedir = (int(*)(DIR*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT closedir: %s\n", dlerror ()); -@@ -1267,7 +1267,7 @@ __collector_util_init () - - ptr = dlsym (libc, "execv"); - if (ptr) -- __collector_util_funcs.execv = (int(*)())ptr; -+ __collector_util_funcs.execv = (int(*)(const char*, char* const*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT execv: %s\n", dlerror ()); -@@ -1276,7 +1276,7 @@ __collector_util_init () - - ptr = dlsym (libc, "exit"); - if (ptr) -- __collector_util_funcs.exit = (void(*)())ptr; -+ __collector_util_funcs.exit = (void(*)(int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT exit: %s\n", dlerror ()); -@@ -1285,7 +1285,7 @@ __collector_util_init () - - ptr = dlsym (libc, "vfork"); - if (ptr) -- __collector_util_funcs.vfork = (pid_t (*)())ptr; -+ __collector_util_funcs.vfork = (pid_t (*)(void))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vfork: %s\n", dlerror ()); -@@ -1294,7 +1294,7 @@ __collector_util_init () - - ptr = dlsym (libc, "waitpid"); - if (ptr) -- __collector_util_funcs.waitpid = (pid_t (*)())ptr; -+ __collector_util_funcs.waitpid = (pid_t (*)(pid_t, int*, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT waitpid: %s\n", dlerror ()); -@@ -1313,7 +1313,7 @@ __collector_util_init () - - ptr = dlsym (libc, "getcontext"); - if (ptr) -- __collector_util_funcs.getcontext = (int(*)())ptr; -+ __collector_util_funcs.getcontext = (int(*)(ucontext_t*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getcontext: %s\n", dlerror ()); -@@ -1331,7 +1331,7 @@ __collector_util_init () - - ptr = dlsym (libc, "putenv"); - if (ptr) -- __collector_util_funcs.putenv = (int(*)())ptr; -+ __collector_util_funcs.putenv = (int(*)(char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT putenv: %s\n", dlerror ()); -@@ -1340,7 +1340,7 @@ __collector_util_init () - - ptr = dlsym (libc, "getenv"); - if (ptr) -- __collector_util_funcs.getenv = (char*(*)())ptr; -+ __collector_util_funcs.getenv = (char*(*)(const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT getenv: %s\n", dlerror ()); -@@ -1349,7 +1349,7 @@ __collector_util_init () - - ptr = dlsym (libc, "time"); - if (ptr) -- __collector_util_funcs.time = (time_t (*)())ptr; -+ __collector_util_funcs.time = (time_t (*)(time_t*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT time: %s\n", dlerror ()); -@@ -1358,7 +1358,7 @@ __collector_util_init () - - ptr = dlsym (libc, "mktime"); - if (ptr) -- __collector_util_funcs.mktime = (time_t (*)())ptr; -+ __collector_util_funcs.mktime = (time_t (*)(struct tm*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT mktime: %s\n", dlerror ()); -@@ -1372,7 +1372,7 @@ __collector_util_init () - - ptr = dlsym (libc, "gmtime_r"); - if (ptr) -- __collector_util_funcs.gmtime_r = (struct tm * (*)())ptr; -+ __collector_util_funcs.gmtime_r = (struct tm * (*)(const time_t*, struct tm*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT gmtime_r: %s\n", dlerror ()); -@@ -1381,7 +1381,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strtol"); - if (ptr) -- __collector_util_funcs.strtol = (long (*)())ptr; -+ __collector_util_funcs.strtol = (long (*)(const char*, char**, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtol: %s\n", dlerror ()); -@@ -1390,7 +1390,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strtoll"); - if (ptr) -- __collector_util_funcs.strtoll = (long long (*)())ptr; -+ __collector_util_funcs.strtoll = (long long (*)(const char*, char**, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoll: %s\n", dlerror ()); -@@ -1402,7 +1402,7 @@ __collector_util_init () - - ptr = dlsym (libc, "setenv"); - if (ptr) -- __collector_util_funcs.setenv = (int(*)())ptr; -+ __collector_util_funcs.setenv = (int(*)(const char*, const char*, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT setenv: %s\n", dlerror ()); -@@ -1411,7 +1411,7 @@ __collector_util_init () - - ptr = dlsym (libc, "unsetenv"); - if (ptr) -- __collector_util_funcs.unsetenv = (int(*)())ptr; -+ __collector_util_funcs.unsetenv = (int(*)(const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT unsetenv: %s\n", dlerror ()); -@@ -1507,7 +1507,7 @@ __collector_util_init () - - ptr = dlsym (libc, "pclose"); - if (ptr) -- __collector_util_funcs.pclose = (int(*)())ptr; -+ __collector_util_funcs.pclose = (int(*)(FILE*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT pclose: %s\n", dlerror ()); -@@ -1516,7 +1516,7 @@ __collector_util_init () - - ptr = dlsym (libc, "fgets"); - if (ptr) -- __collector_util_funcs.fgets = (char*(*)())ptr; -+ __collector_util_funcs.fgets = (char*(*)(char*, int, FILE*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT fgets: %s\n", dlerror ()); -@@ -1543,7 +1543,7 @@ __collector_util_init () - - ptr = dlsym (libc, "vsnprintf"); - if (ptr) -- __collector_util_funcs.vsnprintf = (int(*)())ptr; -+ __collector_util_funcs.vsnprintf = (int(*)(char*, size_t, const char*, ...))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT vsnprintf: %s\n", dlerror ()); -@@ -1552,7 +1552,7 @@ __collector_util_init () - - ptr = dlsym (libc, "atoi"); - if (ptr) -- __collector_util_funcs.atoi = (int(*)())ptr; -+ __collector_util_funcs.atoi = (int(*)(const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT atoi: %s\n", dlerror ()); -@@ -1561,7 +1561,7 @@ __collector_util_init () - - ptr = dlsym (libc, "calloc"); - if (ptr) -- __collector_util_funcs.calloc = (void*(*)())ptr; -+ __collector_util_funcs.calloc = (void*(*)(size_t, size_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT calloc: %s\n", dlerror ()); -@@ -1571,7 +1571,7 @@ __collector_util_init () - ptr = dlsym (libc, "free"); - if (ptr) - { -- __collector_util_funcs.free = (void(*)())ptr; -+ __collector_util_funcs.free = (void(*)(void*))ptr; - } - else - { -@@ -1581,7 +1581,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strdup"); - if (ptr) -- __collector_util_funcs.libc_strdup = (char*(*)())ptr; -+ __collector_util_funcs.libc_strdup = (char*(*)(const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strdup: %s\n", dlerror ()); -@@ -1594,7 +1594,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strerror"); - if (ptr) -- __collector_util_funcs.strerror = (char*(*)())ptr; -+ __collector_util_funcs.strerror = (char*(*)(int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror: %s\n", dlerror ()); -@@ -1602,7 +1602,7 @@ __collector_util_init () - } - ptr = dlsym (libc, "strerror_r"); - if (ptr) -- __collector_util_funcs.strerror_r = (int(*)())ptr; -+ __collector_util_funcs.strerror_r = (int(*)(int, char*, size_t))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strerror_r: %s\n", dlerror ()); -@@ -1610,7 +1610,7 @@ __collector_util_init () - } - ptr = dlsym (libc, "strspn"); - if (ptr) -- __collector_util_funcs.strspn = (size_t (*)())ptr; -+ __collector_util_funcs.strspn = (size_t (*)(const char*, const char*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strspn: %s\n", dlerror ()); -@@ -1619,7 +1619,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strtoul"); - if (ptr) -- __collector_util_funcs.strtoul = (unsigned long int(*)())ptr; -+ __collector_util_funcs.strtoul = (unsigned long int(*)(const char*, char**, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoul: %s\n", dlerror ()); -@@ -1628,7 +1628,7 @@ __collector_util_init () - - ptr = dlsym (libc, "strtoull"); - if (ptr) -- __collector_util_funcs.strtoull = (unsigned long long int(*)())ptr; -+ __collector_util_funcs.strtoull = (unsigned long long int(*)(const char*, char**, int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT strtoull: %s\n", dlerror ()); -@@ -1673,7 +1673,7 @@ __collector_util_init () - - ptr = dlsym (libc, "sysconf"); - if (ptr) -- __collector_util_funcs.sysconf = (long(*)())ptr; -+ __collector_util_funcs.sysconf = (long(*)(int))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysconf: %s\n", dlerror ()); -@@ -1682,7 +1682,7 @@ __collector_util_init () - - ptr = dlsym (libc, "sigfillset"); - if (ptr) -- __collector_util_funcs.sigfillset = (int(*)())ptr; -+ __collector_util_funcs.sigfillset = (int(*)(sigset_t*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigfillset: %s\n", dlerror ()); -@@ -1691,7 +1691,7 @@ __collector_util_init () - - ptr = dlsym (libc, "sigprocmask"); - if (ptr) -- __collector_util_funcs.sigprocmask = (int(*)())ptr; -+ __collector_util_funcs.sigprocmask = (int(*)(int, const sigset_t*, sigset_t*))ptr; - else - { - CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sigprocmask: %s\n", dlerror ()); -diff --git a/gprofng/libcollector/mmaptrace.c b/gprofng/libcollector/mmaptrace.c -index f07f4d76513..2a6857ab58e 100644 ---- a/gprofng/libcollector/mmaptrace.c -+++ b/gprofng/libcollector/mmaptrace.c -@@ -1209,7 +1209,7 @@ process_vsyscall_page () - /* - * collector API for dynamic functions - */ --void collector_func_load () __attribute__ ((weak, alias ("__collector_func_load"))); -+void collector_func_load (char*, char*, char*, void*, int, int, DT_lineno *) __attribute__ ((weak, alias ("__collector_func_load"))); - void - __collector_func_load (char *name, char *alias, char *sourcename, - void *vaddr, int size, int lntsize, DT_lineno *lntable) -@@ -1218,7 +1218,7 @@ __collector_func_load (char *name, char *alias, char *sourcename, - vaddr, size, lntsize, lntable); - } - --void collector_func_unload () __attribute__ ((weak, alias ("__collector_func_unload"))); -+void collector_func_unload (void *vaddr) __attribute__ ((weak, alias ("__collector_func_unload"))); - void - __collector_func_unload (void *vaddr) - { -diff --git a/gprofng/libcollector/unwind.c b/gprofng/libcollector/unwind.c -index 55fa2e9e9e7..e08afa165d1 100644 ---- a/gprofng/libcollector/unwind.c -+++ b/gprofng/libcollector/unwind.c -@@ -421,7 +421,7 @@ __collector_ext_unwind_init (int record) - omp_no_walk = 1; - - if (__collector_VM_ReadByteInstruction == NULL) -- __collector_VM_ReadByteInstruction = (int(*)()) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); -+ __collector_VM_ReadByteInstruction = (int(*)(unsigned char*)) dlsym (RTLD_DEFAULT, "Async_VM_ReadByteInstruction"); - - #if ARCH(SPARC) - #if WSIZE(64) -diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h -index ebcdbca561f..fd888cd58dd 100644 ---- a/gprofng/src/collector_module.h -+++ b/gprofng/src/collector_module.h -@@ -110,7 +110,7 @@ typedef struct CollectorUtilFuncs - long (*sysinfo)(int command, char *buf, long count); - time_t (*time)(time_t *tloc); - int (*unsetenv)(const char *name); -- int (*vsnprintf)(char *str, size_t size, const char *format, va_list ap); -+ int (*vsnprintf)(char *str, size_t size, const char *format, ...); - pid_t (*waitpid)(pid_t pid, int *stat_loc, int options); - ssize_t (*write)(int, void *, size_t); - double (*atof)(); --- -2.50.1 - diff --git a/package/binutils/2.43.1/0007-gprofng-fix-build-with-std-gnu23.patch b/package/binutils/2.43.1/0007-gprofng-fix-build-with-std-gnu23.patch deleted file mode 100644 index fe03b4b5cf..0000000000 --- a/package/binutils/2.43.1/0007-gprofng-fix-build-with-std-gnu23.patch +++ /dev/null @@ -1,199 +0,0 @@ -From 9ca25799ea0e92855d19adc46634e6dd0675a0b7 Mon Sep 17 00:00:00 2001 -From: Vladimir Mezentsev -Date: Thu, 21 Nov 2024 14:48:20 -0800 -Subject: [PATCH] gprofng: fix build with -std=gnu23 - -Fix function pointer types accordingly. -Remove unused function pointers. - -gprofng/ChangeLog -2024-11-21 Vladimir Mezentsev - - PR gprofng/32374 - PR gprofng/32373 - * common/cpuid.c: Define ATTRIBUTE_UNUSED if necessary. - * libcollector/libcol_util.c (sysinfo): Remove unused pointer. - * src/collector_module.h: Likewise. - * libcollector/dispatcher.c (setitimer): Fix prototype. - * libcollector/linetrace.c (system, grantpt, ptsname): Likewise. - * testsuite/gprofng.display/mttest/mttest.c (dump_arrays): Likewise. - * testsuite/gprofng.display/synprog/endcases.c (xinline_code, - s_inline_code): Likewise. - * testsuite/gprofng.display/synprog/inc_inline.h (ext_inline_code): - Likewise. - * testsuite/gprofng.display/synprog/synprog.c (doabort): Rename nullptr. - -Upstream: 4e943705e3e8a5a9448d087502bcb390a694ad02 -Signed-off-by: Thomas Petazzoni ---- - gprofng/common/cpuid.c | 2 ++ - gprofng/libcollector/dispatcher.c | 2 +- - gprofng/libcollector/libcol_util.c | 9 --------- - gprofng/libcollector/linetrace.c | 10 +++++----- - gprofng/src/collector_module.h | 1 - - gprofng/testsuite/gprofng.display/mttest/mttest.c | 2 +- - gprofng/testsuite/gprofng.display/synprog/endcases.c | 4 ++-- - gprofng/testsuite/gprofng.display/synprog/inc_inline.h | 2 +- - gprofng/testsuite/gprofng.display/synprog/synprog.c | 4 ++-- - 9 files changed, 14 insertions(+), 22 deletions(-) - -diff --git a/gprofng/common/cpuid.c b/gprofng/common/cpuid.c -index 891d5471335..b4caef54f57 100644 ---- a/gprofng/common/cpuid.c -+++ b/gprofng/common/cpuid.c -@@ -21,7 +21,9 @@ - #if defined(__i386__) || defined(__x86_64) - #include /* GCC-provided */ - #elif defined(__aarch64__) -+#if !defined(ATTRIBUTE_UNUSED) - #define ATTRIBUTE_UNUSED __attribute__((unused)) -+#endif - - static inline uint_t __attribute_const__ - __get_cpuid (unsigned int op ATTRIBUTE_UNUSED, unsigned int *eax, -diff --git a/gprofng/libcollector/dispatcher.c b/gprofng/libcollector/dispatcher.c -index 4eda18ec324..6f0364cc52c 100644 ---- a/gprofng/libcollector/dispatcher.c -+++ b/gprofng/libcollector/dispatcher.c -@@ -1280,4 +1280,4 @@ __collector_ext_clone_pthread (int (*fn)(void *), void *child_stack, int flags, - // weak symbols: - int sigprocmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_sigprocmask"))); - int thr_sigsetmask (int, const sigset_t*, sigset_t*) __attribute__ ((weak, alias ("__collector_thr_sigsetmask"))); --int setitimer () __attribute__ ((weak, alias ("_setitimer"))); -+__typeof(setitimer) setitimer __attribute__ ((weak, alias ("_setitimer"))); -diff --git a/gprofng/libcollector/libcol_util.c b/gprofng/libcollector/libcol_util.c -index a73488e3f60..77dc886be22 100644 ---- a/gprofng/libcollector/libcol_util.c -+++ b/gprofng/libcollector/libcol_util.c -@@ -1427,15 +1427,6 @@ __collector_util_init () - err = COL_ERROR_UTIL_INIT; - } - -- ptr = dlsym (libc, "sysinfo"); -- if (ptr) -- __collector_util_funcs.sysinfo = (long (*)())ptr; -- else -- { -- CALL_UTIL (fprintf)(stderr, "collector_util_init COL_ERROR_UTIL_INIT sysinfo: %s\n", dlerror ()); -- err = COL_ERROR_UTIL_INIT; -- } -- - ptr = dlsym (libc, "clearenv"); - if (ptr) - __collector_util_funcs.clearenv = (int(*)())ptr; -diff --git a/gprofng/libcollector/linetrace.c b/gprofng/libcollector/linetrace.c -index 66844bc1337..c81ae1a2272 100644 ---- a/gprofng/libcollector/linetrace.c -+++ b/gprofng/libcollector/linetrace.c -@@ -1527,7 +1527,7 @@ DCL_FUNC_VER (DCL_POSIX_SPAWNP, posix_spawnp_2_2, posix_spawnp@GLIBC_2.2) - DCL_POSIX_SPAWNP (posix_spawnp) - - /*------------------------------------------------------------- system */ --int system () __attribute__ ((weak, alias ("__collector_system"))); -+int system (const char *cmd) __attribute__ ((weak, alias ("__collector_system"))); - - int - __collector_system (const char *cmd) -@@ -1582,10 +1582,10 @@ DCL_FUNC_VER (DCL_POPEN, popen_2_0, popen@GLIBC_2.0) - DCL_POPEN (popen) - - /*------------------------------------------------------------- grantpt */ --int grantpt () __attribute__ ((weak, alias ("__collector_grantpt"))); -+int grantpt (int fildes) __attribute__ ((weak, alias ("__collector_grantpt"))); - - int --__collector_grantpt (const int fildes) -+__collector_grantpt (int fildes) - { - if (NULL_PTR (grantpt)) - init_lineage_intf (); -@@ -1607,10 +1607,10 @@ __collector_grantpt (const int fildes) - } - - /*------------------------------------------------------------- ptsname */ --char *ptsname () __attribute__ ((weak, alias ("__collector_ptsname"))); -+char *ptsname (int fildes) __attribute__ ((weak, alias ("__collector_ptsname"))); - - char * --__collector_ptsname (const int fildes) -+__collector_ptsname (int fildes) - { - if (NULL_PTR (ptsname)) - init_lineage_intf (); -diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h -index fd888cd58dd..6640f12fa3c 100644 ---- a/gprofng/src/collector_module.h -+++ b/gprofng/src/collector_module.h -@@ -107,7 +107,6 @@ typedef struct CollectorUtilFuncs - int (*symlink)(const char *s1, const char *s2); - int (*syscall)(int number, ...); - long (*sysconf)(int name); -- long (*sysinfo)(int command, char *buf, long count); - time_t (*time)(time_t *tloc); - int (*unsetenv)(const char *name); - int (*vsnprintf)(char *str, size_t size, const char *format, ...); -diff --git a/gprofng/testsuite/gprofng.display/mttest/mttest.c b/gprofng/testsuite/gprofng.display/mttest/mttest.c -index e0835c833e5..3db5b8d8e86 100644 ---- a/gprofng/testsuite/gprofng.display/mttest/mttest.c -+++ b/gprofng/testsuite/gprofng.display/mttest/mttest.c -@@ -171,7 +171,7 @@ void computeJ (workStruct_t *x); - void computeK (workStruct_t *x); - void addone (workCtr_t *x); - void init_arrays (int strat); --void dump_arrays (); -+void dump_arrays (hrtime_t real, hrtime_t cpu, int case_index); - void *do_work (void *v); - void thread_work (); - void nothreads (Workblk *array, struct scripttab *k); -diff --git a/gprofng/testsuite/gprofng.display/synprog/endcases.c b/gprofng/testsuite/gprofng.display/synprog/endcases.c -index a6a1389658a..6f1c83b6859 100644 ---- a/gprofng/testsuite/gprofng.display/synprog/endcases.c -+++ b/gprofng/testsuite/gprofng.display/synprog/endcases.c -@@ -40,8 +40,8 @@ static void s_inline_code (int); - void ext_inline_code (int); - - #ifndef NO_INLINE --void xinline_code () __attribute__ ((always_inline)); --void s_inline_code () __attribute__ ((always_inline)); -+void xinline_code (int) __attribute__ ((always_inline)); -+void s_inline_code (int) __attribute__ ((always_inline)); - #endif - - #include "inc_inline.h" -diff --git a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h -index da42563c828..6600eacb66d 100644 ---- a/gprofng/testsuite/gprofng.display/synprog/inc_inline.h -+++ b/gprofng/testsuite/gprofng.display/synprog/inc_inline.h -@@ -19,7 +19,7 @@ - MA 02110-1301, USA. */ - - #ifndef NO_INLINE --void ext_inline_code() __attribute__ ((always_inline)); -+void ext_inline_code(int) __attribute__ ((always_inline)); - #endif - - void -diff --git a/gprofng/testsuite/gprofng.display/synprog/synprog.c b/gprofng/testsuite/gprofng.display/synprog/synprog.c -index cf1bc5b0909..05920dc7419 100644 ---- a/gprofng/testsuite/gprofng.display/synprog/synprog.c -+++ b/gprofng/testsuite/gprofng.display/synprog/synprog.c -@@ -528,14 +528,14 @@ reapchildren () - int - doabort (int k) - { -- char *nullptr = NULL; -+ char *p = NULL; - char c; - - /* Log the event */ - wlog ("start of doabort", NULL); - - /* and dereference a NULL */ -- c = *nullptr; -+ c = *p; - - /* this should never be reached */ - return (int) c; --- -2.50.1 - diff --git a/package/binutils/2.43.1/0001-sh-conf.patch b/package/binutils/2.46.0/0001-sh-conf.patch similarity index 73% rename from package/binutils/2.43.1/0001-sh-conf.patch rename to package/binutils/2.46.0/0001-sh-conf.patch index c381017850..e24afb0850 100644 --- a/package/binutils/2.43.1/0001-sh-conf.patch +++ b/package/binutils/2.46.0/0001-sh-conf.patch @@ -1,4 +1,4 @@ -From d71fb5a9999ee7c8963342caa0d5cbb16872ab07 Mon Sep 17 00:00:00 2001 +From 0bf75276c392cac7794e78e1572abcd793d99e4e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 Dec 2015 11:38:13 +0100 Subject: [PATCH] sh-conf @@ -14,18 +14,20 @@ Upstream: N/A [Buildroot specific] Signed-off-by: Romain Naour [Thomas: rebase on top of 2.29, in which sh64 support was removed.] Signed-off-by: Thomas Petazzoni +[Bernd: rebased for version 2.46.0] +Signed-off-by: Bernd Kuhls --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 670684d83d1..967c6708a0c 100755 +index bbfb5979546..bcd95684ae1 100755 --- a/configure +++ b/configure -@@ -4042,7 +4042,7 @@ case "${target}" in +@@ -4196,7 +4196,7 @@ nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + noconfigdirs="$noconfigdirs target-libssp" ;; - sh-*-*) + sh*-*-*) @@ -33,12 +35,12 @@ index 670684d83d1..967c6708a0c 100755 sh*-*-elf) ;; diff --git a/configure.ac b/configure.ac -index 88b4800e298..2c8d08ff6ec 100644 +index f9694cdf901..d6a3623ba50 100644 --- a/configure.ac +++ b/configure.ac -@@ -1269,7 +1269,7 @@ case "${target}" in +@@ -1365,7 +1365,7 @@ nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + noconfigdirs="$noconfigdirs target-libssp" ;; - sh-*-*) + sh*-*-*) @@ -46,5 +48,5 @@ index 88b4800e298..2c8d08ff6ec 100644 sh*-*-elf) ;; -- -2.43.0 +2.51.1 diff --git a/package/binutils/2.43.1/0002-poison-system-directories.patch b/package/binutils/2.46.0/0002-poison-system-directories.patch similarity index 87% rename from package/binutils/2.43.1/0002-poison-system-directories.patch rename to package/binutils/2.46.0/0002-poison-system-directories.patch index 8da0ec31df..584fa9498a 100644 --- a/package/binutils/2.43.1/0002-poison-system-directories.patch +++ b/package/binutils/2.46.0/0002-poison-system-directories.patch @@ -1,4 +1,4 @@ -From 00f6b0a7d31085831429834b2bc8f511b8fab6ce Mon Sep 17 00:00:00 2001 +From 92f4bd0e1713577e30491e99a0226088eaeae740 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 Dec 2015 11:45:38 +0100 Subject: [PATCH] poison-system-directories @@ -15,6 +15,8 @@ Signed-off-by: Romain Naour [Gustavo: adapt to binutils 2.25] Signed-off-by: Thomas Petazzoni Signed-off-by: Gustavo Zacarias +[Bernd: rebased for version 2.46.0] +Signed-off-by: Bernd Kuhls Upstream-Status: Inappropriate [distribution: codesourcery] Upstream: N/A [Buildroot specific] @@ -76,17 +78,17 @@ Signed-off-by: Scott Garman ld/configure.ac | 10 ++++++++++ ld/ld.h | 8 ++++++++ ld/ld.texi | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ + ld/ldfile.c | 16 ++++++++++++++++ ld/ldlex.h | 2 ++ ld/ldmain.c | 2 ++ ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) + 9 files changed, 88 insertions(+) diff --git a/ld/config.in b/ld/config.in -index f7c9da3d02a..e4fdbf6db5b 100644 +index 790efd336be..2b237bcda5e 100644 --- a/ld/config.in +++ b/ld/config.in -@@ -74,6 +74,9 @@ +@@ -86,6 +86,9 @@ language is requested. */ #undef ENABLE_NLS @@ -97,27 +99,27 @@ index f7c9da3d02a..e4fdbf6db5b 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index 44d79c2445d..e28cea11977 100755 +index cd410bd64d1..7e9913949d4 100755 --- a/ld/configure +++ b/ld/configure -@@ -844,6 +844,7 @@ with_lib_path +@@ -843,6 +843,7 @@ enable_checking + with_lib_path enable_targets - enable_64_bit_bfd with_sysroot +enable_poison_system_directories enable_gold enable_got enable_compressed_debug_sections -@@ -1535,6 +1536,8 @@ Optional Features: +@@ -1537,6 +1538,8 @@ Optional Features: + --disable-largefile omit support for large files --enable-checking enable run-time checks --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) + --enable-poison-system-directories + warn for use of native system library directories --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -15587,7 +15590,18 @@ else +@@ -15768,7 +15771,18 @@ else fi @@ -137,10 +139,10 @@ index 44d79c2445d..e28cea11977 100755 # Check whether --enable-got was given. if test "${enable_got+set}" = set; then : diff --git a/ld/configure.ac b/ld/configure.ac -index bdf51a062fa..3d370ff92ce 100644 +index f528ae42ef7..dcf1e17fae6 100644 --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -102,6 +102,16 @@ AC_SUBST(use_sysroot) +@@ -115,6 +115,16 @@ AC_SUBST(use_sysroot) AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -158,7 +160,7 @@ index bdf51a062fa..3d370ff92ce 100644 dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. diff --git a/ld/ld.h b/ld/ld.h -index 0dee944cf2a..83bd82d2a2e 100644 +index c8688153bd4..0b16caf347a 100644 --- a/ld/ld.h +++ b/ld/ld.h @@ -166,6 +166,14 @@ typedef struct @@ -177,10 +179,10 @@ index 0dee944cf2a..83bd82d2a2e 100644 enum endian_enum endian; diff --git a/ld/ld.texi b/ld/ld.texi -index 89e3913317a..b80cf05617f 100644 +index cf750d15259..1acaa26f107 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -3234,6 +3234,18 @@ string identifying the original linked file does not change. +@@ -3375,6 +3375,18 @@ bit string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -200,13 +202,14 @@ index 89e3913317a..b80cf05617f 100644 @item --package-metadata=@var{JSON} Request the creation of a @code{.note.package} ELF note section. The diff --git a/ld/ldfile.c b/ld/ldfile.c -index 87be885d31a..9bc7adca4bc 100644 +index 75fd360d5e3..3526ea8146c 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -327,6 +327,22 @@ ldfile_add_library_path (const char *name, enum search_dir_source source) +@@ -326,6 +326,22 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); - ++ +#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES + if (command_line.poison_system_directories + && ((!strncmp (name, "/lib", 4)) @@ -222,12 +225,11 @@ index 87be885d31a..9bc7adca4bc 100644 + "cross-compilation\n"), name); + } +#endif -+ - /* Accumulate script and command line sourced - search paths at the end of the current list. */ - #if BFD_SUPPORTS_PLUGINS + } + + static void diff --git a/ld/ldlex.h b/ld/ldlex.h -index defe3fcbbb9..0ff12614926 100644 +index c8d61478c60..4b175dca108 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -170,6 +170,8 @@ enum option_values @@ -240,10 +242,10 @@ index defe3fcbbb9..0ff12614926 100644 OPTION_NO_ERROR_EXECSTACK, OPTION_WARN_EXECSTACK_OBJECTS, diff --git a/ld/ldmain.c b/ld/ldmain.c -index 037099b9d37..204feedc6e3 100644 +index 67c60c3f80d..c2365e4006c 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -347,6 +347,8 @@ main (int argc, char **argv) +@@ -749,6 +749,8 @@ main (int argc, char **argv) command_line.warn_mismatch = true; command_line.warn_search_mismatch = true; command_line.check_section_addresses = -1; @@ -253,10 +255,10 @@ index 037099b9d37..204feedc6e3 100644 /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the diff --git a/ld/lexsup.c b/ld/lexsup.c -index 4aa0124ce2f..c4d76943821 100644 +index bde20465835..422866f4ea9 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -648,6 +648,14 @@ static const struct ld_option ld_options[] = +@@ -643,6 +643,14 @@ static const struct ld_option ld_options[] = " is: share-unconflicted (default),\n" " share-duplicated"), TWO_DASHES }, @@ -271,7 +273,7 @@ index 4aa0124ce2f..c4d76943821 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -660,6 +668,7 @@ parse_args (unsigned argc, char **argv) +@@ -655,6 +663,7 @@ parse_args (unsigned argc, char **argv) int ingroup = 0; char *default_dirlist = NULL; char *shortopts; @@ -279,7 +281,7 @@ index 4aa0124ce2f..c4d76943821 100644 struct option *longopts; struct option *really_longopts; int last_optind; -@@ -1785,6 +1794,14 @@ parse_args (unsigned argc, char **argv) +@@ -1789,6 +1798,14 @@ parse_args (unsigned argc, char **argv) } break; @@ -294,7 +296,7 @@ index 4aa0124ce2f..c4d76943821 100644 case OPTION_PUSH_STATE: input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -@@ -1938,6 +1955,10 @@ parse_args (unsigned argc, char **argv) +@@ -1933,6 +1950,10 @@ parse_args (unsigned argc, char **argv) command_line.soname = NULL; } @@ -305,3 +307,6 @@ index 4aa0124ce2f..c4d76943821 100644 while (ingroup) { einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.51.1 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index a043771339..8032bfe005 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,7 +7,7 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_44_X if !BR2_arc + default BR2_BINUTILS_VERSION_2_45_X if !BR2_arc default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. @@ -16,23 +16,23 @@ config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.43)" depends on BR2_arc -config BR2_BINUTILS_VERSION_2_43_X - bool "binutils 2.43.1" - config BR2_BINUTILS_VERSION_2_44_X bool "binutils 2.44" config BR2_BINUTILS_VERSION_2_45_X bool "binutils 2.45.1" +config BR2_BINUTILS_VERSION_2_46_X + bool "binutils 2.46.0" + endchoice config BR2_BINUTILS_VERSION string default "arc-2024.12-release" if BR2_BINUTILS_VERSION_ARC - default "2.43.1" if BR2_BINUTILS_VERSION_2_43_X default "2.44" if BR2_BINUTILS_VERSION_2_44_X default "2.45.1" if BR2_BINUTILS_VERSION_2_45_X + default "2.46.0" if BR2_BINUTILS_VERSION_2_46_X config BR2_BINUTILS_GPROFNG bool "gprofng support" diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 183b7c1f4e..df2613055a 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,7 +1,7 @@ # From https://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 20977ad17729141a2c26d358628f44a0944b84dcfefdec2ba029c2d02f40dfc41cc91c0631044560d2bd6f9a51e1f15846b4b311befbe14f1239f14ff7d57824 binutils-2.43.1.tar.xz sha512 b85d3bbc0e334cf67a96219d3c7c65fbf3e832b2c98a7417bf131f3645a0307057ec81cd2b29ff2563cec53e3d42f73e2c60cc5708e80d4a730efdcc6ae14ad7 binutils-2.44.tar.xz sha512 ea030419eba387579ab717be7e3223fc99e93b586860b06003c12489f93441640d4082736f76aa5e98233db4f46e232f536a45e471486de1f5b64e1b827c167e binutils-2.45.1.tar.xz +sha512 32f880bb4f69351f4ae54a5d00359625c6c49d8e76624fb5cffdf174c79c8d3212f66225b81c12933c6ed59604ab652560773dd92fab384b930c97a9d4e1fdf2 binutils-2.46.0.tar.xz # Locally calculated (fetched from Github) sha512 46c336a16bde7b73dc4ceac0986887d47d542a1452e1936ef871b5e76afdb6cad4b18ccb4d93341358e7bb92c2ef74781e1fb72935d527d15251ac9f9daa8305 binutils-gdb-arc-2024.12-release.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 0f2384d69d..f772c9cf9a 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2024.12-release else -BINUTILS_VERSION = 2.44 +BINUTILS_VERSION = 2.45.1 endif endif # BINUTILS_VERSION diff --git a/package/connman/connman.hash b/package/connman/connman.hash index 807f7144b1..da9c879b0b 100644 --- a/package/connman/connman.hash +++ b/package/connman/connman.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 77128cce80865455c4f106b5901a575e2dfdb35a7d2e2e2996f16e85cba10913 connman-1.45.tar.xz +sha256 d25c2ddc0b5ad13e986ec35ad765ae8d2f4b7acb47c958a05616c943cd082527 connman-2.0.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 695a81f1e5..0100509405 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.45 +CONNMAN_VERSION = 2.0 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash index b658359257..35524c7742 100644 --- a/package/gawk/gawk.hash +++ b/package/gawk/gawk.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/gawk/gawk-5.3.2.tar.xz.sig +# https://ftp.gnu.org/gnu/gawk/gawk-5.4.0.tar.xz.sig # Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 -sha256 f8c3486509de705192138b00ef2c00bbbdd0e84c30d5c07d23fc73a9dc4cc9cc gawk-5.3.2.tar.xz +sha256 3dd430f0cd3b4428c6c3f6afc021b9cd3c1f8c93f7a688dc268ca428a90b4ac1 gawk-5.4.0.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 40b0672da2..10ca336844 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 5.3.2 +GAWK_VERSION = 5.4.0 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk diff --git a/package/gkrellm/gkrellm.hash b/package/gkrellm/gkrellm.hash index 2f0fbcbeb4..e8a6ef5540 100644 --- a/package/gkrellm/gkrellm.hash +++ b/package/gkrellm/gkrellm.hash @@ -1,5 +1,5 @@ -# From https://git.srcbox.net/gkrellm/gkrellm/releases/download/gkrellm-2.5.0/gkrellm-2.5.0.tar.bz2.sha256sum -sha256 68c75a03a06b935afa93d3331ca1c2d862c1d50c3e9df19d9a8d48970d766b55 gkrellm-2.5.0.tar.bz2 +# From https://git.srcbox.net/gkrellm/gkrellm/releases/download/gkrellm-2.5.1/gkrellm-2.5.1.tar.bz2.sha256sum +sha256 089e3c1ed398482e682c9900b504ea166a6144a6c9fa041e70c5bbca6b177e63 gkrellm-2.5.1.tar.bz2 # Locally computed sha256 691de85c3c6eeda5b6982c751548575344739ce4b4418d78905e599359f6c435 COPYING sha256 a4bb0b604fe7d40ca4469ffd5e2e2de70ff8ece43e47980ab2c8962d5e913330 COPYRIGHT diff --git a/package/gkrellm/gkrellm.mk b/package/gkrellm/gkrellm.mk index 6ee00858d3..16d0729d5f 100644 --- a/package/gkrellm/gkrellm.mk +++ b/package/gkrellm/gkrellm.mk @@ -4,8 +4,8 @@ # ################################################################################ -GKRELLM_VERSION = 2.5.0 -GKRELLM_SITE = http://gkrellm.srcbox.net/releases +GKRELLM_VERSION = 2.5.1 +GKRELLM_SITE = https://gkrellm.srcbox.net/releases GKRELLM_SOURCE = gkrellm-$(GKRELLM_VERSION).tar.bz2 GKRELLM_LICENSE = GPL-3.0+ GKRELLM_LICENSE_FILES = COPYING COPYRIGHT diff --git a/package/iniparser/Config.in b/package/iniparser/Config.in new file mode 100644 index 0000000000..56764c04e6 --- /dev/null +++ b/package/iniparser/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_INIPARSER + bool "iniparser" + help + iniparser is a simple C library offering ini file + parsing services. + + https://gitlab.com/iniparser/iniparser diff --git a/package/iniparser/iniparser.hash b/package/iniparser/iniparser.hash new file mode 100644 index 0000000000..27a5fa81aa --- /dev/null +++ b/package/iniparser/iniparser.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 67575ed032a544d5359610e5f697af786371bbc3eb01311218ef8adfd3e5e329 iniparser-v4.2.6.tar.gz +sha256 da809b67f3cc571433b7b97d4253ae1f9d8817770aa859aad202df6bde1d5fde LICENSE diff --git a/package/iniparser/iniparser.mk b/package/iniparser/iniparser.mk new file mode 100644 index 0000000000..d5e4601d2b --- /dev/null +++ b/package/iniparser/iniparser.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# iniparser +# +################################################################################ + +INIPARSER_VERSION = 4.2.6 +INIPARSER_SITE = https://gitlab.com/iniparser/iniparser/-/archive/v$(INIPARSER_VERSION) +INIPARSER_SOURCE = iniparser-v$(INIPARSER_VERSION).tar.gz +INIPARSER_INSTALL_STAGING = YES +INIPARSER_LICENSE = MIT +INIPARSER_LICENSE_FILES = LICENSE + +$(eval $(cmake-package)) diff --git a/package/libbytesize/libbytesize.hash b/package/libbytesize/libbytesize.hash index c3962d7bbd..3697afd982 100644 --- a/package/libbytesize/libbytesize.hash +++ b/package/libbytesize/libbytesize.hash @@ -1,3 +1,4 @@ +# From https://github.com/storaged-project/libbytesize/releases/tag/2.12 +sha256 8356bac2cafd2f31f39bf1ad373cef8448cab08b817aeaee5c526d54e81c3c5a libbytesize-2.12.tar.gz # Locally calculated -sha256 1f6ce157750ed1201ce83edd3c23d997a615c7da30f9a0e5bb44635f66768d81 libbytesize-2.11.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libbytesize/libbytesize.mk b/package/libbytesize/libbytesize.mk index f163b9ad21..c786105118 100644 --- a/package/libbytesize/libbytesize.mk +++ b/package/libbytesize/libbytesize.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBYTESIZE_VERSION = 2.11 +LIBBYTESIZE_VERSION = 2.12 LIBBYTESIZE_SITE = https://github.com/storaged-project/libbytesize/releases/download/$(LIBBYTESIZE_VERSION) LIBBYTESIZE_LICENSE = LGPL-2.1+ LIBBYTESIZE_LICENSE_FILES = LICENSE diff --git a/package/libeastl/0001-cmake-patch-EABase-to-fix-build-with-cmake-4.patch b/package/libeastl/0001-cmake-patch-EABase-to-fix-build-with-cmake-4.patch new file mode 100644 index 0000000000..4544073be4 --- /dev/null +++ b/package/libeastl/0001-cmake-patch-EABase-to-fix-build-with-cmake-4.patch @@ -0,0 +1,30 @@ +From d2374930c45ecf117b08df0ffa5c1611867f6d92 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 22 Feb 2026 15:26:22 +0100 +Subject: [PATCH] cmake: patch EABase to fix build with cmake 4+ + +FetchContent_Declare overwrites extracted source files during configure. + +Upstream: Not applicable (Buildroot specific) +(sent PR for version bump: https://github.com/electronicarts/EABase/pull/18) + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0124dc7..f76df69 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,6 +75,7 @@ FetchContent_Declare( + GIT_REPOSITORY https://github.com/electronicarts/EABase.git + GIT_TAG 0699a15efdfd20b6cecf02153bfa5663decb653c + GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EABase. ++ PATCH_COMMAND sed -i "s/make_minimum_required(VERSION 3.1)/make_minimum_required(VERSION 3.5)/" "${CMAKE_CURRENT_SOURCE_DIR}/_deps/eabase-src/CMakeLists.txt" + ) + + FetchContent_MakeAvailable(EABase) +-- +2.47.3 + diff --git a/package/libeastl/libeastl.hash b/package/libeastl/libeastl.hash index c7ba6da09f..3424fd5951 100644 --- a/package/libeastl/libeastl.hash +++ b/package/libeastl/libeastl.hash @@ -1,2 +1,3 @@ -sha256 9b3484553812b3ec3bad0857f7f675499c81f7cf4ac87e5f3b2acbe72e3a878a libeastl-45469730d641868ce05433fff2e199510c7d45c3.tar.gz -sha256 82c0243a1a62b8af01dab3bce6ed2b0852604bd508b85a561ba7d32480e598e3 LICENSE +# Locally computed +sha256 fce43bf443f5569b00a8deae735394ea0b16f6c3f96867a17ded50775ffcdd12 libeastl-3.27.01.tar.gz +sha256 cebc1fa5ade455a79f821180cf86bf5f9717dd1df5704b4c2a3bb0617ab35f2a LICENSE diff --git a/package/libeastl/libeastl.mk b/package/libeastl/libeastl.mk index 0559dd856d..15feaf9847 100644 --- a/package/libeastl/libeastl.mk +++ b/package/libeastl/libeastl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEASTL_VERSION = 45469730d641868ce05433fff2e199510c7d45c3 +LIBEASTL_VERSION = 3.27.01 LIBEASTL_SITE = $(call github,electronicarts,EASTL,$(LIBEASTL_VERSION)) LIBEASTL_LICENSE = BSD-3-Clause LIBEASTL_LICENSE_FILES = LICENSE diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash index 14fb45ef48..93b02362f6 100644 --- a/package/libkrb5/libkrb5.hash +++ b/package/libkrb5/libkrb5.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# from https://web.mit.edu/kerberos/dist/krb5/1.22/krb5-1.22.1.tar.gz.asc +# from https://web.mit.edu/kerberos/dist/krb5/1.22/krb5-1.22.2.tar.gz.asc # with key C4493CB739F4A89F9852CBC20CBA08575F8372DF -sha256 1a8832b8cad923ebbf1394f67e2efcf41e3a49f460285a66e35adec8fa0053af krb5-1.22.1.tar.gz +sha256 3243ffbc8ea4d4ac22ddc7dd2a1dc54c57874c40648b60ff97009763554eaf13 krb5-1.22.2.tar.gz # Hash for license file: -sha256 83914195f655de4f4970014a26f38b16bf4c5ff357ea51645ca2aea3a92764eb NOTICE +sha256 d37fcb886de2ad1c602f61c99c6893bcbd9a1949f54d9a6bb40d191204eb605e NOTICE diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index ede0b8afd3..6bf08a2516 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -5,7 +5,7 @@ ################################################################################ LIBKRB5_VERSION_MAJOR = 1.22 -LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).1 +LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).2 LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR) LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src diff --git a/package/libmodbus/libmodbus.hash b/package/libmodbus/libmodbus.hash index 5c081d9710..ddca835f34 100644 --- a/package/libmodbus/libmodbus.hash +++ b/package/libmodbus/libmodbus.hash @@ -1,3 +1,4 @@ +# From https://github.com/stephane/libmodbus/releases/tag/v3.1.12 +sha256 2f4d4191cd196c1fba131daec03b621db75129d8255c832fc66b259d9fc46e7b libmodbus-3.1.12.tar.gz # Locally computed -sha256 15b4b2e0f68122c2da9b195de5c330489a9c97d40b4a95d2822378dc14d780e7 libmodbus-3.1.11.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk index 4902d6257f..5d20aef35c 100644 --- a/package/libmodbus/libmodbus.mk +++ b/package/libmodbus/libmodbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODBUS_VERSION = 3.1.11 +LIBMODBUS_VERSION = 3.1.12 LIBMODBUS_SITE = https://github.com/stephane/libmodbus/releases/download/v$(LIBMODBUS_VERSION) LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER diff --git a/package/libnfs/0001-Do-not-edit-const-and-use-const-qualifier-from-point.patch b/package/libnfs/0001-Do-not-edit-const-and-use-const-qualifier-from-point.patch new file mode 100644 index 0000000000..d463ecd356 --- /dev/null +++ b/package/libnfs/0001-Do-not-edit-const-and-use-const-qualifier-from-point.patch @@ -0,0 +1,37 @@ +From 89a795fee97a3da348c28dbd58500100a13dcec0 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sun, 25 Jan 2026 08:30:43 +0000 +Subject: [PATCH] Do not edit const and use const qualifier from pointer target + type + +Fixes: + ../../lib/libnfs.c: In function 'nfs_set_context_args': + ../../lib/libnfs.c:301:30: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] + 301 | char *strp = strchr(val, ','); + | ^~~~~~ + +Upstream: https://github.com/sahlberg/libnfs/commit/89a795fee97a3da348c28dbd58500100a13dcec0 + +Signed-off-by: Bernd Kuhls +--- + lib/libnfs.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/libnfs.c b/lib/libnfs.c +index bbe6666..162492b 100755 +--- a/lib/libnfs.c ++++ b/lib/libnfs.c +@@ -316,9 +316,8 @@ nfs_set_context_args(struct nfs_context *nfs, const char *arg, const char *val) + } else if (!strcmp(arg, "wsize")) { + nfs_set_writemax(nfs, atoi(val)); + } else if (!strcmp(arg, "readdir-buffer")) { +- char *strp = strchr(val, ','); ++ const char *strp = strchr(val, ','); + if (strp) { +- *strp = 0; + strp++; + nfs_set_readdir_max_buffer_size(nfs, atoi(val), atoi(strp)); + } else { +-- +2.47.3 + diff --git a/package/libnfs/0001-Fix-include-sys-time.h.patch b/package/libnfs/0001-Fix-include-sys-time.h.patch deleted file mode 100644 index 03193d6d71..0000000000 --- a/package/libnfs/0001-Fix-include-sys-time.h.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9df082012cba1dc32d83e5e8b0bdc0892f250058 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 5 Nov 2018 00:43:07 +0100 -Subject: [PATCH] Fix include sys/time.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -POSIX says `struct timeval` is defined if is included. - -Instead of the mess that is currently done based on the system on which -the stuff is being compiled, include it unconditionally. - -Upstream: https://github.com/sahlberg/libnfs/issues/272 - -Signed-off-by: Jörg Krause -[Fabrice: update for 5.0.2] -Signed-off-by: Fabrice Fontaine -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi ---- - include/nfsc/libnfs.h | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h -index 09dcf1c..b6db58c 100755 ---- a/include/nfsc/libnfs.h -+++ b/include/nfsc/libnfs.h -@@ -28,12 +28,7 @@ - #endif - - #include --#if defined(__ANDROID__) || defined(AROS) || defined(__PPU__) \ -- || ( defined(__APPLE__) && defined(__MACH__) ) || defined(__FreeBSD__) || defined(__OpenBSD__) - #include --#else --#include --#endif - - #ifdef __cplusplus - extern "C" { --- -2.19.1 - diff --git a/package/libnfs/0002-use-const-qualifier-from-pointer-target-type.patch b/package/libnfs/0002-use-const-qualifier-from-pointer-target-type.patch new file mode 100644 index 0000000000..6fe8f6433b --- /dev/null +++ b/package/libnfs/0002-use-const-qualifier-from-pointer-target-type.patch @@ -0,0 +1,117 @@ +From 6a06cb6dba0065705179329729cca2f95a842a63 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sun, 25 Jan 2026 08:42:18 +0000 +Subject: [PATCH] use const qualifier from pointer target type + +Fixes: + ../../lib/nfs_v3.c: In function 'nfs3_mknod_async': + ../../lib/nfs_v3.c:3260:13: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] + 3260 | ptr = strrchr(path, '/'); + | ^ + ../../lib/nfs_v3.c: In function 'nfs3_unlink_async': + ../../lib/nfs_v3.c:3361:13: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] + 3361 | ptr = strrchr(path, '/'); + | ^ + ../../lib/nfs_v3.c: In function 'nfs3_rmdir_async': + ../../lib/nfs_v3.c:3472:13: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] + 3472 | ptr = strrchr(path, '/'); + | ^ + ../../lib/nfs_v3.c: In function 'nfs3_mkdir2_async': + ../../lib/nfs_v3.c:3574:13: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] + 3574 | ptr = strrchr(path, '/'); + | ^ + +Upstream: https://github.com/sahlberg/libnfs/commit/6a06cb6dba0065705179329729cca2f95a842a63 + +Signed-off-by: Bernd Kuhls +--- + lib/nfs_v3.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/lib/nfs_v3.c b/lib/nfs_v3.c +index addd0ae..2c32fff 100644 +--- a/lib/nfs_v3.c ++++ b/lib/nfs_v3.c +@@ -3244,7 +3244,7 @@ int + nfs3_mknod_async(struct nfs_context *nfs, const char *path, int mode, int dev, + nfs_cb cb, void *private_data) + { +- char *ptr; ++ const char *ptr; + struct mknod_cb_data *cb_data; + + cb_data = malloc(sizeof(struct mknod_cb_data)); +@@ -3262,8 +3262,8 @@ nfs3_mknod_async(struct nfs_context *nfs, const char *path, int mode, int dev, + "buffer for mknod path"); + return -1; + } +- ptr = strrchr(cb_data->path, '/'); +- *ptr = 0; ++ char *ptr2 = strrchr(cb_data->path, '/'); ++ *ptr2 = 0; + } else { + cb_data->path = malloc(strlen(path) + 2); + if (cb_data->path == NULL) { +@@ -3353,7 +3353,7 @@ nfs3_unlink_async(struct nfs_context *nfs, const char *path, nfs_cb cb, + void *private_data) + { + char *new_path; +- char *ptr; ++ const char *ptr; + + ptr = strrchr(path, '/'); + if (ptr) { +@@ -3363,8 +3363,8 @@ nfs3_unlink_async(struct nfs_context *nfs, const char *path, nfs_cb cb, + "buffer for unlink path"); + return -1; + } +- ptr = strrchr(new_path, '/'); +- *ptr = 0; ++ char *ptr2 = strrchr(new_path, '/'); ++ *ptr2 = 0; + } else { + new_path = malloc(strlen(path) + 2); + if (new_path == NULL) { +@@ -3464,7 +3464,7 @@ nfs3_rmdir_async(struct nfs_context *nfs, const char *path, nfs_cb cb, + void *private_data) + { + char *new_path; +- char *ptr; ++ const char *ptr; + + ptr = strrchr(path, '/'); + if (ptr) { +@@ -3474,8 +3474,8 @@ nfs3_rmdir_async(struct nfs_context *nfs, const char *path, nfs_cb cb, + "buffer for rmdir path"); + return -1; + } +- ptr = strrchr(new_path, '/'); +- *ptr = 0; ++ char *ptr2 = strrchr(new_path, '/'); ++ *ptr2 = 0; + } else { + new_path = malloc(strlen(path) + 2); + if (new_path == NULL) { +@@ -3566,7 +3566,7 @@ nfs3_mkdir2_async(struct nfs_context *nfs, const char *path, int mode, + nfs_cb cb, void *private_data) + { + char *new_path; +- char *ptr; ++ const char *ptr; + + ptr = strrchr(path, '/'); + if (ptr) { +@@ -3576,8 +3576,8 @@ nfs3_mkdir2_async(struct nfs_context *nfs, const char *path, int mode, + "buffer for mkdir path"); + return -1; + } +- ptr = strrchr(new_path, '/'); +- *ptr = 0; ++ char *ptr2 = strrchr(new_path, '/'); ++ *ptr2 = 0; + } else { + new_path = malloc(strlen(path) + 2); + if (new_path == NULL) { +-- +2.47.3 + diff --git a/package/libnfs/0002-utils-nfs-stat.c-include-time.h.patch b/package/libnfs/0002-utils-nfs-stat.c-include-time.h.patch deleted file mode 100644 index 649d84524c..0000000000 --- a/package/libnfs/0002-utils-nfs-stat.c-include-time.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 034205b6b3acd64f9c75010d8da27e2c9f1bc82f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 21 Jul 2024 18:04:05 +0200 -Subject: [PATCH] utils/nfs-stat.c: include time.h - -Include time.h to fix the following build failure with gcc >= 14 which -enables -Werror=implicit-function-declaration -(https://gcc.gnu.org/gcc-14/porting_to.html): - -nfs-stat.c: In function 'main': -nfs-stat.c:287:30: error: implicit declaration of function 'ctime' [-Wimplicit-function-declaration] - 287 | printf("Access: %s", ctime( (const time_t *) &st.nfs_atime)); - | ^~~~~ -nfs-stat.c:177:1: note: 'ctime' is defined in header ''; this is probably fixable by adding '#include ' - 176 | #include - +++ |+#include - 177 | char *uid_to_name(int uid) - -Fixes: - - http://autobuild.buildroot.org/results/73c3828a4e5d275ca0dfdd5b314494e2b00393c8 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/sahlberg/libnfs/commit/39e1ae0206fb519c551b48b0e6de57f3e764e886 ---- - utils/nfs-stat.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/nfs-stat.c b/utils/nfs-stat.c -index 17ddb311..0ec33544 100644 ---- a/utils/nfs-stat.c -+++ b/utils/nfs-stat.c -@@ -50,6 +50,7 @@ WSADATA wsaData; - #include - #include - #include -+#include - #include "libnfs.h" - #include "libnfs-raw.h" - #include "libnfs-raw-mount.h" diff --git a/package/libnfs/libnfs.hash b/package/libnfs/libnfs.hash index c5e5197c13..c0e5ef5c81 100644 --- a/package/libnfs/libnfs.hash +++ b/package/libnfs/libnfs.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 d945cb4f4c8f82ee1f3640893a168810f794a28e1010bb007ec5add345e9df3e libnfs-5.0.3.tar.gz +sha256 4e5459cc3e0242447879004e9ad28286d4d27daa42cbdcde423248fad911e747 libnfs-6.0.2.tar.gz sha256 edd960c0142b8ada98b43b6396b78f4e557b0bc70ac601a51e397ad04070e2c5 COPYING sha256 d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1 LICENCE-BSD.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk index e5e302a4f8..4ba6690951 100644 --- a/package/libnfs/libnfs.mk +++ b/package/libnfs/libnfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFS_VERSION = 5.0.3 +LIBNFS_VERSION = 6.0.2 LIBNFS_SITE = $(call github,sahlberg,libnfs,libnfs-$(LIBNFS_VERSION)) LIBNFS_INSTALL_STAGING = YES LIBNFS_AUTORECONF = YES @@ -12,6 +12,10 @@ LIBNFS_LICENSE = LGPL-2.1+ (library), BSD-2-Clause (protocol, .x files), GPL-3.0 LIBNFS_LICENSE_FILES = COPYING LICENCE-BSD.txt LICENCE-LGPL-2.1.txt LICENCE-GPL-3.txt LIBNFS_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBNFS_DEPENDENCIES += gnutls +endif + ifeq ($(BR2_PACKAGE_LIBTIRPC),y) LIBNFS_DEPENDENCIES += libtirpc endif diff --git a/package/libtalloc/libtalloc.hash b/package/libtalloc/libtalloc.hash index 5577583881..c7223bf5bd 100644 --- a/package/libtalloc/libtalloc.hash +++ b/package/libtalloc/libtalloc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6 talloc-2.4.2.tar.gz -sha256 e01fb092aaed2b431be26674e2b791c77fb5984537c29b514e957582c6b31465 talloc.h +sha256 55e47994018c13743485544e7206780ffbb3c8495e704a99636503e6e77abf59 talloc-2.4.4.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk index 676076b857..27d0778f6b 100644 --- a/package/libtalloc/libtalloc.mk +++ b/package/libtalloc/libtalloc.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBTALLOC_VERSION = 2.4.2 +LIBTALLOC_VERSION = 2.4.4 LIBTALLOC_SOURCE = talloc-$(LIBTALLOC_VERSION).tar.gz LIBTALLOC_SITE = https://www.samba.org/ftp/talloc LIBTALLOC_LICENSE = LGPL-3.0+ -LIBTALLOC_LICENSE_FILES = talloc.h +LIBTALLOC_LICENSE_FILES = LICENSE LIBTALLOC_INSTALL_STAGING = YES # libtalloc is extracted from the samba source tree, and that has a workaround diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 4a6eaa9428..5ad4957756 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -589,6 +589,11 @@ endmenu menu "Ethernet firmware" +config BR2_PACKAGE_LINUX_FIRMWARE_AIROHA_EN8811H + bool "Airoha EN8811H 2.5G Ethernet PHY" + help + Firmware files for the Airoha EN8811H 2.5G Ethernet PHY. + config BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3 bool "Broadcom NetXtreme/Tigon3" help diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index f1fdca52a9..bbd8d3295a 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -3,6 +3,7 @@ sha256 b6c9a9c112b88417d985b87d6521b677fa2fa0d5d7ee5219c76dc8ca66945ad3 linux- # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis +sha256 ad548ca0ffb91ec655de0f28e13089ef1cd4e0deabb2f15a9289194990e62252 LICENSE.airoha sha256 27907ae1d74b94fd6f1159971158ed3199e472f129ea1ff748ea13aded2a59d5 LICENSE.amd-ucode sha256 572872598565dc3513470de971a32bf9db301f47afeef3636345eadae33b2eee LICENSE.amdgpu sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 6e58814279..0a35d72bc4 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -675,6 +675,11 @@ LINUX_FIRMWARE_FILES += intel/iwlwifi/iwlwifi-QuZ-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AIROHA_EN8811H),y) +LINUX_FIRMWARE_FILES += airoha/EthMD32.dm.bin airoha/EthMD32.DSP.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.airoha +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3),y) LINUX_FIRMWARE_FILES += tigon/* LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.tigon diff --git a/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch b/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch deleted file mode 100644 index d6eb7476dc..0000000000 --- a/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 964740d28c9a0da52a75d579d7fdfa53df67e925 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 30 Mar 2024 16:50:46 +0100 -Subject: [PATCH] src/lxc/syscall_numbers.h: drop define -1 - -Drop "#define -1" to avoid the following m68k build failure with gcc 12: - -In file included from ../src/lxc/syscall_wrappers.h:19, - from ../src/lxc/mount_utils.h:15, - from ../src/lxc/conf.h:24, - from ../src/lxc/log.h:19, - from ../src/lxc/storage/btrfs.c:20: -../src/lxc/syscall_numbers.h:423:25: error: macro names must be identifiers - 423 | #define -1 - | ^ - -Fixes: - - http://autobuild.buildroot.org/results/f40a517eba86838b11b4b1d6a8a05b8233a3394d - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/lxc/lxc/commit/82fe01821cd5cb8548598d7d93b07d6ef3f6b604 -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi ---- - src/lxc/syscall_numbers.h | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/src/lxc/syscall_numbers.h b/src/lxc/syscall_numbers.h -index ae5fdd0641c6..5dc1259fef1c 100644 ---- a/src/lxc/syscall_numbers.h -+++ b/src/lxc/syscall_numbers.h -@@ -51,7 +51,6 @@ - #define __NR_keyctl 5241 - #endif - #else -- #define -1 - #warning "__NR_keyctl not defined for your architecture" - #endif - #endif -@@ -88,7 +87,6 @@ - #define __NR_memfd_create 5314 - #endif - #else -- #define -1 - #warning "__NR_memfd_create not defined for your architecture" - #endif - #endif -@@ -123,7 +121,6 @@ - #define __NR_pivot_root 5151 - #endif - #else -- #define -1 - #warning "__NR_pivot_root not defined for your architecture" - #endif - #endif -@@ -158,7 +155,6 @@ - #define __NR_setns 5303 - #endif - #else -- #define -1 - #warning "__NR_setns not defined for your architecture" - #endif - #endif -@@ -193,7 +189,6 @@ - #define __NR_sethostname 5165 - #endif - #else -- #define -1 - #warning "__NR_sethostname not defined for your architecture" - #endif - #endif -@@ -260,7 +255,6 @@ - #define __NR_signalfd4 5283 - #endif - #else -- #define -1 - #warning "__NR_signalfd4 not defined for your architecture" - #endif - #endif -@@ -295,7 +289,6 @@ - #define __NR_unshare 5262 - #endif - #else -- #define -1 - #warning "__NR_unshare not defined for your architecture" - #endif - #endif -@@ -330,7 +323,6 @@ - #define __NR_bpf 5315 - #endif - #else -- #define -1 - #warning "__NR_bpf not defined for your architecture" - #endif - #endif -@@ -365,7 +357,6 @@ - #define __NR_faccessat 5259 - #endif - #else -- #define -1 - #warning "__NR_faccessat not defined for your architecture" - #endif - #endif -@@ -420,7 +411,6 @@ - #define __NR_seccomp 5312 - #endif - #else -- #define -1 - #warning "__NR_seccomp not defined for your architecture" - #endif - #endif -@@ -455,7 +445,6 @@ - #define __NR_gettid 5178 - #endif - #else -- #define -1 - #warning "__NR_gettid not defined for your architecture" - #endif - #endif -@@ -494,7 +483,6 @@ - #define __NR_execveat 5316 - #endif - #else -- #define -1 - #warning "__NR_execveat not defined for your architecture" - #endif - #endif -@@ -733,7 +721,6 @@ - #define __NR_personality (132 + 5000) - #endif - #else -- #define -1 - #warning "__NR_personality not defined for your architecture" - #endif - #endif --- -2.43.0 - diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 8b3365ddfc..cfe0e5ab6b 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 2693a4c654dcfdafb3aa95c262051d8122afa1b6f5cef1920221ebbdee934d07 lxc-5.0.3.tar.gz +sha256 2e540c60b9dd49e7ee1a4efa5e9c743b05df911b81b375ed5043d9dd7ee0b48a lxc-6.0.5.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 7a5f91e1a8..2f17960e55 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 5.0.3 +LXC_VERSION = 6.0.5 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 @@ -69,11 +69,11 @@ else LXC_CONF_OPTS += -Dopenssl=false endif -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -LXC_CONF_OPTS += -Dsd-bus=enabled -LXC_DEPENDENCIES += systemd +ifeq ($(BR2_PACKAGE_DBUS),y) +LXC_CONF_OPTS += -Ddbus=true +LXC_DEPENDENCIES += dbus else -LXC_CONF_OPTS += -Dsd-bus=disabled +LXC_CONF_OPTS += -Ddbus=false endif ifeq ($(BR2_INIT_SYSTEMD),y) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index e1faea95d5..63acf0cc6e 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -57,8 +57,10 @@ menuconfig BR2_PACKAGE_MESA3D_OPENCL BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST || \ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS || \ + BR2_PACKAGE_MESA3D_VULKAN_DRIVER_AMD || \ BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL || \ BR2_PACKAGE_MESA3D_VULKAN_DRIVER_IMAGINATION || \ + BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST || \ (BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS && \ BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER) select BR2_PACKAGE_LLVM_RTTI @@ -325,6 +327,18 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ZINK comment "Vulkan drivers" +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_AMD + bool "Vulkan AMD driver (radv)" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence + select BR2_PACKAGE_LIBDRM_AMDGPU + select BR2_PACKAGE_LLVM_AMDGPU if BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER + help + RADV is a userspace driver that implements the + Vulkan API on most modern AMD GPUs. + + https://docs.mesa3d.org/drivers/radv.html + config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM bool "Vulkan broadcom driver" depends on BR2_arm || BR2_aarch64 @@ -365,6 +379,19 @@ comment "intel vulkan needs a glibc toolchain w/ headers >= 3.17" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || \ !BR2_TOOLCHAIN_USES_GLIBC +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST + bool "Vulkan panfrost driver" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence + depends on BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_LLVM_RTTI if BR2_PACKAGE_MESA3D_LLVM + select BR2_PACKAGE_MESA3D_NEEDS_PRECOMP_COMPILER + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER + help + Vulkan panfrost driver. + +comment "panfrost vulkan needs llvm" + depends on !BR2_PACKAGE_MESA3D_LLVM + config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST bool "Vulkan swrast driver" depends on BR2_PACKAGE_MESA3D_LLVM diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 325756d92e..54e8ea4081 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -128,9 +128,12 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ZINK) += zink # Vulkan Drivers +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_AMD) += amd MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM) += broadcom MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_IMAGINATION) += imagination MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST) += panfrost +HOST_MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST) += panfrost MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST) += swrast MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_VIRTIO) += virtio @@ -284,7 +287,7 @@ else MESA3D_CONF_OPTS += -Dglvnd=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST),y) +ifneq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST)$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST),) HOST_MESA3D_TOOLS += panfrost endif @@ -315,7 +318,7 @@ HOST_MESA3D_DEPENDENCIES = \ host-python-pyyaml \ host-spirv-tools -ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST),y) +ifneq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST)$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_PANFROST),) HOST_MESA3D_INSTALL_PANFROST_COMPILE = \ $(INSTALL) -D -m 0755 $(@D)/buildroot-build/src/panfrost/clc/panfrost_compile $(HOST_DIR)/bin/panfrost_compile endif diff --git a/package/minicom/minicom.hash b/package/minicom/minicom.hash index 92a50d010c..8d5f646dd2 100644 --- a/package/minicom/minicom.hash +++ b/package/minicom/minicom.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 90e7ce2856b3eaaa3f452354d17981c49d32c426a255b6f0d3063a227c101538 minicom-2.10.tar.bz2 +sha256 87cf0da91af0531357cd61b8e1906b907edd2c9ef82f9ae74c277e1893d0f98c minicom-2.11.1.tar.bz2 sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15 COPYING diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk index 0c9b1ae434..c799fcd23a 100644 --- a/package/minicom/minicom.mk +++ b/package/minicom/minicom.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINICOM_VERSION = 2.10 +MINICOM_VERSION = 2.11.1 MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.bz2 MINICOM_SITE = \ https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION) diff --git a/package/mstpd/0001-bridge-stp.in-support-different-versions-of-pidof-13.patch b/package/mstpd/0001-bridge-stp.in-support-different-versions-of-pidof-13.patch deleted file mode 100644 index daa591131b..0000000000 --- a/package/mstpd/0001-bridge-stp.in-support-different-versions-of-pidof-13.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 181c453fc1a00573e19f14960dcc54ad84beea7c Mon Sep 17 00:00:00 2001 -From: colin-foster-in-advantage -Date: Tue, 12 Jul 2022 23:01:09 -0700 -Subject: [PATCH] bridge-stp.in: support different versions of pidof (#137) - -* bridge-stp.in: support different versions of pidof - -Busybox uses a version of pdiof that doesn't support the -c option. As -such, this renders mstpd non-functional on any Busybox system. - -Just use the standard form of pidof to detect any running instances of mstpd. - -Signed-off-by: Colin Foster ---- - bridge-stp.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bridge-stp.in b/bridge-stp.in -index 47cbe79..3807873 100755 ---- a/bridge-stp.in -+++ b/bridge-stp.in -@@ -139,7 +139,7 @@ case "$action" in - fi - - # Start mstpd if necessary. -- if ! pidof -c -s mstpd >/dev/null; then -+ if ! pidof -s mstpd >/dev/null; then - if [ "$MANAGE_MSTPD" != 'y' ]; then - errmsg 'mstpd is not running' - exit 3 -@@ -212,12 +212,12 @@ case "$action" in - done - - # Kill mstpd, since no bridges are currently using it. -- kill $(pidof -c mstpd) -+ kill $(pidof mstpd) - ;; - restart|restart_config) - if [ "$action" = 'restart' ]; then - # Kill mstpd. -- pids="$(pidof -c mstpd)" ; Err=$? -+ pids="$(pidof mstpd)" ; Err=$? - if [ $Err -eq 0 ]; then - echo 'Stopping mstpd ...' - kill $pids --- -2.25.1 - diff --git a/package/mstpd/mstpd.hash b/package/mstpd/mstpd.hash index 64e946d6d1..7c6c482ef3 100644 --- a/package/mstpd/mstpd.hash +++ b/package/mstpd/mstpd.hash @@ -1,5 +1,4 @@ # locally computed -sha256 91a1862548b5b509caa2e96e5fb9912bc98d4d58cc98e99a577824735756c14d mstpd-0.0.9.tar.gz -sha256 03d1ff4ca189d54322562cb2891888768af719d2c73ceafa5f1ca96133dffeb2 mstpd-0.1.0.tar.gz +sha256 6b4a0a721147373f0b22e8f47c0f13942b78afc55348299fe7b056b75adc98f4 mstpd-0.1.1.tar.gz sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 LICENSE -sha256 c5cfd44652276184374adf454150d436ce958ce50acc4ef9ccb3605a5ca7a9d3 hmac_md5.c +sha256 69e0a7ba32b016703dea402deae57348f14d028ff4dd9188b2acad607e484588 hmac_md5.c diff --git a/package/mstpd/mstpd.mk b/package/mstpd/mstpd.mk index 07c41af8df..79f361ee6c 100644 --- a/package/mstpd/mstpd.mk +++ b/package/mstpd/mstpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSTPD_VERSION = 0.1.0 +MSTPD_VERSION = 0.1.1 MSTPD_SITE = $(call github,mstpd,mstpd,$(MSTPD_VERSION)) MSTPD_AUTORECONF = YES MSTPD_LICENSE = GPL-2.0, RSA Data Security (md5) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index c8bdb0913f..5d369a514f 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v8/nano-8.7.tar.xz.asc +# https://www.nano-editor.org/dist/v8/nano-8.7.1.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 afd287aa672c48b8e1a93fdb6c6588453d527510d966822b687f2835f0d986e9 nano-8.7.tar.xz +sha256 76f0dcb248f2e2f1251d4ecd20fd30fb400a360a3a37c6c340e0a52c2d1cdedf nano-8.7.1.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index ee82225a72..0e2b0af574 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 8 -NANO_VERSION = $(NANO_VERSION_MAJOR).7 +NANO_VERSION = $(NANO_VERSION_MAJOR).7.1 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index fb5c03d917..9aa9151ebb 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.8.4/sha256sums.asc -sha256 11c4cc598a434d7d340bad3e072a373ba1dcc2c49f855d44b202222b78ecdbf5 nfs-utils-2.8.4.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.8.5/sha256sums.asc +sha256 b13ca4a9df44186bdbe107514b22732d4243f785f95daf2fb86afc1edba15bbb nfs-utils-2.8.5.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index e7d82b10ba..ba87ef813e 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.8.4 +NFS_UTILS_VERSION = 2.8.5 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ @@ -28,7 +28,7 @@ HOST_NFS_UTILS_DEPENDENCIES = host-pkgconf host-libtirpc host-libevent host-sqli HOST_NFS_UTILS_CONF_OPTS = \ --enable-tirpc \ --disable-nfsv4 \ - --disable-nfsv41 \ + --disable-blkmapd \ --disable-gss \ --disable-uuid \ --disable-ipv6 \ @@ -50,10 +50,10 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \ usr/sbin/fsidd usr/lib/systemd/system/fsidd.service ifeq ($(BR2_PACKAGE_NFS_UTILS_NFSV4),y) -NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-nfsv41 +NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-blkmapd NFS_UTILS_DEPENDENCIES += keyutils lvm2 else -NFS_UTILS_CONF_OPTS += --disable-nfsv4 --disable-nfsv41 +NFS_UTILS_CONF_OPTS += --disable-nfsv4 --disable-blkmapd endif ifeq ($(BR2_PACKAGE_NFS_UTILS_GSS),y) diff --git a/package/nghttp2/nghttp2.hash b/package/nghttp2/nghttp2.hash index 4b60d6d143..30c2c9078e 100644 --- a/package/nghttp2/nghttp2.hash +++ b/package/nghttp2/nghttp2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 88bb94c9e4fd1c499967f83dece36a78122af7d5fb40da2019c56b9ccc6eb9dd nghttp2-1.64.0.tar.xz +sha256 5511d3128850e01b5b26ec92bf39df15381c767a63441438b25ad6235def902c nghttp2-1.68.0.tar.xz sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING diff --git a/package/nghttp2/nghttp2.mk b/package/nghttp2/nghttp2.mk index 98f837e28e..3db48e7323 100644 --- a/package/nghttp2/nghttp2.mk +++ b/package/nghttp2/nghttp2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGHTTP2_VERSION = 1.64.0 +NGHTTP2_VERSION = 1.68.0 NGHTTP2_SOURCE = nghttp2-$(NGHTTP2_VERSION).tar.xz NGHTTP2_SITE = https://github.com/nghttp2/nghttp2/releases/download/v$(NGHTTP2_VERSION) NGHTTP2_LICENSE = MIT diff --git a/package/oath-toolkit/oath-toolkit.hash b/package/oath-toolkit/oath-toolkit.hash index d44b7bb742..c45923926d 100644 --- a/package/oath-toolkit/oath-toolkit.hash +++ b/package/oath-toolkit/oath-toolkit.hash @@ -1,9 +1,8 @@ # After checking pgp signature from: -# https://download.savannah.nongnu.org/releases/oath-toolkit/oath-toolkit-2.6.13.tar.gz.sig +# https://download.savannah.nongnu.org/releases/oath-toolkit/oath-toolkit-2.6.14.tar.gz.sig # using key A3CC9C870B9D310ABAD4CF2F51722B08FE4745A2 # From release announce: -# https://mail.gnu.org/archive/html/oath-toolkit-help/2025-07/msg00000.html -sha1 62807099befb8141e429d3e38750772041ea9056 oath-toolkit-2.6.13.tar.gz -sha256 5b5d82e9a4455206d24fcbd7ee58bf4c79398a2e67997d80bd45ae927586b18b oath-toolkit-2.6.13.tar.gz +# https://mail.gnu.org/archive/html/oath-toolkit-help/2026-01/msg00000.html +sha256 8b1da365759f1249be57a82aec6e107f7b57dc77d813f96dc0aaf81624f28971 oath-toolkit-2.6.14.tar.gz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/oath-toolkit/oath-toolkit.mk b/package/oath-toolkit/oath-toolkit.mk index 37b00a8241..8dee1feb00 100644 --- a/package/oath-toolkit/oath-toolkit.mk +++ b/package/oath-toolkit/oath-toolkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -OATH_TOOLKIT_VERSION = 2.6.13 +OATH_TOOLKIT_VERSION = 2.6.14 OATH_TOOLKIT_SITE = https://download.savannah.nongnu.org/releases/oath-toolkit OATH_TOOLKIT_LICENSE = GPL-3.0+ (tools), LGPL-2.1+ (libraries) OATH_TOOLKIT_LICENSE_FILES = COPYING diff --git a/package/piglit/piglit.hash b/package/piglit/piglit.hash index a778401253..8158177e4f 100644 --- a/package/piglit/piglit.hash +++ b/package/piglit/piglit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0553524e1bfce646771560805cbe523204c59dcee20dc58bb9baa87134a50ea1 piglit-62d499d63d2b8b29a67efd9d93ed9b6a94d4950e-git4.tar.gz +sha256 060d45db7304446ef280afd60fad3a728bcd9fdfe4c204b8a236e6a4a46ce592 piglit-3051e13ae12e1c927c7baace3138a8bebec7018a-git4.tar.gz sha256 dcc398730859aee7cc1d6aa57f526f8d181b47bb3a49830e85b5723d5bc2c3bc COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licences/GPL-2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 licences/GPL-3 diff --git a/package/piglit/piglit.mk b/package/piglit/piglit.mk index 619f29204f..e61c3c9e61 100644 --- a/package/piglit/piglit.mk +++ b/package/piglit/piglit.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIGLIT_VERSION = 62d499d63d2b8b29a67efd9d93ed9b6a94d4950e +PIGLIT_VERSION = 3051e13ae12e1c927c7baace3138a8bebec7018a PIGLIT_SITE = https://gitlab.freedesktop.org/mesa/piglit.git PIGLIT_SITE_METHOD = git PIGLIT_LICENSE = MIT (code), \ diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index 8d990d0d5f..b1183fba1e 100644 --- a/package/python-pymodbus/python-pymodbus.hash +++ b/package/python-pymodbus/python-pymodbus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymodbus/json -md5 7485a0f834aafb48273c6adb297dff93 pymodbus-3.11.4.tar.gz -sha256 6910e385cb6b2f983cd457e9ecee2ff580dbb23cf3d84aefec0845e71edd606a pymodbus-3.11.4.tar.gz +md5 c120f359fa9a0bba0c450efcb93941e9 pymodbus-3.12.0.tar.gz +sha256 3fafe85e5d82bb9bcbda14b97a0e69a47dc46be55631e9f988adfaf95140c44b pymodbus-3.12.0.tar.gz # Locally computed sha256 checksums sha256 572a4d6fa7541553f70cc6d494fbcbee7eb7d3f2fbd16080d39b20cccda26f0b LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index 1e7df6892a..75c0bdc35a 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 3.11.4 +PYTHON_PYMODBUS_VERSION = 3.12.0 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/2a/af/bbb716301ab9c60f0702c3cdf72cc0e373286a5648fe16bc4431400489dc +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/41/dc/8db192f3a66032e1bd900eb87b5bbcb539d5118f520372af0cb92ba42499 PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = LICENSE diff --git a/package/rust-bindgen/rust-bindgen.hash b/package/rust-bindgen/rust-bindgen.hash index dc79a62ddd..72ff0401ce 100644 --- a/package/rust-bindgen/rust-bindgen.hash +++ b/package/rust-bindgen/rust-bindgen.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f131b9cf87ea0a5db33ff3ad711aec4dbc4d383536f5f2e37493d63cbe95428e rust-bindgen-0.72.0-cargo4.tar.gz +sha256 9dd2f0f7bae7c84b1d79fb848d17335b8ebc37c27cd5ecb6e0da3ec0dba87d71 rust-bindgen-0.72.1-cargo4.tar.gz sha256 c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db LICENSE diff --git a/package/rust-bindgen/rust-bindgen.mk b/package/rust-bindgen/rust-bindgen.mk index 8c02db557f..55f3b4d5b7 100644 --- a/package/rust-bindgen/rust-bindgen.mk +++ b/package/rust-bindgen/rust-bindgen.mk @@ -4,8 +4,8 @@ # ################################################################################ -RUST_BINDGEN_VERSION = 0.72.0 -RUST_BINDGEN_SITE = $(call github,rust-lang,rust-bindgen,v$(RUST_BINDGEN_VERSION)) +RUST_BINDGEN_VERSION = 0.72.1 +RUST_BINDGEN_SITE = $(call github,rust-lang,rust-bindgen,refs/tags/v$(RUST_BINDGEN_VERSION)) RUST_BINDGEN_LICENSE = BSD-3-clause RUST_BINDGEN_LICENSE_FILES = LICENSE diff --git a/package/transmission/transmission.hash b/package/transmission/transmission.hash index b6dcaf9ae5..d554f8034e 100644 --- a/package/transmission/transmission.hash +++ b/package/transmission/transmission.hash @@ -1,4 +1,4 @@ # From https://transmissionbt.com/download -sha256 dcd28c1c9e6126229c4c17dbc9e95c9fd4aed7e76f4a1f2a74604c8cddec49d6 transmission-4.1.0.tar.xz +sha256 e743283ee03a42c4d0b08fed2bd52b554aa6c9f65b4d4d45b795c32d98762a79 transmission-4.1.1.tar.xz # Locally calculated sha256 9715b55d11caa499d34a6e23498c766fe1ece4ace57777553313e27d688dee78 COPYING diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index e4b6d8d189..b7e204dfce 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRANSMISSION_VERSION = 4.1.0 +TRANSMISSION_VERSION = 4.1.1 TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz TRANSMISSION_SITE = https://github.com/transmission/transmission/releases/download/$(TRANSMISSION_VERSION) TRANSMISSION_DEPENDENCIES = \ diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 87f4e462f1..6e47f07ead 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,5 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.4.0/zfs-2.4.0.sha256.asc -sha256 7bdf13de0a71d95554c0e3e47d5e8f50786c30d4f4b63b7c593b1d11af75c9ee zfs-2.4.0.tar.gz +# From https://github.com/openzfs/zfs/releases/download/zfs-2.4.1/zfs-2.4.1.sha256.asc +sha256 c17b69770f0023154f578eb8c7536a70f07d6a3bb0bd38f04fa0e8811c3c1390 zfs-2.4.1.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 30207f7cf7..0ecc9eee2d 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.4.0 +ZFS_VERSION = 2.4.1 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL